Merge branch 'maint'
commit5d1d1c14790cf74eb0d630c4404114206061232d
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 08:19:15 +0000 (19 00:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 08:19:15 +0000 (19 00:19 -0800)
tree335c531a9a7115e4a965277e54cd07781c86481d
parent8d3f1743103daafab20b6c7b34c1690ecc5af837
parent154c7d0759b6885034bffa7a34d464d703fc8bb3
Merge branch 'maint'

* maint:
  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
Documentation/git-remote.txt
Documentation/user-manual.txt