diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:36:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:36:15 -0700 |
commit | b02f5aeda6f66ac3be9b2e35f9b237d4f1f80d73 (patch) | |
tree | 8b85c36e79c9f3dffbc9ea9df9c812c5f5070514 /builtin/merge-file.c | |
parent | Merge branch 'es/blame-L-twice' (diff) | |
parent | rm: delete .gitmodules entry of submodules removed from the work tree (diff) | |
download | tgif-b02f5aeda6f66ac3be9b2e35f9b237d4f1f80d73.tar.xz |
Merge branch 'jl/submodule-mv'
"git mv A B" when moving a submodule A does "the right thing",
inclusing relocating its working tree and adjusting the paths in
the .gitmodules file.
* jl/submodule-mv: (53 commits)
rm: delete .gitmodules entry of submodules removed from the work tree
mv: update the path entry in .gitmodules for moved submodules
submodule.c: add .gitmodules staging helper functions
mv: move submodules using a gitfile
mv: move submodules together with their work trees
rm: do not set a variable twice without intermediate reading.
t6131 - skip tests if on case-insensitive file system
parse_pathspec: accept :(icase)path syntax
pathspec: support :(glob) syntax
pathspec: make --literal-pathspecs disable pathspec magic
pathspec: support :(literal) syntax for noglob pathspec
kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
parse_pathspec: make sure the prefix part is wildcard-free
rename field "raw" to "_raw" in struct pathspec
tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
remove match_pathspec() in favor of match_pathspec_depth()
remove init_pathspec() in favor of parse_pathspec()
remove diff_tree_{setup,release}_paths
convert common_prefix() to use struct pathspec
...
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions