{"thread":{"id":"7996","subject":"Documentation Bugs","startedAt":"2007-05-06T13:09:22Z","lastAt":"2007-05-07T12:58:37Z","messageCount":2,"participants":["Uwe Kleine-König"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"41207","messageId":"20070506130921.GA3750@lala","threadId":"7996","inReplyTo":null,"subject":"Documentation Bugs","fromName":"Uwe Kleine-König","fromEmail":"ukleinek@informatik.uni-freiburg.de","sentAt":"2007-05-06T13:09:22Z","receivedAt":"2007-05-06T13:09:22Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Hello,\n\n1) git-fetch(1) (from maint) states:\n\n       -q, --quiet\n           Pass --quiet to git-fetch-pack and silence any other internally\n           used programs.\n\t\n   but git-fetch doesn't like -q.  (master has\n   a858c006fae17cef44dd63737771f2bebb6eeae8, but maint only has\n   42905294de0c1885f5636319c4790f184d767875)\n\nMaybe more difficult:\n2) rebase a merged tree:\n\n   If I made a local commit and pulled from origin, I get:\n\n\tzeisberg@cassiopeia:~/gsrc/git$ git show\n\tcommit 15386213004a20dfdf92c654c737795079202545\n\tMerge: 9d740f0... 9159afb...\n\tAuthor: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>\n\tDate:   Sun May 6 14:49:59 2007 +0200\n\n\t    Merge branch 'master' of git://git.kernel.org/pub/scm/git/git\n\n\tzeisberg@cassiopeia:~/gsrc/git$ git rebase junio/master\n\tCurrent branch master is up to date.\n\n   (where junio/master is the tracking branch for\n   git://git.kernel.org/pub/scm/git/git) but git-rebase(1) states:\n\n\tAll changes made by commits in the current branch but that are\n\tnot in <upstream> are saved to a temporary area. This is the\n\tsame set of commits that would be shown by git log\n\t<upstream>..HEAD.\n\n   and git-log junio/master..HEAD is not empty.\n\nI didn't have the time to look into 2).  So I only report it for now.\n\nBest regards\nUwe\n\n-- \nUwe Kleine-König\n\nhttp://www.google.com/search?q=sin%28pi%2F2%29\n"},{"id":"41336","messageId":"20070507125837.GA16370@informatik.uni-freiburg.de","threadId":"7996","inReplyTo":"20070506130921.GA3750@lala","subject":"Re: Documentation Bugs","fromName":"Uwe Kleine-König","fromEmail":"ukleinek@informatik.uni-freiburg.de","sentAt":"2007-05-07T12:58:37Z","receivedAt":"2007-05-07T12:58:37Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Hello,\n\n> 2) rebase a merged tree:\n> \n>    If I made a local commit and pulled from origin, I get:\n> \n> \tzeisberg@cassiopeia:~/gsrc/git$ git show\n> \tcommit 15386213004a20dfdf92c654c737795079202545\n> \tMerge: 9d740f0... 9159afb...\n> \tAuthor: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>\n> \tDate:   Sun May 6 14:49:59 2007 +0200\n> \n> \t    Merge branch 'master' of git://git.kernel.org/pub/scm/git/git\n> \n> \tzeisberg@cassiopeia:~/gsrc/git$ git rebase junio/master\n> \tCurrent branch master is up to date.\n> \n>    (where junio/master is the tracking branch for\n>    git://git.kernel.org/pub/scm/git/git) but git-rebase(1) states:\n> \n> \tAll changes made by commits in the current branch but that are\n> \tnot in <upstream> are saved to a temporary area. This is the\n> \tsame set of commits that would be shown by git log\n> \t<upstream>..HEAD.\n> \n>    and git-log junio/master..HEAD is not empty.\nAfter having thought about that one once more, here some more info:  The\ntwo patches I had in master were merged in the meantime.  So it was\ncorrect for git-rebase to state that master is up to date.  Rereading\nthe documentation I realize there is no bug.  I just missed that both\npatches were already merged and format-patch generated a patch anyhow.\n\nThe first issue remains however.\n\nBest regards\nUwe\n\n-- \nUwe Kleine-König\n\nIf a lawyer and an IRS agent were both drowning, and you could only save\none of them, would you go to lunch or read the paper?\n"}]}