Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions book/02-git-basics/sections/recording-changes.asc
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ $ cat .gitignore
----

The first line tells Git to ignore any files ending in ``.o'' or ``.a'' – object and archive files that may be the product of building your code.
The second line tells Git to ignore all files that end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files.
The second line tells Git to ignore all files whose names end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files.
You may also include a log, tmp, or pid directory; automatically generated documentation; and so on.
Setting up a `.gitignore` file before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository.

Expand Down Expand Up @@ -539,7 +539,7 @@ Or, you can do something like this:
$ git rm \*~
----

This command removes all files that end with `~`.
This command removes all files whose names end with a `~`.

[[_git_mv]]
==== Moving Files
Expand Down
2 changes: 1 addition & 1 deletion book/08-customizing-git/sections/config.asc
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ You can put patterns in your project's `.gitignore` file to have Git not see the

But sometimes you want to ignore certain files for all repositories that you work with.
If your computer is running Mac OS X, you're probably familiar with `.DS_Store` files.
If your preferred editor is Emacs or Vim, you know about files that end with a `~` or `.swp`.
If your preferred editor is Emacs or Vim, you know about filenames that end with a `~` or `.swp`.

This setting lets you write a kind of global `.gitignore` file.
If you create a `~/.gitignore_global` file with these contents:
Expand Down