Bug? Interactive rebase with reword after conflict

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hey All,

I'm seeing some weird behavior when doing interactive rebase of a
single commit with reword if there's a conflict. The rebased commit
gets "squashed" into the target commit and is not a child of that.

I've asked this question in the git-users group first a few weeks ago,
but got no explanation:
https://groups.google.com/forum/?fromgroups#!topic/git-users/1X15nAts3mg

Please refer to the link above for detailed repro steps (reproducible
with 2.18.0).

Kind Regards,
Daniel



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux