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

Prompt to continue when editing during rebase --interactive

2008-02-27T19:23:22Z

On hitting an edit point in an interactive rebase, git should prompt the user to run "git rebase --continue" Signed-off-by: Jonathan del Strother Signed-off-by: Junio C Hamano

rebase -i: accept -m as advertised in the man page

2008-02-11T20:18:53Z

Signed-off-by: Uwe Kleine-K,Av(Bnig Signed-off-by: Junio C Hamano

Squelch bogus progress output from git-rebase--interactive

2008-01-15T04:04:02Z

The command repeats "Rebasing (1/1)" many times even when there is only one task remaining, because mark_action_done() is called to skip comment and empty lines in the TODO file. This should fix it. Signed-off-by: Junio C Hamano

git-rebase -i: clean-up error check codepath.

2007-12-30T20:51:42Z

After replaying a single change, the code performed a number of checks, but some of them were for sanity checking, failures from which should make the command abort, and others were checks to see if it should make a new commit object. Stringing them together with "&&" was wrong. Signed-off-by: Junio C Hamano

git-rebase -i behaves better on commits with incomplete messages

2007-12-30T20:37:59Z

The commit message template when squashing multiple commits is prepared by concatenating the messages of existing commits together. If the messages from some of them end with incomplete lines, this would result in a suboptimal message template. Make sure that we add a terminating LF after each commit message. Signed-off-by: Junio C Hamano

Reallow git-rebase --interactive --continue if commit is unnecessary

2007-12-20T09:12:41Z

During git-rebase --interactive's --continue implementation we used to silently restart the rebase if the user had made the commit for us. This is common if the user stops to edit a commit and does so by amending it. My recent change to watch git-commit's exit status broke this behavior. Thanks to Bernt Hansen for catching it in 1.5.4-rc1. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Catch and handle git-commit failures in git-rebase --interactive

2007-12-20T01:17:27Z

If git-commit fails for any reason then git-rebase needs to stop and not plow through the rest of the series. Its unlikely that a future git-commit will succeed if the current attempt failed. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Avoid update hook during git-rebase --interactive

2007-12-20T01:15:38Z

If we are rebasing changes that contain potential whitespace errors that our .git/hooks/pre-commit hook looks for and fails on then git-commit will fail to commit that change. This causes git-rebase--interactive to squash commits together, even though it was not requested to do so by the todo file. Passing --no-verify to git-commit makes git-rebase -i behave more like git-rebase normally would in such conditions, providing more consistent behavior between the different rebase implementations. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Fix interactive rebase to preserve author email address

2007-12-19T22:59:19Z

Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano

rebase -p -i: handle "no changes" gracefully

2007-12-18T04:49:18Z

Since commit 376ccb8cbb453343998e734d8a1ce79f57a4e092 (rebase -i: style fixes and minor cleanups), unchanged SHA-1s are no longer mapped via $REWRITTEN. But the updating phase was not prepared for the old head not being rewritten. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano