[Cordova Wiki] Update of "CommitterWorkflow" by PatrickMueller

[Apache Wiki <wi...@apache.org>]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Cordova Wiki" for change notification.

The "CommitterWorkflow" page has been changed by PatrickMueller:
http://wiki.apache.org/cordova/CommitterWorkflow?action=diff&rev1=5&rev2=6

  git cherry-pick 5d3e1b6 # For each commit ID in their branch.
  }}}
  
+ == Step 4: Check the author ==
+ 
+ git keeps track of the author of commits separately from the committer of the commit.
+ 
+ Typically, both of these values are set to the person submitting the pull request.
+ After your pull/merge/rebase/whatever work, you may find the values have changed - or not.
+ What we would typically be looking for is the final commit to have YOU as the committer and the original author as the author.
+ 
+ You can check these fields with the following command:
+ {{{
+ git log --pretty=full
+ }}}
+ 
+ If the author is set to YOU, and you'd like to reset it to the original author, you can amend the commit:
+ 
+ {{{
+ git commit --amend --author=some_author_id_here
+ }}}
+ 
+ If the committer is NOT set to YOU, and you'd like to reset it to yourself, well, not sure. I think the idea would be to do an extra merge, maybe on a new branch, probably with --no-ff (preventing a fast-forward), and then a commit --amend from there if the author got reset to you.
+ 
+ {{{
+ git commit --amend --author=SomeAuthorIdHere
+ }}}
+ 
+ 
- == Step 4: Push the change ==
+ == Step 5: Push the change ==
  
  {{{
  git push cordova master
  git remote rm foo
  }}}
  
- == Step 5: Final details ==
+ == Step 6: Final details ==
  
   * Update related JIRA issue with the commit ID and close it if appropriate.
   * Respond to pull request on github with link to their commit and ask them to close pull request.