luca
/
dotfiles
1
0
Fork 0
Code

Merge branch 'bare' of git.snaile.de:luca/dotfiles into bare

This commit is contained in:
Luca Bilke 2024-05-23 18:35:24 +02:00
parent 31ec9c82dc 9424c186ca
commit a408ed0de8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.local/bin/dotsync
View File

@ -9,7 +9,7 @@ NC="$(tput sgr0)"
target=$HOME target=$HOME
gitdir=$target/.local/share/dots gitdir=$target/.local/share/dots
mkdir -p "$gitdir" mkdir -p "$(dirname "$gitdir")"
baregit() { baregit() {
git --git-dir="$gitdir" --work-tree="$target" "$@" git --git-dir="$gitdir" --work-tree="$target" "$@"
@ -54,7 +54,7 @@ if [ $needs_pop -eq 1 ]; then
fi fi
printf "\n" printf "\n"
unmerged_files=$(dgit diff --name-only --diff-filter=U) unmerged_files=$(baregit diff --name-only --diff-filter=U)
if [ -n "$unmerged_files" ]; then if [ -n "$unmerged_files" ]; then
printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n\n" printf "%b" "${RED}The following files have merge conflicts after popping the stash:$NC\n\n"
printf "%s" "$unmerged_files\n\n" printf "%s" "$unmerged_files\n\n"