Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ADD] Support specifying a pin for merges #73

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[ADD] Support specifying a pin for merges #73

wants to merge 3 commits into from

Commits on Jul 22, 2023

  1. new: support annotated tags as merge source (fixes acsone#27, fixes a… 

    …csone#28)

Avoids also contacting twice (``fetch`` and then ``pull``) remote before
merging.

Signed-off-by: Valentin Lab <[email protected]>
    @vaab @thomaspaulb
    vaab authored and thomaspaulb committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    5604714 View commit details
    Browse the repository at this point in the history

  2. [FIX] pre-commit, tests

    @thomaspaulb
    thomaspaulb committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    b1a61a4 View commit details
    Browse the repository at this point in the history

  3. Support specifying a pin for merges

    @janverb @thomaspaulb
    janverb authored and thomaspaulb committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    89db99c View commit details
    Browse the repository at this point in the history