]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 02ef0ed)
Merge branch 'rr/fmt-merge-msg'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:48:20 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:48:20 +0000 (13:48 -0700)
* rr/fmt-merge-msg:
  t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
  t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
  merge: Make 'merge.log' an integer or boolean option
  merge: Make '--log' an integer option for number of shortlog entries
  fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len

Conflicts:
builtin/merge.c


No differences found
local clone of git.git