# git log --graph 7 messages from 2009-10-11 to 2009-10-12. Participants: Dilip M, Sverre Rabbelier, Matthieu Moy, Jakub Narebski, B Smith-Mannschott. Thread: https://gitlist.dev/t/21194 ## Dilip M, 2009-10-11 18:27 Subject: git log --graph Message-ID: URL: https://gitlist.dev/e/c94f8e120910111127q102aa6a1qc3c0850f8a8a1509%40mail.gmail.com ``` I am using: git version 1.6.3.2 Somehow not getting text graph as mentioned in http://www.gitready.com/intermediate/2009/01/26/text-based-graph.html Any hints would really help.. I am trying git log --graph. (has commits in two branches...). But always see one line :( -- Dilip ``` ## Sverre Rabbelier, 2009-10-11 18:35 Subject: Re: git log --graph Message-ID: URL: https://gitlist.dev/e/fabb9a1e0910111135v4f3c75a7v6657f5dcfacf13ac%40mail.gmail.com In-Reply-To: ``` Heya, On Sun, Oct 11, 2009 at 20:27, Dilip M wrote: > I am trying git log --graph. (has commits in two branches...). But > always see one line :( It'll show you the history of one branch at a time online, you won't get the demo-ed multiple lines unless the branch you're looking at contains merges. -- Cheers, Sverre Rabbelier ``` ## Matthieu Moy, 2009-10-11 19:40 Subject: Re: git log --graph Message-ID: URL: https://gitlist.dev/e/vpqhbu5zplr.fsf%40bauges.imag.fr In-Reply-To: ``` Sverre Rabbelier writes: > Heya, > > On Sun, Oct 11, 2009 at 20:27, Dilip M wrote: >> I am trying git log --graph. (has commits in two branches...). But >> always see one line :( > > It'll show you the history of one branch at a time online, you won't > get the demo-ed multiple lines unless the branch you're looking at > contains merges. That said, git log --graph --all will show multiple branches. I personnally like the format of git log --graph --pretty=oneline --abbrev-commit with ui.color set to true in ~/.gitconfig. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## Jakub Narebski, 2009-10-11 20:30 Subject: Re: git log --graph Message-ID: URL: https://gitlist.dev/e/m3ws31fzbp.fsf%40localhost.localdomain In-Reply-To: ``` Matthieu Moy writes: > I personnally like the format of > > $ git log --graph --pretty=oneline --abbrev-commit > > with ui.color set to true in ~/.gitconfig. You can use $ git log --graph --oneline nowadays for that. A bit shorter. -- Jakub Narebski Poland ShadeHawk on #git ``` ## Dilip M, 2009-10-12 03:01 Subject: Re: git log --graph Message-ID: URL: https://gitlist.dev/e/c94f8e120910112001l50f9332fs43d0762bbd9207a3%40mail.gmail.com In-Reply-To: ``` On Mon, Oct 12, 2009 at 12:05 AM, Sverre Rabbelier wrote: > Heya, > > On Sun, Oct 11, 2009 at 20:27, Dilip M wrote: >> I am trying git log --graph. (has commits in two branches...). But >> always see one line :( > > It'll show you the history of one branch at a time online, you won't > get the demo-ed multiple lines unless the branch you're looking at > contains merges. Understood. it shows only when I have merged conflicts! In case, it is a fast forward merge. It doesn't show. Which is good :) Thanks to all. - Dilip ``` ## B Smith-Mannschott, 2009-10-12 05:08 Subject: Re: git log --graph Message-ID: <28c656e20910112208y5eb843eex41e928e04a465396@mail.gmail.com> URL: https://gitlist.dev/e/28c656e20910112208y5eb843eex41e928e04a465396%40mail.gmail.com In-Reply-To: ``` On Sun, Oct 11, 2009 at 20:27, Dilip M wrote: > I am using: git version 1.6.3.2 > > Somehow not getting text graph as mentioned in > http://www.gitready.com/intermediate/2009/01/26/text-based-graph.html > > Any hints would really help.. > > I am trying git log --graph. (has commits in two branches...). But > always see one line :( "one line"? 1 of history? (i.e. the history of the current branch, but not the other) 2 of text? 3 --pretty=oneline? assuming your problem is 1: git log --all --graph //ben ``` ## Matthieu Moy, 2009-10-12 06:54 Subject: Re: git log --graph Message-ID: URL: https://gitlist.dev/e/vpqtyy5rtjn.fsf%40bauges.imag.fr In-Reply-To: ``` Dilip M writes: > Understood. it shows only when I have merged conflicts! > > In case, it is a fast forward merge. It doesn't show. Which is good :) Fast-forward and merge conflicts are two different things. Non-fast forward occurs when you merge two branches which are not a direct ancestor of each other, i.e. both have commits that the other do not have. In case of non-fast forward, if you didn't touch the same file in both branches, the merge is still trivial and conflict-free. If you touched the same files, then Git has to apply in-file merge strategy, but that doesn't mean you'll get conflicts either. Conflicts will occur when you touched the same part of the same file. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ```