summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid K├ągedal <davidk@lysator.liu.se>2007-01-18 11:27:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-18 22:29:42 (GMT)
commitcc75ad6762209ff6055c30b822bce22b105eb7d9 (patch)
tree5edbefece2e61a0adb215133867576f43b706aa2 /Documentation
parenta5cd09f993c0dd96f0c70fd1266f7c58b4f52446 (diff)
downloadgit-cc75ad6762209ff6055c30b822bce22b105eb7d9.zip
git-cc75ad6762209ff6055c30b822bce22b105eb7d9.tar.gz
git-cc75ad6762209ff6055c30b822bce22b105eb7d9.tar.bz2
Document --ignore-if-in-upstream in git-format-patch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-format-patch.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index e7703a5..59f34b9 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -12,6 +12,7 @@ SYNOPSIS
'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
[-s | --signoff] [--diff-options] [--start-number <n>]
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
+ [--ignore-if-in-upstream]
<since>[..<until>]
DESCRIPTION
@@ -80,6 +81,13 @@ OPTIONS
reply to the given Message-Id, which avoids breaking threads to
provide a new patch series.
+--ignore-if-in-upstream::
+ Do not include a patch that matches a commit in
+ <until>..<since>. This will examine all patches reachable
+ from <since> but not from <until> and compare them with the
+ patches being generated, and any patch that matches is
+ ignored.
+
--suffix=.<sfx>::
Instead of using `.patch` as the suffix for generated
filenames, use specifed suffix. A common alternative is