Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 2.18.2 | Johannes Schindelin | 2019-12-06 | 1 | -2/+47 |
|\ | |||||
| * | Sync with 2.17.3 | Johannes Schindelin | 2019-12-06 | 1 | -2/+47 |
| |\ | |||||
| | * | Sync with 2.16.6 | Johannes Schindelin | 2019-12-06 | 1 | -2/+47 |
| | |\ | |||||
| | | * | Sync with 2.15.4 | Johannes Schindelin | 2019-12-06 | 1 | -2/+47 |
| | | |\ | |||||
| | | | * | Sync with 2.14.6 | Johannes Schindelin | 2019-12-06 | 1 | -2/+47 |
| | | | |\ | |||||
| | | | | * | Disallow dubiously-nested submodule git directories | Johannes Schindelin | 2019-12-05 | 1 | -2/+47 |
* | | | | | | Merge branch 'sm/show-superproject-while-conflicted' into maint | Junio C Hamano | 2018-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse: --show-superproject-working-tree should work during a merge | Sam McKelvie | 2018-09-28 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'bp/mv-submodules-with-fsmonitor' into maint | Junio C Hamano | 2018-11-21 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-mv: allow submodules and fsmonitor to work together | Ben Peart | 2018-09-12 | 1 | -2/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Revert "Merge branch 'sb/submodule-core-worktree'" | Jonathan Nieder | 2018-09-08 | 1 | -14/+0 |
* | | | | | | submodule.c: use the right index instead of the_index | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -4/+4 |
* | | | | | | dir.c: remove an implicit dependency on the_index in pathspec code | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'sb/object-store-lookup' | Junio C Hamano | 2018-08-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: add repository argument to lookup_commit_reference | Stefan Beller | 2018-06-29 | 1 | -2/+2 |
* | | | | | | | Merge branch 'sb/submodule-move-head-error-msg' | Junio C Hamano | 2018-07-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | submodule.c: report the submodule that an error occurs in | Stefan Beller | 2018-06-25 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sb/submodule-core-worktree' | Junio C Hamano | 2018-07-18 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | submodule: unset core.worktree if no working tree is present | Stefan Beller | 2018-06-14 | 1 | -0/+14 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | submodule: fix NULL correctness in renamed broken submodules | Stefan Beller | 2018-06-14 | 1 | -2/+4 |
|/ / / / / | |||||
* | | | | | Merge branch 'jt/submodule-pull-recurse-rebase' | Junio C Hamano | 2018-06-04 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | submodule: do not pass null OID to setup_revisions | Jonathan Tan | 2018-05-25 | 1 | -2/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'sb/submodule-merge-in-merge-recursive' | Junio C Hamano | 2018-05-30 | 1 | -166/+2 |
|\ \ \ \ \ | |||||
| * | | | | | submodule.c: move submodule merging to merge-recursive.c | Stefan Beller | 2018-05-16 | 1 | -166/+2 |
* | | | | | | Merge branch 'bw/ref-prefix-for-configured-refspec' | Junio C Hamano | 2018-05-30 | 1 | -10/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: convert push_unpushed_submodules to take a struct refspec | Brandon Williams | 2018-05-17 | 1 | -10/+9 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-05-30 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: convert several uses of EMPTY_TREE_SHA1_HEX | brian m. carlson | 2018-05-02 | 1 | -3/+3 |
* | | | | | | | Merge branch 'js/use-bug-macro' | Junio C Hamano | 2018-05-30 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Convert remaining die*(BUG) messages | Johannes Schindelin | 2018-05-06 | 1 | -1/+1 |
| * | | | | | | | Replace all die("BUG: ...") calls by BUG() ones | Johannes Schindelin | 2018-05-06 | 1 | -3/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'sb/oid-object-info' | Junio C Hamano | 2018-05-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | cache.h: add repository argument to oid_object_info | Stefan Beller | 2018-04-26 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'sb/submodule-move-nested' | Junio C Hamano | 2018-05-08 | 1 | -19/+21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | submodule: fixup nested submodules after moving the submodule | Stefan Beller | 2018-03-29 | 1 | -3/+3 |
| * | | | | | submodule-config: remove submodule_from_cache | Stefan Beller | 2018-03-29 | 1 | -2/+2 |
| * | | | | | submodule-config: add repository argument to submodule_from_{name, path} | Stefan Beller | 2018-03-29 | 1 | -14/+16 |
* | | | | | | Merge branch 'sb/object-store' | Junio C Hamano | 2018-04-11 | 1 | -0/+1 |
|\| | | | | | |||||
| * | | | | | object-store: migrate alternates struct and functions from cache.h | Stefan Beller | 2018-03-23 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | sha1_file: convert sha1_object_info* to object_id | brian m. carlson | 2018-03-14 | 1 | -1/+1 |
* | | | | | strbuf: convert strbuf_add_unique_abbrev to use struct object_id | brian m. carlson | 2018-03-14 | 1 | -2/+2 |
| |/ / / |/| | | | |||||
* | | | | submodule: rename 'new' variables | Brandon Williams | 2018-02-22 | 1 | -15/+15 |
* | | | | object: rename function 'typename' to 'type_name' | Brandon Williams | 2018-02-14 | 1 | -1/+1 |
|/ / / | |||||
* | | | submodule: submodule_move_head omits old argument in forced case | Stefan Beller | 2018-01-05 | 1 | -1/+3 |
* | | | Merge branch 'bw/submodule-sans-cache-compat' | Junio C Hamano | 2017-12-27 | 1 | -14/+18 |
|\ \ \ | |||||
| * | | | submodule: convert get_next_submodule to not rely on the_index | Brandon Williams | 2017-12-12 | 1 | -10/+13 |
| * | | | submodule: used correct index in is_staging_gitmodules_ok | Brandon Williams | 2017-12-12 | 1 | -2/+3 |
| * | | | submodule: convert stage_updated_gitmodules to take a struct index_state | Brandon Williams | 2017-12-12 | 1 | -2/+2 |
* | | | | Merge branch 'bc/hash-algo' | Junio C Hamano | 2017-12-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Switch empty tree and blob lookups to use hash abstraction | brian m. carlson | 2017-11-13 | 1 | -1/+1 |