* Accidental merge
@ 2010-03-23 12:52 Sebastian Spaeth
2010-03-23 13:34 ` Marcin Juszkiewicz
0 siblings, 1 reply; 3+ messages in thread
From: Sebastian Spaeth @ 2010-03-23 12:52 UTC (permalink / raw)
To: openembedded-devel
Uhh, I just accidentally pushed a merge
a501f95529d16fad725b58c241047bde63825cbf, I did not know I have in my
tree. Not even know what the ancestors of that merge were, would it be
possible for someone with git knowledge to revert that merge?
That would be great, thanks
Sebastian
P.S. I'll look into how to revert that myself, but that might take a while.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Accidental merge
2010-03-23 12:52 Accidental merge Sebastian Spaeth
@ 2010-03-23 13:34 ` Marcin Juszkiewicz
2010-03-23 15:19 ` Sebastian Spaeth
0 siblings, 1 reply; 3+ messages in thread
From: Marcin Juszkiewicz @ 2010-03-23 13:34 UTC (permalink / raw)
To: openembedded-devel
Dnia wtorek, 23 marca 2010 o 13:52:58 Sebastian Spaeth napisał(a):
> Uhh, I just accidentally pushed a merge
> a501f95529d16fad725b58c241047bde63825cbf, I did not know I have in my
> tree. Not even know what the ancestors of that merge were, would it be
> possible for someone with git knowledge to revert that merge?
For future: "git pull --rebase" please to not create merge commits.
Regards,
--
JID: hrw@jabber.org
Website: http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Accidental merge
2010-03-23 13:34 ` Marcin Juszkiewicz
@ 2010-03-23 15:19 ` Sebastian Spaeth
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Spaeth @ 2010-03-23 15:19 UTC (permalink / raw)
To: Marcin Juszkiewicz, openembedded-devel
> For future: "git pull --rebase" please to not create merge commits.
Right. Point taken. Actually the merge was not wrong or horrible in the
end, I was just scared by the very bg diffstat I was seeing. Still, I
should have rebased before pushing. My apologies.
spaetz
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-23 15:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-23 12:52 Accidental merge Sebastian Spaeth
2010-03-23 13:34 ` Marcin Juszkiewicz
2010-03-23 15:19 ` Sebastian Spaeth
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.