Re: using git

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

On 01/11/2012 01:26 PM, Kurt Van Dijck wrote:
>>> nitpick:
>>> Oliver, please don't forget to add your S-o-b if you are pushing commits
>>> to the tree.
>>
>>
>> Yes. I noticed myself, that i need to improve this process by reading more git
>> documentation ;-)
>>
>> Yesterday i just cherry-picked the patch and pushed it to the repo.
>>
>> The next time i'll do it the right(TM) way :-)
> 
> Oliver or Marc,
> 
> just out of curiosity,
> what would be the right(TM) way?

3 possibilities:

1) merge your tree:
(if it only contains the patch we want)

git checkout master
git merge tree-of-kvd/branch-name
git push origin master

2) cherry pick

git checkout master
git cherry-pick -s commitish-of-patch  # -s automatically adds the S-o-b
git push origin master

3) apply patch

git checkout master
git am -s /path/to/patch               # -s automatically adds the S-o-b
git push origin master


For solution 1 and 2 you need Kurt's tree in your local repo (git remote
add).

Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]