Using Git Example - Revision history

Mktrost: /* Undoing Commits */

2011-07-12T21:51:58Z

Undoing Commits

@@ Line 599: / Line 599: @@
 |[[Image:GitAnotherUpdate.png]]
 |-
 |valign="top"|
@@ Line 613: / Line 622: @@
 |[[Image:GitRevert.png]]
 |}

Mktrost at 18:57, 12 July 2011

2011-07-12T18:57:14Z

@@ Line 577: / Line 577: @@
   git log
 |[[Image:GitMerge4.png]]
 |}

Mktrost: /* Merging */

2011-07-12T18:45:58Z

Merging

← Older revision		Revision as of 14:45, 12 July 2011
Line 499:		Line 499:
	== Merging ==		== Merging ==
	These steps show how to merge when files are modified in 2 repositories.		These steps show how to merge when files are modified in 2 repositories.
			This steps assumes the committed, but not pushed changes to learningGit that was done in the [[Using_Git_Example#Diff_against_an_Old_Version\|Diff against an Old Version]] section.


	{\| style="width: 1200px" border="1"		{\| style="width: 1200px" border="1"

Mktrost at 18:38, 12 July 2011

2011-07-12T18:38:00Z

← Older revision		Revision as of 14:38, 12 July 2011
Line 292:		Line 292:

	\|[[Image:GitPushFileRemoval.png]]		\|[[Image:GitPushFileRemoval.png]]
			\|}

			== Undo File Removal (uncommitted) in the Repository ==
			In the end, this has no affect on the learningGit repositories.

			{\| style="width: 1200px" border="1"
			\|valign="top"\|
			=== Remove the Files ===
			These steps remove README.txt from ~/code/learnGit/learningGit/.

			# Move to the ~/code/learnGit/learningGit
			# Look at the current status to see nothing.
			# Remove README.txt
			# Look at the git status to see the removed file.
			# Look at the changes.
			cd ~/code/learnGit/learningGit
			git status
			rm README.txt
			git status
			git diff

			\|[[Image:GitRemoveFile2.png]]
			\|-
			\|valign="top"\|
			===Stage the File Removal ===
			This step stages the removal of README.txt from ~/code/learnGit/learningGit/.

			# Stage the file
			# Look at the git status to see the staged file.
			# Look at the diffs, there are no differences
			git rm README.txt
			git status
			git diff

			\|[[Image:GitStagedRemoveFile2.png]]
			\|-
			\|valign="top"\|
			=== Unstage the File Removal ===
			This step unstages the modification to README.txt.

			# Unstage the file
			# Look at the git status to see the unstaged file
			# Look at the diffs (they are back).
			git reset HEAD README.txt
			git status
			git diff

			\|[[Image:GitUnstageFile2.png]]
			\|-
			\|valign="top"\|
			=== Undo the Removal ===
			This step undoes the removal of README.txt.

			The file removal was never stored in the database.

			# Look at the directory contents
			# Undo the removal
			# Check the status
			# Check the diffs
			# Look at the directory contents
			ls
			git checkout -- README.txt
			git status
			git diff
			ls

			\|[[Image:GitUndoRemoval.png]]
	\|}		\|}

Mktrost at 18:46, 8 July 2011

2011-07-08T18:46:55Z

← Older revision		Revision as of 14:46, 8 July 2011
Line 1:		Line 1:
	== Create new Bare Repository ==		== Create new Bare Repository ==
	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	These steps will create a new bare repository called learningGit in ~/code/learnGit/bareRepo/.		These steps will create a new bare repository called learningGit in ~/code/learnGit/bareRepo/.
Line 23:		Line 23:
	This is so you can see how changes don't affect the other repositories unless pushes & pulls are done.		This is so you can see how changes don't affect the other repositories unless pushes & pulls are done.

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Create a Working Repository ===		=== Create a Working Repository ===
Line 62:		Line 62:
	This will create a couple of files in the learningGit repository.		This will create a couple of files in the learningGit repository.

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Create the New Files ===		=== Create the New Files ===
Line 162:		Line 162:
	In the end, this has no affect on the learningGit repositories.		In the end, this has no affect on the learningGit repositories.

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Modify the Files ===		=== Modify the Files ===
Line 230:		Line 230:
	This will remove a file from the learningGit repositories.		This will remove a file from the learningGit repositories.

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Remove the File ===		=== Remove the File ===
Line 297:		Line 297:
	This sets up a .gitignore file in the repository.		This sets up a .gitignore file in the repository.

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Create Files That Should be Ignored ===		=== Create Files That Should be Ignored ===
Line 375:		Line 375:
	These steps show how to look at an old version of a file		These steps show how to look at an old version of a file

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Make updates ===		=== Make updates ===
Line 421:		Line 421:

	git diff 6c4366f6d8b52587f7ec589a62498a14cfce720a		git diff 6c4366f6d8b52587f7ec589a62498a14cfce720a
	git diff 2fb90d8896af728e1ac6d2933812d5c78d8b8be1 c38fc7a7f81a13dfe80ef7129e2294f1b6407608		git diff 2fb90d8896af728e1ac6d2933812d5c78d8b8be1
	git diff 2fb90d8896af728e1ac6d2933812d5c78d8b8be1 c38fc7a7f81a13dfe80ef7129e2294f1b6407608 README.txt		c38fc7a7f81a13dfe80ef7129e2294f1b6407608
			git diff 2fb90d8896af728e1ac6d2933812d5c78d8b8be1
			c38fc7a7f81a13dfe80ef7129e2294f1b6407608 README.txt

	\|[[Image:GitDiffs.png]]		\|[[Image:GitDiffs.png]]
Line 431:		Line 433:
	These steps show how to merge when files are modified in 2 repositories.		These steps show how to merge when files are modified in 2 repositories.

	{\| border="1"		{\| style="width: 1200px" border="1"
	\|valign="top"\|		\|valign="top"\|
	=== Make updates to learningGit2 ===		=== Make updates to learningGit2 ===

Mktrost at 18:26, 8 July 2011

2011-07-08T18:26:05Z

@@ Line 459: / Line 459: @@
 # Try to push (fails)
 # Pull the latest updates
-# Resolve the merge (by hand)
   cd ~/code/learnGit/learningGit
   cat README.txt
   git push
   git pull
   RESOLVE THE MERGE USING YOUR TEXT EDITOR
   git add README.txt
   git commit
   git push
 |}

Mktrost at 15:59, 8 July 2011

2011-07-08T15:59:48Z

← Older revision		Revision as of 11:59, 8 July 2011
Line 471:		Line 471:
	git commit		git commit
	git push		git push
			\|
			[[Image:GitMerge1.png]]
			[[Image:GitMerge2.png]]
			[[Image:GitMerge3.png]]
			[[Image:GitMerge4.png]]

	\|}		\|}

Mktrost at 15:52, 8 July 2011

2011-07-08T15:52:37Z

← Older revision		Revision as of 11:52, 8 July 2011
Line 425:		Line 425:

	\|[[Image:GitDiffs.png]]		\|[[Image:GitDiffs.png]]

			\|}

			== Merging ==
			These steps show how to merge when files are modified in 2 repositories.

			{\| border="1"
			\|valign="top"\|
			=== Make updates to learningGit2 ===
			These steps make updates to README.txt in learningGit2.

			# Move to learningGit2
			# Look at README.txt
			# Make update to README.txt
			# Stage the update
			# Commit the update
			# Push the update

			cd ~/code/learnGit/learningGit2
			cat README.txt
			echo "Update from learningGit2" >> README.txt
			git add README.txt
			git commit -m "Add Update1 to README.txt"
			git push

			\|[[Image:GitUpdate2.png]]
			\|-
			\|valign="top"\|
			=== Pull Updates to learningGit ===

			# Move to learningGit
			# Look at README.txt
			# Try to push (fails)
			# Pull the latest updates
			# Resolve the merge (by hand)
			# Stage the resolution
			# Commit the resolution
			# Push the final version
			cd ~/code/learnGit/learningGit
			cat README.txt
			git push
			git pull
			RESOLVE THE MERGE USING YOUR TEXT EDITOR
			git add README.txt
			git commit
			git push

	\|}		\|}

Mktrost at 15:42, 8 July 2011

2011-07-08T15:42:52Z

← Older revision		Revision as of 11:42, 8 July 2011
Line 400:		Line 400:

	\|[[Image:GitFileUpdates.png]]		\|[[Image:GitFileUpdates.png]]
			\|-
	\|valign="top"\|		\|valign="top"\|
	=== Looking at log ===		=== Looking at log ===

Mktrost at 15:42, 8 July 2011

2011-07-08T15:42:27Z

← Older revision		Revision as of 11:42, 8 July 2011
Line 409:		Line 409:

	\|[[Image:GitLogs.png]]		\|[[Image:GitLogs.png]]
			\|-
	\|valign="top"\|		\|valign="top"\|