| Thread overview | |||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
February 18, 2012 [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
 | This needs to be reverted: https://github.com/D-Programming-Language/dmd/pull/727 Is there a simple command to do it? _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
Permalink
ReplyFebruary 18, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
 Posted in reply to Walter Bright | git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the trick (the hash being the merge commit). Regards, Alex On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright <walter@digitalmars.com> wrote: > This needs to be reverted: > > https://github.com/D-Programming-Language/dmd/pull/727 > > Is there a simple command to do it? > _______________________________________________ > dmd-internals mailing list > dmd-internals@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-internals _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 18, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Alex | This is the message it gave me: fatal: Commit 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 is a merge but no -m option was given. On 2/18/2012 11:20 AM, Alex wrote: > git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the > trick (the hash being the merge commit). > > Regards, > Alex > > On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright<walter@digitalmars.com> wrote: >> This needs to be reverted: >> >> https://github.com/D-Programming-Language/dmd/pull/727 >> >> Is there a simple command to do it? _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 18, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Walter Bright | Oh, hrm, can you try: git revert -m 1 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 Regards, Alex On Sat, Feb 18, 2012 at 8:26 PM, Walter Bright <walter@digitalmars.com> wrote: > This is the message it gave me: > > fatal: Commit 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 is a merge but no -m option was given. > > > On 2/18/2012 11:20 AM, Alex wrote: >> >> git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the trick (the hash being the merge commit). >> >> Regards, >> Alex >> >> On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright<walter@digitalmars.com> wrote: >>> >>> This needs to be reverted: >>> >>> https://github.com/D-Programming-Language/dmd/pull/727 >>> >>> Is there a simple command to do it? > > _______________________________________________ > dmd-internals mailing list > dmd-internals@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-internals _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 18, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Alex | Eh, I had to make a script that reverted each of the commits that made up the merge in reverse order. Apparently there is no command to revert a commit of commits. On 2/18/2012 11:33 AM, Alex wrote: > Oh, hrm, can you try: git revert -m 1 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 > > Regards, > Alex > > On Sat, Feb 18, 2012 at 8:26 PM, Walter Bright<walter@digitalmars.com> wrote: >> This is the message it gave me: >> >> fatal: Commit 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 is a merge but no -m >> option was given. >> >> >> On 2/18/2012 11:20 AM, Alex wrote: >>> git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the >>> trick (the hash being the merge commit). >>> >>> Regards, >>> Alex >>> >>> On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright<walter@digitalmars.com> >>> wrote: >>>> This needs to be reverted: >>>> >>>> https://github.com/D-Programming-Language/dmd/pull/727 >>>> >>>> Is there a simple command to do it? >> _______________________________________________ >> dmd-internals mailing list >> dmd-internals@puremagic.com >> http://lists.puremagic.com/mailman/listinfo/dmd-internals > _______________________________________________ > dmd-internals mailing list > dmd-internals@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-internals > > _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 18, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Walter Bright | Well, I tried the -m 1 thing locally and it *seemed* to revert all the commits introduced by the merge commit itself. Regards, Alex On Sat, Feb 18, 2012 at 8:49 PM, Walter Bright <walter@digitalmars.com> wrote: > Eh, I had to make a script that reverted each of the commits that made up the merge in reverse order. Apparently there is no command to revert a commit of commits. > > > On 2/18/2012 11:33 AM, Alex wrote: >> >> Oh, hrm, can you try: git revert -m 1 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 >> >> Regards, >> Alex >> >> On Sat, Feb 18, 2012 at 8:26 PM, Walter Bright<walter@digitalmars.com> wrote: >>> >>> This is the message it gave me: >>> >>> fatal: Commit 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 is a merge but no >>> -m >>> option was given. >>> >>> >>> On 2/18/2012 11:20 AM, Alex wrote: >>>> >>>> git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the trick (the hash being the merge commit). >>>> >>>> Regards, >>>> Alex >>>> >>>> On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright<walter@digitalmars.com> wrote: >>>>> >>>>> This needs to be reverted: >>>>> >>>>> https://github.com/D-Programming-Language/dmd/pull/727 >>>>> >>>>> Is there a simple command to do it? >>> >>> _______________________________________________ >>> dmd-internals mailing list >>> dmd-internals@puremagic.com >>> http://lists.puremagic.com/mailman/listinfo/dmd-internals >> >> _______________________________________________ >> dmd-internals mailing list >> dmd-internals@puremagic.com >> http://lists.puremagic.com/mailman/listinfo/dmd-internals >> >> > _______________________________________________ > dmd-internals mailing list > dmd-internals@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-internals _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 18, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Alex | The documentation for -m 1 seemed to say it would only do the most recent ("first") of the commits, not all of them.
On 2/18/2012 11:50 AM, Alex wrote:
> Well, I tried the -m 1 thing locally and it *seemed* to revert all the
> commits introduced by the merge commit itself.
>
> Regards,
> Alex
>
> On Sat, Feb 18, 2012 at 8:49 PM, Walter Bright<walter@digitalmars.com> wrote:
>> Eh, I had to make a script that reverted each of the commits that made up
>> the merge in reverse order. Apparently there is no command to revert a
>> commit of commits.
>>
>>
>> On 2/18/2012 11:33 AM, Alex wrote:
>>> Oh, hrm, can you try: git revert -m 1
>>> 03e8dddc8a53e42d73b04dd23287f206fcc35dd0
>>>
>>> Regards,
>>> Alex
>>>
>>> On Sat, Feb 18, 2012 at 8:26 PM, Walter Bright<walter@digitalmars.com>
>>> wrote:
>>>> This is the message it gave me:
>>>>
>>>> fatal: Commit 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 is a merge but no
>>>> -m
>>>> option was given.
>>>>
>>>>
>>>> On 2/18/2012 11:20 AM, Alex wrote:
>>>>> git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the
>>>>> trick (the hash being the merge commit).
>>>>>
>>>>> Regards,
>>>>> Alex
>>>>>
>>>>> On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright<walter@digitalmars.com>
>>>>> wrote:
>>>>>> This needs to be reverted:
>>>>>>
>>>>>> https://github.com/D-Programming-Language/dmd/pull/727
>>>>>>
>>>>>> Is there a simple command to do it?
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals
| |||
February 19, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
 Posted in reply to Walter Bright | On Sat, 18 Feb 2012 20:49:24 +0100, Walter Bright <walter@digitalmars.com> wrote: > Eh, I had to make a script that reverted each of the commits that made up the merge in reverse order. Apparently there is no command to revert a commit of commits. > > On 2/18/2012 11:33 AM, Alex wrote: >> Oh, hrm, can you try: git revert -m 1 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 >> >> Regards, >> Alex >> >> On Sat, Feb 18, 2012 at 8:26 PM, Walter Bright<walter@digitalmars.com> wrote: >>> This is the message it gave me: >>> >>> fatal: Commit 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 is a merge but no -m >>> option was given. >>> >>> >>> On 2/18/2012 11:20 AM, Alex wrote: >>>> git revert 03e8dddc8a53e42d73b04dd23287f206fcc35dd0 should do the >>>> trick (the hash being the merge commit). >>>> >>>> Regards, >>>> Alex >>>> >>>> On Sat, Feb 18, 2012 at 8:16 PM, Walter Bright<walter@digitalmars.com> >>>> wrote: >>>>> This needs to be reverted: >>>>> >>>>> https://github.com/D-Programming-Language/dmd/pull/727 >>>>> >>>>> Is there a simple command to do it? >>> _______________________________________________ >>> dmd-internals mailing list >>> dmd-internals@puremagic.com >>> http://lists.puremagic.com/mailman/listinfo/dmd-internals >> _______________________________________________ >> dmd-internals mailing list >> dmd-internals@puremagic.com >> http://lists.puremagic.com/mailman/listinfo/dmd-internals >> >> > _______________________________________________ > dmd-internals mailing list > dmd-internals@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-internals git revert -m 0 would have worked. The number indexes the parent branch. Author: Walter Bright <walter@walterbright.com> 2012-02-18 20:04:24 Committer: Walter Bright <walter@walterbright.com> 2012-02-18 20:04:24 0 -> Parent: 992fe402c66b554253ecc8c624a336f6e372e017 (Merge pull request #667 from 9rnsr/fix7406) 1 -> Parent: d56aa5f2aa1bb228511a08b26999022ed62fb19e (fixed Issue 5412) Child: ebee93a3743e10d9826b371c8217f3ab45b1d54b (Revert "fixed Issue 5412") Branches: HideModuleMembers, SpellCorrectSelectiveImports, fix5412, fixImports, fixSpeller, master, remotes/dawg/fix5412, remotes/dawg/fixSpeller, remotes/origin/master Follows: v2.058 Precedes: _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 19, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Martin Nowak | > git revert -m 0 would have worked. > The number indexes the parent branch. > OK indexing starts at 1 and it works for me too. It only creates one commit though. _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
February 19, 2012 Re: [dmd-internals] How do I revert on github | ||||
|---|---|---|---|---|
| ||||
Posted in reply to Martin Nowak | Yeah, it seems like it reverts all of the merged-in commits in one huge go. (arguably beneficial considering the amount of commits...) Regards, Alex On Sun, Feb 19, 2012 at 12:10 AM, Martin Nowak <dawg@dawgfoto.de> wrote: >> git revert -m 0 would have worked. >> The number indexes the parent branch. >> > > OK indexing starts at 1 and it works for me too. It only creates one commit though. > > _______________________________________________ > dmd-internals mailing list > dmd-internals@puremagic.com > http://lists.puremagic.com/mailman/listinfo/dmd-internals _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals | |||
Copyright © 1999-2021 by the D Language Foundation