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 checkout strategy to stash apply/pop methods #606

Merged
merged 3 commits into from
Feb 27, 2017
Merged

Add checkout strategy to stash apply/pop methods #606

merged 3 commits into from
Feb 27, 2017

Commits on Dec 18, 2016

  1. Add checkout strategy to stash apply/pop methods 

    For a finer control over the unstash process, propogate checkout strategy to Objective-Git from the underlying libgit2 stash methods.
    @slavikus
    slavikus committed Dec 18, 2016
    Configuration menu
    Copy the full SHA
    11e5bb2 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. Fix conflicts with pull request libgit2#459 

    # Conflicts:
#	ObjectiveGit/GTRepository+Stashing.m
    @slavikus
    slavikus committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    00a5bc4 View commit details
    Browse the repository at this point in the history

  2. Correct descriptions of applyStash: and popStash:

    @slavikus
    slavikus committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    daf7a6f View commit details
    Browse the repository at this point in the history