If you want to send code patches to your coworkers you don’t need to do strange things with different tools. Git has all the neccesary tools for handling this in a pretty way. The idea is generate a patch from git and send to your coworker via email. After received the message they can import those messages directly into git. Let’s see how all this works.
Git has the tool git format-patch for autogenerate the patches for a revision range. For example, for generating patches from all the commits diverged from the origin branch you can issue at your terminal:
$ git format-patch origin
This will produce a series of numbered files in the current directory, one for each commit in the current branch but not in origin/HEAD. You can specify commit hashes or even commit hash ranges:
$ git format-patch 844f1c9ab34302ccb92b00cb02c5afbb8e799ad9..888624fc2c6dd50588d9cd33511048168309972c
The previous command will generate a patch file with the name of the commit:
You can then import these into your mail client and send them by hand. However, if you have a lot to send at once, you may prefer to use the git send-email script to automate the process.
$ git send-email *.patch 0001-Updated-Spanish-and-Galician-translations.patch The following files are 8bit, but do not declare a Content-Transfer-Encoding. 0001-Updated-Spanish-and-Galician-translations.patch Which 8bit encoding should I declare [UTF-8]? Who should the emails appear to be from? [Fran Diéguez <firstname.lastname@example.org>] Emails will be sent from: Fran Diéguez <email@example.com> Who should the emails be sent to? firstname.lastname@example.org Message-ID to be used as In-Reply-To for the first email? [...]
After a couple of questions about who to send, who sends the email… your patch files will be automatically sended to the destination.
By default git uses the deep threading format, which looks somewhat like this:
foobar patch 0 +-foobar patch 1 +-foobar patch 2 | +-foobar patch 3 | +-foobar patch 4 | | +-foobar patch 5 | +-comment on patch 3 +-comment on patch 1
This is very unconformatalbe, specially for very big patch series. That’s why for v1.7.0 the default format would be the shallow one:
foobar patch 0 (usually a summary/overview) +-foobar patch 1 | +-comment on patch 1 +-foobar patch 2 +-foobar patch 3 | +-comment on patch 3 +-foobar patch 4 +-foobar patch 5
So, if you want to change the format to the last one, all you have to do is:
git config --global sendemail.chainreplyto false Ask in your mailing list first to determine how they prefer such patches be handled.
For the other hand Git also provides a tool called git am (am stands for “apply mailbox”). With this tool you can import such emailed series of patches. Just save all of the patch-containing messages, in order, into a single mailbox file, say “patches.mbox”, then run
$ git am -3 patches.mbox
Git will apply each patch in order; if any conflicts are found, it will stop, and you can manually fix the conflicts and resolve the merge. (The “-3” option tells git to perform a merge; if you would prefer it just to abort and leave your tree and index untouched, you may omit that option.) Once the index is updated with the results of the conflict resolution, instead of creating a new commit, just run
$ git am --resolved
and git will create the commit for you and continue applying the remaining patches from the mailbox. The final result will be a series of commits, one for each patch in the original mailbox, with authorship and commit log message taken from the message containing each patch.