* [RFH] how to know if a cherry-picked patch has been applied already?
@ 2008-01-11 10:47 Michal Vitecek
2008-01-11 12:12 ` Johannes Schindelin
2008-01-11 12:14 ` Peter Baumann
0 siblings, 2 replies; 3+ messages in thread
From: Michal Vitecek @ 2008-01-11 10:47 UTC (permalink / raw)
To: git list
Hello everyone,
I'm managing a git repository where I include my and my co-workers'
work. With some co-workers I can use 'git merge' but with some I use
'git cherry-pick'. However, cherry-picking leads to problems because a
new commit ID is generated and I must remember which patches I have
cherry-picked to my tree. Is there any easy way to tell which patches
have and have not been applied?
Thanks,
Michal
--
fuf (fuf@mageo.cz)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [RFH] how to know if a cherry-picked patch has been applied already?
2008-01-11 10:47 [RFH] how to know if a cherry-picked patch has been applied already? Michal Vitecek
@ 2008-01-11 12:12 ` Johannes Schindelin
2008-01-11 12:14 ` Peter Baumann
1 sibling, 0 replies; 3+ messages in thread
From: Johannes Schindelin @ 2008-01-11 12:12 UTC (permalink / raw)
To: Michal Vitecek; +Cc: git list
Hi,
On Fri, 11 Jan 2008, Michal Vitecek wrote:
> Is there any easy way to tell which patches have and have not been
> applied?
If the patches are not too different, "git log --cherry-pick a...b" (note
the three dots instead of two) shows only those patches in b that are not
yet in a.
Hth,
Dscho
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFH] how to know if a cherry-picked patch has been applied already?
2008-01-11 10:47 [RFH] how to know if a cherry-picked patch has been applied already? Michal Vitecek
2008-01-11 12:12 ` Johannes Schindelin
@ 2008-01-11 12:14 ` Peter Baumann
1 sibling, 0 replies; 3+ messages in thread
From: Peter Baumann @ 2008-01-11 12:14 UTC (permalink / raw)
To: Michal Vitecek; +Cc: git list
On Fri, Jan 11, 2008 at 11:47:37AM +0100, Michal Vitecek wrote:
> Hello everyone,
>
> I'm managing a git repository where I include my and my co-workers'
> work. With some co-workers I can use 'git merge' but with some I use
> 'git cherry-pick'. However, cherry-picking leads to problems because a
> new commit ID is generated and I must remember which patches I have
> cherry-picked to my tree. Is there any easy way to tell which patches
> have and have not been applied?
>
> Thanks,
> Michal
Have a look at the manpage of git-cherry, which will tell you if you
already applied a commit/patch.
-Peter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-01-11 12:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-11 10:47 [RFH] how to know if a cherry-picked patch has been applied already? Michal Vitecek
2008-01-11 12:12 ` Johannes Schindelin
2008-01-11 12:14 ` Peter Baumann
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).