• do your modifications
  • show what files changed
git status
  • add changes
git add <filename>
  • in case you want to undo files you added, which you did not commit:
git reset <filename>
  • commit changes
git commit 

or in one go:

  • add and commit the changes
git commit -a

  • create a patchset to submit

After checking in your local changes (in multiple small commits), you can generate a list of the patches you need to send upstream (i.e. to ic_common_patches) with the following command:

git format-patch --keep-subject -o out origin
  • create a patch against the latest and greatest
git format-patch HEAD^!
  • this patch should go to integration