index
:
delta/qt5/qtrepotools.git
devscripts-master
master
code.qt.io: qt/qtrepotools.git
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
bin
/
git-qt-merge-mainlines
Commit message (
Expand
)
Author
Age
Files
Lines
*
git-qt-merge-mainlines: find related changes for conflicts
Liang Qi
2016-11-21
1
-0
/
+61
*
git-qt-merge-mainlines: add wip feature
Liang Qi
2016-11-07
1
-3
/
+57
*
git-qt-merge-mainlines: split some long lines
Edward Welbourne
2016-07-05
1
-11
/
+22
*
git-qt-merge-mainlines: write pythonically
Edward Welbourne
2016-07-05
1
-12
/
+11
*
git-qt-merge-mainlines: reverse a condition to ease reading
Edward Welbourne
2016-07-05
1
-3
/
+3
*
git-qt-merge-mainlines: group the action arguments
Edward Welbourne
2016-07-05
1
-5
/
+6
*
git-qt-merge-mainlines: no need for separate Config class
Edward Welbourne
2016-07-05
1
-6
/
+3
*
git-qt-merge-mainlines: skip type=str (the default) from parser options
Edward Welbourne
2016-07-04
1
-4
/
+4
*
git-qt-merge-mainlines: shuffle code to make --help a clean no-op
Edward Welbourne
2016-07-04
1
-8
/
+15
*
Obtain sha1s from supermodule instead of using branch tips
Liang Qi
2016-05-06
1
-10
/
+35
*
Update copyright headers
Jani Heikkinen
2015-02-11
1
-2
/
+2
*
Unify use of shebang line to invoke tools
Samuel Gaist
2015-01-16
1
-1
/
+1
*
Add mergetool option to merge script
Frederik Gladhorn
2014-10-21
1
-1
/
+7
*
Fix submodule merge script
Frederik Gladhorn
2014-10-13
1
-1
/
+4
*
Fix qt-git-merge-mainlines to deal with submodules dynamically
Frederik Gladhorn
2014-09-07
1
-32
/
+22
*
git-qt-merge-mainlines: Add qtwebsockets to the default list
Sergio Ahumada
2014-02-25
1
-0
/
+1
*
Add qtenginio to merge mainlines script
Frederik Gladhorn
2014-01-06
1
-0
/
+1
*
Be more robust when a module fails to merge
Frederik Gladhorn
2013-11-28
1
-17
/
+25
*
git-qt-merge-mainlines: Add qtandroidextras to the default list
Sergio Ahumada
2013-09-24
1
-0
/
+1
*
git-qt-merge-mainlines: Add some new modules to the default list
Sergio Ahumada
2013-09-23
1
-0
/
+4
*
git-qt-merge-mainlines: Remove qtjsbackend module from the list
Sergio Ahumada
2013-09-11
1
-1
/
+0
*
Fix --list-modules arg to do as advertised
Frederik Gladhorn
2013-08-12
1
-1
/
+2
*
Import the print function from __future__
Frederik Gladhorn
2013-08-12
1
-0
/
+2
*
git-qt-merge: Use #!/usr/bin/env instead of #!/usr/bin/python3
Sergio Ahumada
2013-08-02
1
-1
/
+4
*
Add script to help merging
Frederik Gladhorn
2013-07-01
1
-0
/
+214
