opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Spaces.

Browse source
This commit is contained in:
Oliver Davies 2015-11-13 00:21:31 +00:00
parent 72db0d5901
commit 0f3a368ab8
1 changed files with 83 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
.gitconfig
View file

@ -1,89 +1,89 @@
[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-
work-in-progress = commit -a -m 'WIP' work-in-progress = commit -a -m 'WIP'
# 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
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
# 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 = branchs
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
l = !git log --oneline --graph --decorate -20 || true l = !git log --oneline --graph --decorate -20 || true
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 --short --branch s = status --short --branch
sb = show-branch -a sb = show-branch -a
dt = diftool dt = diftool
[branch] [branch]
autosetupmerge = true autosetupmerge = true
@ -93,27 +93,27 @@
ui = true ui = 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
# Open Git help pages in a browser as HTML. # Open Git help pages in a browser as HTML.
format = web format = web
[include] [include]
path = ~/.gitconfig-local path = ~/.gitconfig-local