From: Junio C Hamano Date: Mon, 12 May 2008 00:29:47 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5.1-211-g65ea X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=869bb80c07ac9d2a9d37d4ac3355bc4529752f53;p=git.git Autogenerated HTML docs for v1.5.5.1-211-g65ea --- diff --git a/config.txt b/config.txt index a6fc5a2cf..217980f48 100644 --- a/config.txt +++ b/config.txt @@ -399,6 +399,21 @@ branch.autosetupmerge:: done when the starting point is either a local branch or remote branch. This option defaults to true. +branch.autosetuprebase:: + When a new branch is created with `git-branch` or `git-checkout` + that tracks another branch, this variable tells git to set + up pull to rebase instead of merge (see "branch..rebase"). + When `never`, rebase is never automatically set to true. + When `local`, rebase is set to true for tracked branches of + other local branches. + When `remote`, rebase is set to true for tracked branches of + remote branches. + When `always`, rebase will be set to true for all tracking + branches. + See "branch.autosetupmerge" for details on how to set up a + branch to track another branch. + This option defaults to never. + 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 98b07b0d7..a6db05dd4 100644 --- a/git-config.html +++ b/git-config.html @@ -1228,6 +1228,26 @@ branch.autosetupmerge

+branch.autosetuprebase +
+
+

+ When a new branch is created with git-branch or git-checkout + that tracks another branch, this variable tells git to set + up pull to rebase instead of merge (see "branch.<name>.rebase"). + When never, rebase is never automatically set to true. + When local, rebase is set to true for tracked branches of + other local branches. + When remote, rebase is set to true for tracked branches of + remote branches. + When always, rebase will be set to true for all tracking + branches. + See "branch.autosetupmerge" for details on how to set up a + branch to track another branch. + This option defaults to never. +

+
+
branch.<name>.remote
@@ -2531,7 +2551,7 @@ web.browser diff --git a/git-format-patch.html b/git-format-patch.html index bf7c6bcee..844ec36ef 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -974,6 +974,17 @@ want a filename like 0001-description-of-my-change.patch, and the first letter does not have to be a dot. Leaving it empty would not add any suffix.

+
+--no-binary +
+
+

+ Don't output contents of changes in binary files, just take note + that they differ. Note that this disable the patch to be properly + applied. By default the contents of changes in those files are + encoded in the patch. +

+

CONFIGURATION

@@ -1068,7 +1079,7 @@ as e-mailable patches: diff --git a/git-format-patch.txt b/git-format-patch.txt index 87e491b59..7548a21d3 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -156,6 +156,12 @@ want a filename like `0001-description-of-my-change.patch`, and the first letter does not have to be a dot. Leaving it empty would not add any suffix. +--no-binary:: + Don't output contents of changes in binary files, just take note + that they differ. Note that this disable the patch to be properly + applied. By default the contents of changes in those files are + encoded in the patch. + CONFIGURATION ------------- You can specify extra mail header lines to be added to each message diff --git a/git-svn.html b/git-svn.html index 26d4d09ab..2db4ab83d 100644 --- a/git-svn.html +++ b/git-svn.html @@ -570,11 +570,26 @@ environment). This command has the same behaviour.

- Show what revision and author last modified each line of a file. This is - identical to `git blame', but SVN revision numbers are shown instead of git - commit hashes. + Show what revision and author last modified each line of a file. The + output of this mode is format-compatible with the output of + `svn blame' by default. Like the SVN blame command, + local uncommitted changes in the working copy are ignored; + the version of the file in the HEAD revision is annotated. Unknown + arguments are passed directly to git-blame.

-

All arguments are passed directly to `git blame'.

+
+
+--git-format +
+
+

+ Produce output in the same format as `git blame', but with + SVN revision numbers instead of git commit hashes. In this mode, + changes that haven't been committed to SVN (including local + working-copy edits) are shown as revision 0. +

+
+
@@ -1105,7 +1120,7 @@ should be manually entered with a text-editor or using diff --git a/git-svn.txt b/git-svn.txt index f4ba1056f..c6b56b4ef 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -166,11 +166,18 @@ environment). This command has the same behaviour. Any other arguments are passed directly to `git log' 'blame':: - Show what revision and author last modified each line of a file. This is - identical to `git blame', but SVN revision numbers are shown instead of git - commit hashes. + Show what revision and author last modified each line of a file. The + output of this mode is format-compatible with the output of + `svn blame' by default. Like the SVN blame command, + local uncommitted changes in the working copy are ignored; + the version of the file in the HEAD revision is annotated. Unknown + arguments are passed directly to git-blame. + -All arguments are passed directly to `git blame'. +--git-format;; + Produce output in the same format as `git blame', but with + SVN revision numbers instead of git commit hashes. In this mode, + changes that haven't been committed to SVN (including local + working-copy edits) are shown as revision 0. -- 'find-rev'::