Re: Question about git log --merge option

2016-04-13 Thread Andrey Hsiao
Thanks Junio, I understand the option's meaning now :) On Thu, Apr 14, 2016 at 4:37 AM, Junio C Hamano wrote: > Andrey Hsiao writes: > >> Dear list: >> >> Just encountered the --merge option for git log. >> >> In the man page, it has the following explanation: >> - After a failed merge, show ref

Re: Question about git log --merge option

2016-04-13 Thread Junio C Hamano
Andrey Hsiao writes: > Dear list: > > Just encountered the --merge option for git log. > > In the man page, it has the following explanation: > - After a failed merge, show refs that touch files having a conflict > and don't exist on all heads to merge. git log --merge [options] -- $path

Question about git log --merge option

2016-04-13 Thread Andrey Hsiao
Dear list: Just encountered the --merge option for git log. In the man page, it has the following explanation: - After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge. I tried this option and get below results: 1. For a failed merge (with confl

Re: About git log

2015-04-24 Thread Kevin Daudt
On Mon, Apr 06, 2015 at 10:21:37PM +0800, niu2x wrote: > I'm a beginner. > Please tell me the log of git commit is exist forever or 90 days As long as a commit is (indirectly) referenced by a branch or tag, it will be kept forever. Only if you rewrite history causing commits to be unreferenced (fo

About git log

2015-04-06 Thread niu2x
I'm a beginner. Please tell me the log of git commit is exist forever or 90 days -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Question about "git log --cherry"

2013-09-27 Thread Francis Moreau
On Fri, Sep 27, 2013 at 11:14 AM, John Keeping wrote: > On Fri, Sep 27, 2013 at 10:28:05AM +0200, Francis Moreau wrote: >> On Fri, Sep 27, 2013 at 10:11 AM, John Keeping wrote: >> > On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: >> >> Hi, >> >> >> >> On Thu, Sep 26, 2013 at 10:21

Re: Question about "git log --cherry"

2013-09-27 Thread John Keeping
On Fri, Sep 27, 2013 at 10:28:05AM +0200, Francis Moreau wrote: > On Fri, Sep 27, 2013 at 10:11 AM, John Keeping wrote: > > On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: > >> Hi, > >> > >> On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote: > >> > On Thu, Sep 26, 2013 at 06:35

Re: Question about "git log --cherry"

2013-09-27 Thread Francis Moreau
On Fri, Sep 27, 2013 at 10:11 AM, John Keeping wrote: > On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: >> Hi, >> >> On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote: >> > On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: >> >> I'm trying to use "git log --cherry

Re: Question about "git log --cherry"

2013-09-27 Thread John Keeping
On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: > Hi, > > On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote: > > On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: > >> I'm trying to use "git log --cherry ..." in order to display new, kept > >> and removed commits

Re: Question about "git log --cherry"

2013-09-26 Thread Francis Moreau
Hi, On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote: > On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: >> I'm trying to use "git log --cherry ..." in order to display new, kept >> and removed commits between two branches A and B. >> >> So commits which are only in B are consi

Re: Question about "git log --cherry"

2013-09-26 Thread John Keeping
On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: > I'm trying to use "git log --cherry ..." in order to display new, kept > and removed commits between two branches A and B. > > So commits which are only in B are considered new and should be marked > with '+'. Commits which are in b

Question about "git log --cherry"

2013-09-26 Thread Francis Moreau
Hello, I'm trying to use "git log --cherry ..." in order to display new, kept and removed commits between two branches A and B. So commits which are only in B are considered new and should be marked with '+'. Commits which are in both branches are marked with '=' but only commit in branch B are s