From: Junio C Hamano Date: Thu, 24 May 2007 07:00:32 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-58-g98ee X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fd841777a3a79f59afbc86aec190e9ab3d49a58;p=git.git Autogenerated HTML docs for v1.5.2-58-g98ee --- diff --git a/config.txt b/config.txt index 179cb177d..3d8f03dfe 100644 --- a/config.txt +++ b/config.txt @@ -280,6 +280,13 @@ apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way as the '--whitespace' option. See gitlink:git-apply[1]. +branch.autosetupmerge:: + Tells `git-branch` and `git-checkout` to setup new branches + so that gitlink:git-pull[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. + branch..remote:: When in branch , it tells `git fetch` which remote to fetch. If this option is not given, `git fetch` defaults to remote "origin". diff --git a/git-config.html b/git-config.html index a13d1c4f2..fa978c771 100644 --- a/git-config.html +++ b/git-config.html @@ -944,6 +944,18 @@ apply.whitespace

+branch.autosetupmerge +
+
+

+ Tells git-branch and git-checkout to setup new branches + so that git-pull(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. +

+
+
branch.<name>.remote
@@ -1690,7 +1702,7 @@ transfer.unpackLimit diff --git a/git-ls-tree.html b/git-ls-tree.html index 914b11325..07c521ac2 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -273,7 +273,7 @@ git-ls-tree(1) Manual Page

SYNOPSIS

-
git-ls-tree [-d] [-r] [-t] [-z] +
git-ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]] <tree-ish> [paths…]
@@ -322,6 +322,17 @@ arguments does not matter.

+-l +
+
+--long +
+
+

+ Show object size of blob (file) entries. +

+
+
-z
@@ -379,6 +390,14 @@ paths

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

+
+
+
<mode> SP <type> SP <object> SP <object size> TAB <file>
+
+

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.

Author

@@ -397,7 +416,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-ls-tree.txt b/git-ls-tree.txt index 789939408..ad7f1b920 100644 --- a/git-ls-tree.txt +++ b/git-ls-tree.txt @@ -9,7 +9,7 @@ git-ls-tree - List the contents of a tree object SYNOPSIS -------- [verse] -'git-ls-tree' [-d] [-r] [-t] [-z] +'git-ls-tree' [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--abbrev=[]] [paths...] @@ -36,6 +36,10 @@ OPTIONS Show tree entries even when going to recurse them. Has no effect if '-r' was not passed. '-d' implies '-t'. +-l:: +--long:: + Show object size of blob (file) entries. + -z:: \0 line termination on output. @@ -65,6 +69,14 @@ Output Format 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 SP SP TAB + +Object size identified by 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. + Author ------