Git cheat sheet - janosgyerik/cheatsheets GitHub Wiki
http://git-scm.com/course/svn.html
| SVN | GIT |
|---|---|
| svn cat PATH | git show REV:PATH |
| svn diff -cREV | git show REV |
| svn export PATH /somewhere/else | git archive master > /somewhere/else/export.tar |
| svn rm --keep-local PATH | git rm --cached PATH |
git init git add . git status git commit -m "some message"
[user]
name = Janos Gyerik
email = [email protected]
[alias]
st = status
ci = commit
br = branch
co = checkout
ls = ls-files
ign = ls-files -o -i --exclude-standard
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
- head
- head^
- head^^
- head^^^
- head^^^^
- head~4
- ...
- rev^
- rev^^
- rev^^^
- rev~3
- ...
git log rev -- path git show rev -- path git diff rev -- path
Scenario: simple lock-step model, the rough equivalent of using svn checkout + svn update + svn commit.
# commit changes to local repo git commit -m "some work" git commit -m "some more work" git commit -m "even more work" # pull changes from svn git svn rebase # commit all local changes back to svn git svn dcommit
In case of large repositories, git svn clone may just stop in the middle with no error message but an apparently empty working tree. When this happens cd into the partially created working tree and run git svn fetch. You may need to repeat it a couple of times, until finally the working tree is correctly populated with files.
Scenario: work a local branch, occasionally getting upstream changes, and in the end commit back everything
# hack away (work)$> git commit -m "msg 1" (work)$> git commit -m "msg 2" (work)$> git commit -m "msg 3 ..." # switch to master and get upstream changes from svn (work)$> git checkout master (master)$> git svn rebase # switch to work, rebase on master (master)$> git checkout work (work)$> git rebase master (work)$> git log --graph --oneline --decorate # switch to master, merge from work, commit back to svn (work)$> git checkout master (master)$> git merge --no-ff work (master)$> git log --graph --oneline --decorate (master)$> git commit --amend (master)$> git svn dcommit
git config --add svn-remote.newbranchname.url https://svn/path_to_newbranch/ git config --add svn-remote.newbranchname.fetch :refs/remotes/newbranchname git svn fetch newbranchname [-r<rev>] git checkout -b local-newbranchname -t newbranchname git svn rebase newbranchname ... git svn dcommit --dry-run git svn dcommit
1. Find the revision id where the path was deleted:
git log -- path_that_was_deleted_in_a_previous_revision
2. Bring back the deleted directory from the revision before the one which deleted it:
git checkout THE_REV^ -- path_that_was_deleted_in_a_previous_revision
Note: the checkout command will not just bring it back but automatically stage it for the next commit. To unstage it:
git reset -- path_that_was_deleted_in_a_previous_revision
cd /path/to/your/new/project git init git add . git commit -m 'first commit, added all files' git clone --bare . project.git rsync -a project.git username@server:path/to/repos/git/project.git rm -fr project.git git remote add origin username@server:path/to/repos/git/project.git git pull origin master # should say: "Already up-to-date."
1. Create the target location inside the Subversion repository
svn mkdir https://reposerver/path/to/repo/path/to/project
2. Edit your git repository configuration to make the connection with git-svn
[svn-remote "svn"] url = https://reposerver/path/to/repo/path/to/project fetch = :refs/remotes/git-svn
3. Import the empty Subversion history
git svn fetch
4. Replay your commits on top of the empty Subversion history
git rebase remotes/git-svn
5. Push the commits to Subversion
git svn dcommit
Restore file or dir from head or rev:
git checkout -- path git checkout rev -- path
Remove all untracked files:
git clean
Mark a file in the index 'assume unchanged':
git update-index --assume-unchanged path_to_the_file
... and how to change it back:
git update-index --no-assume-unchanged path_to_the_file
List files that are marked 'assume unchanged' in the index:
git ls-files -v | grep ^[a-z]
Run this once in a while:
git gc
Create a branch and switch to it:
git checkout -b bname
Merge from another git repository:
git pull path_to_dir
Track specific branches of a subversion repository:
[svn-remote "huge-project"]
url = http://server.org/svn
fetch = trunk/src:refs/remotes/trunk
branches = branches/{red,green}/src:refs/remotes/branches/*
tags = tags/{1.0,2.0}/src:refs/remotes/tags/*
Generate .gitignore in a checkout from subversion:
git-svn show-ignore > .gitignore
Fetch revisions from a remote branch:
git fetch some_name
See what has changed in a remote branch relative to current:
git log master..some_name/master
Two equivalent methods to merge from a branch:
git merge some_name git pull . remotes/some_name/master
# staging hunks
git add --patch
git merge --squash <feature_branch>
git ls-tree -r $BRANCH
git show $REVISION:$FILENAME
git checkout $REVISION -- $FILENAME
git checkout $BRANCH@{yesterday}:$FILENAME # $FILENAME as it was yesterday
git checkout $BRANCH^:$FILENAME # $FILENAME on the first commit parent
git checkout $BRANCH@{2}:$FILENAME # $FILENAME two commits ago
git config --add svn-remote.newbranchname.url https://svn/path_to_newbranch/ git config --add svn-remote.newbranchname.fetch :refs/remotes/newbranchname git svn fetch newbranchname [-r<rev>] git checkout -b local-newbranchname -t newbranchname git svn rebase newbranchname ... git svn dcommit --dry-run git svn dcommit
http://www.kernel.org/pub/software/scm/git/docs/v1.7.3/user-manual.html#resolving-a-merge
git status git checkout --theirs path git checkout --ours path git commit -a
Cherry-pick merge revisions in other branch that are not in master.
git reset --hard git cherry-pick --abort git rev-list ^master other-branch | git cherry-pick -n --stdin
git checkout -b some-name-describing-the-change git commit -m 'describe the change' file1 file2 git checkout master
# see all branches gitk --all
https://speakerdeck.com/u/holman/p/git-and-github-secrets
git show :/something # last matched commit search
# master@{1.day.ago}
# master@{yesterday}
git log branchA ^branchB # commits in branchA not in branchB
git status -sb
git diff HEAD^ --stat
git config --global color.ui 1
git branch --contains sha1
# copy file without switching branches git checkout branchname -- path/to/file
- click a line on github : adds #L123 to the url
- works with ranges too
git rev-list --reverse branch1 ^master --author codername sha1.. | git cherry-pick -n --stdin
- cherry pick the revisions that are in branch1 but not in master, by specific author, after specific revision
- change the url of a remote
git remote set-url origin git://new.url.here
- set user email address
git config --global user.email 'janos@xw8400'
# blame ignore whitespace git blame -w # detect moves git blame -M # detect moves over files, like -M but at other files in that same commit git blame -C # also looks at the commit the file was created in git blame -CC # also looks at all commits git blame -CCC # word diffs git diff HEAD^ --word-diff # fix typos like git comit git config --global help.autocorrect 1 # short log with count grouped by author git shortlog -sn
# the -y is to skip the prompt "Launch 'gvimdiff' [Y/n]" git difftool -y branchname -- ./path/to/file
git init --bare /path/to/somewhere/else git push -u /path/to/somewhere/else master
After this you can do git push with no args to push to that location.
git branch -m old_branch new_branch
git push origin :BRANCHNAME
For example:
$ git branch -r origin/HEAD -> origin/master origin/master origin/blah $ git push origin :blah To [email protected]:user/repo - [deleted] blah
# show all remotes git remote -v # show all remote branches git branch -r # add a new remote git remote add sample /path/to/remote # fetch all branches from remotes and update branch listing git remote update # checkout a remote branch git checkout -b feature1 sample/feature1 # easy way to check out and switch to a branch from a remote git checkout feature1
You cannot. You have to commit the pending changes and then you can create a patch from the commit. This is not really limiting, as you can easily create a temporary branch for the temporary commit. Actually any change that deserves a patch also deserves to be committed. Otherwise you may lose it by mistake.
The commit log message will be used in the filename of the patch file, with spaces and other fancy characters replaced. Write a good a log message.
# Create a patch from any revision git format-patch REV # Create a patch from the last revision git format-patch HEAD^
# show last 5 revision numbers git rev-list master -n 5 # show last 5 revision numbers + online commit message git rev-list master -n 5 --oneline # merge up to specific revision git merge sha1 # get directory from another branch git checkout master -- dirname
https://speakerdeck.com/holman/more-git-and-github-secrets
# check for trailing whitespace and other things git diff --check # get the status of everything you're ignoring git status --ignored curl https://github.com/janosgyerik.keys # fetch pull request #12 into a branch named pr git fetch origin pull/12/head:pr
- commit messages
- should have a short summary, less than 50c
- longer description, wrap lines at 72c
-
git commit(without-mflag), helps writing good messages- assumes:
- EDITOR=vim
- syntax on
- filetype indent plugin on
- assumes:
- emoji
- 👏
- 👍
- 👎
- ✨
- ❤️
- 🔥
- 💩
- github
- when commenting: highlight original text and press [r] to insert quoted text
- issue autocompleting: type [#] to search
- file finder: type [t] to find in project
- task lists within issues:
- [] do this - branch switcher: type [w]
- quick search: type [s]
- http://cheat.errtheblog.com/s/git