Git - Revision history

Zach: /* Branches and Merging */

2023-01-10T05:20:30Z

Branches and Merging

Zach: /* Adding a Remote */

2023-01-10T05:19:05Z

Adding a Remote

Zach: /* Git TL;DR */

2023-01-10T05:18:13Z

Git TL;DR

Zach: /* Git TL;DR */

2023-01-10T05:17:44Z

Git TL;DR

Todd: /* Git TL;DR */

2019-08-20T20:33:29Z

Git TL;DR

Alex at 15:53, 11 February 2017

2017-02-11T15:53:14Z

Alex: Added HTTPS to one link; removed dead link.

2017-02-11T15:52:59Z

Added HTTPS to one link; removed dead link.

James at 20:06, 18 January 2017

2017-01-18T20:06:33Z

Brian: Format new git ignore information

2016-05-03T07:16:24Z

Format new git ignore information

Brian at 07:15, 3 May 2016

2016-05-03T07:15:02Z

@@ Line 113: / Line 113: @@
 To create a new branch, use the '''checkout -b''' command:
-<source lang="bash">$ git checkout -b my-new-branch</source>
+<source lang="bash">$ git checkout -b <my-new-branch></source>
 Now, when you next commit, you will be committing to the '''my-new-branch''' branch rather than the default '''master''' branch.
@@ Line 119: / Line 119: @@
 To switch the working copy over to a different branch, use the '''checkout''' command:
-<source lang="bash">$ git checkout my-existing-branch</source>
+<source lang="bash">$ git checkout <my-existing-branch></source>
 See the screenshot for how to checkout a branch in SourceTree.
@@ Line 125: / Line 125: @@
 To merge changes from a different branch to the current working copy, use the '''merge''' command:
-<source lang="bash">$ git merge my-existing-branch</source>
+<source lang="bash">$ git merge <my-existing-branch></source>
 After you merge, if you wish to terminate a branch, use the '''branch -d''' command:
