Ramkumar Ramachandra bda3b8ff17 merge: Make 'merge.log' an integer or boolean option ...

Make 'merge.log' an integer or boolean option to set the number of
shortlog entries to display in the merge commit. Note that it defaults
to false, and that true means a default value of 20. Also update
corresponding documentation.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Thanks-to: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Johannes Sixt <j.sixt@viscovery.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-09-09 11:39:23 -07:00

..

add.c

git add: Add the "--ignore-missing" option for the dry run

2010-07-12 15:13:54 -07:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

…

commit-tree.c

…

commit.c

Merge branch 'jk/maint-status-keep-index-timestamp'

2010-07-15 12:06:55 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

Merge branch 'jc/diff-merge-base-multi'

2010-07-16 15:45:35 -07:00

fast-export.c

…

fetch-pack.c

…

fetch.c

…

fmt-merge-msg.c

merge: Make 'merge.log' an integer or boolean option

2010-09-09 11:39:23 -07:00

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'jn/grep-open'

2010-07-15 12:07:18 -07:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

…

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

merge-tree: fix where two branches share no changes

2010-07-14 12:56:49 -07:00

merge.c

merge: Make 'merge.log' an integer or boolean option

2010-09-09 11:39:23 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

…

read-tree.c

Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix

2010-07-08 18:55:50 -07:00

receive-pack.c

…

reflog.c

…

remote.c

…

replace.c

…

rerere.c

Merge branch 'js/merge-rr-fix'

2010-07-15 12:08:36 -07:00

reset.c

…

rev-list.c

…

rev-parse.c

Merge branch 'maint'

2010-07-07 11:18:26 -07:00

revert.c

…

rm.c

…

send-pack.c

…

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…