From: Johannes Schneider <mailings@cedarsoft.com>
To: Javier Domingo <javierdo1@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Making a (quick) commit to another branch
Date: Sat, 27 Apr 2013 23:06:26 +0200 [thread overview]
Message-ID: <517C3DD2.5090007@cedarsoft.com> (raw)
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.
> 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-----
prev parent reply other threads:[~2013-04-27 21:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-27 14:06 Making a (quick) commit to another branch Johannes Schneider
2013-04-27 14:21 ` Javier Domingo
2013-04-27 14:56 ` Patrik Gornicz
2013-04-27 21:06 ` Johannes Schneider [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=517C3DD2.5090007@cedarsoft.com \
--to=mailings@cedarsoft.com \
--cc=git@vger.kernel.org \
--cc=javierdo1@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.