summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2014-08-28 11:46:58 +0200
committerJunio C Hamano <gitster@pobox.com>2014-08-28 10:29:53 -0700
commit91e70e00ac3e72eb81e10273b48d884553e7d01d (patch)
treecbabcaadbcfcd6647936d596eccedda92d95e7e1 /advice.c
parent6c4ab27f2378ce67940b4496365043119d7ffff2 (diff)
downloadgit-91e70e00ac3e72eb81e10273b48d884553e7d01d.tar.gz
merge, pull: stop advising 'commit -a' in case of conflictmm/discourage-commit-a-to-finish-conflict-resolution
'git commit -a' is rarely a good way to mark conflicts as resolved: the user anyway has to go manually through the list of conflicts to do the actual resolution, and it is usually better to use "git add" on each files after doing the resolution. On the other hand, using 'git commit -a' is potentially dangerous, as it makes it very easy to mistakenly commit conflict markers without noticing, and even worse, the user may have started a merge while having local changes that do not overlap with it in the working tree. While we're there, synchronize the 'git pull' and 'git merge' messages: the first was ending with '... and make a commit.', but not the latter. Eventually, git should detect that conflicts have been resolved in the working tree and tailor these messages further. Not only "use git commit -a" could be resurected, but "Fix them up in the work tree" should be dropped when it happens. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index 9b42033192..3b8bf3c6da 100644
--- a/advice.c
+++ b/advice.c
@@ -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;
}