2012/2/13 Pavel Březina <pbrez...@redhat.com> > Dne 13.2.2012 14:14, Stephen Gallagher napsal(a): > > On Mon, 2012-02-13 at 14:10 +0100, Pavel Březina wrote: >> >>> Dne 13.2.2012 14:05, Stephen Gallagher napsal(a): >>> >>>> On Mon, 2012-02-13 at 13:58 +0100, Pavel Březina wrote: >>>> >>>>> Hi, >>>>>>> Ok, I understand and agree. >>>>>>> >>>>>>> Now it's time for a second lesson of git :-) >>>>>>> How can I correct the patch? What steps do I have to follow? >>>>>>> re-clone from scratch? Editing the file again produce me a diff with >>>>>>> modified only one file... >>>>>>> >>>>>> >>>>>> >>>>>> Modify the file. Then do a 'git add<file>'. Then instead of doing >>>>>> regular 'git commit', you can do 'git commit --amend'. This will add >>>>>> the >>>>>> changes you just made to the previous commit in the list. Now just >>>>>> 'git >>>>>> format-patch -M -C --patience --full-index -1' and you'll have a new >>>>>> patch with all of your changes. >>>>>> >>>>>> This process gets a little trickier if you have made other patches and >>>>>> commits in the tree since the one you want to edit. In that case, >>>>>> you'll >>>>>> want to learn the "ins and outs" of 'git rebase -i', but that's a much >>>>>> longer lesson. If you get to a point where you need to do that, I >>>>>> recommend joining us on IRC so we can walk you through it for the >>>>>> first >>>>>> time. We hang around on #sssd on irc.freenode.net. >>>>>> >>>>> >>>>> Also if you are interested in git, I suggest you to read Pro Git by >>>>> Scott Chacon. It is a great book, available for free at >>>>> http://progit.org/ >>>>> >>>>> The aforementioned problematic is described in section 7.4. >>>>> >>>> >>>> Just to avoid confusion, Pavel meant to say "section 6.4". >>>> >>> >>> No, I didn't :) >>> In the version that is currently available is "7.4. Rewriting History". >>> >> >> I'm looking at the web version here: http://progit.org/book/ >> Says 6.4 :) >> > > Alright, I used the pdf :) > The web version is missing the introduction chapter :)
Ok, I will give it a look. Thanks Marco
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/sssd-devel
