Closed jasmin-j closed 8 years ago
The only commit from this pull request is included in pull request #15 . If the commits in a series are related they have to be part of a single pull request. If you want to have several pull requests that have non-related commits, you need to have each one based on a different branch (each of the branches need to be based on master).
If you have a series of related commits but don't want to merge all of them, then the only option is to start a pull request with a few of the first (see below how to do it), wait for them to be merged, rebase your branch on the new master and repeat.
If you have a branch "old-10" with 10 commits but you want to "split" first 2 into a new branch "new-2", while leaving the remaining 8 in the original branch, the procedure is as follows:
git reset --hard HEAD~8
to remove the last 8 commits from your current branch "new-2";Therefore I'm closing this one and I'm going to merge #15 later.
If you have a series of related commits but don't want to merge all of them, then the only option is to start a pull request with a few of the first (see below how to do it), wait for them to be merged, rebase your branch on the new master and repeat.
I expected this answer ;) This is the procedure I work for CT-NG. I made the second pull request, so that you can make comments. I planned to rebase it, when #14 is merged. It was too late last night to explain this ... .
I did several branches/pull request, as you requested. So please first merge #14, I will rebase #15 and then it is how you like it (I hope).
For the next things I will wait with other request (if they are related) utill they are merged upstream.
Merged manually with minor formatting/naming changes. Thanks!
In case of a simple target (clean), do not include any other makefile snippet and do not traverse the source tree. Additionally, the output directories are no longer created.
Signed-off-by: Jasmin Jessich jasmin@anw.at