Merge branch 'maint'

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 603f87f3b59358697da821ffe240be9caff43fa7..8dc5171f5e685ab18d466751710f44e8aba104b7 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -136,7 +136,7 @@ $ git branch -D test               <2>
 +
 <1> delete remote-tracking branches "todo", "html", "man"
 <2> delete "test" branch even if the "master" branch does not have all
-commits from todo branch.
+commits from test branch.
 
 
 Notes