... to do when you have a conflict is > this: > > git log ... >8 -- [PATCH] git log -p --merge [[--] paths...] This adds Linus's ... UNINTERESTING; + add_pending_object(revs, &it->object, "(merge-base)"); + } + + if (!active_nr) + read_cache(); + for ...

git - Junio C Hamano - Jul 7 2006 - 04:26

... above for us. > Including all the "conflicting-filename" thing. It would be nice if > > git log -p --merge [[--] filenames...] > > would basically expand to > ... ever again, and doing a > > git log -p --merge drivers/ > > would automatically ...

git - Junio C Hamano - Jun 30 2006 - 23:08

... > attempt to make git-branch a built-in. > > Subject: Re: [PATCH] Implement git-branch and git-merge-base as > built ... $ git-rev-list 89719209 262a6ef7 \ --not $(git-merge-base --all 89719209 262a6ef7) \ --not 66ae0c77 ced9456a ...

git - Rene Scharfe - Jul 1 2006 - 15:29

... > The normal case of git-merge-base calling get_merge_bases() once > and ... clean-up cost at all. Note that this was partly the ... . If you make this function a library function, the main user ... -merge-base any more. Everybody can use it from now on. ...

git - Johannes Schindelin - Jul 1 2006 - 19:01

... this has the same problem I pointed out to Kristian's attempt to make git-branch a built-in. Subject: Re: [PATCH] Implement git-branch and git-merge-base as built-ins. Date: Thu, 08 Jun 2006 11:53:48 ...

git - Junio C Hamano - Jul 1 2006 - 14:37

... should remove them from get_merge_bases(). The normal case of git-merge-base calling get_merge_bases() once and exiting should NOT have to ... : send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at ...

git - Junio C Hamano - Jul 1 2006 - 15:56

... 1 Jul 2006, Linus Torvalds wrote: > On Sat, 1 Jul 2006, Daniel Barkalow ... > It is possible to have > > a > / \ > b c > |\ /| > d e f > ... the complexity in git-merge-base, though. There's a ton more that ...

git - Daniel Barkalow - Jul 1 2006 - 19:25

... there has been any other merges in between (but they aren' ... _also_ did other things), your A...B expression is meaningless, I ... merge+diff" thing, and no amount of "A...B" expressions on ... it's mainly just for merging. Linus - To unsubscribe from this ...

git - Linus Torvalds - Jun 30 2006 - 23:54

Linus Torvalds writes: > On Sat, 1 Jul 2006, Rene Scharfe wrote: ... thought I fixed that up when I merged. Sorry. > Also, it only clears commit marks ... "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More ...

git - Junio C Hamano - Jul 1 2006 - 16:07

... Linus Torvalds writes: > >> On Sat, 1 Jul 2006, Rene Scharfe ... | UNINTERESTING); + } return result; } diff --git a/commit.h b/commit.h index ... , int cleanup_needed); #endif /* COMMIT_H */ diff --git a/merge-base.c b/merge ...

git - Junio C Hamano - Jul 1 2006 - 16:14

On Sat, 1 Jul 2006, Daniel Barkalow wrote: > > I think a... ... It's basically the original merge-bases code, from way back ... It is possible to have a / \ b c |\ /| d e f ... So that's why git-merge-base has all that extra ...

git - Linus Torvalds - Jul 1 2006 - 18:57

... A B --not $(git-merge-base --all A B) > > is meaningful (and the ... refs in `$GIT_DIR/refs/` are listed on the command line as ... (object->sha1)); + exclude = exclude->next; + } + a->object.flags |= flags; + add_pending_object(revs, ...

git - Rene Scharfe - Jul 1 2006 - 11:09

On Sat, 1 Jul 2006, Linus Torvalds wrote: > That said, it does ... } It's basically the original merge-bases code, from way back; ... for computing a good merge base don't matter if you're just ... look at the big examples in merge-base.c (pre-libification), it' ...

git - Daniel Barkalow - Jul 1 2006 - 18:24

On Sat, Jul 01, 2006 at 05:09:26PM +0200, Rene ... which is useful for > +merges. The resulting set of commits ... of an arbitrary choice anyway. A symmetric difference is basically equivalent ... git" in the body of a message to majordomo@vger.kernel ...

git - J. Bruce Fields - Jul 1 2006 - 14:01

... 25:43AM -0700, Linus Torvalds wrote: > > > On Sat, 1 Jul 2006, Rene ... B --not $(git-merge-base --all A B) +$ git-rev-list ... (from_sha1); + b = lookup_commit_reference(sha1); + if (!a || !b) { + die(symmetric ? + "Invalid symmetric ...

git - Rene Scharfe - Jul 1 2006 - 14:13

... >... which is useful for >> +merges. The resulting set of commits is the ... A...B is extension of A..B for merges. > A symmetric difference is basically ... -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: ...

git - Jakub Narebski - Jul 1 2006 - 14:22

On Sat, 1 Jul 2006, Daniel Barkalow wrote: > > But that wouldn't ... > that 'e' is the correct merge-base and 'g' is not, ... You're right - in ths case we don't care about a minimal ... "unsubscribe git" in the body of a message to majordomo@vger.kernel.org ...

git - Linus Torvalds - Jul 1 2006 - 20:08

... Scharfe wrote: > > You mean something like the following patch on top of the 'next' branch? > It also documents the --not ... this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http:// ...

git - Linus Torvalds - Jul 1 2006 - 12:25

On Sat, 1 Jul 2006, Rene Scharfe wrote: > > I wonder why the two clear_commit_marks() calls at the end ... from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel ...

git - Linus Torvalds - Jul 1 2006 - 16:04

On Fri, 30 Jun 2006, Linus Torvalds wrote: > > (it's not strictly a valid set operation, but it ... _is_ perfectly valid. It's called a "symmetric difference" in set theory. ... git-rev-list $(git-merge-base --all a b) // intersection of ...

git - Linus Torvalds - Jun 30 2006 - 23:59