Code

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 07:56:01 +0000 (23:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 07:56:01 +0000 (23:56 -0800)
* '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


Trivial merge