Re: [BUG] git-rebase: reword squashes commits in case of merge-conflicts

the code should be the same, though. I gave native Git version 2.17.1 on Ubuntu 18.04 (no WSL this time) a try and was able to reproduce the issue outlined in my first email. In case there is a misunderstanding, when I wrote On 11.06.2018 18:06, ch wrote: > After the rebase the 'stuff&#x

[BUG] git-rebase: reword squashes commits in case of merge-conflicts

e rebase should finish cleanly. After the rebase the 'stuff' branch only has a single commit even though I'd expect there to be two according to the instructions that were passed to git-rebase. It works as expected if there's either no merge-conflict at the reword or if the conflicting commit is applied as 'pick'. I'm running git version 2.17.1.windows.2. I also tried native git version 2.7.4 via WSL (running Ubuntu 16.04.4 LTS) and this version does not exhibit this behavior. - ch

INFO

I have important transaction for you as next of kin to claim US$8.37m email me at changgordo...@yahoo.com.hk so I can send you more details

Re: Add --ignore-missing to git-pack-objects?

Hi Jeff. Thanks a lot for your response. Jeff King wrote: So if I understand correctly, you are only using these for the negative side of the traversal? Yes. Jeff King wrote: rev-list should ignore missing objects in such a case even without --ignore-missing, and I think it may simply be

Add --ignore-missing to git-pack-objects?

Hi. Is it possible to add an option akin to git-rev-list's '--ignore-missing' to git-pack-objects? I use git bundles to (incrementally) backup my repositories. My script inspects all bundles in the backup and passes their contained refs as excludes to git-pack-objects to build the pack for the n

Passing revs to git-bundle-create via stdin

Hi, I'm using git bundles to create (incremental) backups of my local repositories. This works quite well but for certain repositories I'm getting unexpectedly big incremental bundles. I did some testing and from what I can tell it seems git-bundle-create has issues processing revs passed via std

my private

My name is Gatan Magsino, I work with Mediterranean Bank in Malta. Can i trust you with a business worth $8.3M USD? Please reply ONLY to my private email: mga...@rogers.com for more information -- To unsubscribe from this list: send the line "unsubscribe git" in the