index
:
delta/qt-creator.git
0.9.1-beta
0.9.2-rc1
1.0.0
1.1
1.2
1.2.90
1.3
1.3.0
1.3.0-beta
1.3.1
10.0
2.0
2.0.0
2.0.0-beta
2.0.1
2.1
2.1.0
2.2
2.3
2.4
2.5
2.6
2.7
2.8
3.0
3.1
3.2
3.3
3.4
3.5
3.6
4.0
4.1
4.10
4.11
4.12
4.13
4.14
4.15
4.2
4.3
4.4
4.5
4.6
4.7
4.8
4.9
5.0
6.0
7.0
8.0
9.0
at-3.4
at-3.5
at-3.6
at-master
baserock/3.3.0
baserock/morph/2.7
baserock/v3.6.1
csa-3.3
csa-3.4
csa-3.5
csa-3.6
csa-master
drafts/for/4.3
drafts/for/master
master
qds-1.50
qds-1.59
qds-2.3
qds-3.0
qds-3.1
qds-3.2
qds-3.3
qds-3.4
qds-3.5
qds-3.6
qds-3.7
qds/3.8
qds/3.9
qds/4.0
qds/4.1
qds/dev
qmlprojectstorage
qp-2.8
qp-3.0
qp-3.1
qp-3.2
qp-3.3
qp-3.4
qp-3.5
qp-3.6
qp-master
refsfor/3.0
wip/at-squish
wip/boostbuildprojectmanager
wip/clang
wip/clang-oop
wip/clang-query
wip/qbs
wip/vcproj
wip/winrt
code.qt.io: qt-creator/qt-creator.git
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
src
/
plugins
/
git
/
mergetool.cpp
Commit message (
Expand
)
Author
Age
Files
Lines
*
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
*
Git: Suggest continuing rebase after conflicts are resolved
Orgad Shaneh
2012-11-16
1
-2
/
+14
*
Git: Write mergetool input/output to VCS output window
Orgad Shaneh
2012-11-16
1
-3
/
+39
*
Git: Introduce MergeTool support
Orgad Shaneh
2012-11-07
1
-0
/
+232
