aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/mergetool.cpp
Commit message (Expand)AuthorAgeFilesLines
* VcsOutputWindow: Add working directory to append functionsAndre Hartmann29 hours1-5/+5
* CommandLine: Reuse new c'torJarek Kobus2024-05-221-3/+1
* VCS: Allow remote vcs operationsMarcus Tillmanns2024-02-121-1/+1
* Git: Separate internal plugin access API from plugin classhjk2024-01-151-1/+1
* GitPlugin: Simplify return statementsJarek Kobus2023-08-021-2/+2
* Git: Initialize GitClient on first accesshjk2023-07-261-2/+2
* Utils: Rename QtcProcess -> ProcessJarek Kobus2023-05-041-2/+2
* Utils: Rename QtcProcess::readAllStandard* to readAllRawStandard*hjk2023-01-101-1/+1
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
* Git: Convert to Tr::trAlessandro Portale2022-10-061-25/+25
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
* MergeTool: De-pointer processJarek Kobus2022-06-221-29/+20
* MergeTool: Don't call blocking waitForStarted()Jarek Kobus2022-06-221-18/+10
* QtcProcess: Forward declare Environment in QtcProcess headerJarek Kobus2022-05-091-0/+1
* Utils: Add a QString-based write to QtcProcesshjk2022-04-281-7/+5
* Utils: Move QtcProcess constructor setup data to shared setup datahjk2022-02-111-1/+2
* Git: Fix parsing in mergetoolOrgad Shaneh2022-02-071-1/+4
* Get rid of QtcProcess::workingDirectory() overloadJarek Kobus2022-01-181-1/+1
* 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
|\
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 22:20:07 +0000