University:
Boston University
Course:
MET CS 201 | Introduction to Programming
Academic year:

2020
Views:

68

Pages:

14
Author:

larbiwxcvbn

Review the history git log git log -3 # show the list of commits # show the list of the last 3 commits git show sha1 # show information about specific commit There are many options (can be combined): git log --graph git log --oneline git log --stat git log -p Alias for git log # non-colored version git log --graph --pretty=format:'%h%Creset -%d%Creset %s (%cr) <%an>%Creset' --abbrev-commit #colored version '%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(bold blue)<%an>%C(reset)' git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all # create alias git config --global alias.lg "log --all --decorate --oneline --graph" Filtering logs #Search commits with specific file(s) modified git log -- file1 file2 #Filter by date git log --after="2019-1-1" --before="2019-3-24" #Filter by author git log --author="Katia\|Brian" #Search commit messages git log --grep="delete" View file source in a commit git show HEAD:filename # source in the last commit git show 0721696:filename # source in a specific commit git annotate filename # show who made changes to a file Travelling in time undo staging git reset git reset -- filename working space staging area ( index ) discard changes git checkout HEAD git checkout -- filename local repository Travelling in time working space staging area ( index ) e5678 Head git checkout c3456 d4567 working space staging area ( index ) c3456 b2345 a1234 master branch Head Travelling in time working space staging area ( index ) e5678 Head git checkout master d4567 c3456 b2345 a1234 master branch Head Remote repository To publish repository to a GitHub (or other place): 1. Create a repository in GitHub 2. In your working directory run: git remote add origin https://github.com/katgit/image_prep.git git push -u origin master Collaboration To practice collaboration we will create remote repositories on the SCC and will practice updating them collaborator #1 creates a "bare" repository: cd /projectnb/scv/GIT git init --bare --shared name.git Then collaborator #1 clones it in another directory cd /to/my/own/dir git clone /projectnb/scv/GIT/name.git cd name Collaboration collaborator # 1 in his directory creates a text file README and add a few lines emacs -nw README git add README git commit -m"add README file" git push origin master collaborator # 2 clones this repository cd /to/my/own/dir git clone /projectnb/scv/GIT/name.git cd name Collaboration Both create 1 file with a different name (file1 and file2) and then add them to repo touch file1 git add file1 git commit -m"add file1" Each tries to execute the following command git push origin master One will succeed the other one will fail. ! [rejected] master -> master (fetch first) error: failed to push some refs to '/projectnb/scv/GIT/ka.git/' Collaboration The collaborator who had an error runs:  git pull origin master  within the editor edits merge commit message  git push origin master The other collaborator pulls new changes: git pull origin master Collaboration Both edit the same README file nano README git add README git commit -m"Katia fixed README" Each tries to execute the following command git push origin master One will succeed the other one will fail. ! [rejected] master -> master (fetch first) error: failed to push some refs to '/projectnb/scv/GIT/ka.git/' Collaboration The collaborator who had an error runs:  git pull origin master  edit README file to remove conflict  git add README  git commit -m"merged conflict in README file  git push origin master The other collaborator pulls new changes: git pull origin master