| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Mar 2011 03:13:17 +0000 (20:13 -0700) | ||
| committer | Junio 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
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 | patch | | diff1 | | diff2 | | blob | history |
| Documentation/rev-list-options.txt | patch | | diff1 | | diff2 | | blob | history |
| builtin/log.c | patch | | diff1 | | diff2 | | blob | history |
| contrib/completion/git-completion.bash | patch | | diff1 | | diff2 | | blob | history |
| revision.c | patch | | diff1 | | diff2 | | blob | history |
| revision.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-rev-list.txt
Simple merge
diff --cc Documentation/rev-list-options.txt
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc contrib/completion/git-completion.bash
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge