[Bug 262148] devel/git-review: Fails to run with git >= 2.3.40: fatal: --preserve-merges was replaced by --rebase-merges

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262148

Kubilay Kocak <koobs@FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
              Flags|maintainer-feedback-        |maintainer-feedback?(dereck
                   |                            |son@gmail.com)

--- Comment #5 from Kubilay Kocak <koobs@FreeBSD.org> ---
(In reply to dereckson from comment #4)

Note its preferable to fix bugs only and separately in quarterly (where
possible), independently of whether a new release is available or not, such
that changes can be minimized in quarterly, unless those later release(s) are
also bugfix *only*, in which case, they can and should be merged also.

^Triage: Maintainer feedback provided (set to +). This is separate from patch
approval.

If every release between port current version and latest (2.2.0) are bugfixes
only, we can depend on bug 262164, otherwise the patch here is more appropriate
to  commit and merge first, before and separately from the version update.

@Maintainer Can you clarify the nature of all releases after the current port
version (bugfix only or additional features as well?)

-- 
You are receiving this mail because:
You are the assignee for the bug.