1.2 release

lesfurets · Feb 16, 2016 · c239e86 · c239e86
1 parent 2746b20
commit c239e86
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/doc/git-conflict.1 b/doc/git-conflict.1
@@ -2,12 +2,12 @@
 .\"     Title: git-conflict
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 12/28/2015
+.\"      Date: 02/16/2016
 .\"    Manual: git-octopus suit Manual
-.\"    Source: git-octopus 1.1.1
+.\"    Source: git-octopus 1.2
 .\"  Language: English
 .\"
-.TH "GIT\-CONFLICT" "1" "12/28/2015" "git\-octopus 1\&.1\&.1" "git\-octopus suit Manual"
+.TH "GIT\-CONFLICT" "1" "02/16/2016" "git\-octopus 1\&.2" "git\-octopus suit Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

diff --git a/doc/git-conflict.html b/doc/git-conflict.html
@@ -847,7 +847,7 @@ <h2 id="_git_octopus">GIT-OCTOPUS</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-12-28 21:52:58 CET
+Last updated 2016-02-16 23:10:14 CET
 </div>
 </div>
 </body>

diff --git a/doc/git-octopus.1 b/doc/git-octopus.1
@@ -2,12 +2,12 @@
 .\"     Title: git-octopus
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 12/28/2015
+.\"      Date: 02/16/2016
 .\"    Manual: git-octopus suit Manual
-.\"    Source: git-octopus 1.1.1
+.\"    Source: git-octopus 1.2
 .\"  Language: English
 .\"
-.TH "GIT\-OCTOPUS" "1" "12/28/2015" "git\-octopus 1\&.1\&.1" "git\-octopus suit Manual"
+.TH "GIT\-OCTOPUS" "1" "02/16/2016" "git\-octopus 1\&.2" "git\-octopus suit Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

diff --git a/doc/git-octopus.html b/doc/git-octopus.html
@@ -841,7 +841,7 @@ <h2 id="_git_octopus">GIT-OCTOPUS</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-12-28 22:09:26 CET
+Last updated 2016-02-16 23:10:24 CET
 </div>
 </div>
 </body>

diff --git a/src/doc/git-conflict.1.txt b/src/doc/git-conflict.1.txt
@@ -1,6 +1,6 @@
 :man manual:   git-octopus suit Manual
 :man source:   git-octopus
-:man version:  1.1.1
+:man version:  1.2
 
 git-conflict(1)
 ==============

diff --git a/src/doc/git-octopus.1.txt b/src/doc/git-octopus.1.txt
@@ -1,6 +1,6 @@
 :man manual:   git-octopus suit Manual
 :man source:   git-octopus
-:man version:  1.1.1
+:man version:  1.2
 
 git-octopus(1)
 ==============

diff --git a/src/git-octopus b/src/git-octopus
@@ -42,7 +42,7 @@ while getopts "nhvc" opt; do
       doCommit=true
       ;;
     v)
-      echo "1.1.1"
+      echo "1.2"
       exit 0
       ;;
     \?)
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ while getopts "nhvc" opt; do @@
           doCommit=true
           ;;
         v)
-          echo "1.1.1"
+          echo "1.2"
           exit 0
           ;;
         \?)
@@ Expand Down @@