aboutsummaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-23 00:51:53 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-24 16:12:15 -0800
commitae1dffcb28ee89a23f8d2747be65e17c8eab1690 (patch)
tree669b709d9699b1da49dbeb69813c33b44707c56f /git-merge-resolve.sh
parent27dca07fb77f6f5851e3a8de54f86c803358caa4 (diff)
downloadgit-ae1dffcb28ee89a23f8d2747be65e17c8eab1690.tar.gz
git-ae1dffcb28ee89a23f8d2747be65e17c8eab1690.tar.xz
ls-remote and clone: accept --upload-pack=<path> as well.
This makes them consistent with other commands that take the path to the upload-pack program. We also pass --upload-pack instead of --exec to the underlying fetch-pack, although it is not strictly necessary. [jc: original motivation from Uwe] Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions