diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2020-10-02 10:18:25 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2020-10-02 10:18:25 +0100 |
| commit | f45ea107bed6d6c410b7ebfee691bdbaf51947e6 (patch) | |
| tree | 5f9b11a4158c24795d68bcc649c29811d2519789 /git | |
| parent | 93eab33d13f8f30c8ba0088f20721d14c981fd16 (diff) | |
| parent | 96bfc178286b367b14e6287b3ae6dc57f3e6e2f6 (diff) | |
Merge branch 'master' of localhost:public/dotfiles into master
Diffstat (limited to 'git')
| -rwxr-xr-x | git/.git_template/hooks/ctags | 5 | ||||
| -rw-r--r-- | git/.gitconfig | 2 |
2 files changed, 4 insertions, 3 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 1169c34..79e64f8 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -19,3 +19,5 @@ default = simple [merge] ff = true +[pull] + rebase = false |