summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@mellanox.co.il>2007-02-08 15:57:08 +0200
committerJunio C Hamano <junkio@cox.net>2007-02-08 15:23:52 -0800
commit67dad687ad15d26d8e26f4d27874af0bc0965ce2 (patch)
tree4a6d436ff71e9c83a9196a73596f3c6f6aaebd20 /Documentation/git-am.txt
parent66e788bc7fd1888cb4834a48006128a6217f88af (diff)
downloadgit-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.gz
add -C[NUM] to git-am
Add -C[NUM] to git-am and git-rebase so that patches can be applied even if context has changed a bit. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index aa4ce1ddb0..f7d551e2c7 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -64,6 +64,10 @@ default. You could use `--no-utf8` to override this.
This flag is passed to the `git-apply` program that applies
the patch.
+-C<n>::
+ This flag is passed to the `git-apply` program that applies
+ the patch.
+
--interactive::
Run interactively, just like git-applymbox.