From 49352de17b58a9fe6cffe4957190e1680d9f3c5c Mon Sep 17 00:00:00 2001 From: Brianna Toth Date: Thu, 22 Mar 2018 15:19:42 -0700 Subject: [PATCH 01/17] add text.md --- git-03_branches.md | 2 ++ test.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 test.md diff --git a/git-03_branches.md b/git-03_branches.md index f3bf8d7..77dfd51 100644 --- a/git-03_branches.md +++ b/git-03_branches.md @@ -1 +1,3 @@ ## Git branches + +I have no idea how this works. But I will track this on Git. diff --git a/test.md b/test.md new file mode 100644 index 0000000..dcf9d3b --- /dev/null +++ b/test.md @@ -0,0 +1 @@ +This is my test file. From 8ddb52ea271d8d42d6b5d91c24017b6cb1fe09fb Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Thu, 22 Mar 2018 15:20:03 -0700 Subject: [PATCH 02/17] add test.md --- git-03_branches.md | 2 ++ test.md | 1 + 2 files changed, 3 insertions(+) create mode 100644 test.md diff --git a/git-03_branches.md b/git-03_branches.md index f3bf8d7..1b42d75 100644 --- a/git-03_branches.md +++ b/git-03_branches.md @@ -1 +1,3 @@ ## Git branches + +I'm making some edits! Now I will track and save them using Git :) diff --git a/test.md b/test.md new file mode 100644 index 0000000..6ccb42e --- /dev/null +++ b/test.md @@ -0,0 +1 @@ +this is my test file From eb1abaadd6680b546e3c9c0a347c59d9483b49b4 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Thu, 22 Mar 2018 15:48:36 -0700 Subject: [PATCH 03/17] Update test.md --- test.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test.md b/test.md index 6ccb42e..bca1c9b 100644 --- a/test.md +++ b/test.md @@ -1 +1,3 @@ this is my test file + +add a new line From 97711ce3fba96ff0866db21ea1127fc42d7acf7f Mon Sep 17 00:00:00 2001 From: bravoalphatango <37667486+bravoalphatango@users.noreply.github.com> Date: Thu, 22 Mar 2018 15:48:38 -0700 Subject: [PATCH 04/17] Update test.md --- test.md | 1 + 1 file changed, 1 insertion(+) diff --git a/test.md b/test.md index dcf9d3b..d09823b 100644 --- a/test.md +++ b/test.md @@ -1 +1,2 @@ This is my test file. +add line From 66dca5a01f638d8be4964fe60eab3926fe4bcb92 Mon Sep 17 00:00:00 2001 From: bravoalphatango <37667486+bravoalphatango@users.noreply.github.com> Date: Thu, 22 Mar 2018 15:49:06 -0700 Subject: [PATCH 05/17] Update test.md --- test.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test.md b/test.md index d09823b..ee21c8d 100644 --- a/test.md +++ b/test.md @@ -1,2 +1,3 @@ This is my test file. -add line + +add a new line From 8e3f78b77f20332b4d0f3166d881d9e68f1843ae Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Thu, 22 Mar 2018 15:54:43 -0700 Subject: [PATCH 06/17] Create newfile.md --- test/newfile.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/newfile.md diff --git a/test/newfile.md b/test/newfile.md new file mode 100644 index 0000000..4dfade6 --- /dev/null +++ b/test/newfile.md @@ -0,0 +1 @@ +klsjlkjsad From eb3bd16b664fe21bd3094b01e42762128264d2a2 Mon Sep 17 00:00:00 2001 From: bravoalphatango <37667486+bravoalphatango@users.noreply.github.com> Date: Thu, 22 Mar 2018 15:54:45 -0700 Subject: [PATCH 07/17] Create newfile.md --- test/newfile.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/newfile.md diff --git a/test/newfile.md b/test/newfile.md new file mode 100644 index 0000000..64409df --- /dev/null +++ b/test/newfile.md @@ -0,0 +1 @@ +blah blah blah From 9c586e8aa26c436269a1b215144ed5da4b99e785 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Fri, 23 Mar 2018 12:01:55 -0700 Subject: [PATCH 08/17] Delete newfile.md --- test/newfile.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test/newfile.md diff --git a/test/newfile.md b/test/newfile.md deleted file mode 100644 index 4f6dbc7..0000000 --- a/test/newfile.md +++ /dev/null @@ -1,3 +0,0 @@ - -blah blah blah - From 5e41e6aa83cf190d3a1dee907f1b813fd2420739 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Fri, 23 Mar 2018 12:02:07 -0700 Subject: [PATCH 09/17] Delete test.md --- test.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test.md diff --git a/test.md b/test.md deleted file mode 100644 index c2862c1..0000000 --- a/test.md +++ /dev/null @@ -1,3 +0,0 @@ - - -add a new line From c0bee2d5bce04e3613df516f4c0e815041480113 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Fri, 23 Mar 2018 12:02:22 -0700 Subject: [PATCH 10/17] Update git-03_branches.md --- git-03_branches.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/git-03_branches.md b/git-03_branches.md index 1f2be2a..7739f18 100644 --- a/git-03_branches.md +++ b/git-03_branches.md @@ -1,6 +1,2 @@ ## Git branches - -I have no idea how this works. But I will track this on Git. - -I'm making some edits! Now I will track and save them using Git :) From 28c56ec236112fc135deddced6beba861d75fba1 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Fri, 23 Mar 2018 12:23:16 -0700 Subject: [PATCH 11/17] Update git-01_basics.md --- git-01_basics.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/git-01_basics.md b/git-01_basics.md index f6683b1..8f52009 100644 --- a/git-01_basics.md +++ b/git-01_basics.md @@ -1,23 +1,27 @@ ## Git exercises ### Configuring Git -We do this by setting a couple of options in a file found in your home directory + +First, let's verify that Git is installed by typing the `git` command (then hit enter) ```bash -git config --global user.name "Firstname Lastname" -git config --global user.email username@company.extension +git ``` -Your name and email address is included in every change that you make, so it's easy to keep track of who did what +This should print out usage and common Git commands. If you get something else, then you probably didn't do the pre-class setup! You can follow the instructions for installing Git here: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git -Also, unless you are a vimwizard, I would recommend changing your default editor to nano +Now that we've verified Git is installed, let's set up a couple of options in a file found in your home directory ```bash -git config --global core.editor nano +git config --global user.name "Firstname Lastname" +git config --global user.email username@company.extension ``` -If you have a different favorite editor, you can type in the appropriate -command from the table below: +Your name and email address is included in every change that you make, so it's easy to keep track of who did what + +Also, unless you are a vimwizard, I would recommend changing your default editor to nano or your favorite text editor + +If you have a favorite editor, you can type in the appropriate command from the table below: | Editor | Configuration command | |:-------------------|:-------------------------------------------------| From 8dc955081dd01ea1f80e2401fca7a40f8c6ba4e0 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Tue, 3 Apr 2018 13:06:28 -0700 Subject: [PATCH 12/17] Rename git-02_remotes.md to inprogress/git-02_remotes.md --- git-02_remotes.md => inprogress/git-02_remotes.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename git-02_remotes.md => inprogress/git-02_remotes.md (100%) diff --git a/git-02_remotes.md b/inprogress/git-02_remotes.md similarity index 100% rename from git-02_remotes.md rename to inprogress/git-02_remotes.md From cfd3ffe53c21a0ce7793bd7382a437c9e50c53f5 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Tue, 3 Apr 2018 13:06:46 -0700 Subject: [PATCH 13/17] Rename git-03_branches.md to inprogress/git-03_branches.md --- git-03_branches.md => inprogress/git-03_branches.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename git-03_branches.md => inprogress/git-03_branches.md (100%) diff --git a/git-03_branches.md b/inprogress/git-03_branches.md similarity index 100% rename from git-03_branches.md rename to inprogress/git-03_branches.md From f9128c074575280480164f4988955bea5eb1f1fa Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Thu, 1 Nov 2018 13:43:26 -0700 Subject: [PATCH 14/17] Update git-01_basics.md --- git-01_basics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-01_basics.md b/git-01_basics.md index 8f52009..4fc676e 100644 --- a/git-01_basics.md +++ b/git-01_basics.md @@ -141,7 +141,7 @@ We use the `-m` flag followed by a **commit message** when we make a commit. Eve > Making a whole bunch of changes and committing them all at once is *BAD*. If you make many commits for many small changes, and one of those changes breaks your code, you can *selectively undo* that change and fix the bug. If you make only one commit, you'll have to re-do everything from scratch :( -It takes a while to get a hang of this, and it helps to read other people's commits to know what to say +It takes a while to get the hang of this, and it helps to read other people's commits to know what to say 6. Take a few minutes to make some changes to your mammals.txt file and add a new file to your folder. Then add the changes to the staging area and commit your changes following the steps you just took in 4-5. From 967bffeed6fcdad194e0b13c869790b16cd6b8aa Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Thu, 1 Nov 2018 16:11:38 -0700 Subject: [PATCH 15/17] Update setup.md --- setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.md b/setup.md index 16005e4..b559734 100644 --- a/setup.md +++ b/setup.md @@ -18,7 +18,7 @@ To set your Babun HOME directory to `C:\Users\[username]`, follow these steps: * From your Babun shell, execute `rundll32 sysdm.cpl,EditEnvironmentVariables` or search in the Start menu for `env` and select "Select Edit environment variables for your account” * Select “New” * Name: HOME - * Value: C:\Users\[username] + * Value: `C:\Users\[username]` * Click on “OK” * Click on “OK” again * In Babun, run `babun install` From 18479bb2a9b1970eb1925bf37913e7cb8779e218 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Fri, 29 Nov 2019 13:21:30 -0800 Subject: [PATCH 16/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97bcf7d..3e82158 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Intro to Git and GitHub -* The slides are available here: http://slides.com/kirschbombe/git-7/fullscreen +* The slides are available here: http://slides.com/kirschbombe/learngit/fullscreen * Setup instructions here: https://github.com/kirschbombe/learngit/blob/master/setup.md * You will also need a GitHub account. You can get one here: https://github.com From b704ce3f1c27b4597096a60848713d229bd20ea3 Mon Sep 17 00:00:00 2001 From: Dawn Childress Date: Thu, 3 Aug 2023 13:20:20 -0700 Subject: [PATCH 17/17] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3e82158..c47ec66 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ #### Bash commands we'll use * `cd` : change directory * `cd ..` : move up to the parent directory +* `ls` : list directory contents +* `ls > list.csv` : print directory contents to a CSV named `list.csv` * `touch` : create new file here * `pwd` : print working directory * `cat` : "concatenate", used to print the contents of a file