From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Nov 2007 07:56:01 +0000 (-0800)
Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
X-Git-Tag: v1.5.3.7~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=154c7d0759b6885034bffa7a34d464d703fc8bb3;p=git.git

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
---

154c7d0759b6885034bffa7a34d464d703fc8bb3