Saturday, December 05, 2015

Setting up VS 2013 and GitHub Locally

Install VS 2013

Set up source control provider Tools\Extensions and Updates. Choose Online, Search for git.
  • Choose "Git Source Control Provider" and install.
  • Switch to this provider in Tools\Options\Source Control
Add Pending Changes to Standard toolbar.
  • Right-Click on white space in tool bar, choose customize at the bottom
  • Pick Commands tab, choose the tool bar radio button, select the standard toolbar Click Add Command button, Choose the View Category, scroll down to Pending Changes Click the move down button until it is at the end of the standard toolbar.
Set Keep tabs. Tools\Options\ Search for "tabs" Find in Text Editor\All languages Choose the Keep Tabs radio button.
Show Line Numbers, Search for Line number in Tools\Options. Check "Line Numbers" in Text Editor\All Languages\General\

Install Git For Windows "Full installer for official Git for Windows"

  • Use defaults except for the following
  • In Select Components, choose Windows Explorer integration "Simple context menu (Registry based)" Git Bash Here
    "Use Git from the Windows Command Prompt" For Configuring the line ending conversions, choose "Checkout as-is, commit as-is" ### Install TortoiseGit Set User Info in TortoiseGit Settings\Git. Enter a user name and email.
Sample GitHub workflow:
  • Click Pending Changes button in VS 2013 standard toolbar.
  • check the files you want to commit
  • Enter comments and click the Commit button.
When you are ready to push
  • From the VS 2013 Pending Changes page Choose synch from the TortoiseGit drop down menu. Click the Push button.

TortoiseGit settings

To use BeyondCompare4 for your diff and merge tools use the following urls. To get to the TortoiseGit settings, right-click on any folder and go to TortoiseGit\Settings.
Under Diff Viewer put this in for the External path
  • "C:\Program Files\Beyond Compare 4\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
The child node under Diff View is Merge Tool. Use this for the External path
  • "C:\Program Files (x86)\Beyond Compare 4\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

No comments: