diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 22:54:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 22:54:02 (GMT) |
| commit | 9ca488c04bdab90668471640baeb0d9140be064c (patch) | |
| tree | 6a1e4c6acaff06f234b12fdbb0b4ad9ab3bc8048 /Documentation | |
| parent | 2cd91ec1970bd89e6b4b79b5aa41f27435625e71 (diff) | |
| parent | fbd7a23237094c3fb2e249bbcacbbf1e858e79c9 (diff) | |
| download | git-9ca488c04bdab90668471640baeb0d9140be064c.zip git-9ca488c04bdab90668471640baeb0d9140be064c.tar.gz git-9ca488c04bdab90668471640baeb0d9140be064c.tar.bz2 | |
Merge branch 'nd/rebase-show-current-patch'
The new "--show-current-patch" option gives an end-user facing way
to get the diff being applied when "git rebase" (and "git am")
stops with a conflict.
* nd/rebase-show-current-patch:
rebase: introduce and use pseudo-ref REBASE_HEAD
rebase: add --show-current-patch
am: add --show-current-patch
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 460662e..6f6c34b 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -16,7 +16,7 @@ SYNOPSIS [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [(<mbox> | <Maildir>)...] -'git am' (--continue | --skip | --abort | --quit) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch) DESCRIPTION ----------- @@ -171,6 +171,10 @@ default. You can use `--no-utf8` to override this. Abort the patching operation but keep HEAD and the index untouched. +--show-current-patch:: + Show the patch being applied when "git am" is stopped because + of conflicts. + DISCUSSION ---------- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index d713951..3277ca1 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -12,7 +12,7 @@ SYNOPSIS [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] -'git rebase' --continue | --skip | --abort | --quit | --edit-todo +'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch DESCRIPTION ----------- @@ -255,6 +255,11 @@ leave out at most one of A and B, in which case it defaults to HEAD. --edit-todo:: Edit the todo list during an interactive rebase. +--show-current-patch:: + Show the current patch in an interactive rebase or when rebase + is stopped because of conflicts. This is the equivalent of + `git show REBASE_HEAD`. + -m:: --merge:: Use merging strategies to rebase. When the recursive (default) merge |