Git

Activities

Git Installation

1. Download Git from https://git-scm.com/downloads.
2. Install Git. (MacOS: brew install git)

Copy an existing remote repository

1. Clone a remote repository.
   • Select a local folder to copy the repository into, or create a new folder if you prefer. The repository will be copied as a subdirectory of the selected folder.
   • At a command or terminal prompt, navigate to the selected folder.
   • Clone the repository using the command:
     /git clone/ URL_TO_REPO. See also: git pull and git fetch

Create a local repository

1. Initialize a folder for Git.
   • Select a local folder to add to Git, or create a new folder if you are starting a new project.
   • At a command or terminal prompt, navigate to the selected folder.
   • Initialize the folder using the command:
     git init

Make Local Changes and Update remote Repositories

Add local changes.

1. Stage files.
   • Add files to the folder or modify existing files.
   • Add new and modified files to the git staging area using the command:
     git add . or git add some_modified_file.txt or git add -A
2. Commit changes.
   • Commit changes into the local repository using the command:
     git commit -m "<some message>"
3. Connect to a remote repository.
   • Connect to a remote repository using the command:
     git remote add <name> <url>
4. Push changes to a remote repository.
   • Push changes from your local repository to a remote repository using the command:
     git push or git push origin master or git push -h origin master

Retrieve Remote Changes

• Pull/get changes from a remote repository to have latest version of the code
  • Pull/get changes from a remote repository to your local repository using the command:

/git pull/ or git pull <name> <branch>

git pull -v (for more verbose output)

/git fetch/

gfind $1 -name ".git" | gsed -r 's|/[^/]+$||' | parallel "echo {}; git -C {} pull" (git pull all your repos in parallel, MacOS version)

• Pull subdirectories:

ls | parallel git -C {} pull (assuming all sub-dirs are git repositories)

ls | parallel git -C {} fetch

-C <PATH> run as if git was started in <path> instead of the current working directory.

Repository information

• git remote -v or git remote show origin or git config --get remote.origin.url

Git log

• git log --oneline
• git log --pretty=format:"%h - %an, %ar on %cd: %s"
• Show modifications to a file:git log --follow -p FILE_TO_SHOW or git blame FILE_TO_SHOW
• git shortlog
• List developers: git shortlogs -sne

Git show

• git show 3c88ad72430

Tags / Releases

• Show all tags in git log: git log --no-walk --tags --pretty="%h %d %s" --decorate=full
• git tag (show releases)
• List tags with dates: git log --tags --simplify-by-decoration --pretty="format:%ci %d". Just can also add taglog = log --tags --simplify-by-decoration --pretty='format:%ci %d' (note the single-, NOT double-quotes) in the [alias] section of your /.gitconfig/ file.

Miscelaneous

• git log --decorate=full --simplify-by-decoration
• Print lines matching a pattern:git grep TEXT_TO_SEARCH
• git merge

http://man7.org/linux/man-pages/man1/git-add.1.html

http://man7.org/linux/man-pages/man1/git-remote.1.html

https://git-scm.com/docs/git-push

https://stackoverflow.com/a/33557279

https://stackoverflow.com/questions/4089430/how-can-i-determine-the-url-that-a-local-git-repository-was-originally-cloned-fr

https://stackoverflow.com/a/31306082

https://stackoverflow.com/a/9597462

https://stackoverflow.com/questions/4211604/show-all-tags-in-git-log

https://stackoverflow.com/a/13208822

https://dev.to/neshaz/how-to-use-git-merge-the-correctway-25pd