Git Squash

Tags:
Categories:

  less than a minute  

Option 1

to squash last two commits

git rebase -i HEAD~2

This will open editor where you can choose which commit to keep and which to squash. Also you have option to rewrite messages.

Option 2

Reset and commit again:

git reset --soft HEAD~2
git commit -m "New message for the combined commit"

public class Test {
    public static void main(String[] args) {
        System.out.println("hello");
    }
}

<section id="main">
  <div>
    <h1 id="title">{{ .Title }}</h1>
    {{ range .Pages }}
      {{ .Render "summary"}}
    {{ end }}
  </div>
</section>