Junio C Hamano dc88102484 Merge branch 'jc/clone' into next ...

* jc/clone:
  git-clone: lose the traditional 'no-separate-remote' layout
  git-clone: lose the artificial "first" fetch refspec
  git-pull: refuse default merge without branch.*.merge
  git-clone: use wildcard specification for tracking branches
  merge: give a bit prettier merge message to "merge branch~$n"
  Document git-merge-file
  git-clone documentation
  git-status always says what branch it's on

Conflicts:

	git-clone.sh
	git-merge.sh

2006-12-16 13:20:37 -08:00

9.9 KiB

Executable File

Raw Blame History

View Raw