![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 16 Apr 2006 09:31:11 +0000 (02:31 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 16 Apr 2006 09:31:11 +0000 (02:31 -0700) | ||
| commit | b2934926dd7455de61577c1dfdf4c12d224e7ae0 | |
| tree | 88e571dc7678ab392fe9c3bc6f3b986011ad257e | tree | snapshot |
| parent | ba1d45051e050cbcf68ccccacea86a4b6ecde731 | commit | diff |
| parent | 402461aab17292b78bd36a17bff18e48d544cc9a | commit | 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.
* 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 |