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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint'	Junio C Hamano	2010-12-28
\|\
\| *	Fix false positives in t3404 due to SHELL=/bin/false	Robin H. Johnson	2010-12-28
* \|	Merge branch 'jh/notes-merge'	Junio C Hamano	2010-12-08
\|\ \
\| * \|	notes.c: Use two newlines (instead of one) when concatenating notes	Johan Herland	2010-11-17
* \| \|	t3404: do not use 'describe' to implement test_cmp_rev	Junio C Hamano	2010-11-09
* \| \|	t3404 (rebase -i): introduce helper to check position of HEAD	Jonathan Nieder	2010-11-09
* \| \|	t3404 (rebase -i): move comment to description	Jonathan Nieder	2010-11-09
* \| \|	t3404 (rebase -i): unroll test_commit loops	Jonathan Nieder	2010-11-09
* \| \|	tests: add missing &&, batch 2	Jonathan Nieder	2010-11-09
\| \|/ \|/\|
* \|	t3404 & t7508: cd inside subshell instead of around	Jens Lehmann	2010-09-06
* \|	Merge branch 'mm/rebase-i-exec'	Junio C Hamano	2010-08-21
\|\ \
\| * \|	test-lib: user-friendly alternatives to test [-d\|-f\|-e]	Matthieu Moy	2010-08-11
\| * \|	rebase -i: add exec command to launch a shell command	Matthieu Moy	2010-08-11
* \| \|	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-08-21
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	unpack_trees: group error messages by type	Matthieu Moy	2010-08-11
\| \|/
* \|	git-rebase--interactive.sh: use printf instead of echo to print commit message	Brandon Casey	2010-07-25
\|/
*	rebase-i: do not get fooled by a log message ending with backslash	Junio C Hamano	2010-07-05
*	Merge branch 'ic/maint-rebase-i-abort'	Junio C Hamano	2010-06-21
\|\
\| *	rebase -i: Abort cleanly if new base cannot be checked out	Ian Ward Comfort	2010-06-11
* \|	rebase -i -p: document shortcomings	Jonathan Nieder	2010-06-11
\|/
*	Merge branch 'mb/rebase-i-no-ff'	Junio C Hamano	2010-04-03
\|\
\| *	Teach rebase the --no-ff option.	Marc Branchaud	2010-03-24
* \|	Merge branch 'do/rebase-i-arbitrary'	Junio C Hamano	2010-04-03
\|\ \
\| * \|	rebase--interactive: don't require what's rebased to be a branch	Dave Olszewski	2010-03-14
\| \|/
* \|	rebase: support automatic notes copying	Thomas Rast	2010-03-12
\|/
*	rebase -i: Retain user-edited commit messages after squash/fixup conflicts	Michael Haggerty	2010-01-14
*	t3404: Set up more of the test repo in the "setup" step	Michael Haggerty	2010-01-14
*	rebase -i: For fixup commands without squashes, do not start editor	Michael Haggerty	2010-01-14
*	rebase -i: Improve consistency of commit count in generated commit messages	Michael Haggerty	2010-01-14
*	t3404: Test the commit count in commit messages generated by "rebase -i"	Michael Haggerty	2010-01-14
*	rebase-i: Ignore comments and blank lines in peek_next_command	Michael Haggerty	2010-01-12
*	Add a command "fixup" to rebase --interactive	Michael Haggerty	2009-12-07
*	t3404: Use test_commit to set up test repository	Michael Haggerty	2009-12-06
*	Teach 'rebase -i' the command "reword"	Björn Gustavsson	2009-10-07
*	tests: use "$TEST_DIRECTORY" instead of ".."	Jeff King	2009-08-09
*	Remove filename from conflict markers	Martin Renold	2009-07-01
*	rebase -i: avoid 'git reset' when possible	Johannes Schindelin	2009-03-03
*	Merge branch 'js/maint-rebase-i-submodule'	Junio C Hamano	2009-01-31
\|\
\| *	Fix submodule squashing into unrelated commit	Johannes Schindelin	2009-01-28
\| *	rebase -i squashes submodule changes into unrelated commit	Junio C Hamano	2009-01-28
* \|	t3404 & t3411: undo copy&paste	Johannes Schindelin	2009-01-28
\|/
*	t3404: Add test case for auto-amending only edited commits after "edit"	Stephan Beyer	2009-01-15
*	t3404: Add test case for aborted --continue after "edit"	Stephan Beyer	2009-01-15
*	rebase -i: do not fail when there is no commit to cherry-pick	Johannes Schindelin	2008-10-10
*	tests: use "git xyzzy" form (t0000 - t3599)	Nanako Shiraishi	2008-09-03
*	rebase -i -p: fix parent rewriting	Thomas Rast	2008-08-13
*	rebase -i -p: handle index and workdir correctly	Thomas Rast	2008-08-13
*	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	Johannes Schindelin	2008-07-15
*	t3404: test two "preserve merges with -p" cases	Stephan Beyer	2008-07-13
*	t3404: stricter tests for git-rebase--interactive	Stephan Beyer	2008-06-22