Created
July 23, 2021 19:21
-
-
Save designfrontier/9124e041171811cf503d21dc2750c35c to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = Daniel Sellers | |
[color] | |
ui = true | |
[alias] | |
co = checkout | |
cob = checkout -b | |
st = status | |
ci = commit | |
br = branch | |
amend = commit --amend | |
pl = "!f() { \ | |
git pull origin $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@');\ | |
}; f" | |
dhist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short --left-right --cherry-pick --oneline | |
squash = rebase --interactive HEAD~2 | |
pu = push origin HEAD | |
puf = push origin HEAD --force | |
pug = push origin HEAD:refs/for/master | |
wip = push origin HEAD:refs/for/master%wip | |
oops = reset --soft HEAD~1 | |
contribs = shortlog -s -n | |
gerrit-submit = "!bash -c ' \ | |
local_ref=$(git symbolic-ref HEAD); \ | |
local_name=${local_ref##refs/heads/}; \ | |
remote=$(git config branch.\"$local_name\".remote || echo origin); \ | |
remote_ref=$(git config branch.\"$local_name\".merge); \ | |
remote_name=${remote_ref##refs/heads/}; \ | |
remote_review_ref=\"refs/for/$remote_name\"; \ | |
r=\"\"; \ | |
if [[ $0 != \"\" && $0 != \"bash\" ]]; then r=\"--reviewer=$0\"; fi; \ | |
if [[ $1 != \"\" ]]; then r=\"$r --reviewer=$1\"; fi; \ | |
if [[ $2 != \"\" ]]; then r=\"$r --reviewer=$2\"; fi; \ | |
if [[ $3 != \"\" ]]; then r=\"$r --reviewer=$3\"; fi; \ | |
if [[ $4 != \"\" ]]; then r=\"$r --reviewer=$4\"; fi; \ | |
git push --receive-pack=\"gerrit receive-pack $r\" $remote HEAD:$remote_review_ref'" | |
cherry-pick-merge = "!bash -c 'git cherry-pick -n -m 1 $0 && \ | |
git log -1 --pretty=%P $0 | cut -b 42- > .git/MERGE_HEAD && \ | |
git commit -v'" | |
resolve-ref = log -1 --pretty=format:%H | |
changeset = "!bash -c ' \ | |
git fetch $(git config remote.$(git this-remote).url) \ | |
refs/changes/${0: -2}/$0/$1; \ | |
git resolve-ref FETCH_HEAD'" | |
this-remote = "!bash -c ' \ | |
local_ref=$(git symbolic-ref HEAD); \ | |
local_name=${local_ref##refs/heads/}; \ | |
echo $(git config branch.\"#local_name\".remote || echo origin)'" | |
remote-ref = "!bash -c ' \ | |
local_ref=$(git symbolic-ref HEAD); \ | |
local_name=${local_ref##refs/heads/}; \ | |
remote=$(git config branch.\"#local_name\".remote || echo origin); \ | |
remote_ref=$(git config branch.\"$local_name\".merge); \ | |
remote_name=${remote_ref##refs/heads/}; \ | |
echo remotes/$remote/$remote_name'" | |
rebase-recent = !git rebase -i $(git merge-base HEAD $(git remote-ref)) | |
grfm = !git checkout master; git pull; git checkout -; git rebase master | |
size = !git --no-pager diff --shortstat HEAD~1 HEAD | |
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative | |
kill-whitespace = "!bash -c 'git commit -a -m pre-whitespace-killed && \ | |
echo pre-whitespace ref: $(git resolve-ref HEAD) && \ | |
git reset HEAD^ && \ | |
git diff --ignore-space-at-eol > /tmp/git-whitespace-diff-$$.patch && \ | |
git reset --hard HEAD && \ | |
git apply /tmp/git-whitespace-diff-$$.patch && \ | |
rm /tmp/git-whitespace-diff-$$.patch'" | |
[url "https://"] | |
insteadOf = git:// |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment