Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-10-04 Thread brian m. carlson
On Sat, Sep 28, 2013 at 02:32:44AM +0300, Paul Sokolovsky wrote: $ git --version git version 1.8.4 Specifically from Ubuntu PPA: http://ppa.launchpad.net/git-core/ppa/ubuntu Script to reproduce the issue is: https://gist.github.com/pfalcon/6736632 , based on a real-world case of

Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-10-04 Thread Paul Sokolovsky
Hello, On Fri, 4 Oct 2013 20:28:54 + brian m. carlson sand...@crustytoothpaste.net wrote: On Sat, Sep 28, 2013 at 02:32:44AM +0300, Paul Sokolovsky wrote: $ git --version git version 1.8.4 Specifically from Ubuntu PPA: http://ppa.launchpad.net/git-core/ppa/ubuntu Script

Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-09-27 Thread brian m. carlson
On Tue, Sep 24, 2013 at 10:56:48PM +0300, Paul Sokolovsky wrote: Hello, git rebase is confused about commits like https://github.com/pfalcon/civetweb/commit/ce8493837bf7676c6d824cdcb1d5e3a7ed476fe1 - it stops, telling user to just run rebase --continue. I remember like few years ago rebase

Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-09-27 Thread Paul Sokolovsky
Hello Brian, On Fri, 27 Sep 2013 22:28:07 + brian m. carlson sand...@crustytoothpaste.net wrote: On Tue, Sep 24, 2013 at 10:56:48PM +0300, Paul Sokolovsky wrote: Hello, git rebase is confused about commits like

git rebase is confused about commits w/o textual changes (e.g. chmod's)

2013-09-24 Thread Paul Sokolovsky
Hello, git rebase is confused about commits like https://github.com/pfalcon/civetweb/commit/ce8493837bf7676c6d824cdcb1d5e3a7ed476fe1 - it stops, telling user to just run rebase --continue. I remember like few years ago rebase was confused like that oftentimes, which is in turn confused novices