Merge branch 'ye/http-accept-language'
[gitweb.git] / advice.c
index 9b420331926c6bf1aa371f973d6a96886f419b06..575bec20b35a31e653e49125386f3dcee880c217 100644 (file)
--- 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;
 }
 
@@ -106,7 +105,7 @@ void detach_advice(const char *new_name)
        "state without impacting any branches by performing another checkout.\n\n"
        "If you want to create a new branch to retain commits you create, you may\n"
        "do so (now or later) by using -b with the checkout command again. Example:\n\n"
-       "  git checkout -b new_branch_name\n\n";
+       "  git checkout -b <new-branch-name>\n\n";
 
        fprintf(stderr, fmt, new_name);
 }