OSDN Git Service
Frank Li [Sun, 8 Mar 2009 13:29:32 +0000 (21:29 +0800)]
Add Diff with work copy and file list
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 8 Mar 2009 12:52:30 +0000 (20:52 +0800)]
Use Resource to show Menu Item Context
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 8 Mar 2009 09:22:20 +0000 (17:22 +0800)]
Add external diff merge and udiff Setting at setting Page
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 8 Mar 2009 04:45:56 +0000 (12:45 +0800)]
LogDialog: Add MessageBox Tell user Revert Finished.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 8 Mar 2009 04:32:55 +0000 (12:32 +0800)]
Commit Dialog can Revert files which "revert to version" in log dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 8 Mar 2009 04:17:50 +0000 (12:17 +0800)]
Add Revert to Version feature.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 8 Mar 2009 03:46:39 +0000 (11:46 +0800)]
Add Save Special Version to anther file
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 7 Mar 2009 10:46:33 +0000 (18:46 +0800)]
Add "Save reversion as" ... menu item at File List
Frank Li [Sat, 7 Mar 2009 14:02:51 +0000 (22:02 +0800)]
Fix SwitchDlg assert fail
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 7 Mar 2009 12:11:36 +0000 (20:11 +0800)]
Fix 2 Miss ATL Library at setup package
Frank Li [Sat, 7 Mar 2009 11:19:44 +0000 (19:19 +0800)]
Fix Miss ATL Library at setup package
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 6 Mar 2009 14:24:58 +0000 (22:24 +0800)]
Fix Commit Dialog and Log Dialog default column is wrong
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 6 Mar 2009 06:05:35 +0000 (14:05 +0800)]
fix some dialog can't show after resize and close and open again
Frank Li [Fri, 6 Mar 2009 13:22:16 +0000 (21:22 +0800)]
Fix ProgressDlg Sometime thread is dead blocked.
Avoid update UI at back thread.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 4 Mar 2009 13:17:41 +0000 (21:17 +0800)]
Update Version Number to 0.4.1
Frank Li [Wed, 4 Mar 2009 02:23:55 +0000 (10:23 +0800)]
Add margin for docbook article
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 4 Mar 2009 02:07:44 +0000 (10:07 +0800)]
Finish Add Git Document to help file
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 3 Mar 2009 23:23:35 +0000 (07:23 +0800)]
Fix git command break docbook because miss ">"
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 3 Mar 2009 15:14:59 +0000 (23:14 +0800)]
Add Git Command to document
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 3 Mar 2009 14:55:11 +0000 (22:55 +0800)]
Git user manual okay
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 3 Mar 2009 14:05:09 +0000 (22:05 +0800)]
Git command Working version
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 3 Mar 2009 13:27:05 +0000 (21:27 +0800)]
Add Git official document to help
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 3 Mar 2009 06:14:14 +0000 (14:14 +0800)]
Add Git User manual to Help Document
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 2 Mar 2009 01:31:33 +0000 (09:31 +0800)]
Fix tag to head when *force* check box checked.
Because resource ID force is in the middle of HEAD and version, get current version get wrong radio button id.
Signed-off-by: Frank Li <lznuaa@gmail.com>
jackie [Sun, 1 Mar 2009 08:38:35 +0000 (16:38 +0800)]
Fixed x64 build of TortoiseProc crashed due to received unexpected messages.
jackie [Mon, 2 Mar 2009 06:43:50 +0000 (14:43 +0800)]
All configurations (Release/Debug and x86/x64) can be built properly.
Remove release_static and debug_static solution configurations as it is useless.
jackie [Mon, 2 Mar 2009 05:22:34 +0000 (13:22 +0800)]
Dynamic linking to CRT/MFC.
jackie [Sun, 1 Mar 2009 16:08:32 +0000 (00:08 +0800)]
Merge branch 'master' of git://repo.or.cz/TortoiseGit
Frank Li [Sun, 1 Mar 2009 14:47:34 +0000 (22:47 +0800)]
Roll back TortoiseShell because it is too risk using MFC.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Johan t Hart [Sun, 1 Mar 2009 00:29:04 +0000 (01:29 +0100)]
igit added as submodule
jackie [Sat, 28 Feb 2009 14:10:04 +0000 (22:10 +0800)]
strip and compress igit.exe and libiconv2.dll.
Frank Li [Sun, 1 Mar 2009 13:19:24 +0000 (21:19 +0800)]
Update Linked with static version of CRT/MFC
jackie [Thu, 26 Feb 2009 07:18:40 +0000 (15:18 +0800)]
Linked with static version of CRT/MFC.
jackie [Thu, 26 Feb 2009 06:15:03 +0000 (14:15 +0800)]
Fixed CRT linkage options.
Fixed x64 verson of TortoiseProc crash.
Frank Li [Sun, 1 Mar 2009 13:18:05 +0000 (21:18 +0800)]
Update TGitCache Project
Frank Li [Sun, 1 Mar 2009 09:23:28 +0000 (17:23 +0800)]
Update Help Document (Log)
Signed-off-by: Frank Li <lznuaa@gmail.com>
jackie [Sun, 1 Mar 2009 08:38:35 +0000 (16:38 +0800)]
Fixed x64 build of TortoiseProc crashed due to received unexpected messages.
Frank Li [Sun, 1 Mar 2009 08:32:10 +0000 (16:32 +0800)]
Update Help Document (Checkout, commit, check status)
Signed-off-by: Frank Li <lznuaa@gmail.com>
jackie [Sun, 1 Mar 2009 08:00:26 +0000 (16:00 +0800)]
Merge branch 'master' of git://repo.or.cz/TortoiseGit
Conflicts:
ext/gitexe/igit.exe
src/TGitCache/TSVNCache.vcproj
Frank Li [Sun, 1 Mar 2009 03:34:18 +0000 (11:34 +0800)]
MSI include CrashReportDll
Myagi [Sat, 28 Feb 2009 18:35:07 +0000 (19:35 +0100)]
stripped igit.exe
Frank Li [Sat, 28 Feb 2009 16:11:46 +0000 (00:11 +0800)]
Fix 64 create MSI problem because TGitCache.exe using TSVNCache.exe name.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 28 Feb 2009 15:37:52 +0000 (23:37 +0800)]
Merge branch 'master' of ssh://lznuaa@repo.or.cz/srv/git/TortoiseGit
Frank Li [Sat, 28 Feb 2009 14:56:28 +0000 (22:56 +0800)]
Fix Launch Help Path Error
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 28 Feb 2009 14:33:27 +0000 (22:33 +0800)]
Fix the uninstall don't close TGitCache.exe problem.
Signed-off-by: Frank Li <lznuaa@gmail.com>
jackie [Sat, 28 Feb 2009 14:10:04 +0000 (22:10 +0800)]
strip and compress igit.exe and libiconv2.dll.
Frank Li [Sat, 28 Feb 2009 13:27:09 +0000 (21:27 +0800)]
Update Change Log and add puttygen.exe to manage tortoiseplink key.
Signed-off-by: Frank Li <lznuaa@gmail.com>
jackie [Sat, 28 Feb 2009 14:06:28 +0000 (22:06 +0800)]
Merge branch 'master' of git://repo.or.cz/TortoiseGit
Frank Li [Sat, 28 Feb 2009 03:41:10 +0000 (11:41 +0800)]
Fix contextmenu accident modify cause compile error.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 16:32:42 +0000 (00:32 +0800)]
CherryPick Multi Commits basic work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Fri, 27 Feb 2009 15:32:08 +0000 (16:32 +0100)]
igit.exe updated (status checking order adjusted)
Frank Li [Fri, 27 Feb 2009 15:39:28 +0000 (23:39 +0800)]
Rebasedlg: add show add delete at filelist
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 15:19:55 +0000 (23:19 +0800)]
Show Conflict Status at Filelist at delete conflict local: delete, remote:modified
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 14:37:14 +0000 (22:37 +0800)]
Add handle "Delete Conflict" at conflict edit.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 11:03:17 +0000 (19:03 +0800)]
Conflict Handle Delete case
Frank Li [Fri, 27 Feb 2009 07:30:15 +0000 (15:30 +0800)]
LogDlg: Reorg context menu sequence
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 07:17:46 +0000 (15:17 +0800)]
RebaseDlg: Fix Edit don't show Amend button problem
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 07:11:12 +0000 (15:11 +0800)]
RebaseDlg: Fix Squash All Crash problem
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 05:49:32 +0000 (13:49 +0800)]
RebaseDlg Fix don't start rebase problem
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 27 Feb 2009 01:51:44 +0000 (09:51 +0800)]
Merge branch 'roll_back'
Myagi [Thu, 26 Feb 2009 14:54:12 +0000 (15:54 +0100)]
igit.exe update (staged/modified checking order restored)
Frank Li [Fri, 27 Feb 2009 01:40:20 +0000 (09:40 +0800)]
Fix rebasedlg can't start
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 26 Feb 2009 09:45:57 +0000 (17:45 +0800)]
Add libiconv2dll to install script
Signed-off-by: Frank Li <lznuaa@gmail.com>
jackie [Thu, 26 Feb 2009 07:56:33 +0000 (15:56 +0800)]
.
jackie [Thu, 26 Feb 2009 07:18:40 +0000 (15:18 +0800)]
Linked with static version of CRT/MFC.
jackie [Thu, 26 Feb 2009 06:15:03 +0000 (14:15 +0800)]
Fixed CRT linkage options.
Fixed x64 verson of TortoiseProc crash.
Myagi [Thu, 26 Feb 2009 04:09:09 +0000 (05:09 +0100)]
changed GitCache so folder status propagates upward unchanged
Myagi [Thu, 26 Feb 2009 03:39:35 +0000 (04:39 +0100)]
igit.exe updated (folder status bug)
Frank Li [Thu, 26 Feb 2009 04:17:07 +0000 (12:17 +0800)]
Enable Copy file List to commit Message
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Thu, 26 Feb 2009 01:57:13 +0000 (02:57 +0100)]
igit.exe fix for staged status
Myagi [Thu, 26 Feb 2009 01:32:25 +0000 (02:32 +0100)]
changed EnumFiles path/file params to unicode strings
Myagi [Thu, 26 Feb 2009 00:24:41 +0000 (01:24 +0100)]
igit.exe bug fix (crashed on deleted files)
jackie [Wed, 25 Feb 2009 18:57:43 +0000 (02:57 +0800)]
Merge branch 'master' of git://repo.or.cz/TortoiseGit
Frank Li [Wed, 25 Feb 2009 15:24:50 +0000 (23:24 +0800)]
Using cherry Pick implement combine commits to avoid the rebase start by command line.
Show progress bar when pick up top commits.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Tue, 24 Feb 2009 20:49:26 +0000 (21:49 +0100)]
updated igit.exe (staged/added status)
Myagi [Tue, 24 Feb 2009 20:48:03 +0000 (21:48 +0100)]
icon overlay for "staged" status (uses TSVN's readonly overlay, unused by Git)
Myagi [Tue, 24 Feb 2009 04:04:56 +0000 (05:04 +0100)]
character conversion fix in index file loader
Frank Li [Tue, 24 Feb 2009 15:23:42 +0000 (23:23 +0800)]
Commit Combine: handle case "HEAD is not first one commit of list"
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 24 Feb 2009 14:30:21 +0000 (22:30 +0800)]
Add screen shot for document
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 24 Feb 2009 13:19:07 +0000 (21:19 +0800)]
Change Progress.h to SysProgress.h because there are two progress.h file.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Mon, 23 Feb 2009 22:09:40 +0000 (23:09 +0100)]
character conversion fix for parsed filenames from igit.exe
Frank Li [Mon, 23 Feb 2009 15:47:10 +0000 (23:47 +0800)]
Update Document
Frank Li [Mon, 23 Feb 2009 08:02:43 +0000 (16:02 +0800)]
Update Document
unknown [Mon, 23 Feb 2009 04:57:04 +0000 (12:57 +0800)]
...
Johan t Hart [Sun, 22 Feb 2009 14:21:39 +0000 (15:21 +0100)]
Remove combine option from Rebase context menu Fix crash in CGitLogListBase::Refresh()
Johan t Hart [Sun, 22 Feb 2009 13:39:51 +0000 (14:39 +0100)]
Added extra check in combine process.
Make sure the commits are really continuous.
Frank Li [Sun, 22 Feb 2009 15:39:18 +0000 (23:39 +0800)]
Update little document
Frank Li [Sun, 22 Feb 2009 09:20:50 +0000 (17:20 +0800)]
Fix solution file problem. remove language from default build
Frank Li [Sun, 22 Feb 2009 08:57:46 +0000 (16:57 +0800)]
Update a little help document
Frank Li [Sun, 22 Feb 2009 08:24:34 +0000 (16:24 +0800)]
Delete: Don't ask user about if keep local copy.
because there are command "Delete(keep local copy)" at explore context menu
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 22 Feb 2009 08:02:24 +0000 (16:02 +0800)]
Update rebase pick\squash\edit\skip icon
Signed-off-by: Frank Li <lznuaa@gmail.com>
Johan t Hart [Sat, 21 Feb 2009 22:54:11 +0000 (23:54 +0100)]
'Cherry-pick' commits after combined commits when combine is done
Myagi [Sun, 22 Feb 2009 02:42:07 +0000 (03:42 +0100)]
added current branch info to context menu
Myagi [Sat, 21 Feb 2009 22:24:41 +0000 (23:24 +0100)]
minor fix for win2k context menu icons
Frank Li [Sat, 21 Feb 2009 14:28:28 +0000 (22:28 +0800)]
Fix about dialog title show TortoiseSVN problem
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 21 Feb 2009 14:22:46 +0000 (22:22 +0800)]
Add Resolve context menu
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 21 Feb 2009 14:00:36 +0000 (22:00 +0800)]
Fix TortoiseMerge launch fail because stage is not tree.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 21 Feb 2009 09:27:39 +0000 (17:27 +0800)]
RebaseDlg: Correct get Tabctrl position.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 21 Feb 2009 09:09:33 +0000 (17:09 +0800)]
Use Rebase Dialog For cherry pick ant log dialog actions.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 21 Feb 2009 08:14:04 +0000 (16:14 +0800)]
Add "Rebase" menu at log list. "Cherry Pick show " at multi selection
Signed-off-by: Frank Li <lznuaa@gmail.com>
OSDN Git Service
