search

mikeizbicki / ucr-cs100

open source software construction course
Other
486 stars 407 forks source link

hw4 #1729

Closed zzhou007 closed 9 years ago

zzhou007 commented 9 years ago

zihang zhou zzhou007

kenneth chan kchan049

mikeizbicki commented 9 years ago

Before I look at this, you need to squash this into a single commit, and that commit cannot include all the changes already in this repo (as 677e781 does).

zzhou007 commented 9 years ago

How do I squash commits? I tried reset hard -HEAD~1 to delete all commits but it ends up showing 3 commits like now and git rebase -i HEAD~4 but the Merge branch commit does not show up and lecture notes commit does not show up as well.

mikeizbicki commented 9 years ago

There is a tutorial in the textbook folder.

On Mon, Jun 8, 2015 at 9:59 PM, zzhou007 notifications@github.com wrote:

How do I squash commits? I tried reset hard -HEAD~1 to delete all commits but it ends up showing 3 commits like now and git rebase -i HEAD~4 but the Merge branch commit does not show up and lecture notes commit does not show up as well.

— Reply to this email directly or view it on GitHub https://github.com/mikeizbicki/ucr-cs100/pull/1729#issuecomment-110226502 .