Use tabs
This commit is contained in:
parent
0401865b89
commit
37a44c7095
242
.gitconfig
242
.gitconfig
|
|
@ -1,180 +1,180 @@
|
||||||
[alias]
|
[alias]
|
||||||
## 'New' commands.
|
## 'New' commands.
|
||||||
create-initial-commit = !git commit -m 'Initial commit' --allow-empty
|
create-initial-commit = !git commit -m 'Initial commit' --allow-empty
|
||||||
hard-reset = !git reset --hard $(git upstream)/$(git current-branch)
|
hard-reset = !git reset --hard $(git upstream)/$(git current-branch)
|
||||||
# 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-
|
||||||
# Create a new branch.
|
# Create a new branch.
|
||||||
create-new-branch = checkout -b
|
create-new-branch = checkout -b
|
||||||
# Add a commit that fixes another (to be used with `rebase -i`).
|
# Add a commit that fixes another (to be used with `rebase -i`).
|
||||||
fixup = commit --fixup
|
fixup = commit --fixup
|
||||||
noff = merge --no-ff
|
noff = merge --no-ff
|
||||||
prune = remote prune origin
|
prune = remote prune origin
|
||||||
remotes = remote -v
|
remotes = remote -v
|
||||||
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
|
||||||
ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
|
ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
|
||||||
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
|
||||||
|
|
||||||
# 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
|
it checkout $BRANCH && git pull
|
||||||
|
|
||||||
# Push the current branch upstream to origin using the same branch
|
# Push the current branch upstream to origin using the same branch
|
||||||
# name for the remote branch.
|
# name for the remote branch.
|
||||||
upstream-current-branch = !git push --set-upstream origin \
|
upstream-current-branch = !git push --set-upstream origin \
|
||||||
$(git current-branch)
|
(git current-branch)
|
||||||
|
|
||||||
rebase-against-master = !git fetch --all \
|
rebase-against-master = !git fetch --all \
|
||||||
&& git rebase $(git upstream)/master
|
& git rebase $(git upstream)/master
|
||||||
|
|
||||||
rebase-against-develop = !git fetch --all \
|
rebase-against-develop = !git fetch --all \
|
||||||
&& git rebase $(git upstream)/master
|
& git rebase $(git upstream)/master
|
||||||
|
|
||||||
## Shorterned 'New' commands.
|
## Shorterned 'New' commands.
|
||||||
cic = !git create-initial-commit
|
cic = !git create-initial-commit
|
||||||
red = !git rebase-against-develop
|
red = !git rebase-against-develop
|
||||||
rem = !git rebase-against-master
|
rem = !git rebase-against-master
|
||||||
w = !git word-diff
|
w = !git word-diff
|
||||||
wip = !git work-in-progress
|
wip = !git work-in-progress
|
||||||
|
|
||||||
# Shorterned existing commands.
|
# Shorterned existing commands.
|
||||||
a = add
|
a = add
|
||||||
aa = add --all --intent-to-add
|
aa = add --all --intent-to-add
|
||||||
ap = add --patch
|
ap = add --patch
|
||||||
au = add -u
|
au = add -u
|
||||||
b = branch
|
b = branch
|
||||||
bd = branch --delete
|
bd = branch --delete
|
||||||
c = commit -v
|
c = commit -v
|
||||||
ca = commit --amend
|
ca = commit --amend
|
||||||
caa = commit --amend -C HEAD
|
caa = commit --amend -C HEAD
|
||||||
cl = clone --recursive
|
cl = clone --recursive
|
||||||
co = checkout
|
co = checkout
|
||||||
cop = checkout -p
|
cop = checkout -p
|
||||||
d = diff
|
d = diff
|
||||||
f = fetch --all
|
f = fetch --all
|
||||||
g = grep --break --heading
|
g = grep --break --heading
|
||||||
m = merge --ff-only
|
m = merge --ff-only
|
||||||
nb = !git create-new-branch
|
nb = !git create-new-branch
|
||||||
p = push
|
p = push
|
||||||
rb = rebase
|
rb = rebase
|
||||||
rba = rebase --abort
|
rba = rebase --abort
|
||||||
rbc = rebase --continue
|
rbc = rebase --continue
|
||||||
rbi = rebase --interactive
|
rbi = rebase --interactive
|
||||||
s = status
|
s = status
|
||||||
sb = show-branch -a
|
sb = show-branch -a
|
||||||
dt = difftool
|
dt = difftool
|
||||||
unmerged = branch --no-merged
|
unmerged = branch --no-merged
|
||||||
unmerged-remote = branch --remote --no-merged
|
unmerged-remote = branch --remote --no-merged
|
||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetupmerge = true
|
autosetupmerge = true
|
||||||
autosetuprebase = always
|
autosetuprebase = always
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
branch = auto
|
branch = auto
|
||||||
diff = auto
|
diff = auto
|
||||||
status = auto
|
status = auto
|
||||||
ui = true
|
ui = true
|
||||||
|
|
||||||
[color "branch"]
|
[color "branch"]
|
||||||
current = red reverse
|
current = red reverse
|
||||||
local = blue
|
local = blue
|
||||||
remote = green
|
remote = green
|
||||||
|
|
||||||
[color "diff"]
|
[color "diff"]
|
||||||
meta = yellow
|
meta = yellow
|
||||||
frag = magenta
|
frag = magenta
|
||||||
old = red bold
|
old = red bold
|
||||||
new = green
|
new = green
|
||||||
plain = white
|
plain = white
|
||||||
|
|
||||||
[color "status"]
|
[color "status"]
|
||||||
added = yellow
|
added = yellow
|
||||||
changed = green
|
changed = green
|
||||||
untracked = cyan
|
untracked = cyan
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
# A global .gitignore file.
|
# A global .gitignore file.
|
||||||
excludesFile = ~/.gitignore-global
|
excludesFile = ~/.gitignore-global
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
|
||||||
[fetch]
|
[fetch]
|
||||||
# Always prune when fetching (and pulling).
|
# Always prune when fetching (and pulling).
|
||||||
prune = true
|
prune = true
|
||||||
|
|
||||||
[gitsh]
|
[gitsh]
|
||||||
nogreeting = true
|
nogreeting = true
|
||||||
|
|
||||||
[grep]
|
[grep]
|
||||||
# Show the line numbers in the output.
|
# Show the line numbers in the output.
|
||||||
lineNumber = true
|
lineNumber = true
|
||||||
|
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 1
|
autocorrect = 1
|
||||||
|
|
||||||
[include]
|
[include]
|
||||||
path = ~/.gitconfig-local
|
path = ~/.gitconfig-local
|
||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
autostash = true
|
autostash = true
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
# Store and re-use manual conflict resolution changes.
|
# Store and re-use manual conflict resolution changes.
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
# Push the current branch to update a branch with the same name on the
|
# Push the current branch to update a branch with the same name on the
|
||||||
# receiving end.
|
# receiving end.
|
||||||
default = current
|
default = current
|
||||||
|
|
||||||
[url "https://github.com/"]
|
[url "https://github.com/"]
|
||||||
insteadOf = gh:
|
insteadOf = gh:
|
||||||
|
|
||||||
[url "https://gist.github.com/"]
|
[url "https://gist.github.com/"]
|
||||||
insteadOf = gist:
|
insteadOf = gist:
|
||||||
|
|
||||||
[url "https://bitbucket.org/"]
|
[url "https://bitbucket.org/"]
|
||||||
insteadOf = bb:
|
insteadOf = bb:
|
||||||
|
|
||||||
[url "https://git.drupal.org/project/"]
|
[url "https://git.drupal.org/project/"]
|
||||||
# Clone from drupal.org using "git clone do:{name}"
|
# Clone from drupal.org using "git clone do:{name}"
|
||||||
# or "git clone drupal:{name}".
|
# or "git clone drupal:{name}".
|
||||||
insteadOf = do:
|
insteadOf = do:
|
||||||
insteadOf = drupal:
|
insteadOf = drupal:
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
|
||||||
ff = only
|
ff = only
|
||||||
|
rebase = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
defaultToUpstream = true
|
defaultToUpstream = true
|
||||||
ff = false
|
ff = false
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue