Professional Git

Connected Lab 7

Deleting, Renaming, and Stashing

In this lab, you'll work through some examples of using the rm and mv commands and stashing uncommitted changes.

PREREQUISITES

This lab assumes that you have done Connected Lab 6: Practicing with Merging. You should start out in the same directory as that lab.

STEPS

1. Starting out in the same directory as Connected Lab 6, create a new file, stage it, and commit it.

   $ echo "another one" > file6.c
   $ git add .
   $ git commit -m "yet another lab file"

2. You now decide to remove the file. Use the rm command to do that.

   $ git rm file6.c

3. Check the status to determine whether the file is staged for removal.

   $ git status

4. Run the ls command to find out whether the local file is still there.

   $ ls

5. You now change your mind, and you want the file back. Use the reset command to do that.

   $ git reset --hard HEAD

6. Check the status.

   $ git status

7. To find out whether the file is back locally, run the ls command.

   $ ls

8. Delete the file anyway.

   $ git rm file6.c

9. Check the status; the file should be staged for deletion.

   $ git status -sb

10. You commit to the deletion this time.

    $ git commit -m "<comment>"

11. (Optional) Check the status and run the ls command to make sure the file is really gone.

    $ git status
    $ ls

12. (Optional) Take a look at the changes in gitk. (Start it using the command “gitk &” if you don't have gitk running, or press F5 to refresh if you do have it open.)
13. You decide to make a couple of other changes. Start by creating a new file.

    $ echo "one more" > file7.c ...