matplotlib.github.com/3.5.3/devel/gitwash/dot2_dot3.html at main · matplotlib/matplotlib.github.com · GitHub

History

515 lines (446 loc) · 17.5 KB

Raw

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

161

162

163

164

165

166

167

168

169

170

171

172

173

174

175

176

177

178

179

180

181

182

183

184

185

186

187

188

189

190

191

192

193

194

195

196

197

198

199

200

201

202

203

204

205

206

207

208

209

210

211

212

213

214

215

216

217

218

219

220

221

222

223

224

225

226

227

228

229

230

231

232

233

234

235

236

237

238

239

240

241

242

243

244

245

246

247

248

249

250

251

252

253

254

255

256

257

258

259

260

261

262

263

264

265

266

267

268

269

270

271

272

273

274

275

276

277

278

279

280

281

282

283

284

285

286

287

288

289

290

291

292

293

294

295

296

297

298

299

300

301

302

303

304

305

306

307

308

309

310

311

312

313

314

315

316

317

318

319

320

321

322

323

324

325

326

327

328

329

330

331

332

333

334

335

336

337

338

339

340

341

342

343

344

345

346

347

348

349

350

351

352

353

354

355

356

357

358

359

360

361

362

363

364

365

366

367

368

369

370

371

372

373

374

375

376

377

378

379

380

381

382

383

384

385

386

387

388

389

390

391

392

393

394

395

396

397

398

399

400

401

402

403

404

405

406

407

408

409

410

411

412

413

414

415

416

417

418

419

420

421

422

423

424

425

426

427

428

429

430

431

432

433

434

435

436

437

438

439

440

441

442

443

444

445

446

447

448

449

450

451

452

453

454

455

456

457

458

459

460

461

462

463

464

465

466

467

468

469

470

471

472

473

474

475

476

477

478

479

480

481

482

483

484

485

486

487

488

489

490

491

492

493

494

495

496

497

498

499

500

501

502

503

504

505

506

507

508

509

510

511

512

513

514

515

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<head>

<title>Two and three dots in difference specs — Matplotlib 3.5.3 documentation</title>

href="../../_static/vendor/fontawesome/5.13.0/css/all.min.css">

href="../../_static/vendor/fontawesome/5.13.0/webfonts/fa-solid-900.woff2">

href="../../_static/vendor/fontawesome/5.13.0/webfonts/fa-brands-400.woff2">

title="Search within Matplotlib 3.5.3 documentation"

href="../../_static/opensearch.xml"/>

</head>

</a>

</div>

</button>

<a class="reference internal nav-link" href="../../plot_types/index.html">Plot types</a>

</li>

<a class="reference internal nav-link" href="../../gallery/index.html">Examples</a>

</li>

<a class="reference internal nav-link" href="../../tutorials/index.html">Tutorials</a>

</li>

<a class="reference internal nav-link" href="../../api/index.html">Reference</a>

</li>

<a class="reference internal nav-link" href="../../users/index.html">User guide</a>

</li>

<a class="reference internal nav-link" href="../index.html">Develop</a>

</li>

<a class="reference internal nav-link" href="../../users/release_notes.html">Release notes</a>

</li>

</ul>

</div>

<label class="sr-only">gitter</label>

</a>

</li>

<label class="sr-only">discourse</label>

</a>

</li>

<label class="sr-only">GitHub</label>

</a>

</li>

<label class="sr-only">twitter</label>

</a>

</li>

</ul>

</div>

</nav>

</form><nav class="bd-links" id="bd-docs-nav" aria-label="Main navigation">

Contributing

</a>

</li>

Bug triaging and issue curation

</a>

</li>

Setting up Matplotlib for development

</a>

</li>

Testing

</a>

</li>

Writing documentation

</a>

</li>

Documentation style guide

</a>

</li>

Working with

<em>

Matplotlib

</em>

source code

</a>

</i>

</label>

Introduction

</a>

</li>

Install git

</a>

</li>

Following the latest source

</a>

</li>

