From: Charles Bailey Date: Fri, 10 Oct 2014 09:01:57 GMT Subject: Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help Message-ID: In-Reply-To: <1412931104-74648-1-git-send-email-davvid@gmail.com> On 10 Oct 2014, at 09:51, David Aguilar wrote: > Changes since v1: > > NONGIT_OK=Yes was added to make it actually work outside of a git repo. Does this actually work? The reason that I haven't got around to resending my re-roll is that I found that I needed changes to git-sh-setup.sh because doing NONGIT_OK and then require_work_tree didn't correctly set GIT_DIR when it wasn't already explicitly set in the environment. (I believe the rest of mergetool relies on it.) Perhaps I misunderstood, though.