Skip to content

Latest commit

 

History

History
306 lines (226 loc) · 7.44 KB

usingGit.md

File metadata and controls

306 lines (226 loc) · 7.44 KB

Short note on how to git

When everything fails, and you forget how to git

Warm-up tutorials

http://readwrite.com/2013/09/30/understanding-github-a-journey-for-beginners-part-1#awesm=~oFlQCvoJank0tf http://readwrite.com/2013/10/02/github-for-beginners-part-2#awesm=~oFlUvD0lcooGkC

Generate ssh-key

To not have to type the username and password all the time: NOTE: You have to change the URL from HTTP to SSH when making an SSH key

https://help.github.com/articles/generating-ssh-keys/

(if this is not so informative, this can help on the way https://help.github.com/enterprise/11.10.340/user/articles/generating-ssh-keys/)

https://help.github.com/articles/changing-a-remote-s-url/

Adding files

Nifty to remember

git add -A # Adds everything
git add -u # Do not add new files

http://stackoverflow.com/questions/572549/difference-between-git-add-a-and-git-add

gitdiff

Use git d instead of gitdiff

Eventually, git diff --no-external

http://stackoverflow.com/questions/3713765/viewing-all-git-diffs-with-vimdiff

List files in a commit

Get the checksum for git log

Either:

git diff-tree --no-commit-id --name-only -r <checksum>

or

git show --pretty="format:" --name-only <checksum>

http://stackoverflow.com/questions/424071/list-all-the-files-for-a-commit-in-git

Revert to previous commit

NOTE:

  • This will destroy any local modifications.
  • Don't do it if you have uncommitted work you want to keep.
git reset --hard <checksum>

http://stackoverflow.com/questions/4114095/revert-to-a-previous-git-commit

Create folder on github

git remote add origin https://github.com/uname/folder.git

Revert all changes

Remove all untracked files

git clean -f

Revert changes made to your working copy

git checkout .

Revert changes made to the index (i.e., that you have added)

git reset

Revert a change that you have committed

git revert ...

http://stackoverflow.com/questions/1146973/how-do-i-revert-all-local-changes-in-git-managed-project-to-previous-state

How git works

http://stackoverflow.com/questions/2745076/what-are-the-differences-between-git-commit-and-git-push

Branches

Clone a branch

git clone -b <branch> <remote_repo>

http://stackoverflow.com/questions/1911109/git-clone-a-specific-branch

Make branch

git checkout -b <name_of_your_new_branch>

Push branch

git push origin <name_of_your_new_branch>

See branches

git log --graph --oneline --all

Delete a branch

git push origin --delete <branchName>

http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Add a delete

git rm $(git ls-files --deleted)

Resolve a confilct

https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/

Git on USB

Make the repository

mkdir /path/to/usb/repository.git
cd /path/to/usb/repository.git
git init --bare
cd /path/to/source/
git init
git remote add usb file:///path/to/usb/repository.git
git push usb

Pull from the repository

a) If there are stuff already in the folder:

git remote add usb file:///path/to/usb/repository.git
git pull usb
git fetch --all
git reset --hard usb/master
git push usb

b) In a clean folder

git clone file:///path/to/usb/repository.git

http://www.geppyparziale.com/post/13494900906/create-a-git-repository-on-a-usb-drive

Download git on cluster

For archaic cluster with not up to date software

cd ~
mkdir install
mkdir git
cd install
wget http://kernel.org/pub/software/scm/git/git-2.1.1.tar.gz
tar -xvf git-2.1.1.tar.gz
cd git-2.1.1
./configure --prefix=$HOME/src --exec-prefix=$HOME/src/git
make
make install

# Write the following to the terminal
export PATH=$PATH:$HOME/src/git/bin
# Add following to ./bashrc
# # Using git
# export PATH=$PATH:$HOME/src/git/bin

Branch off last commit

Warning: This rewrites your history! Use with EXTREME caution.

git branch newbranch
git reset --hard HEAD~1 # Go back 1 commits. You *will* lose uncommitted work
git checkout newbranch
git rebase <previous checksum>
git checkout master
git push --force

http://stackoverflow.com/questions/1628563/move-the-most-recent-commits-to-a-new-branch-with-git

Move between repositories

We want to move directory dir1 from gitRepoA to gitRepoB

git clone <gitRepoA url> # Do this someplace else than your standard repo
cd <gitRepoA directory>
git remote rm origin # So that we don't accidentally mess up
git filter-branch --subdirectory-filter <path/to/dir1> -- --all
ll # See the changes in your repo

git clone <gitRepoB url>
cd <gitRepoB directory>
git remote add gitRepoA-branch <path/to/gitRepoA>
git pull gitRepoA-branch master
git remote rm gitRepoA-branch

http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/

Using patches

Make the 4 last commits into one patchfile NOTE: Make sure that the repo is clean before applying patches

git clean -dxfi

then

# Make
git format-patch HEAD~4..HEAD --stdout > changes.patch

# Apply (signoff marks the commit where the patch was applied)
git am --signoff < changes.patch

Eventually

# Make
git format-patch master --stdout > changes.diff

# Apply
git am --signoff < my_new_patch.diff

There may be problems with whitespaces, in that case:

git apply --ignore-space-change --ignore-whitespace mychanges.patch

http://stackoverflow.com/questions/4770177/git-patch-does-not-apply https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/

Delete large files

Assuming you want to delete the large file foo

git filter-branch -f --tree-filter 'rm -rf foo' HEAD
git for-each-ref --format='delete %(refname)' refs/original | git update-ref --stdin
git reflog expire --expire=now --all
git gc --prune=now
git push origin --force --all

http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-git-repo

Manual merge

This can be handy when one wants to merge just some changes, but not all

git merge --no-commit merge_branch --no-ff

The modified files now have to be added manually in order to finish the merge

http://stackoverflow.com/questions/4657009/how-to-merge-all-files-manually-in-git

Pulling a submodule

A submodule can be added by

git submodule add git@github.com:user/awesome_repo.git

If the parent is cloned with

git clone git@github.com:user/parent_to_awesome_repo.git

(or the like), the submodule will be empty. For cloning all submodules, simply

git clone git@github.com:user/parent_to_awesome_repo.git --recursive

If you don't want to pull all the submodules at once, or if you forgot the --recursive flag, you can

cd path/to/awesome_repo
git submodule update --init .
git checkout master