diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2012-01-16 11:53:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-16 16:04:52 -0800 |
| commit | f7e5ea171b693bf5fc88e059d9d4af3753c09143 (patch) | |
| tree | 537dd1c0308531783930497f6d9cf8777623b9a8 /Documentation/git-am.txt | |
| parent | 82553cbb08b791aa0bed920ee58494268c0f579f (diff) | |
| download | git-f7e5ea171b693bf5fc88e059d9d4af3753c09143.tar.gz git-f7e5ea171b693bf5fc88e059d9d4af3753c09143.tar.xz | |
am: learn passing -b to mailinfo
git-am could pass -k to mailinfo, but not -b. Introduce an option
that does so. We change the meaning of the 'keep' state file, but are
careful not to cause a problem unless you downgrade in the middle of
an 'am' run.
This uncovers a bug in mailinfo -b, hence the failing test.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6b1b5af64..123f7c9e4 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -39,6 +39,9 @@ OPTIONS --keep:: Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). +--keep-non-patch:: + Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). + --keep-cr:: --no-keep-cr:: With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) |