projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6bdca89) | patch
git log -p --merge [[--] paths...]
authorJunio C Hamano <junkio@cox.net>
Mon, 3 Jul 2006 09:59:32 +0000 (02:59 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Jul 2006 20:32:31 +0000 (13:32 -0700)
commitae3e5e1ef2271524882d6bb7c0469f777a255315
tree684caf4de6913641229546ac788d8b207908fab9tree | snapshot
parent6bdca8905764affcab0c92a60a6a319080d76652commit | 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>
revision.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.