--autosquash tip

git-tips · Feb 22, 2016 · d07dd00 · d07dd00
1 parent f886fd3
commit d07dd00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -85,6 +85,7 @@
 * [Check if the change was a part of a release.](https://github.com/git-tips/tips#check-if-the-change-was-a-part-of-a-release)
 * [Dry run. (any command that supports dry-run flag should do.)](https://github.com/git-tips/tips#dry-run-any-command-that-supports-dry-run-flag-should-do)
 * [Marks your commit as a fix of a previous commit](https://github.com/git-tips/tips#marks-your-commit-as-a-fix-of-a-previous-commit)
+* [squash fixup commits normal commits.](https://github.com/git-tips/tips#squash-fixup-commits-normal-commits)
 
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end toc -->
@@ -593,5 +594,10 @@ git clean -fd --dry-run
 git commit --fixup <SHA-1>
 ```
 
+## squash fixup commits normal commits.
+```sh
+git rebase -i --autosquash
+```
+
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end -->
diff --git a/tips.json b/tips.json
@@ -260,4 +260,7 @@
 }, {
 	"title": "Marks your commit as a fix of a previous commit",
 	"tip": "git commit --fixup <SHA-1>"
+}, {
+	"title": "squash fixup commits normal commits.",
+	"tip": "git rebase -i --autosquash"
 }]