From dbb64591ddf30b577662e7021a39b24b3fac6177 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 1 Sep 2007 11:17:39 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc7-30-g947ad2 --- config.txt | 22 +++++++++++---- git-clone.html | 10 +++++-- git-config.html | 24 ++++++++++++---- git-daemon.html | 26 ++++++++++------- git-daemon.txt | 16 +++++------ git-fetch.html | 10 +++++-- git-filter-branch.html | 60 +++++++++++++++++++++++++--------------- git-filter-branch.txt | 63 ++++++++++++++++++++++++++++-------------- git-pull.html | 10 +++++-- git-push.html | 10 +++++-- git-rebase.html | 60 ++++++++++++++++++++++++++++++++++++++-- git-rebase.txt | 39 +++++++++++++++++++++++++- git.html | 4 +-- git.txt | 2 +- urls.txt | 4 ++- 15 files changed, 272 insertions(+), 88 deletions(-) diff --git a/config.txt b/config.txt index 903610fec..866e0534b 100644 --- a/config.txt +++ b/config.txt @@ -301,12 +301,12 @@ alias.*:: hide existing git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them. - - If the alias expansion is prefixed with an exclamation point, - it will be treated as a shell command. For example, defining - "alias.new = !gitk --all --not ORIG_HEAD", the invocation - "git new" is equivalent to running the shell command - "gitk --all --not ORIG_HEAD". ++ +If the alias expansion is prefixed with an exclamation point, +it will be treated as a shell command. For example, defining +"alias.new = !gitk --all --not ORIG_HEAD", the invocation +"git new" is equivalent to running the shell command +"gitk --all --not ORIG_HEAD". apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way @@ -396,6 +396,16 @@ color.status.:: commit.template:: Specify a file to use as the template for new commit messages. +diff.autorefreshindex:: + When using `git diff` to compare with work tree + files, do not consider stat-only change as changed. + Instead, silently run `git update-index --refresh` to + update the cached stat information for paths whose + contents in the work tree match the contents in the + index. This option defaults to true. Note that this + affects only `git diff` Porcelain, and not lower level + `diff` commands, such as `git diff-files`. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the git diff option '-l'. diff --git a/git-clone.html b/git-clone.html index c2e1c8aea..ec14ecb17 100644 --- a/git-clone.html +++ b/git-clone.html @@ -504,6 +504,11 @@ git://host.xz/~user/path/to/repo.git/

  • +ssh://[user@]host.xz[:port]/path/to/repo.git/ +

    +
    • +
  • +

    ssh://[user@]host.xz/path/to/repo.git/

    • @@ -522,7 +527,8 @@ ssh://[user@]host.xz/~/path/to/repo.git

    SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support -username expansion, as does the native git protocol. The following +username expansion, as does the native git protocol, but +only the former supports port specification. The following three are identical to the last three above, respectively:

    @@ -635,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus
    diff --git a/git-config.html b/git-config.html index 971299afe..7ec3b96d3 100644 --- a/git-config.html +++ b/git-config.html @@ -1057,14 +1057,11 @@ alias.* spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them.

    -
    -
    -
    If the alias expansion is prefixed with an exclamation point,
+
    If the alias expansion is prefixed with an exclamation point,
 it will be treated as a shell command.  For example, defining
 "alias.new = !gitk --all --not ORIG_HEAD", the invocation
 "git new" is equivalent to running the shell command
-"gitk --all --not ORIG_HEAD".
    -
    +"gitk --all --not ORIG_HEAD".

    apply.whitespace @@ -1219,6 +1216,21 @@ commit.template

    +diff.autorefreshindex +
    +
    +

    + When using git diff to compare with work tree + files, do not consider stat-only change as changed. + Instead, silently run git update-index --refresh to + update the cached stat information for paths whose + contents in the work tree match the contents in the + index. This option defaults to true. Note that this + affects only git diff Porcelain, and not lower level + diff commands, such as git diff-files. +

    +
    +
    diff.renameLimit
    @@ -1879,7 +1891,7 @@ transfer.unpackLimit
    diff --git a/git-daemon.html b/git-daemon.html index 8b1556658..596e2f2bd 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -642,18 +642,24 @@ a subdirectory for each virtual host IP address supported. Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses.

    - -

    To enable git-archive --remote and disable git-fetch against -a repository, have the following in the configuration file in the -repository (that is the file config next to HEAD, refs and -objects).

    -

    +

    +
    +selectively enable/disable services per repository +
    +
    +

    + To enable git-archive --remote and disable git-fetch against + a repository, have the following in the configuration file in the + repository (that is the file config next to HEAD, refs and + objects). +

    -
    [daemon]
