cleanup and sort Git configuration
This commit is contained in:
parent
1310814808
commit
5c0bfde1a8
1 changed files with 25 additions and 41 deletions
|
@ -1,13 +1,3 @@
|
|||
[user]
|
||||
email = {{ .git_email }}
|
||||
name = {{ .git_alias }}
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
|
||||
[push]
|
||||
default = current
|
||||
|
||||
[alias]
|
||||
a = add
|
||||
ahead-of-master = log --oneline origin/master..HEAD
|
||||
|
@ -19,45 +9,15 @@
|
|||
cm = checkout master
|
||||
cp = cherry-pick
|
||||
f = fetch -p
|
||||
# Show incoming changes with upstream.
|
||||
inbound = !git remote update --prune; git log ..@{upstream}
|
||||
# Show outgoing changes with upstream.
|
||||
outbound = log @{upstream}..
|
||||
# log long format
|
||||
l = log --graph --topo-order --date=short --abbrev-commit --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn]%Creset %Cblue%G?%Creset'
|
||||
lg = lg1
|
||||
lg1 = lg1-specific --all
|
||||
lg2 = lg2-specific --all
|
||||
lg3 = lg3-specific --all
|
||||
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
|
||||
lg2-specific = 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(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
|
||||
lg3-specific = 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 cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
|
||||
m = merge
|
||||
nb = checkout -b
|
||||
p = push -u origin
|
||||
s = status
|
||||
track = "!for BRANCH in $(git branch -a | grep remotes | grep -v HEAD); do git branch --track \"${BRANCH#remotes/origin/}\" \"${BRANCH}\"; done"
|
||||
untrack = "!for BRANCH in $(git branch | grep -v '*'); do git branch -D \"${BRANCH}\"; done"
|
||||
work-in-progress = rebase -i @{u}
|
||||
sync = "!git untrack && git gc && git f && git track"
|
||||
|
||||
[include]
|
||||
path = ~/.gitconfig_custom.inc
|
||||
|
||||
[credential]
|
||||
helper = store
|
||||
|
||||
[credential "https://github.com"]
|
||||
helper = cache
|
||||
|
||||
[core]
|
||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||
|
||||
[interactive]
|
||||
diffFilter = diff-so-fancy --patch
|
||||
|
||||
[color]
|
||||
ui = true
|
||||
ui = true
|
||||
[color "diff-highlight"]
|
||||
oldNormal = red bold
|
||||
oldHighlight = red bold 52
|
||||
|
@ -72,3 +32,27 @@
|
|||
new = green bold
|
||||
whitespace = red reverse
|
||||
|
||||
[core]
|
||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||
|
||||
[credential]
|
||||
helper = store
|
||||
[credential "https://github.com"]
|
||||
helper = cache
|
||||
|
||||
[include]
|
||||
path = ~/.gitconfig_custom.inc
|
||||
|
||||
[interactive]
|
||||
diffFilter = diff-so-fancy --patch
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
|
||||
[push]
|
||||
default = current
|
||||
|
||||
[user]
|
||||
email = {{ .git_email }}
|
||||
name = {{ .git_alias }}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue