Question

when using git as the repository, assuming the head is at v1.6

if I find a bug in v1.0

git stash save "interruption "  # is this necessary?
git checkout v1.0
vi badfile.c
git commit -a -m 'bugger fixed'

how is the fix propagated to subsequent versions?

Answer 1

Either merge with head, rebase onto head, or cherrypick.

Option A:

1.0-----1.6-----merge
  \             /
   \           /
    -fix-------

Option B:

 1.0-----1.6-----fix (rebased)
   \             
    \           
     -fix

Option C:

1.0-----1.6-----fix (cherrypicked)
  \             
   \           
    -fix