aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git.txt
Commit message (Collapse)AuthorAge
* Git 1.8.2.3v1.8.2.3Junio C Hamano2013-05-09
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.8.2.2v1.8.2.2Junio C Hamano2013-04-26
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-15
| | | | | | | | Use "SHA-1" instead of "SHA1" whenever we talk about the hash function. When used as a programming symbol, we keep "SHA1". Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.8.2.1v1.8.2.1Junio C Hamano2013-04-07
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Sync with 1.8.1.6Junio C Hamano2013-04-07
|\
| * Git 1.8.1.6v1.8.1.6Junio C Hamano2013-04-07
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-26
|\ \ | |/ | | | | | | * maint-1.8.1: Correct the docs about GIT_SSH.
| * Correct the docs about GIT_SSH.Dan Bornstein2013-03-26
| | | | | | | | | | | | | | | | | | In particular, it can get called with four arguments if you happen to be referring to a repo using the ssh:// scheme with a non-default port number. Signed-off-by: Dan Bornstein <danfuzz@milk.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Merge branch 'mh/maint-ceil-absolute' into maintJunio C Hamano2013-03-07
| |\ | | | | | | | | | | | | * mh/maint-ceil-absolute: Provide a mechanism to turn off symlink resolution in ceiling paths
* | | Git 1.8.2v1.8.2Junio C Hamano2013-03-13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.8.1.5Junio C Hamano2013-03-01
|\ \ \ | |/ /
| * | Git 1.8.1.5v1.8.1.5Junio C Hamano2013-03-01
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'mm/config-intro-in-git-doc' into maintJunio C Hamano2013-02-25
| |\ \ | | | | | | | | | | | | | | | | * mm/config-intro-in-git-doc: git.txt: update description of the configuration mechanism
* | \ \ Merge branch 'mh/maint-ceil-absolute'Junio C Hamano2013-02-27
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An earlier workaround designed to help people who list logical directories that will not match what getcwd(3) returns in the GIT_CEILING_DIRECTORIES had an adverse effect when it is slow to stat and readlink a directory component of an element listed on it. * mh/maint-ceil-absolute: Provide a mechanism to turn off symlink resolution in ceiling paths
| * | | Provide a mechanism to turn off symlink resolution in ceiling pathsMichael Haggerty2013-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 1b77d83cab 'setup_git_directory_gently_1(): resolve symlinks in ceiling paths' changed the setup code to resolve symlinks in the entries in GIT_CEILING_DIRECTORIES. Because those entries are compared textually to the symlink-resolved current directory, an entry in GIT_CEILING_DIRECTORIES that contained a symlink would have no effect. It was known that this could cause performance problems if the symlink resolution *itself* touched slow filesystems, but it was thought that such use cases would be unlikely. The intention of the earlier change was to deal with a case when the user has this: GIT_CEILING_DIRECTORIES=/home/gitster but in reality, /home/gitster is a symbolic link to somewhere else, e.g. /net/machine/home4/gitster. A textual comparison between the specified value /home/gitster and the location getcwd(3) returns would not help us, but readlink("/home/gitster") would still be fast. After this change was released, Anders Kaseorg <andersk@mit.edu> reported: > [...] my computer has been acting so slow when I’m not connected to > the network. I put various network filesystem paths in > $GIT_CEILING_DIRECTORIES, such as > /afs/athena.mit.edu/user/a/n/andersk (to avoid hitting its parents > /afs/athena.mit.edu, /afs/athena.mit.edu/user/a, and > /afs/athena.mit.edu/user/a/n which all live in different AFS > volumes). Now when I’m not connected to the network, every > invocation of Git, including the __git_ps1 in my shell prompt, waits > for AFS to timeout. To allow users to work around this problem, give them a mechanism to turn off symlink resolution in GIT_CEILING_DIRECTORIES entries. All the entries that follow an empty entry will not be checked for symbolic links and used literally in comparison. E.g. with these: GIT_CEILING_DIRECTORIES=:/foo/bar:/xyzzy or GIT_CEILING_DIRECTORIES=/foo/bar::/xyzzy we will not readlink("/xyzzy") because it comes after an empty entry. With the former (but not with the latter), "/foo/bar" comes after an empty entry, and we will not readlink it, either. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Sync with v1.8.1.4Junio C Hamano2013-02-19
|\ \ \ \ | | |/ / | |/| |
| * | | Git 1.8.1.4v1.8.1.4Junio C Hamano2013-02-19
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'mm/config-intro-in-git-doc'Junio C Hamano2013-02-18
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * mm/config-intro-in-git-doc: git.txt: update description of the configuration mechanism
| * | | git.txt: update description of the configuration mechanismMatthieu Moy2013-02-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old Git version where it appeared is now useful only to historians, not to normal users. Also, the text was mentioning only the per-repo config file, but this is a good place to teach that customization can also be made per-user. While at it, remove a now-defunct e-mail from an example. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.8.1.3Junio C Hamano2013-02-07
|\ \ \ | |/ /
| * | Git 1.8.1.3v1.8.1.3Junio C Hamano2013-02-07
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
| | | | | | | | | | | | | | | Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: avoid poor-man's small caps GITThomas Ackermann2013-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the earlier days, we used to spell the name of the system as GIT, to simulate as if it were typeset with capital G and IT in small caps. Later we stopped doing so at around 1.6.5 days. Let's stop doing so throughout the documentation. The name to refer to the whole system (and the concept it embodies) is "Git"; the command end-users type is "git". And document this in the coding guideline. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.8.1.1Junio C Hamano2013-01-14
|\ \ \ | |/ /
| * | Git 1.8.1.1v1.8.1.1Junio C Hamano2013-01-14
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Merge branch 'jn/warn-on-inaccessible-loosen' into maintJunio C Hamano2013-01-11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attempting to read the XDG-style $HOME/.config/git/config and finding that $HOME/.config/git is a file, we gave a wrong error message, instead of treating the case as "a custom config file does not exist there" and moving on. * jn/warn-on-inaccessible-loosen: config: exit on error accessing any config file doc: advertise GIT_CONFIG_NOSYSTEM config: treat user and xdg config permission problems as errors config, gitignore: failure to access with ENOTDIR is ok
* | \ \ Merge branch 'jn/warn-on-inaccessible-loosen'Junio C Hamano2013-01-06
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deal with a situation where .config/git is a file and we notice .config/git/config is not readable due to ENOTDIR, not ENOENT. * jn/warn-on-inaccessible-loosen: config: exit on error accessing any config file doc: advertise GIT_CONFIG_NOSYSTEM config: treat user and xdg config permission problems as errors config, gitignore: failure to access with ENOTDIR is ok
| * | | doc: advertise GIT_CONFIG_NOSYSTEMJonathan Nieder2012-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a multiuser system where mortals do not have write access to /etc, the GIT_CONFIG_NOSYSTEM variable is the best tool we have to keep getting work done when a syntax error or other problem renders /etc/gitconfig buggy, until the sysadmin sorts the problem out. Noticed while experimenting with teaching git to error out when /etc/gitconfig is unreadable. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-05
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow scripts to feed literal paths to commands that take pathspecs, by disabling wildcard globbing. * jk/pathspec-literal: add global --literal-pathspecs option Conflicts: dir.c
| * | | add global --literal-pathspecs optionJeff King2012-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git takes pathspec arguments in many places to limit the scope of an operation. These pathspecs are treated not as literal paths, but as glob patterns that can be fed to fnmatch. When a user is giving a specific pattern, this is a nice feature. However, when programatically providing pathspecs, it can be a nuisance. For example, to find the latest revision which modified "$foo", one can use "git rev-list -- $foo". But if "$foo" contains glob characters (e.g., "f*"), it will erroneously match more entries than desired. The caller needs to quote the characters in $foo, and even then, the results may not be exactly the same as with a literal pathspec. For instance, the depth checks in match_pathspec_depth do not kick in if we match via fnmatch. This patch introduces a global command-line option (i.e., one for "git" itself, not for specific commands) to turn this behavior off. It also has a matching environment variable, which can make it easier if you are a script or porcelain interface that is going to issue many such commands. This option cannot turn off globbing for particular pathspecs. That could eventually be done with a ":(noglob)" magic pathspec prefix. However, that level of granularity is more cumbersome to use for many cases, and doing ":(noglob)" right would mean converting the whole codebase to use "struct pathspec", as the usual "const char **pathspec" cannot represent extra per-item flags. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Merge branch 'maint'Junio C Hamano2012-12-13
| |\ \ \
| * | | | git(1): show link to contributor summary pageJunio C Hamano2012-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.8.1v1.8.1Junio C Hamano2012-12-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Git 1.8.0.3v1.8.0.3Junio C Hamano2012-12-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | git(1): show link to contributor summary pageJunio C Hamano2012-12-27
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | git.txt: add missing info about --git-dir command-line optionManlio Perillo2012-12-13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE), the Documentation/git.txt file did not mention that the GIT_DIR environment variable can also be set using the --git-dir command line option. Signed-off-by: Manlio Perillo <manlio.perillo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.8.0.2v1.8.0.2Junio C Hamano2012-12-10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | git(1): remove a defunct link to "list of authors"Junio C Hamano2012-12-09
| | | | | | | | | | | | | | | | | | | | | | | | The linked page has not been showing the promised "more complete list" for more than 6 months by now, and nobody has resurrected the list there nor elsewhere since then. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.8.0.1v1.8.0.1Junio C Hamano2012-11-25
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.8.0v1.8.0Junio C Hamano2012-10-21
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.12.4v1.7.12.4Junio C Hamano2012-10-17
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.12.3v1.7.12.3Junio C Hamano2012-10-08
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.12.2v1.7.12.2Junio C Hamano2012-09-29
| |/ |/| | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.12.1v1.7.12.1Junio C Hamano2012-09-18
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.7.11.7Junio C Hamano2012-09-14
|\ \
| * | Git 1.7.11.7v1.7.11.7Junio C Hamano2012-09-14
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Sync with 1.7.11.6Junio C Hamano2012-09-11
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | Git 1.7.11.6v1.7.11.6Junio C Hamano2012-09-11
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'jc/doc-git-updates' into maintJunio C Hamano2012-09-11
|\ \ \ | |_|/ |/| | | | | | | | * jc/doc-git-updates: Documentation: update the introductory section
| * | Documentation: update the introductory sectionJunio C Hamano2012-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second paragraph in the git(1) description section were meant to guide people who are not ready to dive into this page away from here. Referring migrating CVS users to another page before they get acquainted with Git was somewhat out of place. Move the reference to the "FURTHER DOCUMENTATION" section and push that section down. Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-05 12:48:44 +0000