commit 48451163246fd60cd4e3286b6fb9049d13c625c5
parent c5b7131ff829e22590f6f2b5bd6dfaa13e036eb7
Author: Nihal Jere <nihal@nihaljere.xyz>
Date: Tue, 11 Jan 2022 21:01:53 -0600
clarify what some commands do
`git checkout -f` and `git reset --hard` do the same thing in this
case, but the former reflects what is happening better.
Diffstat:
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-submodule-integrate b/git-submodule-integrate
@@ -53,6 +53,7 @@ do
fi
done
+ # read tree of new commit into index
git rm -q -r --cached "$where"
git read-tree --prefix="$where" "$treehash"
@@ -62,4 +63,5 @@ do
printf "%s/%s finished\n" "$finished" "$total"
done
-git reset --hard HEAD
+# force worktree to reflect updated HEAD
+git checkout -f HEAD