-<source lang="bash">$ git branch -d my-existing-branch</source>
+<source lang="bash">$ git branch -d <my-existing-branch></source>
 Git also has another command called '''rebase''', which is similar to '''merge''' except that it combines the commits of each branch into a single branch, but still keeping the head of each branch.  For more information on ''rebase'', read [https://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/ this article on the SourceTree blog].

@@ Line 52: / Line 52: @@
 A project that is being tracked with Git needs to be connected to a remote before files are pushed to version control. To add a remote to an initialized Git project, use the '''git remote add''' command:
-<source lang="bash">git remote add origin \<repository URL\></source>
+<source lang="bash">git remote add origin <repository URL></source>
 The origin remote is the default server that Git will push to.
 == Staging ==

@@ Line 12: / Line 12: @@
 <source lang="bash">
 # Navigate to project
-$ cd /path/to/your/directory/
+$ cd </path/to/your/directory/>
 # Initialize folder as git repository
 $ git init

@@ Line 18: / Line 18: @@
 $ git remote add origin <repository URL>
 # If this is your first time using git on your machine, you need to set your username and email
-$ git config --global user.name "Your Name"
+$ git config --global user.name "<Your Name>"
-$ git config --global user.email "you@example.com"
+$ git config --global user.email "<you@example.com>"
 </source>
@@ Line 27: / Line 27: @@
 $ git add <filename>
 # Commit changes
-$ git commit -m "Your commit message"
+$ git commit -m "<Your commit message>"
 # Push changes to Github. Unless you are working on a different branch, <branchname> should be `master`.
 $ git push -u origin <branchname>

@@ Line 28: / Line 28: @@
 # Commit changes
 $ git commit -m "Your commit message"
-# Push changes to bitbucket. Unless you are working on a different branch, <branchname> should be `master`.
+# Push changes to Github. Unless you are working on a different branch, <branchname> should be `master`.
 $ git push -u origin <branchname>
 </source>

@@ Line 137: / Line 137: @@
 == Example: Staging and Branches ==
-Suppose I have three files under version control: apple.txt, banana.txt, and carrot.txt.  The contents is like so (Thanks to Sumit Khemka for the humor):
+Suppose I have three files under version control: apple.txt, banana.txt, and carrot.txt.  The contents are like so (Thanks to Sumit Khemka for the humor):
 * '''apple.txt:''' How do you make an apple turnover?  Push it downhill!

← Older revision		Revision as of 20:06, 18 January 2017
Line 6:		Line 6:

	Subversion is the version control system you used in CSE 132. However, Subversion does not have the same agility of Git in terms of local revisions, staging, and collaboration. This guide aims to get you up to speed with the power of Git for multi-developer projects.		Subversion is the version control system you used in CSE 132. However, Subversion does not have the same agility of Git in terms of local revisions, staging, and collaboration. This guide aims to get you up to speed with the power of Git for multi-developer projects.
		+
		+	== Git TL;DR ==
		+
		+	Before the first commit:
		+	<source lang="bash">
		+	# Navigate to project
		+	$ cd /path/to/your/directory/
		+	# Initialize folder as git repository
		+	$ git init
		+	# Set target URL
		+	$ git remote add origin <repository URL>
		+	# If this is your first time using git on your machine, you need to set your username and email
		+	$ git config --global user.name "Your Name"
		+	$ git config --global user.email "you@example.com"
		+	</source>
		+
		+	For each subsequent commit:
		+	<source lang="bash">
		+	# Add untracked files ( use `git add .` to add all files)
		+	$ git add <filename>
		+	# Commit changes
		+	$ git commit -m "Your commit message"
		+	# Push changes to bitbucket. Unless you are working on a different branch, <branchname> should be `master`.
		+	$ git push -u origin <branchname>
		+	</source>

	== Initializing Git ==		== Initializing Git ==

@@ Line 15: / Line 15: @@
 This will create a .git directory, where Git will store information about the repository. This command can be run either in an empty folder, or in a folder where files already exist.
-=== Local and Remote Branches ===
+== Local and Remote Branches ==
 When you create a branch named "mybranch" on your local repository and ''push'' changes up to the remote repository, they actually get pushed to a remote branch called '''origin/mybranch'''.  (Note that '''origin''' is the default name for a remote Git repository.)  Even after your collaborators ''pull'' changes from remote to their local repositories, no new branches are created on their own personal local repositories.
@@ Line 24: / Line 24: @@
-=== Adding a Remote ===
+== Adding a Remote ==
 A project that is being tracked with Git needs to be connected to a remote before files are pushed to version control. To add a remote to an initialized Git project, use the '''git remote add''' command:

@@ Line 7: / Line 7: @@
 Subversion is the version control system you used in CSE 132.  However, Subversion does not have the same agility of Git in terms of local revisions, staging, and collaboration.  This guide aims to get you up to speed with the power of Git for multi-developer projects.
-== Commits ==
+== Initializing Git ==
-If you need to determine what files have been changed since the last commit, you gan use Git's '''status''' command:
+=== Adding a Remote ===
-<source lang="bash">$ git status</source>
+<source lang="bash">git remote add origin \<repository URL\></source>
-In SourceTree, the results of ''git status'' are displayed nicely in the "File Status View".
+The origin remote is the default server that Git will push to.
 == Staging ==
@@ Line 29: / Line 43: @@
 Then, when you run ''git commit'', only those files that have been staged will be updated.
-'''Note:''' <code>git commit -a</code> commits all files, whether or not they had been staged.  <code>git commit</code> (without the ''-a'') only commits those files in the staging area.
+'''Note:''' <code>git commit -a</code> commits all files, whether or not they had been staged.  <code>git commit</code> (without the ''-a'') only commits those files in the staging area. It is a good idea to run '''git status''' before staging files to avoid staging files that should not be committed.
 === Staging in SourceTree ===
@@ Line 40: / Line 69: @@
 You should now be able to use the staging area!  In the "File Status View", you can drag and drop files back and forth between Staged and Unstaged.  See the screenshot for an example.
 == Branches and Merging ==
@@ Line 378: / Line 417: @@
 Using Git's powerful branch and merge tools are ideal for team collaboration.
 === Collaboration Example ===