Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-05-21Merge branch 'ld/discovery-limit-to-fs' (early part)Junio C Hamano
* '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()
2010-05-21Merge branch 'ar/config-from-command-line'Junio C Hamano
* 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
2010-04-24Git 1.7.1v1.7.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-23Git 1.7.0.6v1.7.0.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-12Git 1.7.0.5v1.7.0.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-05Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEMJunio C Hamano
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>
2010-04-04GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundariesJunio C Hamano
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>
2010-04-01Git 1.7.0.4v1.7.0.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-28Allow passing of configuration parameters in the command lineAlex Riesen
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>
2010-03-28Add support for GIT_ONE_FILESYSTEMLars R. Damerow
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>
2010-03-22Git 1.7.0.3v1.7.0.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-07Git 1.7.0.2v1.7.0.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-05Merge branch 'jn/maint-fix-pager' into maintJunio C Hamano
* 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
2010-02-28Git 1.7.0.1v1.7.0.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-15git.1: Clarify the behavior of the --paginate optionJonathan Nieder
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>
2010-02-13Git 1.7.0v1.7.0Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-11Sync with 1.6.6.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-11Git 1.6.6.2v1.6.6.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-21Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano
* 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
2010-01-21Git 1.6.6.1v1.6.6.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-21Merge branch 'maint-1.6.5' into maintJunio C Hamano
* 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
2010-01-20Git 1.6.5.8v1.6.5.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
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.
2009-12-23Git 1.6.6v1.6.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano
* 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
2009-12-16Git 1.6.5.7v1.6.5.7Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-11Sync with 1.6.5.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-11Git 1.6.5.6v1.6.5.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-05Sync with 1.6.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-05Git 1.6.5.5v1.6.5.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-03Merge in 1.6.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-03Git 1.6.5.4v1.6.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-16Sync with 1.6.5.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-16Git 1.6.5.3v1.6.5.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-26Sync with 1.6.5.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-26GIT 1.6.5.2v1.6.5.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-24Merge branch 'maint'Junio C Hamano
* maint: Fix list of released versions in the toc document Do not fail "describe --always" in a tag-less repository
2009-10-24Fix list of released versions in the toc documentJunio C Hamano
2009-10-19Merge branch 'cc/replace-no-replace'Junio C Hamano
* cc/replace-no-replace: git: add --no-replace-objects option to disable replacing
2009-10-17GIT 1.6.5.1v1.6.5.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-13git: add --no-replace-objects option to disable replacingChristian Couder
Commit dae556b (environment: add global variable to disable replacement) adds a variable to enable/disable replacement, and it is enabled by default for most commands. So there is no way to disable it for some commands, which is annoying when we want to get information about a commit that has been replaced. For example: $ git cat-file -p N would output information about the replacement commit if commit N is replaced. With the "--no-replace-objects" option that this patch adds it is possible to get information about the original commit using: $ git --no-replace-objects cat-file -p N While at it, let's add some documentation about this new option in the "git replace" man page too. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-10GIT 1.6.5v1.6.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-17GIT 1.6.4.4v1.6.4.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-13GIT 1.6.4.3v1.6.4.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-30GIT 1.6.4.2v1.6.4.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-22GIT 1.6.4.1v1.6.4.1Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-13Merge branch 'maint-1.6.3' into maintJunio C Hamano
* maint-1.6.3: Change mentions of "git programs" to "git commands" Documentation: merge: one <remote> is required help.c: give correct structure's size to memset()
2009-08-13Change mentions of "git programs" to "git commands"Ori Avtalion
Most of the docs and printouts refer to "commands" when discussing what the end users call via the "git" top-level program. We should refer them as "git programs" when we discuss the fact that the commands are implemented as separate programs, but in other contexts, it is better to use the term "git commands" consistently. Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-29GIT 1.6.4v1.6.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-29Sync with 1.6.3.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>