myEnv/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nie wiem co zmieniałem, a dużo tego było

Browse Source
This commit is contained in:
Aleksander Cynarski
2022-01-08 14:53:36 +01:00
parent 7f01e3c578
commit 8c1b3b2423
385 changed files with 24002 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
.gitconfig
View File

@ -1,7 +1,7 @@
[user]
email = aleksander@cynarski.pl
name = Aleksander Cynarski
signingkey = C4340BA42B9C173A
signingkey = C4340BA42B9C173A
[push]
default = matching
[merge]
@ -12,32 +12,28 @@
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg = !"git lg1"
tree = "forest --pretty=format:\"%C(red)%h %C(magenta)(%ar) %C(blue)%an %C(reset)%s\" --style=15 --reverse"
d = difftool
open = !vim `git-open.sh`
; slim log
lg = log --graph --pretty=slim --abbrev-commit --date=relative
; lg date: sorted by date and with absolute dates
lgd = log --graph --pretty=slim --abbrev-commit --date=local --date-order
; lg upstream: also show upstream branch
lgu = !git lg $( git rev-parse --symbolic @{u} ) HEAD
; lg date, upstream
lgdu = !git lgd $( git rev-parse --symbolic @{u} ) HEAD
; lg me: my commits from all branches, by date
lgme = !git lgd --author=\"$( git config --get user.name )\" --all
; grep with some context (and a header)
hgrep = grep --heading -B3 -A3
; diff by word
diffword = diff --word-diff --word-diff-regex='\\w+|[^[:space:]]'
; diff by character
diffchar = diff --word-diff --word-diff-regex='.'
; checkout files with only whitespace changes
whitespacecheckout = "!git status --porcelain | grep '^.M' | cut -b4- | while read file ; do if test -z "$( git diff -w "$file" )"; then git checkout -- "$file" ; fi; done"
; rebase not-yet-pushed commits
rebaselocal = "!REMOTE=$( git rev-parse --abbrev-ref HEAD@{u} ) ; if [ -n "$REMOTE" ]; then git rebase -i $REMOTE ; else echo "ERROR: Unable to determine remote branch" ; fi"
d = difftool
open = !vim `git-open.sh`
; slim log
lg = log --graph --pretty=slim --abbrev-commit --date=relative
; lg date: sorted by date and with absolute dates
lgd = log --graph --pretty=slim --abbrev-commit --date=local --date-order
; lg upstream: also show upstream branch
lgu = !git lg $( git rev-parse --symbolic @{u} ) HEAD
; lg date, upstream
lgdu = !git lgd $( git rev-parse --symbolic @{u} ) HEAD
; lg me: my commits from all branches, by date
lgme = !git lgd --author=\"$( git config --get user.name )\" --all
; grep with some context (and a header)
hgrep = grep --heading -B3 -A3
; diff by word
diffword = diff --word-diff --word-diff-regex='\\w+|[^[:space:]]'
; diff by character
diffchar = diff --word-diff --word-diff-regex='.'
; checkout files with only whitespace changes
whitespacecheckout = "!git status --porcelain | grep '^.M' | cut -b4- | while read file ; do if test -z "$( git diff -w "$file" )"; then git checkout -- "$file" ; fi; done"
; rebase not-yet-pushed commits
rebaselocal = "!REMOTE=$( git rev-parse --abbrev-ref HEAD@{u} ) ; if [ -n "$REMOTE" ]; then git rebase -i $REMOTE ; else echo "ERROR: Unable to determine remote branch" ; fi"
[diff]
tool = vimdiff
@ -47,10 +43,10 @@
[core]
excludesfile = ~/.gitignore
quotepath = false
editor = vim
editor = vim
pager = diff-so-fancy | less --tabs=4 -RFX
[pretty]
slim = "%C(red)%h%C(yellow)%d%C(reset) %s %C(green)(%cd) %C(bold blue)<%an>%C(reset)"
slim = "%C(red)%h%C(yellow)%d%C(reset) %s %C(green)(%cd) %C(bold blue)<%an>%C(reset)"
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
@ -73,7 +69,7 @@
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
whitespace = red reverse
[includeIf "gitdir:~/Projects/jazzy.pro/"]
path = ~/Projects/jazzy.pro/.gitconfig
@ -81,7 +77,7 @@
[includeIf "gitdir:~/Projects/CyfroweNiebo/"]
path = ~/Projects/CyfroweNiebo/.gitconfig
[includeIf "gitdir:~/Projects/streamsage.io/"]
[includeIf "gitdir:~/Projects/streamsage/"]
path = ~/Projects/streamsage.io/.gitconfig
[includeIf "gitdir:~/Projects/GONG/"]