diff options
| author | Alan Pearce | 2017-10-20 14:23:20 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-10-20 14:23:20 +0200 |
| commit | 8313479a45431cef18ada541aff0ce88860af4cc (patch) | |
| tree | 6e10559c67a1eaa7b94c3b5f41e3d3347d5a7348 /git | |
| parent | f3ae58584b0ad1c0e527fb2a5f56d25adfbccaf8 (diff) | |
| parent | 92dc1beb83f9e0b56f645d7934488907389d640e (diff) | |
| download | nixfiles-8313479a45431cef18ada541aff0ce88860af4cc.tar.lz nixfiles-8313479a45431cef18ada541aff0ce88860af4cc.tar.zst nixfiles-8313479a45431cef18ada541aff0ce88860af4cc.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'git')
| -rw-r--r-- | git/.config/git/config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index da295997..e710bbef 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -9,6 +9,7 @@ ui = true [push] default = current + followTags = true [alias] up = merge FETCH_HEAD st = status -sb @@ -22,7 +23,7 @@ pr = pull-request delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'" [github] - user = alan@alanpearce.eu + user = alanpearce [ghq "ssh://alanpearce.eu/"] vcs = git [includeIf "gitdir:github.com/Spotcap/"] @@ -47,5 +48,4 @@ cmd = icdiff --line-numbers $LOCAL $REMOTE [gpg] program = gpg -[commit] - gpgsign = true + |