git-clean - Remove untracked files from the working tree
Synopsis
git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>…
Description
Cleans the working tree by recursively removing files that are not under version control, starting from the current directory.
Normally, only files unknown to Git are removed, but if the -x
option is specified, ignored files are also removed. This can, for example, be useful to remove all build products.
If any optional <path>...
arguments are given, only those paths are affected.
Step 1 is to show what will be deleted by using the -n
option:
# Print out the list of files and directories which will be removed (dry run)
git clean -n -d
Clean Step - beware: this will delete files:
# Delete the files from the repository
git clean -f
- To remove directories, run
git clean -f -d
or git clean -fd
- To remove ignored files, run
git clean -f -X
or git clean -fX
- To remove ignored and non-ignored files, run
git clean -f -x
or git clean -fx
Note the case difference on the X
for the two latter commands.
If clean.requireForce
is set to "true" (the default) in your configuration, one needs to specify -f
otherwise nothing will actually happen.
Again see the git-clean
docs for more information.
Options
-f
, --force
If the Git configuration variable clean.requireForce is not set to
false, git clean will refuse to run unless given -f
, -n
or -i
.
-x
Don’t use the standard ignore rules read from .gitignore (per
directory) and $GIT_DIR/info/exclude
, but do still use the ignore
rules given with -e
options. This allows removing all untracked files,
including build products. This can be used (possibly in conjunction
with git reset) to create a pristine working directory to test a clean
build.
-X
Remove only files ignored by Git. This may be useful to rebuild
everything from scratch, but keep manually created files.
-n
, --dry-run
Don’t actually remove anything, just show what would be done.
-d
Remove untracked directories in addition to untracked files. If an
untracked directory is managed by a different Git repository, it is
not removed by default. Use -f
option twice if you really want to
remove such a directory.
In the simplest terms, git pull
does a git fetch
followed by a git merge
.
You can do a git fetch
at any time to update your remote-tracking branches under refs/remotes/<remote>/
. This operation never changes any of your own local branches under refs/heads
, and is safe to do without changing your working copy. I have even heard of people running git fetch
periodically in a cron job in the background (although I wouldn't recommend doing this).
A git pull
is what you would do to bring a local branch up-to-date with its remote version, while also updating your other remote-tracking branches.
From the Git documentation for git pull
:
In its default mode, git pull
is shorthand for git fetch
followed by git merge FETCH_HEAD
.
Best Answer
These messages are due to incorrect default value of
core.autocrlf
on Windows.The concept of
autocrlf
is to handle line endings conversions transparently. And it does!Bad news: value needs to be configured manually.
Good news: it should only be done ONE time per git installation (per project setting is also possible).
How
autocrlf
works:Here
crlf
= win-style end-of-line marker,lf
= unix-style (and mac osx).(pre-osx
cr
in not affected for any of three options above)When does this warning show up (under Windows)
–
autocrlf
=true
if you have unix-stylelf
in one of your files (= RARELY),–
autocrlf
=input
if you have win-stylecrlf
in one of your files (= almost ALWAYS),–
autocrlf
=false
– NEVER!What does this warning mean
The warning "LF will be replaced by CRLF" says that you (having
autocrlf
=true
) will lose your unix-style LF after commit-checkout cycle (it will be replaced by windows-style CRLF). Git doesn't expect you to use unix-style LF under windows.The warning "CRLF will be replaced by LF" says that you (having
autocrlf
=input
) will lose your windows-style CRLF after a commit-checkout cycle (it will be replaced by unix-style LF). Don't useinput
under windows.Yet another way to show how
autocrlf
workswhere x is either CRLF (windows-style) or LF (unix-style) and arrows stand for
How to fix
Default value for
core.autocrlf
is selected during git installation and stored in system-wide gitconfig (%ProgramFiles(x86)%\git\etc\gitconfig
on windows,/etc/gitconfig
on linux). Also there're (cascading in the following order):– "global" (per-user) gitconfig located at
~/.gitconfig
, yet another– "global" (per-user) gitconfig at
$XDG_CONFIG_HOME/git/config
or$HOME/.config/git/config
and– "local" (per-repo) gitconfig at
.git/config
in the working dir.So, write
git config core.autocrlf
in the working dir to check the currently used value and–
git config --system core.autocrlf false
# per-system solution–
git config --global core.autocrlf false
# per-user solution–
git config --local core.autocrlf false
# per-project solutionWarnings
–
git config
settings can be overridden bygitattributes
settings.–
crlf -> lf
conversion only happens when adding new files,crlf
files already existing in the repo aren't affected.Moral (for Windows):
- use
core.autocrlf
=true
if you plan to use this project under Unix as well (and unwilling to configure your editor/IDE to use unix line endings),- use
core.autocrlf
=false
if you plan to use this project under Windows only (or you have configured your editor/IDE to use unix line endings),- never use
core.autocrlf
=input
unless you have a good reason to (eg if you're using unix utilities under windows or if you run into makefiles issues),PS What to choose when installing git for Windows?
If you're not going to use any of your projects under Unix, don't agree with the default first option. Choose the third one (Checkout as-is, commit as-is). You won't see this message. Ever.
PPS My personal preference is configuring the editor/IDE to use Unix-style endings, and setting
core.autocrlf
tofalse
.