| commit | 80fe82e4eb365773ba6518c4539c9235ea9a8b2e | |
| author | Stephen Haberman <stephen@exigencecorp.com> | |
| Wed, 15 Oct 2008 07:44:40 +0000 (15 02:44 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Oct 2008 16:23:54 +0000 (16 09:23 -0700) | ||
| tree | 865b2ff438ef68963f4483ae1cb0264b4c9f490f | treesnapshot (tar.gz zip) |
| parent | d80d6bc146232d81f1bb4bc58e5d89263fd228d4 | commitdiff |
rebase-i-p: if todo was reordered use HEAD as the rewritten parent
This seems like the best guess we can make until git sequencer marks are
available. That being said, within the context of re-ordering a commit before
its parent in todo, I think applying it on top of the current commit seems like
a reasonable assumption of what the user intended.
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This seems like the best guess we can make until git sequencer marks are
available. That being said, within the context of re-ordering a commit before
its parent in todo, I think applying it on top of the current commit seems like
a reasonable assumption of what the user intended.
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3411-rebase-preserve-around-merges.sh | [changed mode: 0755->0644] | diffblobblamehistory |