3 commits

Author	SHA1	Message	Date
Yann Dirson	7c6eafa35a	t/t3415: use && where applicable. ... Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-10-06 13:46:02 -07:00
Heiko Voigt	dd1e5b313a	add configuration variable for --autosquash option of interactive rebase ... If you use this feature regularly you can now enable it by default. In case the user wants to override this config on the commandline --no-autosquash can be used to force disabling. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-07-14 08:47:29 -07:00
Nanako Shiraishi	f59baa502f	rebase -i --autosquash: auto-squash commits ... Teach a new option, --autosquash, to the interactive rebase. When the commit log message begins with "!fixup ...", and there is a commit whose title begins with the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing come right after the commit to be modified, and change the action of the moved commit from pick to squash. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-01-06 17:18:56 -08:00