summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-04-15 19:09:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-16 07:13:38 (GMT)
commitba1d45051e050cbcf68ccccacea86a4b6ecde731 (patch)
tree1c2d22f50d2dd5a78f8626d5ec5f19f5e8cc651f /git-merge-ours.sh
parent5b84f4d87a1bd58c7540e9ea82ee3673ecddbad5 (diff)
downloadgit-ba1d45051e050cbcf68ccccacea86a4b6ecde731.zip
git-ba1d45051e050cbcf68ccccacea86a4b6ecde731.tar.gz
git-ba1d45051e050cbcf68ccccacea86a4b6ecde731.tar.bz2
Tentative built-in "git show"
This uses the "--no-walk" flag that I never actually implemented (but I'm sure I mentioned it) to make "git show" be essentially the same thing as "git whatchanged --no-walk". It just refuses to add more interesting parents to the revision walking history, so you don't actually get any history, you just get the commit you asked for. I was going to add "--no-walk" as a real argument flag to git-rev-list too, but I'm not sure anybody actually needs it. Although it might be useful for porcelain, so I left the door open. [jc: ported to the unified option structure by Linus] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions