Sync with 2.5.2

diff --cc Documentation/git.txt
Simple merge

diff --cc builtin/show-branch.c
index c87c46eb387a8093af92864081673be1a36b5999,344ae4ce2a8d95f0aca6f93ef2d714db059e6431..408ce7030731f765228de93066a815bd4db59e30
--- 1/builtin/show-branch.c
--- 2/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@@ -784,12 -784,13 +784,14 @@@ int cmd_show_branch(int ac, const char 
                        else
                                msg++;
                        reflog_msg[i] = xstrfmt("(%s) %s",
 -                                              show_date(timestamp, tz, 1),
 +                                              show_date(timestamp, tz,
 +                                                        DATE_MODE(RELATIVE)),
                                                msg);
                        free(logmsg);
-                       sprintf(nth_desc, "%s@{%d}", *av, base+i);
+ 
+                       nth_desc = xstrfmt("%s@{%d}", *av, base+i);
                        append_ref(nth_desc, &oid, 1);
+                       free(nth_desc);
                }
                free(ref);
        }

diff --cc sha1_file.c
Simple merge

diff --cc unpack-trees.c
Simple merge