diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-07 09:07:15 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-07 09:07:15 -0500 |
| commit | 56a687d1730ef09284dae86435e788d5c5b63b54 (patch) | |
| tree | 8c40e8c227c1b278969127bd6afe5e35d94725bb /Utilities/Git | |
| parent | 2210e5fd0e817113ebc677f7a4098b6fb47a2863 (diff) | |
| parent | 68579cd6d99063483af66b921a68ba9304d055cf (diff) | |
| download | cmake-56a687d1730ef09284dae86435e788d5c5b63b54.tar.gz | |
Merge topic 'import-KWSys-subtree'
68579cd Merge branch 'upstream-kwsys' into import-KWSys-subtree
cd83da9 KWSys 2012-11-05 (df32fa6f)
3517106 CTestCustom: Suppress LNK4089 warning about PSAPI
5c63fa3 Merge branch 'ctest-SUBMIT_INDEX-cdash' into import-KWSys-subtree
17fb60b Merge branch 'upstream-kwsys' into import-KWSys-subtree
7ae44db KWSys 2012-10-16 (b7a97ac3)
97c9887 pre-commit: Update KWSys rejection message for new workflow
3db0b51 KWSys: Submit dashboard builds to PublicDashboard
4b8d363 Merge branch 'upstream-kwsys' into import-KWSys-subtree
a61f633 Merge branch 'master' into import-KWSys-subtree
8c55ea0 Merge branch 'upstream-kwsys' into import-KWSys-subtree
5d0de36 KWSys 2012-10-01 (bab53989)
7d3c295 KWSys 2012-05-02 (719638e2)
Diffstat (limited to 'Utilities/Git')
| -rwxr-xr-x | Utilities/Git/pre-commit | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Utilities/Git/pre-commit b/Utilities/Git/pre-commit index d308a81b5d..a35d111025 100755 --- a/Utilities/Git/pre-commit +++ b/Utilities/Git/pre-commit @@ -47,18 +47,16 @@ if test -z "$HOOKS_ALLOW_KWSYS"; then '"$(echo "$files" | sed 's/^/ /')"' -cannot be committed through Git. KWSys is kept in a CVS repository -shared by several projects. A robot replays changes committed there -into the Source/kwsys directory in CMake. Please send changes to -this directory separately. Run +should not be made directly in CMake. KWSys is kept in its own Git +repository and shared by several projects. Please visit - git reset HEAD -- Source/kwsys + http://public.kitware.com/Wiki/KWSys/Git -to unstage these changes and then +to contribute changes directly to KWSys. Run - git diff -- Source/kwsys > kwsys.patch + git reset HEAD -- Source/kwsys -to construct the patch. Alternatively, set environment variable +to unstage these changes. Alternatively, set environment variable HOOKS_ALLOW_KWSYS=1 |