diff options
| author | Michael S. Tsirkin <mst@mellanox.co.il> | 2007-02-08 13:57:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-08 23:23:52 (GMT) |
| commit | 67dad687ad15d26d8e26f4d27874af0bc0965ce2 (patch) | |
| tree | 4a6d436ff71e9c83a9196a73596f3c6f6aaebd20 /Documentation/git-am.txt | |
| parent | 66e788bc7fd1888cb4834a48006128a6217f88af (diff) | |
| download | git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.zip git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.gz git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.bz2 | |
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.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index aa4ce1d..f7d551e 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. |