Re: Branch switching with submodules where the submodule replaces a folder aborts unexpectedly

On 12 Oct 2017 at 11:48 Thomas Braun wrote: > On 9 Oct 2017 at 23:59, Stefan Beller wrote: >> On 9 Oct 2017 at 14:29, Thomas Braun wrote: >>> I'm currently in the progress of pulling some subprojects in a git >>> repository of mine into their >>> own repositories and adding these subprojects back

Re: `git merge --abort` does not run `git rerere clear`

On 12/06/2018, Junio C Hamano wrote: > Sam Kuper writes: >> [...] It makes sense that `git am [--skip|--abort]` and `git rebase >> [--skip|--abort]` would run `git rerere clear`. >> >> However, if they run it, then shouldn't `git merge --abort` run it, too? >> &

`git merge --abort` does not run `git rerere clear`

`man git-rerere` says: > clear > > Reset the metadata used by rerere if a merge resolution is to be > aborted. Calling git am [--skip|--abort] or git rebase > [--skip|--abort] will automatically invoke this command. It makes sense that `git am [--skip|--abort]` and `git rebase [--skip|--abort]`

Re: Bug report: "Use of uninitialized value $_ in print"

On 02/03/2018, Junio C Hamano wrote: > Jeff King writes: >> Unfortunately, I don't think there's an easy way to do what you want >> (show word-diffs but apply the full diff). > > The current "word-diff" discards the information on where the lines > end, and it

Re: Bug report: "Use of uninitialized value $_ in print"

On 02/03/2018, Jeff King wrote: > Unfortunately, I don't think there's an easy way to do what you want > (show word-diffs but apply the full diff). Oh :( That would be a *very* useful feature to have, especially where multiple small (e.g. single character or single word) changes

Re: Bug report: "Use of uninitialized value $_ in print"

On 02/03/2018, Jonathan Nieder wrote: > Is this reproducible for you? Yes. It seems to occur consistently, given the same input. > Do you have more details about how I can reproduce it? Unfortunately, the particular git repo I encountered it on is private, otherwise I would

Bug report: "Use of uninitialized value $_ in print"

First, background. I encountered a bug on Debian Stretch, using this git version: $ git --version git version 2.11.0 The bug is that in the midst of running git -c interactive.diffFilter="git diff --word-diff --color" add --patch and after having answered "y" to some patches and "n" to