Permalink
Browse files

Adding git squash/fixup shortcuts

  • Loading branch information...
1 parent ae45369 commit 9893e85e0926a11b1d3442c5a2ad74b5cd26e890 @iloveitaly committed Jan 15, 2013
Showing with 5 additions and 0 deletions.
  1. +5 −0 .gitconfig
View
@@ -16,6 +16,11 @@
# Find FIXME, TODO, etc
n = !"git ls-files | xargs notes 2>/dev/null | awk -F: '{ print $1,$2; print $3,$4; print $5}' | grcat conf.notes "
ksreview = "!f() { local SHA=${1:-HEAD}; local BRANCH=${2:-master}; if [ $SHA == $BRANCH ]; then SHA=HEAD; fi; git difftool $BRANCH...$SHA; }; f"
+
+ # 1-7-release-of-git-rebase---interactive---autosquash/
+ fixup = !sh -c 'git commit --fixup=$1' -
+ squash = !sh -c 'git commit --squash=$1' -
+ ri = rebase --interactive --autosquash
[color]
ui = auto
[color "branch"]

0 comments on commit 9893e85

Please sign in to comment.