alee/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dotfiles update 2025-12-22 12:22

Browse Source
This commit is contained in:
Aaron D. Lee
2025-12-22 12:22:33 -05:00
parent d528c2f7a1
commit 289f178520
3 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/dotfiles-sync.sh
View File

@@ -173,7 +173,7 @@ show_diff() {
cd "$DOTFILES_HOME"
if git status --porcelain | grep -q .; then
if git status --porcelain | grep -I -q .; then
print_status "Modified files:"
git status --porcelain | sed 's/^/ /'
else
@@ -208,7 +208,7 @@ push_changes() {
cd "$DOTFILES_HOME"
if ! git status --porcelain | grep -q .; then
if ! git status --porcelain | grep -I -q .; then
print_warning "No local changes to push"
return
fi
@@ -245,7 +245,7 @@ auto_sync() {
print_status "Pulling from remote..."
git fetch origin
if git status --porcelain | grep -q .; then
if git status --porcelain | grep -I -q .; then
print_status "Resolving conflicts automatically..."
git pull --strategy=ours
else