OSDN Git Service
Frank Li [Mon, 14 Sep 2009 15:27:50 +0000 (23:27 +0800)]
Implemented issue #162: Ability to sync submodules in TGit sync dialog.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 12 Sep 2009 05:07:59 +0000 (13:07 +0800)]
Fixed issue #169: Force rebase checkbox is fixed
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 11 Sep 2009 15:53:38 +0000 (23:53 +0800)]
Add TGit.exe gitdll.dll and some library to install script
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 11 Sep 2009 15:52:57 +0000 (23:52 +0800)]
Fixed issue #163: Conflict "theirs" and "mine" are reversed during a rebase
Rebase cherry pick current branch to upstream.
So it need revert my version and their version at conflict editor
Signed-off-by: Frank Li <lznuaa@gmail.com>
Johan 't Hart [Thu, 10 Sep 2009 21:28:09 +0000 (23:28 +0200)]
Statics: Sort commits by dates before processed by StatGraphDlg
Frank Li [Thu, 10 Sep 2009 14:24:07 +0000 (22:24 +0800)]
Remove Sort HEAD of log dialog.
Log dialog don't support sort log. Sort log will break version tree.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 10 Sep 2009 14:08:23 +0000 (22:08 +0800)]
Fixed issue #165: Incorect path to Notepad2
This problem happen when there are more than one .git at parent directory path.
sOrigCWD is not useful for Tortoisegit. It should be g_Git.m_CurrentDir
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 10 Sep 2009 13:44:49 +0000 (21:44 +0800)]
Show <No branch> replace ref error message at log dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 8 Sep 2009 14:52:34 +0000 (22:52 +0800)]
Fixed issue #158: Rebase can act on the wrong branch
Can't checkout current branch when fast forward case.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 7 Sep 2009 13:32:39 +0000 (21:32 +0800)]
Merge branch 'dev'
Frank Li [Sun, 6 Sep 2009 07:53:51 +0000 (15:53 +0800)]
Add Check Software Updater support
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 6 Sep 2009 03:49:21 +0000 (11:49 +0800)]
Update version number to 1.0.2.0
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 6 Sep 2009 03:40:55 +0000 (11:40 +0800)]
update tgit project
Frank Li [Sat, 5 Sep 2009 05:53:01 +0000 (13:53 +0800)]
Change output path
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 5 Sep 2009 05:42:06 +0000 (13:42 +0800)]
Add gitdll and git test to solution file
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 4 Sep 2009 15:50:35 +0000 (23:50 +0800)]
Show nothing rebase when local branch equal upstream at rebasedlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 4 Sep 2009 15:24:00 +0000 (23:24 +0800)]
Fixed issue #157: Move progress dlg before rebase dialog SVN Rebase doesn't fast-forward
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 4 Sep 2009 14:56:14 +0000 (22:56 +0800)]
Fixed issue #157: SVN Rebase doesn't fast-forward
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 3 Sep 2009 12:41:31 +0000 (20:41 +0800)]
Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk
miss setup upstream of rebase dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 2 Sep 2009 15:01:13 +0000 (23:01 +0800)]
Fixed issue #155: SVN Rebase sets upstream as remotes/trunk
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 29 Aug 2009 07:27:03 +0000 (15:27 +0800)]
Update version number and change log for 1.0.1.0 release
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 29 Aug 2009 06:58:56 +0000 (14:58 +0800)]
Add submodule libcurl tgit and zlib
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 28 Aug 2009 15:21:13 +0000 (23:21 +0800)]
Fixed issue #151: need "stash pop" function and clear HasAdminDir HasGitSVN HashSubmodule.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 28 Aug 2009 13:50:44 +0000 (21:50 +0800)]
Fixed issue #150: When pushing, 'remote' should default to the tracked branch, or empty
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 24 Aug 2009 03:26:56 +0000 (11:26 +0800)]
Commit Dialog ViewPatch Work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 23 Aug 2009 16:08:49 +0000 (00:08 +0800)]
Stick Patch View basic work at
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 23 Aug 2009 15:11:02 +0000 (23:11 +0800)]
Add Miss PatchViewDlg.cpp and PatchViewDlg.h
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 23 Aug 2009 14:54:13 +0000 (22:54 +0800)]
Patch view stick to commit dialog okay
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 23 Aug 2009 06:39:41 +0000 (14:39 +0800)]
Add View Patch & Hide Patch at commit dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 22 Aug 2009 16:03:17 +0000 (00:03 +0800)]
Bold Subject at log dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 22 Aug 2009 15:27:16 +0000 (23:27 +0800)]
Show Line and Column Number at CommitDlg.cpp
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 22 Aug 2009 06:30:17 +0000 (14:30 +0800)]
Fix Pathwatcher thread can't stop when commitdlg exit.
Patchwatcher thread can't exit will cause crash when commitdlg exit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 22 Aug 2009 05:51:47 +0000 (13:51 +0800)]
Check http_proxy environment.
If environment http_proxy setting, don't use setting dialog proxy data.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 21 Aug 2009 14:12:25 +0000 (22:12 +0800)]
Fixed issue #147: Add ability to drop / view stash
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 15 Aug 2009 06:33:10 +0000 (14:33 +0800)]
Fixed issue #144: Attaching message to a merge
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 15 Aug 2009 05:30:15 +0000 (13:30 +0800)]
Fixed issue #139: "Format patch" with a range of revisions doesn't export the first revision in the range
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 14 Aug 2009 16:18:31 +0000 (00:18 +0800)]
Fixed issue #131: Missing SVN DCommit Command
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 14 Aug 2009 14:39:19 +0000 (22:39 +0800)]
Fixed Issue #137: Proxy Authentification fails
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 14 Aug 2009 13:52:43 +0000 (21:52 +0800)]
Fixed Issue #141: Bizarre ordering in commit dialog?
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 14 Aug 2009 11:47:15 +0000 (19:47 +0800)]
Fixed Issue #138: "Format patch" in "Show log" dialog doesn't work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 14 Aug 2009 11:26:27 +0000 (19:26 +0800)]
Fix Issue #142: TortoiseGit Clone of SVN repo does not use PuTTY session for non-standard SSH port
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 14 Aug 2009 02:17:03 +0000 (10:17 +0800)]
Fixed Issue #135: Taskbar text says "TortoiseSVN"
Need clean manually.
HKEY_CURRENT_USER\Software\Microsoft\Windows\ShellNoRoam\MUICache
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 13 Aug 2009 15:02:09 +0000 (23:02 +0800)]
Fixed issue #140: Incorrect treatment of "Cancel" action on "Apply patch serial" command
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 13 Aug 2009 12:29:42 +0000 (20:29 +0800)]
Merge branch 'master' of git://github.com/Jopie64/tortoisegit
Frank Li [Thu, 13 Aug 2009 07:42:11 +0000 (15:42 +0800)]
Fixed issue #133: (mv\rename problem) Command fails on folder with leading dash
And -- to separate file and git options
Signed-off-by: Frank Li <lznuaa@gmail.com>
Johan 't Hart [Wed, 12 Aug 2009 19:37:52 +0000 (21:37 +0200)]
Fix some typos.
Require -> Requires
Come -> Comes
This fixes issue 134
Johan 't Hart [Wed, 12 Aug 2009 19:07:34 +0000 (21:07 +0200)]
igit removed from path (no longer a submodule)
Frank Li [Tue, 11 Aug 2009 15:24:02 +0000 (23:24 +0800)]
Fixed issue #133: Command fails on folder with leading dash
And -- to separate file and git options
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 10 Aug 2009 14:00:39 +0000 (22:00 +0800)]
Add tgit to submodule and remove igit submodule
Frank Li [Thu, 6 Aug 2009 16:02:53 +0000 (00:02 +0800)]
Add Resolve "Their" and Resolve "Mine" at conflict item.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 6 Aug 2009 15:11:08 +0000 (23:11 +0800)]
Update license file and fix don't show "push" after commit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 6 Aug 2009 15:03:20 +0000 (23:03 +0800)]
Fixed issue #126: Config dialog / control
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 1 Aug 2009 04:20:34 +0000 (12:20 +0800)]
Update changelog and version number
Frank Li [Mon, 27 Jul 2009 15:23:32 +0000 (23:23 +0800)]
Fixed issue #124: Incorrect Date header in patch e-mail
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 26 Jul 2009 13:36:15 +0000 (21:36 +0800)]
Fixed issue #122: Garbage text in "Git Command Progress" / suspected buffer overflow
Improve commit speed when many added files.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 26 Jul 2009 12:50:47 +0000 (20:50 +0800)]
Basic Fixed issue #122: Garbage text in "Git Command Progress" / suspected buffer overflow.
But speed is too slow
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 09:23:04 +0000 (17:23 +0800)]
Add Miss file
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 09:19:00 +0000 (17:19 +0800)]
Add Clean Type Dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 08:28:59 +0000 (16:28 +0800)]
Settings dialog show Sync menu
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 07:37:46 +0000 (15:37 +0800)]
Add "Sync" command at ContextMenu
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 07:01:49 +0000 (15:01 +0800)]
Sync Dialog Basic finished.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 06:01:01 +0000 (14:01 +0800)]
SyncDlg Show Conflict when pull
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 04:14:57 +0000 (12:14 +0800)]
SyncDlg apply patch okay show commit list and change file list
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 24 Jul 2009 15:53:17 +0000 (23:53 +0800)]
SyncDlg implement "apply patch" command.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 24 Jul 2009 15:06:59 +0000 (23:06 +0800)]
SyncDlg Fix no patch created problem
Frank Li [Fri, 24 Jul 2009 15:03:09 +0000 (23:03 +0800)]
SyncDlg Enable Send Path by Email button
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 24 Jul 2009 14:44:24 +0000 (22:44 +0800)]
CSyncDlg switch to log when click push. support push with tags and force
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 23 Jul 2009 15:58:01 +0000 (23:58 +0800)]
Sync Dialog progress command output correct handle \r
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 23 Jul 2009 15:36:09 +0000 (23:36 +0800)]
SyncDlg progress text basic work
Frank Li [Thu, 23 Jul 2009 14:44:34 +0000 (22:44 +0800)]
Sync Dialog Scroll the correct line number
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 23 Jul 2009 14:20:37 +0000 (22:20 +0800)]
SyncDlg rewrite output text handle
Frank Li [Thu, 23 Jul 2009 14:04:31 +0000 (22:04 +0800)]
Fixed issue #121: Refresh in "Check for modifications" dialog duplicates added state entries when new repository
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 15:20:40 +0000 (23:20 +0800)]
Sync Dialog Disable command button when running.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 14:59:51 +0000 (22:59 +0800)]
Sync dialog output log message okay.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 14:33:25 +0000 (22:33 +0800)]
Parse output at SyncDialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 11:13:13 +0000 (19:13 +0800)]
Rewrite some progressdlg to share to Sync Dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 05:52:10 +0000 (13:52 +0800)]
Add command output at SyncDlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 04:54:28 +0000 (12:54 +0800)]
add miss file
Frank Li [Tue, 21 Jul 2009 15:59:51 +0000 (23:59 +0800)]
SyncDlg show animate when press push button and hide input control.
Frank Li [Mon, 20 Jul 2009 16:21:47 +0000 (00:21 +0800)]
Add Compare and GNU diff at Change File list at sync dialog. Double click also support.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 20 Jul 2009 15:33:41 +0000 (23:33 +0800)]
Get Change File List at Sync Dialog
Frank Li [Mon, 20 Jul 2009 14:12:40 +0000 (22:12 +0800)]
Add url error message at syncdlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 15:33:24 +0000 (23:33 +0800)]
Add commit list and change list ctrl at SyncDlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 15:00:06 +0000 (23:00 +0800)]
Sync Dialog branch select basic work.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 07:09:07 +0000 (15:09 +0800)]
Record Push and Pull button at sync dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 06:28:19 +0000 (14:28 +0800)]
Enable Sync Dialog Resize
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 06:03:25 +0000 (14:03 +0800)]
Add SYNC dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 05:12:40 +0000 (13:12 +0800)]
Fixed issue #118: Enhancement: "Git Clone" from SVN repository with additional start revision number option (-r xxx:HEAD)
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 18 Jul 2009 06:11:15 +0000 (14:11 +0800)]
Fixed issue #71: (TortoiseProc problem)Icon Overlays don't work in root of drive
When m_CurrentDir =C:\, not C:, pathlist calulate wrong.
Myagi [Fri, 17 Jul 2009 16:11:43 +0000 (18:11 +0200)]
fixed issues with status (and icon overlays) in root directories
Myagi [Thu, 16 Jul 2009 17:48:41 +0000 (19:48 +0200)]
restored the accidently removed quotes on igit command line
Frank Li [Wed, 15 Jul 2009 08:00:15 +0000 (16:00 +0800)]
Add post action button for rebase dialog. Such as send patch by email
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 15 Jul 2009 05:45:29 +0000 (13:45 +0800)]
Enhance Rebase dialog. Add force rebase checkbox.
Disable start button when no item rebase.
Don't show merge commit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 14 Jul 2009 16:04:42 +0000 (00:04 +0800)]
Add launch rebase option at fetch dialog.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Tue, 14 Jul 2009 02:48:39 +0000 (04:48 +0200)]
fixed icon overlays for unversioned directories when using TGitCache
Myagi [Mon, 13 Jul 2009 23:07:45 +0000 (01:07 +0200)]
fixed backslash issues with igit commandline (resulted in overlays not working in root dir, like C:\)
Frank Li [Mon, 13 Jul 2009 16:00:33 +0000 (00:00 +0800)]
Fixed issue #116: SVN Rebase doesn't work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 13 Jul 2009 15:54:25 +0000 (23:54 +0800)]
Fixed issue #115: Windows XP: Initial "Git Clone..." from SVN Repository doesn't work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 13 Jul 2009 14:41:15 +0000 (22:41 +0800)]
Fixed issue #110: Feature Requeest: Default settings from local repositories pushing to remote repository
Choose track remote and remote branch!
Add short-cut at push dialog
Frank Li [Sun, 12 Jul 2009 15:49:19 +0000 (23:49 +0800)]
Add more shut-cut for commit dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>