Skip to content

Commit 69e0fcb

Browse files
committed
Merge pull request #171 from tacker66/some_more_fixes
Some more fixes
2 parents 1d874a3 + f8c74c8 commit 69e0fcb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

book/09-git-and-other-scms/sections/client-tfs.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Git-tfs maps the branch you cloned from to `tfs/default`, and others get their o
134134

135135
Another thing to notice is the `git-tfs-id:` lines in the commit messages.
136136
Instead of tags, git-tfs uses these markers to relate TFVC changesets to Git commits.
137-
This has the implication that your Git commits will have a different SHA-1 hash before and after they has been pushed to TFVC.
137+
This has the implication that your Git commits will have a different SHA-1 hash before and after they have been pushed to TFVC.
138138

139139
===== Git-tf[s] Workflow
140140

@@ -259,7 +259,7 @@ There's a new `TFS_C35348` tag, indicating that TFVC is storing the exact same s
259259
It's important to note that not every Git commit needs to have an exact counterpart in TFVC; the `6eb3eb5` commit, for example, doesn't exist anywhere on the server.
260260

261261
That's the main workflow.
262-
There are a couple other considerations you'll want to keep in mind:
262+
There are a couple of other considerations you'll want to keep in mind:
263263

264264
* There is no branching.
265265
Git-tf can only create Git repositories from one TFVC branch at a time.
@@ -387,7 +387,7 @@ As an example, let's create one:
387387
PS> git tfs branch $/tfvc-test/featureBee
388388
The name of the local branch will be : featureBee
389389
C26 = 1d54865c397608c004a2cadce7296f5edc22a7e5
390-
PS> git lga
390+
PS> git log --oneline --graph --decorate --all
391391
* 1d54865 (tfs/featureBee) Creation branch $/myproject/featureBee
392392
* ff04e7c (HEAD, tfs/default, master) update code
393393
* 71a5ddc update readme

0 commit comments

Comments
 (0)