summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2017-08-04 23:49:05 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-07 12:04:45 -0700
commit974ce8078c9a91190d798eaa65c9f173dd50c3f8 (patch)
tree3ddccb020fb3ba10fbf1e55b1ebc9f2f6ff1b4bd /git-merge-one-file.sh
parent4384e3cde2ce8ecd194202e171ae16333d241326 (diff)
downloadgit-974ce8078c9a91190d798eaa65c9f173dd50c3f8.tar.gz
scripts: use "git foo" not "git-foo"mf/no-dashed-subcommands
We want to make sure that people who copy & paste code would see fewer instances of "git-foo". The use of these dashed forms have been discouraged since v1.6.0 days. Signed-off-by: Michael Forney <mforney@mforney.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 424b034e34..9879c59395 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in
;;
esac
- src1=$(git-unpack-file $2)
- src2=$(git-unpack-file $3)
+ src1=$(git unpack-file $2)
+ src2=$(git unpack-file $3)
case "$1" in
'')
echo "Added $4 in both, but differently."
- orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+ orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
;;
*)
echo "Auto-merging $4"
- orig=$(git-unpack-file $1)
+ orig=$(git unpack-file $1)
;;
esac