git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
* [PATCH 0/2] Avoid suggestions to "merge" remote changes
@ 2013-07-07 19:02 John Keeping
  2013-07-07 19:02 ` [PATCH 1/2] push: avoid suggesting "merging" " John Keeping
  2013-07-07 19:02 ` [PATCH 2/2] pull: change the description to "integrate" changes John Keeping
  0 siblings, 2 replies; 5+ messages in thread
From: John Keeping @ 2013-07-07 19:02 UTC (permalink / raw)
  To: git
  Cc: Junio C Hamano, Andreas Krey, John Szakmeister, Philip Oakley,
	John Keeping

As another aspect of the change to make git-pull die when remote changes
do not fast-forward, this series changes the advice messages in git-push to
avoid implying that the user wants to merge remote changes.

I've chosen the word "integrate" because it does not carry any special
meaning in Git (in terms of being a command) and seems to cover the
merge and rebase cases nicely.

John Keeping (2):
  push: avoid suggesting "merging" remote changes
  pull: change the description to "integrate" changes

 Documentation/git-pull.txt |  2 +-
 builtin/push.c             | 12 ++++++------
 git-pull.sh                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

-- 
1.8.3.2.855.gbc9faed

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/2] push: avoid suggesting "merging" remote changes
  2013-07-07 19:02 [PATCH 0/2] Avoid suggestions to "merge" remote changes John Keeping
@ 2013-07-07 19:02 ` John Keeping
  2013-07-08 13:47   ` Matthieu Moy
  2013-07-07 19:02 ` [PATCH 2/2] pull: change the description to "integrate" changes John Keeping
  1 sibling, 1 reply; 5+ messages in thread
From: John Keeping @ 2013-07-07 19:02 UTC (permalink / raw)
  To: git
  Cc: Junio C Hamano, Andreas Krey, John Szakmeister, Philip Oakley,
	John Keeping

With some workflows, it is more suitable to rebase on top of remote
changes when a push does not fast-forward.  Change the advice messages
in git-push to suggest that a user "integrate the remote changes"
instead of "merge the remote changes" to make this slightly clearer.

Also change the suggested 'git pull' to 'git pull ...' to hint to users
that they may want to add other parameters.

Suggested-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: John Keeping <john@keeping.me.uk>
---
 builtin/push.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin/push.c b/builtin/push.c
index 2d84d10..44e53cd 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -211,8 +211,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[] =
@@ -223,15 +223,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[] =
-- 
1.8.3.2.855.gbc9faed

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/2] pull: change the description to "integrate" changes
  2013-07-07 19:02 [PATCH 0/2] Avoid suggestions to "merge" remote changes John Keeping
  2013-07-07 19:02 ` [PATCH 1/2] push: avoid suggesting "merging" " John Keeping
@ 2013-07-07 19:02 ` John Keeping
  1 sibling, 0 replies; 5+ messages in thread
From: John Keeping @ 2013-07-07 19:02 UTC (permalink / raw)
  To: git
  Cc: Junio C Hamano, Andreas Krey, John Szakmeister, Philip Oakley,
	John Keeping

Since git-pull learned the --rebase option it has not just been about
merging changes from a remote repository (where "merge" is in the sense
of "git merge").  Change the description to use "integrate" instead of
"merge" in order to reflect this.

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 Documentation/git-pull.txt | 2 +-
 git-pull.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 24ab07a..6ef8d59 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -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
diff --git a/git-pull.sh b/git-pull.sh
index 6828e2c..ecf0011 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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 into the current HEAD.'
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 . git-sh-setup
-- 
1.8.3.2.855.gbc9faed

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] push: avoid suggesting "merging" remote changes
  2013-07-07 19:02 ` [PATCH 1/2] push: avoid suggesting "merging" " John Keeping
@ 2013-07-08 13:47   ` Matthieu Moy
  2013-07-08 18:47     ` John Keeping
  0 siblings, 1 reply; 5+ messages in thread
From: Matthieu Moy @ 2013-07-08 13:47 UTC (permalink / raw)
  To: John Keeping
  Cc: git, Junio C Hamano, Andreas Krey, John Szakmeister, Philip Oakley

John Keeping <john@keeping.me.uk> writes:

>  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"

To me, "merge" includes "rebase", so I'd say the merge -> integrate
change is not needed, but I have nothing against it either.

The "..." added are a bit weird with the quotes around. Quotes may
suggest that the content is to be taken literally, which is not the case
anymore. Not a real objection anyway, just thinking aloud.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] push: avoid suggesting "merging" remote changes
  2013-07-08 13:47   ` Matthieu Moy
@ 2013-07-08 18:47     ` John Keeping
  0 siblings, 0 replies; 5+ messages in thread
From: John Keeping @ 2013-07-08 18:47 UTC (permalink / raw)
  To: Matthieu Moy
  Cc: git, Junio C Hamano, Andreas Krey, John Szakmeister, Philip Oakley

On Mon, Jul 08, 2013 at 03:47:19PM +0200, Matthieu Moy wrote:
> John Keeping <john@keeping.me.uk> writes:
> 
> >  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"
> 
> To me, "merge" includes "rebase", so I'd say the merge -> integrate
> change is not needed, but I have nothing against it either.

Yes, I agree that in some sense "merge" does include "rebase" but I
suspect some people read it to mean "git merge" and saying "integrate"
removes that potential source of confusion.

> The "..." added are a bit weird with the quotes around. Quotes may
> suggest that the content is to be taken literally, which is not the case
> anymore. Not a real objection anyway, just thinking aloud.

I hadn't thought of it that way, but I wonder how else we can delimit
the command.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-07-08 18:47 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-07 19:02 [PATCH 0/2] Avoid suggestions to "merge" remote changes John Keeping
2013-07-07 19:02 ` [PATCH 1/2] push: avoid suggesting "merging" " John Keeping
2013-07-08 13:47   ` Matthieu Moy
2013-07-08 18:47     ` John Keeping
2013-07-07 19:02 ` [PATCH 2/2] pull: change the description to "integrate" changes John Keeping

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git