diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2020-10-04 19:13:49 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2020-10-04 19:13:49 +0100 |
| commit | 3a3321af173a73b158c606f0e2c3c3e0dece2cb9 (patch) | |
| tree | 00075dc12714c8b128e2327542526ac0676820fc /git | |
| parent | ac7ba6d8aa7eb6ef384f10b7798bd01308beb970 (diff) | |
| parent | 2c5e2b7a6667fd4e726bba3e50f9ccf6ce13bab3 (diff) | |
Merge branch 'master' of https://github.com/urbainvaes/dotfiles
Diffstat (limited to 'git')
| -rwxr-xr-x | git/.git_template/hooks/ctags | 5 | ||||
| -rw-r--r-- | git/.gitconfig | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/git/.git_template/hooks/ctags b/git/.git_template/hooks/ctags index a52759d..fe27a19 100755 --- a/git/.git_template/hooks/ctags +++ b/git/.git_template/hooks/ctags @@ -1,7 +1,6 @@ #!/bin/sh set -e PATH="/usr/local/bin:$PATH" -dir="$(git rev-parse --git-dir)" trap 'rm -f "$dir/$$.tags"' EXIT -git ls-files | ctags --tag-relative=yes -L - -f"$dir/$$.tags" --languages=-javascript,sql -mv "$dir/$$.tags" "$dir/tags" +git ls-files | ctags --tag-relative=yes -L - -f"$$.tags" --languages=-javascript,sql +mv "$$.tags" "tags" diff --git a/git/.gitconfig b/git/.gitconfig index 0e7df50..79e64f8 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -4,7 +4,7 @@ [user] name = Urbain Vaes email = urbain@vaes.uk - signingKey = 716064C0 + ; signingKey = 716064C0 [init] templatedir = ~/.git_template [alias] @@ -13,9 +13,11 @@ [http] sslverify = false [commit] - gpgSign = true + ; gpgSign = true verbose = true [push] default = simple [merge] ff = true +[pull] + rebase = false |