Patchwork diff: document the nobinary option

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date Sept. 30, 2014, 8:59 p.m.
Message ID <accdba3c4b4afbb15252.1412110799@Iris>
Download mbox | patch
Permalink /patch/6051/
State Accepted
Commit 551d776a0a9ab1522be88e1e26d8f1ff37f304b8
Headers show

Comments

Jordi Gutiérrez Hermoso - Sept. 30, 2014, 8:59 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1412110747 14400
#      Tue Sep 30 16:59:07 2014 -0400
# Node ID accdba3c4b4afbb15252ff7d779de4333b73996b
# Parent  939ce500c92a3dcc0e10815242361ff70a6fcae9
diff: document the nobinary option

Since 3fbef7ac26f0, we have a diff.nobinary option. This is handy, but
the only way I found out about it was by looking at the release notes
for 3.1, which is not something I normally do.
Matt Mackall - Oct. 1, 2014, 9:26 p.m.
On Tue, 2014-09-30 at 16:59 -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@octave.org>
> # Date 1412110747 14400
> #      Tue Sep 30 16:59:07 2014 -0400
> # Node ID accdba3c4b4afbb15252ff7d779de4333b73996b
> # Parent  939ce500c92a3dcc0e10815242361ff70a6fcae9
> diff: document the nobinary option

I put this in stable.

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -519,6 +519,9 @@  related options for the annotate command
 ``git``
     Use git extended diff format.
 
+``nobinary``
+    Omit git binary patches.
+
 ``nodates``
     Don't include dates in diff headers.