[cmake-developers] Gitish questions ... again

[Eric Noulard]

Hi all,

I started using github fork (http://github.com/TheErk/CMake) because
it was easier to offer patch proposal than pure patch.

Now I struggled a little bit because it was the first time I was
doing the whole path from my github to cmake.org/next

I did the following

1) git checkout master (local master tracking from git://cmake.org/cmake.git)
2) git checkout -b MyBranch
3) git pull github MyBranch (gitgub is my github remote:
url=git at github.com:TheErk/CMake.git)
4) git checkout next (local next tracking from git://cmake.org/cmake.git)
5) git merge MyBranch
6) git push

Is this the appropriate workflow?
Using this I got 2 merge/pull messages from steps 3) and 5) like:

commit b662f0620bfbe96eeea509a79ac327d9e71dcd86
Merge: 419cacc 3178767
Author: Eric NOULARD <eric.noulard at gmail.com>
Date:   Tue Aug 24 22:00:00 2010 +0200

    Merge branch 'CPack-FixDESTDIR-Issue7000' into next

commit 3178767d5f12c96d830f6da790fde95a36a1742b
Merge: d5e3e04 6a521f8
Author: Eric NOULARD <eric.noulard at gmail.com>
Date:   Tue Aug 24 21:47:28 2010 +0200

    Merge 'CPack-FixDESTDIR-Issue7000' from github.com:TheErk/CMake


Is it ok?

Is there a better workflow to avoid those "spurious" messages/commit?

Shall I rebase my local branch "MyBranch" after step 3) in order to
squash/reword commits?

-- 
Erk
Membre de l'April - « promouvoir et défendre le logiciel libre » -
http://www.april.org