git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/3] pull: prefer invoking "git <command>" over "git-<command>"
Date: Sun, 14 Apr 2013 02:45:27 +0530	[thread overview]
Message-ID: <1365887729-9630-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1365887729-9630-1-git-send-email-artagnon@gmail.com>

14e5d40c (pull: Fix parsing of -X<option>, 2010-01-17) added the lines
containing "git-push" and "git-merge", even though the prevelant style
at the time was to use the unhyphenated "git <command>" form.  Fix
this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 git-pull.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-pull.sh b/git-pull.sh
index 638aabb..5fe69fa 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -285,11 +285,11 @@ fi
 merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 case "$rebase" in
 true)
-	eval="git-rebase $diffstat $strategy_args $merge_args $verbosity"
+	eval="git rebase $diffstat $strategy_args $merge_args $verbosity"
 	eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
 	;;
 *)
-	eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
+	eval="git merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
 	eval="$eval  $log_arg $strategy_args $merge_args $verbosity $progress"
 	eval="$eval \"\$merge_name\" HEAD $merge_head"
 	;;
-- 
1.8.2.1.392.g6943ea6

  reply	other threads:[~2013-04-13 21:16 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-13 21:15 [PATCH v2 0/3] Introduce pull.autostash Ramkumar Ramachandra
2013-04-13 21:15 ` Ramkumar Ramachandra [this message]
2013-04-14  9:09   ` [PATCH 1/3] pull: prefer invoking "git <command>" over "git-<command>" Philip Oakley
2013-04-13 21:15 ` [PATCH 2/3] t5521 (pull-options): use test_commit() where appropriate Ramkumar Ramachandra
2013-04-13 21:15 ` [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash Ramkumar Ramachandra
2013-04-15  5:47   ` Junio C Hamano
2013-04-15 12:31     ` Ramkumar Ramachandra
2013-04-15 15:16       ` Junio C Hamano
2013-04-15 16:31         ` Ramkumar Ramachandra
2013-04-15  8:17   ` Matthieu Moy
2013-04-15  9:52     ` Junio C Hamano
2013-04-15 10:58       ` Matthieu Moy
2013-04-15 13:29         ` Ramkumar Ramachandra
2013-04-15 13:45           ` Matthieu Moy
2013-04-15 14:31             ` Ramkumar Ramachandra
2013-04-15 16:17               ` Matthieu Moy
2013-04-15 16:52                 ` Ramkumar Ramachandra
2013-04-16  3:09         ` Jonathan Nieder
2013-04-15 13:15     ` Ramkumar Ramachandra
2013-04-15 13:40       ` Matthieu Moy
2013-04-15 13:56         ` Ramkumar Ramachandra
2013-04-15 15:04           ` Ramkumar Ramachandra
2013-04-15 16:13           ` Matthieu Moy
2013-04-15 16:32             ` Junio C Hamano
2013-04-15 16:45             ` Ramkumar Ramachandra
2013-04-15 16:53               ` John Keeping
2013-04-15 17:05                 ` Ramkumar Ramachandra
2013-04-16  3:14               ` Jonathan Nieder
2013-04-16  4:55                 ` Ramkumar Ramachandra
2013-04-16  5:26                   ` Jonathan Nieder
2013-04-15 15:36         ` Junio C Hamano
2013-04-15 16:38           ` Ramkumar Ramachandra
2013-04-15 17:58             ` Junio C Hamano
2013-04-15 18:08               ` Ramkumar Ramachandra
2013-04-15 18:15                 ` John Keeping
2013-04-15 22:17                 ` Matthieu Moy
2013-04-16  9:20                   ` Ramkumar Ramachandra
2013-04-16  9:44                     ` Matthieu Moy
2013-04-16  9:55                       ` Ramkumar Ramachandra
2013-04-16 10:36                         ` Matthieu Moy
2013-04-16 11:22                           ` Matthieu Moy
2013-04-16 17:42                       ` Junio C Hamano
2013-04-16 16:50                     ` Phil Hord
2013-04-16 20:53                       ` Ramkumar Ramachandra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365887729-9630-2-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).