Author:
erics, June 17th, 2021
To update your git user name and email address for all repos:
|
|
git config --global user.name "Your Name" git config --global user.email "yourName@theDomain.com" |
To update your git user name and email address for a specific repo:
|
|
cd repo git config user.name "Your Name" git config user.email "yourName@theDomain.com" |
Categories: How-To's, Technology Tags: Change, Email, git, Global, howto, local, name, Repo, repository, tips, user.email, user.name
| 
No comments
Author:
erics, June 8th, 2021
shell> git merge branch-with-messy-changes
|
|
Auto-merging myCode.pm CONFLICT (content): Merge conflict in myCode.pm Automatic merge failed; fix conflicts and then commit the result. |
shell> git status
|
|
On branch eric-merge Your branch is up to date with 'origin/eric-merge'. You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Changes to be committed: Unmerged paths: (use "git add <file>..." to mark resolution) both modified: myCode.pm |
shell> git merge –abort shell> git status
|
|
On branch eric-merge Your branch is up to date with 'origin/eric-merge'. nothing to commit, working tree clean |
IMPORTANT NOTE: Previous versions of git used different commands for this operation: Latest version: git merge –abort Older than version 1.7.4: git reset –merge Older than version 1.6.2: git reset –hard
Categories: How-To's, Technology Tags: abort, conflict, git, howto, Merge, Revert, tips, Undo
| No comments
Author:
erics, March 16th, 2021
Recent changes to git have made the push default choice a bit confusing – “matching” vs. “simple” I picked “matching” when prompted. This means that git push by itself will try to push ALL local branches, not just the one you are working on. Personally, I find that a bit mad, so I decided to […]
Categories: How-To's, Technology Tags: Config, Default, defaults, git, git config, git push, Matching, Push, Simple
| No comments
Author:
erics, November 19th, 2020
|
|
$ git reset --hard HEAD~1 |
Categories: How-To's, Technology Tags: git, git revert, HEAD, Merge, Reset, Revert
| No comments
Author:
erics, October 29th, 2020
Show All Branches, Local and Remote
Show Local Branches
Show Remote Branches
Categories: How-To's, Technology Tags: All, Branch, Branches, Display, git, git branch, git branch -a, local, remote, Show, view
| No comments
Author:
erics, August 10th, 2020
For more information about Tagging in GIT, please visit: https://git-scm.com/book/en/v2/Git-Basics-Tagging Add an Annotated Tag:
|
|
git tag -a v1.0.0 -m "Software version 1.0.0" git show v1.0.0 |
Add a Lightweight Tag:
|
|
git tag v1.0.1 git show v1.0.1 |
Show all tags:
Push all tags:
Add a Tag Later:
|
|
git log --pretty=oneline git tag v1.0.2 5370c8da4095fefad7476fa1c226a309dd00a9f7 git tag -a v1.0.2 5370c8da4095fefad7476fa1c226a309dd00a9f7 fatal: tag 'v1.0.2' already exists git tag -d v1.0.2 Deleted tag 'v1.0.2' (was 5370c8d) git tag -a v1.0.2 5370c8da4095fefad7476fa1c226a309dd00a9f7 git push origin --tags |
Use a Tag:
|
|
git checkout -b {new branch name} {tag name} git checkout -b v1.0.2-from-tag v1.0.2 |
Categories: How-To's, Technology Tags: git, howto, Tag, Tags, tips
| No comments
Author:
erics, July 9th, 2020
shell$ git log | head -1 commit a203e1bd04718bff10a3df4a3389c493c97c0432 Use the commit string as the last argument to the git revert command: shell$ git revert -m 1 a203e1bd04718bff10a3df4a3389c493c97c0432
Categories: How-To's, Technology Tags: commit, git, git merge, git revert, howto, last, Last Commit, Merge, Mistake, Revert, Revert Commit, revert merge, tips
| No comments
Author:
erics, July 9th, 2020
Show commits and messages that match
|
|
git log --all --grep='SEARCH_STRING_HERE' |
Include code diffs
|
|
git log --all --grep='SEARCH_STRING_HERE' -p |
Include file names
|
|
git log --all --grep='SEARCH_STRING_HERE' --name-only |
Categories: How-To's, Technology Tags: commit, contains, Find, git, git log, howto, Log, Log message, Message, tips
| No comments
Author:
erics, February 7th, 2020
|
|
git log --pickaxe-regex -p --color-words -S "theSearchString" |
Categories: How-To's, Technology Tags: Color, color-words, git, grep, howto, Log, Pickaxe, search, tips
| No comments
Author:
erics, February 7th, 2020
First, get on the branch that you know already has the commits you are looking for:
|
|
git checkout theBranch-1234 |
Copy-and-paste the commit(s) you want:
~or~
Optionally, display the code changes for a visual confirmation:
|
|
git show {one or more commit ID's} |
Finally, extract the list of branches that contain the desired commits:
|
|
git branch --contains CommitID-A git branch --contains CommitID-B |
Example:
|
|
git log git branch --contains 097e1859f248a7aa5e148a2a946be3e360030095 git branch --contains 24339549f9f1920a33f721d3faa2538c8ba5d249 |
Categories: How-To's, Technology Tags: commit, git, git log, git show, howto, Show, tips
| No comments
