[PATCH] winsup/doc/dll.xml: update MinGW/.org to MinGW-w64/.org

ASSI Stromeko@nexgo.de
Mon Mar 8 20:52:56 GMT 2021

Ken Brown via Cygwin-patches writes:
> If the unfinished business consists of local commits that haven't yet
> been applied upstream, then I typically do the following:
> git fetch  # Find out if upstream has changed since my last pull.  If so...
> git format-patch -n  # save n local commits
> git reset --hard origin/master
> git am 00*  # reapply my local commits
> This assumes I've been too lazy to work on a separate branch, which is
> often the case for small changes.

git branch local # optional
git rebase origin/master
git branch -D local # once you know you don't need it anymore

… does more or less the same thing.

I usually skip the safety branch since I can pull it from the reflog if
needed and it's unlikely I'll trigger a GC just that moment.

+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf microQ V2.22R2:

More information about the Cygwin-patches mailing list