From: Ramkumar Ramachandra artag...@gmail.com
Sent: Saturday, April 13, 2013 10:15 PM
14e5d40c (pull: Fix parsing of -Xoption, 2010-01-17) added the lines
containing git-push and git-merge, even though the prevelant style
s /git-push/git rebase/The fix is to a git-rebase not git-push
invocation.
at the time was to use the unhyphenated git command form. Fix
this.
Signed-off-by: Ramkumar Ramachandra artag...@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
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-
No virus found in this message.
Checked by AVG - www.avg.com
Version: 2013.0.3272 / Virus Database: 3162/6242 - Release Date:
04/13/13
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
