Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
git_add_rm [2019/03/13 14:03] – [git rm and empty directories] rpjdaygit_add_rm [2019/03/18 12:29] (current) – [-u, --update option] rpjday
Line 152: Line 152:
 ==== "-u", "--update" option ==== ==== "-u", "--update" option ====
  
-Stage all changes and deletions of existing files, but not addition of new files:+Stage all changes and deletions of existing files, //but not addition of new files//:
  
 <code> <code>
Line 255: Line 255:
  
 Since Git cannot version empty directories, any ''git rm'' command that results in any empty directories will result in the removal of //all// resulting empty directories. Since Git cannot version empty directories, any ''git rm'' command that results in any empty directories will result in the removal of //all// resulting empty directories.
 +
 +===== Accessing deleted files =====
  
 ==== Listing all deleted files throughout history ==== ==== Listing all deleted files throughout history ====
Line 281: Line 283:
  delete mode 100644 book/06-github/images/hubot.png  delete mode 100644 book/06-github/images/hubot.png
 ... snip ... ... snip ...
 +</code>
 +
 +==== Recovering a deleted file ====
 +
 +Display the most recent commit that references the file:
 +
 +<code>
 +$ git log -1 -- OUTLINE.txt
 +commit b86814bf758645cf1d0ea8a6cbfd1486d257f4dc
 +Author: Scott Chacon <schacon@gmail.com>
 +Date:   Tue Oct 14 10:55:34 2014 +0200
 +
 +    remove changes notes and initial outline
 +$
 +</code>
 +
 +Now display its content from the //previous// commit (optionally redirect to file):
 +
 +<code>
 +$ git show b86814bf758645cf1d0ea8a6cbfd1486d257f4dc^:OUTLINE.txt
 +1. Getting Started
 +1.1 About Version Control
 +    * Local Version Control Systems
 +    * Centralized Version Control Systems
 +    * Distributed Version Control Systems
 +... snip ...
 +</code>
 +
 +You can also:
 +
 +<code>
 +$ git rev-list -n 1 HEAD -- OUTLINE.txt
 +b86814bf758645cf1d0ea8a6cbfd1486d257f4dc
 +$
 </code> </code>
  • git_add_rm.1552485812.txt.gz
  • Last modified: 2019/03/13 14:03
  • by rpjday