summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-01-09 11:11:47 -0500
committerJunio C Hamano <junkio@cox.net>2007-01-09 14:08:41 -0800
commitd93b7d1c30c9716953392ec6590686301de0cc25 (patch)
treeef4c4fc39ad91d0a50d5fa86c8ba31ec4b694434 /git-merge-octopus.sh
parent2740b2b8539a322bc73f46c45c569503900c5dc1 (diff)
downloadgit-d93b7d1c30c9716953392ec6590686301de0cc25.tar.gz
get_tree_entry: map blank requested entry to tree root
This means that git show HEAD: will now return HEAD^{tree}, which is logically consistent with git show HEAD:Documentation Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions