Document --ignore-if-in-upstream in git-format-patch
Signed-off-by: Junio C Hamano <junkio@cox.net>
David Kågedal committed
Jan 18, 2007 at 12:27 UTC
cc75ad6762209ff6055c30b822bce22b105eb7d9
1 file changed
+8
Documentation/git-format-patch.txt
+8
@@ -12,6 +12,7 @@ SYNOPSIS
12
'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
13
[-s | --signoff] [--diff-options] [--start-number <n>]
14
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
15
+ [--ignore-if-in-upstream]
16
<since>[..<until>]
17
18
DESCRIPTION
@@ -80,6 +81,13 @@ OPTIONS
81
reply to the given Message-Id, which avoids breaking threads to
82
provide a new patch series.
83
84
+--ignore-if-in-upstream::
85
+ Do not include a patch that matches a commit in
86
+ <until>..<since>. This will examine all patches reachable
87
+ from <since> but not from <until> and compare them with the
88
+ patches being generated, and any patch that matches is
89
+ ignored.
90
+
91
--suffix=.<sfx>::
92
Instead of using `.patch` as the suffix for generated
93
filenames, use specifed suffix. A common alternative is