| commit | 250fab4a8458a697b92b90baa914e9324f587247 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 25 Jan 2009 19:58:08 +0000 (25 20:58 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 21:34:18 +0000 (7 22:34 +0100) | ||
| tree | 9ebcf945a50adcecebaaf0765d643dd44cde3f34 | treesnapshot (tar.gz zip) |
| parent | 436a8b126a75cef9597ff6f86f40baabbce2e300 | commitdiff |
rebase -i -p: Add the "merge" command
The syntax is
"merge parents <parent commits> original <original merge>"
and the action is to merge the given parents, and mark the result as
the rewritten version of the original merge commit.
As "git merge -m <msg>" insists on appending its own message, we
call "commit --amend -m <msg>" after the merge.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The syntax is
"merge parents <parent commits> original <original merge>"
and the action is to merge the given parents, and mark the result as
the rewritten version of the original merge commit.
As "git merge -m <msg>" insists on appending its own message, we
call "commit --amend -m <msg>" after the merge.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| git-rebase--interactive.sh | diffblobblamehistory |