Skip to content
Snippets Groups Projects
Commit 0e2aa84b authored by nimrod's avatar nimrod
Browse files

Force recreation of files in Git post-merge.

parent a3823a99
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.githooks/post-merge
+ 1
− 1
View file @ 0e2aa84b
...@@ -5,7 +5,7 @@ notify () { printf '\n\e[1;94m=== %s ====\e[0m\n\n' "$1" >&2; } ...@@ -5,7 +5,7 @@ notify () { printf '\n\e[1;94m=== %s ====\e[0m\n\n' "$1" >&2; }
cd "$(git rev-parse --show-toplevel)" cd "$(git rev-parse --show-toplevel)"
notify 'Generating some configuration and private files.' notify 'Generating some configuration and private files.'
make make --directory "$HOME" --always-make
notify 'Installing Git hooks' notify 'Installing Git hooks'
Documents/bin/install-git-hooks Documents/bin/install-git-hooks
notify 'Loading dconf config' notify 'Loading dconf config'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment