summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase-interactive: trim leading whitespace from progress countjs/rebase-i-progress-tidyJohannes Sixt2016-07-281-1/+1
* i18n: rebase-interactive: mark strings for translationVasco Almeida2016-06-172-90/+102
* i18n: git-sh-setup.sh: mark strings for translationVasco Almeida2016-06-177-22/+50
* t6030: update to use test_i18ncmpVasco Almeida2016-06-171-2/+2
* i18n: bisect: simplify error message for i18nVasco Almeida2016-06-171-2/+3
* i18n: rebase: mark placeholder for translationVasco Almeida2016-06-171-1/+1
* i18n: rebase: fix marked string to use eval_gettext variantVasco Almeida2016-06-171-1/+1
* merge-octopus: use die shell function from git-sh-setup.shVasco Almeida2016-06-171-5/+1
* i18n: merge-octopus: mark messages for translationVasco Almeida2016-06-171-8/+10
* i18n: sequencer: mark string for translationVasco Almeida2016-06-171-1/+1
* i18n: sequencer: mark entire sentences for translationVasco Almeida2016-06-171-3/+8
* i18n: transport: mark strings for translationVasco Almeida2016-06-171-10/+10
* i18n: advice: internationalize message for conflictsVasco Almeida2016-06-173-4/+17
* i18n: advice: mark string about detached head for translationVasco Almeida2016-06-172-4/+4
* i18n: builtin/remote.c: fix mark for translationVasco Almeida2016-06-171-3/+3
* Merge branch 'jc/t2300-setup' into HEADJunio C Hamano2016-06-072-1/+30
|\
| * t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-011-1/+2
| * More topics for 2.8.4Junio C Hamano2016-05-311-0/+28
| * Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-313-10/+48
| |\
| * \ Merge branch 'bn/http-cookiefile-config' into maintJunio C Hamano2016-05-312-3/+4
| |\ \
| * \ \ Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
| |\ \ \
| * \ \ \ Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-312-7/+14
| |\ \ \ \
* | \ \ \ \ Sync with maintJunio C Hamano2016-05-262-1/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Start preparing for 2.8.4Junio C Hamano2016-05-261-0/+27
| * | | | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-268-10/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ls/travis-build-doc' into maintJunio C Hamano2016-05-262-0/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-262-3/+31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/rebase-interative-eval-fix' into maintJunio C Hamano2016-05-261-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-268-3/+147
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'kf/gpg-sig-verification-doc' into maintJunio C Hamano2016-05-262-4/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-2612-14/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-268-61/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bn/config-doc-tt-varnames' into maintJunio C Hamano2016-05-261-21/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/remote-plural-ours-plus-theirs' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/t4151-ls-files-could-be-empty' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-seq' into maintJunio C Hamano2016-05-261-15/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/t5601-sed-fix' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/mailinfo-doc-typofix' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-2.7' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/war-on-sprintf' into maint-2.7Junio C Hamano2016-05-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | archive-tar: convert snprintf to xsnprintfjk/war-on-sprintfJeff King2016-05-261-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Git 2.9-rc0v2.9.0-rc0Junio C Hamano2016-05-232-29/+50
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'svn-travis' of git://bogomips.org/git-svnJunio C Hamano2016-05-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | travis-ci: enable Git SVN tests t91xx on LinuxLars Schneider2016-05-221-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere-multi'Junio C Hamano2016-05-231-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | rerere: remove an null statementjc/rerere-multiJunio C Hamano2016-05-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano2016-05-111-8/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2016-05-232-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \