![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Thomas Rast <trast@student.ethz.ch> | |
| Fri, 12 Mar 2010 17:04:30 +0000 (18:04 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Mar 2010 05:55:39 +0000 (21:55 -0800) | ||
| commit | b079feed64238558fa24ba8ade892d84628a05ac | |
| tree | b9c518a1135141e6594fc68eed77db22b51805a8 | tree | snapshot |
| parent | 96e19488f1e8f3964f5f329248852864b4ee4541 | commit | diff |
rebase -i: invoke post-rewrite hook
Aside from the same issue that rebase also has (remembering the
original commit across a conflict resolution), rebase -i brings an
extra twist: We need to defer writing the rewritten list in the case
of {squash,fixup} because their rewritten result should be the last
commit in the squashed group.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Aside from the same issue that rebase also has (remembering the
original commit across a conflict resolution), rebase -i brings an
extra twist: We need to defer writing the rewritten list in the case
of {squash,fixup} because their rewritten result should be the last
commit in the squashed group.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diff | blob | history | |
| t/t5407-post-rewrite-hook.sh | diff | blob | history |