- 07 11月, 2011 1 次提交
-
-
由 Felipe Contreras 提交于
Bad copy-paste. Otherwise the help text for "git remote set-url --help" would show help for "git remote update" subcommand. Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 19 1月, 2010 1 次提交
-
-
由 Ilari Liusvaara 提交于
Add 'git remote set-url' for changing URL of remote repository with one "porcelain-level" command. Signed-off-by: NIlari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 1月, 2010 10 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* tc/test-locate-httpd: t/lib-http.sh: Restructure finding of default httpd location
-
由 Junio C Hamano 提交于
* jh/commit-status: t7502: test commit.status, --status and --no-status commit: support commit.status, --status, and --no-status Conflicts: Documentation/git-commit.txt builtin-commit.c
-
由 Junio C Hamano 提交于
* jn/makefile: Makefile: consolidate .FORCE-* targets Makefile: learn to generate listings for targets requiring special flags Makefile: use target-specific variable to pass flags to cc Makefile: regenerate assembler listings when asked
-
由 Junio C Hamano 提交于
* jc/maint-1.6.1-checkout-m-custom-merge: checkout -m path: fix recreating conflicts Conflicts: t/t7201-co.sh
-
由 Junio C Hamano 提交于
* tc/clone-v-progress: clone: use --progress to force progress reporting clone: set transport->verbose when -v/--verbose is used git-clone.txt: reword description of progress behaviour check stderr with isatty() instead of stdout when deciding to show progress Conflicts: transport.c
-
由 Junio C Hamano 提交于
* tc/smart-http-restrict: Test t5560: Fix test when run with dash Smart-http tests: Test http-backend without curl or a webserver Smart-http tests: Break test t5560-http-backend into pieces Smart-http tests: Improve coverage in test t5560 Smart-http: check if repository is OK to export before serving it
-
由 Junio C Hamano 提交于
* jk/run-command-use-shell: t4030, t4031: work around bogus MSYS bash path conversion diff: run external diff helper with shell textconv: use shell to run helper editor: use run_command's shell feature run-command: optimize out useless shell calls run-command: convert simple callsites to use_shell t0021: use $SHELL_PATH for the filter script run-command: add "use shell" option
-
由 Junio C Hamano 提交于
* sr/gfi-options: fast-import: add (non-)relative-marks feature fast-import: allow for multiple --import-marks= arguments fast-import: test the new option command fast-import: add option command fast-import: add feature command fast-import: put marks reading in its own function fast-import: put option parsing code in separate functions
-
由 Junio C Hamano 提交于
The mailing address of FSF changed quite a while ago. Also the expansion of the acronym LGPL (which we don't use) is "Lesser GPL" not "Library GPL" these days in recent copies of GPLv2. Update the copy we have with a fresh download of <http://www.gnu.org/licenses/gpl-2.0.txt>. This incidentally removes form-feeds in the text we retained for all these years. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 1月, 2010 3 次提交
-
-
由 Junio C Hamano 提交于
* maint: Fix uninitialized variable in get_refs_via_rsync(). Document git-blame triple -C option
-
由 Junio C Hamano 提交于
* cc/reset-more: t7111: fix bad HEAD in tests with unmerged entries
-
由 Christian Couder 提交于
When testing what happens on unmerged entries, the HEAD is the commit we are starting from before the merge that fails and create the unmerged entries. It is not the commit before. Signed-off-by: NChristian Couder <chriscool@tuxfamily.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 1月, 2010 2 次提交
-
-
由 Richard Weinberger 提交于
This fixes a crash when cloning via rsync://. Signed-off-by: NRichard Weinberger <richard@nod.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Tarmigan Casebolt 提交于
A command invocation preceded by variable assignments, i.e. VAR1=VAL1 VAR2=VAL2 ... command args are implemented by dash and ksh in such a way not to export these variables, and keep the values after the command finishes, when the command is a shell function. POSIX.1 "2.9.5 Function Definition Command" specifies this behaviour. Many shells however treat this construct the same way as they are calling external commands. They export the variables during the duration of command, and resets their values after command returns. The test relied on the behaviour of the latter kind. Reported-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NTarmigan Casebolt <tarmigan+git@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 15 1月, 2010 1 次提交
-
-
由 Ramkumar Ramachandra 提交于
Lift the explanation of -CCC option in the source to the documentation. Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 14 1月, 2010 5 次提交
-
-
由 Junio C Hamano 提交于
* jc/checkout-merge-base: rebase -i: teach --onto A...B syntax rebase: fix --onto A...B parsing and add tests "rebase --onto A...B" replays history on the merge base between A and B "checkout A...B" switches to the merge base between A and B
-
由 Junio C Hamano 提交于
* rs/maint-archive-match-pathspec: archive: complain about path specs that don't match anything
-
由 Junio C Hamano 提交于
* il/vcs-helper: Reset possible helper before reusing remote structure Remove special casing of http, https and ftp Support remote archive from all smart transports Support remote helpers implementing smart transports Support taking over transports Refactor git transport options parsing Pass unknown protocols to external protocol handlers Support mandatory capabilities Add remote helper debug mode Conflicts: Documentation/git-remote-helpers.txt transport-helper.c
-
由 Junio C Hamano 提交于
* cc/reset-more: t7111: check that reset options work as described in the tables Documentation: reset: add some missing tables Fix bit assignment for CE_CONFLICTED "reset --merge": fix unmerged case reset: use "unpack_trees()" directly instead of "git read-tree" reset: add a few tests for "git reset --merge" Documentation: reset: add some tables to describe the different options reset: improve mixed reset error message when in a bare repo
-
由 Junio C Hamano 提交于
* nd/sparse: (25 commits) t7002: test for not using external grep on skip-worktree paths t7002: set test prerequisite "external-grep" if supported grep: do not do external grep on skip-worktree entries commit: correctly respect skip-worktree bit ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID tests: rename duplicate t1009 sparse checkout: inhibit empty worktree Add tests for sparse checkout read-tree: add --no-sparse-checkout to disable sparse checkout support unpack-trees(): ignore worktree check outside checkout area unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout unpack-trees.c: generalize verify_* functions unpack-trees(): add CE_WT_REMOVE to remove on worktree alone Introduce "sparse checkout" dir.c: export excluded_1() and add_excludes_from_file_1() excluded_1(): support exclude files in index unpack-trees(): carry skip-worktree bit over in merged_entry() Read .gitignore from index if it is skip-worktree Avoid writing to buffer in add_excludes_from_file_1() ... Conflicts: .gitignore Documentation/config.txt Documentation/git-update-index.txt Makefile entry.c t/t7002-grep.sh
-
- 13 1月, 2010 6 次提交
-
-
由 Junio C Hamano 提交于
Make sure that the status information: - is shown as before without configuration nor command line option; - is shown if commit.status is set to true and no command line option is given, or --status is explicitly given; - is not shown if commit.status is set to false and no command line option is given, or --no-status is explicitly given. Also make sure that the way lines taken from the custom --template appear in the log message editor is not changed at all. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 James P. Howard, II 提交于
A new configuration variable commit.status, and new command line options --status, and --no-status control whether or not the git status information is included in the commit message template when using an editor to prepare the commit message. It does not affect the effects of a user's commit.template settings. Signed-off-by: NJames P. Howard, II <jh@jameshoward.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: remote-curl: Fix Accept header for smart HTTP connections grep: -L should show empty files rebase--interactive: Ignore comments and blank lines in peek_next_command
-
由 Matthieu Moy 提交于
When calling a git command from a subdirectory and a file locking fails, the user will get a path relative to the root of the worktree, which is invalid from the place where the command is ran. Make it easy for the user to know which file it is. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Bart Trojanowski 提交于
This script passes the author and committer to git-commit via environment variables, but it was missing the seccond T of COMMITTER in a few places. Signed-off-by: NBart Trojanowski <bart@jukie.net> Acked-by: NStelian Pop <stelian@popies.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Shawn O. Pearce 提交于
We actually expect to see an application/x-git-upload-pack-result but we lied and said we Accept *-response. This was a typo on my part when I was writing the code. Fortunately the wrong Accept header had no real impact, as the deployed git-http-backend servers were not testing the Accept header before they returned their content. Signed-off-by: NShawn O. Pearce <spearce@spearce.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 12 1月, 2010 3 次提交
-
-
由 Junio C Hamano 提交于
The -L (--files-without-match) option is supposed to show paths that produced no matches. When running the internal grep on work tree files, however, we had an optimization to just return on zero-sized files, without doing anything. This optimization doesn't matter too much in practice (a tracked empty file must be rare, or there is something wrong with your project); to produce results consistent with GNU grep, we should stop the optimization and show empty files as not having the given pattern. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Matthieu Moy 提交于
The error message in case of non-fast forward points to 'git push --help', but used to talk about a section 'non-fast-forward', while the actual section name is 'Note about fast-forwards'. Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael Haggerty 提交于
Previously, blank lines and/or comments within a series of squash/fixup commands would confuse "git rebase -i" into thinking that the series was finished. It would therefore require the user to edit the commit message for the squash/fixup commits seen so far. Then, after continuing, it would ask the user to edit the commit message again. Ignore comments and blank lines within a group of squash/fixup commands, allowing them to be processed in one go. Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 1月, 2010 8 次提交
-
-
由 Junio C Hamano 提交于
* tr/http-updates: Remove http.authAny Allow curl to rewind the RPC read buffer Add an option for using any HTTP authentication scheme, not only basic http: maintain curl sessions
-
由 Junio C Hamano 提交于
* jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE
-
由 Junio C Hamano 提交于
* jk/push-to-delete: builtin-push: add --delete as syntactic sugar for :foo
-
由 Junio C Hamano 提交于
* mm/config-path: builtin-config: add --path option doing ~ and ~user expansion.
-
由 Junio C Hamano 提交于
* pm/cvs-environ: CVS Server: Support reading base and roots from environment
-
由 Junio C Hamano 提交于
* tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state
-
由 Junio C Hamano 提交于
* bg/maint-remote-update-default: Fix "git remote update" with remotes.defalt set
-
由 Junio C Hamano 提交于
* mm/diag-path-in-treeish: Detailed diagnosis when parsing an object name fails.
-