From: Junio C Hamano <gitster@pobox•com>
To: Thomas Ackermann <th.acker@arcor•de>
Cc: git@vger•kernel.org, martinvonz@gmail•com, jrnieder@gmail•com,
wking@tremily•us, philipoakley@iee•org
Subject: Re: [PATCH 07/11] Improve section "Manipulating branches"
Date: Tue, 27 Aug 2013 12:11:40 -0700 [thread overview]
Message-ID: <xmqqbo4jc5jn.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1088240617.34545.1377626528726.JavaMail.ngmail@webmail19.arcor-online.net> (Thomas Ackermann's message of "Tue, 27 Aug 2013 20:02:08 +0200 (CEST)")
Thomas Ackermann <th.acker@arcor•de> writes:
> `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 or contained in the current branch,
> + this command will fail with a warning.
This is not a new problem, but it fails with an error, not a warning
(which often is a message to caution but operation gets carried out
anyway). For that matter, it might be better to say "stops", as it
is not a failure but is saving the user from losing information (in
other words, that is a different kind of success ;-).
It also stops you from deleting the branch you are currently on. I
wonder if we want to mention that, too?
> `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.
> `git checkout <branch>`::
> make the current branch `<branch>`, updating the working
> - directory to reflect the version referenced by `<branch>`
> + directory to reflect the version referenced by `<branch>`.
> `git checkout -b <new> <start-point>`::
> create a new branch `<new>` referencing `<start-point>`, and
> check it out.
next prev parent reply other threads:[~2013-08-27 19:11 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 17:52 [PATCH v2 0/11] Modernize user-manual Thomas Ackermann
2013-08-27 17:55 ` [PATCH 01/11] Call it "Git User Manual" and remove reference to very old Git version Thomas Ackermann
2013-08-27 19:04 ` Junio C Hamano
2013-08-27 21:16 ` Lars Gullik Bjønnes
2013-08-29 18:12 ` Junio C Hamano
2013-08-27 17:56 ` [PATCH 02/11] Use current "detached HEAD" message Thomas Ackermann
2013-08-29 18:13 ` Junio C Hamano
2013-08-27 17:56 ` [PATCH 03/11] Use current output for "git repack" Thomas Ackermann
2013-08-29 18:13 ` Junio C Hamano
2013-08-27 17:58 ` [PATCH 04/11] Use "git merge" instead of "git pull ." Thomas Ackermann
2013-08-27 19:06 ` Junio C Hamano
2013-08-27 19:44 ` Jonathan Nieder
2013-08-27 20:46 ` Junio C Hamano
2013-08-27 17:59 ` [PATCH 05/11] Fix some typos and improve wording Thomas Ackermann
2013-08-27 19:07 ` Junio C Hamano
2013-08-29 18:16 ` Junio C Hamano
2013-08-27 18:01 ` [PATCH 06/11] Simplify "How to make a commit" Thomas Ackermann
2013-08-27 19:08 ` Junio C Hamano
2013-08-29 18:16 ` Junio C Hamano
2013-08-27 18:02 ` [PATCH 07/11] Improve section "Manipulating branches" Thomas Ackermann
2013-08-27 19:11 ` Junio C Hamano [this message]
2013-08-27 18:03 ` [PATCH 08/11] Improve section "Merging multiple trees" Thomas Ackermann
2013-08-27 19:15 ` Junio C Hamano
2013-08-27 18:04 ` [PATCH 09/11] Remove unnecessary historical note from "Object storage format" Thomas Ackermann
2013-08-27 19:16 ` Junio C Hamano
2013-08-27 18:04 ` [PATCH 10/11] Remove irrelevant reference from "Tying it all together" Thomas Ackermann
2013-08-27 18:05 ` [PATCH 11/11] "git prune" is safe Thomas Ackermann
2013-08-27 19:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbo4jc5jn.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=martinvonz@gmail$(echo .)com \
--cc=philipoakley@iee$(echo .)org \
--cc=th.acker@arcor$(echo .)de \
--cc=wking@tremily$(echo .)us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox