diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 15:25:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 15:25:44 -0800 |
| commit | 664750f03dff9b27b2c2fe5381a720967c1b60c1 (patch) | |
| tree | 6960e5a2646c836d9415e1aa4aace2cea9aad4f1 /git-rebase.txt | |
| parent | 615c3b305d84007474d17c62d54fc18c71fdc587 (diff) | |
| download | git-htmldocs-664750f03dff9b27b2c2fe5381a720967c1b60c1.tar.gz | |
Autogenerated HTML docs for v2.16.2-440-gc6284
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index d713951b8..3277ca143 100644 --- a/git-rebase.txt +++ b/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 |