summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t5[6-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1918-186/+186
* t55[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1919-239/+239
* t55[23]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1913-307/+307
* t551*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-198-441/+441
* t550*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-198-130/+130
* t5503: prepare aligned comment for replacing `master` with `main`Johannes Schindelin2020-11-191-1/+1
* t5[0-4]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1915-131/+131
* t5323: prepare centered comment for `master` -> `main`Johannes Schindelin2020-11-191-3/+3
* t4*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1929-319/+319
* t3[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1916-126/+126
* t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1923-253/+253
* t3416: preemptively adjust alignment in a commentJohannes Schindelin2020-11-191-1/+1
* t3[0-3]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1916-240/+240
* t2*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1919-219/+219
* t[01]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-1944-394/+394
* t0060: preemptively adjust alignmentJohannes Schindelin2020-11-191-2/+2
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-19325-0/+974
* Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-...Junio C Hamano2020-11-192-0/+16
|\
| * t7800: simplify difftool testJinoh Kang2020-11-111-19/+9
| * diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang2020-11-062-0/+26
* | Sixth batchJunio C Hamano2020-11-181-0/+35
* | Merge branch 'jc/blame-ignore-fix'Junio C Hamano2020-11-182-4/+5
|\ \
| * | blame: silently ignore invalid ignore file objectsRené Scharfe2020-11-102-4/+5
* | | Merge branch 'jc/sparse-error-for-developer-build'Junio C Hamano2020-11-181-0/+1
|\ \ \
| * | | Makefile: enable -Wsparse-error for DEVELOPER buildJunio C Hamano2020-10-311-0/+1
| | |/ | |/|
* | | Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano2020-11-1812-72/+79
|\ \ \
| * | | blame: simplify 'setup_blame_bloom_data' interfacePhilippe Blain2020-11-013-6/+4
| * | | blame: simplify 'setup_scoreboard' interfacePhilippe Blain2020-11-013-8/+6
| * | | blame: enable funcname blaming with userdiff driverPhilippe Blain2020-11-012-2/+20
| * | | line-log: mention both modes in 'blame' and 'log' short helpPhilippe Blain2020-11-012-3/+4
| * | | doc: add more pointers to gitattributes(5) for userdiffPhilippe Blain2020-11-013-4/+11
| * | | blame-options.txt: also mention 'funcname' in '-L' descriptionPhilippe Blain2020-11-012-4/+5
| * | | doc: line-range: improve formattingPhilippe Blain2020-11-013-17/+17
| * | | doc: log, gitk: move '-L' description to 'line-range-options.txt'Philippe Blain2020-11-013-33/+17
* | | | Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-1813-15/+517
|\ \ \ \
| * | | | merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-025-15/+104
| * | | | fast-rebase: demonstrate merge-ort's API via new test-tool commandElijah Newren2020-10-294-0/+214
| * | | | merge-ort-wrappers: new convience wrappers to mimic the old merge APIElijah Newren2020-10-263-0/+88
| * | | | merge-ort: barebones API of new merge strategy with empty implementationElijah Newren2020-10-263-0/+111
* | | | | Merge branch 'ds/maintenance-part-3'Junio C Hamano2020-11-1817-8/+759
|\ \ \ \ \
| * | | | | maintenance: add troubleshooting guide to docsDerrick Stolee2020-10-161-0/+44
| * | | | | maintenance: use 'incremental' strategy by defaultDerrick Stolee2020-10-163-4/+43
| * | | | | maintenance: create maintenance.strategy configDerrick Stolee2020-10-163-2/+90
| * | | | | maintenance: add start/stop subcommandsDerrick Stolee2020-09-258-0/+207
| * | | | | maintenance: add [un]register subcommandsDerrick Stolee2020-09-253-2/+84
| * | | | | for-each-repo: run subcommands on configured reposDerrick Stolee2020-09-258-0/+152
| * | | | | maintenance: add --schedule option and configDerrick Stolee2020-09-254-4/+118
| * | | | | maintenance: optionally skip --auto processDerrick Stolee2020-09-253-0/+24
* | | | | | Merge branch 'pw/rebase-i-orig-head'Junio C Hamano2020-11-184-22/+31
|\ \ \ \ \ \
| * | | | | | rebase -i: simplify get_revision_ranges()Phillip Wood2020-11-041-6/+4
View Lorry Controller Status