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

Add meta.platforms attribute to fbreader and libunibreak #1195

Closed
wants to merge 2 commits into from

Conversation

coroa
Copy link
Contributor

@coroa coroa commented Nov 9, 2013

Tell hydra to build fbreader.

@bjornfor
Copy link
Contributor

bjornfor commented Nov 9, 2013

Rebased onto master and pushed. Thanks!

@bjornfor bjornfor closed this Nov 9, 2013
@coroa coroa deleted the fbreader branch November 9, 2013 18:32
@coroa
Copy link
Contributor Author

coroa commented Nov 9, 2013

i'll start submitting pull requests against master from now on, i promise. ^^

@bjornfor
Copy link
Contributor

bjornfor commented Nov 9, 2013

@coroa: My comment about rebasing was just for info. You did nothing wrong :-)

@vcunat
Copy link
Member

vcunat commented Nov 10, 2013

I see no problem, it's just to keep the history easier to read, and someone can always squeeze in other commits before the PR gets merged. Rebase-applying e.g. just via curl https://github.com/NixOS/nixpkgs/pull/1195.patch | git am is very easy.

@bjornfor
Copy link
Contributor

Yes, it's just to have a linear history. (And maybe save the merge commits for more significant changes, like merging stdenv-branch?)

I run git merge origin/pr/PULL_NUM and then git pull --rebase before push. Very easy.

To get pull requests under origin/pr/* I use this little trick that I found on the net. Add this to ~/.gitconfig under the [alias] section:

pullify = config --add remote.origin.fetch '+refs/pull/*/head:refs/remotes/origin/pr/*'

Then run git pullify once in a repo that is forked from github. Then, whenever you fetch, git will also retrieve pull requests under origin/pr/*. Quite neat.

@vcunat
Copy link
Member

vcunat commented Nov 11, 2013

Thanks! I didn't know github exports PRs in branches.

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.

3 participants