Code

Merge branch 'mg/rev-list-n-parents'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Mar 2011 03:13:17 +0000 (20:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Mar 2011 03:13:17 +0000 (20:13 -0700)
* mg/rev-list-n-parents:
  tests: avoid nonportable {foo,bar} glob
  rev-list --min-parents,--max-parents: doc, test and completion
  revision.c: introduce --min-parents and --max-parents options
  t6009: use test_commit() from test-lib.sh

1  2 
Documentation/git-rev-list.txt
Documentation/rev-list-options.txt
builtin/log.c
contrib/completion/git-completion.bash
revision.c
revision.h

Simple merge
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge