gitconfig: Use tabs.
This commit is contained in:
parent
51c4d9d0c2
commit
b031b0e492
184
.gitconfig
184
.gitconfig
|
|
@ -1,122 +1,122 @@
|
||||||
[include]
|
[include]
|
||||||
path = ~/.gitconfig-local
|
path = ~/.gitconfig-local
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
ui = true
|
ui = true
|
||||||
|
|
||||||
[color "branch"]
|
[color "branch"]
|
||||||
current = yellow bold
|
current = yellow bold
|
||||||
local = green bold
|
local = green bold
|
||||||
remote = cyan bold
|
remote = cyan bold
|
||||||
|
|
||||||
[color "diff"]
|
[color "diff"]
|
||||||
meta = yellow bold
|
meta = yellow bold
|
||||||
frag = magenta bold
|
frag = magenta bold
|
||||||
old = red bold
|
old = red bold
|
||||||
new = green bold
|
new = green bold
|
||||||
whitespace = red reverse
|
whitespace = red reverse
|
||||||
|
|
||||||
[color "status"]
|
[color "status"]
|
||||||
added = green bold
|
added = green bold
|
||||||
changed = yellow bold
|
changed = yellow bold
|
||||||
untracked = red bold
|
untracked = red bold
|
||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetupmerge = true
|
autosetupmerge = true
|
||||||
autosetuprebase = always
|
autosetuprebase = always
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
aa = add --all
|
aa = add --all
|
||||||
ap = add --patch
|
ap = add --patch
|
||||||
b = branch -v
|
b = branch -v
|
||||||
bv = branch -vv
|
bv = branch -vv
|
||||||
bd = branch -d
|
bd = branch -d
|
||||||
c = commit -v
|
c = commit -v
|
||||||
ca = !git c --amend
|
ca = !git c --amend
|
||||||
caa = !git ca -a -C HEAD
|
caa = !git ca -a -C HEAD
|
||||||
cam = !git c -am
|
cam = !git c -am
|
||||||
cf = commit --fixup
|
cf = commit --fixup
|
||||||
cl = clone
|
cl = clone
|
||||||
cm = !git c -m
|
cm = !git c -m
|
||||||
co = checkout
|
co = checkout
|
||||||
cop = checkout -p
|
cop = checkout -p
|
||||||
ds = diff --stat
|
ds = diff --stat
|
||||||
f = fetch
|
f = fetch
|
||||||
g = grep --break --heading --line-number
|
g = grep --break --heading --line-number
|
||||||
create-initial-commit = !git commit -m 'Initial commit' --allow-empty
|
create-initial-commit = !git commit -m 'Initial commit' --allow-empty
|
||||||
l = log --oneline --graph --decorate
|
l = log --oneline --graph --decorate
|
||||||
la = !git l --all
|
la = !git l --all
|
||||||
noff = merge --no-ff
|
noff = merge --no-ff
|
||||||
prb = pull --rebase
|
prb = pull --rebase
|
||||||
ra = rebase --abort
|
ra = rebase --abort
|
||||||
ri = rebase --interactive
|
ri = rebase --interactive
|
||||||
rc = rebase --continue
|
rc = rebase --continue
|
||||||
s = status --short --branch
|
s = status --short --branch
|
||||||
staged = diff --staged
|
staged = diff --staged
|
||||||
undo = reset --hard
|
undo = reset --hard
|
||||||
unstage = reset HEAD --
|
unstage = reset HEAD --
|
||||||
wipe = clean -fd
|
wipe = clean -fd
|
||||||
word-diff = diff --word-diff
|
word-diff = diff --word-diff
|
||||||
# Print the name of the current branch.
|
# Print the name of the current branch.
|
||||||
current-branch = symbolic-ref --short HEAD
|
current-branch = symbolic-ref --short HEAD
|
||||||
# Print the name of the current upstream tracking branch.
|
# Print the name of the current upstream tracking branch.
|
||||||
upstream = !git config --get branch.$(git current-branch).remote \
|
upstream = !git config --get branch.$(git current-branch).remote \
|
||||||
|| echo origin
|
|| echo origin
|
||||||
# Checkout the latest develop branch and update it.
|
# Checkout the latest develop branch and update it.
|
||||||
pull-develop = !git checkout develop && git pull --rebase
|
pull-develop = !git checkout develop && git pull --rebase
|
||||||
# Checkout the latest master branch and update it.
|
# Checkout the latest master branch and update it.
|
||||||
pull-master = !git checkout master && git pull --rebase
|
pull-master = !git checkout master && git pull --rebase
|
||||||
# Update the develop, master and current branches.
|
# Update the develop, master and current branches.
|
||||||
pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \
|
pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \
|
||||||
git fetch --all && git pull-develop && git pull-master && \
|
git fetch --all && git pull-develop && git pull-master && \
|
||||||
git checkout $BRANCH && git pull
|
git checkout $BRANCH && git pull
|
||||||
# Fetch and merge the latest changes from the develop branch.
|
# Fetch and merge the latest changes from the develop branch.
|
||||||
merge-origin-develop = !git fetch origin && git merge origin/develop
|
merge-origin-develop = !git fetch origin && git merge origin/develop
|
||||||
# Fetch and merge the latest changes from the master branch.
|
# Fetch and merge the latest changes from the master branch.
|
||||||
merge-origin-master = !git fetch origin && git merge origin/master
|
merge-origin-master = !git fetch origin && git merge origin/master
|
||||||
# Assume the specified file is unchanged to stop changes
|
# Assume the specified file is unchanged to stop changes
|
||||||
# being seen by Git
|
# being seen by Git
|
||||||
assume = update-index --assume-unchanged
|
assume = update-index --assume-unchanged
|
||||||
# No longer assume a specified file remains unchanged
|
# No longer assume a specified file remains unchanged
|
||||||
unassume = update-index --no-assume-unchanged
|
unassume = update-index --no-assume-unchanged
|
||||||
# List all files that are assumed to be unchanged
|
# List all files that are assumed to be unchanged
|
||||||
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
|
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
|
||||||
push-current-branch = !git push -u $(git upstream) $(git current-branch)
|
push-current-branch = !git push -u $(git upstream) $(git current-branch)
|
||||||
|
|
||||||
# Shorter commands.
|
# Shorter commands.
|
||||||
cic = !git create-initial-commit
|
cic = !git create-initial-commit
|
||||||
mod = !git merge-origin-develop
|
mod = !git merge-origin-develop
|
||||||
mom = !git merge-origin-master
|
mom = !git merge-origin-master
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
# A global .gitignore file.
|
# A global .gitignore file.
|
||||||
excludesFile = ~/.gitignore-global
|
excludesFile = ~/.gitignore-global
|
||||||
|
|
||||||
[grep]
|
[grep]
|
||||||
# Show the line numbers in the output.
|
# Show the line numbers in the output.
|
||||||
lineNumber = true
|
lineNumber = true
|
||||||
#
|
#
|
||||||
patternType = extended
|
patternType = extended
|
||||||
|
|
||||||
[fetch]
|
[fetch]
|
||||||
# Always prune when fetching (and pulling).
|
# Always prune when fetching (and pulling).
|
||||||
prune = 1
|
prune = 1
|
||||||
|
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 1
|
autocorrect = 1
|
||||||
# Open Git help pages in a browser as HTML.
|
# Open Git help pages in a browser as HTML.
|
||||||
format = web
|
format = web
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
# Store and re-use manual conflict resolution changes.
|
# Store and re-use manual conflict resolution changes.
|
||||||
enabled = 1
|
enabled = 1
|
||||||
|
|
||||||
[gitsh]
|
[gitsh]
|
||||||
nogreeting = true
|
nogreeting = true
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
autostash = true
|
autostash = true
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue