Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  git-rm.txt: Fix quoting
  • Loading branch information
Junio C Hamano committed Dec 8, 2010
2 parents f188e33 + f34e9ed commit a48aafd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Documentation/git-rm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ the paths that have disappeared from the filesystem. However,
depending on the use case, there are several ways that can be
done.

Using "git commit -a"
~~~~~~~~~~~~~~~~~~~~~
Using ``git commit -a''
~~~~~~~~~~~~~~~~~~~~~~~
If you intend that your next commit should record all modifications
of tracked files in the working tree and record all removals of
files that have been removed from the working tree with `rm`
(as opposed to `git rm`), use `git commit -a`, as it will
automatically notice and record all removals. You can also have a
similar effect without committing by using `git add -u`.

Using "git add -A"
~~~~~~~~~~~~~~~~~~
Using ``git add -A''
~~~~~~~~~~~~~~~~~~~~
When accepting a new code drop for a vendor branch, you probably
want to record both the removal of paths and additions of new paths
as well as modifications of existing paths.
Expand All @@ -111,8 +111,8 @@ tree using this command:
git ls-files -z | xargs -0 rm -f
----------------

and then "untar" the new code in the working tree. Alternately
you could "rsync" the changes into the working tree.
and then untar the new code in the working tree. Alternately
you could 'rsync' the changes into the working tree.

After that, the easiest way to record all removals, additions, and
modifications in the working tree is:
Expand Down

0 comments on commit a48aafd

Please sign in to comment.