{"thread":{"id":"21194","subject":"git log --graph","startedAt":"2009-10-11T18:27:33Z","lastAt":"2009-10-12T06:54:36Z","messageCount":7,"participants":["Dilip M","Sverre Rabbelier","Matthieu Moy","Jakub Narebski","B Smith-Mannschott"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"124624","messageId":"c94f8e120910111127q102aa6a1qc3c0850f8a8a1509@mail.gmail.com","threadId":"21194","inReplyTo":null,"subject":"git log --graph","fromName":"Dilip M","fromEmail":"dilipm79@gmail.com","sentAt":"2009-10-11T18:27:33Z","receivedAt":"2009-10-11T18:27:33Z","isPatch":false,"sender":{"key":"dilipm79@gmail.com","avatar":"https://gravatar.com/avatar/9417e308513ce9251de2802a026c72eb164e6c9b9d7143a3ee13f6ed0c4d1bd5?d=mp&s=160"},"body":"I am using: git version 1.6.3.2\n\nSomehow not getting text graph as mentioned in\nhttp://www.gitready.com/intermediate/2009/01/26/text-based-graph.html\n\nAny hints would really help..\n\nI am trying git log --graph. (has commits in two branches...). But\nalways see one line :(\n\n\n\n\n-- \nDilip\n"},{"id":"124625","messageId":"fabb9a1e0910111135v4f3c75a7v6657f5dcfacf13ac@mail.gmail.com","threadId":"21194","inReplyTo":"c94f8e120910111127q102aa6a1qc3c0850f8a8a1509@mail.gmail.com","subject":"Re: git log --graph","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-10-11T18:35:04Z","receivedAt":"2009-10-11T18:35:04Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Sun, Oct 11, 2009 at 20:27, Dilip M wrote:\n> I am trying git log --graph. (has commits in two branches...). But\n> always see one line :(\n\nIt'll show you the history of one branch at a time online, you won't\nget the demo-ed multiple lines unless the branch you're looking at\ncontains merges.\n\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"124633","messageId":"vpqhbu5zplr.fsf@bauges.imag.fr","threadId":"21194","inReplyTo":"fabb9a1e0910111135v4f3c75a7v6657f5dcfacf13ac@mail.gmail.com","subject":"Re: git log --graph","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2009-10-11T19:40:16Z","receivedAt":"2009-10-11T19:40:16Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Sverre Rabbelier writes:\n\n> Heya,\n>\n> On Sun, Oct 11, 2009 at 20:27, Dilip M wrote:\n>> I am trying git log --graph. (has commits in two branches...). But\n>> always see one line :(\n>\n> It'll show you the history of one branch at a time online, you won't\n> get the demo-ed multiple lines unless the branch you're looking at\n> contains merges.\n\nThat said, git log --graph --all will show multiple branches.\n\nI personnally like the format of\ngit log --graph --pretty=oneline --abbrev-commit\nwith ui.color set to true in ~/.gitconfig.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"124634","messageId":"m3ws31fzbp.fsf@localhost.localdomain","threadId":"21194","inReplyTo":"vpqhbu5zplr.fsf@bauges.imag.fr","subject":"Re: git log --graph","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-10-11T20:30:12Z","receivedAt":"2009-10-11T20:30:12Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Matthieu Moy writes:\n\n> I personnally like the format of\n> \n> $ git log --graph --pretty=oneline --abbrev-commit\n>\n> with ui.color set to true in ~/.gitconfig.\n\nYou can use\n\n $ git log --graph --oneline\n\nnowadays for that. A bit shorter.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"124656","messageId":"c94f8e120910112001l50f9332fs43d0762bbd9207a3@mail.gmail.com","threadId":"21194","inReplyTo":"fabb9a1e0910111135v4f3c75a7v6657f5dcfacf13ac@mail.gmail.com","subject":"Re: git log --graph","fromName":"Dilip M","fromEmail":"dilipm79@gmail.com","sentAt":"2009-10-12T03:01:59Z","receivedAt":"2009-10-12T03:01:59Z","isPatch":false,"sender":{"key":"dilipm79@gmail.com","avatar":"https://gravatar.com/avatar/9417e308513ce9251de2802a026c72eb164e6c9b9d7143a3ee13f6ed0c4d1bd5?d=mp&s=160"},"body":"On Mon, Oct 12, 2009 at 12:05 AM, Sverre Rabbelier wrote:\n> Heya,\n>\n> On Sun, Oct 11, 2009 at 20:27, Dilip M wrote:\n>> I am trying git log --graph. (has commits in two branches...). But\n>> always see one line :(\n>\n> It'll show you the history of one branch at a time online, you won't\n> get the demo-ed multiple lines unless the branch you're looking at\n> contains merges.\n\nUnderstood. it shows only when I have merged conflicts!\n\nIn case, it is a fast forward merge. It doesn't show. Which is good :)\n\nThanks to all.\n\n\n-\nDilip\n"},{"id":"124662","messageId":"28c656e20910112208y5eb843eex41e928e04a465396@mail.gmail.com","threadId":"21194","inReplyTo":"c94f8e120910111127q102aa6a1qc3c0850f8a8a1509@mail.gmail.com","subject":"Re: git log --graph","fromName":"B Smith-Mannschott","fromEmail":"bsmith.occs@gmail.com","sentAt":"2009-10-12T05:08:36Z","receivedAt":"2009-10-12T05:08:36Z","isPatch":false,"sender":{"key":"bsmith.occs@gmail.com","avatar":"https://gravatar.com/avatar/46449e07c27bb8a30e4d50c08859f7210d47f6e84526b0a3b903641231dfc1bd?d=mp&s=160"},"body":"On Sun, Oct 11, 2009 at 20:27, Dilip M wrote:\n> I am using: git version 1.6.3.2\n>\n> Somehow not getting text graph as mentioned in\n> http://www.gitready.com/intermediate/2009/01/26/text-based-graph.html\n>\n> Any hints would really help..\n>\n> I am trying git log --graph. (has commits in two branches...). But\n> always see one line :(\n\n\"one line\"?\n1 of history? (i.e. the history of the current branch, but not the other)\n2 of text?\n3 --pretty=oneline?\n\nassuming your problem is 1:\n\ngit log --all --graph\n\n//ben\n"},{"id":"124675","messageId":"vpqtyy5rtjn.fsf@bauges.imag.fr","threadId":"21194","inReplyTo":"c94f8e120910112001l50f9332fs43d0762bbd9207a3@mail.gmail.com","subject":"Re: git log --graph","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2009-10-12T06:54:36Z","receivedAt":"2009-10-12T06:54:36Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Dilip M writes:\n\n> Understood. it shows only when I have merged conflicts!\n>\n> In case, it is a fast forward merge. It doesn't show. Which is good :)\n\nFast-forward and merge conflicts are two different things. Non-fast\nforward occurs when you merge two branches which are not a direct\nancestor of each other, i.e. both have commits that the other do not\nhave.\n\nIn case of non-fast forward, if you didn't touch the same file in both\nbranches, the merge is still trivial and conflict-free. If you touched\nthe same files, then Git has to apply in-file merge strategy, but that\ndoesn't mean you'll get conflicts either. Conflicts will occur when\nyou touched the same part of the same file.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}