Hi Stefano, * Stefano Lattarini wrote on Wed, Jul 14, 2010 at 03:51:05PM CEST: > Independently from the fact that you give or not your OK to this > particular patch, I'd like to know if the following procedure is > correct for the pushing of simple patches which should go into > both maint and master:
Yes, with the following minor changes: 0. Install and configure the git-merge-changelog program (get it from gnulib, look at its source code header for instructions how to use it). > 1. Checkout the "maint" branch on my local repos: > $ git co maint If "co" is a short-hand command alias for checkout, then yes. > 2. Apply the patch(es) with "git am": > $ git am 0*.patch Use "git am -3" for a better user experience in the presence of not- quite-matching changes. > 2a. (Run required tests, if any) > 3. Merge maint into master: > $ git co master && git merge maint I'd first merge it into branch-1.11: git checkout branch-1.11 git merge maint then into master. BTW, my informal way of merging has been to merge to merge maint without --log but merge feature branches with --log; rationale is that feature branches may have patches which are not quite new in relation to other patches, and thus 'git log' may not have them show up early in the list. > 3a. (Run required tests, if any) > 4. Push the maint and master branches: > $ push --dry-run origin master maint # and if all seems ok ... > $ push origin master maint git push --dry-run origin master maint branch-1.11 Cheers, and sorry again for delaying all of your patches for so long, Ralf
