summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-11 22:21:48 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-12 02:26:01 -0800
commitb47dfe9e9c86be97fc07c4c04e26a303730f76c6 (patch)
treeac70929812c01e40e797abf3c53cbf13bc53ccdc /Documentation/git-am.txt
parentd727f676ad9f03c2b2a11ea68a2c6242ca02fa10 (diff)
downloadgit-b47dfe9e9c86be97fc07c4c04e26a303730f76c6.tar.gz
git-am: add --directory=<dir> option
Thanks to a200337 (git-am: propagate -C<n>, -p<n> options as well, 2008-12-04) and commits around it, "git am" is equipped to correctly propagate the command line flags such as -C/-p/-whitespace across a patch failure and restart. It is trivial to support --directory option now, resurrecting previous attempts by Kevin and Simon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index b9c6fac748..5cbbe76937 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -11,7 +11,7 @@ SYNOPSIS
[verse]
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive]
- [--whitespace=<option>] [-C<n>] [-p<n>]
+ [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[<mbox> | <Maildir>...]
'git am' (--skip | --resolved | --abort)
@@ -60,12 +60,9 @@ default. You could use `--no-utf8` to override this.
available locally.
--whitespace=<option>::
- This flag is passed to the 'git-apply' (see linkgit:git-apply[1])
- program that applies
- the patch.
-
-C<n>::
-p<n>::
+--directory=<dir>::
These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
program that applies
the patch.