From: "Martin Ågren" <martin.agren@gmail.com>
To: Ani Sinha <ani@anirban.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Cherry pick a commit but with files in another location
Date: Mon, 13 Apr 2020 07:43:35 +0200 [thread overview]
Message-ID: <CAN0heSp+Lmyx=eGjjioCYc6dmncz4Dcwo-MCsfMMKbP6vKdOzQ@mail.gmail.com> (raw)
In-Reply-To: <AE1E8050-EF04-47A0-96E0-27EEC4A0C013@anirban.org>
On Sat, 11 Apr 2020 at 15:25, Ani Sinha <ani@anirban.org> wrote:
>
> > On Apr 11, 2020, at 6:13 PM, Martin Ågren <martin.agren@gmail.com> wrote:
> >
> > Do you use "git cherry-pick", "git am" or "git apply"?
>
> Yes
I still don't understand exactly what it is you're doing.
> > (Or
> > something else entirely?) Are you aware of "-p<n>" for "git apply"
> > (and "--directory=<root>"?) and are wondering what similar options are
> > available with "git cherry-pick"?
>
> Yes was wondering if similar options exist for cherry pick. I wanted
> to use cherry-pick so that cherry picks can be tracked by git.
Are you working on some repo that is publicly available, e.g., on
github/gitlab? If so, you could post a link.
What is it that you try doing? You could post the commands you execute.
What happens? You could post error messages.
What do you expect *should* happen? You could try to describe your
expectations.
Without that kind of information, it is unfortunately hard to help you.
One final thought: Have you actually tried cherry-picking the way you
want to, and have you actually encountered a problem? Or are you looking
for solutions to a problem that you're not sure you're having?
Martin
prev parent reply other threads:[~2020-04-13 5:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-11 11:21 Cherry pick a commit but with files in another location Ani Sinha
2020-04-11 12:21 ` Martin Ågren
[not found] ` <b26f041f-82d5-450f-998d-5a5c557a7994@Spark>
2020-04-11 12:42 ` Martin Ågren
2020-04-11 13:25 ` Ani Sinha
2020-04-13 5:43 ` Martin Ågren [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN0heSp+Lmyx=eGjjioCYc6dmncz4Dcwo-MCsfMMKbP6vKdOzQ@mail.gmail.com' \
--to=martin.agren@gmail.com \
--cc=ani@anirban.org \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).