git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Branch Awareness

From
謝F謝晉凡 Hsieh Chin Fan <kernel@topo.tw>
Date
Nov 19, 2026, 12:27 UTC
Message-ID
<av7rT2dKR1zguMeN@dell>
In-Reply-To
<CAA8YNQAsyUe275DLPRnB4dym5aq9ZyemA39u+HJciKzat5tNQA@mail.gmail.com>

.gitignore is itself a tracked file. A merge from feature into main would also merge the branch rules. This makes the rules hard to reason about.

What Git already provides based on .git/config:
# .git/config
[includeIf "onbranch:feature/**"]
    path = .git/feature.config
# .git/feature.config
[core]
    excludesFile = .git/feature.ignore    # contains: settings.py

$ git switch main ; git status -s -> ?? settings.py $ git switch feature/x ; git status -s -> (nothing)

On Thu, Nov 19, 2026 at 11:54:02AM +0200, Jordan K wrote:
Show 22 quoted lines
>I have a situation at my current workplace that led me to consider this feature:
>
>We crudely pass around a `settings.py` file that doesn't match the one
>stored in our `main` branch, as many workplaces do.
>
>Feature request:
>Allow `.gitignore` branch awareness, so that changes/the existence of
>a specific file are ignored in all branches that are not
>`specific-branch-name` or ignore the file in ONLY
>`specific-branch-name`
>
>Sor of like a whitelist/blacklist flag (there should be an option to
>use either).
>
>I think this is an impactful feature, as many git users have
>situations where they need to ignore Django migration files, local
>settings files, compiled binary changes, etc etc but those files _do_
>need to exist and be included on the staging/main branches
>
>Regards
>Jordan Kadish
>
-- 
謝晉凡 Hsieh Chin Fan
site: https://topo.tw/about
timezone: GMT-4
Previous: Jordan KNext: Ben Knoble
Message 2 of 3 in “Branch Awareness”
  1. Jordan KNov 19, 2026
  2. 謝晉凡 Hsieh Chin FanNov 19, 2026
  3. Ben KnobleNov 21, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.