fake 1.40.5.0 → 1.42.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. data/docs/Fake.Git/AssemblyInfo.htm +5 -1
  2. data/docs/Fake.Git/Branches.htm +12 -48
  3. data/docs/Fake.Git/CommandHelper.htm +5 -1
  4. data/docs/Fake.Git/CommitMessage.htm +15 -3
  5. data/docs/Fake.Git/FileStatus.htm +30 -2
  6. data/docs/Fake.Git/Information.htm +5 -1
  7. data/docs/Fake.Git/Merge.htm +45 -3
  8. data/docs/Fake.Git/MergeType.htm +5 -1
  9. data/docs/Fake.Git/Rebase.htm +141 -0
  10. data/docs/Fake.Git/Repository.htm +5 -1
  11. data/docs/Fake.Git/Reset.htm +5 -1
  12. data/docs/Fake.Git/ReturnException183c26a427ae489c8fd92ec21a0c9a59.htm +5 -1
  13. data/docs/Fake.Git/ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59.htm +5 -1
  14. data/docs/Fake.Git/SHA1.htm +5 -1
  15. data/docs/Fake.Git/SanityChecks.htm +5 -1
  16. data/docs/Fake.Git/Staging.htm +5 -1
  17. data/docs/Fake.Git/Stash.htm +115 -0
  18. data/docs/Fake.Git/Submodule.htm +5 -1
  19. data/docs/Fake.Git/Tags.htm +5 -1
  20. data/docs/Fake.Git/index.htm +7 -1
  21. data/docs/Fake.MSBuild/SpecsRemovement.htm +4 -4
  22. data/docs/Fake.MSBuild/index.htm +1 -1
  23. data/docs/Fake.SQL/AssemblyInfo.htm +1 -1
  24. data/docs/Fake.SQL/ReturnException183c26a427ae489c8fd92ec21a0c9a59.htm +1 -1
  25. data/docs/Fake.SQL/ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59.htm +1 -1
  26. data/docs/Fake.SQL/ServerInfo.htm +1 -1
  27. data/docs/Fake.SQL/SqlServer.htm +1 -1
  28. data/docs/Fake.SQL/index.htm +1 -1
  29. data/docs/Fake/AssemblyInfoHelper.htm +19 -5
  30. data/docs/Fake/AssemblyInfoParams.htm +19 -5
  31. data/docs/Fake/AsyncHelper.htm +19 -5
  32. data/docs/Fake/Build.htm +19 -5
  33. data/docs/Fake/BuildConfiguration.htm +19 -5
  34. data/docs/Fake/BuildServer.htm +19 -5
  35. data/docs/Fake/BuildServerHelper.htm +23 -9
  36. data/docs/Fake/CacheHelper.htm +19 -5
  37. data/docs/Fake/CodeLanguage.htm +19 -5
  38. data/docs/Fake/ConsoleTraceListener.htm +193 -0
  39. data/docs/Fake/DocuHelper.htm +19 -5
  40. data/docs/Fake/DocuParams.htm +19 -5
  41. data/docs/Fake/EnvironmentHelper.htm +19 -5
  42. data/docs/Fake/Event.htm +19 -5
  43. data/docs/Fake/ExecParams.htm +19 -5
  44. data/docs/Fake/FSIHelper.htm +21 -7
  45. data/docs/Fake/FileHelper.htm +19 -5
  46. data/docs/Fake/FileIncludes.htm +19 -5
  47. data/docs/Fake/FileSetHelper.htm +19 -5
  48. data/docs/Fake/FileSystemHelper.htm +19 -5
  49. data/docs/Fake/FxCopErrorLevel.htm +19 -5
  50. data/docs/Fake/FxCopHelper.htm +19 -5
  51. data/docs/Fake/FxCopParams.htm +19 -5
  52. data/docs/Fake/GemHelper.htm +285 -0
  53. data/docs/Fake/GemParams.htm +284 -0
  54. data/docs/Fake/HTMLHelpWorkShopHelper.htm +19 -5
  55. data/docs/Fake/ILMergeHelper.htm +19 -5
  56. data/docs/Fake/ILMergeParams.htm +19 -5
  57. data/docs/Fake/ITraceListener.htm +206 -0
  58. data/docs/Fake/MSBuildHelper.htm +19 -5
  59. data/docs/Fake/MailBoxHelper.htm +20 -26
  60. data/docs/Fake/{TraceMessage.htm → MailboxMessage.htm} +29 -15
  61. data/docs/Fake/MessageHelper.htm +19 -5
  62. data/docs/Fake/NAntXmlTraceListener.htm +193 -0
  63. data/docs/Fake/NCoverHelper.htm +19 -5
  64. data/docs/Fake/NCoverParams.htm +19 -5
  65. data/docs/Fake/NUnitHelper.htm +19 -5
  66. data/docs/Fake/NUnitParams.htm +19 -5
  67. data/docs/Fake/PostMethod.htm +19 -5
  68. data/docs/Fake/ProcessHelper.htm +28 -6
  69. data/docs/Fake/Project.htm +19 -5
  70. data/docs/Fake/REST.htm +19 -5
  71. data/docs/Fake/RegexEntry.htm +19 -5
  72. data/docs/Fake/RegistryBaseKey.htm +19 -5
  73. data/docs/Fake/RegistryHelper.htm +19 -5
  74. data/docs/Fake/{BuildError.htm → SCPHelper.htm} +36 -44
  75. data/docs/Fake/{Message.htm → SCPParams.htm} +30 -31
  76. data/docs/Fake/StringHelper.htm +19 -5
  77. data/docs/Fake/Tags.htm +108 -6
  78. data/docs/Fake/TargetHelper.htm +37 -15
  79. data/docs/Fake/TargetTemplate`1.htm +19 -5
  80. data/docs/Fake/TeamCityHelper.htm +28 -6
  81. data/docs/Fake/TeamCityRESTHelper.htm +19 -5
  82. data/docs/Fake/TemplateHelper.htm +19 -5
  83. data/docs/Fake/TestCase.htm +19 -5
  84. data/docs/Fake/TestSuite.htm +19 -5
  85. data/docs/Fake/TimeoutHelper.htm +19 -5
  86. data/docs/Fake/TraceData.htm +404 -0
  87. data/docs/Fake/TraceHelper.htm +27 -34
  88. data/docs/Fake/TraceListener.htm +234 -0
  89. data/docs/Fake/TraceMode.htm +19 -5
  90. data/docs/Fake/VCSRoot.htm +19 -5
  91. data/docs/Fake/VSSHelper.htm +19 -5
  92. data/docs/Fake/WiXHelper.htm +19 -5
  93. data/docs/Fake/WiXParams.htm +19 -5
  94. data/docs/Fake/XCopyHelper.htm +19 -5
  95. data/docs/Fake/XMLHelper.htm +19 -5
  96. data/docs/Fake/XUnitHelper.htm +19 -5
  97. data/docs/Fake/XUnitParams.htm +19 -5
  98. data/docs/Fake/ZipHelper.htm +19 -5
  99. data/docs/Fake/index.htm +32 -8
  100. data/docs/FakeLib/AssemblyInfo.htm +1 -1
  101. data/docs/FakeLib/ReturnException183c26a427ae489c8fd92ec21a0c9a59.htm +1 -1
  102. data/docs/FakeLib/ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59.htm +1 -1
  103. data/docs/FakeLib/index.htm +1 -1
  104. data/docs/index.htm +2 -2
  105. data/lib/FAKE.exe +0 -0
  106. data/lib/Fake.Git.XML +100 -42
  107. data/lib/Fake.Git.dll +0 -0
  108. data/lib/Fake.SQL.dll +0 -0
  109. data/lib/FakeLib.XML +244 -75
  110. data/lib/FakeLib.dll +0 -0
  111. data/lib/docu.exe +0 -0
  112. data/lib/readme.markdown +271 -0
  113. metadata +130 -126
  114. data/lib/readme.txt +0 -65
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -80,7 +84,7 @@
80
84
 
81
85
 
82
86
  <div id="footer">
83
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
87
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
84
88
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
85
89
  </div>
86
90
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -73,12 +77,9 @@
73
77
 
74
78
 
75
79
  <h3 class="section">Methods</h3>
76
- <ul><li><a href="../Fake.Git/Branches.htm#checkout">checkout</a></li><li><a href="../Fake.Git/Branches.htm#checkoutBranch">checkoutBranch</a></li><li><a href="../Fake.Git/Branches.htm#checkoutNewBranch">checkoutNewBranch</a></li><li><a href="../Fake.Git/Branches.htm#checkoutTracked``1">checkoutTracked&lt;a&gt;</a></li><li><a href="../Fake.Git/Branches.htm#compareBranches">compareBranches</a></li><li><a href="../Fake.Git/Branches.htm#createBranch">createBranch</a></li><li><a href="../Fake.Git/Branches.htm#deleteBranch">deleteBranch</a></li><li><a href="../Fake.Git/Branches.htm#deleteTag">deleteTag</a></li><li><a href="../Fake.Git/Branches.htm#findMergeBase">findMergeBase</a></li><li><a href="../Fake.Git/Branches.htm#getAllBranches">getAllBranches</a></li><li><a href="../Fake.Git/Branches.htm#getLocalBranches">getLocalBranches</a></li><li><a href="../Fake.Git/Branches.htm#getRemoteBranches">getRemoteBranches</a></li><li><a href="../Fake.Git/Branches.htm#getSHA1">getSHA1</a></li><li><a href="../Fake.Git/Branches.htm#merge">merge</a></li><li><a href="../Fake.Git/Branches.htm#pull">pull</a></li><li><a href="../Fake.Git/Branches.htm#push">push</a></li><li><a href="../Fake.Git/Branches.htm#rebase">rebase</a></li><li><a href="../Fake.Git/Branches.htm#revisionsBetween">revisionsBetween</a></li><li><a href="../Fake.Git/Branches.htm#tag">tag</a></li>
80
+ <ul><li><a href="../Fake.Git/Branches.htm#checkout">checkout</a></li><li><a href="../Fake.Git/Branches.htm#checkoutBranch">checkoutBranch</a></li><li><a href="../Fake.Git/Branches.htm#checkoutNewBranch">checkoutNewBranch</a></li><li><a href="../Fake.Git/Branches.htm#checkoutTracked``1">checkoutTracked&lt;a&gt;</a></li><li><a href="../Fake.Git/Branches.htm#createBranch">createBranch</a></li><li><a href="../Fake.Git/Branches.htm#deleteBranch">deleteBranch</a></li><li><a href="../Fake.Git/Branches.htm#deleteTag">deleteTag</a></li><li><a href="../Fake.Git/Branches.htm#findMergeBase">findMergeBase</a></li><li><a href="../Fake.Git/Branches.htm#getAllBranches">getAllBranches</a></li><li><a href="../Fake.Git/Branches.htm#getLocalBranches">getLocalBranches</a></li><li><a href="../Fake.Git/Branches.htm#getRemoteBranches">getRemoteBranches</a></li><li><a href="../Fake.Git/Branches.htm#getSHA1">getSHA1</a></li><li><a href="../Fake.Git/Branches.htm#pull">pull</a></li><li><a href="../Fake.Git/Branches.htm#push">push</a></li><li><a href="../Fake.Git/Branches.htm#revisionsBetween">revisionsBetween</a></li><li><a href="../Fake.Git/Branches.htm#tag">tag</a></li>
77
81
  </ul>
78
82
 
79
- <h3 class="section">Properties</h3>
80
- <ul><li><a href="../Fake.Git/Branches.htm#FastForwardFlag">FastForwardFlag</a></li><li><a href="../Fake.Git/Branches.htm#NoFastForwardFlag">NoFastForwardFlag</a></li>
81
- </ul>
82
83
 
83
84
  </div>
84
85
 
@@ -105,7 +106,13 @@
105
106
  <h4><span title="System.void">void</span> <strong>checkoutNewBranch</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> baseBranch, <span title="System.string">string</span> branch)</h4>
106
107
  <div class="content">Creates a new branch based on the given baseBranch and checks it out to the working copy
107
108
 
109
+ <div class="parameters">
110
+ <h5>Parameters</h5>
108
111
 
112
+ <h6><code><span title="System.string">string</span></code> repositoryDir</h6><p class="comments">The repository directory.</p>
113
+ <h6><code><span title="System.string">string</span></code> baseBranch</h6><p class="comments">The base branch.</p>
114
+ <h6><code><span title="System.string">string</span></code> branch</h6><p class="comments">The new branch.</p>
115
+ </div>
109
116
 
110
117
 
111
118
  </div>
@@ -116,21 +123,6 @@
116
123
 
117
124
 
118
125
 
119
- </div>
120
- </div><div id="compareBranches" class="method">
121
- <h4><a href="../Fake.Git/MergeType.htm">MergeType</a> <strong>compareBranches</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> local, <span title="System.string">string</span> remote)</h4>
122
- <div class="content">Tests whether branches and their "origin" counterparts have diverged and need
123
- merging first.
124
-
125
- <div class="parameters">
126
- <h5>Parameters</h5>
127
-
128
- <h6><code><span title="System.string">string</span></code> repositoryDir</h6><p class="comments">The path to the repository.</p>
129
- <h6><code><span title="System.string">string</span></code> local</h6><p class="comments">The local branch name.</p>
130
- <h6><code><span title="System.string">string</span></code> remote</h6><p class="comments">The remote branch name.</p>
131
- </div>
132
-
133
-
134
126
  </div>
135
127
  </div><div id="createBranch" class="method">
136
128
  <h4><span title="System.void">void</span> <strong>createBranch</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> newBranchName, <span title="System.string">string</span> fromCommit)</h4>
@@ -195,14 +187,6 @@ merging first.
195
187
 
196
188
 
197
189
 
198
- </div>
199
- </div><div id="merge" class="method">
200
- <h4><span title="System.void">void</span> <strong>merge</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> flags, <span title="System.string">string</span> branch)</h4>
201
- <div class="content">Performs a merge of the given branch with the current branch
202
-
203
-
204
-
205
-
206
190
  </div>
207
191
  </div><div id="pull" class="method">
208
192
  <h4><span title="System.void">void</span> <strong>pull</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> remote, <span title="System.string">string</span> branch)</h4>
@@ -219,14 +203,6 @@ merging first.
219
203
 
220
204
 
221
205
 
222
- </div>
223
- </div><div id="rebase" class="method">
224
- <h4><span title="System.void">void</span> <strong>rebase</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> onTopOfBranch)</h4>
225
- <div class="content">Performs a rebase on top of the given branch with the current branch
226
-
227
-
228
-
229
-
230
206
  </div>
231
207
  </div><div id="revisionsBetween" class="method">
232
208
  <h4><span title="System.int">int</span> <strong>revisionsBetween</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> branch1, <span title="System.string">string</span> branch2)</h4>
@@ -246,20 +222,8 @@ merging first.
246
222
  </div>
247
223
  </div>
248
224
 
249
- <h3 class="section">Public properties</h3>
250
- <div id="FastForwardFlag" class="method">
251
- <h4><span title="System.string">string</span> <strong>FastForwardFlag</strong> get; </h4>
252
- <div class="content">
253
-
254
- </div>
255
- </div><div id="NoFastForwardFlag" class="method">
256
- <h4><span title="System.string">string</span> <strong>NoFastForwardFlag</strong> get; </h4>
257
- <div class="content">
258
-
259
- </div>
260
- </div>
261
225
  <div id="footer">
262
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
226
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
263
227
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
264
228
  </div>
265
229
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -188,7 +192,7 @@
188
192
  </div>
189
193
  </div>
190
194
  <div id="footer">
191
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
195
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
192
196
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
193
197
  </div>
194
198
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -73,7 +77,7 @@
73
77
 
74
78
 
75
79
  <h3 class="section">Methods</h3>
76
- <ul><li><a href="../Fake.Git/CommitMessage.htm#getCommitMessageFileInfo">getCommitMessageFileInfo</a></li><li><a href="../Fake.Git/CommitMessage.htm#setMessage">setMessage</a></li>
80
+ <ul><li><a href="../Fake.Git/CommitMessage.htm#getCommitMessage">getCommitMessage</a></li><li><a href="../Fake.Git/CommitMessage.htm#getCommitMessageFileInfo">getCommitMessageFileInfo</a></li><li><a href="../Fake.Git/CommitMessage.htm#setMessage">setMessage</a></li>
77
81
  </ul>
78
82
 
79
83
 
@@ -82,7 +86,15 @@
82
86
 
83
87
 
84
88
  <h3 class="section">Public static methods</h3>
85
- <div id="getCommitMessageFileInfo" class="method">
89
+ <div id="getCommitMessage" class="method">
90
+ <h4><span title="System.string">string</span> <strong>getCommitMessage</strong>(<span title="System.string">string</span> repositoryDir)</h4>
91
+ <div class="content">Gets the commit message
92
+
93
+
94
+
95
+
96
+ </div>
97
+ </div><div id="getCommitMessageFileInfo" class="method">
86
98
  <h4><span title="System.IO.FileInfo">FileInfo</span> <strong>getCommitMessageFileInfo</strong>(<span title="System.string">string</span> repositoryDir)</h4>
87
99
  <div class="content">
88
100
 
@@ -101,7 +113,7 @@
101
113
  </div>
102
114
 
103
115
  <div id="footer">
104
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
116
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
105
117
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
106
118
  </div>
107
119
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -73,7 +77,7 @@
73
77
 
74
78
 
75
79
  <h3 class="section">Methods</h3>
76
- <ul><li><a href="../Fake.Git/FileStatus.htm#cleanWorkingCopy">cleanWorkingCopy</a></li><li><a href="../Fake.Git/FileStatus.htm#CompareTo">CompareTo</a></li><li><a href="../Fake.Git/FileStatus.htm#CompareTo">CompareTo</a></li><li><a href="../Fake.Git/FileStatus.htm#CompareTo">CompareTo</a></li><li><a href="../Fake.Git/FileStatus.htm#Equals">Equals</a></li><li><a href="../Fake.Git/FileStatus.htm#Equals">Equals</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Added">get_Added</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Deleted">get_Deleted</a></li><li><a href="../Fake.Git/FileStatus.htm#get_IsAdded">get_IsAdded</a></li><li><a href="../Fake.Git/FileStatus.htm#get_IsDeleted">get_IsDeleted</a></li><li><a href="../Fake.Git/FileStatus.htm#get_IsModified">get_IsModified</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Modified">get_Modified</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Tag">get_Tag</a></li><li><a href="../Fake.Git/FileStatus.htm#getAllFiles">getAllFiles</a></li><li><a href="../Fake.Git/FileStatus.htm#getChangedFiles">getChangedFiles</a></li><li><a href="../Fake.Git/FileStatus.htm#getChangedFilesInWorkingCopy">getChangedFilesInWorkingCopy</a></li><li><a href="../Fake.Git/FileStatus.htm#getConflictedFiles">getConflictedFiles</a></li><li><a href="../Fake.Git/FileStatus.htm#GetHashCode">GetHashCode</a></li><li><a href="../Fake.Git/FileStatus.htm#isInTheMiddleOfConflictedMerge">isInTheMiddleOfConflictedMerge</a></li>
80
+ <ul><li><a href="../Fake.Git/FileStatus.htm#cleanWorkingCopy">cleanWorkingCopy</a></li><li><a href="../Fake.Git/FileStatus.htm#CompareTo">CompareTo</a></li><li><a href="../Fake.Git/FileStatus.htm#CompareTo">CompareTo</a></li><li><a href="../Fake.Git/FileStatus.htm#CompareTo">CompareTo</a></li><li><a href="../Fake.Git/FileStatus.htm#Equals">Equals</a></li><li><a href="../Fake.Git/FileStatus.htm#Equals">Equals</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Added">get_Added</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Deleted">get_Deleted</a></li><li><a href="../Fake.Git/FileStatus.htm#get_IsAdded">get_IsAdded</a></li><li><a href="../Fake.Git/FileStatus.htm#get_IsDeleted">get_IsDeleted</a></li><li><a href="../Fake.Git/FileStatus.htm#get_IsModified">get_IsModified</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Modified">get_Modified</a></li><li><a href="../Fake.Git/FileStatus.htm#get_Tag">get_Tag</a></li><li><a href="../Fake.Git/FileStatus.htm#getAllFiles">getAllFiles</a></li><li><a href="../Fake.Git/FileStatus.htm#getChangedFiles">getChangedFiles</a></li><li><a href="../Fake.Git/FileStatus.htm#getChangedFilesInWorkingCopy">getChangedFilesInWorkingCopy</a></li><li><a href="../Fake.Git/FileStatus.htm#getConflictedFiles">getConflictedFiles</a></li><li><a href="../Fake.Git/FileStatus.htm#GetHashCode">GetHashCode</a></li><li><a href="../Fake.Git/FileStatus.htm#getRebaseDir">getRebaseDir</a></li><li><a href="../Fake.Git/FileStatus.htm#isInTheMiddleOfConflictedMerge">isInTheMiddleOfConflictedMerge</a></li><li><a href="../Fake.Git/FileStatus.htm#isInTheMiddleOfPatch">isInTheMiddleOfPatch</a></li><li><a href="../Fake.Git/FileStatus.htm#isInTheMiddleOfRebase">isInTheMiddleOfRebase</a></li>
77
81
  </ul>
78
82
 
79
83
  <h3 class="section">Properties</h3>
@@ -230,6 +234,14 @@
230
234
 
231
235
 
232
236
 
237
+ </div>
238
+ </div><div id="getRebaseDir" class="method">
239
+ <h4><span title="System.string">string</span> <strong>getRebaseDir</strong>(<span title="System.string">string</span> repositoryDir)</h4>
240
+ <div class="content">
241
+
242
+
243
+
244
+
233
245
  </div>
234
246
  </div><div id="isInTheMiddleOfConflictedMerge" class="method">
235
247
  <h4><span title="System.bool">bool</span> <strong>isInTheMiddleOfConflictedMerge</strong>(<span title="System.string">string</span> repositoryDir)</h4>
@@ -238,6 +250,22 @@
238
250
 
239
251
 
240
252
 
253
+ </div>
254
+ </div><div id="isInTheMiddleOfPatch" class="method">
255
+ <h4><span title="System.bool">bool</span> <strong>isInTheMiddleOfPatch</strong>(<span title="System.string">string</span> repositoryDir)</h4>
256
+ <div class="content">
257
+
258
+
259
+
260
+
261
+ </div>
262
+ </div><div id="isInTheMiddleOfRebase" class="method">
263
+ <h4><span title="System.bool">bool</span> <strong>isInTheMiddleOfRebase</strong>(<span title="System.string">string</span> repositoryDir)</h4>
264
+ <div class="content">
265
+
266
+
267
+
268
+
241
269
  </div>
242
270
  </div>
243
271
 
@@ -284,7 +312,7 @@
284
312
  </div>
285
313
  </div>
286
314
  <div id="footer">
287
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
315
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
288
316
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
289
317
  </div>
290
318
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -141,7 +145,7 @@
141
145
  </div>
142
146
 
143
147
  <div id="footer">
144
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
148
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
145
149
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
146
150
  </div>
147
151
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm" class="current">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -73,27 +77,65 @@
73
77
 
74
78
 
75
79
  <h3 class="section">Methods</h3>
76
- <ul><li><a href="../Fake.Git/Merge.htm#getMergeMessage">getMergeMessage</a></li>
80
+ <ul><li><a href="../Fake.Git/Merge.htm#compareBranches">compareBranches</a></li><li><a href="../Fake.Git/Merge.htm#getMergeMessage">getMergeMessage</a></li><li><a href="../Fake.Git/Merge.htm#merge">merge</a></li>
77
81
  </ul>
78
82
 
83
+ <h3 class="section">Properties</h3>
84
+ <ul><li><a href="../Fake.Git/Merge.htm#FastForwardFlag">FastForwardFlag</a></li><li><a href="../Fake.Git/Merge.htm#NoFastForwardFlag">NoFastForwardFlag</a></li>
85
+ </ul>
79
86
 
80
87
  </div>
81
88
 
82
89
 
83
90
 
84
91
  <h3 class="section">Public static methods</h3>
85
- <div id="getMergeMessage" class="method">
92
+ <div id="compareBranches" class="method">
93
+ <h4><a href="../Fake.Git/MergeType.htm">MergeType</a> <strong>compareBranches</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> local, <span title="System.string">string</span> remote)</h4>
94
+ <div class="content">Tests whether branches and their "origin" counterparts have diverged and need
95
+ merging first.
96
+
97
+ <div class="parameters">
98
+ <h5>Parameters</h5>
99
+
100
+ <h6><code><span title="System.string">string</span></code> repositoryDir</h6><p class="comments">The path to the repository.</p>
101
+ <h6><code><span title="System.string">string</span></code> local</h6><p class="comments">The local branch name.</p>
102
+ <h6><code><span title="System.string">string</span></code> remote</h6><p class="comments">The remote branch name.</p>
103
+ </div>
104
+
105
+
106
+ </div>
107
+ </div><div id="getMergeMessage" class="method">
86
108
  <h4><span title="System.string">string</span> <strong>getMergeMessage</strong>(<span title="System.string">string</span> repositoryDir)</h4>
87
109
  <div class="content">Gets the current merge message
88
110
 
89
111
 
90
112
 
91
113
 
114
+ </div>
115
+ </div><div id="merge" class="method">
116
+ <h4><span title="System.void">void</span> <strong>merge</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> flags, <span title="System.string">string</span> branch)</h4>
117
+ <div class="content">Performs a merge of the given branch with the current branch
118
+
119
+
120
+
121
+
92
122
  </div>
93
123
  </div>
94
124
 
125
+ <h3 class="section">Public properties</h3>
126
+ <div id="FastForwardFlag" class="method">
127
+ <h4><span title="System.string">string</span> <strong>FastForwardFlag</strong> get; </h4>
128
+ <div class="content">
129
+
130
+ </div>
131
+ </div><div id="NoFastForwardFlag" class="method">
132
+ <h4><span title="System.string">string</span> <strong>NoFastForwardFlag</strong> get; </h4>
133
+ <div class="content">
134
+
135
+ </div>
136
+ </div>
95
137
  <div id="footer">
96
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
138
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
97
139
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
98
140
  </div>
99
141
  </body>
@@ -43,6 +43,8 @@
43
43
  <a href="../Fake.Git/Merge.htm">Merge</a>
44
44
  </li><li>
45
45
  <a href="../Fake.Git/MergeType.htm" class="current">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm">Rebase</a>
46
48
  </li><li>
47
49
  <a href="../Fake.Git/Repository.htm">Repository</a>
48
50
  </li><li>
@@ -57,6 +59,8 @@
57
59
  <a href="../Fake.Git/SHA1.htm">SHA1</a>
58
60
  </li><li>
59
61
  <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
60
64
  </li><li>
61
65
  <a href="../Fake.Git/Submodule.htm">Submodule</a>
62
66
  </li><li>
@@ -217,7 +221,7 @@
217
221
  </div>
218
222
  </div>
219
223
  <div id="footer">
220
- <p>Based on v1.40.5.0 of FAKE - F# Make Git Lib</p>
224
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
221
225
  <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
222
226
  </div>
223
227
  </body>
@@ -0,0 +1,141 @@
1
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
2
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
3
+ <head>
4
+ <title>Rebase - FAKE - F# Make Git Lib Documentation</title>
5
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
6
+ <link type="text/css" rel="stylesheet" href="../main.css"/>
7
+ <script type="text/javascript" src="../js/jquery-1.3.2.min.js"></script>
8
+ <script type="text/javascript" src="../js/jquery.scrollTo-min.js"></script>
9
+ <script type="text/javascript" src="../js/navigation.js"></script>
10
+ </head>
11
+ <body><div id="namespaces">
12
+ <h2 class="fixed">Namespaces</h2>
13
+ <div class="scroll">
14
+ <ul><li>
15
+ <a href="../Fake/index.htm">Fake</a>
16
+ </li><li>
17
+ <a href="../Fake.Git/index.htm" class="current">Fake.Git</a>
18
+ </li><li>
19
+ <a href="../Fake.MSBuild/index.htm">Fake.MSBuild</a>
20
+ </li><li>
21
+ <a href="../Fake.SQL/index.htm">Fake.SQL</a>
22
+ </li><li>
23
+ <a href="../FakeLib/index.htm">FakeLib</a>
24
+ </li>
25
+ </ul>
26
+ </div>
27
+ </div><div id="types">
28
+ <h2 class="fixed">Types in Fake.Git</h2>
29
+ <div class="scroll">
30
+ <ul><li>
31
+ <a href="../Fake.Git/AssemblyInfo.htm">AssemblyInfo</a>
32
+ </li><li>
33
+ <a href="../Fake.Git/Branches.htm">Branches</a>
34
+ </li><li>
35
+ <a href="../Fake.Git/CommandHelper.htm">CommandHelper</a>
36
+ </li><li>
37
+ <a href="../Fake.Git/CommitMessage.htm">CommitMessage</a>
38
+ </li><li>
39
+ <a href="../Fake.Git/FileStatus.htm">FileStatus</a>
40
+ </li><li>
41
+ <a href="../Fake.Git/Information.htm">Information</a>
42
+ </li><li>
43
+ <a href="../Fake.Git/Merge.htm">Merge</a>
44
+ </li><li>
45
+ <a href="../Fake.Git/MergeType.htm">MergeType</a>
46
+ </li><li>
47
+ <a href="../Fake.Git/Rebase.htm" class="current">Rebase</a>
48
+ </li><li>
49
+ <a href="../Fake.Git/Repository.htm">Repository</a>
50
+ </li><li>
51
+ <a href="../Fake.Git/Reset.htm">Reset</a>
52
+ </li><li>
53
+ <a href="../Fake.Git/ReturnException183c26a427ae489c8fd92ec21a0c9a59.htm">ReturnException183c26a427ae489c8fd92ec21a0c9a59</a>
54
+ </li><li>
55
+ <a href="../Fake.Git/ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59.htm">ReturnNoneException183c26a427ae489c8fd92ec21a0c9a59</a>
56
+ </li><li>
57
+ <a href="../Fake.Git/SanityChecks.htm">SanityChecks</a>
58
+ </li><li>
59
+ <a href="../Fake.Git/SHA1.htm">SHA1</a>
60
+ </li><li>
61
+ <a href="../Fake.Git/Staging.htm">Staging</a>
62
+ </li><li>
63
+ <a href="../Fake.Git/Stash.htm">Stash</a>
64
+ </li><li>
65
+ <a href="../Fake.Git/Submodule.htm">Submodule</a>
66
+ </li><li>
67
+ <a href="../Fake.Git/Tags.htm">Tags</a>
68
+ </li>
69
+ </ul>
70
+ </div>
71
+ </div>
72
+ <div class="header">
73
+ <p class="class"><strong>Type</strong> Rebase</p>
74
+ <p><strong>Namespace</strong> Fake.Git</p>
75
+ </div>
76
+ <div class="sub-header">
77
+
78
+
79
+ <h3 class="section">Methods</h3>
80
+ <ul><li><a href="../Fake.Git/Rebase.htm#abort">abort</a></li><li><a href="../Fake.Git/Rebase.htm#continueRebase">continueRebase</a></li><li><a href="../Fake.Git/Rebase.htm#rebaseOrFallbackOnMerge">rebaseOrFallbackOnMerge</a></li><li><a href="../Fake.Git/Rebase.htm#skip">skip</a></li><li><a href="../Fake.Git/Rebase.htm#start">start</a></li>
81
+ </ul>
82
+
83
+
84
+ </div>
85
+
86
+
87
+
88
+ <h3 class="section">Public static methods</h3>
89
+ <div id="abort" class="method">
90
+ <h4><span title="System.void">void</span> <strong>abort</strong>(<span title="System.string">string</span> repositoryDir)</h4>
91
+ <div class="content">Restore the original branch and abort the rebase operation.
92
+
93
+
94
+
95
+
96
+ </div>
97
+ </div><div id="continueRebase" class="method">
98
+ <h4><span title="System.void">void</span> <strong>continueRebase</strong>(<span title="System.string">string</span> repositoryDir)</h4>
99
+ <div class="content">Restart the rebasing process after having resolved a merge conflict.
100
+
101
+
102
+
103
+
104
+ </div>
105
+ </div><div id="rebaseOrFallbackOnMerge" class="method">
106
+ <h4><span title="System.bool">bool</span> <strong>rebaseOrFallbackOnMerge</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> onTopOfBranch)</h4>
107
+ <div class="content">Tries to rebase on top of the given branch.
108
+ If the rebasing process fails a normal merge will be started.
109
+
110
+
111
+ <div class="return">
112
+ <h5>Return</h5>
113
+ <h6><code><span title="System.bool">bool</span></code></h6>
114
+ <p>If the process used merge instead of rebase.</p>
115
+ </div>
116
+
117
+ </div>
118
+ </div><div id="skip" class="method">
119
+ <h4><span title="System.void">void</span> <strong>skip</strong>(<span title="System.string">string</span> repositoryDir)</h4>
120
+ <div class="content">Restart the rebasing process by skipping the current patch.
121
+
122
+
123
+
124
+
125
+ </div>
126
+ </div><div id="start" class="method">
127
+ <h4><span title="System.void">void</span> <strong>start</strong>(<span title="System.string">string</span> repositoryDir, <span title="System.string">string</span> onTopOfBranch)</h4>
128
+ <div class="content">Performs a rebase on top of the given branch with the current branch
129
+
130
+
131
+
132
+
133
+ </div>
134
+ </div>
135
+
136
+ <div id="footer">
137
+ <p>Based on v1.42.11.0 of FAKE - F# Make Git Lib</p>
138
+ <p>Generated by <a href="http://docu.jagregory.com">docu</a></p>
139
+ </div>
140
+ </body>
141
+ </html>