From: Uwe Kleine-König Date: Fri, 22 Oct 2010 08:43:58 GMT Subject: Re: [TopGit PATCH] Clarify tg-log note Message-ID: <20101022084358.GE19834@pengutronix.de> In-Reply-To: <0ecc03501a8282e7c19011ca1cbc138dec502390.1287734568.git.bert.wesarg@googlemail.com> On Fri, Oct 22, 2010 at 10:03:36AM +0200, Bert Wesarg wrote: > --- > README | 13 +++++++++---- > 1 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/README b/README > index 5ca0424..348f515 100644 > --- a/README > +++ b/README > @@ -520,10 +520,15 @@ tg log > ~~~~~~ > Prints the git log of the named topgit branch. > > - Note: if you have shared the TopGit branch, this command > - only lists the commits that were made in the current > - repository, so you will not see work done by your > - collaborators. > + Note: that you don't see changes made by the remote > + when the topic diverged at both sides. Any 'fast-forward' > + updates from remote topics will shown up. This could also > + mean, that you 'lose' all your history, because the remote > + made the merge and you do only a 'fast-forward'. Than you > + will see only his history from now on. So its best to prevent > + diverging development if you like to 'preserve' the full > + history. Please note, that 'lose' and 'preserve' only relates > + to when showing the log. Hmm, I see your intention, but I wonder if it wouldn't be enough to say: Note: if you have merged changes from a different repository, this command might not list all interesting commits. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |