1.4 release

lesfurets · Nov 18, 2016 · d8dd4ea · d8dd4ea
1 parent b98f82a
commit d8dd4ea
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 13 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 07/27/2016
+.\"      Date: 11/18/2016
 .\"    Manual: git-octopus suit Manual
-.\"    Source: git-octopus 1.3
+.\"    Source: git-octopus 1.4
 .\"  Language: English
 .\"
-.TH "GIT\-CONFLICT" "1" "07/27/2016" "git\-octopus 1\&.3" "git\-octopus suit Manual"
+.TH "GIT\-CONFLICT" "1" "11/18/2016" "git\-octopus 1\&.4" "git\-octopus suit Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

diff --git a/doc/git-conflict.html b/doc/git-conflict.html
@@ -857,7 +857,7 @@ <h2 id="_git_octopus">GIT-OCTOPUS</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-07-27 15:49:10 CEST
+Last updated 2016-11-18 15:17:46 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 07/27/2016
+.\"      Date: 11/18/2016
 .\"    Manual: git-octopus suit Manual
-.\"    Source: git-octopus 1.3
+.\"    Source: git-octopus 1.4
 .\"  Language: English
 .\"
-.TH "GIT\-OCTOPUS" "1" "07/27/2016" "git\-octopus 1\&.3" "git\-octopus suit Manual"
+.TH "GIT\-OCTOPUS" "1" "11/18/2016" "git\-octopus 1\&.4" "git\-octopus suit Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -32,7 +32,7 @@ git-octopus \- extends git\-merge with branch naming patterns\&.
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit octopus\fR [\-n|\-c] [\-s <n>] [<pattern>\&...]
+\fIgit octopus\fR [\-n|\-c] [\-s <n>] [\-e <pattern>] [<pattern>\&...]
 \fIgit octopus\fR \-v
 .fi
 .SH "DESCRIPTION"
@@ -63,6 +63,11 @@ set to false\&. Use this option to override the latter\&.
 Chunk mode: the merge is performed by subsets of <n> branches\&. This is meant to help reading the log graph when lots of branches are merged\&.
 .RE
 .PP
+\-e <pattern>
+.RS 4
+Exclude pattern: the merge excludes branches matching the <pattern>\&.
+.RE
+.PP
 \-v
 .RS 4
 Prints the version of
@@ -106,6 +111,13 @@ Defines a branch naming pattern that
 would use by default\&. Use multiple lines to define several patterns\&. See
 git\-config(1)\&.
 .RE
+.PP
+octopus\&.excludePattern
+.RS 4
+Defines a branch naming pattern that
+\fIgit octopus\fR
+will exclude by default\&.
+.RE
 .SH "SEE ALSO"
 .sp
 git\-merge(1), git\-ls\-remote(1), git\-conflict(1)\&.

diff --git a/doc/git-octopus.html b/doc/git-octopus.html
@@ -748,7 +748,7 @@ <h2>NAME</h2>
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git octopus</em> [-n|-c] [-s &lt;n&gt;] [&lt;pattern&gt;&#8230;]
+<pre class="content"><em>git octopus</em> [-n|-c] [-s &lt;n&gt;] [-e &lt;pattern&gt;] [&lt;pattern&gt;&#8230;]
 <em>git octopus</em> -v</pre>
 <div class="attribution">
 </div></div>
@@ -787,6 +787,12 @@ <h2 id="_options">OPTIONS</h2>
 <div class="paragraph"><p>Chunk mode: the merge is performed by subsets of &lt;n&gt; branches. This is meant to help reading the log graph when lots of branches are merged.</p></div>
 </dd>
 <dt class="hdlist1">
+-e &lt;pattern&gt;
+</dt>
+<dd>
+<div class="paragraph"><p>Exclude pattern: the merge excludes branches matching the &lt;pattern&gt;.</p></div>
+</dd>
+<dt class="hdlist1">
 -v
 </dt>
 <dd>
@@ -828,6 +834,12 @@ <h2 id="_configuration">CONFIGURATION</h2>
 <dd>
 <div class="paragraph"><p>Defines a branch naming pattern that <em>git octopus</em> would use by default. Use multiple lines to define several patterns. See <a href="git-config.html">git-config(1)</a>.</p></div>
 </dd>
+<dt class="hdlist1">
+octopus.excludePattern
+</dt>
+<dd>
+<div class="paragraph"><p>Defines a branch naming pattern that <em>git octopus</em> will exclude by default.</p></div>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -847,7 +859,7 @@ <h2 id="_git_octopus">GIT-OCTOPUS</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-07-27 15:49:15 CEST
+Last updated 2016-11-18 15:17:57 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.3
+:man version:  1.4
 
 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.3
+:man version:  1.4
 
 git-octopus(1)
 ==============

diff --git a/src/git-octopus b/src/git-octopus
@@ -56,7 +56,7 @@ while getopts "nhvcs:e:" opt; do
       doCommit=true
       ;;
     v)
-      echo "1.3"
+      echo "1.4"
       exit 0
       ;;
     s)
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ while getopts "nhvcs:e:" opt; do @@
           doCommit=true
           ;;
         v)
-          echo "1.3"
+          echo "1.4"
           exit 0
           ;;
         s)
@@ Expand Down @@