summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorUwe Kleine-König <ukleinek@informatik.uni-freiburg.de>2007-01-23 08:20:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-25 00:12:15 (GMT)
commit27dca07fb77f6f5851e3a8de54f86c803358caa4 (patch)
treeb278026c048e04a4a5f179de1b6444962b5020be /git-merge-resolve.sh
parent497171e765b7b4f903d21379bee050380e539cf3 (diff)
downloadgit-27dca07fb77f6f5851e3a8de54f86c803358caa4.zip
git-27dca07fb77f6f5851e3a8de54f86c803358caa4.tar.gz
git-27dca07fb77f6f5851e3a8de54f86c803358caa4.tar.bz2
rename --exec to --upload-pack for fetch-pack and peek-remote
Just some option name disambiguation. This is the counter part to commit d23842fd which made a similar change for push and send-pack. --exec continues to work. Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions