aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-30 11:42:21 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-30 11:42:21 +1200
commit0acee35a6621432f8e17772f2b47b2bdb200aa2d (patch)
tree2230ea9c1489b8c64b20b6913ac584572abf2d38
parent0524542b03d486d48c178b5abf5cb77f3351f487 (diff)
parentb0998ab17590baf001d70e2cb5dc9273284dbe94 (diff)
downloaddotfiles-5.11.0.tar.gz (sig)
dotfiles-5.11.0.zip
Merge branch 'release/v5.11.0'v5.11.0
* release/v5.11.0: Restore log settings Restore Git merge.log config to 1024 commits Remove most of git config; time to review it
-rw-r--r--VERSION4
-rw-r--r--git/gitconfig.mi543
2 files changed, 3 insertions, 44 deletions
diff --git a/VERSION b/VERSION
index e50cd32c..7b4ebf12 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v5.10.0
-Wed May 29 12:50:49 UTC 2019
+tejr dotfiles v5.11.0
+Wed May 29 23:42:21 UTC 2019
diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index eeb99406..060c3a78 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -1,39 +1,3 @@
-[advice]
- statusHints = false
- detachedHead = false
- implicitIdentity = false
- pushUpdateRejected = false
-
-[alias]
- amend = commit --amend
- ls = log --oneline
- others = ls-files --others --exclude-standard
- fuckit = "!git clean -dfx ; git reset --hard"
-
-[color]
- ui = true
-
-[commit]
- status = false
-
-[core]
- compression = 9
-
-[diff]
- algorithm = patience
- tool = vimdiff
-
-[difftool]
- prompt = false
-
-[fetch]
- output = compact
- prune = true
-
-[grep]
- extendRegexp = true
- lineNumber = true
-
[init]
templateDir = ~/.git-template
@@ -43,17 +7,13 @@
[merge]
ff = false
- log = 500
-
-[pager]
- diff = cat
+ log = 1024
[pull]
ff = only
[push]
default = current
- followTags = true
[sendemail]
confirm = compose
@@ -61,7 +21,6 @@
[status]
short = true
- showUntrackedFiles = all
[user]
name = <% NAME %>