summaryrefslogtreecommitdiff
path: root/Documentation/gitweb.conf.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-24 16:17:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-24 16:19:42 -0700
commite4d15959d45468bfb13c80195e3a6b40f5b0a489 (patch)
tree847ff7ecdecbd5b4babe51cc57354a6b2d4f6091 /Documentation/gitweb.conf.txt
parentMerge branch 'sr/log-SG-no-textconv' into maint (diff)
parentdiff: allow unstuck arguments with --diff-algorithm (diff)
downloadtgif-e4d15959d45468bfb13c80195e3a6b40f5b0a489.tar.xz
Merge branch 'jk/diff-algo-finishing-touches' into maint
"git diff --diff-algorithm=algo" was understood by the command line parser, but "git diff --diff-algorithm algo" was not. * jk/diff-algo-finishing-touches: diff: allow unstuck arguments with --diff-algorithm git-merge(1): document diff-algorithm option to merge-recursive
Diffstat (limited to 'Documentation/gitweb.conf.txt')
0 files changed, 0 insertions, 0 deletions