projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba1d450 402461a)
Merge branch 'master' into lt/logopt
authorJunio C Hamano <junkio@cox.net>
Sun, 16 Apr 2006 09:31:11 +0000 (02:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 16 Apr 2006 09:31:11 +0000 (02:31 -0700)
commitb2934926dd7455de61577c1dfdf4c12d224e7ae0
tree88e571dc7678ab392fe9c3bc6f3b986011ad257etree | snapshot
parentba1d45051e050cbcf68ccccacea86a4b6ecde731commit | diff
parent402461aab17292b78bd36a17bff18e48d544cc9acommit | diff
Merge branch 'master' into lt/logopt

* master:
  pager: do not fork a pager if PAGER is set to empty.
  diff-options: add --patch-with-stat
  diff-files --stat: do not dump core with unmerged index.
  Support "git cmd --help" syntax
  diff --stat: do not do its own three-dashes.
  diff-tree: typefix.
  GIT v1.3.0-rc4
  xdiff: post-process hunks to make them consistent.
git.c diff1 | diff2 | blob | history
The core git plumbing