diff options
Diffstat (limited to 'plugins/git4idea/src/git4idea/config/GitVcsPanel.form')
| -rw-r--r-- | plugins/git4idea/src/git4idea/config/GitVcsPanel.form | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.form b/plugins/git4idea/src/git4idea/config/GitVcsPanel.form index 0f24aaf99d56..87d3578f7c0a 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.form +++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.form @@ -91,7 +91,7 @@ <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/> </constraints> </vspacer> - <grid id="4d15a" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <grid id="4d15a" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> @@ -134,6 +134,15 @@ <text value="Warn if &CRLF line separators are about to be committed"/> </properties> </component> + <component id="29d5c" class="javax.swing.JCheckBox" binding="myWarnAboutDetachedHead"> + <constraints> + <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> + </constraints> + <properties> + <selected value="true"/> + <text value="Warn when committing in detached HEAD or during rebase"/> + </properties> + </component> </children> </grid> </children> |