To untrack a single file that has already been added/initialized to your repository, i.e., stop tracking the file but not delete it from your system use: git rm –cached filename To untrack every file that is now in your .gitignore: First commit any outstanding code changes, and then, run this command: git rm -r –cached … Read more
How to change the author and committer name and e-mail of multiple commits in Git?
Since your pull was unsuccessful then HEAD (not HEAD^) is the last “valid” commit on your branch: git reset –hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the “theirs” merge strategy: git pull –strategy=theirs remote_branch But this has since been … Read more
How can I reset or revert a file to a specific revision?
How do I discard unstaged changes in Git?
[*] ⚠ Important: If you have any local changes, they will be lost (if they’re tracked). Also, with or without –hard option, any local commits that haven’t been pushed will be lost.[*] If you have any files that are not tracked by Git (e.g. uploaded user content), these files will not be affected. First, run … Read more
If you want to rename a branch while pointed to any branch, do: git branch -m <oldname> <newname> If you want to rename the current branch, you can do: git branch -m <newname> If you want to push the local branch and reset the upstream branch: git push origin -u <newname> And finally if you … Read more