]> asedeno.scripts.mit.edu Git - git.git/commit
projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 72583e6) | patch
rebase-i-p: delay saving current-commit to REWRITTEN if squashing
authorStephen Haberman <stephen@exigencecorp.com>
Wed, 15 Oct 2008 07:44:36 +0000 (02:44 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Oct 2008 16:23:53 +0000 (09:23 -0700)
commitbb645071645240a23ede4e93c9425252a0eaaefb
treef99c9b503aec81a0a21f3154abfdd796ab65f3e8tree | snapshot
parent72583e6c685a85b9354ee2310cec3d9240df3c0fcommit | diff
rebase-i-p: delay saving current-commit to REWRITTEN if squashing

If the current-commit was dumped to REWRITTEN, but then we squash the next
commit in to it, we have invalidated the HEAD was just written to REWRITTEN.
Instead, append the squash hash to current-commit and save both of them the next
time around.

Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh diff | blob | history
local clone of git.git