![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 3 Jul 2006 09:59:32 +0000 (02:59 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 7 Jul 2006 20:32:31 +0000 (13:32 -0700) | ||
| commit | ae3e5e1ef2271524882d6bb7c0469f777a255315 | |
| tree | 684caf4de6913641229546ac788d8b207908fab9 | tree | snapshot |
| parent | 6bdca8905764affcab0c92a60a6a319080d76652 | commit | diff |
git log -p --merge [[--] paths...]
This adds Linus's wish, "--merge" flag, which makes the above
expand to a rough equivalent to:
git log -p HEAD MERGE_HEAD ^$(git-merge-base HEAD MERGE_HEAD) \
-- $(git-ls-files -u [paths...] | cut -f2 | uniq)
Signed-off-by: Junio C Hamano <junkio@cox.net>
This adds Linus's wish, "--merge" flag, which makes the above
expand to a rough equivalent to:
git log -p HEAD MERGE_HEAD ^$(git-merge-base HEAD MERGE_HEAD) \
-- $(git-ls-files -u [paths...] | cut -f2 | uniq)
Signed-off-by: Junio C Hamano <junkio@cox.net>
| revision.c | diff | blob | history |