Re: [Gambas-devel] Git - more surprises
Brought to you by:
gambas
From: Benoît M. <ga...@us...> - 2017-08-18 01:26:35
|
Le 18/08/2017 à 03:21, ada...@gm... a écrit : > Ok, so I did the pull into our local "gambasbase" clone which is a "single-branch" of the "master". All worked fine and super quick. > > Then, I did a pull from my personal clone of "gambasbase". This one has some branches in it for our (paddys-hill) changes. That pull automagically started a merge, which is fine, but then.... > > it invoked vim on the commit header. That was a surprise! Not the least of which was trying to remember how the heck to get out of vim. > > Is there a way to turn off this "feature"? > > b > Check your EDITOR environment variable. I put "kwrite" in it, and everything went fine. -- Benoît Minisini |