On Sat, Jan 20, 2024 at 2:24 PM Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx> wrote: > On Fri, Jan 19, 2024, at 06:59, brianmlyles@xxxxxxxxx wrote: > > From: Brian Lyles <brianmlyles@xxxxxxxxx> > > ---keep-redundant-commits:: > > - If a commit being cherry picked duplicates a commit already in the > > - current history, it will become empty. By default these > > - redundant commits cause `cherry-pick` to stop so the user can > > - examine the commit. This option overrides that behavior and > > - creates an empty commit object. Note that use of this option only > > +--empty=(stop|drop|keep):: > > + How to handle commits being cherry-picked that are redundant with > > + changes already in the current history. > > ++ > > +-- > > Trailing whitespace on this line. Thank you -- This will be corrected with v2. Is the sample pre-commit hook the ideal way to prevent this in the future? Or is there some config I could set globally to enforce this across repositories? I was having a little trouble finding a good way to accomplish this globally. Thanks, Brian Lyles
