summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | object-name: reject trees found in the indexDerrick Stolee2022-04-262-10/+20
| * | | | | | show: integrate with the sparse indexDerrick Stolee2022-04-262-4/+25
| * | | | | | t1092: add compatibility tests for 'git show'Derrick Stolee2022-04-261-0/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'vd/sparse-stash'Junio C Hamano2022-05-217-9/+131
|\ \ \ \ \ \
| * | | | | | unpack-trees: preserve index sparsityVictoria Dye2022-05-112-1/+7
| * | | | | | stash: apply stash using 'merge_ort_nonrecursive()'Victoria Dye2022-05-112-8/+26
| * | | | | | read-cache: set sparsity when index is newVictoria Dye2022-05-112-2/+18
| * | | | | | sparse-index: expose 'is_sparse_index_allowed()'Victoria Dye2022-05-112-1/+2
| * | | | | | stash: integrate with sparse indexVictoria Dye2022-05-112-1/+31
| * | | | | | stash: expand sparse-checkout compatibility testingVictoria Dye2022-05-112-0/+51
| |/ / / / /
* | | | | | Merge branch 'cd/bisect-messages-from-pre-flight-states'Junio C Hamano2022-05-213-13/+93
|\ \ \ \ \ \
| * | | | | | bisect: output bisect setup status in bisect logChris Down2022-05-112-5/+31
| * | | | | | bisect: output state before we are ready to compute bisectionChris Down2022-05-113-13/+67
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jc/update-ozlabs-url'Junio C Hamano2022-05-211-1/+4
|\ \ \ \ \ \
| * | | | | | SubmittingPatches: use more stable git.ozlabs.org URLJunio C Hamano2022-05-111-1/+4
| |/ / / / /
* | | | | | Merge branch 'gc/pull-recurse-submodules'Junio C Hamano2022-05-212-3/+33
|\ \ \ \ \ \
| * | | | | | pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo2022-05-122-3/+33
* | | | | | | Merge branch 'mg/detect-compiler-in-c-locale'Junio C Hamano2022-05-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | detect-compiler: make detection independent of localeMichael J Gruber2022-05-091-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'js/trace2-doc-fixes'Junio C Hamano2022-05-211-22/+22
|\ \ \ \ \ \ \
| * | | | | | | trace2 docs: add missing full stopJohannes Schindelin2022-05-041-1/+1
| * | | | | | | trace2 docs: clarify what `varargs` is all aboutJohannes Schindelin2022-05-041-1/+1
| * | | | | | | trace2 docs: fix a JSON formatted exampleJohannes Schindelin2022-05-041-1/+1
| * | | | | | | trace2 docs: surround more terms in backticksJohannes Schindelin2022-05-041-7/+7
| * | | | | | | trace2 docs: "printf" is not an English wordJohannes Schindelin2022-05-041-6/+6
| * | | | | | | trace2 docs: a couple of grammar fixesJohannes Schindelin2022-05-041-8/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mv/log-since-as-filter'Junio C Hamano2022-05-214-0/+57
|\ \ \ \ \ \ \
| * | | | | | | log: "--since-as-filter" option is a non-terminating "--since" variantMiklos Vajna2022-04-234-0/+57
| |/ / / / / /
* | | | | | | Merge branch 'rs/external-diff-tempfile'Junio C Hamano2022-05-214-11/+81
|\ \ \ \ \ \ \
| * | | | | | | diff: use mks_tempfile_dt()René Scharfe2022-04-212-11/+5
| * | | | | | | tempfile: add mks_tempfile_dt()René Scharfe2022-04-212-0/+76
| |/ / / / / /
* | | | | | | Merge branch 'kf/p4-multiple-remotes'Junio C Hamano2022-05-211-1/+9
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix issue with multiple perforce remotesKirill Frolov2022-03-211-1/+9
* | | | | | | | Merge branch 'tk/p4-with-explicity-sync'Junio C Hamano2022-05-213-14/+132
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: support explicit sync of arbitrary existing git-p4 refsTao Klerks2022-04-063-14/+133
* | | | | | | | | Merge branch 'tk/p4-utf8-bom'Junio C Hamano2022-05-212-0/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: preserve utf8 BOM when importing from p4 to gitTao Klerks2022-04-062-0/+44
| |/ / / / / / / /
* | | | | | | | | Merge branch 'cg/vscode-with-gdb'Junio C Hamano2022-05-212-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | contrib/vscode/: debugging with VS Code and gdbCOGONI Guillaume2022-04-082-2/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sa/t1011-use-helpers'Junio C Hamano2022-05-211-23/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t1011: replace test -f with test_path_is_fileSiddharth Asthana2022-04-131-23/+23
* | | | | | | | | | Merge branch 'km/t3501-use-test-helpers'Junio C Hamano2022-05-211-5/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3501: remove test -f and stop ignoring git <cmd> exit codeKhalid Masum2022-04-061-5/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pb/submodule-recurse-mode-enum'Junio C Hamano2022-05-212-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule.h: use a named enum for RECURSE_SUBMODULES_*Philippe Blain2022-04-062-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ah/convert-warning-message'Junio C Hamano2022-05-212-10/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | convert: clarify line ending conversion warningAlex Henrie2022-04-082-10/+10
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gf/unused-includes'Junio C Hamano2022-05-212-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply.c: remove unnecessary includeGarrit Franke2022-04-061-1/+0
| * | | | | | | | | | serve.c: remove unnecessary includeGarrit Franke2022-04-061-1/+0
| | |/ / / / / / / / | |/| | | | | | | |