summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano2018-05-301-0/+14
|\
| * fetch: generate ref-prefixes when using a configured refspecBrandon Williams2018-05-181-0/+14
* | Merge branch 'ab/get-short-oid'Junio C Hamano2018-05-301-0/+21
|\ \
| * | get_short_oid: sort ambiguous objects by type, then SHA-1Ævar Arnfjörð Bjarmason2018-05-111-0/+21
* | | Merge branch 'jt/partial-clone-proto-v2'Junio C Hamano2018-05-302-0/+126
|\ \ \
| * | | {fetch,upload}-pack: support filter in protocol v2Jonathan Tan2018-05-061-0/+98
| * | | upload-pack: read config when serving protocol v2Jonathan Tan2018-05-061-0/+14
| * | | upload-pack: fix error message typoJonathan Tan2018-05-021-0/+14
| * | | Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2Junio C Hamano2018-05-023-0/+513
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-302-3/+3
|\ \ \ \
| * | | | dir: convert struct untracked_cache_dir to object_idbrian m. carlson2018-05-021-1/+1
| * | | | Update struct index_state to use struct object_idbrian m. carlson2018-05-021-1/+1
| * | | | split-index: convert struct split_index to object_idbrian m. carlson2018-05-021-1/+1
* | | | | Merge branch 'sb/blame-color'Junio C Hamano2018-05-301-0/+48
|\ \ \ \ \
| * | | | | builtin/blame: add new coloring scheme configStefan Beller2018-04-241-0/+4
| * | | | | builtin/blame: highlight recently changed linesStefan Beller2018-04-241-0/+25
| * | | | | builtin/blame: dim uninteresting metadata linesStefan Beller2018-04-241-0/+19
* | | | | | Merge branch 'cf/submodule-progress-dissociate'Junio C Hamano2018-05-302-0/+33
|\ \ \ \ \ \
| * | | | | | submodule: add --dissociate option to add/update commandsCasey Fitzpatrick2018-05-221-0/+17
| * | | | | | submodule: add --progress option to add commandCasey Fitzpatrick2018-05-221-0/+16
* | | | | | | Merge branch 'sg/complete-paths'Junio C Hamano2018-05-301-2/+162
|\ \ \ \ \ \ \
| * | | | | | | t9902-completion: exercise __git_complete_index_file() directlySZEDER Gábor2018-05-211-107/+118
| * | | | | | | completion: improve handling quoted paths in 'git ls-files's outputSZEDER Gábor2018-04-171-2/+15
| * | | | | | | t9902-completion: ignore COMPREPLY element order in some testsSZEDER Gábor2018-04-171-2/+4
| * | | | | | | completion: let 'ls-files' and 'diff-index' filter matching pathsSZEDER Gábor2018-04-171-0/+1
| * | | | | | | completion: improve handling quoted paths on the command lineSZEDER Gábor2018-04-171-2/+44
| * | | | | | | completion: support completing non-ASCII pathnamesSZEDER Gábor2018-04-171-1/+1
| * | | | | | | t9902-completion: add tests demonstrating issues with quoted pathnamesSZEDER Gábor2018-04-171-0/+91
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ma/create-pseudoref-with-null-old-oid'Junio C Hamano2018-05-301-0/+60
|\ \ \ \ \ \ \
| * | | | | | | refs: handle zero oid for pseudorefsMartin Ågren2018-05-131-2/+2
| * | | | | | | t1400: add tests around adding/deleting pseudorefsMartin Ågren2018-05-131-0/+60
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'bp/status-rename-config'Junio C Hamano2018-05-301-0/+113
|\ \ \ \ \ \ \
| * | | | | | | add status config and command line options for rename detectionBen Peart2018-05-131-0/+113
* | | | | | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-302-8/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | BUG_exit_code: fix sparse "symbol not declared" warningRamsay Jones2018-05-101-1/+0
| * | | | | | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-8/+8
| * | | | | | | | test-tool: help verifying BUG() code pathsJohannes Schindelin2018-05-061-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-302-11/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | lock_file: move static locks into functionsMartin Ågren2018-05-101-2/+2
| * | | | | | | | t/helper/test-write-cache: clean up lock-handlingMartin Ågren2018-05-101-9/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sg/t6500-no-redirect-of-stdin'Junio C Hamano2018-05-301-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | t6050-replace: don't disable stdin for the whole test scriptSZEDER Gábor2018-05-091-2/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'bp/merge-rename-config'Junio C Hamano2018-05-301-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: add merge.renames config settingBen Peart2018-05-081-0/+18
* | | | | | | | | Merge branch 'js/sequencer-and-root-commits'Junio C Hamano2018-05-303-9/+88
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin2018-05-061-0/+25
| * | | | | | | | | rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin2018-05-061-0/+13
| * | | | | | | | | sequencer: allow introducing new root commitsJohannes Schindelin2018-05-061-0/+34
| * | | | | | | | | rebase -i --root: let the sequencer handle even the initial partJohannes Schindelin2018-05-062-9/+16
* | | | | | | | | | Sync with Git 2.17.1Junio C Hamano2018-05-294-0/+272
|\ \ \ \ \ \ \ \ \ \