Merge branch 'maint'

* maint:
  Prepare for 1.6.3.2
  fix cat-file usage message and documentation
  fetch: report ref storage DF errors more accurately
  lock_ref: inform callers of unavailable ref
  merge-options.txt: Clarify merge --squash

Conflicts:
	RelNotes

diff --cc builtin-fetch.c
index 77acabfcc71aaee02ea99d2cd10e51dd0feaea6e,1f7a3f1ce66434a84ff96ef352245862fe088a70..1eec64e9c4f624f035dc8c155316964c3b87470f
--- 1/builtin-fetch.c
--- 2/builtin-fetch.c
+++ b/builtin-fetch.c
@@@ -384,9 -381,8 +389,9 @@@ static int store_updated_refs(const cha
                                fprintf(stderr, " %s\n", note);
                }
        }
 +      free(url);
        fclose(fp);
-       if (rc & 2)
+       if (rc & STORE_REF_ERROR_DF_CONFLICT)
                error("some local refs could not be updated; try running\n"
                      " 'git remote prune %s' to remove any old, conflicting "
                      "branches", remote_name);

diff --cc refs.c
Simple merge