Merge branch 'es/worktree-add'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Jul 2015 17:44:54 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jul 2015 17:44:55 +0000 (10:44 -0700)
Update to the "linked checkout" in 2.5.0-rc1.

Instead of "checkout --to" that does not do what "checkout"
normally does, move the functionality to "git worktree add".

As this makes the end-user experience of the "worktree add" more or
less complete, I am tempted to say we should cook the other topic
that removes the internal "new-worktree-mode" hack from "checkout"
a bit longer in 'next', and release 2.5 final without that one.

* es/worktree-add:
Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference
worktree: caution that this is still experimental
Documentation/git-worktree: fix stale "git checkout --to" references

1  2 
Documentation/git.txt
diff --combined Documentation/git.txt
index d4aa3f60500364e21cb3de50fa2cd1d81729a8f0,ef76f952708b46cff693b51fbd3334c5336ff689..2ca77c8913dd181f19e10105deaf7a5642df8ec5
@@@ -43,70 -43,40 +43,70 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v2.2.0/git.html[documentation for release 2.2]
 +* link:v2.4.6/git.html[documentation for release 2.4.6]
  
  * release notes for
 +  link:RelNotes/2.4.6.txt[2.4.6],
 +  link:RelNotes/2.4.5.txt[2.4.5],
 +  link:RelNotes/2.4.4.txt[2.4.4],
 +  link:RelNotes/2.4.3.txt[2.4.3],
 +  link:RelNotes/2.4.2.txt[2.4.2],
 +  link:RelNotes/2.4.1.txt[2.4.1],
 +  link:RelNotes/2.4.0.txt[2.4].
 +
 +* link:v2.3.8/git.html[documentation for release 2.3.8]
 +
 +* release notes for
 +  link:RelNotes/2.3.8.txt[2.3.8],
 +  link:RelNotes/2.3.7.txt[2.3.7],
 +  link:RelNotes/2.3.6.txt[2.3.6],
 +  link:RelNotes/2.3.5.txt[2.3.5],
 +  link:RelNotes/2.3.4.txt[2.3.4],
 +  link:RelNotes/2.3.3.txt[2.3.3],
 +  link:RelNotes/2.3.2.txt[2.3.2],
 +  link:RelNotes/2.3.1.txt[2.3.1],
 +  link:RelNotes/2.3.0.txt[2.3].
 +
 +* link:v2.2.2/git.html[documentation for release 2.2.2]
 +
 +* release notes for
 +  link:RelNotes/2.2.2.txt[2.2.2],
 +  link:RelNotes/2.2.1.txt[2.2.1],
    link:RelNotes/2.2.0.txt[2.2].
  
 -* link:v2.1.3/git.html[documentation for release 2.1.3]
 +* link:v2.1.4/git.html[documentation for release 2.1.4]
  
  * release notes for
 +  link:RelNotes/2.1.4.txt[2.1.4],
    link:RelNotes/2.1.3.txt[2.1.3],
    link:RelNotes/2.1.2.txt[2.1.2],
    link:RelNotes/2.1.1.txt[2.1.1],
    link:RelNotes/2.1.0.txt[2.1].
  
 -* link:v2.0.4/git.html[documentation for release 2.0.4]
 +* link:v2.0.5/git.html[documentation for release 2.0.5]
  
  * release notes for
 +  link:RelNotes/2.0.5.txt[2.0.5],
    link:RelNotes/2.0.4.txt[2.0.4],
    link:RelNotes/2.0.3.txt[2.0.3],
    link:RelNotes/2.0.2.txt[2.0.2],
    link:RelNotes/2.0.1.txt[2.0.1],
    link:RelNotes/2.0.0.txt[2.0.0].
  
 -* link:v1.9.4/git.html[documentation for release 1.9.4]
 +* link:v1.9.5/git.html[documentation for release 1.9.5]
  
  * release notes for
 +  link:RelNotes/1.9.5.txt[1.9.5],
    link:RelNotes/1.9.4.txt[1.9.4],
    link:RelNotes/1.9.3.txt[1.9.3],
    link:RelNotes/1.9.2.txt[1.9.2],
    link:RelNotes/1.9.1.txt[1.9.1],
    link:RelNotes/1.9.0.txt[1.9.0].
  
 -* link:v1.8.5.5/git.html[documentation for release 1.8.5.5]
 +* link:v1.8.5.6/git.html[documentation for release 1.8.5.6]
  
  * release notes for
 +  link:RelNotes/1.8.5.6.txt[1.8.5.6],
    link:RelNotes/1.8.5.5.txt[1.8.5.5],
    link:RelNotes/1.8.5.4.txt[1.8.5.4],
    link:RelNotes/1.8.5.3.txt[1.8.5.3],
