From 63ef0ac13e411afbeaaf0ff1f279affbb8614188 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 22 Dec 2006 07:28:18 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.3-gfa39b --- git-branch.html | 19 +++++++++++++------ git-branch.txt | 13 ++++++++----- git-tag.html | 14 ++++++++++++-- git-tag.txt | 6 +++++- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/git-branch.html b/git-branch.html index 74a4e26d1..f9cf223ad 100644 --- a/git-branch.html +++ b/git-branch.html @@ -276,7 +276,7 @@ git-branch(1) Manual Page
git-branch [-r | -a] [-v [--abbrev=<length>]] git-branch [-l] [-f] <branchname> [<start-point>] git-branch (-m | -M) [<oldbranch>] <newbranch> -git-branch (-d | -D) <branchname>…
+git-branch (-d | -D) [-r] <branchname>…

DESCRIPTION

@@ -295,7 +295,8 @@ 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 ref log then the ref log will also be deleted.

+has a ref log then the ref log will also be deleted. Use -r together with -d +to delete remote-tracking branches.

OPTIONS

@@ -355,7 +356,7 @@ has a ref log then the ref log will also be deleted.

- List the remote-tracking branches. + List or delete (if used with -d) the remote-tracking branches.

@@ -454,12 +455,18 @@ Delete unneeded branch 
$ git clone git://git.kernel.org/.../git.git my.git
 $ cd my.git
-$ git branch -D todo    (1)
+$ git branch -d -r todo html man (1) +$ git branch -D test (2)

  1. -delete todo branch even if the "master" branch does not have all +delete remote-tracking branches "todo", "html", "man" +

    +
    2. +
  2. +

    +delete "test" branch even if the "master" branch does not have all commits from todo branch.

    3. @@ -487,7 +494,7 @@ a branch and check it out with a single command.

    diff --git a/git-branch.txt b/git-branch.txt index 71417feba..c464bd2fd 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git-branch' [-r | -a] [-v [--abbrev=]] 'git-branch' [-l] [-f] [] 'git-branch' (-m | -M) [] -'git-branch' (-d | -D) ... +'git-branch' (-d | -D) [-r] ... DESCRIPTION ----------- @@ -33,7 +33,8 @@ 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 ref log then the ref log will also be deleted. +has a ref log then the ref log will also be deleted. Use -r together with -d +to delete remote-tracking branches. OPTIONS @@ -60,7 +61,7 @@ OPTIONS Move/rename a branch even if the new branchname already exists. -r:: - List the remote-tracking branches. + List or delete (if used with -d) the remote-tracking branches. -a:: List both remote-tracking branches and local branches. @@ -111,10 +112,12 @@ Delete unneeded branch:: ------------ $ git clone git://git.kernel.org/.../git.git my.git $ cd my.git -$ git branch -D todo <1> +$ git branch -d -r todo html man <1> +$ git branch -D test <2> ------------ + -<1> delete todo branch even if the "master" branch does not have all +<1> delete remote-tracking branches "todo", "html", "man" +<2> delete "test" branch even if the "master" branch does not have all commits from todo branch. diff --git a/git-tag.html b/git-tag.html index fe9fa9769..5977f4775 100644 --- a/git-tag.html +++ b/git-tag.html @@ -273,7 +273,8 @@ git-tag(1) Manual Page

    SYNOPSIS

    -
    git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <name> [<head>] +
    git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg> | -F <file>] + <name> [<head>] git-tag -l [<pattern>]

    DESCRIPTION

    @@ -354,6 +355,15 @@ if no pattern is given).

    Use the given tag message (instead of prompting)

    +
    +-F <file> +
    +
    +

    + Take the tag message from the given file. Use - to + read the message from the standard input. +

    +

    Author

    @@ -371,7 +381,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tag.txt b/git-tag.txt index 45476c2e4..48b82b86f 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -9,7 +9,8 @@ git-tag - Create a tag object signed with GPG SYNOPSIS -------- [verse] -'git-tag' [-a | -s | -u ] [-f | -d] [-m ] [] +'git-tag' [-a | -s | -u ] [-f | -d] [-m | -F ] + [] 'git-tag' -l [] DESCRIPTION @@ -60,6 +61,9 @@ OPTIONS -m :: Use the given tag message (instead of prompting) +-F :: + Take the tag message from the given file. Use '-' to + read the message from the standard input. Author ------ -- 2.26.2