summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'tb/commit-graph-no-check-oids' into masterJunio C Hamano2020-07-151-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-graph: fix "Collecting commits from input" progress lineSZEDER Gábor2020-07-151-3/+1
* | | | | | | | | | Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano2020-07-151-7/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-diff.txt: reorder possible usagesMartin Ågren2020-07-131-6/+7
| * | | | | | | | | | git-diff.txt: don't mark required argument as optionalMartin Ågren2020-07-131-1/+1
* | | | | | | | | | | Merge branch 'sg/commit-graph-progress-fix' into masterJunio C Hamano2020-07-151-22/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit-graph: fix "Writing out commit graph" progress counterSZEDER Gábor2020-07-091-20/+2
| * | | | | | | | | | | commit-graph: fix progress of reachable commitsSZEDER Gábor2020-07-091-2/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ta/wait-on-aliased-commands-upon-signal' into masterJunio C Hamano2020-07-153-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Wait for child on signal death for aliases to externalsTrygve Aaberge2020-07-071-0/+2
| * | | | | | | | | | Wait for child on signal death for aliases to builtinsTrygve Aaberge2020-07-073-1/+3
* | | | | | | | | | | Git 2.28-rc0v2.28.0-rc0Junio C Hamano2020-07-091-3/+27
* | | | | | | | | | | Merge branch 'mt/entry-fstat-fallback-fix' into masterJunio C Hamano2020-07-091-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | entry: check for fstat() errors after checkoutMatheus Tavares2020-07-091-2/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ma/rebase-doc-typofix' into masterJunio C Hamano2020-07-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-rebase.txt: fix description list separatorMartin Ågren2020-07-091-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/eject-fetch-write-commit-graph-out-of-experimental' into masterJunio C Hamano2020-07-093-14/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | experimental: default to fetch.writeCommitGraph=falseJonathan Nieder2020-07-083-14/+5
* | | | | | | | | | | | Merge branch 'tb/fix-persistent-shallow' into masterJunio C Hamano2020-07-094-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit.c: don't persist substituted parents when unshallowingTaylor Blau2020-07-084-1/+19
* | | | | | | | | | | | | Merge branch 'ct/diff-with-merge-base-clarification' into masterJunio C Hamano2020-07-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | diff: check for merge bases before assigning sym->baseJeff King2020-07-081-1/+1
* | | | | | | | | | | | | Merge branch 'rs/line-log-until' into masterJunio C Hamano2020-07-092-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | revision: disable min_age optimization with line-logRené Scharfe2020-07-062-1/+10
* | | | | | | | | | | | | | Merge branch 'ra/send-email-in-reply-to-from-command-line-wins' into masterJunio C Hamano2020-07-092-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | send-email: restore --in-reply-to superseding behaviorRafael Aquini2020-07-012-3/+19
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'vs/completion-with-set-u' into masterJunio C Hamano2020-07-091-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | completion: nounset mode fixesVille Skyttä2020-07-011-9/+9
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'cc/cat-file-usage-update' into masterJunio C Hamano2020-07-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | cat-file: add missing [=<format>] to usage/synopsisChristian Couder2020-07-012-2/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | The seventh batchJunio C Hamano2020-07-061-0/+35
* | | | | | | | | | | | | Merge branch 'es/worktree-code-cleanup'Junio C Hamano2020-07-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | worktree: avoid dead-code in conditionalEric Sunshine2020-06-241-3/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'dl/test-must-fail-fixes-5'Junio C Hamano2020-07-0613-59/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | lib-submodule-update: pass 'test_must_fail' as an argumentDenton Liu2020-06-248-26/+84
| * | | | | | | | | | | | | lib-submodule-update: prepend "git" to $commandDenton Liu2020-06-1213-30/+34
| * | | | | | | | | | | | | lib-submodule-update: consolidate --recurse-submodulesDenton Liu2020-04-291-3/+3
| * | | | | | | | | | | | | lib-submodule-update: add space after function nameDenton Liu2020-04-291-3/+3
* | | | | | | | | | | | | | Merge branch 'jk/fast-export-anonym-alt'Junio C Hamano2020-07-063-71/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fast-export: use local array to store anonymized oidJeff King2020-06-251-4/+4
| * | | | | | | | | | | | | | fast-export: anonymize "master" refnameJeff King2020-06-252-12/+7
| * | | | | | | | | | | | | | fast-export: allow seeding the anonymized mappingJeff King2020-06-253-2/+88
| * | | | | | | | | | | | | | fast-export: add a "data" callback parameter to anonymize_str()Jeff King2020-06-231-13/+14
| * | | | | | | | | | | | | | fast-export: move global "idents" anonymize hashmap into functionJeff King2020-06-231-1/+1
| * | | | | | | | | | | | | | fast-export: use a flex array to store anonymized entriesJeff King2020-06-231-3/+2
| * | | | | | | | | | | | | | fast-export: stop storing lengths in anonymized hashmapsJeff King2020-06-231-10/+18
| * | | | | | | | | | | | | | fast-export: tighten anonymize_mem() interface to handle only stringsJeff King2020-06-231-27/+26
| * | | | | | | | | | | | | | fast-export: store anonymized oids as hex stringsJeff King2020-06-231-12/+16
| * | | | | | | | | | | | | | fast-export: use xmemdupz() for anonymizing oidsJeff King2020-06-232-1/+16
| * | | | | | | | | | | | | | t9351: derive anonymized tree checks from original repoJeff King2020-06-231-10/+6