Skip to content

Instantly share code, notes, and snippets.

@danielmarbach
Last active June 28, 2017 07:30
Show Gist options
  • Save danielmarbach/54a937ba941de39d2153ec708732ddaa to your computer and use it in GitHub Desktop.
Save danielmarbach/54a937ba941de39d2153ec708732ddaa to your computer and use it in GitHub Desktop.
[user]
email = [email protected]
name = danielmarbach
[merge]
tool = kdiff3
[diff]
guitool = kdiff3
[core]
autocrlf = False
editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor
[mergetool]
keepBackup = false
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
[difftool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
[alias]
prune-all = !git remote | xargs -n 1 git remote prune
dtag = !git tag -l | xargs git tag -d
otup = !git dtag && git fetch origin --tags
tup = !git dtag && git fetch upstream --tags
oup = !git checkout $1 && git dtag && git fetch origin && git merge origin/$1 && git remote update && git prune-all && git branch --merged $1 | grep -v -emaster-edevelop-edev| xargs -r git branch -d
odup = !git checkout dev && git dtag && git fetch origin && git merge origin/dev && git remote update && git prune-all && git branch --merged dev | grep -v -emaster-edevelop-edev| xargs -r git branch -d
oddup = !git checkout develop && git dtag && git fetch origin && git merge origin/develop && git remote update && git prune-all && git branch --merged develop | grep -v -emaster-edevelop-edev| xargs -r git branch -d
omup = !git checkout master && git dtag && git fetch origin && git merge origin/master && git remote update && git prune-all && git branch --merged master | grep -v -emaster-edevelop-edev| xargs -r git branch -d
ogup = !git checkout gh-pages && git dtag && git fetch origin && git merge origin/gh-pages && git remote update && git prune-all && git branch --merged gh-pages | grep -v -emaster-edevelop-edev| xargs -r git branch -d
up = !git checkout $1 && git dtag && git fetch upstream && git merge upstream/$1 && git push origin $1 -f --tags && git remote update && git prune-all && git branch --merged $1 | grep -v -emaster-edevelop-edev| xargs -r git branch -d
dup = !git checkout dev && git dtag && git fetch upstream && git merge upstream/dev && git push origin dev -f --tags && git remote update && git prune-all && git branch --merged dev | grep -v -emaster-edevelop-edev| xargs -r git branch -d
ddup = !git checkout develop && git dtag && git fetch upstream && git merge upstream/develop && git push origin develop -f --tags && git remote update && git prune-all && git branch --merged develop | grep -v -emaster-edevelop-edev| xargs -r git branch -d
mup = !git checkout master && git dtag && git fetch upstream && git merge upstream/master && git push origin master -f --tags && git remote update && git prune-all && git branch --merged master | grep -v -emaster-edevelop-edev| xargs -r git branch -d
gup = !git checkout gh-pages && git dtag && git fetch upstream && git merge upstream/gh-pages && git push origin gh-pages -f --tags && git remote update && git prune-all && git branch --merged gh-pages | grep -v -emaster-edevelop-edev| xargs -r git branch -d
merge-theirs = "!f() { git checkout $2; git commit-tree $1^{tree} -p $1 -p $2 -m \"Merge '$1' into '$2'\" | xargs -n 1 git reset --hard; }; f"
# Delete all local branches but master and the current one, only if they are fully merged with master.
dlt-useless = "!f(){\
git branch | grep -v "master" | grep -v ^* | xargs git branch -d;\
}; f"
# Delete all local branches but master and the current one.
dlt-useless-force = "!f(){\
git branch | grep -v "master" | grep -v ^* | xargs git branch -D;\
}; f"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment