OSDN Git Service

Pull/Fetch Dlg: Used git config to determine default remote and remote branch. Also...
authorJohan 't Hart <johanthart@gmail.com>
Fri, 26 Jun 2009 18:59:58 +0000 (20:59 +0200)
committerJohan 't Hart <johanthart@gmail.com>
Fri, 26 Jun 2009 19:03:19 +0000 (21:03 +0200)
commit25bd4c961830590ffdb51202e935fd168b7b2484
tree05f926663efff831e226a8d18df081263b4ed8f2
parentc1a66f0ec94ab60252eea8ff9bb0c5a570b8d1f2
Pull/Fetch Dlg: Used git config to determine default remote and remote branch. Also enabled 'branch' option when pulling from known remote.
Also started implementing rebase option (rebase instead of merge) when pulling. Disabled this though, because I think the rebase dialog should be used for this. It needs some work.
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Commands/PullCommand.cpp
src/TortoiseProc/PullFetchDlg.cpp
src/TortoiseProc/PullFetchDlg.h
src/TortoiseProc/resource.h