diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-30 00:38:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-30 00:38:36 -0700 |
| commit | 9cdfecf16e1f60e1aef2c5bbc4da68035642f66f (patch) | |
| tree | 25472738de4d09a44180de787e20b291e8282203 /git-rebase.txt | |
| parent | 4f07aeca5786f644177419a0a3f2157d3e835277 (diff) | |
| download | git-htmldocs-9cdfecf16e1f60e1aef2c5bbc4da68035642f66f.tar.gz | |
Autogenerated HTML docs for v1.7.12.2-421-g261b5
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index fd535b06a..da067ecaf 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 +'git rebase' --continue | --skip | --abort | --edit-todo DESCRIPTION ----------- @@ -245,6 +245,9 @@ leave out at most one of A and B, in which case it defaults to HEAD. --skip:: Restart the rebasing process by skipping the current patch. +--edit-todo:: + Edit the todo list during an interactive rebase. + -m:: --merge:: Use merging strategies to rebase. When the recursive (default) merge |