| commit | 5fcbec50a57a972268ec20b1ae5d94cdc385e68a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Apr 2010 20:12:27 +0000 (1 13:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Apr 2010 20:12:27 +0000 (1 13:12 -0700) | ||
| tree | c41ee3bed21137b88abebe988e1f803a9a1c06f0 | treesnapshot (tar.gz zip) |
| parent | 16aedc8cc57625c705eb4f7618c792bc42393aad | commitdiff |
| parent | 63e671508782ca2dd386e5878d3682090fd64eda | commitdiff |
Merge branch 'sb/fmt-merge-msg' into next
* sb/fmt-merge-msg:
fmt-merge-msg: hide summary option
fmt-merge-msg: remove custom string_list implementation
string-list: add unsorted_string_list_lookup()
fmt-merge-msg: use pretty.c routines
t6200: test fmt-merge-msg more
t6200: modernize with test_tick
fmt-merge-msg: be quiet if nothing to merge
* sb/fmt-merge-msg:
fmt-merge-msg: hide summary option
fmt-merge-msg: remove custom string_list implementation
string-list: add unsorted_string_list_lookup()
fmt-merge-msg: use pretty.c routines
t6200: test fmt-merge-msg more
t6200: modernize with test_tick
fmt-merge-msg: be quiet if nothing to merge