diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-30 09:28:12 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-30 09:28:12 +0400 |
| commit | 68a31b7d956e958f1b51e80f6cb91858e416c95d (patch) | |
| tree | 8b260e1da7ef80c08a1535c2f719d15bfc7f9178 /Documentation | |
| parent | f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a (diff) | |
| parent | 9c8e1011b9f6979777946ff87aae7b5846ed20a7 (diff) | |
Merge branch 'aw/rebase-i-edit-todo'
Teach an option to edit the insn sheet to "git rebase -i".
* aw/rebase-i-edit-todo:
rebase -i: suggest using --edit-todo to fix an unknown instruction
rebase -i: Add tests for "--edit-todo"
rebase -i: Teach "--edit-todo" action
rebase -i: Refactor help messages for todo file
rebase usage: subcommands can not be combined with -i
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index fd535b06ab..da067ecafa 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 +'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 |