{"id":63,"date":"2013-07-15T18:41:07","date_gmt":"2013-07-15T18:41:07","guid":{"rendered":"http:\/\/www.theacidfrog.com\/blog\/?p=63"},"modified":"2013-07-15T18:41:07","modified_gmt":"2013-07-15T18:41:07","slug":"basic-git-commands","status":"publish","type":"post","link":"https:\/\/www.theacidfrog.com\/blog\/basic-git-commands\/","title":{"rendered":"Basic Git Commands"},"content":{"rendered":"

Here is a list of some basic Git commands to get you going with Git Repositories.<\/p>\n

\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
Task<\/th>\nDescription<\/th>\nCommand<\/th>\n<\/tr>\n
Create a new local repository<\/strong><\/td>\n<\/td>\n\n
git init<\/pre>\n<\/td>\n<\/tr>\n
Check out a repository<\/strong><\/td>\nCreate a working copy of a local repository:<\/td>\n\n
git clone \/path\/to\/repository<\/pre>\n<\/td>\n<\/tr>\n
For a remote server, use:<\/td>\n\n
git clone username@host:\/path\/to\/repository<\/pre>\n<\/td>\n<\/tr>\n
Add files<\/strong><\/td>\nAdd one or more files to staging (index):<\/td>\n\n
git add <filename>\r\n\r\ngit add *<\/pre>\n<\/td>\n<\/tr>\n
Commit<\/strong><\/td>\nCommit changes to head (but not yet to the remote repository):<\/td>\n\n
git commit -m \"Commit message\"<\/pre>\n<\/td>\n<\/tr>\n
Commit any files you’ve added with\u00a0git add<\/code>, and also commit any files you’ve changed since then:<\/td>\n\n
git commit -a<\/pre>\n<\/td>\n<\/tr>\n
Push<\/strong><\/td>\nSend changes to the master branch of your remote repository:<\/td>\n\n
git push origin master<\/pre>\n<\/td>\n<\/tr>\n
Status<\/strong><\/td>\nList the files you’ve changed and those you still need to add or commit:<\/td>\n\n
git status<\/pre>\n<\/td>\n<\/tr>\n
Connect to a remote repository<\/strong><\/td>\nIf you haven’t connected your local repository to a remote server, add the server to be able to push to it:<\/td>\n\n
git remote add origin <server><\/pre>\n<\/td>\n<\/tr>\n
List all currently configured remote repositories:<\/td>\ngit remote -v<\/code><\/td>\n<\/tr>\n
Branches<\/strong><\/td>\nCreate a new branch and switch to it:<\/td>\n\n
git checkout -b <branchname><\/pre>\n<\/td>\n<\/tr>\n
Switch from one branch to another:<\/td>\n\n
git checkout <branchname><\/pre>\n<\/td>\n<\/tr>\n
List all the branches in your repo, and also tell you what branch you’re currently in:<\/td>\n\n
git branch<\/pre>\n<\/td>\n<\/tr>\n
Delete the feature branch:<\/td>\n\n
git branch -d <branchname><\/pre>\n<\/td>\n<\/tr>\n
Push the branch to your remote repository, so others can use it:<\/td>\n\n
git push origin <branchname><\/pre>\n<\/td>\n<\/tr>\n
Push all branches to your remote repository:<\/td>\n\n
git push --all origin<\/pre>\n<\/td>\n<\/tr>\n
Delete a branch on your remote repository:<\/td>\n\n
git push origin :<branchname><\/pre>\n<\/td>\n<\/tr>\n
Update from the remote repository<\/strong><\/p>\n

 <\/td>\n

Fetch and merge changes on the remote server to your working directory:<\/td>\n\n
git pull<\/pre>\n<\/td>\n<\/tr>\n
To merge a different branch into your active branch:<\/td>\n\n
git merge <branchname><\/pre>\n<\/td>\n<\/tr>\n
View all the merge conflicts:<\/p>\n

View the conflicts against the base file:<\/p>\n

Preview changes, before merging:<\/td>\n

git diff<\/code><\/p>\n

git diff --base <filename><\/code><\/p>\n

git diff <sourcebranch> <targetbranch><\/pre>\n<\/td>\n<\/tr>\n
After you have manually resolved any conflicts, you mark the changed file:<\/td>\n\n
git add <filename><\/pre>\n<\/td>\n<\/tr>\n
Tags<\/strong><\/td>\nYou can use tagging to mark a significant changeset, such as a release:<\/td>\n\n
git tag 1.0.0 <commitID><\/pre>\n<\/td>\n<\/tr>\n
CommitId is the leading characters of the changeset ID, up to 10, but must be unique. Get the ID using:<\/td>\n\n
git log<\/pre>\n<\/td>\n<\/tr>\n
Push all tags to remote repository:<\/td>\n\n
git push --tags origin<\/pre>\n<\/td>\n<\/tr>\n
Undo local changes<\/strong><\/td>\nIf you mess up, you can replace the changes in your working tree with the last content in head:<\/p>\n

Changes already added to the index, as well as new files, will be kept.<\/td>\n

\n
git checkout -- <filename><\/pre>\n<\/td>\n<\/tr>\n
Instead, to drop all your local changes and commits, fetch the latest history from the server and point your local master branch at it, do this:<\/td>\n\n
git fetch origin\r\n\r\ngit reset --hard origin\/master<\/pre>\n<\/td>\n<\/tr>\n
Search<\/strong><\/td>\nSearch the working directory for\u00a0foo()<\/code>:<\/td>\ngit grep \"foo()\"<\/code><\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n","protected":false},"excerpt":{"rendered":"

Here is a list of some basic Git commands to get you going with Git Repositories. Task Description Command Create a new local repository git init Check out a repository Create a working copy of a local repository: git clone \/path\/to\/repository For a remote server, use: git clone username@host:\/path\/to\/repository Add files Add one or more…<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[1],"tags":[],"_links":{"self":[{"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/posts\/63"}],"collection":[{"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/comments?post=63"}],"version-history":[{"count":3,"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/posts\/63\/revisions"}],"predecessor-version":[{"id":66,"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/posts\/63\/revisions\/66"}],"wp:attachment":[{"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/media?parent=63"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/categories?post=63"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.theacidfrog.com\/blog\/wp-json\/wp\/v2\/tags?post=63"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}