From: Junio C Hamano <junkio@cox.net>
Date: Mon, 7 May 2007 21:46:48 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc3~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=679c7c56ed9f73db5892fe17ef9b67b84b0ca242;p=git.git

Merge branch 'maint'

* maint:
  Documentation: don't reference non-existent 'git-cvsapplycommit'
  user-manual: stop deprecating the manual
  user-manual: miscellaneous editing
  user-manual: fix .gitconfig editing examples
  user-manual: clean up fast-forward and dangling-objects sections
  user-manual: add section ID's
  user-manual: more discussion of detached heads, fix typos
  git-gui: Allow spaces in path to 'wish'
  gitk: Allow user to choose whether to see the diff, old file, or new file
---

679c7c56ed9f73db5892fe17ef9b67b84b0ca242