Junio C Hamano 60b188a984 Merge branch 'js/branch-track' ...

* js/branch-track:
  doc: documentation update for the branch track changes
  branch: optionally setup branch.*.merge from upstream local branches

Conflicts:

	Documentation/config.txt
	Documentation/git-branch.txt
	Documentation/git-checkout.txt
	builtin-branch.c
	cache.h
	t/t7201-co.sh

2008-02-27 13:02:57 -08:00

3.7 KiB

Raw Blame History

View Raw