projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ca4effd) | patch
Do not autosquash in case of an implied interactive rebase
authorVincent van Ravesteijn <vfr@lyx.org>
Thu, 24 May 2012 13:57:26 +0000 (13:57 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jun 2012 21:01:42 +0000 (14:01 -0700)
commit941cab3a78a3fd3d21ba3acb3f8da3407a692015
tree749c3eec1e754e46584fa4b9e164b92554e1cecdtree | snapshot
parentca4effd8bce5e0dfce7ce1425074475c8643b7f0commit | diff
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>
git-rebase.sh diff | blob | history
Git—the stupid content tracker