From: 謝晉凡 Hsieh Chin Fan Date: Thu, 19 Nov 2026 12:27:59 GMT Subject: Re: Branch Awareness Message-ID: In-Reply-To: .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