From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 26 Aug 2007 20:18:12 +0000 (-0700)
Subject: Merge branch 'master' of git://linux-nfs.org/~bfields/git
X-Git-Tag: v1.5.3-rc7~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=67c10b422c179b9ce2e4537f7c2a1e7d50649cd4;p=git.git

Merge branch 'master' of git://linux-nfs.org/~bfields/git

* 'master' of git://linux-nfs.org/~bfields/git:
  Documentation/user-manual.txt: fix a few omissions of gitlink commands.
  user-manual: fix incorrect header level
  user-manual: use pithier example commit
  user-manual: introduce the word "commit" earlier
  user-manual: minor editing for conciseness
  user-manual: edit "ignoring files" for conciseness
  Documentation/user-manual.txt: fix a few omissions of gitlink commands.
---

67c10b422c179b9ce2e4537f7c2a1e7d50649cd4