summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'sb/plug-misc-leaks'Junio C Hamano2018-06-253-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sequencer.c: plug mem leak in git_sequencer_configStefan Beller2018-06-251-0/+1
| * | | | | | | | | | | | sequencer.c: plug leaks in do_pick_commitStefan Beller2018-06-041-1/+2
| * | | | | | | | | | | | submodule--helper: plug mem leak in print_default_remoteStefan Beller2018-06-011-1/+2
| * | | | | | | | | | | | refs/packed-backend.c: close fd of empty fileStefan Beller2018-06-011-0/+1
* | | | | | | | | | | | | Merge branch 'cc/tests-without-assuming-ref-files-backend'Junio C Hamano2018-06-251-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9104: kosherly remove remote refsChristian Couder2018-06-041-1/+3
* | | | | | | | | | | | | | Merge branch 'sg/update-ref-stdin-cleanup'Junio C Hamano2018-06-251-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update-ref --stdin: use skip_prefix()SZEDER Gábor2018-06-041-12/+13
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'nd/reject-empty-shallow-request'Junio C Hamano2018-06-252-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | upload-pack: reject shallow requests that would return nothingNguyễn Thái Ngọc Duy2018-06-042-0/+14
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ls/complete-remote-update-names'Junio C Hamano2018-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | completion: complete remote names tooŁukasz Stelmach2018-06-011-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ag/rebase-p'Junio C Hamano2018-06-255-803/+1048
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase: remove -p code from git-rebase--interactive.shAlban Gruin2018-06-011-794/+8
| * | | | | | | | | | | | | | rebase: use the new git-rebase--preserve-merges.shAlban Gruin2018-06-011-7/+25
| * | | | | | | | | | | | | | rebase: strip unused code in git-rebase--preserve-merges.shAlban Gruin2018-06-011-61/+4
| * | | | | | | | | | | | | | rebase: introduce a dedicated backend for --preserve-mergesAlban Gruin2018-06-013-0/+1072
* | | | | | | | | | | | | | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-2521-553/+445
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: complete general config vars in two stepsNguyễn Thái Ngọc Duy2018-05-291-2/+7
| * | | | | | | | | | | | | | | log-tree: allow to customize 'grafted' colorNguyễn Thái Ngọc Duy2018-05-292-1/+3
| * | | | | | | | | | | | | | | completion: support case-insensitive config varsNguyễn Thái Ngọc Duy2018-05-291-1/+9
| * | | | | | | | | | | | | | | completion: keep other config var completion in camelCaseNguyễn Thái Ngọc Duy2018-05-291-6/+6
| * | | | | | | | | | | | | | | completion: drop the hard coded list of config varsNguyễn Thái Ngọc Duy2018-05-294-331/+49
| * | | | | | | | | | | | | | | am: move advice.amWorkDir parsing back to advice.cNguyễn Thái Ngọc Duy2018-05-294-6/+5
| * | | | | | | | | | | | | | | advice: keep config name in camelCase in advice_config[]Nguyễn Thái Ngọc Duy2018-05-291-21/+21
| * | | | | | | | | | | | | | | fsck: produce camelCase config key namesNguyễn Thái Ngọc Duy2018-05-291-4/+18
| * | | | | | | | | | | | | | | help: add --config to list all available configNguyễn Thái Ngọc Duy2018-05-2913-1/+172
| * | | | | | | | | | | | | | | fsck: factor out msg_id_info[] lazy initialization codeNguyễn Thái Ngọc Duy2018-05-291-16/+24
| * | | | | | | | | | | | | | | grep: keep all colors in an arrayNguyễn Thái Ngọc Duy2018-05-292-65/+62
| * | | | | | | | | | | | | | | Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy2018-05-297-112/+82
| * | | | | | | | | | | | | | | Merge branch 'nd/command-list' into nd/complete-config-varsJunio C Hamano2018-05-2925-313/+589
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sb/object-store-alloc'Junio C Hamano2018-06-2515-68/+221
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | alloc: allow arbitrary repositories for alloc functionsStefan Beller2018-05-1613-42/+140
| * | | | | | | | | | | | | | | | object: allow create_object to handle arbitrary repositoriesStefan Beller2018-05-092-8/+7
| * | | | | | | | | | | | | | | | object: allow grow_object_hash to handle arbitrary repositoriesStefan Beller2018-05-091-8/+8
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_commit_indexStefan Beller2018-05-093-4/+5
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_reportStefan Beller2018-05-092-2/+3
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_object_nodeStefan Beller2018-05-093-3/+4
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_tag_nodeStefan Beller2018-05-093-3/+4
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_commit_nodeStefan Beller2018-05-095-5/+6
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_tree_nodeStefan Beller2018-05-093-3/+4
| * | | | | | | | | | | | | | | | alloc: add repository argument to alloc_blob_nodeStefan Beller2018-05-093-3/+4
| * | | | | | | | | | | | | | | | object: add repository argument to grow_object_hashJonathan Nieder2018-05-091-2/+3
| * | | | | | | | | | | | | | | | object: add repository argument to create_objectStefan Beller2018-05-096-7/+14
| * | | | | | | | | | | | | | | | repository: introduce parsed objects fieldStefan Beller2018-05-094-23/+64
* | | | | | | | | | | | | | | | | Merge branch 'jk/show-index'Junio C Hamano2018-06-255-8/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | show-index: update documentation for index v2Jeff King2018-05-281-6/+20
| * | | | | | | | | | | | | | | | | make show-index a builtinJeff King2018-05-284-2/+5
* | | | | | | | | | | | | | | | | | Merge branch 'en/merge-recursive-tests'Junio C Hamano2018-06-252-861/+1098
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \