Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git-up/GitUp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.4.0
Choose a base ref
...
head repository: git-up/GitUp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.4.1
Choose a head ref
  • 10 commits
  • 222 files changed
  • 2 contributors

Commits on Mar 11, 2024

  1. Configuration menu
    Copy the full SHA
    2b25022 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Configuration menu
    Copy the full SHA
    8977eab View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Move the contents of _didBecomeActive into a main queue async dispa…

    …tch (#993)
    
    So `NSApplicationDidBecomeActiveNotification` isn't blocked so command-tabbing into GitUp isn't delayed because we're refreshing all the repositories synchronously. The work will still be done on the main thread, but it will now be less likely to be noticed (especially with Stage Manager activated, the reload will probably be done by the time the Stage Manager animation is done)
    lapfelix authored Apr 22, 2024
    Configuration menu
    Copy the full SHA
    db2e97f View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Specify initial_head when initializing a repository for tests so th…

    …e global git config doesn't make it fail (#988)
    lapfelix authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    aabbc8a View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. Create a test for rebaseBranch (with a basic conflict) (#989)

    * Create `rebaseBranch` tests and move `resolveConflictsWithResolver` method into GCLiveRepository category
    
    * Reorganize rebase tests to include a simple rebase, one with conflict and one with multiple commits and conflicts (the last one fails with the current version)
    
    * Add GCLiveRepository+Conflicts.m to the iOS GitUpKit target
    
    * Fix release compilation by making GCLiveRepository+Conflicts.h public
    lapfelix authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    498bf96 View commit details
    Browse the repository at this point in the history
  2. Add and implement kGCCheckoutOption_RemoveUntrackedFiles (#990)

    ...to fix issue where untracked files are left behind after forceCheckoutHEAD is called during a rebase
    lapfelix authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    795843e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b7a1da7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9cae310 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Migrate to Sparkle 1.27.3

    Add SUPubliceEDKey to Info plist
    lucasderraugh committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    a0945e1 View commit details
    Browse the repository at this point in the history
  2. Bump to 1.4.1

    lucasderraugh committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    08bab3e View commit details
    Browse the repository at this point in the history
Loading