Changes between Version 31 and Version 32 of UsingGit

Timestamp:

Jul 8, 2016, 4:47:01 PM (8 years ago)

Author:

Peter Bennett

Comment:

--

UsingGit

@@ -85 +85 @@
 || svn revert -R (for pristine index and working copy) || git reset --hard || applies to entire tree so no filename or directory allowed ||
 
+=== Useful git commands ===
+
 To cherry pick a commit from master to fixes/0.27 (this automatically commits to your local branch):
 {{{
 git checkout fixes/0.27; git cherry-pick -x {commitref} (retrieve commitref hash from git log, e-mail or github history)
 }}}
+Options to use for cherry-pick
+* -s to signoff another person's fix with your name
+* -x append a comment line that says "(cherry picked from commit ...)"
+* -e to edit comment to add ticket number (e.g. Fixes #12345, see below)
+* -n to leave out commit so you can combine multiple cherry-picks into 1 commit.
+
 To see log for specific branch
 {{{
@@ -105 +113 @@
 git commit --author "Full Name <email@address>" -s
 }}}
+When committing a change that closes a ticket, add this to the commit comment, to automatically close the ticket:
+{{{
+Fixes #123456
+}}}
+
 Also, github has a wealth of good information.
 
 == MythTV Git Repositories ==
 
-||= Name =||= mirrored on GitHub =||
+||= Name =||= mirrored on !GitHub =||
 ||buildbot-config||no||
 ||extras||yes||