summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2010-11-08 17:58:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-15 17:57:37 (GMT)
commite21adb8c100cd2859cff1d74f7d0e622ac640085 (patch)
tree0dc6a3b9858d1c472ad153430950b0c638b2cc3e /git-merge-one-file.sh
parentfd03881a48fc31197ab3343ac2f02ed0cdbbbaaf (diff)
downloadgit-e21adb8c100cd2859cff1d74f7d0e622ac640085.zip
git-e21adb8c100cd2859cff1d74f7d0e622ac640085.tar.gz
git-e21adb8c100cd2859cff1d74f7d0e622ac640085.tar.bz2
add description parameter to OPT__DRY_RUN
Allows better help text to be defined than "dry run". Also make use of the macro in places that already had a different description. No object code changes intended. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions