Merge branch 'jc/maint-log-grep'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Sep 2008 05:30:44 +0000 (22:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Sep 2008 05:30:44 +0000 (22:30 -0700)
* jc/maint-log-grep:
  log --author/--committer: really match only with name part
  diff --cumulative is a sub-option of --dirstat
  bash completion: Hide more plumbing commands

1  2 
contrib/completion/git-completion.bash
diff.c
revision.c

diff --cc diff.c
Simple merge
diff --cc revision.c
Simple merge