summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Sean <seanlkml@sympatico.ca>2006-05-22 00:39:52 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-22 18:20:46 -0700
commit1100ac81a90b03e0c037a286569a340decf7489b (patch)
tree1b0e7fd218c20f72ba6d1727ca009d005cf13d0c /git-merge-ours.sh
parentcvsimport: replace anonymous sub ref with a normal sub (diff)
downloadtgif-1100ac81a90b03e0c037a286569a340decf7489b.tar.xz
Change GIT-VERSION-GEN to call git commands with "git" not "git-".
GIT-VERSION-GEN can incorrectly return a default version of "v1.3.GIT" because it tries to execute git commands using the "git-cmd" format that expects all git commands to be in the $PATH. Convert these to "git cmd" format so that a proper answer is returned even when the git commands have been moved out of the $PATH and into a $gitexecdir. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions