Re: [PATCH 08/13] Improve section "Manipulating branches"
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 25, 2013, 03:25 UTC
- Message-ID
- <xmqqioyumoxr.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1973484790.1091060.1377329493472.JavaMail.ngmail@webmail08.arcor-online.net>
Thomas Ackermann <th.acker@arcor.de> writes:
Show 9 quoted lines
> Add some missing punctuation. > Simplify description of "git branch -d/-D". > ... > `git branch -d <branch>`:: > - delete the branch `<branch>`; if the branch you are deleting > - points to a commit which is not reachable from the current > - branch, this command will fail with a warning. > + delete the branch `<branch>`; if the branch is not fully > + merged in its upstream branch, this command will fail with a warning.
But is this correct? I somehow thought that we check with the current or the upstream.
Show 7 quoted lines
> `git branch -D <branch>`:: > - even if the branch points to a commit not reachable > - from the current branch, you may know that that commit > - is still reachable from some other branch or tag. In that > - case it is safe to use this command to force Git to delete > - the branch. > + delete the branch `<branch>` irrespective of its merged status.
This is an OK change.