Git Pull opens VIM even with --no-edit -

-

the "vim opens asking commit message after implicit non-conflicting merge" seems relatively common issue, seems relatively simple answer: git config --global core.mergeoptions --no-edit.

unfortunately doesn't seem work me or @ least 8 of other 15 people in class, , our instructor bit baffled (though fair hasn't had time beyond quick google search or two). isn't that big of issue, can escape out enough :q, we'd know answer to, , google searches return stack overflow questions --no-edit solution (either via core or every time pull done).

my .gitconfig (minus personal info):

[mergetool "kdiff3"]         path = "/c/program files/kdiff3/kdiff3.exe" [merge]         tool = kdiff3 [core]         mergeoptions = --no-edit [mergetool]         keepbackup = false

and yet:

image.

does know why fix isn't working (ie: "ya dun goofed in spelling 'options'"), or if there better/more reliable way fix this?

you need add add export git_merge_autoedit=no in .bash_profile , open new bash.

you can next bash command:

echo 'export git_merge_autoedit=no' >> $home/.bash_profile && . $home/.bash_profile

i hope helps :d


Comments

Post a Comment

Popular posts from this blog

html - Styling progress bar with inline style -

-
i trying set progress bar color red using inline style. need in way because have access <body> part of document. style need apply: progress { color: red } progress::-moz-progress-bar { background: red;} progress::-webkit-progress-value { background: red; } progress[aria-valuenow]:before { background: red; } i tried <progress style="background: red;"> incorrect effect, progress bar color turns blue red background. guide right direction desired style? thank in advance. here live example: https://jsfiddle.net/z36d3f6l/
Read more

java - Oracle Sql developer error: could not install some modules -

-
i have downloaded fresh copy of sqldeveloper ( sqldeveloper-4.1.3.20.78-no-jre ) oracle website. when unzip , lauch gui, keep getting following error message: warning - not install modules: dynamic module config - no module providing capability org.netbeans.netbinox found. my system: windows 7 32 bit hp probook. jdk 1.6 , 1.7, 1.8 available in java/jdk subdirectory. netbeans 8.0.2 installed finally got way out after dirty hours. extracted sqldeveloper zip in nested directory. i.e: e://a/b/c/sqldeveloper. starting sqldeveloper gui above directory threw erros. solution: go in c:\users**username**\appdata\roaming : delete sql developer , sqldeveloper folders extract sql developer zip in new non nested directory. i.e: e:// start , should work now reference: https://community.oracle.com/thread/3870680?start=0&tstart=0
Read more

How to use autoclose brackets in Jupyter notebook? -

-
this may sound silly question, how make use of autoclose brackets in jupyter notebook? example, when type print( jupyter notebook auto-closes brakets print() and places cursor inside. type argument, say print(1 + 1) now cursor between second 1 , right bracket ) . key navigate right of ) ? of course can press end or → or ) achieve this, not seem save time, purpose of brackets autoclose suppose? thanks in advance.
Read more