Skip to content

fix(git): change branch.autoSetupMerge from 'always' to 'simple'#57

Merged
chicham merged 1 commit intomainfrom
fix/git-branch-autosetuprmerge
Feb 21, 2026
Merged

fix(git): change branch.autoSetupMerge from 'always' to 'simple'#57
chicham merged 1 commit intomainfrom
fix/git-branch-autosetuprmerge

Conversation

@chicham
Copy link
Copy Markdown
Collaborator

@chicham chicham commented Feb 21, 2026

Summary

Fixes branch.autoSetupMerge = always which incorrectly sets upstream tracking to local branches when branching off another local branch.

With simple, upstream is only set when the start point is a remote-tracking branch (e.g. origin/main), keeping the push.autoSetupRemote=true workflow clean.

Closes #48

@chicham
fix(git): change branch.autoSetupMerge from 'always' to 'simple'
7ce512f 
Using 'simple' only sets upstream tracking when starting from a
remote-tracking branch, avoiding confusion with push.autoSetupRemote=true.

Closes #48
@gemini-code-assist
Copy link
Copy Markdown
Contributor

gemini-code-assist bot commented Feb 21, 2026

Summary of Changes

Hello @chicham, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the Git configuration to prevent unintended upstream tracking for local branches. By modifying the branch.autoSetupMerge setting, the change ensures that Git only establishes upstream relationships when a new branch is created from a remote-tracking branch, thereby streamlining the branching and pushing workflow and resolving a specific issue related to incorrect local branch tracking.

Highlights

  • Git Configuration Update: The branch.autoSetupMerge setting in the Git configuration template has been changed from always to simple. This resolves an issue where always incorrectly set upstream tracking to local branches when branching off another local branch.
  • Improved Branch Tracking Workflow: With the simple setting, upstream tracking is now only established when the starting point is a remote-tracking branch (e.g., origin/main), which helps maintain a cleaner workflow when push.autoSetupRemote=true is enabled.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • dot_gitconfig.tmpl
    • Updated the branch.autoSetupMerge setting from always to simple.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist[bot]
gemini-code-assist bot reviewed Feb 21, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

The pull request correctly addresses the issue of branch.autoSetupMerge incorrectly setting upstream tracking to local branches. Changing the value from always to simple aligns with the desired behavior of only setting upstream when branching off a remote-tracking branch, which is a good improvement for maintaining a clean push.autoSetupRemote=true workflow. The change is minimal and directly resolves the reported bug.

@chicham chicham merged commit e5b229f into main Feb 21, 2026
@chicham chicham deleted the fix/git-branch-autosetuprmerge branch February 21, 2026 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Git: Fix branch.autoSetupMerge from 'always' to 'simple'

1 participant

@chicham