For Git 1.x $ git add -u This tells git to automatically stage tracked files — including deleting the previously tracked files. For Git 2.0 To stage your whole working tree: $ git add -u :/ To stage just the current path: $ git add -u .
Basically, git commit “records changes to the repository” while git push “updates remote refs along with associated objects“. So the first one is used in connection with your local repository, while the latter one is used to interact with a remote repository. Here is a nice picture from Oliver Steele, that explains the Git model … Read more
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
IF you have NOT pushed your changes to remote git reset HEAD~1 Check if the working copy is clean by git status. ELSE you have pushed your changes to remote git revert HEAD This command will revert/remove the local commits/change and then you can push
You can run these two commands: # Revert changes to modified files. git reset –hard # Remove all untracked files and directories. # ‘-f’ is force, ‘-d’ is remove directories. git clean -fd
For Git 1.x $ git add -u This tells git to automatically stage tracked files — including deleting the previously tracked files. For Git 2.0 To stage your whole working tree: $ git add -u :/ To stage just the current path: $ git add -u .
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.)
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
I think other answers here are wrong, because this is a question of moving the mistakenly committed files back to the staging area from the previous commit, without cancelling the changes done to them. This can be done like Paritosh Singh suggested: git reset –soft HEAD^ or git reset –soft HEAD~1 Then reset the unwanted … 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