Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made changes to highest #5

Open
wants to merge 38 commits into
base: obliv-c
Choose a base branch
from
Open

Made changes to highest #5

wants to merge 38 commits into from

Conversation

mdh3hc
Copy link
Contributor

@mdh3hc mdh3hc commented Jun 10, 2014

I made the changes to highest, and everything still works exactly like it is supposed to.

Is there anyway that I can separate all of the commits from each other at a pull request so that you don't have to accept all of these at once?

In here is also what we have been working on this week, which is the Private Set Intersection

@samee
Copy link
Owner

samee commented Jun 11, 2014

Thanks.

About cleaning up commit logs before pushing, yes there is a way, but it takes a bit more work. You can get started by reading through this page about git: http://git-scm.com/book/en/Git-Internals-Git-References

Essentially the workflow looks like this (remember that branches are super cheap in git):

  1. git checkout -b myworkbranch so you don't work directly on the master
  2. Hack as much as you like on this new branch. Commit them all any way you want.
  3. git checkout -b cleanbranch to make a copy of myworkbranch
  4. The magic command: git rebase -i. This will let you change work history in any way you like, but only in the cleanbranch. You could have done this directly on myworkbranch but I like having a backup copy in case something goes wrong
  5. Finally, push out cleanbranch
  6. Once you are happy, delete old branch git branch -D myworkbranch. This doesn't actually remove anything, since it is technically possible to recreate the branch by using the commit ref.

If you want, you can practice doing this right here using these commits. If you have already done your work on the main branch (I think it's called obliv-c here), don't worry: just rename the branch to something else. Later on, you can sync up the official version by doing another pull.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants