Merge branch 'mm/shortopt-detached'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:28:31 +0000 (23:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:28:31 +0000 (23:28 -0700)
* 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

No differences found