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

show both staged and unstaged changes for a file #629

Merged
merged 10 commits into from
Jun 14, 2020
Merged

show both staged and unstaged changes for a file #629

merged 10 commits into from
Jun 14, 2020

Commits on May 25, 2020

  1. show staged and unstaged changes to the same file 

    previously if you add staged a file and then made subsequent changes to it then the file will only show up in the staged files list. This adds another option to the Status used internally that notes when a file has both staged and unstaged changes and modifies the filelist to account for this.
    @ianhi
    ianhi committed May 25, 2020
    Configuration menu
    Copy the full SHA
    bdafa21 View commit details
    Browse the repository at this point in the history

  2. suggested changes

    @ianhi
    ianhi committed May 25, 2020
    Configuration menu
    Copy the full SHA
    7f5dfa3 View commit details
    Browse the repository at this point in the history

  3. Skip checkout if file was added in index

    @fcollonval
    fcollonval committed May 25, 2020
    Configuration menu
    Copy the full SHA
    9879067 View commit details
    Browse the repository at this point in the history

  4. Display 'MD' file status as partially-staged

    @fcollonval
    fcollonval committed May 25, 2020
    Configuration menu
    Copy the full SHA
    3527c1f View commit details
    Browse the repository at this point in the history

  5. Improve sligthly the test

    @fcollonval
    fcollonval committed May 25, 2020
    Configuration menu
    Copy the full SHA
    b54834a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. Reset only staged or partially staged file

    @fcollonval
    fcollonval committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    01b1bfa View commit details
    Browse the repository at this point in the history

  2. Fix unit tests

    @fcollonval
    fcollonval committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    5331666 View commit details
    Browse the repository at this point in the history

  3. account for partial staging in _hasStagedFile and _hasUnstagedFile

    @ianhi
    ianhi committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    8eff829 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. allow discard on staged files in simple mode

    @ianhi
    ianhi committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    15dfa9a View commit details
    Browse the repository at this point in the history

  2. add contextmenu to files in simple staging mode

    @ianhi
    ianhi committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    4ef99e3 View commit details
    Browse the repository at this point in the history