Using git-tfs

migration-to-git/3-working-with-git/git-fts-as-bridge.md

@@ -0,0 +1,25 @@
+---
+layout: default
+title: Using TFS and Git together
+---
+
+If you need continue checking-in to TFS along you work with Git, you can use git-tfs as a bridge.
+
+It supposed that git-tfs supports to check-in in name of another developer, but for some reason (maybe TFS permissions, maybe it is not ready yet, maybe my fault) it didn't work for me, so, in our team we decided that each developer check-in in TFS his changes after merge his pull requests.
+
+### 1. Prepare environment for developers
+
+* Clone GitHub repository <!-- TODO -->
+* Bootstrap git-tfs <!-- TODO -->
+
+### 2. Work in a feature
+
+<!-- TODO (fetch remotes, fetch tfs, start a new branch, commit changes) -->
+
+### 3. Create a pull request
+
+<!-- TODO (Rebase or merge upstream changes, create the pull request, discuss) -->
+
+### 4. Merge pull request and check-in in TFS
+
+<!-- TODO (Merga the pull request, fetch remotes, fetch tfs, check-in in TFS, push to upstream) -->

migration-to-git/3-working-with-git/git-fts-to-github.md

@@ -0,0 +1,36 @@
+---
+layout: default
+title: Clone a TFS repository to GitHub
+---
+
+
+### 1. Clone TFS to a local git repository
+
+The command [clone](https://github.com/git-tfs/git-tfs/blob/master/doc/commands/clone.md) allows to clone a branch with all _changesets_. 
+
+![git-tfs clone](git-tfs-clone.png)
+
+The same command allows to [clone all the branches](https://github.com/git-tfs/git-tfs/blob/master/doc/commands/clone.md#clone-all-the-branches-and-merge-changesets)) (but I didn't test it).
+
+![git-tfs clone with branches](git-tfs-clone-with-branches.png)
+
+But it used to fail:
+
+![git-tfs clone with branches broken](git-tfs-clone-with-branches-broken.png)
+
+If you don't need the complete history, it is possible to get only the last _changeset_ with the command [quick-clone](https://github.com/git-tfs/git-tfs/blob/master/doc/commands/quick-clone.md).
+
+![git-tfs quick-clone](git-tfs-quick-clone.png)
+
+### 2. Prepare repository for Git
+
+<!-- TODO (git configuration files, delete files, etc) -->
+
+### 3. Create a new GitHub repository
+
+<!-- TODO -->
+
+### 4. Push local cloned commits to GitHub repository
+
+<!-- TODO -->
+

migration-to-git/3-working-with-git/index.md

@@ -83,6 +83,14 @@ that [Git Extensions]({{ site.github.url }}/migration-to-git/3-working-with-git/
 is a good choice to start because it helps you to understand how Git is working
 internally.
 
+### git-tfs
+
+It is an useful tool when you have to migrate a TFS repository and also when Git and TFS should co-exist.
+
+See [git-tfs readme](https://github.com/git-tfs/git-tfs/#readme) for a complete reference.
+
+* [Clone a TFS repository to GitHub](git-fts-to-github.html)
+* [Using TFS and Git together](git-fts-as-bridge.html)
 
 ---