summaryrefslogtreecommitdiffstats
path: root/bin/git-qt-grafts
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersJani Heikkinen2015-02-111-2/+2
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: If3c8d221bcf8e5010048ed5f1c50cd35c04e7199 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Create .git/info directory if it does not exist before graftingDavid Edmundson2014-03-111-0/+2
| | | | | | | | | When cloning a new repository the directory .git/info does not always exist. This change ensures this directory is always created before trying to write to a file in that directory. Change-Id: I9488caa7c4d0d80588ba880bee3bf9d8c11cca92 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* update copyright yearOswald Buddenhagen2013-02-111-1/+1
| | | | | Change-Id: I670423c6001e2a504df8be80b42ee88566ad3baa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyright info from Nokia to DigiaSergio Ahumada2012-11-281-2/+2
| | | | | Change-Id: I1cec04e8763c6102b485638058df37d9093ed859 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie3419ce67907b27514e493aa123e4e266b0f59aa Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-111-1/+1
| | | | | | | | Update copyright headers from before 2011. Change-Id: I69f1bd05becc281b9e274c7b13eb830ebf5c80d6 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Workaround a missing flag in older versions of Git.axis2011-05-121-1/+1
| | | | | | | | Somewhere between version 1.7.0 and 1.7.3, the %B flag was introduced. However, %b works equally well in both versions so let's use that instead. Done-with: Jason McDonald
* Several fixes to the git-qt-graft script.axis2011-05-091-14/+26
| | | | | | | | | | | | - Switch away from using globally namespaced file descriptors. - Made sure that existing alternates in the history repo are copied over to the new repo. - Made nonexisting graft objects non-fatal. They will just be skipped. Done-with: Jiang Jiang
* Made git-qt-grafts follow existing grafts in the history repository.axis2011-05-031-5/+16
| | | | | | | This allows history to go back even further, by respecting grafts inside the history repository. Reviewed-by: Olivier Goffart
* Several fixes to the git-qt-grafts script.axis2011-04-281-33/+56
| | | | | | | | | | | | | - Handle several graft points. This is important because master and qtquick2 were both modularized separately. - Preserve existing commit parents. This is important so that history properly displays which branch changes came from. Without this it would look like master and qtquick2 both were modularized separately. What we want is that it looks like master was modularized, and qtquick2 just merged those changes in. - Some other small fixes here and there. Reviewed by: Marius Storm-Olsen
* Add script to graft a repo based on commit messageMarius Storm-Olsen2011-04-281-0/+138