author | Junio C Hamano <gitster@pobox.com> | |
Wed, 23 Mar 2011 04:38:50 +0000 (21:38 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 23 Mar 2011 04:38:50 +0000 (21:38 -0700) |
* mg/rev-list-one-side-only:
git-log: put space after commit mark
t6007: test rev-list --cherry
log --cherry: a synonym
rev-list: documentation and test for --cherry-mark
revision.c: introduce --cherry-mark
rev-list/log: factor out revision mark generation
rev-list: --left/right-only are mutually exclusive
rev-list: documentation and test for --left/right-only
t6007: Make sure we test --cherry-pick
revlist.c: introduce --left/right-only for unsymmetric picking
git-log: put space after commit mark
t6007: test rev-list --cherry
log --cherry: a synonym
rev-list: documentation and test for --cherry-mark
revision.c: introduce --cherry-mark
rev-list/log: factor out revision mark generation
rev-list: --left/right-only are mutually exclusive
rev-list: documentation and test for --left/right-only
t6007: Make sure we test --cherry-pick
revlist.c: introduce --left/right-only for unsymmetric picking
1 | 2 | |||
---|---|---|---|---|
Documentation/git-rev-list.txt | patch | | diff1 | | diff2 | | blob | history |
Documentation/rev-list-options.txt | patch | | diff1 | | diff2 | | blob | history |
pretty.c | 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 pretty.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge