diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-08-02 15:42:44 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-12 18:06:07 -0700 |
| commit | 452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e (patch) | |
| tree | 32c051aaff0dc6dcaac0a68c8610fa5938eef4e3 /git-merge-resolve.sh | |
| parent | Standardize do { ... } while (0) style (diff) | |
| download | tgif-452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e.tar.xz | |
push: mention "git pull" in error message for non-fast forwards
The message remains fuzzy to include "git pull", "git pull --rebase" and
others, but directs the user to the simplest solution in the vast
majority of cases.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions