I would prefer to write my commit messages in Vim, but it is opening them in Emacs.
How do I configure Git to always use Vim? Note that I want to do this globally, not just for a single project.
commit-messageeditoremacsgitvim
I would prefer to write my commit messages in Vim, but it is opening them in Emacs.
How do I configure Git to always use Vim? Note that I want to do this globally, not just for a single project.
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
git clean -f -d
or git clean -fd
git clean -f -X
or git clean -fX
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 forgit fetch
followed bygit merge FETCH_HEAD
.
Best Solution
If you want to set the editor only for Git, do either (you don’t need both):
core.editor
in your Git config:git config --global core.editor "vim"
OR
GIT_EDITOR
environment variable:export GIT_EDITOR=vim
If you want to set the editor for Git and also other programs, set the standardized
VISUAL
andEDITOR
environment variables*:NOTE: Setting both is not necessarily needed, but some programs may not use the more-correct
VISUAL
. SeeVISUAL
vs.EDITOR
.Some editors require a
--wait
flag, or they will open a blank page. For example:Sublime Text (if correctly set up; or use the full path to the executable in place of
subl
):export VISUAL="subl --wait"
VS Code (after adding the shell command):
export VISUAL="code --wait"