{"id":443,"date":"2014-02-20T14:32:45","date_gmt":"2014-02-20T13:32:45","guid":{"rendered":"http:\/\/hesmid.nl\/test\/?p=443"},"modified":"2019-07-17T16:21:57","modified_gmt":"2019-07-17T14:21:57","slug":"git-snippets-and-tricks","status":"publish","type":"post","link":"https:\/\/hesmid.nl\/test\/git-snippets-and-tricks\/","title":{"rendered":"Git snippets and tricks"},"content":{"rendered":"

Read this:<\/h3>\n

Git from the inside out<\/a><\/em><\/p>\n

Look at this workflow:<\/h3>\n

http:\/\/justinhileman.info\/git-pretty\/<\/a><\/p>\n

\"git-pretty\"<\/a><\/p>\n

<\/h3>\n

1.\u00a0Ignore files that are already tracked<\/h3>\n
    \n
  1. First commit any outstanding code changes<\/strong>,<\/li>\n
  2. and then, run this command:
    \ngit rm -r --cached .<\/code>
    \nThis removes everything from the index<\/em><\/li>\n
  3. then just run:
    \ngit add .<\/code><\/li>\n
  4. Commit it:
    \ngit commit -m \".gitignore is now working\"<\/code><\/li>\n<\/ol>\n

    <\/p>\n

    2. Edit an incorrect commit message in Git<\/h3>\n
    git commit --amend -m \"New commit message\"<\/pre>\n
    If you’ve already pushed, just force push again:<\/p>\n
    git push -f origin branchname<\/pre>\n
    Note: like rebasing, this is changing the history. If someone has cloned\/pulled from your repo between the original and rewritten history then they won’t be able to pull after the rewrite (for that branch).<\/p>\n
    3. Undo the last commit<\/h3>\n
    $ git commit ...              #(1)\n$ git reset --soft 'HEAD^'    #(2)\n$ edit                        #(3)\n$ git add ....                #(4)\n$ git commit -c ORIG_HEAD     #(5)<\/pre>\n
    (1) This is what you want to undo
    \n(2)This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before “reset”. (The quotes may or may not be required in your shell)
    \n(3)Make corrections to working tree files.
    \n(4) Stage changes for commit.
    \n(5) “reset” copies the old head to .git\/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead.<\/p>\n
    See this answer<\/a> on StackOverflow for a more elaborate explanation<\/p>\n
    4. Delete all changes from working directory including new untracked files.<\/h3>\n
    git reset --hard # removes staged and working directory changes\ngit clean -f -d # remove untracked files\n\n\n( git clean -f -x -d # CAUTION: as above but removes ignored files like config. )<\/pre>\n
    5. Force pull<\/h3>\n
    Force an overwrite of local files on a Git<\/a> pull?<\/p>\n
    I did this succesfully on my server where I force pulled from a bare repository (on the same server). \u00a0Source:\u00a0http:\/\/stackoverflow.com\/a\/8888015<\/a><\/p>\n
    git fetch --all\ngit reset --hard origin\/master\n<\/code><\/pre>\n
    Explanation:<\/strong><\/p>\n
    git fetch<\/code> downloads the latest from remote without trying to merge or rebase anything.<\/p>\n
    Then the git reset<\/code> resets the master branch to what you just fetched. The --hard<\/code> option changes all the files in your working tree to match the files in origin\/master<\/code>, so if you have any local changes, they will be lost. With or without --hard<\/code>, any local commits that haven’t been pushed will be lost.<\/p>\n
    If you have any files that are not<\/em> tracked by Git (e.g. uploaded user content), these files will not be affected.<\/p>\n
    6. Force Push<\/h3>\n
    You can completely specify specific branches and a remote:<\/p>\n
    git push   -f\ngit push origin master -f # Example<\/pre>\n
    When the branch to push branch is omitted, Git will figure it out based on your config settings. In Git versions after 2.0, a new repo will have default settings to push the currently checked-out branch:<\/p>\n
    git push  -f\ngit push origin -f # Example<\/pre>\n
    When both the remote and the branch are omitted, the behavior of just git push –force is determined by your push.default Git config settings:<\/p>\n
    git push --force<\/pre>\n
    As of Git 2.0, the default setting, simple, will basically just push your current branch to its upstream remote counter-part. The remote is determined by the branch’s branch..remote setting, and defaults to the origin repo otherwise.<\/p>\n
    7. Change remote origin<\/h3>\n
    git remote set-url origin [URL]<\/pre>\n
    8. Remove submodule<\/h3>\n
      \n
    1. Delete the relevant section from the\u00a0.gitmodules<\/code>\u00a0file. \u00a0The section would look similar to:\n
      [<\/span>submodule \"vendor\"<\/span>]<\/span>\n\tpath =<\/span> vendor\n\turl =<\/span> git:<\/span>\/<\/span>\/<\/span>github.<\/span>com\/<\/span>some-<\/span>user\/<\/span>some-<\/span>repo.<\/span>git<\/pre>\n<\/li>\n
    2. Stage the\u00a0.gitmodules<\/code>\u00a0changes via command line using:git add .gitmodules<\/code><\/li>\n
    3. Delete the relevant section from\u00a0.git\/config<\/code>, which will look like:\n
      [<\/span>submodule \"vendor\"<\/span>]<\/span>\n\turl =<\/span> git:<\/span>\/<\/span>\/<\/span>github.<\/span>com\/<\/span>some-<\/span>user\/<\/span>some-<\/span>repo.<\/span>git<\/pre>\n<\/li>\n
    4. Run\u00a0git rm --cached path\/to\/submodule<\/code>\u00a0. \u00a0Don’t include a trailing slash — that will lead to an error.<\/li>\n
    5. Run\u00a0rm -rf .git\/modules\/submodule_name<\/code><\/li>\n
    6. Commit the change<\/li>\n
    7. If you want to keep the submodule files in your repo:\n
        \n
      1. rm -rf path\/to\/submodule\/.git<\/li>\n
      2. git add .<\/li>\n<\/ol>\n<\/li>\n
      3. Otherwise:
        \nDelete the now untracked submodule files rm -rf path\/to\/submodule<\/code><\/li>\n<\/ol>\n
        9.\u00a0Push a particular commit<\/h3>\n
        source<\/a><\/p>\n
        git push <remotename> <commit SHA>:<remotebranchname><\/pre>\n
        should do the trick. Example:<\/p>\n
        git push origin 712acff81033eddc90bb2b45e1e4cd031fefc50f:master<\/pre>\n
        Note that this pushes all commits up to and including the commit you choose. If you don’t want that to happen, you should first use git rebase -i<\/code> to re-order the commits.<\/p>\n
        10.\u00a0Clone a particular release\/version<\/h3>\n
        “reset” your repository to any commit you want (e.g. 1 month ago).
        \n        source<\/a><\/p>\n
        Use git-reset<\/a> for that:<\/p>\n
        git clone [remote_address_here] my_repo\ncd my_repo\ngit reset --hard [ENTER HERE THE COMMIT HASH YOU WANT]\n\n<\/code><\/pre>\n\n\n\n\n
        \n
        why would you not do a simple checkout of the wanted commit?<\/span> \u2013\u00a0nemoo<\/a> May 23 ’13 at 10:44<\/span><\/a><\/span><\/div>\n<\/td>\n<\/tr>\n
        Because you will be on the “detached HEAD” state after checkout to a particular commit.<\/span> \u2013\u00a0Rui Carneiro<\/a>May 23 ’13 at 16:06<\/span><\/a><\/span><\/td>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
        \u00a0<\/code><\/pre>\n
        11. Use Sublime Text 3 as core editor<\/h3>\n
        Source<\/a><\/p>\n
        Sublime Text 3<\/a> (Build 3065) added the subl.exe<\/code> command line helper. Use subl.exe -h<\/code> for the options available to you. I have hot_exit: true<\/code> and remember_open_files: true<\/code> set in my Sublime Text user settings. I have found the following git config to work well for me.<\/p>\n
        git config --global core.editor \"'c:\/program files\/sublime text 3\/subl.exe' -w\"\n<\/code><\/pre>\n
        With this git config the a new tab is opened in my editor. I edit my commit message, save the tab and close it (CTRL+w<\/code>). Git will wait until the tab is closed to continue its work.<\/p>\n
        12.\u00a0Undo git add<\/code> for a file<\/h3>\n
        \u00a0git reset HEAD <file><\/code><\/p>\n
        13. Delete the history of a repo<\/h3>\n
        http:\/\/stackoverflow.com\/a\/26000395<\/a>
        \nIf you want to delete all your commit history but keep the code in its current state, it is very safe to do it as in the following:<\/p>\n
          \n
        1. Checkoutgit checkout --orphan latest_branch<\/code><\/li>\n
        2. Add all the filesgit add -A<\/code><\/li>\n
        3. Commit the changesgit commit -am \"commit message\"<\/code><\/li>\n
        4. Delete the branchgit branch -D master<\/code><\/li>\n
        5. Rename the current branch to mastergit branch -m master<\/code><\/li>\n
        6. Finally, force update your repositorygit push -f origin master<\/code><\/li>\n<\/ol>\n
          14.\u00a0Diff the same file between two different commits on the same branch<\/h3>\n
          https:\/\/stackoverflow.com\/a\/3338145<\/a><\/p>\n
          To see the difference for a file “main.c” between now and two commits back, here are three equivalent commands:<\/p>\n
          git diff HEAD^^ HEAD main.c<\/code>
          \ngit diff HEAD^^..HEAD -- main.c<\/code>
          \ngit diff HEAD~2 HEAD -- main.c<\/code><\/p>\n
          15. Error when pushing to bare repository<\/h3>\n
          When you get something like this:<\/p>\n
          error: failed to push some refs to 'git@github.com:519ebayproject\/519ebayproject.git'
          \nhint: Updates were rejected because the tip of your current branch is behind
          \nhint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
          \nhint: before pushing again.
          \nhint: See the 'Note about fast-forwards' in 'git push --help' for details.<\/code><\/p>\n
          The simplest solution is to force push the repo as described before:<\/p>\n
          git push origin master -f<\/p>\n","protected":false},"excerpt":{"rendered":"
          Read this: Git from the inside out Look at this workflow: http:\/\/justinhileman.info\/git-pretty\/ 1.\u00a0Ignore files that are already tracked First commit any outstanding code changes, and then, run this command: git rm -r –cached . This removes everything from the index then just run: git add . Commit it: git commit -m “.gitignore is now working”<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[7],"tags":[3],"acf":[],"_links":{"self":[{"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/posts\/443"}],"collection":[{"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/comments?post=443"}],"version-history":[{"count":38,"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/posts\/443\/revisions"}],"predecessor-version":[{"id":13680,"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/posts\/443\/revisions\/13680"}],"wp:attachment":[{"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/media?parent=443"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/categories?post=443"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/hesmid.nl\/test\/wp-json\/wp\/v2\/tags?post=443"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}