git-jira-shortcuts 1.0.1 → 1.0.3

package/README.md

@@ -18,7 +18,7 @@ Running `git-jira-shortcuts init` creates `~/.git-jira-shortcuts.env` with:
 
 | Variable | Required | Description |
 |----------|----------|-------------|
-| `GJS_TICKET_PREFIX` | Yes | Jira project key (e.g. `MOTOMATE`, `PROJ`) |
+| `GJS_TICKET_PREFIX` | Yes | Jira project key (e.g. `MYPROJ`, `ACME`) |
 | `GJS_JIRA_DOMAIN` | Yes | Jira domain (e.g. `yourco.atlassian.net`) |
 | `GJS_JIRA_API_TOKEN` | Yes | Base64-encoded Jira API token |
 | `GJS_BRANCH_WEBHOOK_URL` | No | Optional webhook for branch name generation |

package/bin/cli.js

@@ -94,7 +94,7 @@ async function runInit() {
   try {
     const ticketPrefix = await ask(
       rl,
-      '  Jira project key (e.g. MOTOMATE, PROJ)',
+      '  Jira project key (e.g. MYPROJ, ACME)',
       existing.GJS_TICKET_PREFIX
     );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-jira-shortcuts",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Git + Jira workflow shortcuts for zsh — interactive branch switching, auto-prefixed commits, Jira integration, and more.",
   "author": "chipallen2",
   "license": "MIT",

package/shell/git-extras.sh

@@ -3,7 +3,7 @@
 # https://github.com/chipallen2/git-jira-shortcuts
 #
 # Configuration (set in ~/.git-jira-shortcuts.env):
-#   GJS_TICKET_PREFIX      — Jira project key (e.g. MOTOMATE, PROJ)
+#   GJS_TICKET_PREFIX      — Jira project key (e.g. MYPROJ, ACME)
 #   GJS_JIRA_DOMAIN        — Jira domain (e.g. yourco.atlassian.net)
 #   GJS_JIRA_API_TOKEN     — Base64 Jira API token
 #   GJS_BRANCH_WEBHOOK_URL — Optional webhook for branch name generation
@@ -299,7 +299,7 @@ ghelp() { # ghelp | Show all git-jira-shortcuts commands
   gp                  Pull (no rebase, no editor)
 
 ── Merge & Diff ───────────────────────────────────────────────
-  gm [branch]         Merge into current branch — conflict check first
+  gm [branch]         Merge another branch INTO your current branch
     gmerge              (same)
   gdiff [branch]      Files changed vs target branch + GitHub compare link
 
@@ -312,7 +312,28 @@ ghelp() { # ghelp | Show all git-jira-shortcuts commands
   testJira / tj       Test your Jira API connection
   ghelp               This help screen
 
-Shortcuts: "m" → master, "d" → develop, ticket number → auto-resolves branch
+── Tips ───────────────────────────────────────────────────────
+  Ticket numbers:
+    Just type the number — no need to type the full branch name.
+    Example: gw 1234  →  switches to PROJ-1234-whatever-the-branch-is
+             gt 1234  →  creates a branch named from the Jira story title
+
+  Interactive picker:
+    Leave the branch empty on gw, gdel, or gm and you'll get an
+    arrow-key menu of your recent branches to pick from.
+
+  Merge workflow (gm):
+    Stay on YOUR branch, then tell it which branch to merge in.
+    It pulls latest on that branch first, then merges it into yours.
+    Example: (on feature branch) gm develop
+             → pulls latest develop → merges develop into your branch
+
+  Auto-prefixed commits:
+    On a ticket branch like PROJ-1234-fix-bug, your commit messages
+    are automatically prefixed:  gf "fixed it"  →  "PROJ-1234: fixed it"
+
+  Branch shorthand:
+    m → master    d → develop
 EOF
 }