From: Chris Packham <judge.packham@gmail.com>
To: GIT <git@vger.kernel.org>
Subject: Getting a list of commits between 2 points without upstream changes
Date: Mon, 18 Jul 2011 11:49:57 +1200 [thread overview]
Message-ID: <CAFOYHZC5hQ9JV8a5d20AaPR_eYFDViama+4148MPumvvJ-n6wQ@mail.gmail.com> (raw)
Hi List,
I'm trying to send round an incremental changelog for my project which
contains just my changes without changes that have been made upstream.
The history look something like this.
---o--o--o--o--o--o--o--o-- upstream
\ \ \
\-m--A--m--B--m--C--D-- topic
What I want is a changelog with just B, C and D in it (i.e. no merge
commits and no commits already in upstream). I know if I wanted A,B,C
and D I could just do 'git log --no-merges upstream..topic'. If I do
'git log --no-merges B..topic' I get the merged commits from upstream.
In set-speak what I think want is the union of upstream..topic and
B..topic.
Is there any existing way to achieve this? I'm happy to hack something
up using git rev-list if necessary.
Thanks,
Chris
next reply other threads:[~2011-07-17 23:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 23:49 Chris Packham [this message]
2011-07-18 0:17 ` Getting a list of commits between 2 points without upstream changes Jeff King
2011-07-18 0:33 ` Chris Packham
2011-07-18 1:28 ` Jeff King
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=CAFOYHZC5hQ9JV8a5d20AaPR_eYFDViama+4148MPumvvJ-n6wQ@mail.gmail.com \
--to=judge.packham@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).