Merge branch 'maint'

* maint:
  t1010-mktree: Adjust expected result to code and documentation
  combined diff: correctly handle truncated file
  Document new "already-merged" rule for branch -d

diff --combined Documentation/git-branch.txt
index d78f4c7398be1e7a403fcc34a9587dfee651b72d,60fa684b1d99d798d8db4a1b0e89cd878f48c21a..1940256930d92c0679b95bb0cd41f24847828bd4
--- 1/Documentation/git-branch.txt
--- 2/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -8,7 -8,7 +8,7 @@@ git-branch - List, create, or delete br
  SYNOPSIS
  --------
  [verse]
 -'git branch' [--color | --no-color] [-r | -a]
 +'git branch' [--color[=<when>] | --no-color] [-r | -a]
        [-v [--abbrev=<length> | --no-abbrev]]
        [(--merged | --no-merged | --contains) [<commit>]]
  'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
@@@ -63,7 -63,9 +63,9 @@@ way to clean up all obsolete remote-tra
  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.
@@@ -86,14 -88,12 +88,14 @@@
  -M::
        Move/rename a branch even if the new branch name already exists.
  
 ---color::
 +--color[=<when>]::
        Color branches to highlight current, local, and remote branches.
 +      The value must be always (the default), never, or auto.
  
  --no-color::
        Turn off branch colors, even when the configuration file gives the
        default to color output.
 +      Same as `--color=never`.
  
  -r::
        List or delete (if used with -d) the remote-tracking branches.