summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2005-09-18 11:18:30 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-09-18 14:18:34 -0700
commita8783eeb7988a20664dade2379d380ee1a199a10 (patch)
tree085f8d34eb6dcf178478a6ab6fdf46bf82d52db2 /git-merge-resolve.sh
parent[PATCH] Support alternates and http-alternates in http-fetch (diff)
downloadtgif-a8783eeb7988a20664dade2379d380ee1a199a10.tar.xz
[PATCH] Add "--git-dir" flag to git-rev-parse
Especially when you're deep inside the git repository, it's not all that trivial for scripts to figure out where GIT_DIR is if it isn't set. So add a flag to git-rev-parse to show where it is, since it will have figured it out anyway. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions