{"thread":{"id":"8152","subject":"Re: [PATCH 08/10] user-manual: add a \"counting commits\" example","startedAt":"2007-05-14T15:51:11Z","lastAt":"2007-05-14T21:38:37Z","messageCount":5,"participants":["Frank Lichtenheld","J. Bruce Fields","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"42137","messageId":"20070514155111.GE5272@planck.djpig.de","threadId":"8152","inReplyTo":null,"subject":"Re: [PATCH 08/10] user-manual: add a \"counting commits\" example","fromName":"Frank Lichtenheld","fromEmail":"frank@lichtenheld.de","sentAt":"2007-05-14T15:51:11Z","receivedAt":"2007-05-14T15:51:11Z","isPatch":true,"sender":{"key":"frank@lichtenheld.de","avatar":"https://gravatar.com/avatar/b9f1d4b120e138f157c9e480d0818197c474628923786adb98f30017cdb99c3c?d=mp&s=160"},"body":"On Mon, May 14, 2007 at 11:21:27AM -0400, J. Bruce Fields wrote:\n> +Suppose you want to know how many commits you've made on \"mybranch\"\n> +since it diverged from \"origin\":\n> +\n> +-------------------------------------------------\n> +$ git log --pretty=oneline origin..maint | wc -l\n> +-------------------------------------------------\n\nShouldn't that be mybranch instead of maint?\n\n> +Alternatively you may often see this sort of thing done with the\n> +lower-level command gitlink:git-rev-list[1], which just lists the SHA1's\n> +of all the given commits:\n> +\n> +-------------------------------------------------\n> +$ git rev-list origin..maint | wc -l\n> +-------------------------------------------------\n\nSame here.\n\nGruesse,\n-- \nFrank Lichtenheld <frank@lichtenheld.de>\nwww: http://www.djpig.de/\n"},{"id":"42138","messageId":"20070514160335.GA20736@fieldses.org","threadId":"8152","inReplyTo":"20070514155111.GE5272@planck.djpig.de","subject":"Re: [PATCH 08/10] user-manual: add a \"counting commits\" example","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2007-05-14T16:03:35Z","receivedAt":"2007-05-14T16:03:35Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Mon, May 14, 2007 at 05:51:11PM +0200, Frank Lichtenheld wrote:\n> On Mon, May 14, 2007 at 11:21:27AM -0400, J. Bruce Fields wrote:\n> > +Suppose you want to know how many commits you've made on \"mybranch\"\n> > +since it diverged from \"origin\":\n> > +\n> > +-------------------------------------------------\n> > +$ git log --pretty=oneline origin..maint | wc -l\n> > +-------------------------------------------------\n> \n> Shouldn't that be mybranch instead of maint?\n> \n> > +Alternatively you may often see this sort of thing done with the\n> > +lower-level command gitlink:git-rev-list[1], which just lists the SHA1's\n> > +of all the given commits:\n> > +\n> > +-------------------------------------------------\n> > +$ git rev-list origin..maint | wc -l\n> > +-------------------------------------------------\n> \n> Same here.\n\nYep, thanks for the sharp eyes.\n\n--b.\n"},{"id":"42139","messageId":"20070514160507.GB20736@fieldses.org","threadId":"8152","inReplyTo":"20070514160335.GA20736@fieldses.org","subject":"[PATCH] user-manual: fix branch names in examples","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2007-05-14T16:05:08Z","receivedAt":"2007-05-14T16:05:08Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"Thanks to Frank Lichtenheld for pointing out inconsistent use of branch\nnames in a couple examples.\n\nAdd a little more example output while I'm at it.\n\nAt some point actually it might be good for someone to figure out a good\nexample to use consistently throughout the manual and tutorials; it\nmight make them a little easier to read.\n\nSigned-off-by: \"J. Bruce Fields\" <bfields@citi.umich.edu>\n---\n Documentation/user-manual.txt |   18 +++++++++++-------\n 1 files changed, 11 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 9fc2bba..5fb86f2 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -701,7 +701,7 @@ Suppose you want to know how many commits you've made on \"mybranch\"\n since it diverged from \"origin\":\n \n -------------------------------------------------\n-$ git log --pretty=oneline origin..maint | wc -l\n+$ git log --pretty=oneline origin..mybranch | wc -l\n -------------------------------------------------\n \n Alternatively you may often see this sort of thing done with the\n@@ -709,7 +709,7 @@ lower-level command gitlink:git-rev-list[1], which just lists the SHA1's\n of all the given commits:\n \n -------------------------------------------------\n-$ git rev-list origin..maint | wc -l\n+$ git rev-list origin..mybranch | wc -l\n -------------------------------------------------\n \n [[checking-for-equal-branches]]\n@@ -849,19 +849,23 @@ a07157ac624b2524a059a3414e99f6f44bebc1e7 refs/heads/master\n 1e87486ae06626c2f31eaa63d26fc0fd646c8af2 refs/heads/tutorial-fixes\n -------------------------------------------------\n \n-We can get just the branch-head names, and remove \"maint\", with\n+We can get just the branch-head names, and remove \"master\", with\n the help of the standard utilities cut and grep:\n \n -------------------------------------------------\n-$ git show-ref --heads | cut -d' ' -f2 | grep -v '^refs/heads/maint'\n+$ git show-ref --heads | cut -d' ' -f2 | grep -v '^refs/heads/master'\n+refs/heads/core-tutorial\n+refs/heads/maint\n+refs/heads/tutorial-2\n+refs/heads/tutorial-fixes\n -------------------------------------------------\n \n-And then we can ask to see all the commits reachable from maint\n+And then we can ask to see all the commits reachable from master\n but not from these other heads:\n \n -------------------------------------------------\n-$ gitk maint --not $( git show-ref --heads | cut -d' ' -f2 |\n-\t\t\t\tgrep -v '^refs/heads/maint' )\n+$ gitk master --not $( git show-ref --heads | cut -d' ' -f2 |\n+\t\t\t\tgrep -v '^refs/heads/master' )\n -------------------------------------------------\n \n Obviously endless variations are possible; to see all commits\n-- \n1.5.1.4.19.g69e2\n"},{"id":"42168","messageId":"7viravm6s7.fsf@assigned-by-dhcp.cox.net","threadId":"8152","inReplyTo":"20070514160507.GB20736@fieldses.org","subject":"Re: [PATCH] user-manual: fix branch names in examples","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-05-14T21:31:20Z","receivedAt":"2007-05-14T21:31:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"J. Bruce Fields\" <bfields@fieldses.org> writes:\n\n> Thanks to Frank Lichtenheld for pointing out inconsistent use of branch\n> names in a couple examples.\n>\n> Add a little more example output while I'm at it.\n> ...\n\nThanks everybody for participating in these fixups.\n\nBruce, how heavy is your workload these days?  Would you mind if\nI ask you to collect the list comments, have me wait for a few\ndays until the discussions and updates settle down and give me\n\"Ok, all ready to be pulled\" after that?\n"},{"id":"42169","messageId":"20070514213837.GE23090@fieldses.org","threadId":"8152","inReplyTo":"7viravm6s7.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] user-manual: fix branch names in examples","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2007-05-14T21:38:37Z","receivedAt":"2007-05-14T21:38:37Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Mon, May 14, 2007 at 02:31:20PM -0700, Junio C Hamano wrote:\n> Thanks everybody for participating in these fixups.\n> \n> Bruce, how heavy is your workload these days?\n\nProbably lighter than yours.\n\n> Would you mind if I ask you to collect the list comments, have me wait\n> for a few days until the discussions and updates settle down and give\n> me \"Ok, all ready to be pulled\" after that?\n\nYep, that should be no problem.\n\n--b.\n"}]}