Cloning a repository

$ git clone <repository_name>
# Replace <repository_name> with the repo name.

When pushing a cloned repo to github, manage upstream depends on if you want to pull changes from that repo. More about origin and upstream here.

Create a repo

  • Create a repo on the github website.
  • Use following code to create a new repo 
    git init
git add README.md
git commit -m "first commit"
git branch -M main
git remote add origin git@github.com:sally-00/test2.git
git push -u origin main```

Add locally hosted code to github

  • Firstly, create a repo on the github website.
  • Secondly, do the following to set which repo to push to and push. Code should be run in the directory of the project. 
    $ git init && git symbolic-ref HEAD refs/heads/main
$ git add .
# Adds the files in the local repository and stages them for commit. To unstage a file or a folder, use 'git reset YOUR-FILE-OR-FOLDER'.
$ git commit -m "First commit"
# Commits the tracked changes and prepares them to be pushed to a remote repository. To remove this commit and modify the file, use 'git reset --soft HEAD~1' and commit and add the file again.
$ git remote add origin <REMOTE_URL>
# Sets the new remote
$ git remote -v
# Verifies the new remote URL
$ git push origin main
# Pushes the changes in your local repository up to the remote repository you specified as the origin

Flow of commit and push (upload) to repo

# This is used to check what changes has been made to the directory compared to the repo.
$ git status
# add all new changes
$ git add --all
# if you need to undo the add to specific files or folder
$ git reset path/to/file_or_folder
$ git commit -m "Comment here"
$ git push

Branch management:

# create a new branch
$ git branch <branch_name>
# switch to an other branch
$ git checkout <branch_name>
# list all branch
$ git branch -a

Switching between commits

Switching between different commits, temporarily and hard delete: A good explanation here

Selecting what files to be ignored by git

To ignore files in the folder, create a file named “.gitignore” and put all the files’ name inside.

Pulling repo

Pull the repo without it overwriting the changes you have made:

$ git stash
$ git pull
$ git stash pop

source

Or.

Commit changes and then pull. Use --rebase so it is not a merge commit and the history wil be linear.

$ git pull --rebase

git pull with local commits