There are always some changes that you make temporarily but must never make it upstream, such as development-specific debugging instrumentation. The trick is to keep track of these but never send them upstream (to a repository you share with others, for instance).

Unsuprisingly, git’s got a way to handle this. Thank you, Karl Bielefeldt!

Assuming master is the upstream integration branch…

# just once: create branch for dev-only changes
git checkout -b common-dev-changes
 
# get latest upstream changes
git fetch
 
# rewind/replay common-dev-changes on top of master
git rebase origin/master
 
# switch to topic branch for a new feature/bugfix
git checkout -b topic-branch common-dev-changes
 
# ...edit files, debug, commit, etc...
 
# prepare to push - remove dev-only changes
git rebase --onto master common-dev-changes topic-branch
 
# switch back to master
git checkout master
 
# merge feature/bugfix code into master
git merge --ff-only topic-branch
 
# ...do integration testing...
 
# share your work!
git push

I’ve been jumping through all sorts of hoops like always having locally-modified files, git stash, even keeping patch files around. These techniques quickly become unwieldy with larger sets of changes because you forget why you authored a change or you accidentally push it upstream. rebase --onto was hiding in git-rebase(1) all this time, but I just discovered it today thanks to Google and stackoverflow.

If you don’t want the technique I outlined above another answer on that same stackoverflow post outlines using the git index (git add -p and friends) for managing your dev-only changes. That might be a handy stepping stone, and will provide tools you’ll still need later even when you are savvy with branching and rebase.

Tweet of same.

BreadVault is a tool to help you teach a child and yourself fiscal responsibility. It’s also my job! Here’s how to add a goal using our iPhone app.

1. Install BreadVault using the App Store.
2. Touch “Log in with Facebook”.
3. Add a family member. If you don’t have kids, add yourself. Set allocation sliders to 100% Save (you can change this later).
4. Log in as the family member you just added and scan a barcode (see photos, below). Don’t worry if the price isn’t right, you can change this later, too.

The next time you’re in line at the store, add a goal instead of making a discretionary purchase!

Other Tips

• For some more why and what about BreadVault, see How my 3-year-old bought herself The Lorax.
• iPhone+Facebook is probably the easiest and most convenient (but definitely not the only) way to use BreadVault. BreadVault HD is the iPad-optimized version. And of course there’s our full-featured website. We’ve got plans to support Android and Windows 8, too, so keep your eyes peeled for those.
• You added this goal when logged in as a family member. To make progress towards the goal, add funds using the Family Dashboard. Touch the upper leftmost corner of the app, and touch “Family Dashboard”. Try adding, say, $2 per week to the family member. To check goal progress, log out, then in as the family member. Touch the piggy bank to view Save goals.
• Once the goal is met, a blue Buy button will appear next to the goal progress bar. Use that to purchased the earned item.
• Saving for discretionary purchases is one facet of fiscal responsibility. Charity and investments are others, so next time check out the Give and Invest channels!

Sip & Ship Greenwood accepts Dwolla!

I have a favor to ask. Will you sign up for Dwolla and buy a coffee at the Greenwood Sip & Ship?

Please also click Like (below) if you support local/small businesses!