From: Jannik ZANDER <jzander@grundfos.com>
Date: Thu, 13 Sep 2018 13:09:56 +0000 (+0200)
Subject: No autocrlf
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=53355844036937001a12912b1654641163daf730;p=dotfiles.git

No autocrlf
---

diff --git a/.config/git/config b/.config/git/config
index 6fe2a4f..3101f7d 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,106 +1,107 @@
-[help]
-	autocorrect = 10
-[branch]
-	autosetupmerge = always
-	autosetuprebase = always
-[rebase]
-	autosquash = true
-	autostash = true
-[pull]
-	rebase = true
-[push]
-	default = simple
-[diff]
-	tool = vimdiff
-[merge]
-	tool = vimdiff
-[difftool "vimdiff"]
-	prompt = false
-	conflictstyle = diff3
-[mergetool "vimdiff"]
-	prompt = false
-[difftool "bc"]
-	path = bcompare
-	trustExitCode = false
-[mergetool "bc"]
-	path = bcompare
-	trustExitCode = false
-[init]
-	templatedir = ~/.config/git/templates
-[core]
-	editor = vim
-	pager = less
-[filter "lfs"]
-	clean = git-lfs clean %f
-	smudge = git-lfs smudge %f
-	required = true
-[alias]
-# shortcuts
-	pp = "!git pull --rebase && git push"
-	up = "!git pull --rebase --prune $@ && git submodule update --init --recursive"
-	co = checkout
-	co = checkout
-	ci = commit
-	st = status
-	ls = ls-files
-	cl = clone --recurse-submodules -j8
-	dt = difftool
-	mt = mergetool
-	undo = reset --soft HEAD^ 
-	unci = reset --soft HEAD~
-	una = reset HEAD --
-	uha = checkout HEAD --
-	unaa = reset HEAD
-	uhaa = reset --hard HEAD
-	sb = status -sb
-	amend = commit --amend
-	a = add
-	br = branch
-	brdm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
-	go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
-	diff = diff --word-diff
-	# dont pull without rebase, and dont push without pull (fetch & merge)
-	# avoid merge commits
-	mf = merge --ff-only
-	cp = cherry-pick
-	wc = whatchanged -p
-	ch = cherry -v
-	fs = "!git fetch && git status"
-	rb = rebase
-	ec = config --global -e
-	l = log --oneline --decorate
-	lg = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
-	lol = log --oneline --decorate --graph --all --first-parent
-	last = log -1 HEAD
-	lt = tag -l
-	type = cat-file -t
-	dump = cat-file -p
-	who = shortlog -s --
-	remotes = remote -v
-	root = rev-parse --show-toplevel
-
-	# Show the diff between the latest commit and the current state
-	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
-	# `git di $number` shows the diff between the state `$number` revisions ago and the current state
-	di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
-
-	# Find branches containing commit
-	fb = "!f() { git branch -a --contains $1; }; f"
-	# Find tags containing commit
-	ft = "!f() { git describe --always --contains $1; }; f"
-	# Find commits by source code
-	fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
-	# Find commits by commit message
-	fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
-
-	#Credit an author on the latest commit
-	credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
-	# List contributors with number of commits
-	contributors = shortlog --summary --numbered
-
-	ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
-	gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
-	cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
-
-[include]
-	path = ~/.gitconfig.local
+[core]
+	editor = vim
+	pager = less
+	autocrlf = false
+[help]
+	autocorrect = 10
+[branch]
+	autosetupmerge = always
+	autosetuprebase = always
+[rebase]
+	autosquash = true
+	autostash = true
+[pull]
+	rebase = true
+[push]
+	default = simple
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
+[difftool "vimdiff"]
+	prompt = false
+	conflictstyle = diff3
+[mergetool "vimdiff"]
+	prompt = false
+[difftool "bc"]
+	path = bcompare
+	trustExitCode = false
+[mergetool "bc"]
+	path = bcompare
+	trustExitCode = false
+[init]
+	templatedir = ~/.config/git/templates
+[filter "lfs"]
+	clean = git-lfs clean %f
+	smudge = git-lfs smudge %f
+	required = true
+[alias]
+# shortcuts
+	pp = "!git pull --rebase && git push"
+	up = "!git pull --rebase --prune $@ && git submodule update --init --recursive"
+	co = checkout
+	co = checkout
+	ci = commit
+	st = status
+	ls = ls-files
+	cl = clone --recurse-submodules -j8
+	dt = difftool
+	mt = mergetool
+	undo = reset --soft HEAD^ 
+	unci = reset --soft HEAD~
+	una = reset HEAD --
+	uha = checkout HEAD --
+	unaa = reset HEAD
+	uhaa = reset --hard HEAD
+	sb = status -sb
+	amend = commit --amend
+	a = add
+	br = branch
+	brdm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
+	go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
+	diff = diff --word-diff
+	# dont pull without rebase, and dont push without pull (fetch & merge)
+	# avoid merge commits
+	mf = merge --ff-only
+	cp = cherry-pick
+	wc = whatchanged -p
+	ch = cherry -v
+	fs = "!git fetch && git status"
+	rb = rebase
+	ec = config --global -e
+	l = log --oneline --decorate
+	lg = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
+	lol = log --oneline --decorate --graph --all --first-parent
+	last = log -1 HEAD
+	lt = tag -l
+	type = cat-file -t
+	dump = cat-file -p
+	who = shortlog -s --
+	remotes = remote -v
+	root = rev-parse --show-toplevel
+
+	# Show the diff between the latest commit and the current state
+	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
+	# `git di $number` shows the diff between the state `$number` revisions ago and the current state
+	di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
+
+	# Find branches containing commit
+	fb = "!f() { git branch -a --contains $1; }; f"
+	# Find tags containing commit
+	ft = "!f() { git describe --always --contains $1; }; f"
+	# Find commits by source code
+	fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
+	# Find commits by commit message
+	fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
+
+	#Credit an author on the latest commit
+	credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
+	# List contributors with number of commits
+	contributors = shortlog --summary --numbered
+
+	ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
+	gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
+	cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
+
+[include]
+	path = ~/.gitconfig.local