@@@ -784,8 -754,7 +784,8 @@@ Git so take care if using Cogito etc
  'GIT_INDEX_VERSION'::
        This environment variable allows the specification of an index
        version for new repositories.  It won't affect existing index
 -      files.  By default index file version [23] is used.
 +      files.  By default index file version 2 or 3 is used. See
 +      linkgit:git-update-index[1] for more information.
  
  'GIT_OBJECT_DIRECTORY'::
        If the object storage directory is specified via this
        normally in $GIT_DIR will be taken from this path
        instead. Worktree-specific files such as HEAD or index are
        taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and
-       the section 'MULTIPLE CHECKOUT MODE' in linkgit:checkout[1]
+       linkgit:git-worktree[1] for
        details. This variable has lower precedence than other path
        variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
  
@@@ -921,21 -890,19 +921,21 @@@ othe
        and the `core.editor` option in linkgit:git-config[1].
  
  'GIT_SSH'::
 -      If this environment variable is set then 'git fetch'
 -      and 'git push' will use this command instead
 -      of 'ssh' when they need to connect to a remote system.
 -      The '$GIT_SSH' command will be given exactly two or
 -      four arguments: the 'username@host' (or just 'host')
 -      from the URL and the shell command to execute on that
 -      remote system, optionally preceded by '-p' (literally) and
 -      the 'port' from the URL when it specifies something other
 -      than the default SSH port.
 +'GIT_SSH_COMMAND'::
 +      If either of these environment variables is set then 'git fetch'
 +      and 'git push' will use the specified command instead of 'ssh'
 +      when they need to connect to a remote system.
 +      The command will be given exactly two or four arguments: the
 +      'username@host' (or just 'host') from the URL and the shell
 +      command to execute on that remote system, optionally preceded by
 +      '-p' (literally) and the 'port' from the URL when it specifies
 +      something other than the default SSH port.
  +
 -To pass options to the program that you want to list in GIT_SSH
 -you will need to wrap the program and options into a shell script,
 -then set GIT_SSH to refer to the shell script.
 +`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
 +by the shell, which allows additional arguments to be included.
 +`$GIT_SSH` on the other hand must be just the path to a program
 +(which can be a wrapper shell script, if additional arguments are
 +needed).
  +
  Usually it is easier to configure any desired options through your
  personal `.ssh/config` file.  Please consult your ssh documentation
@@@ -945,13 -912,9 +945,13 @@@ for further details
        If this environment variable is set, then Git commands which need to
        acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
        will call this program with a suitable prompt as command-line argument
 -      and read the password from its STDOUT. See also the 'core.askpass'
 +      and read the password from its STDOUT. See also the 'core.askPass'
        option in linkgit:git-config[1].
  
 +'GIT_TERMINAL_PROMPT'::
 +      If this environment variable is set to `0`, git will not prompt
 +      on the terminal (e.g., when asking for HTTP authentication).
 +
  'GIT_CONFIG_NOSYSTEM'::
        Whether to skip reading settings from the system-wide
        `$(prefix)/etc/gitconfig` file.  This environment variable can
@@@ -1052,17 -1015,6 +1052,17 @@@ GIT_ICASE_PATHSPECS:
        variable when it is invoked as the top level command by the
        end user, to be recorded in the body of the reflog.
  
 +`GIT_REF_PARANOIA`::
 +      If set to `1`, include broken or badly named refs when iterating
 +      over lists of refs. In a normal, non-corrupted repository, this
 +      does nothing. However, enabling it may help git to detect and
 +      abort some operations in the presence of broken refs. Git sets
 +      this variable automatically when performing destructive
 +      operations like linkgit:git-prune[1]. You should not need to set
 +      it yourself unless you want to be paranoid about making sure
 +      an operation has touched every ref (e.g., because you are
 +      cloning a repository to make a backup).
 +
  
  Discussion[[Discussion]]
  ------------------------