summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 12:06:25 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-15 12:06:25 -0700
commit849865733fc667789d0e57edd1ac2ee1f38499a3 (patch)
treef2507a5c015a48669914438e6c92e37850a336d9 /git-submodule.sh
parentaa57328d60f5d5a5f74d1d336caf06b6bdf4fd03 (diff)
parent31991b0260216d16f2e447e68bcabd9d9cce26ba (diff)
downloadgit-849865733fc667789d0e57edd1ac2ee1f38499a3.tar.gz
Merge branch 'ab/submodule-add-f'
* ab/submodule-add-f: git submodule: add submodules with git add -f <path>
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index d9950c2b7f..ad2417d1b0 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -234,12 +234,12 @@ cmd_add()
) || die "Unable to checkout submodule '$path'"
fi
- git add "$path" ||
+ git add --force "$path" ||
die "Failed to add submodule '$path'"
git config -f .gitmodules submodule."$path".path "$path" &&
git config -f .gitmodules submodule."$path".url "$repo" &&
- git add .gitmodules ||
+ git add --force .gitmodules ||
die "Failed to register submodule '$path'"
}