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 merge files files to GetCommitFileStatus #20515

Merged
merged 6 commits into from
Aug 24, 2023
Merged

Add merge files files to GetCommitFileStatus #20515

merged 6 commits into from
Aug 24, 2023

Commits on May 14, 2023

  1. Fix GetCommitFileStatus on merge commit 

    Add new test repo repo6_merge
    @tdesveaux
    tdesveaux committed May 14, 2023
    Configuration menu
    Copy the full SHA
    637125c View commit details
    Browse the repository at this point in the history

  2. remove unnecessary files from git module test repo6

    @tdesveaux
    tdesveaux committed May 14, 2023
    Configuration menu
    Copy the full SHA
    63d43a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Merge remote-tracking branch 'origin/main' into fix/GetCommitFileStat… 

    …us/merges
    @tdesveaux
    tdesveaux committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    7aad4dc View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Merge remote-tracking branch 'origin/main' into fix/GetCommitFileStat… 

    …us/merges
    @tdesveaux
    tdesveaux committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    c092046 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge remote-tracking branch 'gitea/main' into dontnod_diffmerges_for… 

    …_api_commits
    @tdesveaux
    tdesveaux committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    801f9b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into dontnod_diffmerges_for_api_commits

    @tdesveaux
    tdesveaux authored Aug 24, 2023
    Configuration menu
    Copy the full SHA
    9530f97 View commit details
    Browse the repository at this point in the history