9

When I write the code in local, sometimes I commit the code that isn't clean yet, or, with an ugly message as temporary revision.

However, when I want my code to merge with the others, I would like the only final snapshot that the other can see, (hidden the revisions that look ugly)

Ex. I fork 0 to my local repository, I make change and test and commit with unclean code

0->1->2->3->4->5->6 (Final code)

when the others pull the code, is it possible to make other see only final state? and not see the tree from 1..5

I want users will see like

0------------------->6

One way I can think of is making a patch file, but it not good enough if there is some file have to be deleted or create.

jiexishede
  • 2,473
  • 6
  • 38
  • 54
scalopus
  • 2,640
  • 3
  • 19
  • 32

5 Answers5

5

You can use reset --soft to squash multiple commits into a single new clean commit. With your branch at the final code with no staged changes you can do:

git reset --soft <sha1-of-0>
git commit

When git commit prompts, give a clear commit message describing the complete changes being introduced.

CB Bailey
  • 755,051
  • 104
  • 632
  • 656
3

The most flexible way to do this is to do an interactive rebase to squash together or amend your commits. You need to be careful not to rewrite any history that's already public, however. For example, if you're working on the master branch, and you want to rewrite and linearize all your commits that aren't in origin/master (which typically means the work that you haven't pushed yet) you can do:

git rebase -i origin/master

That will launch a text editor where each commit you have that isn't in origin/master is shown, from oldest to newest. If you want want to combine any commit with the previous one, you can just change the start of the line from pick to squash. Or, if you want to amend that commit somehow, you can change pick to edit.

Using interactive rebase is the most flexible way of doing what you ask for, and it's a very useful tool to get to know, but in the exact situation you describe, it's probably overkill. First, check that the output of git status is clean, so that you're sure that your staging area represents the same state as HEAD. You can then just do a "soft reset" back to 0, which resets HEAD to that commit, but leaves your working tree and index (i.e. the staging area) intact. If you then do a commit, your index will be used to create a new commit with the same state as 6, but with 0 as a parent. i.e.

 git status # Check that your status is clean
 git reset --soft 0
 git commit -m 'Work that is totally flawless'
Mark Longair
  • 446,582
  • 72
  • 411
  • 327
2

Yes, use git rebase -i, and squash the commits. Check this for more info and some examples.

Geo
  • 93,257
  • 117
  • 344
  • 520
2

Assuming you haven't already pushed your commits to the remote then there are several ways to do this.

One option is to use 

git rebase -i

which gives you the interactive rebase editor. You can then mark all the commits except the last as 'squash'

BenBtg
  • 836
  • 1
  • 9
  • 22
0

Git squash merge is designed for this purpose. The way you would do this is to create a branch, make all your changes, and then merge back using squash merge.

How to use git merge --squash?

However, this isn't usually recommended because you will lose history this way.

Christian Findlay
  • 6,770
  • 5
  • 51
  • 103