git.howto aanpast
This commit is contained in:
		
							
								
								
									
										70
									
								
								git.howto
									
									
									
									
									
								
							
							
						
						
									
										70
									
								
								git.howto
									
									
									
									
									
								
							@@ -176,4 +176,74 @@ Date:   Tue Mar 20 11:04:40 2018 +0100
 | 
				
			|||||||
    eerste commit
 | 
					    eerste commit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git branch
 | 
				
			||||||
 | 
					* master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git branch features
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git branch
 | 
				
			||||||
 | 
					  features
 | 
				
			||||||
 | 
					* master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git checkout features
 | 
				
			||||||
 | 
					Switched to branch 'features'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git branch
 | 
				
			||||||
 | 
					* features
 | 
				
			||||||
 | 
					  master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git checkout master
 | 
				
			||||||
 | 
					Switched to branch 'master'
 | 
				
			||||||
 | 
					Your branch is up to date with 'origin/master'.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git branch
 | 
				
			||||||
 | 
					  features
 | 
				
			||||||
 | 
					* master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git checkout features
 | 
				
			||||||
 | 
					Already on 'features'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git add ./hoi.txt 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git commit -m "test"
 | 
				
			||||||
 | 
					On branch features
 | 
				
			||||||
 | 
					nothing to commit, working tree clean
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git push origin features 
 | 
				
			||||||
 | 
					Username for 'https://git.web.rug.nl': g.j.c.strikwerda@rug.nl
 | 
				
			||||||
 | 
					Password for 'https://g.j.c.strikwerda@rug.nl@git.web.rug.nl': 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Enumerating objects: 4, done.
 | 
				
			||||||
 | 
					Counting objects: 100% (4/4), done.
 | 
				
			||||||
 | 
					Delta compression using up to 8 threads
 | 
				
			||||||
 | 
					Compressing objects: 100% (2/2), done.
 | 
				
			||||||
 | 
					Writing objects: 100% (3/3), 271 bytes | 271.00 KiB/s, done.
 | 
				
			||||||
 | 
					Total 3 (delta 0), reused 0 (delta 0)
 | 
				
			||||||
 | 
					remote: 
 | 
				
			||||||
 | 
					remote: Create a new pull request for 'features':
 | 
				
			||||||
 | 
					remote:   https://git.web.rug.nl/p216149/git-workshop/compare/master...features
 | 
				
			||||||
 | 
					remote: 
 | 
				
			||||||
 | 
					To https://git.web.rug.nl/p216149/git-workshop.git
 | 
				
			||||||
 | 
					 * [new branch]      features -> features
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git branch
 | 
				
			||||||
 | 
					  features
 | 
				
			||||||
 | 
					* master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git merge features
 | 
				
			||||||
 | 
					Already up to date.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git status
 | 
				
			||||||
 | 
					On branch master
 | 
				
			||||||
 | 
					Your branch is ahead of 'origin/master' by 2 commits.
 | 
				
			||||||
 | 
					  (use "git push" to publish your local commits)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ger@ger-lpt-werk:~/Desktop/CIT/git-workshop$ git push 
 | 
				
			||||||
 | 
					Username for 'https://git.web.rug.nl': g.j.c.strikwerda@rug.nl
 | 
				
			||||||
 | 
					Password for 'https://g.j.c.strikwerda@rug.nl@git.web.rug.nl': 
 | 
				
			||||||
 | 
					Total 0 (delta 0), reused 0 (delta 0)
 | 
				
			||||||
 | 
					To https://git.web.rug.nl/p216149/git-workshop.git
 | 
				
			||||||
 | 
					   5605e6f..bb99908  master -> master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user