You can’t merge with local modifications. Git protects you from losing potentially important changes. You have three options: Commit the change using git commit -m “My message” Stash it. Stashing acts as a stack, where you can push changes, and you pop them in reverse order. To stash, type git stash Do the merge, and … Read more
Here’s the brute-force approach. It also removes the configuration of the repository. Note: This does NOT work if the repository has submodules! If you are using submodules, you should use e.g. interactive rebase Step 1: remove all history (Make sure you have backup, this cannot be reverted) cat .git/config # note <github-uri> rm -rf .git … Read more
I actually once pushed with –force and .git repository and got scolded by Linus BIG TIME. In general this will create a lot of problems for other people. A simple answer is “Don’t do it”. I see others gave the recipe for doing so anyway, so I won’t repeat them here. But here is a … Read more
Note: please see an alternative to git rebase -i in the comments below— git reset –soft HEAD^ First, remove the commit on your local repository. You can do this using git rebase -i. For example, if it’s your last commit, you can do git rebase -i HEAD~2 and delete the second line within the editor … Read more
As long as you’re just renaming a file, and not a folder, you can just use git mv: git mv -f yOuRfIlEnAmE yourfilename (As of a change in Git 2.0.1, the -f flag in the incantation above is superfluous, but it was needed in older Git versions.)
For all practical purposes, the first thing you should be worried about is CHANGING YOUR PASSWORDS! It’s not clear from your question whether your git repository is entirely local or whether you have a remote repository elsewhere yet; if it is remote and not secured from others you have a problem. If anyone has cloned … Read more
Interactive rebase off of a point earlier in the history than the commit you need to modify (git rebase -i <earliercommit>). In the list of commits being rebased, change the text from pick to edit next to the hash of the one you want to modify. Then when git prompts you to change the commit, … Read more
You can use git add –patch <filename> (or -p for short), and git will begin to break down your file into what it thinks are sensible “hunks” (portions of the file). It will then prompt you with this question: Stage this hunk [y,n,q,a,d,/,j,J,g,s,e,?]? Here is a description of each option: y stage this hunk for … Read more
Message ‘src refspec master does not match any’ when pushing commits in Git
Amending the most recent commit message git commit –amend will open your editor, allowing you to change the commit message of the most recent commit. Additionally, you can set the commit message directly in the command line with: git commit –amend -m “New commit message” …however, this can make multi-line commit messages or small corrections … Read more