summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-18 13:56:36 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-18 13:56:36 -0700
commit34e98ea56414adc5a582e6368e8ec9c109dbee48 (patch)
tree7081c2475ea0c9df65dcc9933c32a51ae174c352 /git-merge.sh
parentGIT 1.3.0 (diff)
parentFix "git log --stat": make sure to set recursive with --stat. (diff)
downloadtgif-34e98ea56414adc5a582e6368e8ec9c109dbee48.tar.xz
Merge branch 'lt/logopt'
* lt/logopt: Fix "git log --stat": make sure to set recursive with --stat. combine-diff: show diffstat with the first parent. git.c: LOGSIZE is unused after log printing cleanup. Log message printout cleanups (#3): fix --pretty=oneline Log message printout cleanups (#2) Log message printout cleanups rev-list --header: output format fix Fixes for option parsing log/whatchanged/show - log formatting cleanup. Simplify common default options setup for built-in log family. Tentative built-in "git show" Built-in git-whatchanged. rev-list option parser fix. Split init_revisions() out of setup_revisions() Fix up rev-list option parsing. Fix up default abbrev in setup_revisions() argument parser. Common option parsing for "git log --diff" and friends
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions