From: Junio C Hamano Date: Mon, 5 Feb 2007 07:21:48 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc3-58-g79812 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=16cf158f7b6397ada1e6d221393c66f284e15b70;p=git.git Autogenerated HTML docs for v1.5.0-rc3-58-g79812 --- diff --git a/git-show-branch.html b/git-show-branch.html index aa128bbee5..349e6fdd83 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -276,7 +276,7 @@ git-show-branch(1) Manual Page
git-show-branch [--all] [--remotes] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]… -git-show-branch (-g|--reflog)[=<n>[,<base>]] [--list] <ref>
+git-show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]

DESCRIPTION

@@ -430,14 +430,16 @@ no <rev> nor <glob> is given on the command line.

---reflog[=<n>[,<base>]] <ref> +--reflog[=<n>[,<base>]] [<ref>]

Shows <n> most recent ref-log entries for the given ref. If <base> is given, <n> entries going back from that entry. <base> can be specified as count or date. - -g can be used as a short-hand for this option. + -g can be used as a short-hand for this option. When + no explicit <ref> parameter is given, it defaults to the + current branch (or HEAD if it is detached).

@@ -519,7 +521,7 @@ topologically related with each other.

diff --git a/git-show-branch.txt b/git-show-branch.txt index b38633c397..ba5313d51f 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git-show-branch' [--all] [--remotes] [--topo-order] [--current] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [ | ]... -'git-show-branch' (-g|--reflog)[=[,]] [--list] +'git-show-branch' (-g|--reflog)[=[,]] [--list] [] DESCRIPTION ----------- @@ -97,11 +97,13 @@ OPTIONS will show the revisions given by "git rev-list {caret}master topic1 topic2" ---reflog[=[,]] :: +--reflog[=[,]] []:: Shows most recent ref-log entries for the given ref. If is given, entries going back from that entry. can be specified as count or date. - `-g` can be used as a short-hand for this option. + `-g` can be used as a short-hand for this option. When + no explicit parameter is given, it defaults to the + current branch (or `HEAD` if it is detached). Note that --more, --list, --independent and --merge-base options are mutually exclusive. diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index e21a3c8e8f..225e583d92 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -272,7 +272,7 @@ git-symbolic-ref(1) Manual Page

SYNOPSIS

-

git-symbolic-ref [-q] <name> [<ref>]

+

git-symbolic-ref [-q] [-m <reason>] <name> [<ref>]

DESCRIPTION

@@ -299,6 +299,15 @@ a regular file whose contents is ref: refs/heads/master.

non-zero status silently.

+
+-m +
+
+

+ Update the reflog for <name> with <reason>. This is valid only + when creating or updating a symbolic ref. +

+

NOTES

@@ -327,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.

diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index f93b79a85e..a88f722860 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -7,7 +7,7 @@ git-symbolic-ref - Read and modify symbolic refs SYNOPSIS -------- -'git-symbolic-ref' [-q] [] +'git-symbolic-ref' [-q] [-m ] [] DESCRIPTION ----------- @@ -31,6 +31,10 @@ OPTIONS symbolic ref but a detached HEAD; instead exit with non-zero status silently. +-m:: + Update the reflog for with . This is valid only + when creating or updating a symbolic ref. + NOTES ----- In the past, `.git/HEAD` was a symbolic link pointing at diff --git a/git.html b/git.html index 30fadd4f7d..42e8a5978f 100644 --- a/git.html +++ b/git.html @@ -2288,7 +2288,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/tutorial.html b/tutorial.html index 59b541ef92..213e15106f 100644 --- a/tutorial.html +++ b/tutorial.html @@ -650,7 +650,9 @@ in the working directory, it will also remove all later commits from this branch. If this branch is the only branch containing those commits, they will be lost. Also, don't use "git reset" on a publicly-visible branch that other developers pull from, as it will -force needless merges on other developers to clean up the history.

+force needless merges on other developers to clean up the history. +If you need to undo changes that you have pushed, use git-revert(1) +instead.

The git grep command can search for strings in any version of your project, so

@@ -779,7 +781,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index 5fc5be5a28..129c5c5f5b 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -461,6 +461,8 @@ this branch. If this branch is the only branch containing those commits, they will be lost. Also, don't use "git reset" on a publicly-visible branch that other developers pull from, as it will force needless merges on other developers to clean up the history. +If you need to undo changes that you have pushed, use gitlink:git-revert[1] +instead. The git grep command can search for strings in any version of your project, so