mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve section "Manipulating branches"

Browse Source 
Add some missing punctuation.
Simplify description of "git branch -d/-D".

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Ackermann
2013-08-27 20:02:08 +02:00
committed by Junio C Hamano
parent d39765b12e
commit df47da758e
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Documentation/user-manual.txt
View File

@ -268,27 +268,23 @@ Creating, deleting, and modifying branches is quick and easy; here's
a summary of the commands: a summary of the commands:
`git branch`:: `git branch`::
list all branches list all branches.
`git branch <branch>`:: `git branch <branch>`::
create a new branch named `<branch>`, referencing the same create a new branch named `<branch>`, referencing the same
point in history as the current branch point in history as the current branch.
`git branch <branch> <start-point>`:: `git branch <branch> <start-point>`::
create a new branch named `<branch>`, referencing create a new branch named `<branch>`, referencing
`<start-point>`, which may be specified any way you like, `<start-point>`, which may be specified any way you like,
including using a branch name or a tag name including using a branch name or a tag name.
`git branch -d <branch>`:: `git branch -d <branch>`::
delete the branch `<branch>`; if the branch you are deleting delete the branch `<branch>`; if the branch is not fully
points to a commit which is not reachable from the current merged in its upstream branch or contained in the current branch,
branch, this command will fail with a warning. this command will fail with a warning.
`git branch -D <branch>`:: `git branch -D <branch>`::
even if the branch points to a commit not reachable delete the branch `<branch>` irrespective of its merged status.
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.
`git checkout <branch>`:: `git checkout <branch>`::
make the current branch `<branch>`, updating the working 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>`:: `git checkout -b <new> <start-point>`::
create a new branch `<new>` referencing `<start-point>`, and create a new branch `<new>` referencing `<start-point>`, and
check it out. check it out.