Merge pull request #1577 from AnswerDotAI/fix-clean-cli-cmds

fix reference to nbdev cli cmds: _ -> -

Author: jph00

nbdev/clean.py

@@ -205,7 +205,7 @@ def nbdev_install_hooks():
     hook_path = repo_path/'.git'/'hooks'
     fn = hook_path/'post-merge'
     hook_path.mkdir(parents=True, exist_ok=True)
-    fn.write_text("#!/bin/bash\nnbdev_trust")
+    fn.write_text("#!/bin/bash\nnbdev-trust")
     os.chmod(fn, os.stat(fn).st_mode | stat.S_IEXEC)
 
     cmd = 'git config --local include.path ../.gitconfig'
@@ -219,7 +219,7 @@ def nbdev_install_hooks():
 #
 [merge "nbdev-merge"]
 	name = resolve conflicts with nbdev_fix
-	driver = nbdev_merge %O %A %B %P
+	driver = nbdev-merge %O %A %B %P
 ''')
     run(cmd)
 

nbs/api/11_clean.ipynb

@@ -707,7 +707,7 @@
     "    hook_path = repo_path/'.git'/'hooks'\n",
     "    fn = hook_path/'post-merge'\n",
     "    hook_path.mkdir(parents=True, exist_ok=True)\n",
-    "    fn.write_text(\"#!/bin/bash\\nnbdev_trust\")\n",
+    "    fn.write_text(\"#!/bin/bash\\nnbdev-trust\")\n",
     "    os.chmod(fn, os.stat(fn).st_mode | stat.S_IEXEC)\n",
     "\n",
     "    cmd = 'git config --local include.path ../.gitconfig'\n",
@@ -721,7 +721,7 @@
     "#\n",
     "[merge \"nbdev-merge\"]\n",
     "\tname = resolve conflicts with nbdev_fix\n",
-    "\tdriver = nbdev_merge %O %A %B %P\n",
+    "\tdriver = nbdev-merge %O %A %B %P\n",
     "''')\n",
     "    run(cmd)\n",
     "\n",