diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-19 00:37:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-19 00:37:50 +0000 |
| commit | 7c73c663897cfb2796fa93efc40ebe4ea33a3db1 (patch) | |
| tree | 1f9d377ee80bb9eada67fc063f87c517dffa8832 /git-format-patch.txt | |
| parent | 2d47c62a3df350dff294aba379e2a5430fd130d1 (diff) | |
| download | git-htmldocs-7c73c663897cfb2796fa93efc40ebe4ea33a3db1.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc1-g72fe
Diffstat (limited to 'git-format-patch.txt')
| -rw-r--r-- | git-format-patch.txt | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/git-format-patch.txt b/git-format-patch.txt index 574cf76dc..59f34b9f0 100644 --- a/git-format-patch.txt +++ b/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,10 +81,17 @@ 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 `.txt` as the suffix for generated + Instead of using `.patch` as the suffix for generated filenames, use specifed suffix. A common alternative is - `--suffix=.patch`. + `--suffix=.txt`. + Note that you would need to include the leading dot `.` if you want a filename like `0001-description-of-my-change.patch`, and @@ -93,15 +101,14 @@ not add any suffix. CONFIGURATION ------------- You can specify extra mail header lines to be added to each -message in the repository configuration as follows: +message in the repository configuration. Also you can specify +the default suffix different from the built-in one: +------------ [format] headers = "Organization: git-foo\n" - -You can specify default suffix used: - -[format] - suffix = .patch + suffix = .txt +------------ EXAMPLES @@ -126,6 +133,9 @@ git-format-patch -M -B origin:: understand renaming patches, so use it only when you know the recipient uses git to apply your patch. +git-format-patch -3:: + Extract three topmost commits from the current branch + and format them as e-mailable patches. See Also -------- |