Skip to content

Commit d07dd00

Browse files
committed
--autosquash tip
1 parent f886fd3 commit d07dd00

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
* [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)
8686
* [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)
8787
* [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)
88+
* [squash fixup commits normal commits.](https://github.com/git-tips/tips#squash-fixup-commits-normal-commits)
8889

8990
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
9091
<!-- @doxie.inject end toc -->
@@ -593,5 +594,10 @@ git clean -fd --dry-run
593594
git commit --fixup <SHA-1>
594595
```
595596

597+
## squash fixup commits normal commits.
598+
```sh
599+
git rebase -i --autosquash
600+
```
601+
596602
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
597603
<!-- @doxie.inject end -->

tips.json

+3
Original file line numberDiff line numberDiff line change
@@ -260,4 +260,7 @@
260260
}, {
261261
"title": "Marks your commit as a fix of a previous commit",
262262
"tip": "git commit --fixup <SHA-1>"
263+
}, {
264+
"title": "squash fixup commits normal commits.",
265+
"tip": "git rebase -i --autosquash"
263266
}]

0 commit comments

Comments
 (0)