summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-11-12archive.c: mark more strings for translationLibravatar Nguyễn Thái Ngọc Duy1-4/+4
2018-11-12alias.c: mark split_cmdline_strerror() strings for translationLibravatar Nguyễn Thái Ngọc Duy3-4/+4
2018-11-12git.c: mark more strings for translationLibravatar Nguyễn Thái Ngọc Duy1-15/+15
2018-11-12Update .mailmapLibravatar Johannes Schindelin1-0/+13
2018-11-12range-diff: fix regression in passing along diff optionsLibravatar Ævar Arnfjörð Bjarmason2-1/+54
2018-11-12range-diff doc: add a section about output stabilityLibravatar Ævar Arnfjörð Bjarmason1-0/+17
2018-11-11l10n: Update Catalan translationLibravatar Jordi Mas1-3293/+6284
2018-11-09http: add support selecting http versionLibravatar Force Charlie2-0/+48
2018-11-09Makefile: ease dynamic-gettext-poison transitionLibravatar Junio C Hamano1-1/+1
2018-11-09i18n: make GETTEXT_POISON a runtime optionLibravatar Ævar Arnfjörð Bjarmason16-49/+59
2018-11-08merge-recursive: combine error handlingLibravatar Derrick Stolee1-26/+27
2018-11-08t6036, t6043: increase code coverage for file collision handlingLibravatar Elijah Newren2-0/+88
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingLibravatar Elijah Newren3-94/+113
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsLibravatar Elijah Newren1-8/+21
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren4-148/+89
2018-11-08merge-recursive: fix rename/add conflict handlingLibravatar Elijah Newren3-64/+101
2018-11-08merge-recursive: new function for better colliding conflict resolutionsLibravatar Elijah Newren1-0/+121
2018-11-08merge-recursive: increase marker length with depth of recursionLibravatar Elijah Newren4-9/+172
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesLibravatar Elijah Newren2-0/+312
2018-11-08t6042: add tests for consistency in file collision conflict handlingLibravatar Elijah Newren1-0/+162
2018-11-08built-in rebase --autostash: leave the current branch alone if possibleLibravatar Johannes Schindelin2-2/+3
2018-11-08built-in rebase: demonstrate regression with --autostashLibravatar Johannes Schindelin1-0/+8
2018-11-07Windows: force-recompile git.res for differing architecturesLibravatar Johannes Schindelin1-1/+1
2018-11-07approxidate: fix NULL dereference in date_time()Libravatar Jeff King2-1/+2
2018-11-07pack-objects: ignore ambiguous object warningsLibravatar Derrick Stolee1-0/+6
2018-11-07pull: handle --verify-signatures for unborn branchLibravatar Jeff King2-0/+18
2018-11-07merge: handle --verify-signatures for unborn branchLibravatar Jeff King2-0/+11
2018-11-07merge: extract verify_merge_signature() helperLibravatar Jeff King3-25/+34
2018-11-06Ninth batch for 2.20Libravatar Junio C Hamano1-2/+57
2018-11-06Merge branch 'sg/test-verbose-log'Libravatar Junio C Hamano2-2/+3
2018-11-06Merge branch 'rj/header-cleanup'Libravatar Junio C Hamano3-3/+6
2018-11-06Merge branch 'ss/travis-ci-force-vm-mode'Libravatar Junio C Hamano1-2/+0
2018-11-06Merge branch 'sg/test-rebase-editor-fix'Libravatar Junio C Hamano2-7/+7
2018-11-06Merge branch 'tb/char-may-be-unsigned'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'js/mingw-ns-filetime'Libravatar Junio C Hamano3-38/+76
2018-11-06Merge branch 'md/exclude-promisor-objects-fix'Libravatar Junio C Hamano8-2/+15
2018-11-06Merge branch 'jw/send-email-no-auth'Libravatar Junio C Hamano2-3/+12
2018-11-06Merge branch 'nd/submodule-unused-vars'Libravatar Junio C Hamano4-31/+38
2018-11-06Merge branch 'nd/unpack-trees-with-cache-tree'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'nd/completion-negation'Libravatar Junio C Hamano1-1/+1
2018-11-06Merge branch 'jt/upload-pack-v2-fix-shallow'Libravatar Junio C Hamano2-63/+115
2018-11-06Merge branch 'sb/submodule-url-to-absolute'Libravatar Junio C Hamano2-17/+58
2018-11-06Merge branch 'js/shallow-and-fetch-prune'Libravatar Junio C Hamano5-8/+54
2018-11-06Merge branch 'js/remote-archive-dwimfix'Libravatar Junio C Hamano6-4/+23
2018-11-06completion: use __gitcomp_builtin for format-patchLibravatar Duy Nguyen2-10/+14
2018-11-06midx: double-check large object write loopLibravatar Jeff King1-3/+9
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King26-3/+134
2018-11-06parse-options: drop OPT_DATE()Libravatar Jeff King5-38/+0
2018-11-06apply: return -1 from option callback instead of calling exit(1)Libravatar Jeff King1-1/+1
2018-11-06cat-file: report an error on multiple --batch optionsLibravatar Jeff King1-1/+1