summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-18 22:21:06 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-18 22:21:06 -0700
commit3635a187704ed30b32eb11f5098496e5e435a19d (patch)
tree90fbf761702cc522b5efd2fe69d02b4c797783e9 /git-merge-ours.sh
parentMake git-send-email aware of Cc: lines. (diff)
parentUse run_command within send-pack (diff)
downloadtgif-3635a187704ed30b32eb11f5098496e5e435a19d.tar.xz
Merge branch 'sp/run-command'
* sp/run-command: Use run_command within send-pack Use run_command within receive-pack to invoke index-pack Use run_command within merge-index Use run_command for proxy connections Use RUN_GIT_CMD to run push backends Correct new compiler warnings in builtin-revert Replace fork_with_pipe in bundle with run_command Teach run-command to redirect stdout to /dev/null Teach run-command about stdout redirection
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions