Teach rebase an interactive mode
commit1b1dce4bae760248a1fc3e29548a72c446e77270
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Mon, 25 Jun 2007 00:11:14 +0000 (25 01:11 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2007 00:45:02 +0000 (24 17:45 -0700)
treeb48022f5003b0b8116348ef728beb2d42211ec58
parent0cae23467ada9b94210a0e770064841efea8ad40
Teach rebase an interactive mode

Don't you just hate the fact sometimes, that git-rebase just applies
the patches, without any possibility to edit them, or rearrange them?
With "--interactive", git-rebase now lets you edit the list of patches,
so that you can reorder, edit and delete patches.

Such a list will typically look like this:

pick deadbee The oneline of this commit
pick fa1afe1 The oneline of the next commit
...

By replacing the command "pick" with the command "edit", you can amend
that patch and/or its commit message, and by replacing it with "squash"
you can tell rebase to fold that patch into the patch before that.

It is derived from the script sent to the list in
<Pine.LNX.4.63.0702252156190.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
Makefile
git-rebase--interactive.sh [new file with mode: 0755]
git-rebase.sh
t/t3404-rebase-interactive.sh [new file with mode: 0755]