Commit Graph

863 Commits

Author SHA1 Message Date
Gordon Burgett fc1365d8fa TfsHelper can now map multiple paths in a workspace, remotes now map all paths for all subtrees
Signed-off-by: Gordon Burgett <gordon.burgett@gmail.com>
2013-04-09 09:01:14 -05:00
Gordon Burgett c8300dfa13 added subtree command for "subtree add" and "subtree pull" 2013-04-05 18:25:11 -05:00
Philippe Miossec c550a8583b see wiki for better help 2013-04-06 01:30:25 +03:00
Philippe Miossec 3ad5899542 Merge pull request #343 from pmiossec/correct_branch_help
correct missing `branch` in help
2013-04-05 02:07:33 -07:00
Philippe Miossec d9e439e41a correct missing branch in help 2013-04-05 11:05:39 +02:00
Matt Burke 9467fade55 Merge pull request #328 from git-tfs/workspace-fix
Make workspace cleanup more automatic.
2013-04-04 19:36:40 -07:00
Matt Burke eddb571739 Merge remote-tracking branch 'origin/master' into workspace-fix 2013-04-04 22:31:04 -04:00
Matt Burke 4d338626e2 Interweave some comments.
I'm normally not big on comments, but I thought I could validate my
reading of the code and answer future questions at the same time.
2013-04-04 14:58:12 -04:00
Matt Burke c13a1de363 tweak 2013-04-04 14:47:28 -04:00
Matt Burke d885971e06 Merge pull request #342 from pmiossec/update_libgit2sharp
Update LibGit2Sharp to the v0.10 just released
2013-04-03 12:52:30 -07:00
Philippe Miossec 2f3b9ff30b update LibGit2Sharp to the v0.10 just released 2013-04-03 21:29:53 +02:00
Szymon Martynuska 46b75dc5d9 deleting all mappings to directories in working directory path 2013-04-03 00:16:54 +02:00
Matt Burke b9c82c7bb7 Merge pull request #338 from git-tfs/no-mono-core-dumps
No mono core dumps
2013-03-28 16:28:51 -07:00
Matt Burke bd9a8e0ad0 Update to libgit2/libgit2sharp@01639e22 2013-03-28 07:51:52 -07:00
Matt Burke 47df1fbed4 Tidy up the corners. 2013-03-27 13:47:27 -07:00
Matt Burke 4d6f122c70 exit from the build when things go south. 2013-03-27 10:46:39 -07:00
Matt Burke 04434fcc0a Extract a script for the travis build, so I can test it locally more easily. 2013-03-27 10:23:59 -07:00
Matt Burke 0cc5b97f78 Bump libgit2sharp. 2013-03-27 08:53:11 -07:00
Matt Burke 2b15cce51c Merge pull request #334 from pmiossec/typo_release_version
correct specify version in Releasing.md
2013-03-26 10:36:52 -07:00
Philippe Miossec e2413b6c8b correct specify version in Releasing.md 2013-03-26 10:07:46 +01:00
Matt Burke ea066d5783 Merge pull request #329 from git-tfs/gitattributes-added
Gitattributes added (line endings normalized)
2013-03-25 23:39:27 -07:00
Matt Burke e25d166038 Revert ".gitattributes supercedes setting core.autocrlf."
This reverts commit 23c84c6482.

core.autocrlf is still useful because it tells git what to do on
checkout, while the attributes specify what happens on add (apparently).
2013-03-26 02:36:50 -04:00
Matt Burke e983b8bd13 Merge pull request #333 2013-03-25 19:57:17 -07:00
Matt Burke e92a1fe3ea Whitespaces. 2013-03-25 18:25:03 -07:00
Matt Burke 922a75da39 Use ASCII.
This is just for simplicity. Version.cs doesn't need any non-ASCII
characters, and `git diff` works more reliably with ASCII than with
other encodings.

