Skip to content

Commit

Permalink
Do not use subtree squash.
Browse files Browse the repository at this point in the history
  • Loading branch information
renelink committed Aug 18, 2024
1 parent d4511c4 commit 67bd61e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git_utils
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ function updateSubtree(){
local subtreeBranchQualifier="${subtree#\.}"

if [[ ${existingSubtrees} =~ ${subtree} ]]; then
git subtree -P "${subtree}" pull --squash "${repo}" "${projectFacet}/${subtreeBranchQualifier}"
git subtree -P "${subtree}" pull "${repo}" "${projectFacet}/${subtreeBranchQualifier}"
else
local subtreeBranchQualifier="${subtree#\.}"
git subtree -P "${subtree}" add --squash "${repo}/${projectFacet}/${subtreeBranchQualifier}"
git subtree -P "${subtree}" add "${repo}/${projectFacet}/${subtreeBranchQualifier}"
fi
}

0 comments on commit 67bd61e

Please sign in to comment.