Merge branch 'master' into next

* master:
  diff.c: work around pointer constness warnings
  docs: clarify "branch -l"

Documentation/git-branch.txt

@@ -72,6 +72,8 @@ OPTIONS
 	Create the branch's reflog.  This activates recording of
 	all changes made to the branch ref, enabling use of date
 	based sha1 expressions such as "<branchname>@\{yesterday}".
+	Note that in non-bare repositories, reflogs are usually
+	enabled by default by the `core.logallrefupdates` config option.
 
 -f::
 --force::

diff.c

@@ -535,9 +535,9 @@ static void emit_rewrite_diff(const char *name_a,
 	if (lc_b)
 		emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
 	if (textconv_one)
-		free(data_one);
+		free((char *)data_one);
 	if (textconv_two)
-		free(data_two);
+		free((char *)data_two);
 }
 
 struct diff_words_buffer {