Commit Graph

8 Commits

Author SHA1 Message Date
ducoterra
3b8bbd3d1f Add make-push command
Add command to update the subtree from a child repo. This pushes to the
main branch of the common repo with only the relevant commits.
2021-11-01 09:20:11 -04:00
ducoterra
858ac5f132 Ignore subtree pull failures
Rather than potentially leaving the developer in a state where `git
stash pop` wasn't run, ignore failures in git subtree and let the
developer fix issues and re-run the command. This makes `make-update`
more idempotent.
2021-11-01 09:13:15 -04:00
ducoterra
052b8f836c Merge commit 'dd39e3335a3a92c34c86ef296c2cc651d8d3afa8' 2021-11-01 09:05:55 -04:00
ducoterra
3de29c8b5d Merge commit '74a4a4e77f5fa40b486ae9b94a91e53b3ace5d65' 2021-10-31 20:35:09 -04:00
ducoterra
0cbdd4d98e Add '.gitlab/' from commit '8a52a21a398f3bb2840e76e26f065a7963c79efa'
git-subtree-dir: .gitlab
git-subtree-mainline: d249e35463
git-subtree-split: 8a52a21a39
2021-10-31 15:12:47 -04:00
ducoterra
d249e35463 switch to named subtree 2021-10-31 15:12:17 -04:00
ducoterra
7b7ef78bfc Merge commit '536f0c84ae2c5272a8e1d9bb83839766d34f6d14' 2021-10-31 15:04:49 -04:00
ducoterra
fd13582e8f Merge commit '0cc825e2555b4eec700e3e88cc1eb322dd6268c1' as '.gitlab' 2021-10-31 15:01:49 -04:00