- 16 3月, 2012 1 次提交
-
-
由 Tim Henigan 提交于
deltawalker has been supported since 284a126c, but was not added to the list of valid diff tools reported by 'git difftool --help'. Signed-off-by: NTim Henigan <tim.henigan@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 3月, 2012 1 次提交
-
-
由 Tim Henigan 提交于
DeltaWalker is a non-free tool popular among some users. Add a plug-in to support it from difftool and mergetool. Note that the $(pwd)/ in front of $MERGED should not be necessary. However without it, DeltaWalker crashes with a JRE exception. Signed-off-by: NTim Henigan <tim.henigan@gmail.com> Helped-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 3月, 2012 3 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Documentation: do not assume that n > 1 in <rev>~$n
-
由 Junio C Hamano 提交于
We explained <rev>~<n> as <n>th generation grand-parent, but a reader got confused by the "grand-" part when <n> is 1. Reword it with "ancestor"; with the "generation" and "following only the first parents" around there, what we try to describe should be clear enough now. Noticed-by: NLuke Diamand <luke@diamand.org> Helped-by: NThomas Rast <trast@inf.ethz.ch> Helped-by: NAndreas Ericsson <ae@op5.se> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 3月, 2012 12 次提交
-
-
由 Junio C Hamano 提交于
* cb/fsck-squelch-dangling: fsck: --no-dangling omits "dangling object" information
-
由 Junio C Hamano 提交于
* rs/no-no-no-parseopt: parse-options: remove PARSE_OPT_NEGHELP parse-options: allow positivation of options starting, with no- test-parse-options: convert to OPT_BOOL() Conflicts: builtin/grep.c
-
由 Junio C Hamano 提交于
* th/git-diffall: contrib: add git-diffall script
-
由 Junio C Hamano 提交于
* l10n: Update l10n guide: change the repository URL, etc l10n: leave leading space unchanged for zh_CN.po Update l10n guide l10n: update Chinese translation to the new git.po l10n: Update git.pot (12 new messages) l10n: fast-forward here is ff-only merge, not push l10n: update zh_CN translation for "Fetching %s" l10n: po for zh_CN l10n: initial git.pot for 1.7.10 upcoming release
-
https://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* 'master' of https://github.com/git-l10n/git-po: l10n: leave leading space unchanged for zh_CN.po
-
由 Jiang Xin 提交于
Host the l10n coordinator repository in a dedicated github organization account "git-l10n", so that the team may have a more permanent home. Also add a hint about reference of TEAMS file for l10n contributors. Update TEAMS file with new zh_CN l10n team members and a repository URL. Signed-off-by: NJiang Xin <worldhello.net@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: Documentation fixes in git-config
-
由 Junio C Hamano 提交于
* nd/maint-verify-objects: rev-list: fix --verify-objects --quiet becoming --objects rev-list: remove BISECT_SHOW_TRIED flag
-
由 Junio C Hamano 提交于
* jn/maint-gitweb-invalid-regexp: gitweb: Handle invalid regexp in regexp search
-
由 Junio C Hamano 提交于
* cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed
-
由 Junio C Hamano 提交于
* cn/maint-branch-with-bad: branch: don't assume the merge filter ref exists Conflicts: t/t3200-branch.sh
-
由 Libor Pechacek 提交于
Variable names must start with an alphabetic character, regexp config key matching has its limits, sentence grammar. Signed-off-by: NLibor Pechacek <lpechacek@suse.cz> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 3月, 2012 1 次提交
-
-
由 ws3389 提交于
Signed-off-by: Nws3389 <willsmith3389@gmail.com> Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
- 29 2月, 2012 12 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
The default output from "fsck" is often overwhelmed by informational message on dangling objects, especially if you do not repack often, and a real error can easily be buried. Add "--no-dangling" option to omit them, and update the user manual to demonstrate its use. Based on a patch by Clemens Buchacher, but reverted the part to change the default to --no-dangling, which is unsuitable for the first patch. The usual three-step procedure to break the backward compatibility over time needs to happen on top of this, if we were to go in that direction. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* pj/completion-remote-set-url-branches: completion: normalize increment/decrement style completion: remote set-* <name> and <branch>
-
由 Junio C Hamano 提交于
* ph/cherry-pick-advice-refinement: cherry-pick: No advice to commit if --no-commit
-
由 Junio C Hamano 提交于
* jb/required-filter: Add a setting to require a filter to be successful Conflicts: convert.c
-
由 Carlos Martín Nieto 提交于
Text between two '*' is emphasized in AsciiDoc and makes explanations in rev-list-options.txt on glob-related options very confusing, as the rendered text would be missing two asterisks and the text between them would be emphasized instead. Use '{asterisk}' where needed to make them show up as asterisks in the rendered text. Signed-off-by: NCarlos Martín Nieto <cmn@elego.de> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 René Scharfe 提交于
PARSE_OPT_NEGHELP is confusing because short options defined with that flag do the opposite of what the helptext says. It is also not needed anymore now that options starting with no- can be negated by removing that prefix. Convert its only two users to OPT_NEGBIT() and OPT_BOOL() and then remove support for PARSE_OPT_NEGHELP. Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jakub Narebski 提交于
When using regexp search ('sr' parameter / $search_use_regexp variable is true), check first that regexp is valid. Without this patch we would get an error from Perl during search (if searching is performed by gitweb), or highlighting matches substring (if applicable), if user provided invalid regexp... which means broken HTML, with error page (including HTTP headers) generated after gitweb already produced some output. Add test that illustrates such error: for example for regexp "*\.git" we would get the following error: Quantifier follows nothing in regex; marked by <-- HERE in m/* <-- HERE \.git/ at /var/www/cgi-bin/gitweb.cgi line 3084. Reported-by: NRamsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nguyễn Thái Ngọc Duy 提交于
When --quiet is specified, finish_object() is called instead of show_object(). The latter is in charge of --verify-objects and will be skipped if --quiet is specified. Move the code up to finish_object(). Also pass the quiet flag along and make it always call show_* functions to avoid similar problems in future. Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Nguyễn Thái Ngọc Duy 提交于
Since c99f069d (bisect--helper: remove "--next-vars" option as it is now useless - 2009-04-21), this flag has always been off. Remove the flag and all related code. Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jiang Xin 提交于
l10n: translation for Simplified Chinese. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
- 28 2月, 2012 10 次提交
-
-
由 Jiang Xin 提交于
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Jiang Xin 提交于
Update file 'po/git.pot' to v1.7.9.2-315-g25a78 (Merge branch 'maint'), with 12 new string additions. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Jiang Xin 提交于
-
由 Junio C Hamano 提交于
* maint: Update draft release notes to 1.7.9.3 CodingGuidelines: do not use 'which' in shell scripts CodingGuidelines: Add a note about spaces after redirection post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly post-receive-email: remove unused variable
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* pj/remote-set-branches-usage-fix: remote: fix set-branches usage and documentation Conflicts: builtin/remote.c
-
由 Junio C Hamano 提交于
* jn/gitweb-unborn-head: gitweb: Fix "heads" view when there is no current branch
-
由 Junio C Hamano 提交于
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
-
由 Junio C Hamano 提交于
* tr/merge-edit-guidance: merge: add instructions to the commit message when editing
-
由 Tim Henigan 提交于
During the code review of a recent patch, it was noted that shell scripts must not use 'which $cmd' to check the availability of the command $cmd. The output of the command is not machine parseable and its exit code is not reliable across platforms. It is better to use 'type' to accomplish this task. Signed-off-by: NTim Henigan <tim.henigan@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-