Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/the-index-final' | Junio C Hamano | 2019-02-07 | 3 | -2/+4 |
|\ | |||||
| * | cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch | Nguyễn Thái Ngọc Duy | 2019-01-24 | 3 | -2/+4 |
* | | Merge branch 'tt/bisect-in-c' | Junio C Hamano | 2019-02-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | bisect--helper: `get_terms` & `bisect_terms` shell function in C | Pranit Bauva | 2019-01-02 | 1 | -1/+1 |
* | | | Merge branch 'tb/utf-16-le-with-explicit-bom' | Junio C Hamano | 2019-02-07 | 1 | -1/+11 |
|\ \ \ | |||||
| * | | | Support working-tree-encoding "UTF-16LE-BOM" | Torsten Bögershausen | 2019-01-31 | 1 | -1/+11 |
| |/ / | |||||
* | | | Merge branch 'dt/cat-file-batch-ambiguous' | Junio C Hamano | 2019-02-07 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | t1512: test ambiguous cat-file --batch and --batch-output | Eric Wong | 2019-01-31 | 1 | -0/+10 |
* | | | | Merge branch 'en/rebase-merge-on-sequencer' | Junio C Hamano | 2019-02-07 | 6 | -93/+53 |
|\ \ \ \ | |||||
| * | | | | rebase: implement --merge via the interactive machinery | Elijah Newren | 2019-01-07 | 4 | -84/+13 |
| * | | | | rebase: define linearization ordering and enforce it | Elijah Newren | 2018-12-28 | 1 | -9/+6 |
| * | | | | am, rebase--merge: do not overlook --skip'ed commits with post-rewrite | Elijah Newren | 2018-12-28 | 1 | -0/+3 |
| * | | | | t5407: add a test demonstrating how interactive handles --skip differently | Elijah Newren | 2018-12-28 | 1 | -0/+31 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'pw/no-editor-in-rebase-i-implicit' | Junio C Hamano | 2019-02-05 | 3 | -6/+11 |
|\ \ \ \ | |||||
| * | | | | implicit interactive rebase: don't run sequence editor | Phillip Wood | 2019-01-28 | 3 | -6/+11 |
| |/ / / | |||||
* | | | | Merge branch 'jk/diff-cc-stat-fixes' | Junio C Hamano | 2019-02-05 | 6 | -23/+133 |
|\ \ \ \ | |||||
| * | | | | combine-diff: treat --dirstat like --stat | Jeff King | 2019-01-24 | 2 | -0/+4 |
| * | | | | combine-diff: treat --summary like --stat | Jeff King | 2019-01-24 | 2 | -0/+13 |
| * | | | | combine-diff: treat --shortstat like --stat | Jeff King | 2019-01-24 | 2 | -0/+5 |
| * | | | | diff: clear emitted_symbols flag after use | Jeff King | 2019-01-24 | 1 | -0/+79 |
| * | | | | t4006: resurrect commented-out tests | Jeff King | 2019-01-24 | 1 | -23/+32 |
| |/ / / | |||||
* | | | | Merge branch 'bp/checkout-new-branch-optim' | Junio C Hamano | 2019-02-05 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | checkout: fix regression in checkout -b on intitial checkout | Ben Peart | 2019-01-23 | 1 | -1/+1 |
| * | | | | checkout: add test demonstrating regression with checkout -b on initial commit | Ben Peart | 2019-01-23 | 1 | -0/+9 |
* | | | | | Merge branch 'jk/attr-macro-fix' | Junio C Hamano | 2019-02-05 | 1 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | attr: do not mark queried macros as unset | Jeff King | 2019-01-22 | 1 | -0/+20 |
* | | | | | | Merge branch 'js/test-git-installed' | Junio C Hamano | 2019-02-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tests: explicitly use `test-tool.exe` on Windows | Johannes Schindelin | 2019-01-22 | 1 | -1/+1 |
* | | | | | | | Merge branch 'js/abspath-part-inside-repo' | Junio C Hamano | 2019-02-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | abspath_part_inside_repo: respect core.ignoreCase | Johannes Schindelin | 2019-01-18 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'jt/namespaced-ls-refs-fix' | Junio C Hamano | 2019-02-05 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ls-refs: filter refs using namespace-stripped name | Jonathan Tan | 2019-01-18 | 1 | -0/+21 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ab/commit-graph-write-progress' | Junio C Hamano | 2019-02-05 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit-graph: rename "large edges" to "extra edges" | SZEDER Gábor | 2019-01-22 | 1 | -7/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'js/t6042-timing-fix' | Junio C Hamano | 2019-02-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t6042: work around speed optimization on Windows | Johannes Schindelin | 2019-01-17 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/add-ignore-errors-bit-assignment-fix' | Junio C Hamano | 2019-02-05 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add: use separate ADD_CACHE_RENORMALIZE flag | Jeff King | 2019-01-17 | 1 | -0/+9 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/mingw-unc-path-w-backslashes' | Junio C Hamano | 2019-02-05 | 2 | -0/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mingw: special-case arguments to `sh` | Johannes Schindelin | 2019-01-18 | 2 | -1/+11 |
| * | | | | | | | | mingw (t5580): document bug when cloning from backslashed UNC paths | Johannes Schindelin | 2019-01-18 | 1 | -0/+5 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cc/test-ref-store-typofix' | Junio C Hamano | 2019-02-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo | Christian Couder | 2019-01-17 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jt/fetch-v2-sideband' | Junio C Hamano | 2019-02-05 | 6 | -6/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tests: define GIT_TEST_SIDEBAND_ALL | Jonathan Tan | 2019-01-17 | 5 | -4/+11 |
| * | | | | | | | | | Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband | Junio C Hamano | 2019-01-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | pack-protocol.txt: accept error packets in any context | Masaya Suzuki | 2019-01-02 | 1 | -2/+2 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
* | | | | | | | | | Merge branch 'js/commit-graph-chunk-table-fix' | Junio C Hamano | 2019-02-05 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | commit-graph: fix buffer read-overflow | Josh Steadmon | 2019-01-16 | 1 | -3/+13 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ld/git-p4-shelve-update-fix' | Junio C Hamano | 2019-02-05 | 1 | -3/+54 |
|\ \ \ \ \ \ \ \ \ |