mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: use "git foo" not "git-foo"

Browse Source 
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>
This commit is contained in:
Michael Forney
2017-08-04 23:49:05 -07:00
committed by Junio C Hamano
parent 4384e3cde2
commit 974ce8078c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-merge-one-file.sh
View File

@ -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