From: Sandra Snan <sandra.snan@idiomdrottning.org>
To: git@vger.kernel.org
Subject: getting git send-email patches from someone who is behind
Date: Fri, 08 Dec 2023 18:50:31 +0100 [thread overview]
Message-ID: <87h6ksk2hk.fsf@ellen.idiomdrottning.org> (raw)
I have a li'l git send-email question. Someone sent me a patch set
of six patches today but they were not on most current main. I had
to guess what version they were sending to so I could git am when
I was on that particular version. I managed to sort it all out so
this question is more for future reference.
Isn't there a way inside of the emails that it can show what
version to apply the patches to?
Because now I was like "OK, I remember talking to them the other
day and that means they probably are on what for me is HEAD^^" and
that turned out to be correct, and sorting out the conflicts was
also easy enough,
but if I hadn't talked to them beforehand I would've been
completely lost.
I asked another friend about it and he said:
> it's possible to record the base commit:
> https://git-scm.com/docs/git-format-patch#_base_tree_information
> however, it's a bit finicky to do with git-send-email
I dunno.
I get that one of the fun parts about using patches instead of PRs
is
that you can be a li'l more loosey goosey about exactly what
commit
something is supposed to belong to but here I would've been
completely
lost because the patchset just borked horribly right from the
first patch.
If others have run into this, what's the solution?
next reply other threads:[~2023-12-08 17:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 17:50 Sandra Snan [this message]
2023-12-08 18:49 ` getting git send-email patches from someone who is behind Konstantin Ryabitsev
2023-12-08 18:57 ` Sandra Snan
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=87h6ksk2hk.fsf@ellen.idiomdrottning.org \
--to=sandra.snan@idiomdrottning.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox