From f72c0713f98baf1f2d3502425d958a87e7f4b7eb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 15 Jan 2006 02:14:03 -0800 Subject: [PATCH] Autogenerated man pages for v1.1.2-gd425 --- man1/git-clone.1 | 17 ++++++++++++++++- man1/git-show-branch.1 | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 1d9bfcb3..bd5dee9e 100755 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -23,7 +23,7 @@ git-clone \- Clones a repository. .SH "SYNOPSIS" .nf -git\-clone [\-l [\-s]] [\-q] [\-n] [\-o ] [\-u ] +git\-clone [\-l [\-s]] [\-q] [\-n] [\-\-naked] [\-o ] [\-u ] [] .fi @@ -61,6 +61,10 @@ Operate quietly\&. This flag is passed to "rsync" and "git\-clone\-pack" command No checkout of HEAD is performed after the clone is complete\&. .TP +\-\-naked +Make a naked GIT repository\&. That is, instead of creating and placing the administrative files in /\&.git, make the itself the $GIT_DIR\&. This implies \-n option\&. + +.TP \-o Instead of using the branch name origin to keep track of the upstream repository, use instead\&. Note that the shorthand name stored in remotes/origin is not affected, but the local branch name to pull the remote master branch into is\&. @@ -92,6 +96,17 @@ Make a local clone that borrows from the current directory, without checking thi $ git clone \-l \-s \-n \&. \&.\&./copy $ cd copy $ git show\-branch +.TP +Create a naked repository to publish your changes to the public + +.IP +$ git clone \-\-naked \-l /home/proj/\&.git /pub/scm/proj\&.git +.TP +Create a repository on the kernel\&.org machine that borrows from Linus + +.IP +$ git clone \-\-naked \-l \-s /pub/scm/\&.\&.\&./torvalds/linux\-2\&.6\&.git \\ + /pub/scm/\&.\&.\&./me/subsys\-2\&.6\&.git .SH "AUTHOR" diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 63a8fcad..7408d3e4 100755 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -22,8 +22,11 @@ git-show-branch \- Show branches and their commits. .SH "SYNOPSIS" - -git\-show\-branch [\-\-all] [\-\-heads] [\-\-tags] [\-\-topo\-order] [\-\-more= | \-\-list | \-\-independent | \-\-merge\-base] [\-\-no\-name | \-\-sha1\-name] [ | ]... +.nf +git\-show\-branch [\-\-all] [\-\-heads] [\-\-tags] [\-\-topo\-order] [\-\-current] + [\-\-more= | \-\-list | \-\-independent | \-\-merge\-base] + [\-\-no\-name | \-\-sha1\-name] [ | ]... +.fi .SH "DESCRIPTION" @@ -33,6 +36,9 @@ Shows the commit ancestry graph starting from the commits named with s or < It cannot show more than 29 branches and commits at a time\&. + +It uses showbranch\&.default multi\-valued configuration items if no nor is given on the command line\&. + .SH "OPTIONS" .TP @@ -48,6 +54,10 @@ A glob pattern that matches branch or tag names under $GIT_DIR/refs\&. For examp Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads, and $GIT_DIR/refs/tags, respectively\&. .TP +\-\-current +With this option, the command includes the current branch to the list of revs to be shown when it is not given on the command line\&. + +.TP \-\-topo\-order By default, the branches and their commits are shown in reverse chronological order\&. This option makes them appear in topological order (i\&.e\&., descendant commits are shown before their parents)\&. @@ -57,7 +67,7 @@ Usually the command stops output upon showing the commit that is the common ance .TP \-\-list -Synomym to \-\-more=\-1 +Synonym to \-\-more=\-1 .TP \-\-merge\-base @@ -84,14 +94,14 @@ Note that \-\-more, \-\-list, \-\-independent and \-\-merge\-base options are mu Given N , the first N lines are the one\-line description from their commit message\&. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk * character while other heads are prefixed with a ! character\&. -Following these N lines, one\-line log for each commit is displayed, indented N places\&. If a commit is on the I\-th branch, the I\-th indentation character shows a + sign; otherwise it shows a space\&. Each commit shows a short name that can be used as an extended SHA1 to name that commit\&. +Following these N lines, one\-line log for each commit is displayed, indented N places\&. If a commit is on the I\-th branch, the I\-th indentation character shows a + sign; otherwise it shows a space\&. Merge commits are denoted by a \- sign\&. Each commit shows a short name that can be used as an extended SHA1 to name that commit\&. The following example shows three branches, "master", "fixes" and "mhf": .IP $ git show\-branch master fixes mhf -! [master] Add 'git show\-branch'\&. +* [master] Add 'git show\-branch'\&. ! [fixes] Introduce "reset type" flag to "git reset" ! [mhf] Allow "+remote:local" refspec to cause \-\-force when fetching\&. \-\-\- @@ -105,9 +115,22 @@ $ git show\-branch master fixes mhf + [mhf~6] Retire git\-parse\-remote\&. + [mhf~7] Multi\-head fetch\&. + [mhf~8] Start adding the $GIT_DIR/remotes/ support\&. -+++ [master] Add 'git show\-branch'\&. +*++ [master] Add 'git show\-branch'\&. + +These three branches all forked from a common commit, [master], whose commit message is "Add git show\-branch\&. "fixes" branch adds one commit Introduce "reset type"\&. "mhf" branch has many other commits\&. The current branch is "master"\&. + +.SH "EXAMPLE" + + +If you keep your primary branches immediately under $GIT_DIR/refs/heads, and topic branches in subdirectories of it, having the following in the configuration file may help: + +.IP +[showbranch] + default = \-\-topo\-order + default = heads/* + -These three branches all forked from a common commit, [master], whose commit message is "Add git show\-branch\&. "fixes" branch adds one commit Introduce "reset type"\&. "mhf" branch has many other commits\&. +With this,git show\-branch without extra parameters would show only the primary branches\&. In addition, if you happen to be on your topic branch, it is shown as well\&. .SH "AUTHOR" -- 2.11.0