To reset both the working copy of my-file.txt and its state in the Git index to that of HEAD: git checkout HEAD — my-file.txt — means “treat every argument after this point as a filename”. More details in this answer. Thanks to VonC for pointing this out.
Remove directory from Git and local Checkout ‘master’ with both directories: git rm -r one-of-the-directories // This deletes from filesystem git commit . -m “Remove duplicated directory” git push origin <your-git-branch> (typically ‘master’, but not always) Remove directory from Git but NOT local To remove this directory from Git but not delete it entirely from … Read more
In git revert -m, the -m option specifies the parent number. This is needed because a merge commit has more than one parent, and Git does not know automatically which parent was the mainline, and which parent was the branch you want to un-merge. When you view a merge commit in the output of git … Read more
None of these solutions worked for me. Instead, I elaborate on @Martin v. Löwis ‘s mention of setting a config file for SSH. SSH will look for the user’s ~/.ssh/config file. I have mine setup as: Host gitserv Hostname remote.server.com IdentityFile ~/.ssh/id_rsa.github IdentitiesOnly yes # see NOTES below And I add a remote git repository: … Read more
git rebase -i will do it. First, start with a clean working directory: git status should show no pending modifications, deletions, or additions. Now, you have to decide which commit(s) you want to split. A) Splitting the most recent commit To split apart your most recent commit, first: $ git reset HEAD~ Now commit the … Read more
Git keeps all of its files in the .git directory. Just remove that one and init again. If you can’t find it, it’s because it is hidden. In Windows 7, you need to go to your folder, click on Organize on the top left, then click on Folder and search options, then click on the … Read more
It’s explained in great detail in the docs, but I’ll try to summarize: matching means git push will push all your local branches to the ones with the same name on the remote. This makes it easy to accidentally push a branch you didn’t intend to. simple means git push will push only the current … Read more
Just do: git push origin <your_branch_name> –force or if you have a specific repo: git push https://git…. –force This will delete your previous commit(s) and push your current one. It may not be proper, but if anyone stumbles upon this page, thought they might want a simple solution… Short flag Also note that -f is … Read more
Say your bug fix branch is called bugfix and you want to merge it into master: git checkout master git merge –squash bugfix git commit This will take all the commits from the bugfix branch, squash them into 1 commit, and merge it with your master branch. Explanation: git checkout master Switches to your master … Read more
Update Apr. 2021: there are a few tools created by the community that can do this for you: Download Directory (Credits to fregante) It has also been integrated into the excellent Refined Github chrome extension as a button in the Github web UI. GitZip (Credits to Kino – see his answer here) DownGit (Credits to … Read more