diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-03 02:59:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-07 13:32:31 -0700 |
| commit | ae3e5e1ef2271524882d6bb7c0469f777a255315 (patch) | |
| tree | 684caf4de6913641229546ac788d8b207908fab9 /Documentation/git-repo-config.txt | |
| parent | send-email: format 2822 datestring ourselves. (diff) | |
| download | tgif-ae3e5e1ef2271524882d6bb7c0469f777a255315.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-repo-config.txt')
0 files changed, 0 insertions, 0 deletions