Permalink
Browse files

Add `git squash` alias

* Add alias to squash commits before merging

Style:
* Sort git aliases
  • Loading branch information...
1 parent 056495d commit 1fb4bfcc3e43162480e69c981f751074b7f12422 Adarsh Pandit committed Dec 1, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 gitconfig
View
@@ -12,13 +12,13 @@
ui = true
[alias]
- c = commit -m
a = add
aa= !git add -u && git add . && git status
+ c = commit -m
cob = checkout -b
- up = !git fetch origin && git rebase origin/master
down = !git checkout master && git merge @{-1} --ff-only
- ir = !git rebase -i origin/master
+ squash = !git rebase -i origin/master
+ up = !git fetch origin && git rebase origin/master
[credential]
helper = osxkeychain

0 comments on commit 1fb4bfc

Please sign in to comment.