On Aug 30, 2010 at 17:14, Carsten Bock <carsten(a)bock.info> wrote: In the future please avoid merging master into your branch, unless absolutely necessary (e.g. you depend on some changes made on master). It will create confusing log messages later when/if will be merged into master. Andrei _______________________________________________ sr-dev mailing list sr-dev(a)lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

On Aug 31, 2010 at 08:59, Carsten Bock <lists(a)bock.info> wrote: Actually it is not too late. You can still filter out the unneeded commits before the merge. For that you need to create a new branch. Example (tested): git checkout -b rtpproxy_cleanup origin/carstenbock/rtpproxy # no you need to git rebase -i, but first you need to see which commits # to keep. For that use (1): git log --oneline ^master origin/carstenbock/rtpproxy # this will show all the commits that are unique to your branch (not # present in master). # To see which is the commit from where you branched, take the last # commit above and look at its parent (either by means of git log, # git show or git rev-parse) git rev-parse ac84acd~1 => 96e1bc629bc7ed78dd64b221bc54b266cd45e3ca # now rebase it: git rebase -i 96e1bc6 # (you'll get an editor and a commit list and you should delete all # lines with commits that don't appear in the list (1) # (git log --oneline ^master origin/carstenbock/rtpproxy) # now check it with git log to see if it looks ok, push it with a # new name to the repo and merge it into master: git push origin HEAD:carstenbock/rtpproxy2 git checkout master git merge --log origin/carstenbock/rtpproxy2$ git push origin master:master Alternatively you could use git cherry-pick and pick only the commits in the list instead of using git rebase -i. I could also push the cleaned version for you, if you don't want to go through the above exercise. Andrei