If you’ve made a commit, but want to revert the commit and retain the file changes as unstaged, do the following: git reset --soft HEAD^ git reset HEAD
Read More
To list the commits of a single user from all branches, use the following command: git log --pretty=format:"%ad:%an:%d:%B" --date=short --reverse --all --since=2.months.ago --author=Anthony
Read More
If after you’ve updated .gitignore to ignore a file and the changes are not being ignored, do the following: git rm /path/to/your/file --cached This will remove the file from the repository, but not from the file system.
Read More
To find when a specific line of code was added to a branch with git, run the following: git log -S "your-string-here" --source --all --stat
Read More
If you want to see the difference between the same file on separate branches, use the following snippet at the CLI: git diff branch1 branch2 — your-file.ext
Read More
If you’ve been working on a common staging branch when you thought you were working on a personal feature branch, you can move your work by doing the following: git checkout feature_branch git cherry-pick SHA (Do this for each commit on the mistaken branch) git checkout staging git reset –hard HEAD~n (where n = the number of mistakenly committed commits) This assumes you haven’t already pushed your changes to a [...]
Read More
git log topic ^master –no-merges This will list all commits within the topic branch that are not found within the master branch. I needed this to cherry-pick specific commits out of a working feature branch when I mistakenly rebased against a common staging branch.
Read More
Recent Comments