summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/the-index-final'Junio C Hamano2019-02-073-2/+4
|\
| * cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-243-2/+4
* | Merge branch 'tt/bisect-in-c'Junio C Hamano2019-02-071-1/+1
|\ \
| * | bisect--helper: `get_terms` & `bisect_terms` shell function in CPranit Bauva2019-01-021-1/+1
* | | Merge branch 'tb/utf-16-le-with-explicit-bom'Junio C Hamano2019-02-071-1/+11
|\ \ \
| * | | Support working-tree-encoding "UTF-16LE-BOM"Torsten Bögershausen2019-01-311-1/+11
| |/ /
* | | Merge branch 'dt/cat-file-batch-ambiguous'Junio C Hamano2019-02-071-0/+10
|\ \ \
| * | | t1512: test ambiguous cat-file --batch and --batch-outputEric Wong2019-01-311-0/+10
* | | | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-076-93/+53
|\ \ \ \
| * | | | rebase: implement --merge via the interactive machineryElijah Newren2019-01-074-84/+13
| * | | | rebase: define linearization ordering and enforce itElijah Newren2018-12-281-9/+6
| * | | | am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren2018-12-281-0/+3
| * | | | t5407: add a test demonstrating how interactive handles --skip differentlyElijah Newren2018-12-281-0/+31
| | |/ / | |/| |
* | | | Merge branch 'pw/no-editor-in-rebase-i-implicit'Junio C Hamano2019-02-053-6/+11
|\ \ \ \
| * | | | implicit interactive rebase: don't run sequence editorPhillip Wood2019-01-283-6/+11
| |/ / /
* | | | Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano2019-02-056-23/+133
|\ \ \ \
| * | | | combine-diff: treat --dirstat like --statJeff King2019-01-242-0/+4
| * | | | combine-diff: treat --summary like --statJeff King2019-01-242-0/+13
| * | | | combine-diff: treat --shortstat like --statJeff King2019-01-242-0/+5
| * | | | diff: clear emitted_symbols flag after useJeff King2019-01-241-0/+79
| * | | | t4006: resurrect commented-out testsJeff King2019-01-241-23/+32
| |/ / /
* | | | Merge branch 'bp/checkout-new-branch-optim'Junio C Hamano2019-02-051-0/+9
|\ \ \ \
| * | | | checkout: fix regression in checkout -b on intitial checkoutBen Peart2019-01-231-1/+1
| * | | | checkout: add test demonstrating regression with checkout -b on initial commitBen Peart2019-01-231-0/+9
* | | | | Merge branch 'jk/attr-macro-fix'Junio C Hamano2019-02-051-0/+20
|\ \ \ \ \
| * | | | | attr: do not mark queried macros as unsetJeff King2019-01-221-0/+20
* | | | | | Merge branch 'js/test-git-installed'Junio C Hamano2019-02-051-1/+1
|\ \ \ \ \ \
| * | | | | | tests: explicitly use `test-tool.exe` on WindowsJohannes Schindelin2019-01-221-1/+1
* | | | | | | Merge branch 'js/abspath-part-inside-repo'Junio C Hamano2019-02-051-0/+7
|\ \ \ \ \ \ \
| * | | | | | | abspath_part_inside_repo: respect core.ignoreCaseJohannes Schindelin2019-01-181-0/+7
* | | | | | | | Merge branch 'jt/namespaced-ls-refs-fix'Junio C Hamano2019-02-051-0/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | ls-refs: filter refs using namespace-stripped nameJonathan Tan2019-01-181-0/+21
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/commit-graph-write-progress'Junio C Hamano2019-02-051-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: rename "large edges" to "extra edges"SZEDER Gábor2019-01-221-7/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'js/t6042-timing-fix'Junio C Hamano2019-02-051-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t6042: work around speed optimization on WindowsJohannes Schindelin2019-01-171-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/add-ignore-errors-bit-assignment-fix'Junio C Hamano2019-02-051-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | add: use separate ADD_CACHE_RENORMALIZE flagJeff King2019-01-171-0/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/mingw-unc-path-w-backslashes'Junio C Hamano2019-02-052-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: special-case arguments to `sh`Johannes Schindelin2019-01-182-1/+11
| * | | | | | | | mingw (t5580): document bug when cloning from backslashed UNC pathsJohannes Schindelin2019-01-181-0/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'cc/test-ref-store-typofix'Junio C Hamano2019-02-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | helper/test-ref-store: fix "new-sha1" vs "old-sha1" typoChristian Couder2019-01-171-1/+1
* | | | | | | | | Merge branch 'jt/fetch-v2-sideband'Junio C Hamano2019-02-056-6/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: define GIT_TEST_SIDEBAND_ALLJonathan Tan2019-01-175-4/+11
| * | | | | | | | | Merge branch 'ms/packet-err-check' into jt/fetch-v2-sidebandJunio C Hamano2019-01-141-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | pack-protocol.txt: accept error packets in any contextMasaya Suzuki2019-01-021-2/+2
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Merge branch 'js/commit-graph-chunk-table-fix'Junio C Hamano2019-02-051-3/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-graph: fix buffer read-overflowJosh Steadmon2019-01-161-3/+13
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ld/git-p4-shelve-update-fix'Junio C Hamano2019-02-051-3/+54
|\ \ \ \ \ \ \ \ \