Files
git/Documentation
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
..
2009-10-01 08:21:35 -04:00
2010-09-29 10:39:53 -07:00
2010-09-03 09:43:42 -07:00
2010-09-29 13:47:51 -07:00
2009-04-06 00:27:09 -07:00
2010-03-10 15:32:34 -08:00
2010-04-17 12:40:45 -07:00
2010-07-20 16:52:53 -07:00
2010-03-21 17:03:57 -07:00
2010-07-20 16:59:17 -07:00
2010-04-09 21:23:10 -07:00
2010-07-05 11:56:53 -07:00
2008-08-01 23:21:44 -07:00
2010-09-03 09:43:42 -07:00
2010-02-23 12:05:18 -08:00
2010-02-14 18:23:16 -08:00
2010-09-29 10:39:53 -07:00
2010-07-05 13:39:02 -07:00
2010-07-20 16:59:17 -07:00