How To Combine Directories From Multiple Hosts Into a Single Git Repository

Author: erics, March 2nd, 2025

If you have multiple ~/bin/ directories across different hosts and want to consolidate them into a single Git repository hosted on your own Git server, follow these steps. 1. Create a New Bare Git Repository on Your Git Server First, log in to your Git server and create a new repository:

mkdir -p /path/to/git/repos/bin.git
cd /path/to/git/repos/bin.git
git init --bare
chown -R git: /path/to/git/repos/bin.git

1

2

3

4

mkdir -p /path/to/git/repos/bin.git

cd /path/to/git/repos/bin.git

git init --bare

chown -R git: /path/to/git/repos/bin.git

This repository will […]

Categories: How-To's, Technology Tags: bare, git, git init, git pull, git push, howto, origin, remote, tips | No comments

How To List All Tags With The Message In git

Author: erics, April 11th, 2023

git tag -n
git tag -n3

1 2	git tag -n git tag -n3

Categories: How-To's, Technology Tags: Display, git, git tag, howto, List, Message, Show, Tag, tips | No comments

How To Change Your GIT Name and Email Address Globally and Per Repository

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"

1 2	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"

1

2

3

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

How To Undo A Conflicting Merge in GIT

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.

1

2

3

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

1

2

3

4

5

6

7

8

9

10

11

12

13

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

1 2	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

1

2

3

4

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

How To Configure GIT To Push The Current Branch Only

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

How To Revert a Merge in GIT

Author: erics, November 19th, 2020

To revert the local branch:

$ git reset --hard HEAD~1

1	$ git reset --hard HEAD~1

To revert the remote branch AFTER the previous step has been performed:

$ git push origin HEAD --force

1	$ git push origin HEAD --force

Categories: How-To's, Technology Tags: git, git revert, HEAD, Merge, Reset, Revert | No comments

How To Show All Branches In GIT

Author: erics, October 29th, 2020

Show All Branches, Local and Remote

git branch -a

1	git branch -a

Show Local Branches

git branch

1	git branch

Show Remote Branches

git branch -r

1	git branch -r

To fetch all remote branches locally

git branch -r | grep -v '\->' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | while read remote; do git branch --track "${remote#origin/}" "$remote"; done
git fetch --all
git pull --all

1

2

3

git branch -r | grep -v '\->' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | while read remote; do git branch --track "${remote#origin/}" "$remote"; done

git fetch --all

git pull --all

Categories: How-To's, Technology Tags: All, Branch, Branches, Display, git, git branch, git branch -a, git fetch, git pull, local, remote, Show, track, view | No comments

How To Add and Use Tags In GIT

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

1 2	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

1 2	git tag v1.0.1 git show v1.0.1

Show all tags:

git tag

1

git tag

Push all tags:

git push origin --tags

1	git push origin --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

1

2

3

4

5

6

7

8

9

10

11

12

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

1 2	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

How To Revert the Last git Commit

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

How To Find All git Commits Containing a Specific Log Message

Author: erics, July 9th, 2020

Show commits and messages that match

git log --all --grep='SEARCH_STRING_HERE'

1	git log --all --grep='SEARCH_STRING_HERE'

Include code diffs

git log --all --grep='SEARCH_STRING_HERE' -p

1	git log --all --grep='SEARCH_STRING_HERE' -p

Include file names

git log --all --grep='SEARCH_STRING_HERE' --name-only

1	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

How To Combine Directories From Multiple Hosts Into a Single Git Repository

How To List All Tags With The Message In git

How To Change Your GIT Name and Email Address Globally and Per Repository

How To Undo A Conflicting Merge in GIT

How To Configure GIT To Push The Current Branch Only

How To Revert a Merge in GIT

How To Show All Branches In GIT

How To Add and Use Tags In GIT

How To Revert the Last git Commit

How To Find All git Commits Containing a Specific Log Message

Our Link Network

Business

Client Websites

Fine Dining

Friends & Family

Galleries

Health

Resources

Technology

Travel

The Archives

Latest Ramblings…

Various Topics of No Interest