summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-1/+8
* pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-262-8/+24
* rebase-helper --make-script: introduce a flag to rebase mergesJohannes Schindelin2018-04-261-1/+3
* Merge branch 'sb/filenames-with-dashes'Junio C Hamano2018-04-2512-13/+13
|\
| * sha1_file.c: rename to use dash in file nameStefan Beller2018-04-111-1/+1
| * exec_cmd: rename to use dash in file nameStefan Beller2018-04-1112-12/+12
* | Merge branch 'jk/ref-array-push'Junio C Hamano2018-04-252-2/+2
|\ \
| * | ref-filter: use "struct object_id" consistentlyJeff King2018-04-082-2/+2
* | | Merge branch 'bw/commit-partial-from-subdirectory-fix'Junio C Hamano2018-04-251-2/+1
|\ \ \ | |_|/ |/| |
| * | commit: allow partial commits with relative pathsBrandon Williams2018-04-051-2/+1
* | | Merge branch 'rs/status-with-removed-submodule'Junio C Hamano2018-04-111-2/+6
|\ \ \
| * | | submodule: check for NULL return of get_submodule_ref_store()René Scharfe2018-03-291-2/+6
| * | | Merge branch 'jk/cached-commit-buffer' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \
| * \ \ \ Merge branch 'sm/mv-dry-run-update' into maintJunio C Hamano2018-03-221-2/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/worktree-add-short-help' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/describe-unique-abbrev' into maintJunio C Hamano2018-03-221-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2018-03-221-1/+7
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'sb/packfiles-in-repository'Junio C Hamano2018-04-116-10/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | packfile: keep prepare_packed_git() privateNguyễn Thái Ngọc Duy2018-03-265-8/+1
| * | | | | | | | | packfile: add repository argument to reprepare_packed_gitStefan Beller2018-03-262-2/+3
| * | | | | | | | | packfile: add repository argument to prepare_packed_gitStefan Beller2018-03-265-5/+5
* | | | | | | | | | Merge branch 'sb/object-store'Junio C Hamano2018-04-1113-23/+43
|\| | | | | | | | |
| * | | | | | | | | sha1_file: add repository argument to prepare_alt_odbStefan Beller2018-03-261-1/+1
| * | | | | | | | | object-store: close all packs upon clearing the object storeStefan Beller2018-03-265-5/+5
| * | | | | | | | | object-store: move packed_git and packed_git_mru to object storeStefan Beller2018-03-266-16/+27
| * | | | | | | | | object-store: move alt_odb_list and alt_odb_tail to object storeStefan Beller2018-03-231-0/+4
| * | | | | | | | | object-store: migrate alternates struct and functions from cache.hStefan Beller2018-03-234-0/+4
| * | | | | | | | | repository: introduce raw object store fieldStefan Beller2018-03-231-1/+2
* | | | | | | | | | Merge branch 'ps/contains-id-error-message'Junio C Hamano2018-04-103-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: do not show usage upon invalid option valuePaul-Sebastian Ungureanu2018-03-223-0/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/worktree-prune'Junio C Hamano2018-04-101-9/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | worktree prune: improve prune logic when worktree is movedNguyễn Thái Ngọc Duy2018-03-151-1/+2
| * | | | | | | | | | worktree: delete dead codeNguyễn Thái Ngọc Duy2018-03-151-8/+0
* | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-1041-166/+167
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Convert lookup_replace_object to struct object_idbrian m. carlson2018-03-141-5/+2
| * | | | | | | | | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-1416-36/+36
| * | | | | | | | | | | sha1_file: convert read_object_with_reference to object_idbrian m. carlson2018-03-143-4/+4
| * | | | | | | | | | | tree-walk: convert tree entry functions to object_idbrian m. carlson2018-03-142-2/+2
| * | | | | | | | | | | builtin/notes: convert static functions to object_idbrian m. carlson2018-03-141-5/+5
| * | | | | | | | | | | builtin/fmt-merge-msg: convert remaining code to object_idbrian m. carlson2018-03-141-2/+2
| * | | | | | | | | | | sha1_file: convert sha1_object_info* to object_idbrian m. carlson2018-03-1414-29/+28
| * | | | | | | | | | | sha1_file: convert assert_sha1_type to object_idbrian m. carlson2018-03-141-1/+1
| * | | | | | | | | | | builtin/mktree: convert to struct object_idbrian m. carlson2018-03-141-12/+12
| * | | | | | | | | | | streaming: convert open_istream to use struct object_idbrian m. carlson2018-03-142-2/+2
| * | | | | | | | | | | sha1_file: convert check_sha1_signature to struct object_idbrian m. carlson2018-03-143-3/+6
| * | | | | | | | | | | sha1_file: convert read_loose_object to use struct object_idbrian m. carlson2018-03-141-1/+1
| * | | | | | | | | | | builtin/index-pack: convert struct ref_delta_entry to object_idbrian m. carlson2018-03-141-17/+17
| * | | | | | | | | | | builtin/mktag: convert to struct object_idbrian m. carlson2018-03-141-9/+9
| * | | | | | | | | | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-1417-31/+33
| * | | | | | | | | | | strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-143-6/+6