summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
Commit message (Collapse)AuthorAgeFilesLines
* Git 1.7.3.2v1.7.3.2Junio C Hamano2010-10-211-1/+2
|
* Merge branch 'sn/doc-opt-notation' into maintJunio C Hamano2010-10-211-6/+6
|\ | | | | | | | | | | | | | | | | | | * sn/doc-opt-notation: Fix {update,checkout}-index usage strings Put a space between `<' and argument in pack-objects usage string Remove stray quotes in --pretty and --format documentation Use parentheses and `...' where appropriate Fix odd markup in --diff-filter documentation Use angles for placeholders consistently
| * Use angles for placeholders consistentlyŠtěpán Němec2010-10-081-6/+6
| | | | | | | | | | | | Signed-off-by: Štěpán Němec <stepnem@gmail.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: gitrevisions is in section 7Jonathan Nieder2010-10-131-1/+1
|/ | | | | | | | | | | Fix references to gitrevisions(1) in the manual pages and HTML documentation. In practice, this will not matter much unless someone tries to use a hard copy of the git reference manual. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.3.1v1.7.3.1Junio C Hamano2010-09-291-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.3v1.7.3Junio C Hamano2010-09-181-0/+5
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'np/relnotes-in-subdir'Junio C Hamano2010-09-101-105/+105
|\ | | | | | | | | | | * np/relnotes-in-subdir: install-webdoc: keep installed RelNotes-*.txt Documentation: move RelNotes into a directory of their own
| * Documentation: move RelNotes into a directory of their ownNicolas Pitre2010-09-061-105/+105
| | | | | | | | | | | | | | | | There are 108 of them already. That's a bit more than one third of all the files in the Documentation directory already, and still growing. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'kf/askpass-config'Junio C Hamano2010-09-081-0/+7
|\ \ | |/ |/| | | | | | | | | * kf/askpass-config: Extend documentation of core.askpass and GIT_ASKPASS. Allow core.askpass to override SSH_ASKPASS. Add a new option 'core.askpass'.
| * Extend documentation of core.askpass and GIT_ASKPASS.Knut Franke2010-08-311-0/+7
| | | | | | | | | | Signed-off-by: Knut Franke <k.franke@science-computing.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.2.3v1.7.2.3Junio C Hamano2010-09-031-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.2.2v1.7.2.2Junio C Hamano2010-08-191-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Documentation: reporting bugsJunio C Hamano2010-08-021-0/+7
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.2.1v1.7.2.1Junio C Hamano2010-07-271-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.7.1.2Junio C Hamano2010-07-271-2/+4
|\ \ | |/ |/|
| * Git 1.7.1.2v1.7.1.2Junio C Hamano2010-07-271-1/+3
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Sync with 1.7.0 seriesJunio C Hamano2010-07-271-1/+3
| |\
| | * Git 1.7.0.7v1.7.0.7Junio C Hamano2010-07-271-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.2v1.7.2Junio C Hamano2010-07-211-0/+5
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Documentation: link to gitrevisions rather than git-rev-parseMichael J Gruber2010-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, whenever we need documentation for revisions and ranges, we link to the git-rev-parse man page, i.e. a plumbing man page, which has this along with the documentation of all rev-parse modes. Link to the new gitrevisions man page instead in all cases except - when the actual git-rev-parse command is referred to or - in very technical context (git-send-pack). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.2-rc1v1.7.2-rc1Junio C Hamano2010-06-301-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'ld/discovery-limit-to-fs' (early part)Junio C Hamano2010-05-211-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'ld/discovery-limit-to-fs' (early part): Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries Add support for GIT_ONE_FILESYSTEM truncate cwd string before printing error message config.c: remove static keyword from git_env_bool()
| * | | Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEMJunio C Hamano2010-04-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a missing ONE_FILESYSTEM defaults to true, the only users who set this variable set it to false to tell git not to limit the discovery to one filesystem; there are too many negations in one sentence to make a simple panda brain dizzy. Use the variable GIT_DISCOVERY_ACROSS_FILESYSTEM that changes the behaviour from the default "limit to one filesystem" to "cross the boundary as I ask you to"; makes the semantics much more straight forward. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundariesJunio C Hamano2010-04-041-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regarding the new environment variable, Linus Torvalds <torvalds@linux-foundation.org> writes on Tue, 30 Mar 2010 in <alpine.LFD.2.00.1003301537150.3707@i5.linux-foundation.org>: I suspect that it is _very_ unusual to have a source repo that crosses multiple filesystems, and the original reason for this patch-series seems to me to be likely to be more common than that multi-fs case. So having the logic go the other way would seem to match the common case, no? The "crossing filesystem boundary" condition is checked by comparing st_dev field in the result from stat(2). This is slightly worrysome if non-POSIX ports return different values in the field even for directories in the same work tree extracted to the same "filesystem". Erik Faye-Lund confirms that in the msysgit port st_dev is 0, so this should be safe, as "even Windows is safe" ;-) This will affect those who use /.git to cram /etc and /home/me in the same repostiory, /home is mounted from non-root filesystem, and a git operation is done from inside /home/me/src. But that is such a corner case we don't want to give preference over helping people who will benefit from having this default so that they do not have to suffer from slow automounters. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | Add support for GIT_ONE_FILESYSTEMLars R. Damerow2010-03-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes git pay attention to the GIT_ONE_FILESYSTEM environment variable. When that variable is set, git will stop searching for a GIT_DIR when it attempts to cross a filesystem boundary. When working in an environment with too many automount points to make maintaining a GIT_CEILING_DIRECTORIES list enjoyable, GIT_ONE_FILESYSTEM gives the option of turning all such attempts off with one setting. Signed-off-by: Lars R. Damerow <lars@pixar.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'ar/config-from-command-line'Junio C Hamano2010-05-211-0/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | * ar/config-from-command-line: Complete prototype of git_config_from_parameters() Use strbufs instead of open-coded string manipulation Allow passing of configuration parameters in the command line
| * | | Allow passing of configuration parameters in the command lineAlex Riesen2010-03-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The values passed this way will override whatever is defined in the config files. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Git 1.7.1v1.7.1Junio C Hamano2010-04-231-0/+5
| |_|/ |/| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-221-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.0.5v1.7.0.5Junio C Hamano2010-04-111-1/+2
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Git 1.7.0.4v1.7.0.4Junio C Hamano2010-03-311-1/+2
| |/ |/| | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.0.3v1.7.0.3Junio C Hamano2010-03-211-1/+2
|/ | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.0.2v1.7.0.2Junio C Hamano2010-03-071-1/+2
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano2010-03-041-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | * jn/maint-fix-pager: tests: Fix race condition in t7006-pager t7006-pager: if stdout is not a terminal, make a new one tests: Add tests for automatic use of pager am: Fix launching of pager git svn: Fix launching of pager git.1: Clarify the behavior of the --paginate option Make 'git var GIT_PAGER' always print the configured pager Fix 'git var' usage synopsis
| * git.1: Clarify the behavior of the --paginate optionJonathan Nieder2010-02-141-2/+6
| | | | | | | | | | | | | | | | | | The --paginate option is meant to negate the effect of an explicit or implicit pager.<cmd> = false setting. Thus it turns the pager on if output is going to a terminal rather than unconditionally. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.7.0.1v1.7.0.1Junio C Hamano2010-02-281-1/+2
|/ | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 1.7.0v1.7.0Junio C Hamano2010-02-121-0/+5
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Sync with 1.6.6.2Junio C Hamano2010-02-101-1/+2
|\ | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.6.6.2v1.6.6.2Junio C Hamano2010-02-101-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-201-4/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | * remotes/trast-doc/for-next: Documentation: spell 'git cmd' without dash throughout Documentation: format full commands in typewriter font Documentation: warn prominently against merging with dirty trees Documentation/git-merge: reword references to "remote" and "pull" Conflicts: Documentation/config.txt Documentation/git-config.txt Documentation/git-merge.txt
| * Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation was quite inconsistent when spelling 'git cmd' if it only refers to the program, not to some specific invocation syntax: both 'git-cmd' and 'git cmd' spellings exist. The current trend goes towards dashless forms, and there is precedent in 647ac70 (git-svn.txt: stop using dash-form of commands., 2009-07-07) to actively eliminate the dashed variants. Replace 'git-cmd' with 'git cmd' throughout, except where git-shell, git-cvsserver, git-upload-pack, git-receive-pack, and git-upload-archive are concerned, because those really live in the $PATH.
* | Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-201-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-201-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | * maint-1.6.5: Git 1.6.5.8 Fix mis-backport of t7002 bash completion: factor submodules into dirty state reset: unbreak hard resets with GIT_WORK_TREE Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes
| * Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-201-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Git 1.6.6v1.6.6Junio C Hamano2009-12-231-0/+5
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-161-1/+2
|\ \ | |/ | | | | | | | | | | | | | | * maint: Git 1.6.5.7 worktree: don't segfault with an absolute pathspec without a work tree ignore unknown color configuration help.autocorrect: do not run a command if the command given is junk Illustrate "filter" attribute with an example
| * Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-161-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.6.5.6Junio C Hamano2009-12-101-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-101-1/+2
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.6.5.5Junio C Hamano2009-12-051-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
View Lorry Controller Status