doug f1402509d2 Handle parsing merge commit messages with multiple TFS changeset ids
The original code would null out currentCommit after parsing the FIRST changeset id in the
log message, and associate the null commit hash with any additional changeset ids in the message
for the same commit. This eventually leads to a null reference error when executing git commands
that require the hash.

The new code ignores all of the changeset ids in the commit message except for the last one, which
is the only one that matters.
2013-02-21 16:44:57 -05:00
2013-01-08 05:27:20 -05:00
2013-01-08 05:27:20 -05:00
2012-08-29 16:51:16 -04:00
2013-02-03 18:53:15 +01:00
2012-08-29 16:51:16 -04:00
2013-01-31 19:33:22 -05:00
2012-09-03 09:11:13 -04:00
2012-09-13 22:25:17 -04:00
2013-01-10 08:58:35 -05:00
2009-10-26 12:22:43 -04:00
2012-12-19 10:25:53 -05:00
2013-02-21 16:37:57 -05:00
2010-02-12 09:25:18 -05:00
2012-01-30 08:21:20 -05:00
2012-11-14 07:56:31 -05:00
2013-02-07 13:40:31 -05:00
2010-02-03 13:22:11 -05:00
2010-01-28 13:04:45 -05:00
2010-10-05 15:23:11 -04:00
2012-12-06 11:14:15 -05:00
2012-12-06 11:14:15 -05:00

Introduction

git-tfs is a two-way bridge between TFS and git, similar to git-svn.

Usage

Cloning a repository

git tfs clone http://tfs:8080/tfs/DefaultCollection $/some_project
(wait for git-tfs to pull your history)

-or-

git tfs quick-clone http://tfs:8080/tfs/DefaultCollection $/some_project

(cd some_project and hack away, using only git, until you need to share with TFS...)

Pushing your changes to TFS

Check-in

git tfs checkintool 

-or-

git tfs checkin -m "Did stuff"

Shelveset

git tfs shelve A_SHELVESET_NAME

Other commands

git tfs help

Installing

Using Chocolatey:

cinst GitTfs

You need .NET 4 and either the 2008 or 2010 version of Team Explorer installed.

Building

Prerequisites

Building

Building With MSBuild

  1. Update submodules. git submodule update to get the libgit2sharp dependencies.
  2. Build with msbuild GitTfs.sln /p:Configuration=debug for the default debug build.

####Building With Rake You can also do rake build:debug.

Contributing

If you contribute patches, please set core.autocrlf to true. (git config core.autocrlf true)

Contributions are always welcome. For more information about contributing, please see the wiki.

Community

#git-tfs on FreeNode, and the mailing list

Build Status

Thanks to travis-ci and jetbrains (teamcity) for providing CI!

S
Description
Languages
C# 99.2%
PowerShell 0.8%