summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Jakub Narebski <jnareb@gmail.com>2006-08-08 18:39:06 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-08-08 17:19:18 -0700
commit424adc50b73f269ac3f3bd0195f9e7fea935109f (patch)
tree7283dcac63e2da941294e0a11513f252c3917228 /git-merge-ours.sh
parentautoconf: Improvements in NO_PYTHON/PYTHON_PATH handling (diff)
downloadtgif-424adc50b73f269ac3f3bd0195f9e7fea935109f.tar.xz
autoconf: Move variables which we always set to config.mak.in
Move detected NO_STH and NEED_STH variables, which we always output, either setting or unsetting (setting to empty string) to config.mak.in and use setting appropriately named variables and doing AC_SUBST instead of adding them via GIT_CONF_APPEND_LINE macro and config.mak.append temporary file. Variables which might and might not be set are still added via config.mak.append; this include all STH_PATH variables. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions