| commit | 8a6dae108eadbd2882296981e03fd8e251d42f56 | |
| author | Vincent van Ravesteijn <vfr@lyx.org> | |
| Thu, 24 May 2012 13:57:26 +0000 (24 13:57 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 May 2012 18:44:14 +0000 (29 11:44 -0700) | ||
| tree | ef1aa4cdca49d738c7bb80cb86e9384f00611e1a | treesnapshot (tar.gz zip) |
| parent | befc5ed3799cb6fcbaa7de03e7fa1760e846853c | commitdiff |
Do not autosquash in case of an implied interactive rebase
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory |