Merge branch 'ob/typofixes'

* ob/typofixes:
typofix: in-code comments
typofix: documentation
typofix: release notes

diff --combined diff.c
index 4629de2092ee7eca1b6aadc892396acc8af46d48,76c6d8df5a720fbc941896464be36b9bec4e6074..266112ca6104450497fb9be504c2404cced595f0
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -1683,7 -1683,9 +1683,7 @@@ static void show_stats(struct diffstat_
                del = deleted;
  
                if (graph_width <= max_change) {
 -                      int total = add + del;
 -
 -                      total = scale_linear(add + del, graph_width, max_change);
 +                      int total = scale_linear(add + del, graph_width, max_change);
                        if (total < 2 && add && del)
                                /* width >= 2 due to the sanity check */
                                total = 2;
@@@ -4464,7 -4466,7 +4464,7 @@@ void diff_flush(struct diff_options *op
            DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
                /*
                 * run diff_flush_patch for the exit status. setting
-                * options->file to /dev/null should be safe, becaue we
+                * options->file to /dev/null should be safe, because we
                 * aren't supposed to produce any output anyway.
                 */
                if (options->close_file)

diff --combined sha1_name.c
index 0cf0c28a6fb737ccdb2b93c9b7d01570ec018f37,6f7d4d13d7393968b7c82a7fc51505296b5b67d3..1d210e32012ab96f03590fa0be1bd64c1e2b7605
--- 1/sha1_name.c
--- 2/sha1_name.c
+++ b/sha1_name.c
@@@ -52,7 -52,7 +52,7 @@@ static void update_candidates(struct di
        }
  
        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;
@@@ -452,15 -452,13 +452,15 @@@ static int get_sha1_basic(const char *s
        int at, reflog_len, nth_prior = 0;
  
        if (len == 40 && !get_sha1_hex(str, sha1)) {
 -              refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
 -              if (refs_found > 0 && warn_ambiguous_refs) {
 -                      warning(warn_msg, len, str);
 -                      if (advice_object_name_warning)
 -                              fprintf(stderr, "%s\n", _(object_name_msg));
 +              if (warn_on_object_refname_ambiguity) {
 +                      refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
 +                      if (refs_found > 0 && warn_ambiguous_refs) {
 +                              warning(warn_msg, len, str);
 +                              if (advice_object_name_warning)
 +                                      fprintf(stderr, "%s\n", _(object_name_msg));
 +                      }
 +                      free(real_ref);
                }
 -              free(real_ref);
                return 0;
        }