{"id":435,"date":"2017-09-14T11:31:51","date_gmt":"2017-09-14T11:31:51","guid":{"rendered":"http:\/\/www.codeinsightacademy.com\/blog\/?page_id=435"},"modified":"2024-12-24T03:28:03","modified_gmt":"2024-12-24T03:28:03","slug":"git","status":"publish","type":"page","link":"https:\/\/codeinsightacademy.com\/blog\/devops\/git\/","title":{"rendered":"Git"},"content":{"rendered":"

Git Commands<\/strong><\/p>\n

    \n
  1. git symbolic-ref HEAD<\/strong><\/li>\n
  2. git log –oneline –graph –decorate –all<\/strong><\/li>\n
  3. git –version<\/li>\n
  4. git config –list<\/li>\n
  5. git config –global user.name “Hello World”<\/li>\n
  6. git config –global user.emao “hello@world.com”<\/li>\n<\/ol>\n
    \n
      \n
    1. clear<\/li>\n
    2. git config user.email<\/li>\n
    3. git help<\/li>\n
    4. git help commit<\/li>\n<\/ol>\n
      \n

      Linux Commands<\/strong><\/p>\n

        \n
      1. pwd<\/li>\n
      2. cd ~<\/li>\n
      3. cd ..<\/li>\n
      4. ls<\/li>\n
      5. ls -l<\/li>\n
      6. ls -lrth<\/li>\n
      7. cd folder<\/li>\n<\/ol>\n
        \n

        Git\u00a0Basic Commands<\/strong><\/p>\n

          \n
        1. git init<\/li>\n
        2. ls -la<\/li>\n
        3. git status<\/li>\n
        4. git add filename.ext<\/li>\n
        5. git add .<\/li>\n
        6. git commit -m “Take snapshot till this point”<\/li>\n
        7. git commit -am “add and commit at the same time”<\/li>\n
        8. git log<\/li>\n
        9. git log –author=”Hello World”<\/li>\n
        10. git log –oneline<\/li>\n<\/ol>\n
          \n
            \n
          • working copy >> staging area >> repository<\/li>\n<\/ul>\n
            \n
              \n
            1. git diff<\/li>\n
            2. git diff filename.ext<\/li>\n
            3. git diff –staged<\/li>\n<\/ol>\n
              \n
                \n
              1. git rm filename.ext<\/li>\n<\/ol>\n
                \n

                Rename file<\/p>\n

                Way 1<\/p>\n

                  \n
                1. git add newfilename.ext<\/li>\n
                2. git rm oldfilename.ext<\/li>\n<\/ol>\n

                  Way 2<\/p>\n

                    \n
                  1. git mv oldfilename.ext newfilename.ext<\/li>\n<\/ol>\n
                    \n

                    Undo changes in file (copy repo file to local file)<\/p>\n

                      \n
                    1. git checkout — filename.ext<\/li>\n
                    2. git reset HEAD filename.ext<\/li>\n<\/ol>\n
                      \n
                        \n
                      • REVERTING THE CHANGES
                        \ngit checkout versionnumber(few chars) — filename.ext<\/li>\n
                      • Pull Request<\/li>\n
                      • Watch<\/li>\n
                      • Star<\/li>\n
                      • Fork<\/li>\n
                      • Github issues and Labels<\/li>\n
                      • Github Wiki<\/li>\n
                      • Git Organization<\/li>\n<\/ul>\n
                        \n

                        Useful\u00a0git commands for production<\/strong>:<\/p>\n

                        \n

                        Logs<\/strong><\/p>\n

                        git log –oneline
                        \nTo display commit log in one line format<\/p>\n

                        git diff-tree --no-commit-id --name-only -r <commit_id><\/code> git show --pretty=\"\" --name-only <commit_id><\/code> git ls-tree --name-only -r <commit_id>\ngit show --name-only <sha><\/code> git show --stat --oneline HEAD<\/code><\/pre>\n
                        \n
                        Branching<\/strong><\/p>\n
                        git branch
                        \nTo show all existing branches on local machine<\/p>\n
                        git checkout -b NewBranch
                        \nTo create new branch from master branch<\/p>\n
                        git checkout Branch
                        \nTo switch from current branch to specified branch<\/p>\n
                        git branch -d BranchName
                        \nTo delete specific branch<\/p>\n
                        git push origin :branchname
                        \nOR
                        \ngit push origin –delete :branchname
                        \nTo delete remote branch<\/p>\n
                        \n
                        Merging Changes from Another Branch to Current Branch<\/strong><\/p>\n
                        git checkout target-branch
                        \nSwitch to target branch e.g. master or dev<\/p>\n
                        git merge source-branch
                        \nMerge change from source-branch to current branch e.g. git merge CHG001<\/p>\n
                        \n
                        Revert Uncommit Changes<\/strong><\/p>\n
                        git checkout — file
                        \nTo revert all uncommitted changes for specified file<\/p>\n
                        git checkout — .
                        \nTo revert all uncommitted changes for all files<\/p>\n
                        \n
                        Revert Commited Changes<\/strong><\/p>\n
                        git revert [-n] hashcommitcode
                        \nTo revert commited changes for hashcode<\/p>\n
                        \n
                        Reset Pushed Changes<\/strong><\/p>\n
                        git reset –hard hashcommitid
                        \nTo reset till specified hashcommitcode<\/p>\n
                        \n
                        Push after reset<\/strong><\/p>\n
                        git push -f origin master
                        \nTo push changes forcefully to git repository<\/p>\n
                        \n
                        In Git, commands like reset<\/strong>, rebase<\/strong>, revert<\/strong>, and restore<\/strong> serve distinct purposes. Here’s a detailed breakdown:<\/p>\n
                        \n
                        1. git reset<\/strong><\/h3>\n
                          \n
                        • Purpose<\/strong>: Moves the HEAD pointer and optionally modifies the working directory and staging area.<\/li>\n
                        • Use Case<\/strong>: Undo commits or unstage changes.<\/li>\n
                        • Types<\/strong>:\n
                            \n
                          • Soft<\/strong>: Moves HEAD, but keeps changes staged.\n
                            git reset --soft <commit>\n<\/code><\/pre>\n<\/li>\n
                          • Mixed (default)<\/strong>: Moves HEAD and un-stages changes, but keeps them in the working directory.\n
                            git reset <commit>\n<\/code><\/pre>\n<\/li>\n
                          • Hard<\/strong>: Moves HEAD and deletes all changes in the staging area and working directory.\n
                            git reset --hard <commit>\n<\/code><\/pre>\n<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n
                            \n
                            2. git rebase<\/strong><\/h3>\n
                              \n
                            • Purpose<\/strong>: Reapplies commits from one branch onto another in a linear fashion.<\/li>\n
                            • Use Case<\/strong>: Keep commit history clean by avoiding merge commits.<\/li>\n
                            • Types<\/strong>:\n
                                \n
                              • Interactive Rebase<\/strong>:\n
                                git rebase -i <base>\n<\/code><\/pre>\n
                                Lets you squash, reorder, or edit commits.<\/li>\n
                              • Regular Rebase<\/strong>:\n
                                git rebase <base>\n<\/code><\/pre>\n
                                Applies commits from the current branch onto <base><\/code>.<\/li>\n<\/ul>\n<\/li>\n
                              • Key Note<\/strong>: Rewriting history with rebase is fine for local branches, but avoid using it on shared branches.<\/li>\n<\/ul>\n
                                \n
                                3. git revert<\/strong><\/h3>\n
                                  \n
                                • Purpose<\/strong>: Creates a new commit that undoes the changes made by a previous commit.<\/li>\n
                                • Use Case<\/strong>: Safely undo a commit without rewriting history.<\/li>\n
                                • Example<\/strong>:\n
                                  git revert <commit>\n<\/code><\/pre>\n
                                  This creates a new commit that negates the changes introduced by <commit><\/code>.<\/li>\n
                                • Key Note<\/strong>: Unlike reset, it doesn\u2019t alter history and is suitable for public\/shared branches.<\/li>\n<\/ul>\n
                                  \n
                                  4. git restore<\/strong><\/h3>\n
                                    \n
                                  • Purpose<\/strong>: Restores working directory files or staging area files to their original state.<\/li>\n
                                  • Use Case<\/strong>: Discard changes in a file or unstage changes without affecting the commit history.<\/li>\n
                                  • Examples<\/strong>:\n
                                      \n
                                    • Restore a file in the working directory:\n
                                      git restore <file>\n<\/code><\/pre>\n<\/li>\n
                                    • Unstage changes:\n
                                      git restore --staged <file>\n<\/code><\/pre>\n<\/li>\n<\/ul>\n<\/li>\n
                                    • Key Note<\/strong>: A safer alternative to git reset<\/code> for managing uncommitted changes.<\/li>\n<\/ul>\n
                                      \n
                                      Summary Table<\/h3>\n\n\n\n\n\n\n\n\n
                                      Command<\/strong><\/th>\nMain Action<\/strong><\/th>\nScope<\/strong><\/th>\nSafe for Shared Branches?<\/strong><\/th>\n<\/tr>\n<\/thead>\n
                                      reset<\/strong><\/td>\nMoves HEAD pointer; optionally modifies working\/staging<\/td>\nUndo commits or unstage files<\/td>\nNo<\/td>\n<\/tr>\n
                                      rebase<\/strong><\/td>\nReapplies commits to a new base<\/td>\nClean up commit history<\/td>\nNo (rewrites history)<\/td>\n<\/tr>\n
                                      revert<\/strong><\/td>\nCreates a new commit that undoes changes<\/td>\nUndo changes safely<\/td>\nYes<\/td>\n<\/tr>\n
                                      restore<\/strong><\/td>\nResets files in working\/staging area<\/td>\nDiscard or unstage changes<\/td>\nYes<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
                                      \n
                                      Choose the command based on whether you’re working locally or on a shared branch and whether you want to rewrite history or preserve it.<\/p>\n","protected":false},"excerpt":{"rendered":"
                                      Git Commands git symbolic-ref HEAD git log –oneline –graph –decorate –all git –version git config –list git config –global user.name “Hello World” git config –global user.emao “hello@world.com” clear git config user.email git help git help commit Linux Commands pwd cd ~ cd .. ls ls -l ls -lrth cd folder Git\u00a0Basic Commands git init ls […]<\/p>\n","protected":false},"author":1,"featured_media":0,"parent":483,"menu_order":0,"comment_status":"closed","ping_status":"closed","template":"","meta":[],"_links":{"self":[{"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/pages\/435"}],"collection":[{"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/pages"}],"about":[{"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/types\/page"}],"author":[{"embeddable":true,"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/comments?post=435"}],"version-history":[{"count":18,"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/pages\/435\/revisions"}],"predecessor-version":[{"id":2798,"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/pages\/435\/revisions\/2798"}],"up":[{"embeddable":true,"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/pages\/483"}],"wp:attachment":[{"href":"https:\/\/codeinsightacademy.com\/blog\/wp-json\/wp\/v2\/media?parent=435"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}