Commits

Author Commit Message Labels Comments Date
Junio C Hamano
git-svn: platform auth providers are working only on 1.6.15 or newer Matthijs Kooijman reports that the cut-off point 082afee (git-svn: use platform specific auth providers, 2012-04-26) set at 1.6.12 to use this feature safely was incorrect, and it is 1.6.15 instead: http://svn.apache.org/repos/asf/subversion/trunk/CHANGES Version 1.6.15 * improve some swig parameter mapping (r984565, r1035745) Signed-off-by: Junio C Hamano <gitster@pobox.com> Acke…
Jiang Xin
Merge git://github.com/ralfth/git-po-de By Ralf Thielow via Ralf Thielow * ralfth/git-po-de/master: l10n: de.po: add additional newline l10n: de.po: translate 2 new, 3 fuzzy messages l10n: de.po: translate 41 new messages l10n: de.po: translate 265 new messages
Tran Ngoc Quan
l10n: Update translation for Vietnamese * Updated 5 strings for v1.7.11-rc0-100-g5498c * Retranslated about 16 strings Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Junio C Hamano
ls-files -i: micro-optimize path_excluded() As we know a caller that does not recurse is calling us in the index order, we can remember the last directory we found to be excluded and see if the path we are looking at is still inside it, in which case we can just answer that it is excluded. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
ls-files -i: pay attention to exclusion of leading paths "git ls-files --exclude=t/ -i" does not show paths in directory t/ that have been added to the index, but it should. The excluded() API was designed for callers who walk the tree from the top, checking each level of the directory hierarchy as it descends if it is excluded, and not even bothering to recurse into an excluded directory. This would allow us optimize for a common case by not having t…
Junio C Hamano
Git 1.7.11-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.11-rc1
Junio C Hamano
Sync with 1.7.10.4 * maint: Git 1.7.10.4
Junio C Hamano
Git 1.7.10.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10.4
Junio C Hamano
Merge branch 'ef/maint-rebase-error-message' into maint When "git rebase" was given a bad commit to replay the history on, its error message did not correctly give the command line argument it had trouble parsing. By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
Ralf Thielow
l10n: de.po: add additional newline The translation of "builtin/gc.c:224" was missing of a newline which made the second part of the message quite long. We simply add a newline. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Ralf Thielow
l10n: de.po: translate 2 new, 3 fuzzy messages Translate 2 new and 3 fuzzy messages came from git.pot update in 75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)). Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Ralf Thielow
l10n: de.po: translate 41 new messages Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Ralf Thielow
l10n: de.po: translate 265 new messages Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Jiang Xin
l10n: zh_CN.po: translate 2 new, 3 fuzzy messages Translate 2 new and 3 fuzzy messages came from git.pot update in 75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)). Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
l10n: Update git.pot (5 new, 3 removed messages) Generate po/git.pot from v1.7.11-rc0-100-g5498c: * 5 new l10n messages at lines: 635, 639, 1203, 1208, 3946 * 3 removed l10n messages at lines: 1194, 3158, 3936 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano
Update draft release notes to 1.7.11 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ef/maint-rebase-error-message' By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
Junio C Hamano
Merge branch 'nh/empty-rebase' * nh/empty-rebase: cherry-pick: regression fix for empty commits
Junio C Hamano
Merge branch 'vr/rebase-autosquash-does-not-imply-i' "git rebase -p" used to pay attention to rebase.autosquash which was wrong. "git rebase -p -i" should, but "git rebase -p" by itself should not. By Vincent van Ravesteijn * vr/rebase-autosquash-does-not-imply-i: Do not autosquash in case of an implied interactive rebase
Junio C Hamano
Merge branch 'mm/levenstein-penalize-deletion-less' "git tags" used to suggest "git stage" which was nonsense; it should have favored "git tag". Tweak the cost of deletion to correct it. By Matthieu Moy * mm/levenstein-penalize-deletion-less: Reduce cost of deletion in levenstein distance (4 -> 3)
Junio C Hamano
Merge branch 'jl/submodule-report-new-path-once' "git submodule init" used to report "registered for path ..." even for submodules that were registered earlier. By Jens Lehmann * jl/submodule-report-new-path-once: submodules: print "registered for path" message only once
Junio C Hamano
Sync with maint
Junio C Hamano
Start preparing for 1.7.10.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ef/http-o-depends-on-gvf' into maint A minor compilation fix. By Erik Faye-Lund * ef/http-o-depends-on-gvf: Makefile: add missing GIT-VERSION-FILE dependency
Junio C Hamano
Merge git://github.com/git-l10n/git-po By Jiang Xin (4) and others via Jiang Xin * git://github.com/git-l10n/git-po: l10n: Set nplurals of zh_CN.po from 1 to 2 l10n: zh_CN.po: translate 323 new messages l10n: zh.CN.po: update by msgmerge git.pot First release translation for Vietnamese Init translation for Vietnamese l10n: New it.po file with 504 translations Update Swedish translation (728t0f0u) l10n: Update git.pot (4…
Junio C Hamano
Merge branch 'rs/maint-grep-F' into maint "git grep -e '$pattern'", unlike the case where the patterns are read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should. By René Scharfe * rs/maint-grep-F: grep: stop leaking line strings with -f grep: support newline separated pattern list grep: factor out do_append_grep_pat() grep: factor out create_grep_pat()
Junio C Hamano
Merge branch 'jk/ident-split-fix' into maint An author/committer name that is a single character was mishandled as an invalid name by mistake. By Jeff King * jk/ident-split-fix: fix off-by-one error in split_ident_line
Junio C Hamano
Merge branch 'jk/pretty-commit-header-incomplete-line' into maint By Jeff King * jk/pretty-commit-header-incomplete-line: avoid segfault when reading header of malformed commits
Junio C Hamano
Merge branch 'jk/format-person-part-buffer-limit' into maint By Jeff King * jk/format-person-part-buffer-limit: pretty: avoid buffer overflow in format_person_part
Junio C Hamano
Merge branch 'ap/checkout-no-progress-for-non-tty' into maint "git checkout" gave progress display even when the standard error stream was not connected to the tty, which made little sense. By Avery Pennarun * ap/checkout-no-progress-for-non-tty: checkout: no progress messages if !isatty(2).
  1. Prev
  2. Next