Re: [GIT PULL 0/3] arm-soc updates
On Mon, Aug 13, 2012 at 11:58 AM, Sascha Hauer wrote: > Hi Arnd, > > On Fri, Aug 10, 2012 at 09:06:12PM +0200, Arnd Bergmann wrote: >> Hi Linus, >> >> Here are three pull requests for you to consider for the next -rc. > > How do you send multiple pull requests? Is there some git foo available > or do you do this manually? For truly trivial multi-branch pulls, I just generate each individually. For the merge windows we tend to have several branches touching the same files, so diffstats would be harder to compare that way. So, this is my workflow. I think Arnd's is quite similar since my script is based on an early version of what I got from him: * Start a dummy branch based on latest upstream version * For each branch to pull: - Merge in the branch to make sure you document/resolve conflicts - Generate pull request email (save to file) - Push resolved branch (if you want to provide that) * Edit the saved pull requests to modify the x/y fields * Send them (with git send-mail --annotate for cover letter) I have a script that generates the pull-request email in a format that git send-email accepts (i.e. it has a From/Subject header). It's not very pretty, but for reference I included a copy below. #!/bin/sh # Usage: my-request-pull , run from a branch that is checked out # with the branch you wish to request pulled merged in as the top commit. echo "From: $(git config --get user.name) <$(git config --get user.email)>" echo -n Subject: [GIT PULL x/y]\ git tag -n20 -l $1 | sed -e 's:^[-a-z0-9]* *::g' echo echo "" echo SHA=$(git log --pretty=oneline -1 HEAD~ | cut -d' ' -f 1) DESC=$(git log --pretty=oneline -1 HEAD~ | cut -d' ' -f 1 --complement) echo "The following changes since commit $SHA:" echo echo " $DESC" echo echo "are available in the git repository at:" echo echo " git://EDIT_YOUR_URL_IN_HERE tags/$1" echo SHA=$(git log --pretty=oneline -1 $1 | cut -d' ' -f 1) DESC=$(git log --pretty=oneline -1 $1 | cut -d' ' -f 1 --complement) echo "for you to fetch changes up to $SHA:" echo echo " $DESC" echo echo "" echo git shortlog HEAD~..$1 echo git diff -M --stat=75 --summary HEAD~ | cat -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 0/3] arm-soc updates
Hi Arnd, On Fri, Aug 10, 2012 at 09:06:12PM +0200, Arnd Bergmann wrote: > Hi Linus, > > Here are three pull requests for you to consider for the next -rc. How do you send multiple pull requests? Is there some git foo available or do you do this manually? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 0/3] arm-soc updates
Hi Arnd, On Fri, Aug 10, 2012 at 09:06:12PM +0200, Arnd Bergmann wrote: Hi Linus, Here are three pull requests for you to consider for the next -rc. How do you send multiple pull requests? Is there some git foo available or do you do this manually? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT PULL 0/3] arm-soc updates
On Mon, Aug 13, 2012 at 11:58 AM, Sascha Hauer s.ha...@pengutronix.de wrote: Hi Arnd, On Fri, Aug 10, 2012 at 09:06:12PM +0200, Arnd Bergmann wrote: Hi Linus, Here are three pull requests for you to consider for the next -rc. How do you send multiple pull requests? Is there some git foo available or do you do this manually? For truly trivial multi-branch pulls, I just generate each individually. For the merge windows we tend to have several branches touching the same files, so diffstats would be harder to compare that way. So, this is my workflow. I think Arnd's is quite similar since my script is based on an early version of what I got from him: * Start a dummy branch based on latest upstream version * For each branch to pull: - Merge in the branch to make sure you document/resolve conflicts - Generate pull request email (save to file) - Push resolved branch (if you want to provide that) * Edit the saved pull requests to modify the x/y fields * Send them (with git send-mail --annotate for cover letter) I have a script that generates the pull-request email in a format that git send-email accepts (i.e. it has a From/Subject header). It's not very pretty, but for reference I included a copy below. #!/bin/sh # Usage: my-request-pull tagname, run from a branch that is checked out # with the branch you wish to request pulled merged in as the top commit. echo From: $(git config --get user.name) $(git config --get user.email) echo -n Subject: [GIT PULL x/y]\ git tag -n20 -l $1 | sed -e 's:^[-a-z0-9]* *::g' echo echo echo SHA=$(git log --pretty=oneline -1 HEAD~ | cut -d' ' -f 1) DESC=$(git log --pretty=oneline -1 HEAD~ | cut -d' ' -f 1 --complement) echo The following changes since commit $SHA: echo echo $DESC echo echo are available in the git repository at: echo echo git://EDIT_YOUR_URL_IN_HERE tags/$1 echo SHA=$(git log --pretty=oneline -1 $1 | cut -d' ' -f 1) DESC=$(git log --pretty=oneline -1 $1 | cut -d' ' -f 1 --complement) echo for you to fetch changes up to $SHA: echo echo $DESC echo echo echo git shortlog HEAD~..$1 echo git diff -M --stat=75 --summary HEAD~ | cat -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL 0/3] arm-soc updates
Hi Linus, Here are three pull requests for you to consider for the next -rc. The first one is our regular bug fix series, this time with a lot of patches fixing build regressions. Please pull at least this one. The other two are things that fell through the cracks in the v3.6 merge window because of communication problems between the arm-soc team and our downstream maintainers. Neither of them is important, but applying them should also be harmless. If you feel like making an exception, please have a look and consider merging them as well, but don't worry about them otherwise. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT PULL 0/3] arm-soc updates
Hi Linus, Here are three pull requests for you to consider for the next -rc. The first one is our regular bug fix series, this time with a lot of patches fixing build regressions. Please pull at least this one. The other two are things that fell through the cracks in the v3.6 merge window because of communication problems between the arm-soc team and our downstream maintainers. Neither of them is important, but applying them should also be harmless. If you feel like making an exception, please have a look and consider merging them as well, but don't worry about them otherwise. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
