diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-17 12:40:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-17 12:40:45 -0700 |
| commit | f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7 (patch) | |
| tree | 91956e5a6a412502376f1d54009c9d23e213074a /Documentation | |
| parent | t6006: do not write to /tmp (diff) | |
| parent | t1010-mktree: Adjust expected result to code and documentation (diff) | |
| download | tgif-f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d78f4c7398..1940256930 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. |