Re: Making a (quick) commit to another branch

From: Johannes Schneider <mailings@cedarsoft.com>
Date: Apr 27, 2013, 21:06 UTC
Message-ID: <517C3DD2.5090007@cedarsoft.com>
In-Reply-To: <CALZVap=9Z=0DPM1fNwotn3sN-W7mXMPRSJ2aY5jzkQTBD6v=Kw@mail.gmail.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 27.04.2013 16:21, Javier Domingo wrote:

> I would first recommend you, instead of cherry-picking the commit,
> you did this: -- stash -- go to the master branch -- fix the line 
> -- commit the fix -- got to the feature branch -- unstash

Yeah, of course u are right.

Thanks for pointing that out - saves me a few key strokes.

Show 5 quoted lines

> As when you merge with master, git will carry on with the changes.
> I don't see the need to cherry pick that commit.
> 
> Javier Domingo
>

- -- 
Johannes Schneider - blog.cedarsoft.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAEBAgAGBQJRfD3SAAoJEAytD9R7Qv6duWgH/2BIIuTP0FJTR9Duli+jyzd4 dIicrkwuCCELiOe3XQ2vSgxxr0nUI52Vn0uCRaXwXJqz466/55PGvpNb/COnLUm0 sSDXbQFVPZtb38AZIQvz844pzb5R9DMujp5g/3oA146x7LscPvrWmtSCK6mlGDa5 bm9LUdULP9eMEJ1aJaqDYEDQ/vY/rS/66/c7G2+A1EysxIlW3t3aXLSosv/BGjbF l2RyHFeV0RsreeA+Aa1ZJoyheMqkDCVKijo/xfBnz7m9OFj12g1moSheD7p2hDJh UHQU4d9qrHmFcUAhkMe9wIP8Opr98Q7GZOq03p5DaWzWggV2HPcrP8rkmARx2Q8= =9I4w -----END PGP SIGNATURE-----