summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l10n: vi.po: Updated Vietnamese translation (3137t)Tran Ngoc Quan2017-02-171-1338/+2669
* Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-02-131-1337/+2670
|\
| * l10n: sv.po: Update Swedish translation (3137t0f0u)Peter Krefting2017-02-111-1337/+2670
* | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/gitJiang Xin2017-02-131-1344/+2655
|\ \ | |/ |/|
| * l10n: fr.po: v2.11-rc0 first roundJean-Noel Avila2017-02-111-1337/+2648
| * l10n: fr.po: Fix a typo in the French translationAnthony Ramine2017-02-041-1/+1
| * l10n: fr.po: Remove gender specific adjectivesJoachim Jablon2017-02-041-4/+4
| * l10n: fr.po: Fix typosJoachim Jablon2017-02-041-4/+4
* | l10n: ko.po: Update Korean translationChangwoo Ryu2017-02-111-1320/+2617
|/
* l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)Jiang Xin2017-02-041-1273/+2454
* Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-02-044-3084/+5025
|\
| * l10n: bg: Updated Bulgarian translation (2913t+0f+0u)Alexander Shopov2017-01-311-2761/+4683
| * Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-01-251-289/+308
| |\
| | * l10n: fixes to Catalan translationJordi Mas2017-01-031-289/+308
| * | l10n: zh_CN: review for git v2.11.0 l10nRay Chen2017-01-021-32/+31
| * | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-01-021-2/+3
| |\|
| | * l10n: New Catalan translation maintainerJordi Mas2016-12-261-2/+3
* | | Git 2.12-rc0v2.12.0-rc0Junio C Hamano2017-02-032-7/+30
* | | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-0315-30/+133
|\ \ \
| * | | doc: add note about ignoring '--no-create-reflog'Cornelius Weig2017-02-022-0/+6
| * | | update-ref: add test cases for bare repositoryCornelius Weig2017-01-311-7/+36
| * | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-3114-20/+88
| * | | config: add markup to core.logAllRefUpdates docCornelius Weig2017-01-301-3/+3
* | | | Merge branch 'pl/complete-diff-submodule-diff'Junio C Hamano2017-02-031-1/+1
|\ \ \ \
| * | | | Completion: Add support for --submodule=diffPeter Law2017-01-311-1/+1
| |/ / /
* | | | Merge branch 'rs/object-id'Junio C Hamano2017-02-037-10/+10
|\ \ \ \
| * | | | checkout: convert post_checkout_hook() to struct object_idRené Scharfe2017-01-301-2/+2
| * | | | use oidcpy() for copying hashes between instances of struct object_idRené Scharfe2017-01-302-3/+3
| * | | | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-304-5/+5
| |/ / /
* | | | Merge branch 'js/re-running-failed-tests'Junio C Hamano2017-02-031-0/+6
|\ \ \ \
| * | | | t/Makefile: add a rule to re-run previously-failed testsJohannes Schindelin2017-01-271-0/+6
| |/ / /
* | | | Merge branch 'sb/submodule-update-initial-runs-custom-script'Junio C Hamano2017-02-032-1/+16
|\ \ \ \
| * | | | submodule update: run custom update script for initial populating as wellStefan Beller2017-01-262-1/+16
* | | | | Merge branch 'sb/submodule-recursive-absorb'Junio C Hamano2017-02-034-41/+105
|\ \ \ \ \
| * | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-movesStefan Beller2017-01-262-16/+73
| * | | | | cache.h: expose the dying procedure for reading gitlinksStefan Beller2017-01-262-22/+27
| * | | | | setup: add gentle version of resolve_git_dirStefan Beller2017-01-262-3/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-035-676/+702
|\ \ \ \ \
| * | | | | unpack-trees: support super-prefix optionStefan Beller2017-01-253-4/+49
| * | | | | t1001: modernize styleStefan Beller2017-01-111-321/+320
| * | | | | t1000: modernize styleStefan Beller2017-01-111-333/+315
| * | | | | read-tree: use OPT_BOOL instead of OPT_SET_INTStefan Beller2017-01-111-18/+18
* | | | | | Sync with v2.11.1Junio C Hamano2017-02-021-0/+3
|\ \ \ \ \ \
| * | | | | | Git 2.11.1v2.11.1Junio C Hamano2017-02-021-0/+3
| * | | | | | Merge branch 'ws/request-pull-code-cleanup' into maintJunio C Hamano2017-02-021-3/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/execv-dashed-external' into maintJunio C Hamano2017-02-023-21/+35
| |\ \ \ \ \ \ \
* | | | | | | | | Ninth batch for 2.12; almost ready for -rc0Junio C Hamano2017-02-021-21/+50
* | | | | | | | | Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano2017-02-026-5/+97
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | document behavior of empty color nameJeff King2017-02-021-0/+3
| * | | | | | | | | color_parse_mem: allow empty color specJeff King2017-02-014-4/+25