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

Exclude pattern #19

Merged
merged 2 commits into from
Sep 7, 2016
Merged

Exclude pattern #19

merged 2 commits into from
Sep 7, 2016

Conversation

ozangunalp
Copy link
Contributor

@ozangunalp ozangunalp commented Aug 22, 2016

Implementation of the part 1 of exclude pattern option mentioned in #14.

The option can be given in command line via,
git octopus -e features/feat1 -e octopus-* -s 4
or defined in git config
git config octopus.excludePattern features/feat1
git config --add octopus.excludePattern octopus-*

The command line option overrides the git config.


This change is Reviewable

@apflieger
Copy link
Contributor

Waow you wrote a test. It's been a while since I haven't run them. Does it still actually work?

@ozangunalp
Copy link
Contributor Author

Well they still do work if you have access to docker base images. There is a failing test about saving conflict resolutions though. I left it as is.

@apflieger
Copy link
Contributor

I tried it on OSX, seems to work well.

I guess that you changed the doc files by hand ? what's in doc/ is actually generated based on files in src/doc/. Don't worry about updating generated files, I'll do it before the next release but put your changes in the sources.

@ozangunalp
Copy link
Contributor Author

my bad, thought I was editing src/doc. I'll transfer changes to the src file.

@apflieger apflieger merged commit 78d7a16 into lesfurets:master Sep 7, 2016
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