diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 17:33:29 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 17:33:30 (GMT) |
commit | 785514bb5544fbe2604ea657530134671f82e4b1 (patch) | |
tree | 9d532ce1491690315135d93f0a830e98d61c50c9 | |
parent | 683b4d828c145594d5ef8dfbefb847dbe23c2c14 (diff) | |
parent | 91e70e00ac3e72eb81e10273b48d884553e7d01d (diff) | |
download | git-785514bb5544fbe2604ea657530134671f82e4b1.zip git-785514bb5544fbe2604ea657530134671f82e4b1.tar.gz git-785514bb5544fbe2604ea657530134671f82e4b1.tar.bz2 |
Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
* mm/discourage-commit-a-to-finish-conflict-resolution:
merge, pull: stop advising 'commit -a' in case of conflict
-rw-r--r-- | advice.c | 3 | ||||
-rwxr-xr-x | git-pull.sh | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -86,8 +86,7 @@ int error_resolve_conflict(const char *me) * other commands doing a merge do. */ advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n" - "as appropriate to mark resolution and make a commit, or use\n" - "'git commit -a'.")); + "as appropriate to mark resolution and make a commit.")); return -1; } diff --git a/git-pull.sh b/git-pull.sh index 18a394f..4d4fc77 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -20,7 +20,7 @@ die_conflict () { if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then die "$(gettext "Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>' -as appropriate to mark resolution, or use 'git commit -a'.")" +as appropriate to mark resolution and make a commit.")" else die "$(gettext "Pull is not possible because you have unmerged files.")" fi |