Blog Entries tagged: git
December 21, 2017 • 10:29 PM
I get asked quite a lot whether I recommend a
merge-based workflow, or one
rebase onto master. But to be quite honest, I couldn't
possibly care less. Your workflow is your workflow after all, it's up
to your team to work in the way that's most productive for you.
For some teams that's merging, for some teams that's rebasing…
n the end, the code gets integrated and the end result is the same either
way, whether you merge or rebase it, right?
December 6, 2017 • 6:25 PM
October 27, 2017 • 5:57 PM
I built a little open source side project: Google Analytics Handler, which reports tracking information to Google Analytics on the server side.
August 14, 2017 • 12:11 PM
A security vulnerability in Git
has been announced:
a bug in URL parsing can cause
git clone to execute arbitrary commands.
These URLs look quite suspicious, so it's unlikely that you'd be convinced
through social engineering to clone them yourself. But they can be hidden
in repository submodules.
June 18, 2017 • 8:18 PM
June 15, 2017 • 2:04 PM
I'm old enough to remember the old Norton
UNERASE command: it was part
of the old Norton Utilities for MS-DOS. It made clever use of the FAT
to find files that were recently deleted, show them to you and let you
June 6, 2017 • 1:29 PM
One of the features that slipped quietly into Git 2.13 is the notion of "conditional includes" for configuration files, and it's one of my favorite new features. Although it's really simple, it's also extremely important for people who work both on Enterprise software and open source projects.
March 28, 2017 • 7:15 PM
Professional cooks have a term: "mise en place", which translates literally to "everything in its place". In a kitchen, it means that your station is prepared and well-organized; all the ingredients for every dish that you cook are prepared and set out in front of you so that they're ready to use. But perhaps most importantly: your station is clean, because professional cooks have another phrase:
February 5, 2017 • 5:20 PM
The annual Git Merge conference just wrapped up, and it was another exciting year. As always, the speakers were excellent, the training was informative, and the after-party was a blast. But my favorite part was a part of Git Merge that most people don't see: the Git Contributor Summit.
November 14, 2015 • 10:56 AM
You can authenticate to correctly configured instances of Visual Studio Team Foundation Server by using Kerberos over the Negotiate (SPNEGO) protocol. By using authentication with a Kerberos ticket, you can more securely authenticate from supported clients to your server without providing your password. After you obtain a Kerberos ticket, you can configure your git client to use Kerberos.
June 9, 2015 • 11:36 AM
Sometimes you need to check an executable into your Git repository and - even though Windows doesn't really have a concept of an "executable bit" - you might need to set it executable for the other platforms.
March 30, 2015 • 11:37 AM
January 20, 2015 • 7:41 PM
On the heels of
we are announcing another round of security updates to libgit2. Similar
to the prior vulnerability, an attacker can construct a git commit that,
when checked out, may cause files to be written to your
which may lead to arbitrary code execution.
September 10, 2014 • 10:42 AM
I noticed last night that Jared Parsons had cheerfully tweeted about the Visual Studio ASCII art logo that shows up when you clone a repository from TFS and Visual Studio Online:
August 15, 2014 • 2:29 PM
I had the privilege of speaking at That Conference earlier this week on my favorite topic: version control! I discussed how Git works under the covers, and my audience was kind enough to stay awake (which is the fundamental difference between Git and other version control systems).
May 27, 2014 • 9:48 PM
One of the great features of Git as a version control system is that there's no vendor lock-in: you can create a new Git repository on your local computer and push it to any Git server to collaborate with your team. This allows you to choose whatever Git hosting provider you want to use: it could be Team Foundation Server, GitHub, Codeplex, or even setting up your own Git server that you access over a network file share. We've been busy adding unique features to Team Foundation Server so that it's a compelling place to host your Git repositories.
May 9, 2014 • 1:56 PM
This question on StackOverflow
asks about recovering files that were added to the Git index using
git add but were subsequently removed from the index. I provided an
answer for that direct question, since you can recover these changes, but
I also wanted to dig a little deeper into what happens when you add something
to the index.
October 17, 2013 • 6:29 AM
Visual Studio 2013 RTM was made available this morning which means that the new Git support in Visual Studio is available to everyone!
August 28, 2012 • 1:00 PM
If you haven't yet seen or heard about the new git-tf tool from Microsoft, this blog post probably won't make any sense. So... go check it out over at gittf.codeplex.com. It's okay, I'll wait.
August 20, 2012 • 11:15 AM
Brian Harry announced the availability of
git-tf last Monday, a new tool from Microsoft that
allows you to create a local git repository from a path in Team Foundation
Server, then check the changes in your repository back in to TFS. This
tool is another piece in our cross-platform support, aimed at users of IDEs
that don't have built-in TFS integration.