From 6dac1b9a783bfd52b7e37dc4204093a5ae025930 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Feb 2007 23:48:34 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0-rc4-372-g26cfc --- man1/git-checkout.1 | 10 ++++++---- man1/git-config.1 | 5 ++++- man1/git-gc.1 | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index 42854c726..3dc486763 100644 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.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\-CHECKOUT" "1" "02/02/2007" "" "" +.TH "GIT\-CHECKOUT" "1" "02/13/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -55,9 +55,11 @@ Earlier versions of git did not allow this and asked you to create a temporary b You can use usual git commands while in this state. You can use git\-reset \-\-hard $othercommit to further move around, for example. You can make changes and create a new commit on top of a detached HEAD. You can even create a merge by using git merge $othercommit. -The state you are in while your HEAD is detached is not recorded by any branch (which is natural \-\-\- you are not on any branch). What this means is that you can discard your temporary commits and merges by switching back to an existing branch (e.g. git checkout master), and a later git prune or git gc would garbage\-collect them. - -The command would refuse to switch back to make sure that you do not discard your temporary state by mistake when your detached HEAD is not pointed at by any existing ref. If you did want to save your state (e.g. "I was interested in the fifth commit from the top of \fImaster\fR branch", or "I made two commits to fix minor bugs while on a detached HEAD" \(em and if you do not want to lose these facts), you can create a new branch and switch to it with git checkout \-b newbranch so that you can keep building on that state, or tag it first so that you can come back to it later and switch to the branch you wanted to switch to with git tag that_state; git checkout master. On the other hand, if you did want to discard the temporary state, you can give \-f option (e.g. git checkout \-f master) to override this behaviour. +The state you are in while your HEAD is detached is not recorded by any branch (which is natural \-\-\- you are not on any branch). What this means is that you can discard your temporary commits and merges by switching back to an existing branch (e.g. git checkout master), and a later git prune or git gc would garbage\-collect them. If you did this by mistake, you can ask the reflog for HEAD where you were, e.g. +.sp +.nf +$ git log \-g \-2 HEAD +.fi .SH "EXAMPLES" .TP 3 1. diff --git a/man1/git-config.1 b/man1/git-config.1 index 1b23f3e96..b5d221246 100644 --- a/man1/git-config.1 +++ b/man1/git-config.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\-CONFIG" "1" "02/12/2007" "" "" +.TH "GIT\-CONFIG" "1" "02/13/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -350,6 +350,9 @@ If the number of objects fetched over the git native transfer is below this limi format.headers Additional email headers to include in a patch to be submitted by mail. See \fBgit\-format\-patch\fR(1). .TP +gc.packrefs +git gc does not run git pack\-refs in a bare repository by default so that older dumb\-transport clients can still fetch from the repository. Setting this to true lets git gc to run git pack\-refs. Setting this to false tells git gc never to run git pack\-refs. The default setting is notbare. Enable it only when you know you do not have to support such clients. The default setting will change to true at some stage, and setting this to false will continue to prevent git pack\-refs from being run from git gc. +.TP gc.reflogexpire git reflog expire removes reflog entries older than this time; defaults to 90 days. .TP diff --git a/man1/git-gc.1 b/man1/git-gc.1 index a5e38905b..ee224c1a8 100644 --- a/man1/git-gc.1 +++ b/man1/git-gc.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\-GC" "1" "01/22/2007" "" "" +.TH "GIT\-GC" "1" "02/13/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -27,6 +27,8 @@ The optional configuration variable \fIgc.reflogExpireUnreachable\fR can be set The optional configuration variable \fIgc.rerereresolved\fR indicates how long records of conflicted merge you resolved earlier are kept. This defaults to 60 days. The optional configuration variable \fIgc.rerereunresolved\fR indicates how long records of conflicted merge you have not resolved are kept. This defaults to 15 days. + +The optional configuration variable \fIgc.packrefs\fR determines if git gc runs git\-pack\-refs. Without the configuration, git\-pack\-refs is not run in bare repositories by default, to allow older dumb\-transport clients fetch from the repository, but this will change in the future. .SH "SEE ALSO" \fBgit\-prune\fR(1) \fBgit\-reflog\fR(1) \fBgit\-repack\fR(1) \fBgit\-rerere\fR(1) .SH "AUTHOR" -- 2.26.2