Re: Bug: .gitconfig folder

2015-05-27 Thread Stefan Beller
On Wed, May 27, 2015 at 3:18 PM, Jeff King p...@peff.net wrote: On Wed, May 27, 2015 at 01:30:29PM -0700, Junio C Hamano wrote: Jorge grif...@gmx.es writes: If you have a folder named ~/.gitconfig instead of a file with that name, when you try to run some global config editing command it

Re: [PATCH] glossary: add remote and submodule

2015-05-27 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Noticed-by: Philip Oakley philipoak...@iee.org Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/glossary-content.txt | 10 ++ 1 file changed, 10 insertions(+) diff --git a/Documentation/glossary-content.txt

Re: [PATCH v3 0/4] showing existing ws breakage

2015-05-27 Thread Jeff King
On Tue, May 26, 2015 at 11:30:28PM -0700, Junio C Hamano wrote: The fourth one in v2 used a new option --[no-]ws-check-deleted, but in this round a new option --ws-error-highlight=kinds is defined instead. With that, you can say diff --ws-error-highlight=new,old to say I want to

Re: Staging commits with visual diff tools?

2015-05-27 Thread Jeff King
On Tue, May 26, 2015 at 09:50:49PM +0100, John Lee wrote: Does anybody have code to stage commits using a the visual diff/merge tools supported by git-difftool? Is there support in git itself somewhere, even? I'm looking for something functionally similar to git add -p Looking at the

Re: Staging commits with visual diff tools?

2015-05-27 Thread John Lee
On Wed, 27 May 2015, Jeff King wrote: If you are interested in looking further, see how the %patch_mode hash is defined in git-add--interactive.perl. Specifically, note that add -p is just one case: diff against the index and apply with apply --cached. But once you have a separate tool for

<    1   2