ducoterra
096a98ce62
Merge update from Common
2021-11-02 15:47:58 -04:00
ducoterra
fe8db45abd
Fix PROJECT_NAME variable
...
PROJECT_NAME variable wasn't working. Fixed.
2021-11-02 15:04:55 -04:00
ducoterra
d580f3407c
Merge update from Common
2021-11-02 11:57:26 -04:00
ducoterra
6f553df13c
Merge commit '99c243e9cdbe95f4439463500b6797e9ae6d7f17'
2021-11-01 22:44:14 -04:00
ducoterra
13a4740c14
Merge commit '13085be69aa1b30274f07c210042025395b9ccfd'
2021-11-01 20:42:52 -04:00
ducoterra
a4d2e1f8fe
Run update after make-push
...
To close things out we should re-run make-update to ensure changes are
pulled back into the repo we updated from.
2021-11-01 10:05:43 -04:00
ducoterra
57285aba52
Remove warning from make-update
...
make-update isn't as destructive as it once was. It should be safe to
run as long as the developer is fixes any weird merge conflicts after
stash pop.
2021-11-01 10:02:35 -04:00
ducoterra
d9d1c75126
Add make-stash-drop command
...
Sometimes you can get stuck in a loop where git stash pop preserves the
stash commit. Dropping that commit if it's a STASH commit after an
update is totally fine.
2021-11-01 10:01:12 -04:00
ducoterra
1849624763
Only pop stash if changes
...
Only pop the stash if the most recent stash commit matches the STASH
name.
2021-11-01 09:56:37 -04:00
ducoterra
d9024f0847
Add warning to make-update and make-push
...
Add warning before make-update and make-push to alert developers that
running the commands might be destructive. Allow cancelling the command
up to 3 seconds before continuing. Also explain that merge conflicts
warrant a re-run of the command.
2021-11-01 09:38:00 -04:00
ducoterra
669e95a9f1
Ignore git stash pop failures
...
In the event the stash is empty, don't run stash pop.
2021-11-01 09:23:36 -04:00
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
fda8323c19
switch to no remote
2021-10-31 22:52:46 -04:00
ducoterra
1cb23265fd
Merge commit 'ba12c923ba6644e8aadcc18b33feaacf61a8fb43'
2021-10-31 21:00:07 -04:00
ducoterra
9dd42f574a
Add '.gitlab/' from commit '74a4a4e77f5fa40b486ae9b94a91e53b3ace5d65'
...
git-subtree-dir: .gitlab
git-subtree-mainline: cf52f5595774a4a4e77f
2021-10-31 20:36:21 -04:00
ducoterra
cf52f55957
remove old subtree
2021-10-31 20:36:07 -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: d249e354638a52a21a39
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
ducoterra
a16d810344
Merge commit '768b672b1f17fcb01580b6b27c715f5ce1ea2ab0' as '.gitlab'
2021-10-31 11:59:18 -04:00
