Avoid suggestions to "merge" remote changes
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest2 patches 2 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | push: avoid suggesting "merging" remote changesbuiltin/ | +6 | 2 replies | |
| 2/2 | pull: change the description to "integrate" changesDocumentation/ git-pull.sh | +2 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/2] Avoid suggestions to "merge" remote changes
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(-)
Signature · 1 line
1.8.3.2.855.gbc9faed