diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-29 13:50:59 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-29 13:52:49 +0100 |
commit | 76e16b228e0cd76c152f07e249d0e02f800cbd2d (patch) | |
tree | 5f4d93f12b6af2b1a4926a13d5782e32f9316c8d /.commit-template | |
parent | 4b256e249bbbc3285ec1e9dd971278ca53a957bb (diff) | |
parent | 604f330cd22bcb044f43bcd7ce6f4fe0ed2fe057 (diff) |
Merge branch 'stable' into dev
Conflicts:
qtactiveqt
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtwinextras
qtx11extras
qtxmlpatterns
Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
Diffstat (limited to '.commit-template')
-rw-r--r-- | .commit-template | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.commit-template b/.commit-template index 0aef528f..813ca689 100644 --- a/.commit-template +++ b/.commit-template @@ -4,10 +4,10 @@ # ==[ Details: Describe what changed and explain why it changed ]======| -# ==[ Footers: Uncomment and edit where applicable ]===================| -# # Change log entry (see below for instructions). #[ChangeLog][][] + +# ==[ Footers: Uncomment and edit where applicable ]===================| # # One task per entry. Remember space after colon. #Task-number: @@ -22,7 +22,8 @@ # Change log entry: If this commit adds a significant feature, fixes an # issue or contains a behavior change that is relevant to others, # add a change log entry. It can be multiple lines long and ends with an -# empty newline. +# empty newline. Try to integrate it into the flow of the commit message +# to avoid redundancy. # Use the module name to indicate the area of the change e.g. [QtCore]. # Optionally specify a class or subtopic [QtNetwork][QSslSocket]. # Other common tags are: [General], [Important Behavior Changes], |