diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:06 -0700 |
| commit | 5b307e95e880b95eafd36e93251c6638c222dcf4 (patch) | |
| tree | 0d511facc0fe5969d5b923dde557349997be5a19 /builtin | |
| parent | e70aee5c86c508af4a92bd02b688b4aa39c58180 (diff) | |
| parent | 153d7265ef1277c1c9971780ad035a530e305f78 (diff) | |
| download | git-5b307e95e880b95eafd36e93251c6638c222dcf4.tar.gz git-5b307e95e880b95eafd36e93251c6638c222dcf4.tar.xz | |
Merge branch 'jk/pull-to-integrate'
* jk/pull-to-integrate:
pull: change the description to "integrate" changes
push: avoid suggesting "merging" remote changes
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/push.c b/builtin/push.c index a2580a94f..6d36c2426 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -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[] = @@ -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[] = |