Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-14 Thread David Aguilar
On Tue, Oct 14, 2014 at 11:35:11PM -0700, David Aguilar wrote: > On Mon, Oct 13, 2014 at 12:16:55PM -0700, Junio C Hamano wrote: > > David Aguilar writes: > > > > > From: Charles Bailey > > > > > > Signed-off-by: Charles Bailey > > > Signed-off-by: David Aguilar > > > --- > > > Changes since v

Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-14 Thread David Aguilar
On Mon, Oct 13, 2014 at 12:16:55PM -0700, Junio C Hamano wrote: > David Aguilar writes: > > > From: Charles Bailey > > > > Signed-off-by: Charles Bailey > > Signed-off-by: David Aguilar > > --- > > Changes since v2: > > > > This now uses the new git_dir_init function. > > > > git-mergetool.sh

Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-13 Thread Junio C Hamano
David Aguilar writes: > From: Charles Bailey > > Signed-off-by: Charles Bailey > Signed-off-by: David Aguilar > --- > Changes since v2: > > This now uses the new git_dir_init function. > > git-mergetool.sh | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/git-merget

[PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

2014-10-11 Thread David Aguilar
From: Charles Bailey Signed-off-by: Charles Bailey Signed-off-by: David Aguilar --- Changes since v2: This now uses the new git_dir_init function. git-mergetool.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 96a61ba..cddb5