kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Merge branch 'jk/pull-to-integrate' 

* jk/pull-to-integrate:
  pull: change the description to "integrate" changes
  push: avoid suggesting "merging" remote changes
maint
Junio C Hamano 12 years ago
parent
e70aee5c86 153d7265ef
commit
5b307e95e8
3 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Documentation/git-pull.txt
  2. 12
      builtin/push.c
  3. 2
      git-pull.sh

2
Documentation/git-pull.txt
Unescape View File

@ -3,7 +3,7 @@ git-pull(1)


NAME 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 SYNOPSIS

12
builtin/push.c
Unescape View File

@ -230,8 +230,8 @@ static void setup_default_push_refspecs(struct remote *remote)


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


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


static const char message_advice_ref_fetch_first[] = static const char message_advice_ref_fetch_first[] =
N_("Updates were rejected because the remote contains work that you do\n" 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" "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" "to the same ref. You may want to first integrate the remote changes\n"
"'git pull') before pushing again.\n" "(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."); "See the 'Note about fast-forwards' in 'git push --help' for details.");


static const char message_advice_ref_already_exists[] = static const char message_advice_ref_already_exists[] =

2
git-pull.sh
Unescape View File

@ -5,7 +5,7 @@
# Fetch one or more remote refs and merge it/them into the current HEAD. # 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>...' 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 SUBDIRECTORY_OK=Yes
OPTIONS_SPEC= OPTIONS_SPEC=
. git-sh-setup . git-sh-setup

Write Preview
Loading…
Cancel
Save