| commit | ce22989472fa3d8755f26248df0a7388a3f9b21d | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 7 Feb 2009 18:54:52 +0000 (7 19:54 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 21:38:13 +0000 (7 22:38 +0100) | ||
| tree | 59974aca5a0a9768a87a09318df4dce0e7c98750 | treesnapshot (tar.gz zip) |
| parent | 250fab4a8458a697b92b90baa914e9324f587247 | commitdiff |
rebase -i: make sure that the commands record the rewritten commits
The function pick_one() cannot just call add_rewritten(), as pick_one()
is called both by the "edit" and by the "squash" code, which want to
do more before calling add_rewritten() themselves ("squash" amends the
commit messages, and "edit" lets the user amend the commit).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The function pick_one() cannot just call add_rewritten(), as pick_one()
is called both by the "edit" and by the "squash" code, which want to
do more before calling add_rewritten() themselves ("squash" amends the
commit messages, and "edit" lets the user amend the commit).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| git-rebase--interactive.sh | diffblobblamehistory |