org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	rebase -i: Enclose sed command substitution in quotes	Michael Haggerty	2010-01-22
\| \| \| \| \| \| \|	Reported by: Johannes Sixt <j.sixt@viscovery.net> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	t3404: Test the commit count in commit messages generated by "rebase -i"	Michael Haggerty	2010-01-14
\| \| \| \| \| \| \| \| \| \|	The first line of commit messages generated for "rebase -i" squash/fixup commits includes a count of the number of commits that are being combined. Add machinery to check that this count is correct, and add such a check to some test cases. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	lib-rebase: Allow comments and blank lines to be added to the rebase script	Michael Haggerty	2010-01-12
\| \| \| \| \| \| \| \| \|	(For testing "rebase -i"): Support new action types in $FAKE_LINES to allow comments and blank lines to be added to the "rebase -i" command list. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	lib-rebase: Provide clearer debugging info about what the editor did	Michael Haggerty	2010-01-12
\| \| \| \| \| \| \| \|	(For testing "rebase -i"): Output the "rebase -i" command script before and after the edits, to make it clearer what the editor did. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Add a command "fixup" to rebase --interactive	Michael Haggerty	2009-12-07
\| \| \| \| \| \| \| \| \|	The command is like "squash", except that it discards the commit message of the corresponding commit. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Teach 'rebase -i' the command "reword"	Björn Gustavsson	2009-10-07
\| \| \| \| \| \| \| \|	Make it easier to edit just the commit message for a commit using 'git rebase -i' by introducing the "reword" command. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	lib-rebase.sh: Document what set_fake_editor() does	Johannes Schindelin	2009-01-28
\| \| \| \| \| \| \|	Make it easy for other authors to use rebase tests' fake-editor. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	t3404 & t3411: undo copy&paste	Johannes Schindelin	2009-01-28
	Rather than copying and pasting, which is prone to lead to fixes missing in one version, move the fake-editor generator to t/t3404/. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>