Compare commits

..

2 Commits

Author SHA1 Message Date
6232fe80c4 use home dir shortcut ~ again since bug was fixed in 'store' 2026-08-04 18:08:02 -06:00
81695100d2 add git merge alias 2026-08-04 17:16:38 -06:00
2 changed files with 4 additions and 2 deletions

View File

@@ -1,11 +1,11 @@
stores: stores:
apps: apps:
target: ~/ target: ~
files: files:
- .omp - .omp
- .emacs.d/init.el - .emacs.d/init.el
bash: bash:
target: ~/ target: ~
files: files:
- .aliases - .aliases
- .bash_profile - .bash_profile

View File

@@ -16,6 +16,8 @@
f = fetch --all f = fetch --all
m = merge
p = push p = push
pf = push --force-with-lease pf = push --force-with-lease