Compare commits

...

2 Commits

2 changed files with 4 additions and 2 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
credentials credentials
local

5
config
View File

@@ -12,7 +12,7 @@
awk \"{print \\$1}\" | \ awk \"{print \\$1}\" | \
sed -e ':a' -e 'N' -e '$!ba' -e 's/\\n/../g') | \ sed -e ':a' -e 'N' -e '$!ba' -e 's/\\n/../g') | \
git apply - 2> /dev/null || \ git apply - 2> /dev/null || \
echo \"\\e[31merror:\\e[39m last commit was not amended\" echo "\\\\033[31merror:\\\\033[39m last commit was not amended"
fixup = commit --fixup fixup = commit --fixup
squash = commit --squash squash = commit --squash
prepare = rebase -i --fork-point prepare = rebase -i --fork-point
@@ -44,7 +44,7 @@
save = commit -m "temp!" save = commit -m "temp!"
load = !sh -c '[ \"temp!\" = \"`git show --format=%s --no-patch`\" ] && \ load = !sh -c '[ \"temp!\" = \"`git show --format=%s --no-patch`\" ] && \
git reset --mixed HEAD~ || echo \"\\e[31merror:\\e[39m commit subject is not: temp!\"' git reset --mixed HEAD~ || echo \"\\033[31merror:\\033[39m commit subject is not: temp!\"'
[core] [core]
excludesfile = ~/.config/git/excludes excludesfile = ~/.config/git/excludes
@@ -91,3 +91,4 @@
[include] [include]
path = ~/.config/private/gitconfig path = ~/.config/private/gitconfig
path = ~/.config/work/gitconfig path = ~/.config/work/gitconfig
path = ~/.config/git/local