From 3f564b8073ffa3ada8ab6bd9205c2986fd6572cc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 5 Feb 2007 07:22:00 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0-rc3-58-g79812 --- man1/git-show-branch.1 | 8 ++++---- man1/git-symbolic-ref.1 | 7 +++++-- man7/git.7 | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 2dd9c5fbb..bfb64ab3e 100644 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SHOW\-BRANCH" "1" "01/25/2007" "" "" +.TH "GIT\-SHOW\-BRANCH" "1" "02/05/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,7 +15,7 @@ git\-show\-branch \- Show branches and their commits \fIgit\-show\-branch\fR [\-\-all] [\-\-remotes] [\-\-topo\-order] [\-\-current] [\-\-more= | \-\-list | \-\-independent | \-\-merge\-base] [\-\-no\-name | \-\-sha1\-name] [\-\-topics] [ | ]\&... -\fIgit\-show\-branch\fR (\-g|\-\-reflog)[=[,]] [\-\-list] +\fIgit\-show\-branch\fR (\-g|\-\-reflog)[=[,]] [\-\-list] [] .fi .SH "DESCRIPTION" Shows the commit ancestry graph starting from the commits named with s or s (or all refs under $GIT_DIR/refs/heads and/or $GIT_DIR/refs/tags) semi\-visually. @@ -67,8 +67,8 @@ Instead of naming the commits using the path to reach them from heads (e.g. "mas \-\-topics Shows only commits that are NOT on the first branch given. This helps track topic branches by hiding any commit that is already in the main line of development. When given "git show\-branch \-\-topics master topic1 topic2", this will show the revisions given by "git rev\-list ^master topic1 topic2" .TP -\-\-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. +\-\-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. 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. .SH "OUTPUT" diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index ad72c080a..570b398e3 100644 --- a/man1/git-symbolic-ref.1 +++ b/man1/git-symbolic-ref.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SYMBOLIC\-REF" "1" "01/19/2007" "" "" +.TH "GIT\-SYMBOLIC\-REF" "1" "02/05/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-symbolic\-ref \- Read and modify symbolic refs .SH "SYNOPSIS" -\fIgit\-symbolic\-ref\fR [\-q] [] +\fIgit\-symbolic\-ref\fR [\-q] [\-m ] [] .SH "DESCRIPTION" Given one argument, reads which branch head the given symbolic ref refers to and outputs its path, relative to the .git/ directory. Typically you would give HEAD as the argument to see on which branch your working tree is on. @@ -21,6 +21,9 @@ A symbolic ref is a regular file that stores a string that begins with ref: refs .TP \-q Do not issue an error message if the is not a symbolic ref but a detached HEAD; instead exit with non\-zero status silently. +.TP +\-m +Update the reflog for with . This is valid only when creating or updating a symbolic ref. .SH "NOTES" In the past, .git/HEAD was a symbolic link pointing at refs/heads/master. When we wanted to switch to another branch, we did ln \-sf refs/heads/newbranch .git/HEAD, and when we wanted to find out which branch we are on, we did readlink .git/HEAD. This was fine, and internally that is what still happens by default, but on platforms that do not have working symlinks, or that do not have the readlink(1) command, this was a bit cumbersome. On some platforms, ln \-sf does not even work as advertised (horrors). Therefore symbolic links are now deprecated and symbolic refs are used by default. diff --git a/man7/git.7 b/man7/git.7 index cca7e6a1f..9bf3f802c 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT" "7" "02/04/2007" "" "" +.TH "GIT" "7" "02/05/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2