From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 24 May 2007 07:00:50 +0000 (+0000)
Subject: Autogenerated manpages for v1.5.2-58-g98ee
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b7a171d1dd052158113155718d803f932403b0a;p=git.git

Autogenerated manpages for v1.5.2-58-g98ee
---

diff --git a/man1/git-config.1 b/man1/git-config.1
index 48fc857b3..ff7c3c32f 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" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-CONFIG" "1" "05/24/2007" "Git 1.5.2.58.g98ee" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -341,6 +341,9 @@ it will be treated as a shell command.  For example, defining
 apply.whitespace
 Tells git\-apply how to handle whitespaces, in the same way as the \fI\-\-whitespace\fR option. See \fBgit\-apply\fR(1).
 .TP
+branch.autosetupmerge
+Tells git\-branch and git\-checkout to setup new branches so that \fBgit\-pull\fR(1) will appropriately merge from that remote branch. Note that even if this option is not set, this behavior can be chosen per\-branch using the \-\-track and \-\-no\-track options. This option defaults to false.
+.TP
 branch.<name>.remote
 When in branch <name>, it tells git fetch which remote to fetch. If this option is not given, git fetch defaults to remote "origin".
 .TP
diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1
index 9c043cfbe..61aa434b0 100644
--- a/man1/git-ls-tree.1
+++ b/man1/git-ls-tree.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\-LS\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-LS\-TREE" "1" "05/23/2007" "Git 1.5.2.45.ged82" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -12,7 +12,7 @@ git\-ls\-tree \- List the contents of a tree object
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit\-ls\-tree\fR [\-d] [\-r] [\-t] [\-z]
+\fIgit\-ls\-tree\fR [\-d] [\-r] [\-t] [\-l] [\-z]
             [\-\-name\-only] [\-\-name\-status] [\-\-full\-name] [\-\-abbrev=[<n>]]
             <tree\-ish> [paths\&...]
 .fi
@@ -32,6 +32,9 @@ Recurse into sub\-trees.
 \-t
 Show tree entries even when going to recurse them. Has no effect if \fI\-r\fR was not passed. \fI\-d\fR implies \fI\-t\fR.
 .TP
+\-l , \-\-long
+Show object size of blob (file) entries.
+.TP
 \-z
 \\0 line termination on output.
 .TP
@@ -52,6 +55,13 @@ When paths are given, show them (note that this isn't really raw pathnames, but
 <mode> SP <type> SP <object> TAB <file>
 .fi
 When the \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively.
+
+When the \-l option is used, format changes to
+.sp
+.nf
+<mode> SP <type> SP <object> SP <object size> TAB <file>
+.fi
+Object size identified by <object> is given in bytes, and right\-justified with minimum width of 7 characters. Object size is given only for blobs (file) entries; for other entries \- character is used in place of size.
 .SH "AUTHOR"
 Written by Petr Baudis <pasky@suse.cz> Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>, another major rewrite by Linus Torvalds <torvalds@osdl.org>
 .SH "DOCUMENTATION"