aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/mergetool.cpp
Commit message (Expand)AuthorAgeFilesLines
* MergeTool: use multiarg arg()Jarek Kobus2021-11-031-5/+3
* Use QtcProcess in MergeToolJarek Kobus2021-11-031-66/+62
* VCS: Use more FilePath in ShellCommand and surroundingshjk2021-08-171-2/+2
* Vcs: Use more FilePath for file pathshjk2021-08-021-1/+2
* Git: Store singleton instance in GitClientOrgad Shaneh2020-02-261-2/+2
* Git: Partially move plugin pimpl to .cpphjk2020-02-071-3/+3
* Vcs: Merge IVersionControl and VcsBasePlugin hierarchieshjk2020-01-311-2/+1
* Vcs: Pimpl pluginshjk2020-01-241-3/+3
* Utils: Use CommandLine in ShellCommandhjk2019-06-111-1/+1
* Utils: Rename FileName to FilePathhjk2019-05-281-1/+1
* Fix some deprecation warnings in basic pluginsFriedemann Kleint2019-02-111-2/+3
* Git: Move HTML out of translated stringRobert Loehning2018-10-221-3/+4
* Git: Abort mergetool if not configuredOrgad Shaneh2018-06-191-0/+7
* Git: Show also stderr on MergetoolOrgad Shaneh2018-06-171-0/+1
* Git: Use nullptr in MergetoolOrgad Shaneh2018-06-171-1/+1
* Git: Use C locale when parsing the command outputOrgad Shaneh2017-10-121-0/+4
* Git: Fix parsing of "already merged" files in merge toolOrgad Shaneh2017-02-231-0/+5
* Git: Make mergetool parsing more robustOrgad Shaneh2016-11-091-11/+24
* Git: Avoid QProcess::waitForReadyRead in MergeToolOrgad Shaneh2016-09-201-13/+6
* Git: Do not rely on QProcess::readData/writeData in MergeToolOrgad Shaneh2016-09-201-30/+15
* Git: De-noiseOrgad Shaneh2016-07-221-2/+2
* Git: Prompt for unchanged file after custom mergetool failsOrgad Shaneh2016-06-241-9/+15
* Git: ModernizeTobias Hunger2016-02-101-18/+8
* Git: Require 1.8.0Orgad Shaneh2016-02-091-9/+1
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
* Git: Use Qt5-style connectsTobias Hunger2015-11-231-2/+2
* Git: Increase delay for mergetoolOrgad Shaneh2015-09-301-25/+29
* Git: Enable "Continue Merging" dialog on deleted conflictOrgad Shaneh2015-09-281-1/+1
* Git: Add overrideOrgad Shaneh2015-04-121-2/+2
* Git: s/GitPlugin::gitClient/GitPlugin::client/Tobias Hunger2015-04-081-4/+4
* Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClientTobias Hunger2015-03-261-1/+1
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\
| * Update LicenseEike Ziller2015-01-161-6/+6
* | Git: Use Core::AsynchronousMessageBoxMarco Bubke2015-02-091-2/+3
|/
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\
| * License updateEike Ziller2014-10-091-7/+8
* | VcsBase: Use static pattern for VcsBaseOutputWindowhjk2014-08-271-12/+9
* | Git: Initialize some member variables in constructorTobias Hunger2014-08-041-1/+5
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-07-181-1/+1
|\|
| * Git: Rename gitBinaryPath => gitExecutableOrgad Shaneh2014-07-181-1/+1
* | Some QString -> FileName transformationOrgad Shaneh2014-07-161-2/+2
|/
* Git: Fix mergetool prompt repliesOrgad Shaneh2014-06-031-0/+2
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-1/+1
* Git: Continue command after failed merge tool attemptOrgad Shaneh2014-03-271-1/+1
* Fix some strings.Jarek Kobus2014-03-141-1/+1
* Use ICore::dialogParent for message boxes without parent so farhjk2014-03-121-2/+4
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
* VCS: Introduce message styleOrgad Shaneh2013-08-201-1/+1
* VCS: Use correct output styleOrgad Shaneh2013-08-121-1/+2
* Fix coding style for else statementsOrgad Shaneh2013-07-171-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 21:08:50 +0000