summaryrefslogtreecommitdiff
path: root/builtin-update-ref.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-07-03 02:59:32 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-07 13:32:31 -0700
commitae3e5e1ef2271524882d6bb7c0469f777a255315 (patch)
tree684caf4de6913641229546ac788d8b207908fab9 /builtin-update-ref.c
parentsend-email: format 2822 datestring ourselves. (diff)
downloadtgif-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 'builtin-update-ref.c')
0 files changed, 0 insertions, 0 deletions