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

Restore functionality for early gits #7775

Merged
merged 17 commits into from
Oct 12, 2019
Merged

Restore functionality for early gits #7775

merged 17 commits into from
Oct 12, 2019

Commits on Aug 14, 2019

  1. Change tests to make it possible to run TestGit with 1.7.2

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    9a69d80 View commit details
    Browse the repository at this point in the history

  2. Make merge run on 1.7.2

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    9b4fcc7 View commit details
    Browse the repository at this point in the history

  3. Fix tracking and staging branch name problem

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    29758ec View commit details
    Browse the repository at this point in the history

  4. ensure that there is no chance for conflicts

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    bdb32c9 View commit details
    Browse the repository at this point in the history

  5. Fix-up missing merge issues

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    d6841c5 View commit details
    Browse the repository at this point in the history

  6. Ensure that git 1.7.2 works on tests

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    f501939 View commit details
    Browse the repository at this point in the history

  7. Final rm

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    04c67ed View commit details
    Browse the repository at this point in the history

  8. Ensure LFS filters run on the tests

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    afca25d View commit details
    Browse the repository at this point in the history

  9. Do not sign commits from temp repo

    @zeripath
    zeripath committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    709c48b View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2019

  1. Merge branch 'master' into fix-7754-Make-merge-work-on-1.7.2

    @zeripath
    zeripath committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    da76fa2 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. Merge branch 'master' into fix-7754-Make-merge-work-on-1.7.2

    @zeripath
    zeripath committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    c456747 View commit details
    Browse the repository at this point in the history

  2. Restore tracking fetch change

    @zeripath
    zeripath committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    215b8a1 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review

    @zeripath
    zeripath authored Oct 9, 2019
    Configuration menu
    Copy the full SHA
    eca4132 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. Update modules/repofiles/temp_repo.go

    @zeripath
    zeripath authored Oct 10, 2019
    Configuration menu
    Copy the full SHA
    5169165 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. Merge branch 'master' into fix-7754-Make-merge-work-on-1.7.2

    @lunny
    lunny authored Oct 11, 2019
    Configuration menu
    Copy the full SHA
    ab08f15 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fix-7754-Make-merge-work-on-1.7.2

    @lafriks
    lafriks authored Oct 11, 2019
    Configuration menu
    Copy the full SHA
    bf0d659 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fix-7754-Make-merge-work-on-1.7.2

    @zeripath
    zeripath authored Oct 11, 2019
    Configuration menu
    Copy the full SHA
    7c0fc09 View commit details
    Browse the repository at this point in the history