diff options
Diffstat (limited to 'git/git-cheatsheet.txt')
-rw-r--r-- | git/git-cheatsheet.txt | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/git/git-cheatsheet.txt b/git/git-cheatsheet.txt deleted file mode 100644 index 211e808..0000000 --- a/git/git-cheatsheet.txt +++ /dev/null @@ -1,72 +0,0 @@ -Tag - - git tag -a x.y.z -m "Tag version x.y.z" - -Squash multiple commits into one - - git rebase -i HEAD~<N> - - http://www.gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html - -Change commit message - - git commit --amend - -Revert uncommited changes - - git reset --hard HEAD - -Copy commit from one branch to the other - - # On the source branch - git log -1 - git cout <target-branch> - git cherry-pick <commit-id> - -Setup remote repository - - On remote: - - 1. mkdir proj.git - 2. chgrp scm proj.git - 2. cd proj.git - 3. git --bare init --shared=all - 4. chgrp -R scm ../proj.git - 5. edit description - 5a touch git-daemon-export-ok && chgrp scm git-daemon-export-ok && \ - chmod g+w git-daemon-export-ok # if public - 6. cd hooks - 7. mv post-update.sample post-update - - On local: - - 1. git remote add origin scm.codesynthesis.com:/var/scm/proj/proj.git - 2. git push --tags origin master - 3. # blow the local project and do clone - git clone scm.codesynthesis.com:/var/scm/proj/proj.git [name] - -Delete a branch from a remote repository - - git push origin :experimental - - Find a ref that matches experimental in the origin repository (e.g. - refs/heads/experimental), and delete it. - - Using the push.sh script: - - ./push.sh :<name> - -Rebasing - - Local (e.g., from a feature branch to master): - - git rebase <src> [<dst>] - - If <dst> is not specified, current branch is used. If <dst> is - specified, it is checked out. - - Remote (e.g., merge someone else's changes): - - git fetch - git rebase origin[/master] - git push --tags origin |