Admittedly elementary, here is a simple workflow - leave the git education as an exercise for the reader:
Contributors: How to create a patch: 1. isolate a change within a commit - changes should be scoped directly to JIRAs 2. "git format-patch -1" which will create a patch file with a name based on the commit message 3. rename it "KNOX-<jiranumber>.patch" and attach as a file to JIRA 4. click Submit Patch Reviewers: How to review a contribution: 1. clone a fresh copy of the branch for the patch 2. download the submitted patch 3. "git apply KNOX-<jiranumber>.patch" 4. build, review, test 5. provide feedback - request changes or indicate a plan to commit Contributors: How to make changes to reviewed patch: 1. "git reset --soft HEAD^" which will undo the commit locally 2. make required changes 3. recommit 4. "git format-patch -1" which will create a patch file with a name based on the commit message 5. rename it "KNOX-<jiranumber>.patch" and attach as a file to JIRA 6. click Submit Patch Committers: How to commit: 1. clone a fresh copy of the branch for the patch 2. download the submitted patch 3. "git apply KNOX-<jiranumber>.patch" 4. build, review, test 5. stage and commit the change for pushing 6. "git push" 7. thank the contributor! On Fri, Aug 23, 2013 at 1:35 AM, Mattmann, Chris A (398J) < [email protected]> wrote: > LOL nope, SVN wonk here ;) > > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > Chris Mattmann, Ph.D. > Senior Computer Scientist > NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA > Office: 171-266B, Mailstop: 171-246 > Email: [email protected] > WWW: http://sunset.usc.edu/~mattmann/ > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > Adjunct Assistant Professor, Computer Science Department > University of Southern California, Los Angeles, CA 90089 USA > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > > > -----Original Message----- > From: Kevin Minder <[email protected]> > Reply-To: "[email protected]" <[email protected]> > Date: Wednesday, August 21, 2013 12:54 PM > To: "[email protected]" <[email protected]> > Subject: Help with documenting contribution process > > >Hey Everyone, > >I'm a complete git dunce. No matter what I try I can't come up with a > >repeatable git workflow for the various contributor, reviewer, > >contributor use cases. Anyone else claim to understand git? > >Kevin. > > > >-- > >CONFIDENTIALITY NOTICE > >NOTICE: This message is intended for the use of the individual or entity > >to > >which it is addressed and may contain information that is confidential, > >privileged and exempt from disclosure under applicable law. If the reader > >of this message is not the intended recipient, you are hereby notified > >that > >any printing, copying, dissemination, distribution, disclosure or > >forwarding of this communication is strictly prohibited. If you have > >received this communication in error, please contact the sender > >immediately > >and delete it from your system. Thank You. > >
