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

2
git-merge-resolve.sh
View File

@ -45,7 +45,7 @@ then
exit 0
else
echo "Simple merge failed, trying Automatic merge."
if git-merge-index -o git-merge-one-file -a
if git merge-index -o git-merge-one-file -a
then
exit 0
else