• gedhrel@lemmy.ml
      link
      fedilink
      arrow-up
      1
      ·
      1 year ago

      rerere is a lifesaver here.

      (I’m also a fan of rebasing; but I also like to land commits that perform a logical and separable chunk of work, because I like history to have decent narrative flow.)