Skip to content

Commit

Permalink
Merge branch 'jk/pull-to-integrate'
Browse files Browse the repository at this point in the history 
* jk/pull-to-integrate:
  pull: change the description to "integrate" changes
  push: avoid suggesting "merging" remote changes
  • Loading branch information
Junio C Hamano committed Jul 12, 2013
2 parents e70aee5 + 153d726 commit 5b307e9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-pull.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git-pull(1)

NAME
----
git-pull - Fetch from and merge with another repository or a local branch
git-pull - Fetch from and integrate with another repository or a local branch


SYNOPSIS
Expand Down
12 changes: 6 additions & 6 deletions builtin/push.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ static void setup_default_push_refspecs(struct remote *remote)

static const char message_advice_pull_before_push[] =
N_("Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
"before pushing again.\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details.");

static const char message_advice_use_upstream[] =
Expand All @@ -242,15 +242,15 @@ static const char message_advice_use_upstream[] =

static const char message_advice_checkout_pull_push[] =
N_("Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and merge the remote changes\n"
"(e.g. 'git pull') before pushing again.\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details.");

static const char message_advice_ref_fetch_first[] =
N_("Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"to the same ref. You may want to first merge the remote changes (e.g.,\n"
"'git pull') before pushing again.\n"
"to the same ref. You may want to first integrate the remote changes\n"
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details.");

static const char message_advice_ref_already_exists[] =
Expand Down
2 changes: 1 addition & 1 deletion git-pull.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Fetch one or more remote refs and merge it/them into the current HEAD.

USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup
Expand Down

0 comments on commit 5b307e9

Please sign in to comment.