From 258e441aecb311c6dce3330f5bf578cf10b134bb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 29 Nov 2007 02:28:32 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.6-970-gd25430 --- git-branch.html | 22 ++++++++++++++-------- git-branch.txt | 21 ++++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/git-branch.html b/git-branch.html index de381c0e4..9fdf7997b 100644 --- a/git-branch.html +++ b/git-branch.html @@ -305,8 +305,12 @@ renaming. If <newbranch> exists, -M must be used to force the rename to happen.

With a -d or -D option, <branchname> will be deleted. You may specify more than one branch for deletion. If the branch currently -has a reflog then the reflog will also be deleted. Use -r together with -d -to delete remote-tracking branches.

+has a reflog then the reflog will also be deleted.

+

Use -r together with -d to delete remote-tracking branches. Note, that it +only makes sense to delete remote-tracking branches if they no longer exist +in remote repository or if git-fetch(1) was configured not to fetch +them again. See also prune subcommand of git-remote(1) for way to +clean up all obsolete remote-tracking branches.

OPTIONS

@@ -316,7 +320,7 @@ to delete remote-tracking branches.

- Delete a branch. The branch must be fully merged. + Delete a branch. The branch must be fully merged in HEAD.

@@ -324,7 +328,7 @@ to delete remote-tracking branches.

- Delete a branch irrespective of its index status. + Delete a branch irrespective of its merged status.

@@ -522,13 +526,15 @@ $ git branch -D test (2)

  1. -Delete remote-tracking branches "todo", "html", "man" +Delete remote-tracking branches "todo", "html", "man". Next fetch or +pull will create them again unless you configure them not to. See +git-fetch(1).

  2. -Delete "test" branch even if the "master" branch does not have all -commits from test branch. +Delete "test" branch even if the "master" branch (or whichever branch is +currently checked out) does not have all commits from test branch.

@@ -555,7 +561,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index 5ce905de8..f87b6968b 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -45,17 +45,22 @@ to happen. With a `-d` or `-D` option, `` will be deleted. You may specify more than one branch for deletion. If the branch currently -has a reflog then the reflog will also be deleted. Use -r together with -d -to delete remote-tracking branches. +has a reflog then the reflog will also be deleted. + +Use -r together with -d to delete remote-tracking branches. Note, that it +only makes sense to delete remote-tracking branches if they no longer exist +in remote repository or if gitlink:git-fetch[1] was configured not to fetch +them again. See also 'prune' subcommand of gitlink:git-remote[1] for way to +clean up all obsolete remote-tracking branches. OPTIONS ------- -d:: - Delete a branch. The branch must be fully merged. + Delete a branch. The branch must be fully merged in HEAD. -D:: - Delete a branch irrespective of its index status. + Delete a branch irrespective of its merged status. -l:: Create the branch's reflog. This activates recording of @@ -153,9 +158,11 @@ $ git branch -d -r origin/todo origin/html origin/man <1> $ git branch -D test <2> ------------ + -<1> Delete remote-tracking branches "todo", "html", "man" -<2> Delete "test" branch even if the "master" branch does not have all -commits from test branch. +<1> Delete remote-tracking branches "todo", "html", "man". Next 'fetch' or +'pull' will create them again unless you configure them not to. See +gitlink:git-fetch[1]. +<2> Delete "test" branch even if the "master" branch (or whichever branch is +currently checked out) does not have all commits from test branch. Notes -- 2.26.2