diff options
| author | Michael Forney <mforney@mforney.org> | 2017-08-05 06:49:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-07 19:04:45 (GMT) |
| commit | 974ce8078c9a91190d798eaa65c9f173dd50c3f8 (patch) | |
| tree | 3ddccb020fb3ba10fbf1e55b1ebc9f2f6ff1b4bd /git-merge-resolve.sh | |
| parent | 4384e3cde2ce8ecd194202e171ae16333d241326 (diff) | |
| download | git-974ce8078c9a91190d798eaa65c9f173dd50c3f8.zip git-974ce8078c9a91190d798eaa65c9f173dd50c3f8.tar.gz git-974ce8078c9a91190d798eaa65c9f173dd50c3f8.tar.bz2 | |
scripts: use "git foo" not "git-foo"
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-resolve.sh')
| -rwxr-xr-x | git-merge-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index c9da747..343fe7b 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -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 |