Files
git/diff.c
Junio C Hamano 35ceb9826e Merge branch 'mm/shortopt-detached' into next
* 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
2010-08-12 18:36:21 -07:00

114 KiB