Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@towry
Copy link
Owner

@towry towry commented May 28, 2025

  • refactor(lazygit): simplify AI commit command and add git-town sync strategy
  • refactor(lazygit): improve AI commit command description and behavior

towry added 2 commits May 28, 2025 11:01
…trategy

- Simplify lazygit AI commit command by removing fzf selection and error handling

- Add sync-feature-strategy = "merge" to git-town configuration
- update command description from "Pick AI commit" to more descriptive "Auto commit with AI"

- change subprocess to stream for better UI feedback

- add loading text to indicate when AI is generating commit suggestion
@what-the-diff
Copy link

what-the-diff bot commented May 28, 2025

PR Summary

  • Added "merge" as the Sync-Feature-Strategy in Git-Town Configuration
    This means that when you pull in changes from a remote repository, our git-town tool will now use "merge" as a default way to combine different versions of the project. This can help in resolving conflicts and make the merging process more smooth.

  • Improved Auto Committing in Lazygit
    I made a few updates to our lazygit tool which helps you manage your git repository in a more simple way. Specifically:

    • Updated the description of the commit suggestion key to "Auto commit with AI" to truly represent its functionality.

    • Removed the text interface and simplified error handling to make it easier to use the commit suggestion feature.

    • Removed the 'subprocess' option and replaced it with a 'stream' feature. This, combined with a new "loading text", will give clearer indications of what is happening when the commit suggestion is being generated. This should make the process more user-friendly and clear.

towry added 9 commits May 28, 2025 12:55
Add a new git alias 'append' that follows the same pattern as the existing 'hack' alias, but uses 'git-town append' instead of 'git-town hack' for branch creation
- Replace `pkgs-stable` parameter with direct config reference

- Improve AI commit command with better error handling and bash script execution

- Change `stream` parameter to `output` across all git-town commands

- Update lazygit settings including:

  - GUI appearance and behavior changes

  - Git merging strategy to fast-forward

  - Paging configuration with delta

  - Main branch and auto-forwarding settings

- Remove deprecated configuration options
improve markdown formatting for examples section

clarify note about code blocks in examples

reorganize example sections for better readability
Fix incorrect formatting of markdown code blocks in git commit message examples

Remove unnecessary quotes and ensure proper backtick usage for code blocks
- update flake.lock with latest versions of nix-darwin, fenix, home-manager, nixpkgs, rust-analyzer and zig-overlay

- remove unused packages from home-manager configurations (luarocks, bun, prettier, eslint, skim, overmind)

- comment out some optional packages in editor and frontend-dev configurations

- fix starship custom module name from git_town to gittown and format string
Change git merge autostash setting from true to false in home-manager configuration. This aligns with the current workflow preferences where automatic stashing during merge operations is not desired.
Move git-town related configuration from git.nix to a dedicated git-town.nix module

Add conditional enabling of git-town features in lazygit and starship configurations

Introduce new git-town enable option in config.nix
add jj-ai-commit.sh script for multi-line commit message handling

add jj-commit-context.sh script to provide commit context for AI generation

update jj.nix configuration with new ai-ci command that combines both scripts

The jj-ai-commit.sh script allows for multi-line commit message input and properly formats it for jj describe command. The jj-commit-context.sh script provides structured context including staged changes and recent commit history. The new ai-ci command in jj.nix combines these scripts with aichat to generate and apply commit messages automatically.
- Remove --quiet flag from jj describe command in jj-ai-commit.sh

- Enhance jj.nix script to handle interactive commits when no revision is provided

- Add fallback to extract parent commit ID from jj status output

- Rename new-from-bookmark alias to nb for brevity

- Improve error handling and user feedback in commit process
@towry towry merged commit 7f89114 into main May 28, 2025
1 check passed
@towry towry deleted the next branch May 28, 2025 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants