diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:31:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:31:59 -0700 |
| commit | 1030536153db404daba4a140d1e3fa1a7ba470a5 (patch) | |
| tree | 7884237494bd5202639c72dc8080f03baab35cb9 /builtin/merge.c | |
| parent | Merge branch 'jk/format-patch-multiline-header' into maint (diff) | |
| parent | log: fix --max-count when used together with -S or -G (diff) | |
| download | tgif-1030536153db404daba4a140d1e3fa1a7ba470a5.tar.xz | |
Merge branch 'mm/maint-log-n-with-diff-filtering' into maint
* mm/maint-log-n-with-diff-filtering:
log: fix --max-count when used together with -S or -G
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions