# See https://blog.filippo.io/git-fixup-amending-an-older-commit/
# This is a slightly modified version
- fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autosquash $TARGET~; }; f"
+ fixup = "!f() { TARGET=$(git rev-parse \"$1\"); git commit --fixup=$TARGET && GIT_EDITOR=true exec git rebase --interactive --autostash --autosquash $TARGET~; }; f"
### remote ###
file = cat-file -t
type = cat-file -t
ff = merge --ff-only
- git = !exec git
+ #git = !exec git
l1 = log --decorate --oneline
l5 = log --decorate -5
ld = log --decorate
lr1 = log --decorate --reverse --oneline
lr5 = log --decorate --reverse -5
null-merge = merge --strategy=ours
- rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
+ rbi123 = "!f() { exec git rebase --interactive --autostash $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
rbi = !exec git rbi123 '' ''
rbia = !exec git rbi123 --autosquash ''
rbiap = !exec git rbi123 --autosquash --preserve-merges
sw = show --word-diff --decorate
unstage = reset HEAD --
- pr = "!f() { git fetch ${2:-upstream} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
+ pr = "!f() { git fetch ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
clean-pr = "!git checkout master ; git for-each-ref refs/heads/pr/* --format=\"%(refname)\" | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
[branch]
# Github URL shortcuts
[url "git@github.com:"]
insteadOf = "gh:"
- pushInsteadOf = "github:"
- pushInsteadOf = "git://github.com/"
-[url "git://github.com/"]
insteadOf = "github:"
+ insteadOf = "git://github.com/"
[url "git@gist.github.com:"]
insteadOf = "gst:"
- pushInsteadOf = "gist:"
- pushInsteadOf = "git://gist.github.com/"
-[url "git://gist.github.com/"]
insteadOf = "gist:"
+ insteadOf = "git://gist.github.com/"