53 commits

Author	SHA1	Message	Date
Junio C Hamano	c859600954	[PATCH] read-tree: save more user hassles during fast-forward. ... This implements the "never lose the current cache information or the work tree state, but favor a successful merge over merge failure" principle in the fast-forward two-tree merge operation. It comes with a set of tests to cover all the cases described in the case matrix found in the new documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	2005-06-07 11:41:51 -07:00
David Greaves	c1bdacf97e	[PATCH 3/4] split core-git.txt and update ... Update git environment variable docs Update first section of command docs (Manipulation commands section) Signed-off-by: David Greaves <david@dgreaves.com>	2005-05-10 15:01:23 -07:00
David Greaves	2cf565c53c	[PATCH 1/4] split core-git.txt and update ... Split the core-git.txt file Formatting fix to the diff-format.txt Signed-off-by: David Greaves <david@dgreaves.com>	2005-05-10 14:55:22 -07:00