summaryrefslogtreecommitdiff
path: root/submodule.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-32/+190
|\
| * update submodules: add submodule_move_headStefan Beller2017-03-161-0/+137
| * submodule.c: get_super_prefix_or_emptyStefan Beller2017-03-161-6/+10
| * update submodules: move up prepare_submodule_repo_envStefan Beller2017-03-151-12/+17
| * submodules: introduce check to see whether to touch a submoduleStefan Beller2017-03-151-0/+16
| * update submodules: add a config option to determine if submodules are updatedStefan Beller2017-03-151-0/+6
| * make is_submodule_populated gentlyStefan Beller2017-03-151-5/+2
| * connect_work_tree_and_git_dir: safely create leading directoriesStefan Beller2017-03-151-9/+2
* | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-03-171-0/+82
|\ \
| * | rev-parse: add --show-superproject-working-treeStefan Beller2017-03-081-0/+82
| |/
* | real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fixJohannes Schindelin2017-03-081-5/+5
|/
* submodule absorbing: fix worktree/gitdir pointers recursively for non-movessb/submodule-recursive-absorbStefan Beller2017-01-261-16/+46
* Merge branch 'sb/submodule-cleanup-export-git-dir-env'Junio C Hamano2017-01-181-1/+2
|\
| * submodule.c: use GIT_DIR_ENVIRONMENT consistentlysb/submodule-cleanup-export-git-dir-envStefan Beller2017-01-071-1/+2
* | Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-01-181-19/+38
|\ \
| * | submodule: rename and add flags to ok_to_remove_submoduleStefan Beller2016-12-271-12/+37
| * | submodule: modernize ok_to_remove_submodule to use argv_arrayStefan Beller2016-12-271-10/+4
* | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-181-4/+54
|\ \ \
| * | | submodules: load gitmodules file from commit sha1Brandon Williams2016-12-221-0/+12
| * | | submodules: add helper to determine if a submodule is initializedBrandon Williams2016-12-221-0/+23
| * | | submodules: add helper to determine if a submodule is populatedBrandon Williams2016-12-221-0/+15
| * | | real_path: have callers use real_pathdup and strbuf_realpathBrandon Williams2016-12-121-1/+1
* | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-101-24/+103
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | submodule: add absorb-git-dir functionStefan Beller2016-12-121-0/+103
| * | move connect_work_tree_and_git_dir to dir.hStefan Beller2016-12-121-25/+0
| * | submodule: use absolute path for computing relative path connectingStefan Beller2016-12-091-6/+7
| |/
* | Merge branch 'bw/push-dry-run'Junio C Hamano2016-12-161-5/+8
|\ \
| * | push: fix --dry-run to not push submodulesbw/push-dry-runBrandon Williams2016-11-231-5/+8
* | | Merge branch 'hv/submodule-not-yet-pushed-fix'Junio C Hamano2016-12-161-26/+97
|\ \ \ | |/ / | | / | |/ |/|
| * submodule_needs_pushing(): explain the behaviour when we cannot answerhv/submodule-not-yet-pushed-fixHeiko Voigt2016-11-161-0/+11
| * batch check whether submodule needs pushing into one callHeiko Voigt2016-11-161-29/+33
| * serialize collection of refs that contain submodule changesHeiko Voigt2016-11-161-15/+20
| * serialize collection of changed submodulesHeiko Voigt2016-11-161-4/+55
* | Merge branch 'rs/cocci'Junio C Hamano2016-10-171-4/+3
|\ \
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-101-4/+3
* | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-171-22/+1
|\ \ \ | |_|/ |/| |
| * | alternates: provide helper for adding to alternates listJeff King2016-10-101-22/+1
* | | Merge branch 'rs/cocci'Junio C Hamano2016-10-061-1/+1
|\ \ \ | | |/ | |/|
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-271-1/+1
| * | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-271-1/+1
* | | sha1_array: let callbacks interrupt iterationJeff King2016-09-261-1/+2
| |/ |/|
* | Merge branch 'jc/submodule-anchor-git-dir'Junio C Hamano2016-09-121-0/+1
|\ \
| * | submodule: avoid auto-discovery in prepare_submodule_repo_env()jc/submodule-anchor-git-dirJunio C Hamano2016-09-011-0/+1
* | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-311-0/+69
* | | submodule: refactor show_submodule_summary with helper functionJacob Keller2016-08-311-33/+82
* | | submodule: convert show_submodule_summary to use struct object_id *Jacob Keller2016-08-311-8/+8
* | | allow do_submodule_path to work even if submodule isn't checked outJacob Keller2016-08-311-2/+4
| |/ |/|
* | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-2/+2
|\ \
| * | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-2/+2
| |/
* | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-131-1/+1
|/
View Lorry Controller Status