TortoiseGit merge requestshttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests2016-02-26T12:39:06Zhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/46Make the font of CMenuButton identical with parent dialog2016-02-26T12:39:06Zusername-removed-94717Make the font of CMenuButton identical with parent dialogThe font is obviously different between button and menu button on Win10(Surface Pro 4, DPI 250%). See:
![Sync-d](/uploads/f02ee278134bee27b6e4611bb57cd8b5/Sync-d.png)
after fix:
![Sync-fix_cr](/uploads/0a69f3d5c47d7073d60282c47f...The font is obviously different between button and menu button on Win10(Surface Pro 4, DPI 250%). See:
![Sync-d](/uploads/f02ee278134bee27b6e4611bb57cd8b5/Sync-d.png)
after fix:
![Sync-fix_cr](/uploads/0a69f3d5c47d7073d60282c47f48df3a/Sync-fix_cr.png)
So, make it identical for better UI.
I have tested all modified menu buttons.
----
Other information: [Using MS Shell Dlg and MS Shell Dlg 2](https://msdn.microsoft.com/en-us/library/windows/desktop/dd374112(v=vs.85).aspx)
Points:
- MS Shell Dlg(8) is not a real font.
- No hard-coding font to support multi-language.
username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/45Fix automatic close of Rebase dialog when pull.rebase is set2016-02-15T15:59:52Zusername-removed-360247Fix automatic close of Rebase dialog when pull.rebase is setWhen current branch is forward from upstream, send BN_CLICKED
to Abort button to close the dialog.
No need to call m_CommitList.GetItemCount() on line 577, m_CommitList is cleared on line 573 and has zero size.
Repo to test [repo1...When current branch is forward from upstream, send BN_CLICKED
to Abort button to close the dialog.
No need to call m_CommitList.GetItemCount() on line 577, m_CommitList is cleared on line 573 and has zero size.
Repo to test [repo1.zip](/uploads/96d4a092d0f1883001a32b81e9bd2c1a/repo1.zip)
With preview 1.8.16.4 the Rebase dialog remains open when `pull.rebase=true` is sethttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/44Feature #2697: show "InCommits" and "In ChangeList" tabs for Fetch&Rebase2016-02-24T07:08:54Zusername-removed-360247Feature #2697: show "InCommits" and "In ChangeList" tabs for Fetch&RebaseDisplay the same tabs for Fetch&Rebase as for Pull in Sync dialog.
It also applies to Pull when pull.rebase = true/preseerve is set
in config.
Signed-off-by: Jiří Engelthaler <EngyCZ@gmail.com>Display the same tabs for Fetch&Rebase as for Pull in Sync dialog.
It also applies to Pull when pull.rebase = true/preseerve is set
in config.
Signed-off-by: Jiří Engelthaler <EngyCZ@gmail.com>https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/43Don't send BN_CLICKED message to potentially disabled button2016-02-13T18:06:38Zusername-removed-360247Don't send BN_CLICKED message to potentially disabled buttonIn Rebase Dialog : when IDC_REBASE_CONTINUE button is disabled
for example when hash == upstream, sending BN_CLICKED message to
a disabled button throws Debug Assertion Failed.
In Rebase Dialog : when IDC_REBASE_CONTINUE button is disabled
for example when hash == upstream, sending BN_CLICKED message to
a disabled button throws Debug Assertion Failed.
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/42Fix typo2016-02-13T09:54:36Zusername-removed-360247Fix typohttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/41Fix typo2016-02-06T09:01:35Zusername-removed-360247Fix typohttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/40Add support for auto rebase after pull2016-02-05T12:48:24Zusername-removed-112407Add support for auto rebase after pullSee issue #2692 See issue #2692 https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/39Fixed issue #2690: Failed to Show log from repository browser when that repos...2016-01-28T12:45:10Zusername-removed-94717Fixed issue #2690: Failed to Show log from repository browser when that repository is located on a driveI have tested it on `C:\`, `X:\`, `Y:\`.
Refer to the [line 819 of RepositoryBrowser.cpp](https://gitlab.com/tortoisegit/tortoisegit/blob/07135763b442d2ce4304a140cd6b89336dcc1f4b/src%2FTortoiseProc%2FRepositoryBrowser.cpp#L819).I have tested it on `C:\`, `X:\`, `Y:\`.
Refer to the [line 819 of RepositoryBrowser.cpp](https://gitlab.com/tortoisegit/tortoisegit/blob/07135763b442d2ce4304a140cd6b89336dcc1f4b/src%2FTortoiseProc%2FRepositoryBrowser.cpp#L819).username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/38Update doc for adjusting the size of message text box in commit dialog2016-01-28T22:59:42Zusername-removed-94717Update doc for adjusting the size of message text box in commit dialogfor issue #2689for issue #2689username-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/37Fix: the config never has chance to save Global source if XDG source exists.2016-02-22T12:26:49Zusername-removed-94717Fix: the config never has chance to save Global source if XDG source exists.I got a little problem and trace it to [here(line 134~137)](https://gitlab.com/tortoisegit/tortoisegit/commit/04d75640d730028d1ba94706b68793c2d2d0103b#66697ef8713893cb54a64a6e0806f1cb3a3efb7a_0_134). The logic there is a little different...I got a little problem and trace it to [here(line 134~137)](https://gitlab.com/tortoisegit/tortoisegit/commit/04d75640d730028d1ba94706b68793c2d2d0103b#66697ef8713893cb54a64a6e0806f1cb3a3efb7a_0_134). The logic there is a little different with [line 107~113](https://gitlab.com/tortoisegit/tortoisegit/commit/04d75640d730028d1ba94706b68793c2d2d0103b#66697ef8713893cb54a64a6e0806f1cb3a3efb7a_0_107).
OK, then, here is the steps of my problem:
1. Open Settings
2. Go "Git" node/page
2. Click "Global"
3. Change "AutoCrlf"
4. Push "Apply" button
Consider the priority of settings, should be **Local > Global > XDG > System**
(from [the comment of GfW issue #316](https://github.com/git-for-windows/git/issues/316#issuecomment-135667887))
Then, in my test, TortoiseGit always saves config to **XDG** only, and read it back from **Global**. This leads to the effective setting is never changed.username-removed-94717username-removed-94717https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/36Bisect terms2016-02-29T20:30:16Zusername-removed-138980Bisect termsCustom bisect terms are introduced in git 2.7Custom bisect terms are introduced in git 2.7https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/35Remove compilation warning2016-01-08T12:17:03Zusername-removed-360247Remove compilation warningRemove compilation warning caused by commit 00a5ace
Remove compilation warning caused by commit 00a5ace
https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/34Issue #2629: "Browse References" listview's sort column + order is now persis...2016-01-02T12:31:38Zusername-removed-297762Issue #2629: "Browse References" listview's sort column + order is now persistentusername-removed-112407username-removed-112407https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/33Fixed issue #2678: Filter out special ref names in log graph2016-01-04T18:14:52Zusername-removed-138980Fixed issue #2678: Filter out special ref names in log graphFixed issue #2678: Filter out special ref names in log graphFixed issue #2678: Filter out special ref names in log graphhttps://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/32Use PostMessage instead of Timer for automatic clicking on button2015-12-31T11:51:14Zusername-removed-360247Use PostMessage instead of Timer for automatic clicking on buttonIsn't it better to use PostMessage instead of Timer for automatic clicking on button? It's the fastest method.Isn't it better to use PostMessage instead of Timer for automatic clicking on button? It's the fastest method.https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/31Fixed issue #2679: Don't show horizontal scrollbar when logwidthmarker is set2015-12-30T16:20:36Zusername-removed-360247Fixed issue #2679: Don't show horizontal scrollbar when logwidthmarker is setScintilla has default width of horizontal scrollbar 2000.
It applies only when logwidthmarker is set and edit window
is not wrapped.
Signed-off-by: Jiří Engelthaler <EngyCZ@gmail.com>Scintilla has default width of horizontal scrollbar 2000.
It applies only when logwidthmarker is set and edit window
is not wrapped.
Signed-off-by: Jiří Engelthaler <EngyCZ@gmail.com>https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/30Cleanup index.lock after running libgit update-index2016-02-15T12:05:14Zusername-removed-138980Cleanup index.lock after running libgit update-indexCleanup index.lock after running libgit update-index
Fixes #2668Cleanup index.lock after running libgit update-index
Fixes #2668https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/29Add support for rebase.autostash2015-12-30T21:39:42Zusername-removed-112407Add support for rebase.autostash@ch3cooli Comments?@ch3cooli Comments?https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/28Fixed issue #2676: Swapped Theirs and Mine in Edit conflicts outside of rebas...2015-12-30T21:39:43Zusername-removed-112407Fixed issue #2676: Swapped Theirs and Mine in Edit conflicts outside of rebase dialog on rebasingThis is not limited to vanilla git rebase: Even if we use our own rebase dialog and open edit conflicts outside the dialog, we get swapped diffs.
This MR tries to fix both use cases.
@ch3cooli Comments?This is not limited to vanilla git rebase: Even if we use our own rebase dialog and open edit conflicts outside the dialog, we get swapped diffs.
This MR tries to fix both use cases.
@ch3cooli Comments?https://staging.gitlab.com/tortoisegit/tortoisegit/-/merge_requests/27Fixed issue #2673: Display tracked remote URL in folder properties2015-12-29T00:55:22Zusername-removed-94717Fixed issue #2673: Display tracked remote URL in folder propertiesusername-removed-112407username-removed-112407