git/builtin
Junio C Hamano 02ef0ed710 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
2010-09-29 13:48:20 -07:00
..
2010-08-22 20:18:37 -07:00
2010-06-21 06:02:47 -07:00
2010-06-27 12:07:55 -07:00
2010-09-27 10:54:17 -07:00
2010-08-31 16:23:31 -07:00
2010-08-31 16:23:31 -07:00
2010-08-31 16:23:31 -07:00
2010-09-29 13:48:20 -07:00
2010-08-12 18:07:09 -07:00
2010-09-03 09:43:41 -07:00
2010-06-12 09:39:06 -07:00
2010-07-07 11:18:26 -07:00
2010-03-15 00:58:24 -07:00