X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fgit-branch.txt;h=60fa684b1d99d798d8db4a1b0e89cd878f48c21a;hb=28bf4ba014c9b41679f41580fa9e1cc294b240d9;hp=6b6c3da2d95ad2d5d94949034d5dd723f48d977a;hpb=0476228de500049804ae599f557658c3f9042ad0;p=git.git

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 6b6c3da2d..60fa684b1 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -63,7 +63,9 @@ way to clean up all obsolete remote-tracking branches.
 OPTIONS
 -------
 -d::
-	Delete a branch. The branch must be fully merged in HEAD.
+	Delete a branch. The branch must be fully merged in its
+	upstream branch, or in `HEAD` if no upstream was set with
+	`--track` or `--set-upstream`.
 
 -D::
 	Delete a branch irrespective of its merged status.
@@ -72,6 +74,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::