diff options
| author | Stephen Haberman <stephen@exigencecorp.com> | 2008-10-15 09:44:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-16 18:23:54 +0200 |
| commit | 80fe82e4eb365773ba6518c4539c9235ea9a8b2e (patch) | |
| tree | 865b2ff438ef68963f4483ae1cb0264b4c9f490f /Documentation/diff-options.txt | |
| parent | rebase-i-p: do not include non-first-parent commits touching UPSTREAM (diff) | |
| download | git-80fe82e4eb365773ba6518c4539c9235ea9a8b2e.tar.xz git-80fe82e4eb365773ba6518c4539c9235ea9a8b2e.zip | |
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>
Diffstat (limited to 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions