From: Jannik ZANDER <jzander@grundfos.com>
Date: Sat, 1 Feb 2020 19:08:04 +0000 (+0100)
Subject: Move git files
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=c96f7a8490cf629c22171ca55d0c4a8e8a93f8a3;p=dotfiles.git

Move git files
---

diff --git a/.config/git/attributes b/.config/git/attributes
deleted file mode 100644
index 72bce72..0000000
--- a/.config/git/attributes
+++ /dev/null
@@ -1,21 +0,0 @@
-# Default
-*           text=auto !eol
-
-# Text files that should be normalized (CRLF => LF)
-*.c         text
-*.h         text
-*.md        text
-*.txt       text
-
-# Text files with fixed EOL=LF
-*.sh        text eol=lf
-
-# Text files with fixed EOL=CRLF$
-*.bat       text eol=crlf
-*.ahk       text eol=crlf
-*.vcproj    text eol=crlf
-
-# Binary files
-*.jpg       -text
-*.exe       -text 
-*.reg       -text 
diff --git a/.config/git/config b/.config/git/config
deleted file mode 100644
index 03c5f8d..0000000
--- a/.config/git/config
+++ /dev/null
@@ -1,120 +0,0 @@
-[user]
-	name = Jannik ZANDER
-	email = jzander@grundfos.com
-[core]
-	editor = vim
-	pager = less
-	quotepath = false
-	commitGraph = true
-[help]
-	autocorrect = 10
-[branch]
-	autosetupmerge = always
-	autosetuprebase = always
-[rebase]
-	autosquash = true
-	autostash = true
-[pull]
-	rebase = true
-[push]
-	default = simple
-	recurseSubmodules = check
-[diff]
-	tool = bc
-	submodule = log
-[merge]
-	tool = bc
-[difftool "vimdiff"]
-	prompt = false
-	conflictstyle = diff3
-[mergetool "vimdiff"]
-	prompt = false
-[difftool "bc"]
- path = c:/Program Files/Beyond Compare 4/bcomp.exe
-	trustExitCode = false
-[mergetool "bc"]
- path = c:/Program Files/Beyond Compare 4/bcomp.exe
-	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
-	ci = commit
-	st = status
-	ls = ls-files
-	cl = clone --recurse-submodules -j8
-	dt = cloner = clone --recursive
-	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"
-
-	sdiff = !git diff && git submodule foreach 'git diff'
-[include]
-	path = ~/.gitconfig.local
-[gc]
-	writeCommitGraph = true
-[status]
-	submodulesummary = 1
-#[submodule]
-#	recurse = true
diff --git a/.config/git/gitk b/.config/git/gitk
new file mode 100644
index 0000000..861135a
--- /dev/null
+++ b/.config/git/gitk
@@ -0,0 +1,62 @@
+set mainfont {Helvetica 9}
+set textfont {Courier 9}
+set uifont {Helvetica 9 bold}
+set tabstop 8
+set findmergefiles 0
+set maxgraphpct 50
+set maxwidth 16
+set cmitmode patch
+set wrapcomment none
+set autoselect 1
+set autosellen 40
+set showneartags 1
+set maxrefs 20
+set visiblerefs {"master"}
+set hideremotes 0
+set showlocalchanges 1
+set datetimeformat {%Y-%m-%d %H:%M:%S}
+set limitdiffs 1
+set uicolor SystemButtonFace
+set want_ttk 1
+set bgcolor SystemWindow
+set fgcolor SystemWindowText
+set uifgcolor SystemButtonText
+set uifgdisabledcolor SystemDisabledText
+set colors {"#00ff00" red blue magenta darkgrey brown orange}
+set diffcolors {red "#00a000" blue}
+set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
+set markbgcolor #e0e0ff
+set diffcontext 3
+set selectbgcolor SystemHighlight
+set foundbgcolor yellow
+set currentsearchhitbgcolor orange
+set extdifftool meld
+set perfile_attrs 0
+set headbgcolor #00ff00
+set headfgcolor black
+set headoutlinecolor black
+set remotebgcolor #ffddaa
+set tagbgcolor yellow
+set tagfgcolor black
+set tagoutlinecolor black
+set reflinecolor black
+set filesepbgcolor #aaaaaa
+set filesepfgcolor black
+set linehoverbgcolor #ffff80
+set linehoverfgcolor black
+set linehoveroutlinecolor black
+set mainheadcirclecolor yellow
+set workingfilescirclecolor red
+set indexcirclecolor #00ff00
+set circlecolors {white blue gray blue blue}
+set linkfgcolor blue
+set circleoutlinecolor SystemWindowText
+set geometry(main) 2508x1602+815+298
+set geometry(state) normal
+set geometry(topwidth) 2508
+set geometry(topheight) 405
+set geometry(pwsash0) "932 1"
+set geometry(pwsash1) "1137 1"
+set geometry(botwidth) 950
+set geometry(botheight) 1192
+set permviews {}
diff --git a/.config/git/ignore b/.config/git/ignore
deleted file mode 100644
index 5221ad5..0000000
--- a/.config/git/ignore
+++ /dev/null
@@ -1,64 +0,0 @@
-# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
-TAGS
-.TAGS
-!TAGS/
-tags
-.tags
-!tags/
-gtags.files
-GTAGS
-GRTAGS
-GPATH
-cscope.files
-cscope.out
-cscope.in.out
-cscope.po.out
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-
-# OSX
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-__pycache__
diff --git a/.gitattributes b/.gitattributes
index 1816133..e8b69be 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,21 +1,21 @@
 # Default
-*           text=auto !eol
+*           text=auto
 
 # Text files that should be normalized (CRLF => LF)
-*.c         text
-*.h         text
-*.md        text
-*.txt       text
+#*.c         text
+#*.h         text
+#*.md        text
+#*.txt       text
 
 # Text files with fixed EOL=LF
-*.sh        text eol=LF
+#*.sh        text eol=LF
 
 # Text files with fixed EOL=CRLF$
-*.bat       text eol=CRLF
-*.ahk       text eol=crlf
-*.vcproj    text eol=crlf
+#*.bat       text eol=CRLF
+#*.ahk       text eol=crlf
+#*.vcproj    text eol=crlf
 
 # Binary files
-*.jpg       -text
-*.exe       -text 
-*.reg       -text 
+#*.jpg       -text
+#*.exe       -text 
+#*.reg       -text 
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..03c5f8d
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,120 @@
+[user]
+	name = Jannik ZANDER
+	email = jzander@grundfos.com
+[core]
+	editor = vim
+	pager = less
+	quotepath = false
+	commitGraph = true
+[help]
+	autocorrect = 10
+[branch]
+	autosetupmerge = always
+	autosetuprebase = always
+[rebase]
+	autosquash = true
+	autostash = true
+[pull]
+	rebase = true
+[push]
+	default = simple
+	recurseSubmodules = check
+[diff]
+	tool = bc
+	submodule = log
+[merge]
+	tool = bc
+[difftool "vimdiff"]
+	prompt = false
+	conflictstyle = diff3
+[mergetool "vimdiff"]
+	prompt = false
+[difftool "bc"]
+ path = c:/Program Files/Beyond Compare 4/bcomp.exe
+	trustExitCode = false
+[mergetool "bc"]
+ path = c:/Program Files/Beyond Compare 4/bcomp.exe
+	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
+	ci = commit
+	st = status
+	ls = ls-files
+	cl = clone --recurse-submodules -j8
+	dt = cloner = clone --recursive
+	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"
+
+	sdiff = !git diff && git submodule foreach 'git diff'
+[include]
+	path = ~/.gitconfig.local
+[gc]
+	writeCommitGraph = true
+[status]
+	submodulesummary = 1
+#[submodule]
+#	recurse = true
diff --git a/.gitignore b/.gitignore
index 8b13789..5221ad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,64 @@
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
+TAGS
+.TAGS
+!TAGS/
+tags
+.tags
+!tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
 
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+
+# OSX
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+__pycache__