Hi,
Rasmus <[email protected]> writes:
> Please let me know if I did any git mistakes. Somehow the time got skewed
> up and it's behind some of your commits in cgit. . .
Hmm, inspecting cgit I see that one of those persky merge messages got up
there even though it wasn't in my local git log before pushing. Sorry!
What is my mistake:
- I wrote the patch locally in a branch called include.
- I did git pull --rebase origin master before pushing. I then did push
origin master from my include branch. I did not merge it into master
exactly to avoid this merge-message...
- I know I can get a "clean" log by doing git format-patch and then
git am'ing them into my master. But this is tedious.
How can I develop on branch, retain history and not get the merge message?
Thanks,
Rasmus
PS: I did some searching on the webs beforehand, but apparently not well
enough.
--
A clever person solves a problem. A wise person avoids it