Luck, Tony f37d0cc3ff Update howto using-topic-branches ... "git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>		2005-11-08 21:33:36 -08:00
..
isolate-bugs-with-bisect.txt	Add bug isolation howto, scraped from Linus.	2005-11-07 22:18:48 -08:00
make-dist.txt	Big tool rename.	2005-09-07 17:45:20 -07:00
rebase-and-edit.txt	Documentation update: use git branch -d foo where applicable	2005-11-07 13:28:31 -08:00
rebase-from-internal-branch.txt	Big tool rename.	2005-09-07 17:45:20 -07:00
rebuild-from-update-hook.txt	Add how-to on using update-hook.	2005-08-26 22:35:45 -07:00
revert-branch-rebase.txt	Documentation update: use git branch -d foo where applicable	2005-11-07 13:28:31 -08:00
using-topic-branches.txt	Update howto using-topic-branches	2005-11-08 21:33:36 -08:00