updates

vilasvarghese · vilasvarghese · commit c5ceae964d7f · 2023-05-24T09:24:55.000+05:30
diff --git a/git/GitEYTOC.txt b/git/GitEYTOC.txt
@@ -648,13 +648,13 @@ Git Branching
 			git switch second-branch 
 			git log --oneline
 			
-			git log -n
+			git log -n #where n is a number
 				see only the last "n" changes
 			git log -1 
 				see only the last change
 			
 	Switching branches
-		git checkout <branch-name>
+		git checkout <branch-name> #old way has disadv. 
 		git switch <branch-name>
 		
 ----------------------
@@ -687,6 +687,8 @@ git switch:
 		git branch -r
 	see all local branches
 		git branch 
+	see all local and remote branches
+		git branch -a 
 	
 		
 	Rename a branch
@@ -698,6 +700,9 @@ git switch:
 	----------------------
 		git push -u origin <local branch>
 		git push -u origin feature/<name>
+			This will allow create a pull request 
+				link to create pull reques will be there in the output 
+				
 		
 	Tracking branches
 	-----------------
@@ -753,6 +758,7 @@ For more information about using git switch:
 		to associate a local branch (say local) to remote
 			git switch <branch name>
 			git push -u origin <branch name>
+				#will allow to create pull request
 				
 N.B: If you get permission denied error
 	most likely you have configured another user.
diff --git a/git/GitHandsOn.txt b/git/GitHandsOn.txt
@@ -129,21 +129,22 @@
 		git checkout -b newissue
 			Similar to 
 				$ git branch newissue
-				$ git checkout newissue
+				$ git checkout newissue #git switch newissue
 
 13. vi index.html
 	git add .
 	git commit -m 'Fix issue'
 
 14. git checkout master
 	
-15. git checkout -b hotfix
+15. git checkout -b hotfix 
+	- instead use git branch and git switch 
 	
 16. vi index.html
 	git add *
 	git commit -a -m 'Any comment'
 	
-17. git checkout master
+17. git switch master
 	git merge hotfix
 	
 	cd .git/logs
@@ -185,7 +186,7 @@
 	vi m2.txt
 		Enter some data and save.
 	git add *
-	git commit -m "crete 3 files for testing"
+	git commit -m "create 3 files for testing"
 	
 24. Create two different branches.
 	git branch b1
@@ -340,7 +341,7 @@ confirm if the following is working
 sudo apt-get update
 sudo apt-get install kdiff3
 or
-yum install kdiff3
+yum install kdiff3	#doesn't work on amazon linux.
 
 
 
@@ -378,18 +379,25 @@ From f1
 			f1 - feature1 started.
 			f2
 		m3
+
+		git switch f1
+		git rebase main
 		
-		rebase
+		After rebase f1 would be 
 			m1
 			m2
 			m3
-			?
-		
-		merge
+			f1
+			f2
+
+		git switch main
+		git merge f1
+		After merge main branch would be 
 			m1
 			m2
+			f1
+			f2
 			m3
-			?
 			
 -------------------------------------------------------------------------------------
 	git checkout master
@@ -675,4 +683,5 @@ git checkout -- <file>
 Other good references:
 	1. https://shiivangii.medium.com/all-about-git-and-github-c4b987df1b16
 	2. https://docs.gitlab.com/ee/topics/git/numerous_undo_possibilities_in_git/
-	3. https://www.javatpoint.com/git-ignore
+	3. https://www.javatpoint.com/git-ignore
+	4. http://swcarpentry.github.io/git-novice/
