Merge branch 'jc/push-2.0-default-to-simple' (early part)

diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.txt
index f3412ced33479f46bf314a9d3d96fb0e6cc3f000..cf3f455ced07b2d84c9acb4e13313aec864a3b67 100644 (file)
--- a/Documentation/RelNotes/1.7.5.4.txt
+++ b/Documentation/RelNotes/1.7.5.4.txt
@@ -8,6 +8,9 @@ Fixes since v1.7.5.3
    that it was told to add everthing ('a') when up-arrow was pressed by
    mistake.
 
+ * Setting a git command that uses custom configuration via "-c var=val"
+   as an alias caused a crash due to a realloc(3) failure.
+
  * "git diff -C -C" used to disable the rename detection entirely when
    there are too many copy candidate paths in the tree; now it falls
    back to "-C" when doing so would keep the copy candidate paths