Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
commit154c7d0759b6885034bffa7a34d464d703fc8bb3
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 07:56:01 +0000 (18 23:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 07:56:01 +0000 (18 23:56 -0800)
tree9a53213c3c9d39643d7451cb57316935eb634f5f
parent005e2dfdf299a7d869fa9ec819171fba574f42eb
parentc251005c7a5279166a27d4d06854f0c3d26e8208
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
  Documentation: Fix references to deprecated commands
  user-manual: mention "..." in "Generating diffs", etc.
  user-manual: Add section "Why bisecting merge commits can be harder ..."
  git-remote.txt: fix example url