diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index e7703a5000..59f34b9f0d 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git-format-patch' [-n | -k] [-o | --stdout] [--attach] [--thread] [-s | --signoff] [--diff-options] [--start-number ] [--in-reply-to=Message-Id] [--suffix=.] + [--ignore-if-in-upstream] [..] 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 + ... This will examine all patches reachable + from but not from and compare them with the + patches being generated, and any patch that matches is + ignored. + --suffix=.:: Instead of using `.patch` as the suffix for generated filenames, use specifed suffix. A common alternative is