![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 13 Apr 2007 04:04:27 +0000 (21:04 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 13 Apr 2007 04:04:27 +0000 (21:04 -0700) |
* jc/cherry:
Documentation: --cherry-pick
git-log --cherry-pick A...B
Refactor patch-id filtering out of git-cherry and git-format-patch.
Add %m to '--pretty=format:'
Documentation: --cherry-pick
git-log --cherry-pick A...B
Refactor patch-id filtering out of git-cherry and git-format-patch.
Add %m to '--pretty=format:'
| 1 | 2 | |||
|---|---|---|---|---|
| Makefile | patch | | diff1 | | diff2 | | blob | history |
| builtin-log.c | patch | | diff1 | | diff2 | | blob | history |
| revision.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Makefile
Simple merge
diff --cc builtin-log.c
Simple merge
diff --cc revision.c
Simple merge