search

cweiske / phorkie

Self-hosted pastebin software written in PHP. Pastes are editable, forkable, may have multiple files and are stored in git repositories.
https://cweiske.de/phorkie.htm
GNU Affero General Public License v3.0
216 stars 23 forks source link

Configurable index page #4

Closed jnovack closed 12 years ago

jnovack commented 12 years ago

Can you cherry-pick just the changes made in c93108f? If not, I'll have to refork so you can get a clean history.

cweiske commented 12 years ago

Err. Please rebase to my master, so that the pull request is really only 1 commit - currently I see 9 commits in this pull request.

You should also "git mv index.php new.php" and then create a new index.php - that's much cleaner in the history.

jnovack commented 12 years ago

Sure, I'm just trying to get down the 'git' process. I appreciate you working with me. Allow me to refork, and then re-request.

I did 'git mv', but because the file names are the same, it appears as a delete most lines, add 2 lines. Unless you'd rather me commit twice, once as a "git mv" and the other with the new index.php.

Is there a way to submit a group of commits as a single commit up? If I make 10 commits in a dev branch, and merge to (my) master, will it appear as 10 commits when I pull request master to you? Or will the merge make it 1?

I'm going to have to experiment today with that.

Justin J. Novack Official Disturber of the Peace

On Fri, Sep 14, 2012 at 8:13 AM, Christian Weiske notifications@github.comwrote:

Err. Please to my master, so that the pull request is really only 1 commit

  • currently I see 9 commits in this pull request.

You should also "git mv index.php new.php" and then create a new index.php

  • that's much cleaner in the history.

— Reply to this email directly or view it on GitHubhttps://github.com/cweiske/phorkie/pull/4#issuecomment-8559292.

cweiske commented 12 years ago

You don't have to re-fork. Throw away your branch (git branch -d master) and re-create the branch from me, e.g. git checkout -b cweiske/master.

If you did git mv, all is fine and only github displays it wrong.

Submitting a bunch of patches isn't bad, I can squash them when merging - or you can squash them if you want. Commits that do several things are bad as well; a commit should always fix one single issue (bug or feature). (Except when it's a big feature that requires much restructurization).

cweiske commented 12 years ago

You don't have to re-fork. Throw away your branch and re-create the branch from me

Another solution for the future is to use feature branches that you develop the feature in. That way the branches do not depend on each other, and you can open separate, clean pull requests.