maharjun/Personal-Git-Readme

This is a personal git readme consisting of all the knowledge assimilated by me regarding git over the course of my project work. Meant for brushup in case i forget later

Personal-Git-Readme

Basic

Branch related

Create Branch -
```
 git branch <BranchName>
```
Push branch for the first time
```
 git push -u origin <BranchName>
```
Push branch to another repo
```
 git push <Url/Remote> [+]<LocalBranchName>:<RemoteBranchName>
```
the optional + sign is in order to force the push even if it is not fast-forward

Merge Related

Merge Branches -

In order to merge branch Remote into branch Local, we perform the following command
```
 git checkout <LocalBranchName>
 git merge <RemoteBranchName>
```
Merge Options -
1. --no-commit
  
  This means that the merge will be performed and the results indexed but not committed. This allows one to inspect and test the merge before committing
2. --squash
  
  This means that the merge will be performed but all changes in the Remote Branch will be squashed together into a single commit and will not mix up the histories of the Local and Remote branch. However, this also means that the new merge commit will not contain as a parent, the commit of Remote branch that it merged with.