-        uploadpack = false
-        uploadarchive = true
    +
            [daemon]
+                uploadpack = false
+                uploadarchive = true
    +
    +

    Author

    @@ -670,7 +676,7 @@ repository (that is the file config next to HEAD, refs diff --git a/git-daemon.txt b/git-daemon.txt index efdcdadea..99e47c9c2 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -248,16 +248,16 @@ a subdirectory for each virtual host IP address supported. Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses. - -To enable `git-archive --remote` and disable `git-fetch` against -a repository, have the following in the configuration file in the -repository (that is the file 'config' next to 'HEAD', 'refs' and -'objects'). +selectively enable/disable services per repository:: + To enable `git-archive --remote` and disable `git-fetch` against + a repository, have the following in the configuration file in the + repository (that is the file 'config' next to 'HEAD', 'refs' and + 'objects'). + ---------------------------------------------------------------- -[daemon] - uploadpack = false - uploadarchive = true + [daemon] + uploadpack = false + uploadarchive = true ---------------------------------------------------------------- diff --git a/git-fetch.html b/git-fetch.html index e19a1c7e0..ee0cab446 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -531,6 +531,11 @@ git://host.xz/~user/path/to/repo.git/

  • +ssh://[user@]host.xz[:port]/path/to/repo.git/ +

    +
    • +
  • +

    ssh://[user@]host.xz/path/to/repo.git/

    • @@ -549,7 +554,8 @@ ssh://[user@]host.xz/~/path/to/repo.git

    SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support -username expansion, as does the native git protocol. The following +username expansion, as does the native git protocol, but +only the former supports port specification. The following three are identical to the last three above, respectively:

    @@ -658,7 +664,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-filter-branch.html b/git-filter-branch.html index 2a3baf81b..84ed10364 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -282,18 +282,18 @@ git-filter-branch(1) Manual Page

    DESCRIPTION

    -

    Lets you rewrite git revision history by creating a new branch from -your current branch, applying custom filters on each revision. +

    Lets you rewrite git revision history by rewriting the branches mentioned +in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved.

    -

    The command takes the new branch name as a mandatory argument and -the filters as optional arguments. If you specify no filters, the -commits will be recommitted without any changes, which would normally -have no effect. Nevertheless, this may be useful in the future for -compensating for some git bugs or such, therefore such a usage is -permitted.

    +

    The command will only rewrite the _positive_ refs mentioned in the +command line (i.e. if you pass a..b, only b will be rewritten). +If you specify no filters, the commits will be recommitted without any +changes, which would normally have no effect. Nevertheless, this may be +useful in the future for compensating for some git bugs or such, +therefore such a usage is permitted.

    WARNING! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not be able to easily push and distribute the rewritten branch on top of the @@ -304,8 +304,8 @@ would suffice to fix your problem.

    if different from the rewritten ones, will be stored in the namespace refs/original/.

    Note that since this operation is extensively I/O expensive, it might -be a good idea to redirect the temporary directory off-disk, e.g. on -tmpfs. Reportedly the speedup is very noticeable.

    +be a good idea to redirect the temporary directory off-disk with the +-d option, e.g. on tmpfs. Reportedly the speedup is very noticeable.

    Filters

    The filters are applied in the order as listed below. The <command> argument is always evaluated in shell using the eval command (with the @@ -396,6 +396,10 @@ multiple commits.

    As a special extension, the commit filter may emit multiple commit ids; in that case, ancestors of the original commit will have all of them as parents.

    +

    You can use the map convenience function in this filter, and other +convenience functions, too. For example, calling skip_commit "$@" +will leave out the current commit (but not its changes! If you want +that, use git-rebase(1) instead).

    --tag-name-filter <command> @@ -494,8 +498,8 @@ order to paste the other history behind the current history:

    git filter-branch --parent-filter 'sed "s/^\$/-p <graft-id>/"' HEAD
    -

    (if the parent string is empty - therefore we are dealing with the -initial commit - add graftcommit as a parent). Note that this assumes +

    (if the parent string is empty - which happens when we are dealing with +the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:

    @@ -515,17 +519,29 @@ git filter-branch $graft-id..HEAD 
    git filter-branch --commit-filter '
         if [ "$GIT_AUTHOR_NAME" = "Darl McBribe" ];
         then
-                shift;
-                while [ -n "$1" ];
-                do
-                        shift;
-                        echo "$1";
-                        shift;
-                done;
+                skip_commit "$@";
         else
                 git commit-tree "$@";
         fi' HEAD
    +

    Note that the changes introduced by the commits, and not reverted by +subsequent commits, will still be in the rewritten branch. If you want +to throw out _changes_ together with the commits, you should use the +interactive mode of git-rebase(1).

    +

    The function skip_commits is defined as follows:

    +
    +
    +
    skip_commit()
+{
+        shift;
+        while [ -n "$1" ];
+        do
+                shift;
+                map "$1";
+                shift;
+        done;
+}
    +

    The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly @@ -535,8 +551,8 @@ as their parents instead of the merge commit.

    range in addition to the new branch name. The new branch name will point to the top-most revision that a git rev-list of this range will print.

    -

    Note that the changes introduced by the commits, and not reverted by -subsequent commits, will still be in the rewritten branch. If you want +

    NOTE the changes introduced by the commits, and which are not reverted +by subsequent commits, will still be in the rewritten branch. If you want to throw out _changes_ together with the commits, you should use the interactive mode of git-rebase(1).

    Consider this history:

    @@ -582,7 +598,7 @@ and the git list <git@vger.kernel.org>

    diff --git a/git-filter-branch.txt b/git-filter-branch.txt index ae03514e4..29bb8cec0 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -17,19 +17,19 @@ SYNOPSIS DESCRIPTION ----------- -Lets you rewrite git revision history by creating a new branch from -your current branch, applying custom filters on each revision. +Lets you rewrite git revision history by rewriting the branches mentioned +in the , applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved. -The command takes the new branch name as a mandatory argument and -the filters as optional arguments. If you specify no filters, the -commits will be recommitted without any changes, which would normally -have no effect. Nevertheless, this may be useful in the future for -compensating for some git bugs or such, therefore such a usage is -permitted. +The command will only rewrite the _positive_ refs mentioned in the +command line (i.e. if you pass 'a..b', only 'b' will be rewritten). +If you specify no filters, the commits will be recommitted without any +changes, which would normally have no effect. Nevertheless, this may be +useful in the future for compensating for some git bugs or such, +therefore such a usage is permitted. *WARNING*! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not @@ -43,8 +43,8 @@ if different from the rewritten ones, will be stored in the namespace 'refs/original/'. Note that since this operation is extensively I/O expensive, it might -be a good idea to redirect the temporary directory off-disk, e.g. on -tmpfs. Reportedly the speedup is very noticeable. +be a good idea to redirect the temporary directory off-disk with the +'-d' option, e.g. on tmpfs. Reportedly the speedup is very noticeable. Filters @@ -112,6 +112,11 @@ OPTIONS As a special extension, the commit filter may emit multiple commit ids; in that case, ancestors of the original commit will have all of them as parents. ++ +You can use the 'map' convenience function in this filter, and other +convenience functions, too. For example, calling 'skip_commit "$@"' +will leave out the current commit (but not its changes! If you want +that, use gitlink:git-rebase[1] instead). --tag-name-filter :: This is the filter for rewriting tag names. When passed, @@ -186,8 +191,8 @@ order to paste the other history behind the current history: git filter-branch --parent-filter 'sed "s/^\$/-p /"' HEAD ------------------------------------------------------------------- -(if the parent string is empty - therefore we are dealing with the -initial commit - add graftcommit as a parent). Note that this assumes +(if the parent string is empty - which happens when we are dealing with +the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use: @@ -209,34 +214,50 @@ To remove commits authored by "Darl McBribe" from the history: git filter-branch --commit-filter ' if [ "$GIT_AUTHOR_NAME" = "Darl McBribe" ]; then - shift; - while [ -n "$1" ]; - do - shift; - echo "$1"; - shift; - done; + skip_commit "$@"; else git commit-tree "$@"; fi' HEAD ------------------------------------------------------------------------------ +Note that the changes introduced by the commits, and not reverted by +subsequent commits, will still be in the rewritten branch. If you want +to throw out _changes_ together with the commits, you should use the +interactive mode of gitlink:git-rebase[1]. + +The function 'skip_commits' is defined as follows: + +-------------------------- +skip_commit() +{ + shift; + while [ -n "$1" ]; + do + shift; + map "$1"; + shift; + done; +} +-------------------------- + The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit. + To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print. -Note that the changes introduced by the commits, and not reverted by -subsequent commits, will still be in the rewritten branch. If you want +*NOTE* the changes introduced by the commits, and which are not reverted +by subsequent commits, will still be in the rewritten branch. If you want to throw out _changes_ together with the commits, you should use the interactive mode of gitlink:git-rebase[1]. + Consider this history: ------------------ diff --git a/git-pull.html b/git-pull.html index 02c494955..579aca1e2 100644 --- a/git-pull.html +++ b/git-pull.html @@ -577,6 +577,11 @@ git://host.xz/~user/path/to/repo.git/

  • +ssh://[user@]host.xz[:port]/path/to/repo.git/ +

    +
    • +
  • +

    ssh://[user@]host.xz/path/to/repo.git/

    • @@ -595,7 +600,8 @@ ssh://[user@]host.xz/~/path/to/repo.git

    SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support -username expansion, as does the native git protocol. The following +username expansion, as does the native git protocol, but +only the former supports port specification. The following three are identical to the last three above, respectively:

    @@ -903,7 +909,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

    diff --git a/git-push.html b/git-push.html index 8bd7edeb0..262779c66 100644 --- a/git-push.html +++ b/git-push.html @@ -437,6 +437,11 @@ git://host.xz/~user/path/to/repo.git/

  • +ssh://[user@]host.xz[:port]/path/to/repo.git/ +

    +
    • +
  • +

    ssh://[user@]host.xz/path/to/repo.git/

    • @@ -455,7 +460,8 @@ ssh://[user@]host.xz/~/path/to/repo.git

    SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support -username expansion, as does the native git protocol. The following +username expansion, as does the native git protocol, but +only the former supports port specification. The following three are identical to the last three above, respectively:

    @@ -596,7 +602,7 @@ by Linus Torvalds <torvalds@osdl.org>

    diff --git a/git-rebase.html b/git-rebase.html index 88f4404f3..515396b71 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -515,7 +515,8 @@ desired resolution, you can continue the rebasing process with

    Make a list of the commits which are about to be rebased. Let the - user edit that list before rebasing. + user edit that list before rebasing. This mode can also be used to + split commits (see SPLITTING COMMITS below).

    @@ -729,6 +730,61 @@ sure that the current HEAD is "B", and call

    $ git rebase -i -p --onto Q O
    +

    SPLITTING COMMITS

    +
    +

    In interactive mode, you can mark commits with the action "edit". However, +this does not necessarily mean that git rebase expects the result of this +edit to be exactly one commit. Indeed, you can undo the commit, or you can +add other commits. This can be used to split a commit into two:

    +
      +
    • +

      +Start an interactive rebase with git rebase -i <commit>^, where + <commit> is the commit you want to split. In fact, any commit range + will do, as long as it contains that commit. +

      +
      • +
    • +

      +Mark the commit you want to split with the action "edit". +

      +
      • +
    • +

      +When it comes to editing that commit, execute git reset HEAD^. The + effect is that the HEAD is rewound by one, and the index follows suit. + However, the working tree stays the same. +

      +
      • +
    • +

      +Now add the changes to the index that you want to have in the first + commit. You can use git-add(1) (possibly interactively) and/or + git-gui(1) to do that. +

      +
      • +
    • +

      +Commit the now-current index with whatever commit message is appropriate + now. +

      +
      • +
    • +

      +Repeat the last two steps until your working tree is clean. +

      +
      • +
    • +

      +Continue the rebase with git rebase --continue. +

      +
      • +
    +

    If you are not absolutely sure that the intermediate revisions are +consistent (they compile, pass the testsuite, etc.) you should use +git-stash(1) to stash away the not-yet-committed changes +after each commit, test, and amend the commit if fixes are necessary.

    +

    Authors

    Written by Junio C Hamano <junkio@cox.net> and @@ -744,7 +800,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

    diff --git a/git-rebase.txt b/git-rebase.txt index a1b6dce73..640ea3b38 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -211,7 +211,8 @@ OPTIONS -i, \--interactive:: Make a list of the commits which are about to be rebased. Let the - user edit that list before rebasing. + user edit that list before rebasing. This mode can also be used to + split commits (see SPLITTING COMMITS below). -p, \--preserve-merges:: Instead of ignoring merges, try to recreate them. This option @@ -325,6 +326,42 @@ sure that the current HEAD is "B", and call $ git rebase -i -p --onto Q O ----------------------------- + +SPLITTING COMMITS +----------------- + +In interactive mode, you can mark commits with the action "edit". However, +this does not necessarily mean that 'git rebase' expects the result of this +edit to be exactly one commit. Indeed, you can undo the commit, or you can +add other commits. This can be used to split a commit into two: + +- Start an interactive rebase with 'git rebase -i ^', where + is the commit you want to split. In fact, any commit range + will do, as long as it contains that commit. + +- Mark the commit you want to split with the action "edit". + +- When it comes to editing that commit, execute 'git reset HEAD^'. The + effect is that the HEAD is rewound by one, and the index follows suit. + However, the working tree stays the same. + +- Now add the changes to the index that you want to have in the first + commit. You can use gitlink:git-add[1] (possibly interactively) and/or + gitlink:git-gui[1] to do that. + +- Commit the now-current index with whatever commit message is appropriate + now. + +- Repeat the last two steps until your working tree is clean. + +- Continue the rebase with 'git rebase --continue'. + +If you are not absolutely sure that the intermediate revisions are +consistent (they compile, pass the testsuite, etc.) you should use +gitlink:git-stash[1] to stash away the not-yet-committed changes +after each commit, test, and amend the commit if fixes are necessary. + + Authors ------ Written by Junio C Hamano and diff --git a/git.html b/git.html index 034de06ff..88020b0c9 100644 --- a/git.html +++ b/git.html @@ -2413,7 +2413,7 @@ git's founding father is Linus Torvalds <torvalds@osdl.org>.

  • -The current git nurse is Junio C Hamano <junkio@cox.net>. +The current git nurse is Junio C Hamano <gitster@pobox.com>.

  • @@ -2440,7 +2440,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/git.txt b/git.txt index 75b3e1b87..ceca892a0 100644 --- a/git.txt +++ b/git.txt @@ -476,7 +476,7 @@ include::core-intro.txt[] Authors ------- * git's founding father is Linus Torvalds . -* The current git nurse is Junio C Hamano . +* The current git nurse is Junio C Hamano . * The git potty was written by Andres Ericsson . * General upbringing is handled by the git-list . diff --git a/urls.txt b/urls.txt index b38145faf..e67f9140a 100644 --- a/urls.txt +++ b/urls.txt @@ -10,6 +10,7 @@ to name the remote repository: - https://host.xz/path/to/repo.git/ - git://host.xz/path/to/repo.git/ - git://host.xz/~user/path/to/repo.git/ +- ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/ - ssh://{startsb}user@{endsb}host.xz/path/to/repo.git/ - ssh://{startsb}user@{endsb}host.xz/~user/path/to/repo.git/ - ssh://{startsb}user@{endsb}host.xz/~/path/to/repo.git @@ -18,7 +19,8 @@ to name the remote repository: SSH is the default transport protocol over the network. You can optionally specify which user to log-in as, and an alternate, scp-like syntax is also supported. Both syntaxes support -username expansion, as does the native git protocol. The following +username expansion, as does the native git protocol, but +only the former supports port specification. The following three are identical to the last three above, respectively: =============================================================== -- 2.26.2