| commit | fc6c4e96f13fe595fc8991d91c56f2abbe67dc89 | |
| author | John Keeping <john@keeping.me.uk> | |
| Sun, 7 Jul 2013 19:02:14 +0000 (7 20:02 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Jul 2013 20:35:48 +0000 (7 13:35 -0700) | ||
| tree | 35324c89ea043431493773766d53f95877c8d204 | treesnapshot (tar.gz zip) |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 | commitdiff |
push: avoid suggesting "merging" remote changes
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/push.c | diffblobblamehistory |