- 15 4月, 2013 2 次提交
-
-
由 Nguyễn Thái Ngọc Duy 提交于
"git checkout -- <paths>" is usually used to restore all modified files in <paths>. In sparse checkout mode, this command is overloaded with another meaning: to add back all files in <paths> that are excluded by sparse patterns. As the former makes more sense for day-to-day use. Switch it to the default and the latter enabled with --ignore-skip-worktree-bits. While at there, add info/sparse-checkout to gitrepository-layout.txt Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Finishing touches. * po/help-guides: help: mark common_guides[] as translatable
-
- 13 4月, 2013 23 次提交
-
-
由 Torsten Bögershausen 提交于
Make the shell script more portable: - Split export X=Y into 2 lines - Use printf instead of echo -e Use UTF-8 code points which are not decomposed by the filesystem: Code points like "á" will be decomposed by Mac OS X. bzr is unable to find the file "á" on disk. Use code points from unicode which can not be decomposed. In other words, the precompsed form use the same bytes as decomposed. Signed-off-by: NTorsten Bögershausen <tboegi@web.de> Acked-by: NFelipe Contreras <felipe.contreras@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
-
由 Junio C Hamano 提交于
* rr/test-3200-style: t3200 (branch): modernize style Conflicts: t/t3200-branch.sh
-
由 Junio C Hamano 提交于
* mg/texinfo-5: Documentation: Strip texinfo anchors to avoid duplicates
-
由 Junio C Hamano 提交于
* jk/diffcore-break-divzero: diffcore-break: don't divide by zero
-
由 Junio C Hamano 提交于
* cn/commit-amend-doc: Documentation/git-commit: reword the --amend explanation
-
由 Junio C Hamano 提交于
* jk/bisect-prn-unsigned: bisect: avoid signed integer overflow
-
由 Junio C Hamano 提交于
* jk/no-more-self-assignment: match-trees: simplify score_trees() using tree_entry() submodule: clarify logic in show_submodule_summary
-
由 Junio C Hamano 提交于
* rr/send-email-perl-critique: send-email: use the three-arg form of open in recipients_cmd send-email: drop misleading function prototype send-email: use "return;" not "return undef;" on error codepaths
-
由 Junio C Hamano 提交于
* jc/t5516-pushInsteadOf-vs-pushURL: t5516: test interaction between pushURL and pushInsteadOf correctly
-
由 Stefano Lattarini 提交于
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Correct spelling mistakes noticed using Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Noticed using Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Correct some typos found using Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Some of these were found using Lucas De Marchi's codespell tool. Others noticed by Eric Sunshine. Helped-by: NEric Sunshine <sunshine@sunshineco.com> Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Noticed using Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Noticed with Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine. Helped-by: NEric Sunshine <sunshine@sunshineco.com> Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefano Lattarini 提交于
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: NStefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint-1.8.1: fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format
-
由 Simon Ruderich 提交于
Signed-off-by: NSimon Ruderich <simon@ruderich.org> Acked-by: NPhilip Oakley <philipoakley@iee.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Paul Price 提交于
The --signed-tags argument is plural, while error messages referred to --signed-tag (singular). Tweak error messages to correspond to the argument. Signed-off-by: NPaul Price <price@astro.princeton.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefan Saasen 提交于
eb32d236 introduced the OBJ_OFS_DELTA object that uses a relative offset to identify the base object instead of the 20-byte SHA1 reference. The pack file documentation only mentions the SHA1 based reference in its description of the deltified object entry. Update the pack format documentation to clarify that the deltified object representation refers to its base using either a relative negative offset or the absolute SHA1 identifier. Signed-off-by: NStefan Saasen <ssaasen@atlassian.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 12 4月, 2013 11 次提交
-
-
由 Junio C Hamano 提交于
* tb/document-status-u-tradeoff: i18n: make the translation of -u advice in one go
-
由 Jiang Xin 提交于
The advice (consider use of -u when read_directory takes too long) is separated into 3 different status_printf_ln() calls, and which brings trouble for translators. Since status_vprintf() called by status_printf_ln() can handle eol in buffer, we could simply join these lines into one paragraph. Signed-off-by: NJiang Xin <worldhello.net@gmail.com> Reviewed-by: NEric Sunshine <sunshine@sunshineco.com> Reviewed-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Typo fix: replacing it's -> its t: make PIPE a standard test prerequisite archive: clarify explanation of --worktree-attributes t/README: --immediate skips cleanup commands for failed tests
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Attempts to minimize "diff -c/--cc" output by coalescing the same lines removed from the parents better, but with an O(n^2) complexity. * ap/combine-diff-coalesce-lost: combine-diff: coalesce lost lines optimally
-
由 Junio C Hamano 提交于
"git log -S/-G" started paying attention to textconv filter, but there was no way to disable this. Make it honor --no-textconv option. * sr/log-SG-no-textconv: diffcore-pickaxe: unify code for log -S/-G diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>" diffcore-pickaxe: port optimization from has_changes() to diff_grep() diffcore-pickaxe: respect --no-textconv diffcore-pickaxe: remove fill_one() diffcore-pickaxe: remove unnecessary call to get_textconv()
-
由 Junio C Hamano 提交于
A few bugfixes to "git rerere" working on corner case merge conflicts. * js/rerere-forget-protect-against-NUL: rerere forget: do not segfault if not all stages are present rerere forget: grok files containing NUL
-
由 Junio C Hamano 提交于
"git help" learned "-g" option to show the list of guides just like list of commands are given with "-a". * po/help-guides: doc: include --guide option description for "git help" help: mention -a and -g option, and 'git help <concept>' usage. builtin/help.c: add list_common_guides_help() function builtin/help.c: add --guide option builtin/help.c: split "-a" processing into two
-
由 Benoit Bourbie 提交于
Signed-off-by: NBenoit Bourbie <benoit.bourbie@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Adam Spiers 提交于
The 'PIPE' test prerequisite was already defined identically by t9010 and t9300, therefore it makes sense to make it a predefined prerequisite. Signed-off-by: NAdam Spiers <git@adamspiers.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PWD). Link to the ATTRIBUTES section, which has more details. Reported-by: NAmit Bakshi <ambakshi@gmail.com> Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 4月, 2013 1 次提交
-
-
由 Simon Ruderich 提交于
Signed-off-by: NSimon Ruderich <simon@ruderich.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 4月, 2013 3 次提交
-
-
由 Felipe Contreras 提交于
revision_history() is deprecated and doesn't do what we want (revno instead of dotted_revno?). Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Christophe Simonis 提交于
The previous patches didn't deal with all the scenarios. Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Kevin Bracey reports that the change regresses a case shown in the user manual. Trading one fix with another breakage is not worth it. Just keep the test to document the existing breakage, and revert the change for now. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-