summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-07-31config: work around bug with includeif:onbranch and early configJohannes Schindelin2-1/+7
2019-07-31A few more last-minute fixesJunio C Hamano1-63/+2
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Junio C Hamano3-8/+0
2019-07-31Merge branch 'jk/no-system-includes-in-dot-c'Junio C Hamano3-3/+0
2019-07-31tree-walk: drop oid from traverse_infoJeff King5-39/+49
2019-07-31setup_traverse_info(): stop copying oidJeff King3-7/+3
2019-07-31repack: simplify handling of auto-bitmaps and .keep filesJeff King2-16/+4
2019-07-31repack: silence warnings when auto-enabled bitmaps cannot be builtJeff King3-11/+36
2019-07-31t7700: clean up .keep file in bitmap-writing testJeff King1-0/+1
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin4-3/+25
2019-07-31t3418: test `rebase -r` with merge strategiesJohannes Schindelin1-0/+14
2019-07-31t/lib-rebase: prepare for testing `git rebase --rebase-merges`Johannes Schindelin1-4/+5
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin5-23/+33
2019-07-31t3427: fix another incorrect assumptionJohannes Schindelin1-3/+4
2019-07-31t3427: accommodate for the `rebase --merge` backend having been replacedJohannes Schindelin1-2/+2
2019-07-31t3427: fix erroneous assumptionJohannes Schindelin1-3/+3
2019-07-31t3427: condense the unnecessarily repetitive test cases into threeJohannes Schindelin1-50/+11
2019-07-31t3427: move the `filter-branch` invocation into the `setup` caseJohannes Schindelin1-25/+13
2019-07-31t3427: simplify the `setup` test case significantlyJohannes Schindelin1-21/+15
2019-07-31t3427: add a clarifying commentJohannes Schindelin1-0/+28
2019-07-31rebase: fold git-rebase--common into the -p backendJohannes Schindelin5-73/+56
2019-07-31sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin1-1/+1
2019-07-31.gitignore: there is no longer a built-in `git-rebase--interactive`Johannes Schindelin1-1/+0
2019-07-31t3400: stop referring to the scripted rebaseJohannes Schindelin1-1/+1
2019-07-31Drop unused git-rebase--am.shJohannes Schindelin4-91/+0
2019-07-31t5510-fetch: fix negated 'test_i18ngrep' invocationSZEDER Gábor1-1/+1
2019-07-31t: sort output of hashmap iterationJeff King2-27/+49
2019-07-31l10n: sv.po: Update Swedish translation (4676t0f0u)Peter Krefting1-2979/+3586
2019-07-30grep: fix worktree case in submodulesMatheus Tavares2-4/+27
2019-07-30test-dir-iterator: do not assume errno valuesJunio C Hamano2-3/+12
2019-07-30l10n: git.pot: v2.23.0 round 1 (130 new, 35 removed)Jiang Xin1-2829/+3311
2019-07-30Merge tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/gitJiang Xin400-3634/+14750
2019-07-29git: avoid calling aliased builtins via their dashed formJohannes Schindelin1-3/+0
2019-07-29bin-wrappers: append `.exe` to target paths if necessaryJohannes Schindelin1-1/+1
2019-07-29.gitignore: ignore Visual Studio's temporary/generated filesJohannes Schindelin1-0/+3
2019-07-29.gitignore: touch up the entries regarding Visual StudioPhilip Oakley1-2/+3
2019-07-29vcxproj: also link-or-copy builtinsJohannes Schindelin2-0/+18
2019-07-29msvc: add a Makefile target to pre-generate the Visual Studio solutionJohannes Schindelin3-1/+86
2019-07-29contrib/buildsystems: add a backend for modern Visual Studio versionsJohannes Schindelin1-0/+385
2019-07-29contrib/buildsystems: handle options starting with a slashJohannes Schindelin1-1/+1
2019-07-29contrib/buildsystems: also handle -lexpatJohannes Schindelin1-0/+2
2019-07-29contrib/buildsystems: handle libiconv, tooJohannes Schindelin1-0/+2
2019-07-29contrib/buildsystems: handle the curl library optionPhilip Oakley1-1/+3
2019-07-29contrib/buildsystems: error out on unknown optionJohannes Schindelin1-0/+2
2019-07-29contrib/buildsystems: optionally capture the dry-run in a filePhilip Oakley1-0/+10
2019-07-29contrib/buildsystems: redirect errors of the dry run into a log filePhilip Oakley1-1/+6
2019-07-29contrib/buildsystems: ignore gettext stuffPhilip Oakley1-0/+6
2019-07-29contrib/buildsystems: handle quoted spaces in filenamesPhilip Oakley1-3/+4
2019-07-29contrib/buildsystems: fix misleading error messagePhilip Oakley1-1/+1
2019-07-29contrib/buildsystems: ignore irrelevant files in Generators/Johannes Schindelin1-1/+1