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

	Commit message (Collapse)	Author	Age
*	rebase --abort: do not update branch ref	Martin von Zweigbergk	2010-11-23
\| \| \| \| \| \| \| \| \| \|	If a non-interactive rebase of a ref fails at commit X and is aborted by the user, the ref will be updated twice. First to point at X (with the reflog message "rebase finished: $head_name onto $onto"), and then back to $orig_head. It should not be updated at all. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	test-lib: user-friendly alternatives to test [-d\|-f\|-e]	Matthieu Moy	2010-08-11
\| \| \| \| \| \| \| \|	The helper functions are implemented, documented, and used in a few places to validate them, but not everywhere to avoid useless code churn. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	tests: use "git xyzzy" form (t0000 - t3599)	Nanako Shiraishi	2008-09-03
\| \| \| \| \| \| \|	Converts tests between t0050-t3903. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Rename .git/rebase to .git/rebase-apply	Johannes Schindelin	2008-07-21
\| \| \| \| \| \| \| \| \| \|	With git-am, it sounds awkward to have the patches in ".git/rebase/", but for technical reasons, we have to keep the same directory name for git-am and git-rebase. ".git/rebase-apply" seems to be a good compromise. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	Johannes Schindelin	2008-07-15
\| \| \| \| \| \| \| \| \| \| \|	Since the files generated and used during a rebase are never to be tracked, they should live in $GIT_DIR. While at it, avoid the rather meaningless term "dotest" to "rebase", and unhide ".dotest-merge". This was wished for on the mailing list, but so far unimplemented. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git-rebase.sh: Fix --merge --abort failures when path contains whitespace	Bryan Donlan	2008-05-05
\| \| \| \| \| \| \|	Also update t/t3407-rebase-abort.sh to expose the bug. Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge	Mike Hommey	2008-03-03
\| \| \| \| \| \| \| \| \| \| \|	Removing .dotest should actually not be needed, so just test the directory don't exist after --abort, but exists after starting the rebase. Also, execute the same tests with rebase --merge, which uses a different code path. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git rebase --abort: always restore the right commit	Mike Hommey	2008-03-01
\| \| \| \| \| \| \| \| \| \| \| \|	Previously, --abort would end by git resetting to ORIG_HEAD, but some commands, such as git reset --hard (which happened in git rebase --skip, but could just as well be typed by the user), would have already modified ORIG_HEAD. Just use the orig-head we store in $dotest instead. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Add test for git rebase --abort	Mike Hommey	2008-03-01
	We expect git rebase --abort to come back to the original (pre-rebase) head, independently from when it's run during a rebase. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>