Tag: branch

GIT: Find when a specific string was introduced to a branch

Post author By anthony
Post date June 20, 2015
Categories In Git
No Comments on GIT: Find when a specific string was introduced to a branch

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

Git – diff (compare) the same file on different branches

Post author By anthony
Post date December 7, 2013
Categories In Git
No Comments on Git – diff (compare) the same file on different branches

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

Git – move accidental commits to a different branch

Post author By anthony
Post date September 11, 2013
Categories In Git
No Comments on Git – move accidental commits to a different branch

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 […]