Here are some helpful hints and tips when working with git.

Creating a new repo on github using their API

The below is a curl request you can run from the command line. Just change the user and add the name:

curl -u ‘USERNAME’ https://api.github.com/user/repos -d '{"name”:”REPONAME”}’

Set the remote to the repo on github (add the username sometimes):

git remote add origin https://karava@github.com/karava/testCommandLineCreation.git

check the url of the origin:

git remote get-url origin

Reference: https://help.github.com/en/articles/adding-an-existing-project-to-github-using-the-command-line

Fetch online repositories from github

Fetch repos using this:

curl https://api.github.com/users/karava/repos | grep -w '"name"'

Alternatively here is a tool that can be used to fetch repositories, submit pull requests, fork repos all from the command-line https://hub.github.com. What are the advantages of git command line tools:

• Automate workflows
• Easily revert changes
• Easily synchronise code

Some general tips:

• write good git commit messages to give an indication what was changed
• Understand git semantics such as the notion of ‘remote’ and ‘origin’

Questions:

How can you search commits/view commit history, or search view/merge history. For example if you want to go back in time and find out what was done, or what broke what? Or to find how some old code was implemented, or to find some code that was deleted. In particularly how would you find when code you deleted still lived in git?

Other useful git commands

• git clone {url}
• git fork - creates your own copy of a repo
• git add (*)
• git diff
• git commit
• git commit -am “message” - Will add all the files you have changed and commit them together in one step. My
• question is what about if you have added new files?
• git status
• git push
• can be explicit and say:
• git push origin master - Meaning push these changes to the master branch
• git pull
• git log - will give history of all the commits made previously and their messages
• git reset - rollback and go back to an older version
• git reset — hard origin/master - go back to the latest branch in the git repo
• git rm --cached {file} - remove file from git repo but keep on disk, don't forget to push, and use -r for recursive in multiple files in a folder

Handling Merge conflicts

get picture from slides fix merge conflicts, usually keep yours or theirs? then commit the change the message will usually be “fixed merge conflicts” then git push

Branching

A Branch is a version of the repo. Each branch has its own commit history and current version

• git branch - shows all branches of code
• git branch {branch_name}
• git branch -D {branch_name} - delete branch
• git checkout
• git checkout -b {branch_name} - both creates and check-out a new branch at the same time
• git merge {branch_name} - switch to master branch and then run this command
• Pull Requests - Owner of repo can review changes and decide what to approve/reject
• Branch tagging - To automate when complete a sprint - we should tag a branch as a new version, that is increment the tag.
• When merge to master also automatically tag master with an incremented version