| commit | 24fdea2979614256fd46eeb03879b841df335e12 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 7 Feb 2009 18:54:56 +0000 (7 19:54 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 21:53:47 +0000 (7 22:53 +0100) | ||
| tree | 98e288841fa53c4c200fff188004fce22e62520d | treesnapshot (tar.gz zip) |
| parent | 70c329001a56cd34e31a8561a64c766f07923f3e | commitdiff |
rebase -i -p: allow making a new merge
By writing a command like
merge parents deadbeef as blub Merge whatever
you can tell rebase that it should merge deadbeef, make the message
"Merge whatever", and give the commit the name "blub" so that you
can go back later with
goto blub'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By writing a command like
merge parents deadbeef as blub Merge whatever
you can tell rebase that it should merge deadbeef, make the message
"Merge whatever", and give the commit the name "blub" so that you
can go back later with
goto blub'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| git-rebase--interactive.sh | diffblobblamehistory |