From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Aug 2010 06:28:31 +0000 (-0700)
Subject: Merge branch 'mm/shortopt-detached'
X-Git-Tag: v1.7.3-rc0~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e40b34b1ec2c91aaed5572116cd8d01afff7851f?hp=e40b34b1ec2c91aaed5572116cd8d01afff7851f

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
---