1159 lines
39 KiB
Plaintext
1159 lines
39 KiB
Plaintext
{
|
||
"cells": [
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Skipping the Staging Area\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Skipping the Staging Area**<svg aria-labelledby=\"cds-react-aria6078214324-:r1pi:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r1pi:\"><title id=\"cds-react-aria6078214324-:r1pi:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/uAFPm/skipping-the-staging-area).\n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"cd scripts\n",
|
||
"\n",
|
||
"atom all\\_checks.py\n",
|
||
"```\n",
|
||
"\n",
|
||
"## File with code\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"#!/usr/bin/env python3\n",
|
||
"\n",
|
||
"import os\n",
|
||
"\n",
|
||
"import sys\n",
|
||
"\n",
|
||
"def check\\_reboot():\n",
|
||
"\n",
|
||
" \"\"\"Returns True if the computer has a pending reboot.\"\"\"\n",
|
||
"\n",
|
||
" return os.path.exists(\"/run/reboot-required\")\n",
|
||
"\n",
|
||
"def main():\n",
|
||
"\n",
|
||
" if check\\_reboot():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
"main()\n",
|
||
"```\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git commit \\-a \\-m \"Call check\\_reboot from main, exit with 1 on error\"\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master 033f27a\\] Call check\\_reboot from main, exit with 1 on error\n",
|
||
"\n",
|
||
" 1 file changed, 4 insertions(+), 1 deletion(-)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git log\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 033f27a8196987d61c4fd42930f2148b23434a03 (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 14:39:18 2019 +0200\n",
|
||
"\n",
|
||
" Call check\\_reboot from main, exit with 1 on error\n",
|
||
"\n",
|
||
"commit cc1acbf10fdea6cc07ebf827697666b6a35b0f36\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Thu Jul 11 17:19:32 2019 +0200\n",
|
||
"\n",
|
||
" Add a check\\_reboot function\n",
|
||
"\n",
|
||
"commit 6cfc29966acda8213fcd8ac2735b31f3fdbc6c53\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Thu Jul 11 12:08:46 2019 +0200\n",
|
||
"\n",
|
||
" Create and empty all\\_checks.py"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Getting more information from the user\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Getting More Information About Our Changes**<svg aria-labelledby=\"cds-react-aria6078214324-:r224:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r224:\"><title id=\"cds-react-aria6078214324-:r224:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/KLQkB/getting-more-information-about-our-changes)\n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git log \\-p\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 033f27a8196987d61c4fd42930f2148b23434a03 (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 14:39:18 2019 +0200\n",
|
||
"\n",
|
||
" Call check\\_reboot from main, exit with 1 on error\n",
|
||
"\n",
|
||
"diff --git a/all\\_checks.py b/all\\_checks.py\n",
|
||
"\n",
|
||
"index 340f1f7..710266a 100644\n",
|
||
"\n",
|
||
"\\--- a/all\\_checks.py\n",
|
||
"\n",
|
||
"+++ b/all\\_checks.py\n",
|
||
"\n",
|
||
"@@ -1,12 +1,15 @@\n",
|
||
"\n",
|
||
" #!/usr/bin/env python3\n",
|
||
"\n",
|
||
" import os\n",
|
||
"\n",
|
||
"+import sys\n",
|
||
"\n",
|
||
" def check\\_reboot():\n",
|
||
"\n",
|
||
" \"\"\"Returns True if the computer has a pending reboot.\"\"\"\n",
|
||
"\n",
|
||
" return os.path.exists(\"/run/reboot-required\")\n",
|
||
"\n",
|
||
"(...)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git log\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 033f27a8196987d61c4fd42930f2148b23434a03 (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 14:39:18 2019 +0200\n",
|
||
"\n",
|
||
" Call check\\_reboot from main, exit with 1 on error\n",
|
||
"\n",
|
||
"commit **cc1acbf10fdea6cc07ebf827697666b6a35b0f36**\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Thu Jul 11 17:19:32 2019 +0200\n",
|
||
"\n",
|
||
" Add a check\\_reboot function\n",
|
||
"\n",
|
||
"(...)\n",
|
||
"\n",
|
||
"user@ubuntu:~/scripts$ git show cc1acbf10fdea6cc07ebf827697666b6a35b0f36\n",
|
||
"\n",
|
||
"commit cc1acbf10fdea6cc07ebf827697666b6a35b0f36\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Thu Jul 11 17:19:32 2019 +0200\n",
|
||
"\n",
|
||
" Add a check\\_reboot function\n",
|
||
"\n",
|
||
"diff --git a/all\\_checks.py b/all\\_checks.py\n",
|
||
"\n",
|
||
"index c0d03b3..340f1f7 100644\n",
|
||
"\n",
|
||
"\\--- a/all\\_checks.py\n",
|
||
"\n",
|
||
"+++ b/all\\_checks.py\n",
|
||
"\n",
|
||
"@@ -1,5 +1,11 @@\n",
|
||
"\n",
|
||
" #!/usr/bin/env python3\n",
|
||
"\n",
|
||
"+import os\n",
|
||
"\n",
|
||
"+\n",
|
||
"\n",
|
||
"+def check\\_reboot():\n",
|
||
"\n",
|
||
"+ \"\"\"Returns True if the computer has a pending reboot.\"\"\"\n",
|
||
"\n",
|
||
"+ return os.path.exists(\"/run/reboot-required\")\n",
|
||
"\n",
|
||
"+\n",
|
||
"\n",
|
||
" def main():\n",
|
||
"\n",
|
||
" Pass\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git log \\--stat\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 033f27a8196987d61c4fd42930f2148b23434a03 (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 14:39:18 2019 +0200\n",
|
||
"\n",
|
||
" Call check\\_reboot from main, exit with 1 on error\n",
|
||
"\n",
|
||
" all\\_checks.py | 5 ++++-\n",
|
||
"\n",
|
||
" 1 file changed, 4 insertions(+), 1 deletion(-)\n",
|
||
"\n",
|
||
"(...)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"atom all\\_checks.py\n",
|
||
"```\n",
|
||
"\n",
|
||
"## File in video\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"#!/usr/bin/env python3\n",
|
||
"\n",
|
||
"import os\n",
|
||
"\n",
|
||
"import sys\n",
|
||
"\n",
|
||
"def check\\_reboot():\n",
|
||
"\n",
|
||
" \"\"\"Returns True if the computer has a pending reboot.\"\"\"\n",
|
||
"\n",
|
||
" return os.path.exists(\"/run/reboot-required\")\n",
|
||
"\n",
|
||
"def main():\n",
|
||
"\n",
|
||
" if check\\_reboot():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
" print(\"Everything ok.\")\n",
|
||
"\n",
|
||
" sys.exit(0)\n",
|
||
"\n",
|
||
"main()\n",
|
||
"```\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git diff\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"diff --git a/all\\_checks.py b/all\\_checks.py\n",
|
||
"\n",
|
||
"index 710266a..fdc4476 100644\n",
|
||
"\n",
|
||
"\\--- a/all\\_checks.py\n",
|
||
"\n",
|
||
"+++ b/all\\_checks.py\n",
|
||
"\n",
|
||
"@@ -12,4 +12,7 @@ def main():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
"+ print(\"Everything ok.\")\n",
|
||
"\n",
|
||
"+ sys.exit(0)\n",
|
||
"\n",
|
||
"+\n",
|
||
"\n",
|
||
" main()\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git add \\-p\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"diff --git a/all\\_checks.py b/all\\_checks.py\n",
|
||
"\n",
|
||
"index 710266a..fdc4476 100644\n",
|
||
"\n",
|
||
"\\--- a/all\\_checks.py\n",
|
||
"\n",
|
||
"+++ b/all\\_checks.py\n",
|
||
"\n",
|
||
"@@ -12,4 +12,7 @@ def main():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
"+ print(\"Everything ok.\")\n",
|
||
"\n",
|
||
"+ sys.exit(0)\n",
|
||
"\n",
|
||
"+\n",
|
||
"\n",
|
||
" main()\n",
|
||
"\n",
|
||
"Stage this hunk \\[y,n,q,a,d,e,?\\]? y\n",
|
||
"\n",
|
||
"user@ubuntu:~/scripts$ \n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git diff\n",
|
||
"\n",
|
||
"git diff \\--staged\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"diff --git a/all\\_checks.py b/all\\_checks.py\n",
|
||
"\n",
|
||
"index 710266a..fdc4476 100644\n",
|
||
"\n",
|
||
"\\--- a/all\\_checks.py\n",
|
||
"\n",
|
||
"+++ b/all\\_checks.py\n",
|
||
"\n",
|
||
"@@ -12,4 +12,7 @@ def main():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
"+ print(\"Everything ok.\")\n",
|
||
"\n",
|
||
"+ sys.exit(0)\n",
|
||
"\n",
|
||
"+\n",
|
||
"\n",
|
||
" main()\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git commit \\-m 'Add a message when everything is ok'\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master 49d610b\\] Add a message when everything is ok\n",
|
||
"\n",
|
||
" 1 file changed, 3 insertions(+)"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Deleting and Renaming Files\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Deleting and Renaming FIles**<svg aria-labelledby=\"cds-react-aria6078214324-:r2br:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2br:\"><title id=\"cds-react-aria6078214324-:r2br:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/3OT51/deleting-and-renaming-files)\n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"cd checks/\n",
|
||
"\n",
|
||
"ls \\-l\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"total 8\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 659 Jul 9 19:28 disk\\_usage.py\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 659 Jul 15 21:43 processes.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git rm process.py\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"rm '[processes.py<svg aria-labelledby=\"cds-react-aria6078214324-:r2c7:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2c7:\"><title id=\"cds-react-aria6078214324-:r2c7:-title\">Opens in a new tab</title></svg>](http://processes.py/)'\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"ls \\-l \n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"total 4\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 659 Jul 9 19:28 disk\\_usage.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git status\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"On branch master\n",
|
||
"\n",
|
||
"Changes to be committed:\n",
|
||
"\n",
|
||
" (use \"git reset HEAD <file>...\" to unstage)\n",
|
||
"\n",
|
||
" deleted: [processes.py<svg aria-labelledby=\"cds-react-aria6078214324-:r2cj:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2cj:\"><title id=\"cds-react-aria6078214324-:r2cj:-title\">Opens in a new tab</title></svg>](http://processes.py/)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git commit \\-m 'Delete unneeded processes file'\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master 9939311\\] Delete unneeded processes file\n",
|
||
"\n",
|
||
" 1 file changed, 24 deletions(-)\n",
|
||
"\n",
|
||
" delete mode 100644 processes.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git mv disk\\_usage.py check\\_free\\_space.py\n",
|
||
"\n",
|
||
"git status\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"On branch master\n",
|
||
"\n",
|
||
"Changes to be committed:\n",
|
||
"\n",
|
||
" (use \"git reset HEAD <file>...\" to unstage)\n",
|
||
"\n",
|
||
" renamed: disk\\_usage.py -> check\\_free\\_space.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git commit \\-m 'New name for disk\\_usage.py'\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master 7d7167b\\] New name for disk\\_usage.py\n",
|
||
"\n",
|
||
" 1 file changed, 0 insertions(+), 0 deletions(-)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"echo .DS\\_STORE > gitignore\n",
|
||
"\n",
|
||
"ls \\-la\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"total 20\n",
|
||
"\n",
|
||
"drwxrwxr-x 3 user user 4096 Jul 15 22:15 .\n",
|
||
"\n",
|
||
"drwxr-xr-x 19 user user 4096 Jul 15 16:37 ..\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 659 Jul 9 19:28 check\\_free\\_space.py\n",
|
||
"\n",
|
||
"drwxrwxr-x 8 user user 4096 Jul 15 21:52 .git\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 10 Jul 15 22:15 .gitignore\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git add .gitignore \n",
|
||
"\n",
|
||
"git commit \\-m 'Add a gitignore file, ignoring .DS\\_STORE files'\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master abb0632\\] Add a gitignore file, ignoring .DS\\_STORE files\n",
|
||
"\n",
|
||
" 1 file changed, 1 insertion(+)\n",
|
||
"\n",
|
||
" create mode 100644 .gitignore"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Study Guide: Advanced Git\n",
|
||
"\n",
|
||
"| Command | Explanation & Link |\n",
|
||
"| --- | --- |\n",
|
||
"| git commit -a | [$ git commit -a<svg aria-labelledby=\"cds-react-aria6078214324-:r2lc:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lc:\"><title id=\"cds-react-aria6078214324-:r2lc:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---all) automatically stages the files that have been locally modified. New files which have not been published yet are not affected. |\n",
|
||
"| git log -p | [$ git log -p<svg aria-labelledby=\"cds-react-aria6078214324-:r2le:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2le:\"><title id=\"cds-react-aria6078214324-:r2le:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-log#generate_patch_text_with_p) produces patch text that displays the lines of code that were changed in each commit in the current repo. |\n",
|
||
"| git show | [$ git show<svg aria-labelledby=\"cds-react-aria6078214324-:r2lg:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lg:\"><title id=\"cds-react-aria6078214324-:r2lg:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-show) shows you one or more object(s) such as blobs, trees, tags, and commits. |\n",
|
||
"| git diff | [$ git diff<svg aria-labelledby=\"cds-react-aria6078214324-:r2li:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2li:\"><title id=\"cds-react-aria6078214324-:r2li:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-diff) is similar to the Linux \\`diff\\` command, and can show the changes between commits, changes between the working tree and index, changes between two trees, changes from a merge, and so on. |\n",
|
||
"| git diff --staged | [$ git diff --staged<svg aria-labelledby=\"cds-react-aria6078214324-:r2lk:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lk:\"><title id=\"cds-react-aria6078214324-:r2lk:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-diff) is an alias of $ git diff --cached, which shows all staged files compared to the named commit. |\n",
|
||
"| git add -p | [$ git add -p<svg aria-labelledby=\"cds-react-aria6078214324-:r2lm:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lm:\"><title id=\"cds-react-aria6078214324-:r2lm:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-add) allows a user to interactively review patches before adding to the current commit. |\n",
|
||
"| git mv | [$ git mv<svg aria-labelledby=\"cds-react-aria6078214324-:r2lo:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lo:\"><title id=\"cds-react-aria6078214324-:r2lo:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-mv) is similar to the Linux \\`mv\\` command. This command can move or rename a file, directory, or symlink. |\n",
|
||
"| git rm | [$ git rm <svg aria-labelledby=\"cds-react-aria6078214324-:r2lq:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lq:\"><title id=\"cds-react-aria6078214324-:r2lq:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-rm)is similar to the Linux \\`rm\\` command. This command deletes or removes a file from the working tree. |\n",
|
||
"\n",
|
||
"There are many useful git command summaries online as well. Please take some time to research and study a few, such as [this one<svg aria-labelledby=\"cds-react-aria6078214324-:r2ls:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2ls:\"><title id=\"cds-react-aria6078214324-:r2ls:-title\">Opens in a new tab</title></svg>](https://education.github.com/git-cheat-sheet-education.pdf).\n",
|
||
"\n",
|
||
"## .gitignore files\n",
|
||
"\n",
|
||
".gitignore files are used to tell the git tool to intentionally ignore some files in a given Git repository. For example, this can be useful for configuration files or metadata files that a user may not want to check into the master branch. \n",
|
||
"\n",
|
||
"When writing a .gitignore file, there are some specific formats which help tell Git how to read the text in the file. For example, a line starting with # is a comment; a slash / is a directory separator. Visit [https://git-scm.com/docs/gitignore<svg aria-labelledby=\"cds-react-aria6078214324-:r2lu:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2lu:\"><title id=\"cds-react-aria6078214324-:r2lu:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/gitignore) to see more examples.\n",
|
||
"\n",
|
||
"[This GitHub repository<svg aria-labelledby=\"cds-react-aria6078214324-:r2m0:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria6078214324-:r2m0:\"><title id=\"cds-react-aria6078214324-:r2m0:-title\">Opens in a new tab</title></svg>](https://gist.github.com/octocat/9257657) offers some examples of configurations which are often included in a .gitignore file. These examples include: compiled sources, packages, logs, databases, and OS generated files."
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Undoing Changes Before Committing\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Undoing changes before committing**<svg aria-labelledby=\"cds-react-aria2659598955-:r97:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r97:\"><title id=\"cds-react-aria2659598955-:r97:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/LPJn7/undoing-changes-before-committing)\n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"cd scripts\n",
|
||
"\n",
|
||
"atom all\\_checks.py\n",
|
||
"```\n",
|
||
"\n",
|
||
"## File in video\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"#!/usr/bin/env python3\n",
|
||
"\n",
|
||
"import os\n",
|
||
"\n",
|
||
"import sys\n",
|
||
"\n",
|
||
"def main():\n",
|
||
"\n",
|
||
" if check\\_reboot():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
" print(\"Everything ok.\")\n",
|
||
"\n",
|
||
" sys.exit(0)\n",
|
||
"\n",
|
||
"main()\n",
|
||
"```\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"./all\\_checks.py \n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"Traceback (most recent call last):\n",
|
||
"\n",
|
||
" File \"all\\_checks.py\", line 14, in <module>\n",
|
||
"\n",
|
||
" main()\n",
|
||
"\n",
|
||
" File \"all\\_checks.py\", line 7, in main\n",
|
||
"\n",
|
||
" if check\\_reboot():\n",
|
||
"\n",
|
||
"NameError: name 'check\\_reboot' is not defined\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git status\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"On branch master\n",
|
||
"\n",
|
||
"Changes not staged for commit:\n",
|
||
"\n",
|
||
" (use \"git add <file>...\" to update what will be committed)\n",
|
||
"\n",
|
||
" (use \"git checkout -- <file>...\" to discard changes in working directory)\n",
|
||
"\n",
|
||
" modified: all\\_checks.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git checkout all\\_checks.py\n",
|
||
"\n",
|
||
"git status\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"On branch master\n",
|
||
"\n",
|
||
"nothing to commit, working tree clean\n",
|
||
"\n",
|
||
"user@ubuntu:~/scripts$ ./all\\_checks.py \n",
|
||
"\n",
|
||
"Everything ok.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"./all\\_checks.py \n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"Everything ok.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"./all\\_checks.py > output.txt\n",
|
||
"\n",
|
||
"git add \\*\n",
|
||
"\n",
|
||
"git status\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"On branch master\n",
|
||
"\n",
|
||
"Changes to be committed:\n",
|
||
"\n",
|
||
" (use \"git reset HEAD <file>...\" to unstage)\n",
|
||
"\n",
|
||
" new file: output.txt\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git reset HEAD output.txt\n",
|
||
"\n",
|
||
"git status\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"On branch master\n",
|
||
"\n",
|
||
"Untracked files:\n",
|
||
"\n",
|
||
" (use \"git add <file>...\" to include in what will be committed)\n",
|
||
"\n",
|
||
" Output.txt\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git commit \\-m \"it should be os.path.exists\"\n",
|
||
"```"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Amending commits\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Amending commits**<svg aria-labelledby=\"cds-react-aria2659598955-:rkc:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:rkc:\"><title id=\"cds-react-aria2659598955-:rkc:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/nT1S2/amending-commits)\n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"cd scripts/\n",
|
||
"\n",
|
||
"touch auto\\-update.py\n",
|
||
"\n",
|
||
"touch gather\\-information.sh\n",
|
||
"\n",
|
||
"ls \\-l\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"total 8\n",
|
||
"\n",
|
||
"\\-rwxrwxr-x 1 user user 319 Jul 16 17:56 all\\_checks.py\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 0 Jul 16 20:19 auto-update.py\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 0 Jul 16 20:19 gather-information.sh\n",
|
||
"\n",
|
||
"\\-rw-rw-r-- 1 user user 15 Jul 16 18:03 output.txt\n",
|
||
"\n",
|
||
"user@ubuntu:~/scripts$ git add auto-update.py \n",
|
||
"\n",
|
||
"user@ubuntu:~/scripts$ git commit -m 'Add two new scripts'\n",
|
||
"\n",
|
||
"\\[master 9c78761\\] Add two new scripts\n",
|
||
"\n",
|
||
" 1 file changed, 0 insertions(+), 0 deletions(-)\n",
|
||
"\n",
|
||
" create mode 100644 [auto-update.py<svg aria-labelledby=\"cds-react-aria2659598955-:rkj:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:rkj:\"><title id=\"cds-react-aria2659598955-:rkj:-title\">Opens in a new tab</title></svg>](http://auto-update.py/)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git add auto\\-update.py\n",
|
||
"\n",
|
||
"git commit \\-m 'Add two new scripts'\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\# Please enter the commit message for your changes. Lines starting\n",
|
||
"\n",
|
||
"\\# with '#' will be ignored, and an empty message aborts the commit.\n",
|
||
"\n",
|
||
"\\# Date: Tue Jul 16 20:20:24 2019 +0200\n",
|
||
"\n",
|
||
"\\# On branch master\n",
|
||
"\n",
|
||
"\\# Changes to be committed:\n",
|
||
"\n",
|
||
"\\# new file: auto-update.py\n",
|
||
"\n",
|
||
"\\# new file: gather-information.sh\n",
|
||
"\n",
|
||
"\\# Untracked files:\n",
|
||
"\n",
|
||
"\\# output.txt\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git add gather\\-information.sh\n",
|
||
"\n",
|
||
"git commit \\--amend\n",
|
||
"```\n",
|
||
"\n",
|
||
"## File in video\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"Add two new scripts.\n",
|
||
"\n",
|
||
"# Please enter the commit message for your changes. Line starting\n",
|
||
"\n",
|
||
"#with '#' will be ignored, and an empty message aborts the commit.\n",
|
||
"\n",
|
||
"#\n",
|
||
"\n",
|
||
"#Date: Mon Jan 6 08:28:17 2020 -0800\n",
|
||
"\n",
|
||
"#\n",
|
||
"\n",
|
||
"# On branch master\n",
|
||
"\n",
|
||
"# Changes to be committed:\n",
|
||
"\n",
|
||
"# new file: auto-update.py\n",
|
||
"\n",
|
||
"# new file: gather-information.sh\n",
|
||
"\n",
|
||
"#\n",
|
||
"\n",
|
||
"# Untracked files:\n",
|
||
"\n",
|
||
"# output.txt\n",
|
||
"```\n",
|
||
"\n",
|
||
"## File in video\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"Add two new scripts.\n",
|
||
"\n",
|
||
"gather\\-information.sh will collect information in case of errors.\n",
|
||
"\n",
|
||
"auto\\-update.py will run daily to update computers automatically.\n",
|
||
"\n",
|
||
"# Please enter the commit message for your changes. Line starting\n",
|
||
"\n",
|
||
"#with '#' will be ignored, and an empty message aborts the commit.\n",
|
||
"\n",
|
||
"#\n",
|
||
"\n",
|
||
"#Date: Mon Jan 6 08:28:17 2020 -0800\n",
|
||
"\n",
|
||
"#\n",
|
||
"\n",
|
||
"# On branch master\n",
|
||
"\n",
|
||
"# Changes to be committed:\n",
|
||
"\n",
|
||
"# new file: auto-update.py\n",
|
||
"\n",
|
||
"# new file: gather-information.sh\n",
|
||
"\n",
|
||
"#\n",
|
||
"\n",
|
||
"# Untracked files:\n",
|
||
"\n",
|
||
"# output.txt\n",
|
||
"```"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Rollbacks\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Rollbacks**<svg aria-labelledby=\"cds-react-aria2659598955-:rt9:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:rt9:\"><title id=\"cds-react-aria2659598955-:rt9:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/21kjM/rollbacks)\n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"cd scripts\n",
|
||
"\n",
|
||
"atom all\\_checks.py\n",
|
||
"```\n",
|
||
"\n",
|
||
"## File in video\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"#!/usr/bin/env python3\n",
|
||
"\n",
|
||
"import os\n",
|
||
"\n",
|
||
"import sys\n",
|
||
"\n",
|
||
"def check\\_reboot():\n",
|
||
"\n",
|
||
" \"\"\"Returns True if the computer has a pending reboot.\"\"\"\n",
|
||
"\n",
|
||
" return os.path.exists(\"/run/reboot-required\")\n",
|
||
"\n",
|
||
"def main():\n",
|
||
"\n",
|
||
" if check\\_reboot():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
" if disk\\_full():\n",
|
||
"\n",
|
||
" print(\"Disk Full.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
" print(\"Everything ok.\")\n",
|
||
"\n",
|
||
" sys.exit(0)\n",
|
||
"\n",
|
||
"main()\n",
|
||
"```\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git commit \\-a \\-m 'Add call to disk\\_full function'\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master ec61497\\] Add call to disk\\_full function\n",
|
||
"\n",
|
||
" 1 file changed, 4 insertions(+)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"./all\\_checks.py \n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"Traceback (most recent call last):\n",
|
||
"\n",
|
||
" File \"./all\\_checks.py\", line 22, in <module>\n",
|
||
"\n",
|
||
" main()\n",
|
||
"\n",
|
||
" File \"./all\\_checks.py\", line 15, in main\n",
|
||
"\n",
|
||
" if disk\\_full():\n",
|
||
"\n",
|
||
"NameError: name 'disk\\_full' is not defined\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git revert HEAD\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"Revert \"Add call to disk\\_full function\"\n",
|
||
"\n",
|
||
"Reason for rollback: The disk\\_full function is undefined.\n",
|
||
"\n",
|
||
"This reverts commit ec614976e1665b40134d2c01921f9b0fbf89d1e2.\n",
|
||
"\n",
|
||
"\\# Please enter the commit message for your changes. Lines starting\n",
|
||
"\n",
|
||
"\\# with '#' will be ignored, and an empty message aborts the commit.\n",
|
||
"\n",
|
||
"\\# On branch master\n",
|
||
"\n",
|
||
"\\# Changes to be committed:\n",
|
||
"\n",
|
||
"\\# modified: all\\_checks.py\n",
|
||
"\n",
|
||
"\\# Untracked files:\n",
|
||
"\n",
|
||
"\\# output.txt\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git revert HEAD\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master 91c4968\\] Revert \"Add call to disk\\_full function\"\n",
|
||
"\n",
|
||
" 1 file changed, 4 deletions(-)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git log \\-p \\-2\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 91c4968ebd80de900d71b9bc3f332f53149ac57d (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Tue Jul 16 21:43:18 2019 +0200\n",
|
||
"\n",
|
||
" Revert \"Add call to disk\\_full function\"\n",
|
||
"\n",
|
||
" Reason for rollback: The disk\\_full function is undefined.\n",
|
||
"\n",
|
||
" This reverts commit ec614976e1665b40134d2c01921f9b0fbf89d1e2.\n",
|
||
"\n",
|
||
"diff --git a/all\\_checks.py b/all\\_checks.py\n",
|
||
"\n",
|
||
"index 21da366..fdc4476 100755\n",
|
||
"\n",
|
||
"\\--- a/all\\_checks.py\n",
|
||
"\n",
|
||
"+++ b/all\\_checks.py\n",
|
||
"\n",
|
||
"@@ -12,10 +12,6 @@ def main():\n",
|
||
"\n",
|
||
" print(\"Pending Reboot.\")\n",
|
||
"\n",
|
||
" sys.exit(1)\n",
|
||
"\n",
|
||
"\\- if disk\\_full():\n",
|
||
"\n",
|
||
"\\- print(\"Disk Full.\")\n",
|
||
"\n",
|
||
"\\- sys.exit(1)\n",
|
||
"\n",
|
||
"\\-\n",
|
||
"\n",
|
||
" print(\"Everything ok.\")\n",
|
||
"\n",
|
||
" sys.exit(0)"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# Identifying a Commit\n",
|
||
"\n",
|
||
"This reading contains the code used in the instructional videos from [**Identifying a commit**<svg aria-labelledby=\"cds-react-aria2659598955-:r16k:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r16k:\"><title id=\"cds-react-aria2659598955-:r16k:-title\">Opens in a new tab</title></svg>](https://www.coursera.org/learn/introduction-git-github/lecture/WqddF/identifying-a-commit)**.** \n",
|
||
"\n",
|
||
"## Introduction\n",
|
||
"\n",
|
||
"This follow-along reading is organized to match the content in the video that follows. It contains the same code shown in the next video. These code blocks will provide you with the opportunity to see how the code is written and can be used as a reference as you work through the course. \n",
|
||
"\n",
|
||
"You can follow along in the reading as the instructor discusses the code or review the code after watching the video.\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"cd checks\n",
|
||
"\n",
|
||
"git log \\-1\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit abb063210c1f011b0d6470a4c5f1d8f672edd3ef (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 22:20:45 2019 +0200\n",
|
||
"\n",
|
||
" Add a gitignore file, ignoring .DS\\_STORE files\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git log \\-2\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit abb063210c1f011b0d6470a4c5f1d8f672edd3ef (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 22:20:45 2019 +0200\n",
|
||
"\n",
|
||
" Add a gitignore file, ignoring .DS\\_STORE files\n",
|
||
"\n",
|
||
"commit 7d7167b2db44abf8cf014230f9b9708786e41c2a\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 21:52:59 2019 +0200\n",
|
||
"\n",
|
||
" New name for disk\\_usage.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git show 30e70712882267ca2dd749acfa02ea3aacfd0b24\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 21:52:59 2019 +0200\n",
|
||
"\n",
|
||
" New name for disk\\_usage.py\n",
|
||
"\n",
|
||
"diff --git a/disk\\_usage.py b/check\\_free\\_space.py\n",
|
||
"\n",
|
||
"similarity index 100%\n",
|
||
"\n",
|
||
"rename from disk\\_usage.py\n",
|
||
"\n",
|
||
"rename to check\\_free\\_space.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git show 30\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"fatal: ambiguous argument '7d': unknown revision or path not in the working tree.\n",
|
||
"\n",
|
||
"Use '--' to separate paths from revisions, like this:\n",
|
||
"\n",
|
||
"'git <command> \\[<revision>...\\] -- \\[<file>...\\]'\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git show 30e7\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 7d7167b2db44abf8cf014230f9b9708786e41c2a\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Mon Jul 15 21:52:59 2019 +0200\n",
|
||
"\n",
|
||
" New name for disk\\_usage.py\n",
|
||
"\n",
|
||
"diff --git a/disk\\_usage.py b/check\\_free\\_space.py\n",
|
||
"\n",
|
||
"similarity index 100%\n",
|
||
"\n",
|
||
"rename from disk\\_usage.py\n",
|
||
"\n",
|
||
"rename to check\\_free\\_space.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git revert 30e7\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"Revert \"New name for disk\\_usage.py\"\n",
|
||
"\n",
|
||
"Rollback reason: the previous name was actually better.\n",
|
||
"\n",
|
||
"This reverts commit 7d7167b2db44abf8cf014230f9b9708786e41c2a.\n",
|
||
"\n",
|
||
"\\# Please enter the commit message for your changes. Lines starting\n",
|
||
"\n",
|
||
"\\# with '#' will be ignored, and an empty message aborts the commit.\n",
|
||
"\n",
|
||
"\\# On branch master\n",
|
||
"\n",
|
||
"\\# Changes to be committed:\n",
|
||
"\n",
|
||
"\\# renamed: check\\_free\\_space.py -> disk\\_usage.py\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git revert 7d71\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"\\[master 80b2dac\\] Revert \"New name for disk\\_usage.py\"\n",
|
||
"\n",
|
||
" 1 file changed, 0 insertions(+), 0 deletions(-)\n",
|
||
"\n",
|
||
" rename check\\_free\\_space.py => disk\\_usage.py (100%)\n",
|
||
"\n",
|
||
"```bash\n",
|
||
"git show 7d1de19\n",
|
||
"```\n",
|
||
"\n",
|
||
"**Code output:**\n",
|
||
"\n",
|
||
"commit 80b2dacef4b567196e61651064f03089c5e70b5e (HEAD -> master)\n",
|
||
"\n",
|
||
"Author: My name <me@example.com>\n",
|
||
"\n",
|
||
"Date: Wed Jul 17 00:02:39 2019 +0200\n",
|
||
"\n",
|
||
" Revert \"New name for disk\\_usage.py\"\n",
|
||
"\n",
|
||
" Rollback reason: the previous name was actually better.\n",
|
||
"\n",
|
||
" This reverts commit 7d7167b2db44abf8cf014230f9b9708786e41c2a.\n",
|
||
"\n",
|
||
"diff --git a/check\\_free\\_space.py b/disk\\_usage.py\n",
|
||
"\n",
|
||
"similarity index 100%\n",
|
||
"\n",
|
||
"rename from check\\_free\\_space.py\n",
|
||
"\n",
|
||
"rename to disk\\_usage.py"
|
||
]
|
||
},
|
||
{
|
||
"cell_type": "markdown",
|
||
"metadata": {},
|
||
"source": [
|
||
"# \n",
|
||
"\n"
|
||
]
|
||
}
|
||
],
|
||
"metadata": {
|
||
"kernelspec": {
|
||
"display_name": "Python 3",
|
||
"language": "python",
|
||
"name": "python3"
|
||
},
|
||
"language_info": {
|
||
"name": "python",
|
||
"version": "3.13.2"
|
||
}
|
||
},
|
||
"nbformat": 4,
|
||
"nbformat_minor": 2
|
||
}
|