| commit | e40b34b1ec2c91aaed5572116cd8d01afff7851f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:28:31 +0000 (21 23:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Aug 2010 06:28:31 +0000 (21 23:28 -0700) | ||
| tree | fe592011faace9f63915472f2ab791ca0428d74a | treesnapshot (tar.gz zip) |
| parent | 613e4e5f4046ee36f40199cbaeb9f35442d24378 | commitdiff |
| parent | 5adba90d941cdce2aa32ff5b6f562daebef8c2e4 | commitdiff |
Merge branch 'mm/shortopt-detached'
* mm/shortopt-detached:
log: parse separate option for --glob
log: parse separate options like git log --grep foo
diff: parse separate options --stat-width n, --stat-name-width n
diff: split off a function for --stat-* option parsing
diff: parse separate options like -S foo
Conflicts:
revision.c
* mm/shortopt-detached:
log: parse separate option for --glob
log: parse separate options like git log --grep foo
diff: parse separate options --stat-width n, --stat-name-width n
diff: split off a function for --stat-* option parsing
diff: parse separate options like -S foo
Conflicts:
revision.c
| diff.c | diff1 | diff2 | blobhistory |
| diff.h | diff1 | diff2 | blobhistory |
| revision.c | diff1 | diff2 | blobhistory |
| t/t4202-log.sh | diff1 | diff2 | blobhistory |