{"id":5911,"date":"2012-09-11T21:23:32","date_gmt":"2012-09-12T02:23:32","guid":{"rendered":"http:\/\/jianmingli.com\/wp\/?p=5911"},"modified":"2023-05-26T14:12:08","modified_gmt":"2023-05-26T19:12:08","slug":"git","status":"publish","type":"post","link":"https:\/\/jianmingli.com\/wp\/?p=5911","title":{"rendered":"GIT"},"content":{"rendered":"
\n

Contents<\/h2>\n
    \n\t
  1. \n\t\tOverview<\/a>\n\t\t
      \n\t\t\t
    1. \n\t\t\t\tFeatures<\/a>\n\t\t\t<\/li>\n\t\t\t
    2. \n\t\t\t\tDiff from CVCS (Centeralized VCS)<\/a>\n\t\t\t<\/li>\n\t\t\t
    3. \n\t\t\t\tObject Store<\/a>\n\t\t\t<\/li>\n\t\t\t
    4. \n\t\t\t\tFile Status<\/a>\n\t\t\t<\/li>\n\t\t\t
    5. \n\t\t\t\tChecking File Status<\/a>\n\t\t\t<\/li>\n\t\t\t
    6. \n\t\t\t\tThree Config Files<\/a>\n\t\t\t<\/li>\n\t\t<\/ol>\n\t
    7. \n\t\tInstall<\/a>\n\t\t
        \n\t\t\t
      1. \n\t\t\t\tWindows Install<\/a>\n\t\t\t<\/li>\n\t\t\t
      2. \n\t\t\t\tLinux Install<\/a>\n\t\t\t<\/li>\n\t\t\t
      3. \n\t\t\t\tFirst Time Setup<\/a>\n\t\t\t<\/li>\n\t\t\t
      4. \n\t\t\t\tIgnore Files<\/a>\n\t\t\t<\/li>\n\t\t\t
      5. \n\t\t\t\tHelp<\/a>\n\t\t\t<\/li>\n\t\t<\/ol>\n\t
      6. \n\t\tBasics<\/a>\n\t\t
          \n\t\t\t
        1. \n\t\t\t\tGetting a Git Repository<\/a>\n\t\t\t<\/li>\n\t\t\t
        2. \n\t\t\t\tRecording Changes to the Repository<\/a>\n\t\t\t\t
            \n\t\t\t\t\t
          1. \n\t\t\t\t\t\tStage Files<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
          2. \n\t\t\t\t\t\tUn-Stage Files<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
          3. \n\t\t\t\t\t\tView Changes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
          4. \n\t\t\t\t\t\tCommit Changes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
          5. \n\t\t\t\t\t\tRemove Files<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
          6. \n\t\t\t\t\t\tMoving Files<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
          7. \n\t\t\t\t\t\tView Commit History<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t<\/ol>\n\t\t\t
          8. \n\t\t\t\tStash Changes<\/a>\n\t\t\t<\/li>\n\t\t\t
          9. \n\t\t\t\tUndo Things<\/a>\n\t\t\t\t
              \n\t\t\t\t\t
            1. \n\t\t\t\t\t\tChange or Redo Last Commit<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
            2. \n\t\t\t\t\t\tDiscard Commits<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
            3. \n\t\t\t\t\t\tRevert Changes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t<\/ol>\n\t\t\t
            4. \n\t\t\t\tWorking with Remotes<\/a>\n\t\t\t\t
                \n\t\t\t\t\t
              1. \n\t\t\t\t\t\tShow Remotes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
              2. \n\t\t\t\t\t\tAdd remote short name<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
              3. \n\t\t\t\t\t\tFetch\/Pull from Remotes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
              4. \n\t\t\t\t\t\tPushing to Remotes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
              5. \n\t\t\t\t\t\tInspecting a Remote<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
              6. \n\t\t\t\t\t\tRename Remotes<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
              7. \n\t\t\t\t\t\tRemove Remote<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t<\/ol>\n<\/ol>\n\t\t\t
              8. \n\t\t\t\tBranching<\/a>\n\t\t\t\t
                  \n\t\t\t\t\t
                1. \n\t\t\t\t\t\tCreate New Branch<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
                2. \n\t\t\t\t\t\tShow Branches<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
                3. \n\t\t\t\t\t\tSwitch Branch<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
                4. \n\t\t\t\t\t\tDelete Branch<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
                5. \n\t\t\t\t\t\tRenaming a Branch<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
                6. \n\t\t\t\t\t\tPush Branch to Remote<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t<\/ol>\n\t\t\t
                7. \n\t\t\t\tMerging<\/a>\n\t\t\t<\/li>\n\t\t\t
                8. \n\t\t\t\tExamples<\/a>\n\t\t\t\t
                    \n\t\t\t\t\t
                  1. \n\t\t\t\t\t\tGenerate Patch Files<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t<\/ol>\n\t\t\t
                  2. \n\t\t\t\tIssues<\/a>\n\t\t\t\t
                      \n\t\t\t\t\t
                    1. \n\t\t\t\t\t\tCouldn't set refs\/heads\/master<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t\t
                    2. \n\t\t\t\t\t\tFile is far too short to be a packfile<\/a>\n\t\t\t\t\t<\/li>\n\t\t\t\t<\/ol>\n\t\t\t
                    3. \n\t\t\t\tReferences<\/a>\n\t\t\t<\/li>\n<\/ol>\n<\/ol>\n<\/div>\n
                       <\/div>\n

                      Overview<\/h2><\/span>\n

                      Features<\/h3><\/span>\n

                      * Created in 2005
                      \n* Fully distributed
                      \n* Fast and efficient with large projects
                      \n* Incredible branching system for non-linear development (thousands of parallel branches)<\/p>\n

                      Diff from CVCS (Centeralized VCS)<\/h3><\/span>\n

                      * GIT keeps file snapshots<\/strong> not deltas (such as SVN)
                      \n* Nearly every operation is local (no need for network connectivity)
                      \n* Everything is checksumed (by SHA-1) before being installed
                      \n* Uses object database (not relational db) called object store<\/em><\/p>\n

                      Object Store<\/h3><\/span>\n

                      * Object store contains three types of objects:
                      \n– blob: represents a file
                      \n– tree: represents a directory
                      \n– commit: represents a snapshot of the entire repository content
                      \n– annotated tags: human readable object associated with a particular commit
                      \n* Git objects are stored in .git\/objects<\/em> folder<\/p>\n

                      File Status<\/h3><\/span>\n

                      * Unstaged: not under Git control
                      \n* Staged: added to Git control, e.g. command git add file.txt<\/em> stages file.txt file.
                      \n* Committed: added to Git control, e.g. command git commit -m “Commit message” file.txt<\/em> adds file.txt file got Git control.<\/p>\n

                      \"\"<\/a><\/h6><\/span>\n

                      Checking File Status<\/h3><\/span>\n

                      * git status<\/em><\/p>\n

                      \r\n$ git status\r\nOn branch master\r\nnothing to commit, working tree clean\r\n<\/pre>\n
                      Three Config Files<\/h3><\/span>\n
                      * \/etc\/gitconfig<\/em>
                      \n– System wide configuration
                      \n– For all<\/em> users and all<\/em> repositories<\/p>\n
                      \r\ngit config --system\r\n<\/pre>\n
                      * ~\/.gitconfig<\/em>
                      \n– User specific configuration<\/p>\n
                      \r\ngit config --global\r\n\r\n# Edit global configuration\r\ngit config --global --edit\r\n<\/pre>\n
                      * .git\/config<\/em>
                      \n– Config file in the git directory
                      \n– For single repository
                      \n– Take precedence over ~\/.gitconfig<\/em> over \/etc\/gitconfig<\/em><\/p>\n
                      Install<\/h2><\/span>\n
                      Windows Install<\/h3><\/span>\n
                      * Download from git download site<\/a>, e.g. Git-1.8.4-preview20130916.exe<\/em>
                      \n* Double click to install, accept all defaults
                      \n* Open git shell: All Programs > Git > Git Bash<\/strong><\/p>\n
                      Linux Install<\/h3><\/span>\n
                      * yum install git-core<\/em>
                      \n* yum install git<\/em><\/p>\n
                      First Time Setup<\/h3><\/span>\n
                      * Setup user identity<\/p>\n
                      \r\ngit config --global user.name \"Jimmy Li\"\r\ngit config --global user.email jimmy.li@yahoo.com\r\n<\/pre>\n
                      * Setup editor (defaults to vi)<\/p>\n
                      \r\ngit config --global core.editor vim\r\n\r\n# For Git-for-Windows 2.5.3 and above\r\ngit config --global core.editor notepad\r\n<\/pre>\n
                      * Setup diff tool<\/p>\n
                      \r\ngit config --global merge.tool vimdiff\r\n<\/pre>\n
                      * Setup aliases<\/p>\n
                      \r\ngit config --global alias.co checkout\r\ngit config --global alias.br branch\r\ngit config --global alias.ci commit\r\ngit config --global alias.st status\r\ngit config --global alias.lg \"log --pretty=oneline\"\r\n<\/pre>\n
                      * Check config:<\/p>\n
                      \r\ngit config --list\r\n<\/pre>\n
                      \r\n$ git config --global user.name \"Jimmy Li\"\r\n$ git config --global user.email jimmy.li@yahoo.com\r\n$ git config --list\r\nuser.name=Jimmy Li\r\nuser.email=jimmy.li@yahoo.com\r\nalias.co=checkout\r\nalias.br=branch\r\nalias.ci=commit\r\nalias.st=status\r\nalias.lg=log --pretty=oneline\r\n<\/pre>\n
                      Ignore Files<\/h3><\/span>\n
                      * Ignore files: place ignore rules in .gitignore<\/strong> file
                      \n* Rules:<\/p>\n
                      \r\n Blank lines or lines starting with # are ignored.\r\n Standard glob patterns work.\r\n You can end patterns with a forward slash (\/) to specify a directory.\r\n You can negate a pattern by starting it with an exclamation point (!).\r\n<\/pre>\n
                      * Examples:<\/p>\n
                      \r\n# a comment - this is ignored\r\n# no .a files\r\n*.a\r\n# but do track lib.a, even though you're ignoring .a files above\r\n!lib.a\r\n# only ignore the root TODO file, not subdir\/TODO\r\n\/TODO\r\n# ignore all files in the build\/ directory\r\nbuild\/\r\n# ignore doc\/notes.txt, but not doc\/server\/arch.txt\r\ndoc\/*.txt\r\n# ignore all .txt files in the doc\/ directory\r\ndoc\/**\/*.txt\r\n\r\n# Ignore Thumbs.db\r\nThumbs.db\r\n\r\n# Ignore $tf folders\r\ntfs\/DEV\/$tf*\/\r\n\r\n# Ignore all folders in Java folder \r\n# but not ant and config subdirectories\r\ntfs\/DEV\/Java\/*\r\n!tfs\/DEV\/Java\/ant\/\r\n!tfs\/DEV\/Java\/config\/\r\n<\/pre>\n
                      Help<\/h3><\/span>\n
                      \r\ngit help \r\ngit  --help\r\nman git-\r\n\r\ne.g.\r\ngit help config\r\n<\/pre>\n
                      Basics<\/h2><\/span>\n
                      Getting a Git Repository<\/h3><\/span>\n
                      * Initialize a Repository in an Existing Directory<\/p>\n
                      \r\n# Creates a git repository in current directory\r\n# Also setup current directory as working directory \r\ngit init\r\n\r\n# Creates a git repository named my-proj.git without working directory\r\n# Use this for a central repository\r\ngit init --bare my-proj.git\r\n<\/pre>\n
                      * Cloning an Existing Repository. Usually we clone from a central repository to work on.<\/p>\n
                      \r\ngit clone [url]\r\n<\/pre>\n
                      * git url formats:<\/p>\n
                      \r\ngit:\/\/\r\nhttp(s):\/\/\r\nuser@server:\/path.git\r\n\r\n# Local path\r\n--local file:\/\/\/C:\/path\/to\/repo\/my_project\r\n<\/pre>\n
                      * Example<\/p>\n
                      \r\n# Clone a central repository\r\ngit clone file:\/\/\/w\/git\/test2\/my-proj.git\r\n<\/pre>\n
                      \r\n# Clone Azure DevOps using personal auth token\r\n$MyPat = 'xxx'\r\n$B64Pat = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes(\"`:$MyPat\"))\r\ngit -c http.extraHeader=\"Authorization: Basic $B64Pat\" clone devops_git_url\r\n<\/pre>\n
                      Recording Changes to the Repository<\/h3><\/span>\n
                      * Check file status:<\/p>\n
                      \r\ngit status\r\n<\/pre>\n
                      Stage Files<\/h4><\/span>\n
                      * Add new files to stage area:<\/p>\n
                      \r\n# Add a particular file\r\ngit add file1.txt\r\n\r\n# Add current directory and all its content to stage area:\r\ngit add .\r\n\r\n# Add a particular directory\r\ngit add com.acme\r\n\r\n# Add all changed and deleted files but not new files\r\ngit add -u\r\n\r\n# Add all files including new files\r\ngit add -A\r\n\r\n# Interactive add\r\ngit add -p\r\n<\/pre>\n
                      Un-Stage Files<\/h4><\/span>\n
                      * Remove staged files<\/p>\n
                      \r\n# Unstage all staged files\r\ngit reset\r\n\r\n# Unstage a particular staged file\r\ngit reset file1.txt\r\ngit reset HEAD file1.txt\r\n\r\n# Interactive unstage\r\ngit reset --patch\r\n\r\n# Reset to remote and discard all local changes. Be careful!\r\ngit reset --hard origin\/master\r\n<\/pre>\n
                      View Changes<\/h4><\/span>\n
                      * View un-staged<\/em>, i.e.<\/em> have not being git add<\/em>, changes:<\/p>\n
                      \r\ngit diff web.config\r\n<\/pre>\n
                      * View staged<\/em>, i.e.<\/em> have been git add<\/em> changes:<\/p>\n
                      \r\ngit diff --staged web.config\r\n<\/pre>\n
                      * View diff between any two files:<\/p>\n
                      \r\ngit diff a\/web.config b\/web.config\r\n<\/pre>\n
                      * View diff between any two commits:<\/p>\n
                      \r\ngit diff b7b382a3 f31018af \/\/ Display diff for all files between two commits\r\ngit diff b7b382a3 f31018af web.config\r\n<\/pre>\n
                      Commit Changes<\/h4><\/span>\n
                      * Commit staged<\/em> changes:<\/p>\n
                      \r\n# Commit all staged files\r\ngit commit -m 'Commit staged files.'\r\n\r\n# Commit a particular staged file\r\ngit commit -m 'Add file1.txt.' file1.txt\r\n<\/pre>\n
                      Remove Files<\/h4><\/span>\n
                      * Remove file1.txt<\/em> from git,
                      \n– also <\/em>remove it from working directory:<\/p>\n
                      \r\ngit rm file1.txt\r\n\r\n# Need to commit to make it into Git\r\ngit commit -m \"Remove fil1.txt.\" file1.txt\r\n\r\n# Log\r\ngit log --pretty=oneline\r\nd546e7cee2d190d1a063735dad91584734d1268c Remove fil1.txt.\r\n17b6750215ba69a7dd132a4469fcfdaa01262d80 Add file1.txt\r\n<\/pre>\n
                      * Examples:<\/p>\n
                      \r\n# Remove all .log files\r\ngit rm log\/\\*.log\r\ngit commit -m \"Remove all log files in log directory.\"\r\n<\/pre>\n
                      Moving Files<\/h4><\/span>\n
                      \r\ngit mv from_file to_file\r\n<\/pre>\n
                      View Commit History<\/h4><\/span>\n
                      \r\ngit log\r\ngit log -p # show diff\r\ngit log -p -2 # show diff of last two entries\r\ngit log --stat\r\ngit log --pretty=oneline # others: short, full, fuller\r\ngit log --pretty=format:\"%h - %an, %ar : %s\"   # Use custom format\r\ngit log --pretty=format:\"%s %s\" --graph    # Use graph\r\ngit log --since=2.weeks\r\ngit log --pretty=\"%h - %s\" --author=gitster --since=\"2008-10-01\" \\\r\n   --before=\"2008-11-01\" --no-merges -- t\/\r\n\r\n# Show reflog\r\ngit log -g --pretty=oneline\r\n<\/pre>\n
                      * Launch log history in GUI:
                      \ngitk<\/em><\/p>\n
                      Stash Changes<\/h3><\/span>\n
                      \r\n# Stash tracked files, but NOT new files, NOT ignored files\r\ngit stash\r\n\r\n# Stash with message\r\ngit stash save \"Add readme.txt\"\r\n\r\n# Stash tracked files, new files, but NOT ignored files\r\ngit stash -u\r\n\r\n# Stash with message. Note the save keyword\r\ngit stash save -u \"Add readme.txt\"\r\n\r\n# Stash tracked files, new files AND ignored files\r\ngit stash -a\r\n\r\n# Reapply stashed changes, also remove from stashed files\r\ngit stash pop\r\n\r\n# Reapply stashed changes, also do NOT remove from stashed files\r\ngit stash apply\r\n\r\n# You can stash multiple stashes. List all stashes\r\ngit stash list\r\n\r\n# Reapply a specific stash\r\ngit stash pop stash@{2}\r\n<\/pre>\n
                      Undo Things<\/h3><\/span>\n
                      Change or Redo Last Commit<\/h4><\/span>\n
                      \r\n# Redo last commit with new message\r\ngit commit --amend -m \"Redo commit\"\r\n\r\n# Redo last commit with original commit message\r\ngit commit --amend -C HEAD\r\n<\/pre>\n
                      * Example:<\/p>\n
                      \r\n$ vi file1.txt\r\n$ git add file1.txt\r\n$ git ci -m \"Add file1.txt\" file1.txt\r\n[master 7e3524a] Add file1.txt\r\n 1 file changed, 1 insertion(+)\r\n create mode 100644 file1.txt\r\n$ git lg\r\n7e3524a2c39be7aa02f6536bb05f86537cc8119f Add file1.txt\r\n$ vi file1.txt\r\n$ git ci --amend -m \"Redo add file1.txt\" file1.txt\r\n[master c25eb50] Redo add file1.txt\r\n 1 file changed, 2 insertions(+)\r\n create mode 100644 file1.txt\r\n$ git lg\r\nc25eb5041b5aa21ae240fbb379a9b8f27cb73f67 Redo add file1.txt\r\n<\/pre>\n
                      * Another Example<\/p>\n
                      \r\ngit commit -m 'initial commit'\r\ngit add forgotten_file\r\ngit commit --amend -C HEAD\r\n\r\n$ vi file1.txt\r\n$ git add file1.txt\r\n$ git commit -m \"Add some files.\"\r\n[master f29da6b] Add some files.\r\n 1 file changed, 1 insertion(+)\r\n create mode 100644 file1.txt\r\n$ git lg\r\nf29da6be0b4f91575d1bedf4d82ce7c7eef1d248 Add some files.\r\n$ vi file2.txt\r\n$ git add file2.txt\r\n$ git commit --amend -C HEAD\r\n[master fdd5863] Add some files.\r\n 2 files changed, 2 insertions(+)\r\n create mode 100644 file1.txt\r\n create mode 100644 file2.txt\r\n$ git lg\r\nfdd58637e0cb8d56ad1a47438e8526afcd10292f Add some files.\r\n<\/pre>\n
                      Discard Commits<\/h4><\/span>\n
                      * Discard last commit<\/p>\n
                      \r\ngit reset HEAD~\r\n\r\n$ git lg\r\nfdd58637e0cb8d56ad1a47438e8526afcd10292f Add some files.\r\nea9e63cb37606b7901f5baa91c8c8628d967afa7 Add mylib2\r\n$ git reset HEAD~\r\njiali@My \/w\/git\/test3\/my-proj (master)\r\n$ git lg\r\nea9e63cb37606b7901f5baa91c8c8628d967afa7 Add mylib2\r\n<\/pre>\n
                      * Discard last three commits and resetting the branch tip to the fourth commit back:<\/p>\n
                      \r\ngit reset HEAD~3\r\n<\/pre>\n
                      Revert Changes<\/h4><\/span>\n
                      * Revert a modified file:<\/p>\n
                      \r\ngit checkout -- modified_file\r\n\r\n$ vi file1.txt\r\n$ git diff file1.txt\r\ndiff --git a\/file1.txt b\/file1.txt\r\nindex e212970..75ac157 100644\r\n--- a\/file1.txt\r\n+++ b\/file1.txt\r\n@@ -1 +1,2 @@\r\n file1\r\n+second line\r\n$ git checkout -- file1.txt\r\n$ git diff file1.txt\r\n<\/pre>\n
                      * Revert all modified files:<\/p>\n
                      \r\ngit checkout .\r\n<\/pre>\n
                      * Return to master branch<\/p>\n
                      \r\ngit checkout master\r\n<\/pre>\n
                      * Checkout file1.txt<\/em> from a particular commit number:<\/p>\n
                      \r\ngit checkout commit_number file1.txt\r\n<\/pre>\n
                      * Checkout a particular commit<\/p>\n
                      \r\ngit checkout commit_number\r\n<\/pre>\n
                      Working with Remotes<\/h3><\/span>\n
                      Show Remotes<\/h4><\/span>\n
                      \r\ngit remote    # list remote short name\r\ngit remote -v    # also show remote url\r\n<\/pre>\n
                      Add remote short name<\/h4><\/span>\n
                      \r\ngit remote add alias_name remote_url\r\n<\/pre>\n
                      Fetch\/Pull from Remotes<\/h4><\/span>\n
                      \r\ngit fetch remote_name\r\ngit pull remote_name    # fetch and merge\r\n<\/pre>\n
                      * Example:<\/p>\n
                      \r\ngit fetch origin\r\n<\/pre>\n
                      Pushing to Remotes<\/h4><\/span>\n
                      \r\ngit push remote_name branch_name\r\n<\/pre>\n
                      * Example:<\/p>\n
                      \r\ngit push origin master\r\n<\/pre>\n
                      Inspecting a Remote<\/h4><\/span>\n
                      \r\ngit remote show origin\r\n<\/pre>\n
                      Rename Remotes<\/h4><\/span>\n
                      \r\ngit remote rename old_name new_name\r\n<\/pre>\n
                      Remove Remote<\/h4><\/span>\n
                      \r\ngit remote rm remote_name\r\n<\/pre>\n
                      Branching<\/h2><\/span>\n
                      * Default branch: master<\/p>\n
                      Create New Branch<\/h3><\/span>\n
                      \r\n# Create a new branch from current commit\r\ngit checkout -b jimmy\r\n\r\n# Show current HEAD pointer\r\n$ git symbolic-ref HEAD\r\nrefs\/heads\/jimmy\r\n\r\n# Create a new branch from specific commit\r\ngit checkout -b jimmy 09d3cfad\r\n<\/pre>\n
                      Show Branches<\/h3><\/span>\n
                      * Show local branches only:<\/p>\n
                      \r\ngit branch\r\n\r\n git branch\r\n john\r\n master\r\n<\/pre>\n
                      * Show remote branches only:<\/p>\n
                      \r\ngit branch -r\r\n\r\n$ git branch -r\r\n  origin\/HEAD -> origin\/master\r\n  origin\/john\r\n  origin\/master\r\n<\/pre>\n
                      * Show remote branches too:<\/p>\n
                      \r\n$ git ls-remote origin\r\n31104cf88172c94b60820d6d90739bd8ee391ccb        HEAD\r\n31104cf88172c94b60820d6d90739bd8ee391ccb        refs\/heads\/john\r\n31104cf88172c94b60820d6d90739bd8ee391ccb        refs\/heads\/master\r\n<\/pre>\n
                      * Show all branches<\/p>\n
                      \r\ngit branch --all\r\n\r\n$ git branch --all\r\n* john\r\n  master\r\n  remotes\/origin\/HEAD -> origin\/master\r\n  remotes\/origin\/john\r\n  remotes\/origin\/master\r\n<\/pre>\n
                      * Show local branches and last commits<\/p>\n
                      \r\ngit show-branch\r\n\r\n$ git show-branch\r\n* [john] Add john1.txt  # Currently at HEAD branch john\r\n ! [master] Add john1.txt # Non-HEAD branch\r\n--\r\n*+ [john] Add john1.txt # Last commit to john branch \r\n<\/pre>\n
                      * Show log graph<\/p>\n
                      \r\ngit log --graph --all --pretty=oneline\r\n\r\n$ git log --graph --all --pretty=oneline\r\n* 31104cf88172c94b60820d6d90739bd8ee391ccb Add file4.txt\r\n* 09d3cfadd21444f2da6d61a353e9da909a89d062 Add file3.txt\r\n| *-.   969e5ede4d747d2256eaaead70c05b0f14647ec4 On master: file4.txt\r\n| |\\ \\\r\n|\/ \/ \/\r\n| | * 7db8a49ab0a76ac253da633aa2741cc6140f2a72 untracked files on master: 4a0f36\r\n| * 5dae492d06bcdeadba4eddadb3ac4908a5688d6f index on master: 4a0f368 Add file2.\r\n|\/\r\n* 4a0f368da6cd21cf90c7281ccdf5bb806af41c7f Add file2.txt\r\n* 195d2c446d948717ab5fbfe882c4ae4c3e1b9e5e Add file1.txt\r\n<\/pre>\n
                      Switch Branch<\/h3><\/span>\n
                      * When switching,
                      \n– untracked files are ignored
                      \n– switching is aborted if untracked files already exist in target branch
                      \n— use git checkout –merge option to merge<\/p>\n
                      \r\n# Switch to master branch\r\ngit checkout master\r\n\r\n$ git symbolic-ref HEAD\r\nrefs\/heads\/master\r\n\r\n# Switch to jimmy branch\r\ngit checkout jimmy\r\n$ git symbolic-ref HEAD\r\nrefs\/heads\/jimmy\r\n<\/pre>\n
                      Delete Branch<\/h3><\/span>\n
                      \r\n# Save delete a branch\r\n# Branch to be deleted needs to be fully merged\r\ngit branch -d jimmy\r\n\r\n# Force delete a branch\r\ngit bran -D jimmy\r\n<\/pre>\n
                      Renaming a Branch<\/h3><\/span>\n
                      \r\ngit branch -m old new\r\n\r\n$ git branch -m jimmy john\r\njiali@My \/w\/git\/test3\/my-proj (john)\r\n$ git branch -v\r\n* john   09d3cfa Add file3.txt\r\n  master 4a0f368 [ahead 2] Add file2.txt\r\n<\/pre>\n
                      Push Branch to Remote<\/h3><\/span>\n
                      \r\n$ git push origin john\r\nCounting objects: 10, done.\r\nDelta compression using up to 2 threads.\r\nCompressing objects: 100% (6\/6), done.\r\nWriting objects: 100% (9\/9), 801 bytes, done.\r\nTotal 9 (delta 2), reused 0 (delta 0)\r\nTo file:\/\/\/w\/git\/test2\/my-proj.git\r\n * [new branch]      john -> john\r\n<\/pre>\n
                      Merging<\/h2><\/span>\n
                      * Merge branch john to master:<\/p>\n
                      \r\ngit checkout master\r\ngit merge john\r\n\r\n$ git checkout master\r\nSwitched to branch 'master'\r\nYour branch is ahead of 'origin\/master' by 2 commits.\r\n  (use \"git push\" to publish your local commits)\r\njiali@My \/w\/git\/test3\/my-proj (master)\r\n$ git merge john\r\nUpdating 4a0f368..31104cf\r\nFast-forward\r\n file3.txt | 1 +\r\n file4.txt | 1 +\r\n 2 files changed, 2 insertions(+)\r\n create mode 100644 file3.txt\r\n create mode 100644 file4.txt\r\njiali@My \/w\/git\/test3\/my-proj (master)\r\n<\/pre>\n
                      Examples<\/h2><\/span>\n
                      Generate Patch Files<\/h3><\/span>\n
                      * Generate a single patch file named patch-083018.patch<\/em> in home directory.
                      \n– The patch file contains past 22 commits.<\/p>\n
                      \r\ngit format-patch -22 --stdout > ~\/patch-083018.patch\r\n<\/pre>\n
                      Issues<\/h2><\/span>\n
                      Couldn’t set refs\/heads\/master<\/h3><\/span>\n
                      * Error message:<\/p>\n
                      \r\n$ git commit -m \"Test\"\r\nerror: Couldn't set refs\/heads\/master\r\nfatal: cannot update HEAD ref\r\n<\/pre>\n
                      * Fix:<\/p>\n
                      \r\ngit fsck --lost-found\r\n# If still no luck\r\n# go to project root directory and issue:\r\necho ref: refs\/heads\/master >.git\/HEAD\r\n<\/pre>\n
                      File is far too short to be a packfile<\/h3><\/span>\n
                      * Env:<\/p>\n
                      \r\n$ git version\r\ngit version 1.8.1.msysgit.1\r\n<\/pre>\n
                      – Win 7
                      \n* Error message:<\/p>\n
                      \r\n$ git status\r\nGit error: ... is far too short to be a packfile\r\n<\/pre>\n
                      * Fix:
                      \n– Close Git or Git GUI
                      \n– Close all opened folders, especially mounted drives
                      \n– Retry<\/p>\n
                      References<\/h2><\/span>\n
                      * Pro Git<\/a>
                      \n*                       Git Tutorial<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"
                      Overview Features * Created in 2005 * Fully distributed * Fast and efficient with large projects * Incredible branching system for non-linear development (thousands of parallel branches) Diff from CVCS (Centeralized VCS) * GIT keeps file snapshots not deltas (such … Continue reading →<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_exactmetrics_skip_tracking":false,"_exactmetrics_sitenote_active":false,"_exactmetrics_sitenote_note":"","_exactmetrics_sitenote_category":0,"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":true,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":true,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[236],"tags":[616],"class_list":["post-5911","post","type-post","status-publish","format-standard","hentry","category-git","tag-git"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/s8cRUO-git","_links":{"self":[{"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=\/wp\/v2\/posts\/5911","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5911"}],"version-history":[{"count":5,"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=\/wp\/v2\/posts\/5911\/revisions"}],"predecessor-version":[{"id":12934,"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=\/wp\/v2\/posts\/5911\/revisions\/12934"}],"wp:attachment":[{"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5911"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5911"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jianmingli.com\/wp\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5911"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}