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.

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

Feature pull rebase #80

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature pull rebase #80

wants to merge 2 commits into from

Conversation

AoDev
Copy link
Contributor

@AoDev AoDev commented Oct 16, 2014

Add the pull --rebase option.

Per git pull docs, you can set the rebase option to true or preserve.
Also requested here: #78

@dylancwood
Copy link
Collaborator

Thanks @AoDev
Just to be sure that no one accidentally changes your === to == in the future, I suggest adding the following test:

it('should refuse --rebase option with invalid value', function (done) {
        var options = {
            branch: 'master',
            rebase: 'true'
        };

        new Test(command, options)
            .expect(['pull', 'origin', 'master'])
            .run(done);
    });

Let me know what you think.

@dylancwood
Copy link
Collaborator

In fact, it may be prudent to throw an exception inside your customFlagFn if the value of rebase is not true or "preserve", rather than returning a falsy.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants