@gkalpak/aliases 0.10.8 → 0.12.0

package/bin/config/cfgbash.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfgbash.wsl.js

@@ -2,7 +2,7 @@
 import {stripIndentation} from '../../lib/utils.js';
 /* eslint-disable max-len */
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Copy the following into '~/.bashrc':
 
   # Set up prompt.

package/bin/config/cfggit.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Run the following commands:
 
   git config --global commit.gpgSign true

package/bin/config/cfggit.win32.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Run the following commands:
 
   git config --global commit.gpgSign true

package/bin/config/cfggit.wsl.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Run the following commands:
 
   git config --global commit.gpgSign true

package/bin/config/cfggpg.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Copy the following into '~/.gnupg/gpg-agent.conf':
 
   default-cache-ttl 86400

package/bin/config/cfgssh.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Copy the following into '~/.ssh/config':
 
   IdentityFile ~/.ssh/id-rsa-gkalpak.ppk

package/bin/config/cfgvim.js

@@ -2,6 +2,6 @@
 import {readFileSync} from 'node:fs';
 import {fileURLToPath} from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
-console.log('""" [Generated by: @gkalpak/aliases v0.10.8]');
+console.log('""" [Generated by: @gkalpak/aliases v0.12.0]');
 console.log('""" Copy the following into \'~/.vimrc\':\n');
 console.log(readFileSync(`${__dirname}/../../lib/assets/vimrc.txt`, 'utf8').trim() + '\n');

package/bin/config/cfgwsl.wsl.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {stripIndentation} from '../../lib/utils.js';
 console.log(stripIndentation(`
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Copy the following into a root-owned, 600-mode '/etc/resolv.conf' file:
 
   # Cloudflare
@@ -14,7 +14,7 @@ console.log(stripIndentation(`
 
   -----
 
-  ### [Generated by: @gkalpak/aliases v0.10.8]
+  ### [Generated by: @gkalpak/aliases v0.12.0]
   ### Copy the following into a root-owned, 600-mode '/etc/wsl.conf' file:
 
   [network]

package/bin/git/gbcd.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git checkout ${0:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gcod.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git checkout ${0:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} $*';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gdefb.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = '(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch';
+const cmd = 'node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/gprod.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git pull --rebase origin ${0:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} $*';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gprud.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git pull --rebase upstream ${0:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} $*';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/grbd.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import {commandUtils} from '@gkalpak/cli-utils';
+import {isMain, onError} from '../../lib/utils.js';
+// eslint-disable-next-line max-len
+const cmd = 'git rebase --ignore-date ${0:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} $*';
+export default cmd;
+if (isMain(import.meta.url)) {
+  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
+  // eslint-disable-next-line quotes
+  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
+}

package/bin/git/gstk.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git stash save --keep-index $*';
+const cmd = 'git stash push --keep-index $*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/{gcom.js → gstm.js}

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git checkout ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
+const cmd = 'git stash push --message $1 $2*';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/git/gsync.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'git checkout ${1:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} && git pull upstream ${1:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} && git push origin ${1:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch}';
+const cmd = 'git checkout ${1:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} && git pull upstream ${1:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"} && git push origin ${1:::node --print "const rem = \'origin\'; const exec = cmd => child_process.execSync(cmd, {encoding: \'utf8\', stdio: \'pipe\'}); try { exec(\'git rev-parse --abbrev-ref \' + rem + \'/HEAD\').slice(rem.length + 1); } catch { exec([\'main\', \'master\'].map(b => \'(git show-ref --heads --quiet \' + b + \' && echo \' + b + \')\').join(\' || \') + \' || echo unknown-branch\'); }"}';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/bin/misc/alv.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-console.log('@gkalpak/aliases v0.10.8');
+console.log('@gkalpak/aliases v0.12.0');

package/bin/node/nvmup.win32.js

@@ -2,7 +2,7 @@
 import {commandUtils} from '@gkalpak/cli-utils';
 import {isMain, onError} from '../../lib/utils.js';
 // eslint-disable-next-line max-len
-const cmd = 'node --eval "/* NVM update instructions */ (async () => { try { const currentVersion = require(\'child_process\').execSync(\'nvm version\', {encoding: \'utf8\', shell: true}).trim(); const latestVersion = await new Promise((resolve, reject) => require(\'https\').get(\'https://api.github.com/repos/coreybutler/nvm-windows/tags?per_page=1\', {headers: {\'User-Agent\': \'Node.js\'}}, res => { let responseText = \'\'; res.on(\'data\', d => responseText += d).on(\'error\', reject).on(\'end\', () => resolve(JSON.parse(responseText)[0].name.replace(/^v/, \'\'))); }).on(\'error\', reject).end()); const message = (currentVersion === latestVersion) ? \'Already up to date.\' : \'Update available.\'; const escapedInstructionsTmpl = \'Download, unzip and run: https://github.com/coreybutler/nvm-windows/releases/download/{{version}}/nvm-setup.zip\'; console.log(\'Current version: \' + currentVersion); console.log(\'Latest version:  \' + latestVersion); console.log(\'\\n  \' + message); console.log(\'\\nUpdate instructions (https://github.com/coreybutler/nvm-windows#installation--upgrades):\'); console.log(\'  \' + escapedInstructionsTmpl.split(\'{{version}}\').join(latestVersion)); } catch (err) { console.error(\'ERROR:\', err); process.exit(1); } })();"';
+const cmd = 'node --eval "/* NVM update instructions */ (async () => { try { const currentVersion = require(\'child_process\').execSync(\'nvm version\', {encoding: \'utf8\', shell: true}).trim(); const latestVersion = await new Promise((resolve, reject) => require(\'https\').get(\'https://api.github.com/repos/coreybutler/nvm-windows/tags?per_page=1\', {headers: {\'User-Agent\': \'Node.js\'}}, res => { let responseText = \'\'; res.on(\'data\', d => responseText += d).on(\'error\', reject).on(\'end\', () => resolve(JSON.parse(responseText)[0].name.replace(/^v/, \'\'))); }).on(\'error\', reject).end()); const message = (currentVersion === latestVersion) ? \'Already up to date.\' : \'Update available.\'; const escapedInstructionsTmpl = \'Download and run: https://github.com/coreybutler/nvm-windows/releases/download/{{version}}/nvm-setup.exe\'; console.log(\'Current version: \' + currentVersion); console.log(\'Latest version:  \' + latestVersion); console.log(\'\\n  \' + message); console.log(\'\\nUpdate instructions (https://github.com/coreybutler/nvm-windows#installation--upgrades):\'); console.log(\'  \' + escapedInstructionsTmpl.split(\'{{version}}\').join(latestVersion)); } catch (err) { console.error(\'ERROR:\', err); process.exit(1); } })();"';
 export default cmd;
 if (isMain(import.meta.url)) {
   const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));

package/lib/constants.js

@@ -19,8 +19,19 @@ const PR_LOCAL_BRANCH_PREFIX = 'gcoghpr';
 
 const SOURCE_NVM_CMD = '. $NVM_DIR/nvm.sh';
 const GIT_GET_DEFAULT_BRANCH_CMD =
-    `${['master', 'main'].map(b => `(git show-ref --heads --quiet ${b} && echo ${b})`).join(' || ')} || ` +
-    'echo unknown-branch';
+    stripIndentation(`
+      node --print "
+        const rem = 'origin';
+        const exec = cmd => child_process.execSync(cmd, {encoding: 'utf8', stdio: 'pipe'});
+        try {
+          exec('git rev-parse --abbrev-ref ' + rem + '/HEAD').slice(rem.length + 1);
+        } catch {
+          exec(['main', 'master'].
+            map(b => '(git show-ref --heads --quiet ' + b + ' && echo ' + b + ')').
+            join(' || ') +
+            ' || echo unknown-branch');
+        }"
+    `).replace(/([;{+])(\n)/g, '$1 $2').replace(/\n\s*/g, '');
 const GLOBAL_NPM_PACKAGES = [
   '@angular/cli',
   '@gkalpak/aliases',
@@ -257,13 +268,14 @@ const ALIASES = {
 
     // STASH
     gst: new AliasDefault('git stash $*'),
-    gstk: new AliasDefault('git stash save --keep-index $*'),
+    gstm: new AliasDefault('git stash push --message $1 $2*'),
+    gstk: new AliasDefault('git stash push --keep-index $*'),
     gstl: new AliasDefault('git stash list $*'),
     gstp: new AliasDefault('git stash pop --index $*'),
 
     // CHECKOUT
     gco: new AliasDefault('git checkout ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
-    gcom: new AliasDefault(`git checkout \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    gcod: new AliasDefault(`git checkout \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
     gcopr: new AliasDefault('git fetch upstream pull/$1/head && git checkout FETCH_HEAD'),
     gcoghpr: SCRIPT_BACKED_ALIAS('gcoghpr', 'Check out a GitHub pull request as a local branch.'),
     'gcoghpr-cleanup': new AliasDefault(
@@ -299,16 +311,16 @@ const ALIASES = {
     // BRANCH
     gb: new AliasDefault('git branch $*'),
     gbc: new AliasDefault(GIT_CREATE_BRANCH_CMD('${2:HEAD}')),
-    gbcm: new AliasDefault(GIT_CREATE_BRANCH_CMD(`\${0:::${GIT_GET_DEFAULT_BRANCH_CMD}}`)),
+    gbcd: new AliasDefault(GIT_CREATE_BRANCH_CMD(`\${0:::${GIT_GET_DEFAULT_BRANCH_CMD}}`)),
     gbco: new AliasDefault(`git fetch origin $1 && ${GIT_CREATE_BRANCH_CMD('origin/$1')}`),
     gbd: new AliasDefault('git branch --delete --force ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
 
     // PULL(-REBASE)
     gpr: new AliasDefault('git pull --rebase $*'),
     gpro: new AliasDefault('git pull --rebase origin ${*:::git rev-parse --abbrev-ref HEAD}'),
-    gprom: new AliasDefault(`git pull --rebase origin \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    gprod: new AliasDefault(`git pull --rebase origin \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
     gpru: new AliasDefault('git pull --rebase upstream ${*:::git rev-parse --abbrev-ref HEAD}'),
-    gprum: new AliasDefault(`git pull --rebase upstream \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    gprud: new AliasDefault(`git pull --rebase upstream \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
 
     // SYNC DEFAULT BRANCH
     gsync: new AliasDefault(
@@ -319,12 +331,12 @@ const ALIASES = {
 
     // REBASE
     grb: new AliasDefault('git rebase ${*:::__g-pick-branch --gkcu-returnOutput=1}'),
-    grbm: new AliasDefault(`git rebase --ignore-date \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
+    grba: new AliasDefault('git rebase --abort'),
+    grbc: new AliasDefault('git rebase --continue'),
+    grbd: new AliasDefault(`git rebase --ignore-date \${0:::${GIT_GET_DEFAULT_BRANCH_CMD}} $*`),
     grbi: new AliasDefault('git rebase --interactive HEAD~$1'),
     grbia: new AliasDefault('git rebase --autosquash --interactive HEAD~$1'),
     grbin: new AliasDefault('git rebase --no-autosquash --interactive HEAD~$1'),
-    grbc: new AliasDefault('git rebase --continue'),
-    grba: new AliasDefault('git rebase --abort'),
     gmt: new AliasDefault('git mergetool'),
     gcl: new AliasDefault('git clean --interactive "${0:::git rev-parse --show-toplevel}"'),
 
@@ -402,8 +414,8 @@ const ALIASES = {
               'nvm version',
               'coreybutler/nvm-windows',
               'installation--upgrades',
-              'Download, unzip and run: ' +
-              'https://github.com/coreybutler/nvm-windows/releases/download/{{version}}/nvm-setup.zip',
+              'Download and run: ' +
+              'https://github.com/coreybutler/nvm-windows/releases/download/{{version}}/nvm-setup.exe',
           ),
       ),
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gkalpak/aliases",
-  "version": "0.10.8",
+  "version": "0.12.0",
   "description": "My global aliases.",
   "keywords": [
     "Utility"
@@ -54,7 +54,7 @@
     "gaa": "./bin/git/gaa.js",
     "gb": "./bin/git/gb.js",
     "gbc": "./bin/git/gbc.js",
-    "gbcm": "./bin/git/gbcm.js",
+    "gbcd": "./bin/git/gbcd.js",
     "gbco": "./bin/git/gbco.js",
     "gbd": "./bin/git/gbd.js",
     "gcl": "./bin/git/gcl.js",
@@ -71,9 +71,9 @@
     "gcmifc": "./bin/git/gcmifc.js",
     "gcmifs": "./bin/git/gcmifs.js",
     "gco": "./bin/git/gco.js",
+    "gcod": "./bin/git/gcod.js",
     "gcoghpr": "./bin/git/gcoghpr.js",
     "gcoghpr-cleanup": "./bin/git/gcoghpr-cleanup.js",
-    "gcom": "./bin/git/gcom.js",
     "gcopr": "./bin/git/gcopr.js",
     "gcp": "./bin/git/gcp.js",
     "gcpa": "./bin/git/gcpa.js",
@@ -98,16 +98,16 @@
     "gpf": "./bin/git/gpf.js",
     "gpr": "./bin/git/gpr.js",
     "gpro": "./bin/git/gpro.js",
-    "gprom": "./bin/git/gprom.js",
+    "gprod": "./bin/git/gprod.js",
     "gpru": "./bin/git/gpru.js",
-    "gprum": "./bin/git/gprum.js",
+    "gprud": "./bin/git/gprud.js",
     "grb": "./bin/git/grb.js",
     "grba": "./bin/git/grba.js",
     "grbc": "./bin/git/grbc.js",
+    "grbd": "./bin/git/grbd.js",
     "grbi": "./bin/git/grbi.js",
     "grbia": "./bin/git/grbia.js",
     "grbin": "./bin/git/grbin.js",
-    "grbm": "./bin/git/grbm.js",
     "grs": "./bin/git/grs.js",
     "grs1": "./bin/git/grs1.js",
     "gs": "./bin/git/gs.js",
@@ -116,6 +116,7 @@
     "gst": "./bin/git/gst.js",
     "gstk": "./bin/git/gstk.js",
     "gstl": "./bin/git/gstl.js",
+    "gstm": "./bin/git/gstm.js",
     "gstp": "./bin/git/gstp.js",
     "gsync": "./bin/git/gsync.js",
     "halp": "./bin/misc/halp.js",
@@ -194,7 +195,7 @@
   "dependencies": {
     "@gkalpak/cli-utils": "^0.1.10",
     "chalk": "^5.3.0",
-    "inquirer": "^9.2.18",
+    "inquirer": "^9.2.20",
     "is-wsl": "^3.1.0"
   },
   "devDependencies": {

package/bin/git/gbcm.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-import {commandUtils} from '@gkalpak/cli-utils';
-import {isMain, onError} from '../../lib/utils.js';
-// eslint-disable-next-line max-len
-const cmd = 'git checkout ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} -b $1 && git config branch.$1.remote origin && git config branch.$1.merge refs/heads/$1';
-export default cmd;
-if (isMain(import.meta.url)) {
-  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
-  // eslint-disable-next-line quotes
-  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
-}

package/bin/git/gprom.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-import {commandUtils} from '@gkalpak/cli-utils';
-import {isMain, onError} from '../../lib/utils.js';
-// eslint-disable-next-line max-len
-const cmd = 'git pull --rebase origin ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
-export default cmd;
-if (isMain(import.meta.url)) {
-  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
-  // eslint-disable-next-line quotes
-  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
-}

package/bin/git/gprum.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-import {commandUtils} from '@gkalpak/cli-utils';
-import {isMain, onError} from '../../lib/utils.js';
-// eslint-disable-next-line max-len
-const cmd = 'git pull --rebase upstream ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
-export default cmd;
-if (isMain(import.meta.url)) {
-  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
-  // eslint-disable-next-line quotes
-  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
-}

package/bin/git/grbm.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-import {commandUtils} from '@gkalpak/cli-utils';
-import {isMain, onError} from '../../lib/utils.js';
-// eslint-disable-next-line max-len
-const cmd = 'git rebase --ignore-date ${0:::(git show-ref --heads --quiet master && echo master) || (git show-ref --heads --quiet main && echo main) || echo unknown-branch} $*';
-export default cmd;
-if (isMain(import.meta.url)) {
-  const {args, config} = commandUtils.preprocessArgs(process.argv.slice(2));
-  // eslint-disable-next-line quotes
-  commandUtils.run(cmd, args, Object.assign({"sapVersion":2}, config)).catch(onError);
-}