diff options
| author | Michael S. Tsirkin <mst@mellanox.co.il> | 2007-02-08 15:57:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-08 15:23:52 -0800 |
| commit | 67dad687ad15d26d8e26f4d27874af0bc0965ce2 (patch) | |
| tree | 4a6d436ff71e9c83a9196a73596f3c6f6aaebd20 /Documentation/git-rebase.txt | |
| parent | 66e788bc7fd1888cb4834a48006128a6217f88af (diff) | |
| download | git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.gz git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.xz | |
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-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 977f661b9..3dff2dfae 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -7,7 +7,7 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- -'git-rebase' [-v] [--merge] [--onto <newbase>] <upstream> [<branch>] +'git-rebase' [-v] [--merge] [-CNUM] [--onto <newbase>] <upstream> [<branch>] 'git-rebase' --continue | --skip | --abort @@ -196,6 +196,12 @@ OPTIONS -v, \--verbose:: Display a diffstat of what changed upstream since the last rebase. +-C<n>:: + Ensure at least <n> lines of surrounding context match before + and after each change. When fewer lines of surrounding + context exist they all must match. By default no context is + ever ignored. + include::merge-strategies.txt[] NOTES |