From: Junio C Hamano <junkio@cox.net>
Date: Thu, 26 Oct 2006 08:18:55 +0000 (-0700)
Subject: Merge branch 'jc/combined'
X-Git-Tag: v1.4.4-rc1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e893f7ad73d387afc582d7eb063d57a88be4663d;p=thirdparty%2Fgit.git

Merge branch 'jc/combined'

* jc/combined:
  combine-diff: a few more finishing touches.
  Documentation: clarify refname disambiguation rules.
  diff-format.txt: Combined diff format documentation supplement
  Remove --syslog in git-daemon inetd documentation examples.
  Documentation: updates to "Everyday GIT"
---

e893f7ad73d387afc582d7eb063d57a88be4663d