Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

When I'm moving stuff from work to home or the other way around, I'm usually committing my topic branch as far as I can using "clean" commits (doing one thing and only one), followed by one "temp: moving to home" commit.

Then I push to our Gitorious (not trusting github with company internal code, so preferring a self-hosted solution) which we use as a sandbox and/or for code reviews and discussion.

Then, at home, I pull and continue working.

Once the topic branch is completed, I rebase -i to edit and or squash to finally clean out that temp commit. Once I,'m happy, I push to our main repository (which is hosted using gitosis and works quite like a central svn repository where the whole team has push access and where we deploy from)

This works for me because I'm totally comfortable with rebase -i, add -i, squash and amend now so I can get rid of that temp commit.

If I weren't (some people refuse to rebase even on their topic branches and want to work exactly like subversion), then the dtopbox solution would be compelling because of that ugly temporary commit that I can't get rid of without rebase.



Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: