projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2851e8e bd2549c)
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)
commit02ef0ed7102a197e2b746f3e694c09915fa98060
tree3e703ac528c01b7c964a0022185e14071cfb1c40tree | snapshot
parent2851e8eba52e98d3112417952a24d82ae9d8c0ebcommit | diff
parentbd2549ca6b0b2d897e073bbaa34c1fee46acd8f0commit | diff
Merge branch 'rr/fmt-merge-msg'

* 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
Documentation/merge-config.txt diff1 | diff2 | blob | history
builtin.h diff1 | diff2 | blob | history
builtin/fmt-merge-msg.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.