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
If you do not know the exact path you may use git log –all –full-history — “**/thefile.*” If you know the path the file was at, you can do this: git log –all –full-history — <path-to-file> This should show a list of commits in all branches which touched that file. Then, you can find the … Read more
I had the exact same problem as mentioned by you above. But I found this clearer in explaining the answer. Summary: Check out the path(s) from the branch you want to merge, $ git checkout source_branch — <paths>… Hint: It also works without `–` like seen in the linked post. or to selectively merge hunks … Read more
From the relevant Git documentation: Patterns which are specific to a particular repository but which do not need to be shared with other related repositories (e.g., auxiliary files that live inside the repository but are specific to one user’s workflow) should go into the $GIT_DIR/info/exclude file. The .git/info/exclude file has the same format as any … Read more
Even if you haven’t tracked the files so far, Git seems to be able to “know” about them even after you add them to .gitignore. WARNING: First commit or stash your current changes, or you will lose them. Then run the following commands from the top folder of your Git repository: git rm -r –cached … Read more
It’s as simple as this: git reset HEAD^ Note: some shells treat ^ as a special character (for example some Windows shells or ZSH with globbing enabled), so you may have to quote “HEAD^” or use HEAD~1 in those cases. git reset without a –hard or –soft moves your HEAD to point to the specified … Read more