--autosquash tip

This commit is contained in:
Hemanth.HM 2016-02-22 19:20:47 +05:30
parent f886fd31fa
commit d07dd0040c
2 changed files with 9 additions and 0 deletions

View File

@ -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)
<!-- Dont 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
```
<!-- Dont remove or change the comment below that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end -->

View File

@ -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"
}]