Use git commit --amend to fix if you haven't committed the second one yet. Use git rebase -i to squash existing commits together.
> On Nov 23, 2015, at 13:45, Jörg F. Wittenberger > <joerg.wittenber...@softeyes.net> wrote: > > Sorry, > > this patch needs a patch. > > Looks like I shot myself into the foot (using git) again the very same > way. (Looks like "git add" caches the changes, thus must be given not > once per file but once I'm done changing things.) > > Now I'm a bit lost. How would I format a proper patch for git with both > these changes rolled into one? > > Anyway, attached "part two" of the change. This adds more tests and > fixed mutex-unlock! the way it should have been done before. > > Best > > /Jörg > >> Am 23.11.2015 um 17:29 schrieb Jörg F. Wittenberger: >> Hi all, >> >>> Am 07.11.2015 um 21:55 schrieb "Jörg F. Wittenberger": >>> Hi, >>> >>> try the test case: >> >> looks like I messed up with this one. (I sent out half the patch.) > > <0002-mutexlock-p2.patch> > _______________________________________________ > Chicken-hackers mailing list > Chicken-hackers@nongnu.org > https://lists.nongnu.org/mailman/listinfo/chicken-hackers _______________________________________________ Chicken-hackers mailing list Chicken-hackers@nongnu.org https://lists.nongnu.org/mailman/listinfo/chicken-hackers