{"thread":{"id":"25519","subject":"[TopGit PATCH] Clarify tg-log note","startedAt":"2010-10-22T08:03:36Z","lastAt":"2010-10-22T08:57:46Z","messageCount":3,"participants":["Bert Wesarg","Uwe Kleine-König"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"154118","messageId":"0ecc03501a8282e7c19011ca1cbc138dec502390.1287734568.git.bert.wesarg@googlemail.com","threadId":"25519","inReplyTo":null,"subject":"[TopGit PATCH] Clarify tg-log note","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-10-22T08:03:36Z","receivedAt":"2010-10-22T08:03:36Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"---\n README |   13 +++++++++----\n 1 files changed, 9 insertions(+), 4 deletions(-)\n\ndiff --git a/README b/README\nindex 5ca0424..348f515 100644\n--- a/README\n+++ b/README\n@@ -520,10 +520,15 @@ tg log\n ~~~~~~\n \tPrints the git log of the named topgit branch.\n \n-\tNote: if you have shared the TopGit branch, this command\n-\tonly lists the commits that were made in the current\n-\trepository, so you will not see work done by your\n-\tcollaborators.\n+\tNote: that you don't see changes made by the remote\n+\twhen the topic diverged at both sides. Any 'fast-forward'\n+\tupdates from remote topics will shown up. This could also\n+\tmean, that you 'lose' all your history, because the remote\n+\tmade the merge and you do only a 'fast-forward'. Than you\n+\twill see only his history from now on. So its best to prevent\n+\tdiverging development if you like to 'preserve' the full\n+\thistory. Please note, that 'lose' and 'preserve' only relates\n+\tto when showing the log.\n \n TODO: tg rename\n \n-- \n1.7.3.1.1075.g263d8\n"},{"id":"154122","messageId":"20101022084358.GE19834@pengutronix.de","threadId":"25519","inReplyTo":"0ecc03501a8282e7c19011ca1cbc138dec502390.1287734568.git.bert.wesarg@googlemail.com","subject":"Re: [TopGit PATCH] Clarify tg-log note","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2010-10-22T08:43:58Z","receivedAt":"2010-10-22T08:43:58Z","isPatch":true,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"On Fri, Oct 22, 2010 at 10:03:36AM +0200, Bert Wesarg wrote:\n> ---\n>  README |   13 +++++++++----\n>  1 files changed, 9 insertions(+), 4 deletions(-)\n> \n> diff --git a/README b/README\n> index 5ca0424..348f515 100644\n> --- a/README\n> +++ b/README\n> @@ -520,10 +520,15 @@ tg log\n>  ~~~~~~\n>  \tPrints the git log of the named topgit branch.\n>  \n> -\tNote: if you have shared the TopGit branch, this command\n> -\tonly lists the commits that were made in the current\n> -\trepository, so you will not see work done by your\n> -\tcollaborators.\n> +\tNote: that you don't see changes made by the remote\n> +\twhen the topic diverged at both sides. Any 'fast-forward'\n> +\tupdates from remote topics will shown up. This could also\n> +\tmean, that you 'lose' all your history, because the remote\n> +\tmade the merge and you do only a 'fast-forward'. Than you\n> +\twill see only his history from now on. So its best to prevent\n> +\tdiverging development if you like to 'preserve' the full\n> +\thistory. Please note, that 'lose' and 'preserve' only relates\n> +\tto when showing the log.\nHmm, I see your intention, but I wonder if it wouldn't be enough to say:\n\nNote: if you have merged changes from a different repository, this\ncommand might not list all interesting commits.\n\nBest regards\nUwe\n\n-- \nPengutronix e.K.                           | Uwe Kleine-König            |\nIndustrial Linux Solutions                 | http://www.pengutronix.de/  |\n"},{"id":"154124","messageId":"AANLkTi=npfSXVxN7d7-D44s09s=Jgh8P6wZCB03O1kb1@mail.gmail.com","threadId":"25519","inReplyTo":"20101022084358.GE19834@pengutronix.de","subject":"Re: [TopGit PATCH] Clarify tg-log note","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-10-22T08:57:46Z","receivedAt":"2010-10-22T08:57:46Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"2010/10/22 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:\n> On Fri, Oct 22, 2010 at 10:03:36AM +0200, Bert Wesarg wrote:\n>> ---\n>>  README |   13 +++++++++----\n>>  1 files changed, 9 insertions(+), 4 deletions(-)\n>>\n>> diff --git a/README b/README\n>> index 5ca0424..348f515 100644\n>> --- a/README\n>> +++ b/README\n>> @@ -520,10 +520,15 @@ tg log\n>>  ~~~~~~\n>>       Prints the git log of the named topgit branch.\n>>\n>> -     Note: if you have shared the TopGit branch, this command\n>> -     only lists the commits that were made in the current\n>> -     repository, so you will not see work done by your\n>> -     collaborators.\n>> +     Note: that you don't see changes made by the remote\n>> +     when the topic diverged at both sides. Any 'fast-forward'\n>> +     updates from remote topics will shown up. This could also\n>> +     mean, that you 'lose' all your history, because the remote\n>> +     made the merge and you do only a 'fast-forward'. Than you\n>> +     will see only his history from now on. So its best to prevent\n>> +     diverging development if you like to 'preserve' the full\n>> +     history. Please note, that 'lose' and 'preserve' only relates\n>> +     to when showing the log.\n> Hmm, I see your intention, but I wonder if it wouldn't be enough to say:\n>\n> Note: if you have merged changes from a different repository, this\n> command might not list all interesting commits.\n\nYeah, sounds perfect ;-)\n\nBert\n\n>\n> Best regards\n> Uwe\n>\n> --\n> Pengutronix e.K.                           | Uwe Kleine-König            |\n> Industrial Linux Solutions                 | http://www.pengutronix.de/  |\n>\n"}]}