@pavlovic265/gt 0.58.6 → 0.58.8

package/README.md

@@ -19,7 +19,7 @@
 - **Branch Stack Navigation**: Seamlessly move up and down your branch hierarchy
 - **Stack Management**: Restack branches to keep your branch hierarchy up to date
 - **Automated Git Workflows**: Simplify rebasing, syncing, and cleaning up merged branches
-- **Enhanced Pull Request Management**: Create, list, merge, and update PRs with CI/CD status indicators and mergeable state visualization
+- **Enhanced Pull Request Management**: Create, list, and merge PRs with CI/CD status indicators
 - **Multi-Platform Support**: Works with GitHub and GitLab
 - **Account Management**: Add, edit, list, and remove multiple accounts with full profile information
 - **Authentication Management**: Easy account switching and token management
@@ -143,7 +143,8 @@ This means you can use gt as a drop-in replacement for git while getting the ben
 | `checkout` | `co` | Checkout/search and switch to branch | `gt checkout main` |
 | `delete` | `dl` | Delete a branch | `gt delete old-branch` |
 | `clean` | `cl` | Clean merged branches (excludes protected) | `gt clean` |
-| `move` | `mv` | Rebase current branch | `gt move` |
+| `move` | `mv` | Rebase current branch onto another branch | `gt move` |
+| `track` | `tr` | Set parent branch relationship (no rebase) | `gt track` |
 
 ### Navigation
 
@@ -176,21 +177,17 @@ This means you can use gt as a drop-in replacement for git while getting the ben
 |---------|-------|-------------|---------|
 | `pull_request create` | `pr c` | Create a new pull request | `gt pr c` |
 | `pull_request create -d` | `pr c -d` | Create a draft pull request | `gt pr c -d` |
-| `pull_request list` | `pr li` | List all pull requests with CI/CD status and mergeable state | `gt pr li` |
+| `pull_request list` | `pr li` | List all pull requests with CI/CD status | `gt pr li` |
 
 **Pull Request List Features:**
 - **CI/CD Status Indicators**: View build status at a glance
   - `✓` (Green) - Success
   - `✗` (Red) - Failure/Error
   - `★` (Yellow) - Pending/In Progress
-- **Mergeable Status**: See merge conflicts status
-  - `●` (Green) - Mergeable
-  - `●` (Red) - Has conflicts
 - **Interactive Actions**:
   - Press `Enter` to open PR in browser
   - Press `y` to yank (copy) PR URL to clipboard
   - Press `m` to merge the pull request
-  - Press `u` to update PR branch with base branch changes
 
 ### Stack Management
 
@@ -251,7 +248,7 @@ gt account add
 ```
 
 The account management commands allow you to:
-- **Add accounts**: Interactively add GitHub/GitLab accounts with username, email, full name, platform, and API token
+- **Add accounts**: Interactively add GitHub/GitLab accounts with username, email, full name, platform, API token, and GPG signing key for commit signing
 - **List accounts**: View all configured accounts with their details
 - **Edit accounts**: Modify existing account information
 - **Remove accounts**: Delete accounts you no longer need
@@ -266,17 +263,20 @@ accounts:
     name: "User One"
     token: "ghp_..."
     platform: "GitHub"
+    signingkey: "ABCD1234EFGH5678"
   - user: "username2"
     email: "user2@example.com"
     name: "User Two"
     token: "glpat-..."
     platform: "GitLab"
+    signingkey: "1234ABCD5678EFGH"
 active_account:  # Automatically managed by auth commands
   user: "username1"
   email: "user1@example.com"
   name: "User One"
   token: "ghp_..."
   platform: "GitHub"
+  signingkey: "ABCD1234EFGH5678"
 theme:
   type: "dark"
 version:
@@ -400,6 +400,45 @@ gt down  # Move to: feature/auth-system
 gt down  # Move to: feature/user-auth
 ```
 
+### Branch Tracking
+```bash
+# Interactively select a parent branch to track (no rebase)
+gt track
+# or use the alias
+gt tr
+
+# This will:
+# 1. Display an interactive list of all branches (excluding current)
+# 2. Allow searching/filtering branches by typing
+# 3. Select a parent branch with Enter
+# 4. Store parent relationship in git config (gt.branch.<branch>.parent)
+# Note: This does NOT rebase, only sets the parent relationship
+
+# Example workflow:
+# You're on 'feature/new-feature' and want to track 'develop' as parent
+gt track
+# Search for 'develop', press Enter to select
+# ✓ successfully tracking feature/new-feature
+
+# Manual parent configuration (alternative to gt track):
+# You can manually set the parent branch in git config
+git config --local gt.branch.<branch-name>.parent <parent-branch>
+
+# Example: Set 'main' as parent of current branch
+git config --local gt.branch.$(git rev-parse --abbrev-ref HEAD).parent main
+
+# View parent relationship
+git config --local --get gt.branch.<branch-name>.parent
+
+# Remove parent relationship
+git config --local --unset gt.branch.<branch-name>.parent
+
+# The parent relationship is used by:
+# - gt up/down: Navigate branch hierarchy
+# - gt stack restack: Rebase child branches onto their parents
+# - Branch organization and visualization
+```
+
 ### Multi-Account Management
 ```bash
 # Add a new account
@@ -410,6 +449,7 @@ gt account add
 # - Full name
 # - Platform (GitHub/GitLab)
 # - API token
+# - GPG signing key for commit signing (optional)
 
 # List all configured accounts
 gt account list
@@ -494,15 +534,14 @@ gt s rs
 gt pr li
 
 # Output shows:
-# ✓ 123: Add authentication module - ● (CI passed, mergeable)
-# ✗ 124: Fix bug in parser - ● (CI failed, has conflicts)
-# ★ 125: Update dependencies - ● (CI pending, mergeable)
+# ✓ 123: Add authentication module (CI passed)
+# ✗ 124: Fix bug in parser (CI failed)
+# ★ 125: Update dependencies (CI pending)
 
 # Interactive actions in the PR list:
 # - Enter: Open selected PR in browser
 # - y: Copy PR URL to clipboard
 # - m: Merge the selected PR
-# - u: Update PR branch with latest base branch changes
 # - /: Search/filter PRs
 # - Esc/q: Exit
 
@@ -510,7 +549,6 @@ gt pr li
 gt pr li
 # Press 'y' on a PR to copy its URL for sharing
 # Press 'm' on a PR to merge it directly from the terminal
-# Press 'u' on a PR to update it with the latest changes from base
 ```
 
 ## 🚧 Planned Features
@@ -521,7 +559,6 @@ gt pr li
 - [ ] **Multi-Platform Git Integration** — Support for additional Git platforms beyond GitHub (e.g., GitLab, Bitbucket).
 - [ ] **Theme Customization** — Flexible theme settings to personalize the CLI experience.
 - [ ] **Automated GitHub Setup** — One-command configuration for GitHub authentication, commit signing, tokens, and SSH keys.
-- [x] **Git Config Profiles** — Dynamic `.gitconfig` management tied to directories using `includeIf` (implemented via `gt account attach`).
 - [ ] **User-Aware Repository Checkout** — Automatically clone and manage repositories based on the active user profile.
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pavlovic265/gt",
-  "version": "0.58.6",
+  "version": "0.58.8",
   "description": "Git workflow utility with intelligent branch management and automation",
   "author": "Marko Pavlovic <pavlovic265@gmail.com>",
   "license": "MIT",