search

Feh / nocache

minimize caching effects
BSD 2-Clause "Simplified" License
554 stars 53 forks source link

support for kfreebsd and old FreeBSD systems. #13

Closed noushi closed 11 years ago

noushi commented 11 years ago

should fix issue #12

Feh commented 11 years ago

This looks good; but I’d very much prefer not to merge two unnecessary merge-commit of your’s. I could just cherry-pick the one commit, if that’s okay.

noushi commented 11 years ago

sure, please do.

btw, is there a way to hide those merge-commits when doing a pull request?

Feh commented 11 years ago

Thanks, I picked the commit.

btw, is there a way to hide those merge-commits when doing a pull request?

Not really. A pull request is just a commit and github automatically finds out which parent commits are not merged (yet).

The correct thing to do in your case would probably be to either a) rebase behavior_mods to my master branch, and then submit the pull request (check gitk first if it looks right) or b), which is the better method, provide one branch for each pull request:

Assuming my repo is called Feh on your side, proceed like this:

git fetch -p
git checkout -b kfreebsd-fixes Feh/master
git add / git commit / ...
git push <your-remote> kfreebsd-fixes

Then send a pull-request for this branch you just created. Nice thing: Your branch name will appear in the commit merge message, so it’s eves easier to find.

noushi commented 11 years ago

Interesting, I'll do like this next time. cheers