line-range-format.txt: clarify -L:regex usage form

diff --git a/sha1_name.c b/sha1_name.c
index 0cf0c28a6fb737ccdb2b93c9b7d01570ec018f37..852dd951dc2d93660727de23ea9467503288e25b 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -52,7 +52,7 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char
        }
 
        if (!ds->candidate_ok) {
-               /* discard the candidate; we know it does not satisify fn */
+               /* discard the candidate; we know it does not satisfy fn */
                hashcpy(ds->candidate, current);
                ds->candidate_checked = 0;
                return;
@@ -445,7 +445,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
        "\n"
        "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
        "examine these refs and maybe delete them. Turn this message off by\n"
-       "running \"git config advice.object_name_warning false\"");
+       "running \"git config advice.objectNameWarning false\"");
        unsigned char tmp_sha1[20];
        char *real_ref = NULL;
        int refs_found = 0;