In general, Unicode is fine for files, and the .gitattributes branch
will help this. But for Version.cs, I'm making it ASCII, at least for
now.
2013-03-25 18:12:57 -07:00
Matt Burke 9d202e3b82 In the absence of automation, provide hints for checking the current HEAD. 2013-03-25 17:07:48 -07:00
Matt Burke 380037d990 Extract 'origin' 2013-03-25 17:00:20 -07:00
Matt Burke 0b9433e388 Shuffle around the git stuff. 2013-03-25 16:47:19 -07:00
Matt Burke 2663abfa8a The Version target is unnecessary now. 2013-03-25 16:44:14 -07:00
Matt Burke aec249eb36 VERSION file is no longer useful. 2013-03-25 16:40:52 -07:00
Philippe Miossec fcb30b768a Write instead of modify version files
and better missing version detection
2013-03-26 00:28:15 +01:00
Philippe Miossec 16dc701429 Build release : Update de Version.cs file and push the changes
use :
msbuild Deploy.proj /t:Release /p:Version=0.x.y
2013-03-25 23:20:04 +01:00
Matt Burke 52c6af1ba2 Merge remote-tracking branch 'origin/master' into gitattributes-added
Conflicts:
	GitTfs.sln
2013-03-25 11:39:23 -07:00
Matt Burke 713391f0b3 Just use normal merges for sln and csproj files. 2013-03-25 11:36:20 -07:00
Matt Burke ba5e92a99a v0.17.1 v0.17.1 2013-03-25 11:36:32 -04:00
Matt Burke d7214f94ba Merge pull request #288 from spraints/build-releases
Automate release building.
2013-03-25 08:35:21 -07:00
Matt Burke 8239703298 Make the release instructions now-oriented, rather than future-oriented. 2013-03-25 11:30:12 -04:00
Matt Burke 8eabad8119 Merge pull request #332 from pmiossec/short_option_rcheckin_quick
Add a short option `-q` for rcheckin --quick
2013-03-25 08:25:08 -07:00
Sean M. Collins a7b5068eea Merge pull request #331 from pmiossec/crash_clone_whole_repository
Correct crash when clone the whole repository
2013-03-25 07:11:55 -07:00
Philippe Miossec 3264d8bdb8 Add a short option -q for rcheckin quick 2013-03-25 14:29:11 +01:00
Philippe Miossec d7347c8d93 Correct crash when clone the whole repository
Forget to exit after displaying the warning.
Should fix #330
2013-03-25 14:23:25 +01:00
Matt Burke 23c84c6482 .gitattributes supercedes setting core.autocrlf. 2013-03-25 00:06:16 -07:00
Matt Burke eceafac26c 💀 pdb 2013-03-21 22:08:49 -04:00
Matt Burke 240ead7f48 Merge tag 'v0.17.0' into deploy 2013-03-21 21:52:41 -04:00
Matt Burke 11995425c1 v0.17.0 v0.17.0 2013-03-21 21:50:42 -04:00
Matt Burke 98329b58fb Merge pull request #324 from git-tfs/fix-rcheckin-ignores-no-build-default-comment
Fix: Rcheckin ignores --no-build-default-comment option
2013-03-21 14:39:18 -07:00
ivan-danilov 8b921e4cf3 Removed duplicated line after Matt's review. 2013-03-21 14:53:28 +02:00
ivan.danilov-econ e74170291a Fix: Rcheckin ignores --no-build-default-comment option (during rcheckin of merge commit prevents including all comments from merged commits below original merge-commit comment in git) 2013-03-21 14:53:28 +02:00
ivan.danilov-econ 690ccef82e Normalized line endings to be LF in repository (line ending in the working copy managed by core.autocrlf option) 2013-03-21 14:35:22 +02:00
ivan.danilov-econ c9dcca61c1 Added .gittattributes to enable autocrlf for text files regardless of user's global git config. 2013-03-21 14:26:08 +02:00