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

fix(cli): fix mergetool committing more than .gitattributes #3013

Merged
merged 5 commits into from Jul 14, 2022
Merged

fix(cli): fix mergetool committing more than .gitattributes #3013

merged 5 commits into from Jul 14, 2022

Commits on Jul 12, 2022

  1. fix(cli): fix mergetool committing more than .gitattributes

    @Panaetius
    Panaetius committed Jul 12, 2022
    Copy the full SHA
    0a517be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/fix-mergetool-commit-paths

    @Panaetius
    Panaetius committed Jul 12, 2022
    Copy the full SHA
    8a67202 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into bugfix/fix-mergetool-commit-paths

    @Panaetius
    Panaetius committed Jul 12, 2022
    Copy the full SHA
    c09d318 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. Merge branch 'develop' into bugfix/fix-mergetool-commit-paths

    @Panaetius
    Panaetius committed Jul 13, 2022
    Copy the full SHA
    d6ed4af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/fix-mergetool-commit-paths

    @m-alisafaee
    m-alisafaee committed Jul 13, 2022
    Copy the full SHA
    b5ca0b1 View commit details
    Browse the repository at this point in the history