Git development
 help / color / mirror / Atom feed
* Branch Awareness
@ 2026-11-19  9:54 Jordan K
  2026-11-19 12:27 ` 謝晉凡 Hsieh Chin Fan
  0 siblings, 1 reply; 2+ messages in thread
From: Jordan K @ 2026-11-19  9:54 UTC (permalink / raw)
  To: git

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Branch Awareness
  2026-11-19  9:54 Branch Awareness Jordan K
@ 2026-11-19 12:27 ` 謝晉凡 Hsieh Chin Fan
  0 siblings, 0 replies; 2+ messages in thread
From: 謝晉凡 Hsieh Chin Fan @ 2026-11-19 12:27 UTC (permalink / raw)
  To: git

.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:
>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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-19 12:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19  9:54 Branch Awareness Jordan K
2026-11-19 12:27 ` 謝晉凡 Hsieh Chin Fan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox