Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-04-24 | 1 | -2/+1 |
|\ | |||||
| * | submodule: remove a superfluous second check for the "new" variable | Sebastian Schuberth | 2017-04-18 | 1 | -2/+1 |
* | | Merge branch 'nd/files-backend-git-dir' | Junio C Hamano | 2017-04-20 | 1 | -0/+31 |
|\ \ | |||||
| * | | path.c: move some code out of strbuf_git_path_submodule() | Nguyễn Thái Ngọc Duy | 2017-03-27 | 1 | -0/+31 |
* | | | Merge branch 'sb/submodule-rm-absorb' | Junio C Hamano | 2017-04-20 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | submodule.c: add missing ' in error messages | Ralf Thielow | 2017-04-14 | 1 | -2/+2 |
* | | | | Merge branch 'bw/push-options-recursively-to-submodules' | Junio C Hamano | 2017-04-20 | 1 | -4/+70 |
|\ \ \ \ | |||||
| * | | | | push: propagate remote and refspec with --recurse-submodules | Brandon Williams | 2017-04-11 | 1 | -3/+60 |
| * | | | | push: propagate push-options with --recurse-submodules | Brandon Williams | 2017-04-11 | 1 | -2/+11 |
* | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-04-20 | 1 | -33/+33 |
|\ \ \ \ \ | |||||
| * | | | | | Rename sha1_array to oid_array | brian m. carlson | 2017-03-31 | 1 | -24/+24 |
| * | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_id | brian m. carlson | 2017-03-31 | 1 | -10/+10 |
| * | | | | | Make sha1_array_append take a struct object_id * | brian m. carlson | 2017-03-31 | 1 | -3/+3 |
| * | | | | | submodule: convert check_for_new_submodule_commits to object_id | brian m. carlson | 2017-03-28 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sb/submodule-short-status' | Junio C Hamano | 2017-04-20 | 1 | -32/+43 |
|\ \ \ \ \ | |||||
| * | | | | | submodule.c: correctly handle nested submodules in is_submodule_modified | Stefan Beller | 2017-03-30 | 1 | -2/+19 |
| * | | | | | submodule.c: stricter checking for submodules in is_submodule_modified | Stefan Beller | 2017-03-27 | 1 | -2/+3 |
| * | | | | | submodule.c: port is_submodule_modified to use porcelain 2 | Stefan Beller | 2017-03-27 | 1 | -4/+5 |
| * | | | | | submodule.c: convert is_submodule_modified to use strbuf_getwholeline | Stefan Beller | 2017-03-27 | 1 | -16/+14 |
| * | | | | | submodule.c: factor out early loop termination in is_submodule_modified | Stefan Beller | 2017-03-27 | 1 | -8/+8 |
| * | | | | | submodule.c: use argv_array in is_submodule_modified | Stefan Beller | 2017-03-27 | 1 | -8/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'sb/show-diff-for-submodule-in-diff-fix' | Junio C Hamano | 2017-04-17 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | diff: submodule inline diff to initialize env array. | Stefan Beller | 2017-04-02 | 1 | -0/+1 |
| * | | | | | Merge branch 'bw/push-dry-run' into maint | Junio C Hamano | 2017-01-17 | 1 | -5/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'hv/submodule-not-yet-pushed-fix' into maint | Junio C Hamano | 2017-01-17 | 1 | -26/+97 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jk/snprintf-cleanups' | Junio C Hamano | 2017-04-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | convert unchecked snprintf into xsnprintf | Jeff King | 2017-03-30 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'bw/submodule-is-active' | Junio C Hamano | 2017-03-30 | 1 | -8/+42 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | submodule: decouple url and submodule interest | Brandon Williams | 2017-03-18 | 1 | -8/+42 |
* | | | | | | | | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-03-28 | 1 | -32/+190 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | update submodules: add submodule_move_head | Stefan Beller | 2017-03-16 | 1 | -0/+137 |
| * | | | | | | submodule.c: get_super_prefix_or_empty | Stefan Beller | 2017-03-16 | 1 | -6/+10 |
| * | | | | | | update submodules: move up prepare_submodule_repo_env | Stefan Beller | 2017-03-16 | 1 | -12/+17 |
| * | | | | | | submodules: introduce check to see whether to touch a submodule | Stefan Beller | 2017-03-16 | 1 | -0/+16 |
| * | | | | | | update submodules: add a config option to determine if submodules are updated | Stefan Beller | 2017-03-16 | 1 | -0/+6 |
| * | | | | | | make is_submodule_populated gently | Stefan Beller | 2017-03-16 | 1 | -5/+2 |
| * | | | | | | connect_work_tree_and_git_dir: safely create leading directories | Stefan Beller | 2017-03-16 | 1 | -9/+2 |
* | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-03-17 | 1 | -0/+82 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | rev-parse: add --show-superproject-working-tree | Stefan Beller | 2017-03-09 | 1 | -0/+82 |
| |/ / / / / | |||||
* / / / / / | real_pathdup(): fix callsites that wanted it to die on error | Johannes Schindelin | 2017-03-08 | 1 | -5/+5 |
|/ / / / / | |||||
* | | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-moves | Stefan Beller | 2017-01-26 | 1 | -16/+46 |
* | | | | | Merge branch 'sb/submodule-cleanup-export-git-dir-env' | Junio C Hamano | 2017-01-19 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | submodule.c: use GIT_DIR_ENVIRONMENT consistently | Stefan Beller | 2017-01-07 | 1 | -1/+2 |
* | | | | | | Merge branch 'sb/submodule-rm-absorb' | Junio C Hamano | 2017-01-19 | 1 | -19/+38 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | submodule: rename and add flags to ok_to_remove_submodule | Stefan Beller | 2016-12-27 | 1 | -12/+37 |
| * | | | | | submodule: modernize ok_to_remove_submodule to use argv_array | Stefan Beller | 2016-12-27 | 1 | -10/+4 |
* | | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-19 | 1 | -4/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodules: load gitmodules file from commit sha1 | Brandon Williams | 2016-12-22 | 1 | -0/+12 |
| * | | | | | | submodules: add helper to determine if a submodule is initialized | Brandon Williams | 2016-12-22 | 1 | -0/+23 |
| * | | | | | | submodules: add helper to determine if a submodule is populated | Brandon Williams | 2016-12-22 | 1 | -0/+15 |