- 21 4月, 2015 1 次提交
-
-
由 Junio C Hamano 提交于
The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend
-
- 19 4月, 2015 1 次提交
-
-
http://repo.or.cz/r/git-gui由 Junio C Hamano 提交于
git-gui 0.20.0 * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui: git-gui: set version 0.20 git-gui: sv.po: Update Swedish translation (547t0f0u) git-gui i18n: Updated Bulgarian translation (547t,0f,0u) git-gui: Makes chooser set 'gitdir' to the resolved path git-gui: Fixes chooser not accepting gitfiles git-gui: reinstate support for Tcl 8.4 git-gui: fix problem with gui.maxfilesdisplayed git-gui: fix verbose loading when git path contains spaces. git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows git-gui: add configurable tab size to the diff view git-gui: Make git-gui lib dir configurable at runime git-gui i18n: Updated Bulgarian translation (520t,0f,0u) L10n: vi.po (543t): Init translation for Vietnamese git-gui: align the new recursive checkbox with the radiobuttons. git-gui: Add a 'recursive' checkbox in the clone menu.
-
- 18 4月, 2015 3 次提交
-
-
由 Pat Thoyts 提交于
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Peter Krefting 提交于
Signed-off-by: NPeter Krefting <peter@softwolves.pp.se> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org> Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
-
- 16 4月, 2015 1 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit 2bf15a33, whose intention was good, but the verbosity levels used in merge-recursive turns out to be rather uneven. For example, a merge of two branches with conflicting submodule updates used to report CONFLICT: output with --quiet but no longer (which *is* desired), while the final "Automatic merge failed; fix conflicts and then commit" message is still shown even with --quiet (which *is* inconsistent). Originally reported by Bryan Turner; it is too early to declare what the concensus is, but it seems that we would need to level the verbosity levels used in merge strategy backends before we can go forward. In the meantime, we'd revert to the old behaviour until that happens. cf. $gmane/267245
-
- 15 4月, 2015 14 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
"diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters
-
由 Junio C Hamano 提交于
"git merge --quiet" did not squelch messages from the underlying merge-recursive strategy. * jk/merge-quiet: merge: pass verbosity flag down to merge-recursive
-
由 Junio C Hamano 提交于
Documentation update. * jk/pack-corruption-post-mortem: howto: document more tools for recovery corruption
-
由 Junio C Hamano 提交于
A push into an unborn branch, with "receive.denyCurrentBranch" set to "updateInstead", did not check out the working tree as expected. * jc/update-instead-into-void: push-to-deploy: allow pushing into an unborn branch and updating it
-
由 Junio C Hamano 提交于
* sb/plug-streaming-leak: streaming.c: fix a memleak
-
由 Junio C Hamano 提交于
Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit
-
由 Junio C Hamano 提交于
* sb/plug-wt-shortstatus-tracking-leak: wt-status.c: fix a memleak
-
由 Junio C Hamano 提交于
* pt/enter-repo-comment-fix: enter_repo(): fix docs to match code
-
由 Junio C Hamano 提交于
* jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time"
-
由 Junio C Hamano 提交于
* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits
-
由 Junio C Hamano 提交于
* iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
-
由 Junio C Hamano 提交于
* jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count
-
由 Julian Gindi 提交于
Changed inaccurate count of "rough rules" from three to the more generic 'a few'. Signed-off-by: NJulian Gindi <juliangindi@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>
-
- 13 4月, 2015 1 次提交
-
-
由 Márcio Almada 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 4月, 2015 3 次提交
-
-
-
git://github.com/alexhenrie/git-po由 Jiang Xin 提交于
* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
-
由 Jiang Xin 提交于
Repository URL of zh_CN l10n for Git has been changed over 2 years, update po/TEAMS for it. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
- 08 4月, 2015 1 次提交
-
-
由 Alex Henrie 提交于
Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>
-
- 07 4月, 2015 2 次提交
-
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>
-
由 Peter Krefting 提交于
Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>
-
- 06 4月, 2015 1 次提交
-
-
由 Ralf Thielow 提交于
Translate one message came from git.pot update in 6eebb35e (l10n: git.pot: v2.4.0 round 2 (1 update)). Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
- 05 4月, 2015 2 次提交
-
-
由 Kyle J. McKay 提交于
When the input is UTF-8 and Perl is operating on bytes instead of characters, a diff that changes one multibyte character to another that shares an initial byte sequence will result in a broken diff display as the common byte sequence prefix will be separated from the rest of the bytes in the multibyte character. For example, if a single line contains only the unicode character U+C9C4 (encoded as UTF-8 0xEC, 0xA7, 0x84) and that line is then changed to the unicode character U+C9C0 (encoded as UTF-8 0xEC, 0xA7, 0x80), when operating on bytes diff-highlight will show only the single byte change from 0x84 to 0x80 thus creating invalid UTF-8 and a broken diff display. Fix this by putting Perl into character mode when splitting the line and then back into byte mode after the split is finished. The utf8::xxx functions require Perl 5.8 so we require that as well. Also, since we are mucking with code in the split_line function, we change a '*' quantifier to a '+' quantifier when matching the $COLOR expression which has the side effect of speeding everything up while eliminating useless '' elements in the returned array. Reported-by: NYi EungJun <semtlenori@gmail.com> Signed-off-by: NKyle J. McKay <mackyle@gmail.com> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jean-Noel Avila 提交于
Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>
-
- 03 4月, 2015 10 次提交
-
-
由 Dimitriy Ryazantcev 提交于
Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
-
由 Tran Ngoc Quan 提交于
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>
-
由 Jiang Xin 提交于
Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Jiang Xin 提交于
Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
git://github.com/git-l10n/git-po由 Jiang Xin 提交于
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung' l10n: de.po: translate 99 new messages l10n: de.po: fix messages with abbreviated hashs l10n: de.po: add space before ellipsis l10n: vi.po: Updated Vietnamese translation l10n: zh_CN: translations for git v2.4.0-rc0 l10n: fr.po v2.4.0-rc0 round 1 l10n: ca.po: update translation l10n: ru: updated Russian translation l10n: sv.po: Update Swedish translation (2305t0f0u) l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed) l10n: ru: added Russian translation l10n: de.po: fix negation for commit -a with paths
-
由 Jeff King 提交于
This makes "git merge --quiet" really quiet when we call into merge-recursive. Note that we can't just pass our flag down as-is; the two parts of the code use different scales. We center at "0" as normal for git-merge (with "--quiet" giving a negative value), but merge-recursive uses "2" as its center. This patch passes a negative value to merge-recursive rather than "1", though, as otherwise the user would have to use "-qqq" to squelch all messages (but the downside is that the user cannot distinguish between levels 0-2 if without resorting to the GIT_MERGE_VERBOSITY variable). We may want to review and renormalize the message severities in merge-recursive, but that does not have to happen now. This is at least in improvement in the sense that we are respecting "--quiet" at all. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* sb/atomic-push: send-pack: unify error messages for unsupported capabilities
-
由 Ralf Thielow 提交于
If --signed is not supported, the error message names the remote "receiving end". If --atomic is not supported, the error message names the remote "server". Unify the naming to "receiving end" as we're in the context of "push". Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Matthias Rüster 提交于
The use of 'symbolische Verknüpfung' for 'symbolic link' is more common than 'symbolischer Verweis'. Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com> Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-