summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-30 05:04:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-30 05:04:09 (GMT)
commit2a98a8794eac7089d4e44f51b19e358a14eb6d3e (patch)
treebcd3161145577f27c0b66e332b843ebfd52bff9f /fmt-merge-msg.h
parent4ce72180abe72dbb40f5e6a517deea814014e005 (diff)
parenta0ef29341accafa51345e90225d87f6a0d297b7b (diff)
downloadgit-2a98a8794eac7089d4e44f51b19e358a14eb6d3e.zip
git-2a98a8794eac7089d4e44f51b19e358a14eb6d3e.tar.gz
git-2a98a8794eac7089d4e44f51b19e358a14eb6d3e.tar.bz2
Merge branch 'cf/submodule-progress-dissociate'
"git submodule update" and "git submodule add" supported the "--reference" option to borrow objects from a neighbouring local repository like "git clone" does, but lacked the more recent invention "--dissociate". Also "git submodule add" has been taught to take the "--progress" option. * cf/submodule-progress-dissociate: submodule: add --dissociate option to add/update commands submodule: add --progress option to add command submodule: clean up substitutions in script
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions