Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page
- From
Jacob Keller <jacob.keller@gmail.com>
- Date
- Apr 12, 2018, 18:29 UTC
- Message-ID
- <CA+P7+xrYe8tcRdk0_DZum8yR0=WLXgQRj4kkiQv_LBBcGoD=rA@mail.gmail.com>
- In-Reply-To
- <nycvar.QRO.7.76.6.1804121102260.65@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
On Thu, Apr 12, 2018 at 2:30 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 15 quoted lines
>> I think it would be worthwhile to point out that unlike the other commands >> this will not preserve untracked files. Maybe something like >> "Note that unlike the `pick` or `merge` commands or initial checkout when the >> rebase starts the `reset` command will overwrite any untracked files." > > You know what? You just pointed out a bug in my thinking. Previously, I > thought that this is impossible, that you cannot overwrite untracked files > because we labeled this revision previously, so the only new files to > write by `reset` were tracked files previous. But that forgets `exec` and > `reset` with unlabeled revisions (e.g. for cousins). > > So I changed the `reset` command to refuse overwriting untracked files... > > Thank you for improving this patch series! > Dscho
Good catch! This could possibly have bitten someone badly.