Merge branch 'jc/combined'
commite893f7ad73d387afc582d7eb063d57a88be4663d
authorJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 08:18:55 +0000 (26 01:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Oct 2006 08:18:55 +0000 (26 01:18 -0700)
tree925a8741e75c176f42e843bd8c30affa9d00da09
parenteb153837d8509fc6ef59b17630429c63c0993b2d
parentd5f6a01af0658bc0ec5f068d81ba321be94526d5
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"
combine-diff.c