... +0100, Johannes Schindelin wrote: > Hi, > > On Mon, 7 Nov 2005, Linus ... does nothing else than recursively merging the merge-bases > (granted, in ... a bit slower than git-merge-base. * git-diff-tree -M ... do "git reset --hard" and re-do > > the pull with "-s ...

git - Fredrik Kuivinen - Nov 8 2005 - 17:02

... and very timidly tried the >> "recursive" strategy in the hopes that ... ship git-merge with the default rule of 'recursive for two ... who really need a working merge this minute can choose to ... emergency without specifying '-s resolve' on the command line of 'git ...

git - Junio C Hamano - Nov 7 2005 - 20:13

... recursive does nothing else than recursively merging the merge-bases (granted, in a ... just do "git reset --hard" and re-do > the pull with "-s recursive". A bit sad, and it would ... be good to have > coverage on the recursive strategy.. We already have a ...

git - Johannes Schindelin - Nov 8 2005 - 07:58

... (or directly after the really-trivial merge). There are two reasons to avoid git ... 1. The whole idea that git-merge implements "goodness" metric is bogus. It ... more exposure to the greatness of recursive while protecting them from potential glitches ...

git - Junio C Hamano - Nov 8 2005 - 17:47

... On Wed, 9 Nov 2005, Junio C Hamano wrote: > Linus Torvalds ... the first > place. Ahh, you're right, and I'm wrong ... can stop with too _many_ merge heads, just because it hasn ... interesting cases early). Then, the recursive merge strategy could notice (in ...

git - Linus Torvalds - Nov 9 2005 - 19:34

... On Tue, 8 Nov 2005, Fredrik Kuivinen wrote: > On Tue, Nov 08, 2005 at 12:58: ... failed, just > > try once more, with recursive. > > > > I don't think this is a ... (or directly after the really-trivial merge). Two very valid points. You convinced me ...

git - Johannes Schindelin - Nov 8 2005 - 19:04

... think the limit should matter. The > recursive strategy should only add the " ... that result,..., and it uses merge-base of all the heads ... pivot on. And I think this is *wrong*. The merge base ... have to be older than merge base of the original master ...

git - Junio C Hamano - Nov 9 2005 - 02:10

... , and very timidly tried the > "recursive" strategy in the hopes that I ... much information. In particular, I had renames on both sides of the ... has done (the one you're merging) you may or may ... about renames that I had merged earlier in my own branch, ...

git - Linus Torvalds - Nov 7 2005 - 12:56

... and very timidly tried the > "recursive" strategy in the hopes that ... add > some documentation about the merge strategy and how it works ... what > you're doing), I'd almost suggest making "recursive" the ... testing. I have tested it on a thousand commits or so ...

git - Fredrik Kuivinen - Nov 7 2005 - 18:58

... it is fast enough for everyday > trivial merges. Hmm. True. The _really_ trivial in-index ... then just do "git reset --hard" and re-do the pull with "-s recursive" ... be good to have coverage on the recursive strategy.. Linus - To unsubscribe from ...

git - Linus Torvalds - Nov 7 2005 - 20:33

... Nov 2005, Johannes Schindelin wrote: > > On Tue, 8 Nov 2005, Linus ... that points out that "git-merge-base" is another program that ... on the number of refs it can take. Well, git-merge ... the limit should matter. The recursive strategy should only add the ...

git - Linus Torvalds - Nov 8 2005 - 20:18

... On Wed, 9 Nov 2005, Petr Baudis wrote: > > BTW, git-show- ... me suspicious. One reason git-merge-base is slow is because ... wrote the comment about the case in git-merge-base, I ... because they actually have two merge parents. Linus - To unsubscribe from ...

git - Linus Torvalds - Nov 8 2005 - 20:51

... fast enough for everyday >> trivial merges. > > Hmm. True. The _really_ trivial ... 2, max 199 Number of merge parents: average 2.00, median ... saw yourself. Some observations. - Trivial Merges count is surprisingly high. About ...

git - Junio C Hamano - Nov 11 2005 - 18:25

... without ever seeing the virtual merge. In fact, it really is ... (see the "merge_base()" function in merge-base.c). So in general, ... any number of "OR commits" on either side, as long as ... .sh anyway (actually, not git-merge-base, but "git-show-branch ...

git - Linus Torvalds - Nov 8 2005 - 19:05

... You even wrote the comment about the case in git-merge-base, I'm > wondering whether it's ... -branch soon after we worked on those pathlogical merge-base fix, so I ... be simple generalization of two-head merge-base to N heads. - To unsubscribe ...

git - Junio C Hamano - Nov 8 2005 - 20:59

... B looks potentially buggy. > Actually git-merge-base without --all only mentions E ... ). Now, this case obviously depends on history being almost maximally insane ... any question about what the "quick merge" does. Linus - To unsubscribe from this ...

git - Linus Torvalds - Nov 9 2005 - 17:58

... 52:06PM -0800, Linus Torvalds wrote: > > > On Tue, 8 Nov 2005, Fredrik Kuivinen ... a bit slower than git-merge-base. > > Btw, what part of ... C, we will start with merging A with B. The result ... be possible to use git-merge-base in the first iteration ...

git - Fredrik Kuivinen - Nov 8 2005 - 18:36

... .6 history that have more than one merge-base candidates. "git- ... --all" and "git-show-branch --merge-base" give the same answer ... not think "git-show-branch --merge-base" can be any more ... efficient than "git-merge-base --all". It does _more_ things (probably ...

git - Junio C Hamano - Nov 9 2005 - 06:20

... are again no interesting commits on the list any more, so ... that have more > than one merge-base candidates. I'm not ... we can find a potential "merge base" that starts the culling ... something we can absolutely depend on). And THAT was the reason ...

git - Linus Torvalds - Nov 9 2005 - 12:30

... probably the better answer. Actually git-merge-base without --all only mentions E. ... "horizon effect" last time we worked on this --- around August 12th). G gets ... $commit } checkit() { echo MB git-merge-base --all "$@" | xargs git-name-rev ...

git - Junio C Hamano - Nov 9 2005 - 16:13