user/sven/git.git/git-rebase--interactive.sh, branch v1.8.0.2

Merge branch 'aw/rebase-i-edit-todo'

2012-09-30T05:28:12Z

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

rebase -i: suggest using --edit-todo to fix an unknown instruction

2012-09-19T19:52:10Z

We have now an explicit UI to edit the todo sheet and need not disclose the name of the file. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

rebase -i: fix misleading error message after 'exec no-such' instruction

2012-09-18T20:27:45Z

When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error: Execution failed: no-such You can fix the problem, and then run git rebase --continue fatal: 'rebase' appears to be a git command, but we were not able to execute it. Maybe git-rebase is broken? The reason is that the shell that attempted to run the command exits with code 127. rebase--interactive just forwards this code to the caller (the git wrapper). But our smart run-command infrastructure detects this special exit code and turns it into ENOENT, which in turn is interpreted by the git wrapper as if the external command that it just executed did not exist. This is finally translated to the misleading last two lines in error message cited above. Fix it by translating the error code before it is forwarded. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

rebase -i: Teach "--edit-todo" action

2012-09-18T03:59:14Z

This allows users to edit the todo file while they're stopped in the middle of an interactive rebase. When this action is executed, all comments from the original todo file are stripped, and new help messages are appended to the end. Signed-off-by: Andrew Wong Signed-off-by: Junio C Hamano

rebase -i: Refactor help messages for todo file

2012-09-18T03:58:55Z

Signed-off-by: Andrew Wong Signed-off-by: Junio C Hamano

Merge branch 'maint-1.7.11' into maint

2012-09-10T22:31:06Z

* maint-1.7.11: Almost 1.7.11.6 gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO rebase -i: use full onto sha1 in reflog sh-setup: protect from exported IFS receive-pack: do not leak output from auto-gc to standard output t/t5400: demonstrate breakage caused by informational message from prune setup: clarify error messages for file/revisions ambiguity send-email: improve RFC2047 quote parsing fsck: detect null sha1 in tree entries do not write null sha1s to on-disk index diff: do not use null sha1 as a sentinel value

Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11

2012-09-10T22:26:03Z

The reflog entries left by "git rebase" and "git rebase -i" were inconsistent (the interactive one gave an abbreviated object name). * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog

Merge branch 'mg/rebase-i-onto-reflog-in-full'

2012-08-29T21:50:01Z

The reflog entries left by "git rebase" and "git rebase -i" were inconsistent. * mg/rebase-i-onto-reflog-in-full: rebase -i: use full onto sha1 in reflog

rebase -i: use full onto sha1 in reflog

2012-08-10T16:41:28Z

'git rebase' uses the full onto sha1 for the reflog message whereas 'git rebase -i' uses the short sha1. This is not only inconsistent, but can lead to problems when the reflog is inspected at a later time at which that abbreviation may have become ambiguous. Make 'rebase -i' use the full onto sha1, as well. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano

Merge branch 'cw/rebase-i-root'

2012-07-25T22:46:59Z

Finishing touches to the "rebase -i --root" (new feature for 1.7.12). * cw/rebase-i-root: rebase -i: handle fixup of root commit correctly