Thanks Emond, don't like all that commit noise either *yuk* :-)
I read several books about git but it's really a darn powerful tool :-P cheers Peter Am 08.05.2012 um 07:56 schrieb Emond Papegaaij: > Hi Peter, > > You can avoid these merge commits by rebasing on a pull: git pull --rebase. > It > is generaly a good idea to keep the history lineair, because that's easier to > read. It's a small thing, but the 'diamonds' can really clutter the history > of > a project, especially when multiple committers create diamonds at the same > time. > > There is one exception to this rule: do not rebase after merging, that is > after you used 'git merge'. The rebase will rewrite the entire history of > your > branch and you will end up with all kinds of duplicate commits. For manual > rebasing (git rebase), I suggest you read http://git-scm.com/book/ch3-6.html > . > Rebasing is a powerful tool, but great power commes with great responsibility > :) > > Best regards, > Emond > > On Monday 07 May 2012 20:44:34 [email protected] wrote: >> Updated Branches: >> refs/heads/master f0b9ab7a1 -> eaa005523 >> >> >> Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket >> >> >> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo >> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eaa00552 >> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eaa00552 >> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eaa00552 >> >> Branch: refs/heads/master >> Commit: eaa0055239f5c473c82e3c9f56bc858f0e83cdd5 >> Parents: 8272f99 f0b9ab7 >> Author: Peter Ertl <[email protected]> >> Authored: Mon May 7 22:44:04 2012 +0200 >> Committer: Peter Ertl <[email protected]> >> Committed: Mon May 7 22:44:04 2012 +0200 >> >> ---------------------------------------------------------------------- >> .../markup/html/form/ListMultipleChoice.java | 40 +- >> .../html/form/ListMultipleChoiceTest$TestPage.html | 7 + >> .../markup/html/form/ListMultipleChoiceTest.java | 80 +++ >> wicket-experimental/wicket-atmosphere/pom.xml | 2 +- >> .../apache/wicket/atmosphere/jquery.atmosphere.js | 488 +++++++++++---- >> 5 files changed, 497 insertions(+), 120 deletions(-) >> ----------------------------------------------------------------------
