delta/qt-creator.git - code.qt.io: qt-creator/qt-creator.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Git: Fix parsing of "already merged" files in merge tool	Orgad Shaneh	2017-02-23	1	-0/+5
*	Git: Make mergetool parsing more robust	Orgad Shaneh	2016-11-09	1	-11/+24
*	Git: Avoid QProcess::waitForReadyRead in MergeTool	Orgad Shaneh	2016-09-20	1	-13/+6
*	Git: Do not rely on QProcess::readData/writeData in MergeTool	Orgad Shaneh	2016-09-20	1	-30/+15
*	Git: De-noise	Orgad Shaneh	2016-07-22	1	-2/+2
*	Git: Prompt for unchanged file after custom mergetool fails	Orgad Shaneh	2016-06-24	1	-9/+15
*	Git: Modernize	Tobias Hunger	2016-02-10	1	-18/+8
*	Git: Require 1.8.0	Orgad Shaneh	2016-02-09	1	-9/+1
*	Update License according to agreement with Free Qt Foundation	Tobias Hunger	2016-01-19	1	-17/+12
*	Git: Use Qt5-style connects	Tobias Hunger	2015-11-23	1	-2/+2
*	Git: Increase delay for mergetool	Orgad Shaneh	2015-09-30	1	-25/+29
*	Git: Enable "Continue Merging" dialog on deleted conflict	Orgad Shaneh	2015-09-28	1	-1/+1
*	Git: Add override	Orgad Shaneh	2015-04-12	1	-2/+2
*	Git: s/GitPlugin::gitClient/GitPlugin::client/	Tobias Hunger	2015-04-08	1	-4/+4
*	Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient	Tobias Hunger	2015-03-26	1	-1/+1
*	Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'	Eike Ziller	2015-02-12	1	-6/+6
\|\
\| *	Update License	Eike Ziller	2015-01-16	1	-6/+6
* \|	Git: Use Core::AsynchronousMessageBox	Marco Bubke	2015-02-09	1	-2/+3
\|/
*	Merge remote-tracking branch 'origin/3.2'	Eike Ziller	2014-10-14	1	-7/+8
\|\
\| *	License update	Eike Ziller	2014-10-09	1	-7/+8
* \|	VcsBase: Use static pattern for VcsBaseOutputWindow	hjk	2014-08-27	1	-12/+9
* \|	Git: Initialize some member variables in constructor	Tobias Hunger	2014-08-04	1	-1/+5
* \|	Merge remote-tracking branch 'origin/3.2'	Eike Ziller	2014-07-18	1	-1/+1
\|\ \ \| \|/
\| *	Git: Rename gitBinaryPath => gitExecutable	Orgad Shaneh	2014-07-18	1	-1/+1
* \|	Some QString -> FileName transformation	Orgad Shaneh	2014-07-16	1	-2/+2
\|/
*	Git: Fix mergetool prompt replies	Orgad Shaneh	2014-06-03	1	-0/+2
*	Use double quotes instead of single quotes as per our guidelines.	Christian Kandeler	2014-04-22	1	-1/+1
*	Git: Continue command after failed merge tool attempt	Orgad Shaneh	2014-03-27	1	-1/+1
*	Fix some strings.	Jarek Kobus	2014-03-14	1	-1/+1
*	Use ICore::dialogParent for message boxes without parent so far	hjk	2014-03-12	1	-2/+4
*	Incremented year in copyright info	Robert Loehning	2014-01-08	1	-1/+1
*	VCS: Introduce message style	Orgad Shaneh	2013-08-20	1	-1/+1
*	VCS: Use correct output style	Orgad Shaneh	2013-08-12	1	-1/+2
*	Fix coding style for else statements	Orgad Shaneh	2013-07-17	1	-2/+1
*	Fix build	Eike Ziller	2013-06-19	1	-2/+0
*	Git: Style fixes	Orgad Shaneh	2013-06-11	1	-1/+2
*	Git: Mark forgotten cases as expected to change	Orgad Shaneh	2013-06-10	1	-1/+7
*	Merge remote-tracking branch 'origin/2.7'	Eike Ziller	2013-04-08	1	-1/+1
\|\
\| *	Added second button to message box	Robert Loehning	2013-04-08	1	-1/+1
* \|	Clean headers in Git.	Friedemann Kleint	2013-04-05	1	-1/+0
* \|	Fix Krazy warnings about includes/header guards in version control.	Friedemann Kleint	2013-03-12	1	-1/+1
* \|	Git: Move some functions from MergeTool to GitClient	Orgad Shaneh	2013-03-01	1	-42/+1
\|/
*	Git: Handle "no changes" case on conflict resolving	Orgad Shaneh	2013-02-12	1	-14/+19
*	UI text: edit merge tool message	Leena Miettinen	2013-02-12	1	-2/+2
*	UI text: fix git cherry-picking strings	Leena Miettinen	2013-02-09	1	-2/+2
*	Incremented year in copyright info	Robert Loehning	2013-02-01	1	-1/+1
*	Git: Added Revert and cherry-pick	Petar Perisin	2013-01-21	1	-12/+39
*	VCS: Remove superfluous virtual	Orgad Shaneh	2013-01-18	1	-1/+1
*	Git: Use configured binary for merge tool	Orgad Shaneh	2013-01-16	1	-2/+3
*	Git: Refactored "synchronousPullOrRebase" to be more general.	Petar Perisin	2013-01-11	1	-1/+1