From d07dd0040ce793628257b9ac9d168399420ead2f Mon Sep 17 00:00:00 2001 From: "Hemanth.HM" Date: Mon, 22 Feb 2016 19:20:47 +0530 Subject: [PATCH] --autosquash tip --- README.md | 6 ++++++ tips.json | 3 +++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index f6885c8..d0aa04b 100644 --- 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) @@ -593,5 +594,10 @@ git clean -fd --dry-run git commit --fixup ``` +## squash fixup commits normal commits. +```sh +git rebase -i --autosquash +``` + diff --git a/tips.json b/tips.json index 6848a83..e289dda 100644 --- 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 " +}, { + "title": "squash fixup commits normal commits.", + "tip": "git rebase -i --autosquash" }]