Making a patch

</a>

</li>

Git for development

</a>

</i>

</label>

<ul>

Making your own copy (fork) of Matplotlib

</a>

</li>

Set up your fork

</a>

</li>

Configure git

</a>

</li>

Development workflow

</a>

</li>

Maintainer workflow

</a>

</li>

</ul>

</li>

git resources

</a>

</li>

Two and three dots in difference specs

</a>

</li>

</ul>

</li>

Pull request guidelines

</a>

</li>

Release guide

</a>

</li>

Dependencies

</a>

</li>

Minimum version of dependencies policy

</a>

</li>

Matplotlib Enhancement Proposals

</a>

</i>

</label>

<ul>

MEP Template

</a>

</li>

MEP8: PEP8

</a>

</li>

MEP9: Global interaction manager

</a>

</li>

MEP10: Docstring consistency

</a>

</li>

MEP11: Third-party dependencies

</a>

</li>

MEP12: Improve Gallery and Examples

</a>

</li>

MEP13: Use properties for Artists

</a>

</li>

MEP14: Text handling

</a>

</li>

MEP15: Fix axis autoscaling when limits are specified for one axis only

</a>

</li>

MEP19: Continuous Integration

</a>

</li>

MEP21: color and cm refactor

</a>

</li>

MEP22: Toolbar rewrite

</a>

</li>

MEP23: Multiple Figures per GUI window

</a>

</li>

MEP24: Negative radius in polar plots

</a>

</li>

MEP25: Serialization

</a>

</li>

MEP26: Artist styling

</a>

</li>

MEP27: Decouple pyplot from backends

</a>

</li>

MEP28: Remove Complexity from Axes.boxplot

</a>

</li>

MEP29: Text light markup

</a>

</li>

</ul>

</li>

</ul>

Licenses

</a>

</li>

Default color changes

</a>

</li>

</ul>

</div>

</nav>

</div>

</div>

</nav>

</div>

</div>

<div>

<span id="dot2-dot3"></span><h1>Two and three dots in difference specs<a class="headerlink" href="#two-and-three-dots-in-difference-specs" title="Permalink to this headline">#</a></h1>

<p>Thanks to Yarik Halchenko for this explanation.</p>

<p>Imagine a series of commits A, B, C, D... Imagine that there are two

branches, <em>topic</em> and <em>master</em>. You branched <em>topic</em> off <em>master</em> when

<em>master</em> was at commit 'E'. The graph of the commits looks like this:</p>

<div class="highlight-default notranslate"><div class="highlight"><pre><span></span> <span class="n">A</span><span class="o">---</span><span class="n">B</span><span class="o">---</span><span class="n">C</span> <span class="n">topic</span>

<span class="n">D</span><span class="o">---</span><span class="n">E</span><span class="o">---</span><span class="n">F</span><span class="o">---</span><span class="n">G</span> <span class="n">master</span>

</pre></div>

</div>

<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">diff</span> <span class="n">master</span><span class="o">..</span><span class="n">topic</span>

</pre></div>

</div>

<p>will output the difference from G to C (i.e. with effects of F and G),

while:</p>

</pre></div>

</div>

<p>would output just differences in the topic branch (i.e. only A, B, and

C).</p>

</section>

</div>

</main>

</div>

<div id="unreleased-message"> You are reading an old version of the documentation (v3.5.3). For the latest version see <a href="https://matplotlib.org/stable/devel/gitwash/dot2_dot3.html">https://matplotlib.org/stable/devel/gitwash/dot2_dot3.html</a></div>

</p>

</div>

Created using <a href="http://sphinx-doc.org/">Sphinx</a> 4.5.0.<br>

</p>

</div>

</footer>

</body>

</html>

matplotlib.github.com/3.5.3/devel/gitwash/dot2_dot3.html at main · matplotlib/matplotlib.github.com · GitHub

Expand file tree

Breadcrumbs

dot2_dot3.html

Latest commit

History

Breadcrumbs

dot2_dot3.html

File metadata and controls