Re: [PATCH 1/2] Fix support for merge options.

Christian wrote: > Hi Yann, > > On Sat, May 5, 2018 at 3:24 PM, Yann Dirson wrote: > > --- > > git-reintegrate | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/git-reintegrate b/git-reintegrate > > It looks like git-reintegrate is not managed in Git but in th

[BUG] gitk deals badly with --not

When gitk is run with " --not " args, things work fine until one tries to modify the view. There it considers "--not" to be an extra git-log argument on its own, and groups the negative refs together with the positive refs, which naturally gives completely wrong results. Not sure what the best c

Strange reachability inconsistency (apparently, at least...)

I have a (fsck-clean) git tree in which for 2 commits A and B: * "git merge-base --is-ancestor A B" returns 0 * "git log B..A" returns a non-empty set of commits I get this behaviour with 2.3.0 as well as with 2.1.3 and 1.7.12. Is that a real bug or am I just misinterpreting something ? -- To un

[BUG] interactive rebase loses instruction sheet when aborting to avoid overwriting files

[using v2.1.3] When using "rebase -i" and the working dir contains untracked files that are present in the new base, we correctly get a "would be overwritten by checkout" error, but then the whole rebase interrupts the (long) listing of the incriminated files in the middle of a line and termina

HIstory simplification limited to requested refs ?

Hello, I'm trying to get gitk to draw the relationship between a bunch of integration branches. What I'm looking for is a graph that would show which of those branches is included by others. --simplify-by-decoration nearly does the job, but does not omit those heads merged into the requested b

Re: [RFC/PATCH] Supporting non-blob notes

Johan Herland wrote on 02/24/2014 02:29:10: > On Wed, Feb 19, 2014 at 12:10 AM, Duy Nguyen wrote: > > On Tue, Feb 18, 2014 at 9:46 PM, Johan Herland wrote: > >> On Mon, Feb 17, 2014 at 11:48 AM, wrote: > >>> The recent "git-note -C changes commit type?" thread > >>> ( http://thread.gmane.o

Re: Help requested - trying to build a tool doing whole-tree commits

esr: >Junio C Hamano pobox.com>: >> Perhaps not exactly what you are looking for, but don't we have >> import-tar somewhere in contrib/fast-import hierarchy (sorry, not on >> a machine yet, and I cannot give more details). > >If I recall correctly, that can only be used for original import. You m