5 Commits

Author	SHA1	Message	Date
Linus Torvalds	7f1d112962	Remove MERGE_HEAD after committing merge	2005-06-08 13:44:32 -07:00
Linus Torvalds	9c065315f7	Make "git commit" work correctly in the presense of a manual merge ... This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it.	2005-06-08 13:33:15 -07:00
Alexey Guzeev	ef6a46e6ea	[PATCH] git: git-commit-script ignores $GIT_DIR	2005-06-01 07:51:51 -07:00
Junio C Hamano	2036d84102	[PATCH] Buglets fix in the new two scripts ... Should be obvious... - Use $VISUAL, $EDITOR, in this order if set, and fall back on vi. - Status R, C, D, N usually are followed by number, so adjust case arms to that pattern. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	2005-05-30 18:10:46 -07:00
Linus Torvalds	a3e870f2e2	Add "commit" helper script ... This is meant to make raw git not hugely less usable than something like raw CVS. I want to make a 1.0 release of the plumbing, and the actual commit part was just too intimidating.	2005-05-30 12:51:00 -07:00