Change markdowns tags to not met git conflicts markers accidentaly

Adding a validating script for git conflict marks

Moving to Github flavored markdown titles

Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
This commit is contained in:
Damien DUPORTAL 2015-01-25 11:19:00 +01:00
parent 6522431978
commit 63fb06cd0b
3 changed files with 28 additions and 7 deletions

View File

@ -298,7 +298,6 @@ run:
If you have any questions we're in #docker-machine on Freenode. If you have any questions we're in #docker-machine on Freenode.
=======
## Integration Tests ## Integration Tests
There is a suite of integration tests that will run for the drivers. In order There is a suite of integration tests that will run for the drivers. In order
to use these you must export the corresponding environment variables for each to use these you must export the corresponding environment variables for each

View File

@ -1,15 +1,13 @@
Roadmap # Roadmap
=======
Machine 1.0
----------- ## Machine 1.0
This will be a stable version of the current design with additional drivers and complete documentation. This will be a stable version of the current design with additional drivers and complete documentation.
You can follow progress towards this release with the [GitHub milestone](https://github.com/docker/machine/milestones/1.0). You can follow progress towards this release with the [GitHub milestone](https://github.com/docker/machine/milestones/1.0).
Future ## Future
------
There are two main areas for future development: There are two main areas for future development:

24
script/validate-git-marks Executable file
View File

@ -0,0 +1,24 @@
#!/bin/sh
IN_MARK=$(grep -r "^<<<<<<<" *)
if [ $? -eq 0 ]; then
echo "-- Git conflict marks have been found, please correct them :"
echo "$IN_MARK"
exit 1
fi
OUT_MARK=$(grep -r "^>>>>>>>" *)
if [ $? -eq 0 ]; then
echo "-- Git conflict marks have been found, please correct them :"
echo "$OUT_MARK"
exit 1
fi
SEPARATE_MARK=$(grep -r "^=======$" *)
if [ $? -eq 0 ]; then
echo "-- Git conflict marks have been found, please correct them :"
echo "$SEPARATE_MARK"
exit 1
fi
echo "-- Congratulations : no git conflict marks have been found !"