Improve section "Manipulating branches"
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>
Thomas Ackermann committed
Aug 27, 2013 at 20:02 UTC
df47da758e6c7e76f9011f53df1cfdaf3443de1c
1 file changed
+8
-12
Documentation/user-manual.txt
+8
-12
@@ -268,27 +268,23 @@ Creating, deleting, and modifying branches is quick and easy; here's
268
a summary of the commands:
269
270
`git branch`::
271
- list all branches
271
+ list all branches.
272
`git branch <branch>`::
273
create a new branch named `<branch>`, referencing the same
274
- point in history as the current branch
274
+ point in history as the current branch.
275
`git branch <branch> <start-point>`::
276
create a new branch named `<branch>`, referencing
277
`<start-point>`, which may be specified any way you like,
278
- including using a branch name or a tag name
278
+ including using a branch name or a tag name.
279
`git branch -d <branch>`::
280
- delete the branch `<branch>`; if the branch you are deleting
281
- points to a commit which is not reachable from the current
282
- branch, this command will fail with a warning.
280
+ delete the branch `<branch>`; if the branch is not fully
281
+ merged in its upstream branch or contained in the current branch,
282
+ this command will fail with a warning.
283
`git branch -D <branch>`::
284
- even if the branch points to a commit not reachable
285
- from the current branch, you may know that that commit
286
- is still reachable from some other branch or tag. In that
287
- case it is safe to use this command to force Git to delete
288
- the branch.
284
+ delete the branch `<branch>` irrespective of its merged status.
285
`git checkout <branch>`::
286
make the current branch `<branch>`, updating the working
291
- directory to reflect the version referenced by `<branch>`
287
+ directory to reflect the version referenced by `<branch>`.
288
`git checkout -b <new> <start-point>`::
289
create a new branch `<new>` referencing `<start-point>`, and
290
check it out.