Skip to content

Commit 18ec8b0

Browse files
committed
updated git.md
1 parent de9eab2 commit 18ec8b0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ pip install --user bitbucket-cli
134134
## GitHub Badges
135135

136136
https://github.com/commonality/architecture-decision-records/wiki/GitHub-repository-status-badges
137+
137138
## The Evils of Rebasing
138139

139140
Some people like rebasing to make their `git log --graph` look like a straight line,
@@ -145,7 +146,7 @@ Git lets you get away with this because Git is ultra powerful, but...
145146

146147
#### Cautionary Tale from Experience
147148

148-
I was called over to a desk by my colleague in Denmark who had a little Git problem.
149+
While consulting in Denmark, I was called over to a desk by my colleague who had a little Git problem.
149150

150151
He's tried to do a "git rebase" but was hitting merge conflict after merge conflict and didn't know how to get out of it.
151152

0 commit comments

Comments
 (0)