Skip to content
Permalink
Branch: master
Find file Copy path
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
42 lines (41 sloc) 1.27 KB
# private file must define [user] and [core]
[include]
path = .gitconfig_private
[color]
ui = auto
[alias]
c = commit
ca = commit -a
d = diff --ignore-all-space
dc = diff --cached --ignore-all-space
r = rebase
p = push -u origin head
a = add
s = status
co = checkout
g = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
zmerge = merge --no-ff
l = diff --word-diff HEAD^ HEAD
ll = diff --word-diff HEAD^^ HEAD^
lf = diff HEAD^ HEAD --name-only
llf = diff HEAD^^ HEAD^ --name-only
nuke = reset --hard origin/master
# yolo = "!f() { \
# curr_branch=$(git rev-parse --abbrev-ref HEAD); \
# if [ "$curr_branch" = "master" ]; then \
# echo "~~ cant yolo on master..." && return; \
# fi; \
# echo "~~ force pushing origin head"; \
# git push -f origin head; \
# }; f"
mu = "!f() { \
echo "~~ updating master"; \
git fetch origin master; \
git update-ref --create-reflog refs/heads/master refs/remotes/origin/master; \
}; f"
reup = "!f() { \
git mu; \
echo "~~ rebasing on origin/master"; \
git rebase origin/master; \
echo "~~ done"; \
}; f"
You can’t perform that action at this time.