Как обновить форк репозитория в github

# Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

# Fetch all the branches of that remote into remote-tracking branches,
# such as upstream/master:

git fetch upstream

# Make sure that you're on your master branch:

git checkout master

# Rewrite your master branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:

git rebase upstream/master

#or

git merge upstream/master

 

http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository

git squash

git rebase -i HEAD~3

Link

 

pick f392171 Added new feature X
squash ba9dd9a Added new elements to page design
squash df71a27 Updated CSS for new elements

Как использовать Visual Studio DiffTool vsmergediff в GIT

по пути типа C:\Users\%username% в файле .gitconfig  нужно:

 

добавить в конце:

[difftool "vsdiffmerge"]
     path = C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe
     cmd = \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "vsdiffmerge"]
     path = C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe
     cmd = "\"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe\" /m \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" "

только укажите правильный путь к visual studio

 

и в начале файле укажите чем вы будете

[merge]
     tool = vsdiffmerge
[diff]
     guitool = vsdiffmerge