summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* l10n: Update one message in git.potJiang Xin2012-08-061-7/+9
* Merge git://github.com/git-l10n/git-poJunio C Hamano2012-08-053-449/+1265
|\
| * l10n: zh_CN.po: translate 76 new messagesJiang Xin2012-08-051-366/+451
| * l10n: vi.po update to follow POT in 3b613Tran Ngoc Quan2012-08-031-44/+420
| * l10n: Update git.pot (76 new, 4 removed messages)Jiang Xin2012-08-021-39/+394
* | merge-recursive: separate message for common ancestorsRalf Thielow2012-08-051-1/+4
* | git-remote-mediawiki: replace TODO-list in comment by appropriate linkMatthieu Moy2012-08-031-14/+1
|/
* Merge git://github.com/git-l10n/git-poJunio C Hamano2012-08-014-1981/+2305
|\
| * l10n: de.po: translate 4 new messagesRalf Thielow2012-07-311-494/+506
| * l10n: vi.po: translate 4 new messagesTran Ngoc Quan2012-07-311-529/+545
| * l10n: zh_CN.po: translate 4 new messagesJiang Xin2012-07-311-483/+776
| * l10n: Update git.pot (4 new, 3 removed messages)Jiang Xin2012-07-301-475/+478
* | git-rebase.sh: fix typo in an error messageRalf Thielow2012-08-011-1/+1
* | Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano2012-07-311-1/+1
|\ \
| * | i18n: leave \n out of translated diffstatNguyễn Thái Ngọc Duy2012-07-261-1/+1
* | | Merge branch 'jx/i18n-1.7.11'Junio C Hamano2012-07-3111-157/+150
|\ \ \
| * | | i18n: merge-recursive: mark strings for translationJiang Xin2012-07-263-78/+88
| * | | Remove dead code which contains bad gettext blockJiang Xin2012-07-261-3/+0
| * | | i18n: am: mark more strings for translationJiang Xin2012-07-261-6/+5
| * | | rebase: remove obsolete and unused LONG_USAGE which breaks xgettextJiang Xin2012-07-261-25/+0
| * | | i18n: Rewrite gettext messages start with dashJiang Xin2012-07-263-3/+3
| * | | i18n: rebase: mark messages for translationJiang Xin2012-07-255-42/+53
| * | | i18n: New keywords for xgettext extraction from shJiang Xin2012-07-251-1/+2
* | | | Git 1.7.12-rc1v1.7.12-rc1Junio C Hamano2012-07-302-33/+11
* | | | Sync with 1.7.11.4Junio C Hamano2012-07-302-1/+33
|\ \ \ \
| * | | | Git 1.7.11.4v1.7.11.4Junio C Hamano2012-07-304-3/+35
| * | | | Merge branch 'jk/maint-commit-document-editmsg' into maintJunio C Hamano2012-07-301-0/+9
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-advise-vaddf' into maintJunio C Hamano2012-07-301-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'kk/maint-commit-tree' into maintJunio C Hamano2012-07-303-4/+18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-302-3/+64
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maintJunio C Hamano2012-07-302-0/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2012-07-302-2/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-filter-branch-epoch-date' into maintJunio C Hamano2012-07-304-5/+15
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-grep-remove-redundant-test'Junio C Hamano2012-07-301-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t7810-*.sh: Remove redundant testRamsay Jones2012-07-291-11/+0
* | | | | | | | | | | | | Merge branch 'dg/submodule-in-dismembered-working-tree'Junio C Hamano2012-07-301-6/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7409: make sure submodule is initialized and updated in more detailDaniel Graña2012-07-301-6/+23
* | | | | | | | | | | | | | Merge branch 'hv/link-alt-odb-entry'Junio C Hamano2012-07-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | link_alt_odb_entry: fix read over array bounds reported by valgrindHeiko Voigt2012-07-291-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Add explanatory comment for transport-helpers refs mapping.Florian Achleitner2012-07-301-0/+15
* | | | | | | | | | | | | | t1100-*.sh: Fix an intermittent test failureRamsay Jones2012-07-291-0/+1
* | | | | | | | | | | | | | t: add missing executable bit to t7409Jeff King2012-07-291-0/+0
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Update draft release notes to 1.7.12Junio C Hamano2012-07-271-0/+15
* | | | | | | | | | | | | Merge branch 'extract-remaining' of git://git.bogomips.org/git-svnJunio C Hamano2012-07-279-761/+795
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extract Git::SVN::GlobSpec from git-svn.Michael G. Schwern2012-07-275-60/+64
| * | | | | | | | | | | | | Move Git::IndexInfo into its own file.Michael G. Schwern2012-07-275-33/+37
| * | | | | | | | | | | | | Load all the modules in one place and before running code.Michael G. Schwern2012-07-271-23/+21
| * | | | | | | | | | | | | Extract Git::SVN::Migration from git-svn.Michael G. Schwern2012-07-274-258/+262
| * | | | | | | | | | | | | Prepare Git::SVN::Migration for extraction from git-svn.Michael G. Schwern2012-07-271-12/+24
| * | | | | | | | | | | | | Extract Git::SVN::Log from git-svn.Michael G. Schwern2012-07-274-396/+401