Due to external weird constraints I cannot modify the .gitignore
of my repository. Is there a way to ignore files and directories other than modifying a .gitignore
? Even if it is a global solution like a global configuration that will be applied to all my repositories.
Do not forget, according to gitignore, that there is an order of precedence in the different "ignore pattern sources" that Git consider:
- Patterns read from the command line for those commands that support them.
- Patterns read from a .gitignore file in the same directory as the path, or in any parent directory, with patterns in the higher level files (up to the root) being overridden by those in lower level files down to the directory containing the file.
- Patterns read from
$GIT_DIR/info/exclude
. - Patterns read from the file specified by the configuration variable
core.excludesfile
.
The last two can be a solution for your problem but:
- they are not replicated for a distant repository
- they can have their patterns overridden by the other sources
(See also this SO question)
The other two solutions involve updating the index (git update-index
):
git update-index --assume-unchanged
: see "Git: untrack a file in local repo only and keep it in the remote repo".
It is mentioned by Elijah Lynn in the comments.- You can even ignore a folder content: "
git update-index --assume-unchanged
on directory". - Use
--no-assume-unchange
to reverse the effect: See "Is it possible togit add
a file currently protected byassume-unchanged
?".
- You can even ignore a folder content: "
However, when you checkout another branch or when you git pull
, that "ignore" status might be reset. Hence the other option:
git update-index --skip-worktree
; see:
The difference between the two is explained in "Git - Difference Between 'assume-unchanged
' and 'skip-worktree
'".
update-index --skip-work-tree
. I jave edited the answer to add some links to old answers of mine illustrating those two update-index
commands. –
Jammiejammin --assume-unchanged
? –
Aalborg If you can modify .git/info/exclude
you can put the same rules there. But that file is within your local repo only.
.git
directory in a submodule... –
Christology .git
folder is actually at parent_repo/.git/modules/submodule_name
. So you'd edit parent_repo/.git/modules/submodule_name/info/exclude
–
Engleman Do not forget, according to gitignore, that there is an order of precedence in the different "ignore pattern sources" that Git consider:
- Patterns read from the command line for those commands that support them.
- Patterns read from a .gitignore file in the same directory as the path, or in any parent directory, with patterns in the higher level files (up to the root) being overridden by those in lower level files down to the directory containing the file.
- Patterns read from
$GIT_DIR/info/exclude
. - Patterns read from the file specified by the configuration variable
core.excludesfile
.
The last two can be a solution for your problem but:
- they are not replicated for a distant repository
- they can have their patterns overridden by the other sources
(See also this SO question)
The other two solutions involve updating the index (git update-index
):
git update-index --assume-unchanged
: see "Git: untrack a file in local repo only and keep it in the remote repo".
It is mentioned by Elijah Lynn in the comments.- You can even ignore a folder content: "
git update-index --assume-unchanged
on directory". - Use
--no-assume-unchange
to reverse the effect: See "Is it possible togit add
a file currently protected byassume-unchanged
?".
- You can even ignore a folder content: "
However, when you checkout another branch or when you git pull
, that "ignore" status might be reset. Hence the other option:
git update-index --skip-worktree
; see:
The difference between the two is explained in "Git - Difference Between 'assume-unchanged
' and 'skip-worktree
'".
update-index --assume-unchanged
@see https://mcmap.net/q/54457/-how-do-you-make-git-ignore-files-without-using-gitignore –
Propertius update-index --skip-work-tree
. I jave edited the answer to add some links to old answers of mine illustrating those two update-index
commands. –
Jammiejammin --assume-unchanged
? –
Aalborg There are three ways to tell GIT which files to ignore:
.gitignore
files$GIT_DIR/info/exclude
- Files pointed to via the
core.excludesFile
setting
The latter two points could solve your problem.
For further information, see gitignore(5).
I have been in similar situations, so I'm adding my preferred solution that I don't see mentioned. The problem with git update-index --assume-unchanged
in this case is that you cannot do that for an untracked file. You said
I cannot modify the .gitignore of my repository.
I'm going to assume what you mean is that you can't push any changes to .gitignore
to origin. If that is the case what you can do is add the untracked file to your local .gitignore
, then do git update-index --assume-unchanged .gitignore
so that your change to .gitignore
is never pushed. Now you are ignoring the (possibly) untracked file, and not affecting the remote .gitignore
file.
git update-index --no-assume-unchanged .gitignore; git stash push -- .gitignore; git pull; git stash pop #may need to resolve conflict; git update-index --assume-unchanged .gitignore;
–
Selenium Another way:
- edit local
.gitignore
- then
git update-index --assume-unchanged .gitignore
Ignore local changes to tracked files:
git update-index --assume-unchanged my-file.php
Unignore local changes to tracked files:
git update-index --no-assume-unchanged my-file.php
source: git help update-index
--[no-]assume-unchanged
...
This option can be also used as a coarse file-level mechanism to ignore uncommitted changes in tracked
files (akin to what .gitignore does for untracked files). Git will fail (gracefully) in case it needs to
modify this file in the index e.g. when merging in a commit; thus, in case the assumed-untracked file is
changed upstream, you will need to handle the situation manually.
If you just want to have some local files in the repository and the subdirectory location is flexible, you can put your files in tracked_dir1/tracked_dir2/untracked_dir/
and then add a tracked_dir1/tracked_dir2/untracked_dir/.gitignore
with contents like:
*
I.e.
$ cat > tracked_dir1/tracked_dir2/untracked_dir/.gitignore
*
<Ctrl+D>
You can use the global gitignore method instead of modifying the one in the project https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
I use VS Code. I found this discussion and now I use the extension GitSweep
The extension is specific to VS Code but it uses Git techniques, which was helpful to learn. As their site says:
GitSweep uses git's
--skip-worktree
and.git/info/exclude
to exclude changed files that you don't want to accidentally commit.
So these techniques are not new, nor specific to VS Code; the accepted answer already describes how to use git update-index --skip-worktree {file}
and/or $GIT_DIR/info/exclude
.
However, the extension is handy because it gives a visual reminder. Also, the GIF demo of the extension (seen below) points out that a new file can't use --skip-worktree
, which implies that an old/already-tracked file might not be able to use .git/info/exclude
. The inability to use .git/info/exclude
was my problem -- so GitSweep taught me something new about how Git works!
The screenshot below demonstrates that files that I was already tracking in my repo could not be ignored with .git/info/exclude
. When I listed them in my .git/info/exclude
file , they were marked "Excluded" by GitSweep, but not removed from the Git/Source Control "Changes" list in VS Code (unexpected results, left of screenshot, red arrows). This was true before the GitSweep extension, GitSweep just reminds me what's happening.
However, when I used GitSweep to "sweep" the files (which uses the --skip-worktree
technique , apparently), the files were no longer listed under my Git/Source Control "Changes" list! (expected results, right of screenshot, green arrows). This technique would also work independently of the GitSweep extension, GitSweep just reminds me what's happening.
Indeed, I could achieve the same effect without GitSweep VS Code extension, using the plain git commands $ git update-index --skip-worktree index.html
, GitSweep just helps me remember what's happening. And for me, the --skip-worktree
technique still works even if I checkout other branches (i.e. I don't get errors like described here), nor do I have to repeat the command (like when changing branches and using the --assume-unchanged
technique)
Modifying .git/info/exclude
using vim or emacs works fine for me.
Taking note of @Desko27 comment, this approach, though, doesn’t work if you want to ignore files that are already being tracked by Git.
So ignore files early before tracking it.
© 2022 - 2024 — McMap. All rights reserved.
update-index --assume-unchanged
@see https://mcmap.net/q/54457/-how-do-you-make-git-ignore-files-without-using-gitignore – Propertius