diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-04-18 00:01:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-04-18 00:01:03 +0000 |
| commit | d965706c16463c13fa1d7871b06e94934b65ef1c (patch) | |
| tree | 31d9505c6aa294664cf1f39045f2dd95e012e80e /git-branch.txt | |
| parent | b04bb3fbb5c8461cde3fdfe283963c01fc97b518 (diff) | |
| download | git-htmldocs-d965706c16463c13fa1d7871b06e94934b65ef1c.tar.gz | |
Autogenerated HTML docs for v1.7.1-rc1-21-gf3bd6
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-branch.txt b/git-branch.txt index d78f4c739..194025693 100644 --- a/git-branch.txt +++ b/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. |