one small update

thevasudevgupta · Feb 29, 2020 · b4511bb · b4511bb
1 parent 10824a1
commit b4511bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
-# Git--Notes
- [Git Notes readme](git-notes.md)
+# Git-Notes
+
+ - [Git command line notes](git-notes.md)
 
 
 Thanks to @sreekarsr
diff --git a/git-notes.md b/git-notes.md
@@ -65,15 +65,16 @@ in case of:
 
 **MERGE CONFLICTS**
 
-- on a particular line, if there is a change in one of the branches, and no change on the other branch, the CHANGE WILL WIN on the merge-commit
+- on a particular line, if there is a change in one of the branches, and no change on the other branch, the **CHANGE WILL WIN** on the merge-commit
 - if there are different changes on the same line, git tells you that automatic merge failes, fix conflicts. This time, using git status tells you 'You have unmerged paths' which means the merge is still on, and will complete when the conflicts are resolved.(at this stage we may abort using git merge --abort).
 Now, go into the conflicting files, to see the changes git has made to indicate conflicts
 
-<<<<<<<HEAD
+```<<<<<<<HEAD
 ..				(status in HEAD)
 ======
 ..				(status in otherbranchname)
 >>>>>>><other-branchname>
+```
 
 Just delete everything except what you want to keep, then use git add, to add the file to commit just like any other commit.
 checking git status says 'all conflicts fixed, but still merging' Using 'git commmit' will conclude the merge-----
@@ -98,11 +99,6 @@ if we want to apply a specific stash, use `git stash apply <labelname>`
 
 `git stash pop` this will apply the stashes and delete the stash
 
-
-
-
-
-
 **USING REMOTE REPOS**
 
 a git remote any location with a git repository- it could be a repo even on a co-worker's laptop, or another directory on our own system
@@ -153,7 +149,7 @@ to see all branches, use `git branch -a` To see only remote branches, use `git b
 AMAZING TUTORIALS - courtesy David Mahler
 https://www.youtube.com/watch?v=uR6G2v_WsRA
 
-**VIDEO 1**
+## All commands overview:
 
 `git init` - initialize a new repo in a directory
 
@@ -179,8 +175,6 @@ https://www.youtube.com/watch?v=uR6G2v_WsRA
 
 `git checkout (commit hash) filename` - retrieve a file from a previous commit
 
-**VIDEO 2**
-
 `git log` =  git history
 
 `git log --all --decorate --oneline --graph` = commit history graph
@@ -219,11 +213,6 @@ https://www.youtube.com/watch?v=uR6G2v_WsRA
 
 `git stash save "(description)"` = create a stash point, be more descriptive
 
-
-**VIDEO 3**
-
-Commands used:
-
 Retrieve/Clone a repo = `git clone (URL)`
 
 List remotes = `git remote (-v for detail)`