Commits

Show all
Author Commit Message Labels Comments Date
Jonathan Nieder
git-svn: make Git::SVN::RA a separate file This slices off another 600 or so lines from the frighteningly long git-svn.perl script. The Git::SVN::Ra interface is similar enough to SVN::Ra that it is probably safe to ignore most of its implementation on first reading. (Documenting or moving functions that do not fit that pattern is left as an exercise to the interested reader.) [ew: rebased and fixed conflict against commit c26ddce86d721…
Jonathan Nieder
git-svn: make Git::SVN::Editor a separate file This makes the git-svn script shorter and less scary for beginners to read through for the first time. Take the opportunity to explain the purpose and basic interface of the Git::SVN::Editor class while at it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Tran Ngoc Quan
l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb * Translated 28 strings. Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Junio C Hamano
Merge branch 'mm/api-credentials-doc' Finishing touches... * mm/api-credentials-doc: docs: fix cross-directory linkgit references
Jeff King
docs: fix cross-directory linkgit references Most of our documentation is in a single directory, so using linkgit:git-config[1] just generates a relative link in the same directory. However, this is not the case with the API documentation in technical/*, which need to refer to git-config from the parent directory. We can fix this by passing a special prefix attribute when building in a subdirectory, and respecting that prefix in our linkgit…
Jiang Xin
l10n: zh_CN.po: translate 27 new messages Translate 19 new and 8 fuzzy messages which are marked by shell gettext wrappers, and ignored by previous 'git.pot' updates. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin
l10n: Update git.pot (27 new, 1 removed messages) Extract messages marked by shell gettext wrappers which are ignored before. See: * http://thread.gmane.org/gmane.comp.version-control.git/199112 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano
Git 1.7.11-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.11-rc2
Junio C Hamano
Merge branch 'mm/api-credentials-doc' * mm/api-credentials-doc: api-credentials.txt: add "see also" section api-credentials.txt: mention credential.helper explicitly api-credentials.txt: show the big picture first doc: fix xref link from api docs to manual pages
Junio C Hamano
Merge branch 'rr/maint-t3510-cascade-fix' * rr/maint-t3510-cascade-fix: t3510 (cherry-pick-sequence): add missing '&&'
Junio C Hamano
Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12' Regression fix for people with libsvn between 1.6.12 and 1.6.15, on which we tried to use the non-working platform auth providers. * jc/svn-auth-providers-unusable-at-1.6.12: git-svn: platform auth providers are working only on 1.6.15 or newer
Junio C Hamano
Merge branch 'cr/persistent-https' A remote helper that acts as a proxy and caches ssl session for the https:// transport is added to the contrib/ area. By Colby Ranger * cr/persistent-https: Add persistent-https to contrib
Junio C Hamano
fmt-merge-msg: make attribution into comment lines The submaintainer credit is not something you can compute purely by looking at the history and its shape, especially in the presense of fast-forward merges, and this observation makes the information on the "via" line unreliable. Let's leave the final determination of credits up to whoever is making the merge and show them as comments. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge git://github.com/git-l10n/git-po German and Chinese translation updates. By Ralf Thielow (4) and others via Jiang Xin (1) and Tran Ngoc Quan (1) * git://github.com/git-l10n/git-po: l10n: Update translation for Vietnamese 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 l10n: zh_CN.po: translate 2 new, 3 fu…
Ramkumar Ramachandra
t3510 (cherry-pick-sequence): add missing '&&' Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Fix an instance of this in the setup. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy
api-credentials.txt: add "see also" section Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy
api-credentials.txt: mention credential.helper explicitly The name of the configuration variable was mentioned only at the very end of the explanation, in a place specific to a specific rule, hence it was not very clear what the specification was about. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy
api-credentials.txt: show the big picture first The API documentation targets two kinds of developers: those using the C API, and those writing remote-helpers. The document was not clear about which part was useful to which category, and for example, the C API could be mistakenly thought as an API for writting remote helpers. Based-on-patch-by: Jeff King <peff@peff.net> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C …
Junio C Hamano
doc: fix xref link from api docs to manual pages They are one-level above, so refer them as linkgit:../git-foo[n] with "../" Signed-off-by: Junio C Hamano <gitster@pobox.com>
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
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>
  1. Prev
  2. Next