<commit_before><!doctype html>
<html lang="en">

	<head>
		<meta charset="utf-8">

		<title>Git Flow and Recommendation</title>

		<link rel="stylesheet" href="css/reveal.css">
		<link rel="stylesheet" href="css/theme/black.css" id="theme">

		<!-- Code syntax highlighting -->
		<link rel="stylesheet" href="lib/css/zenburn.css">

		<!-- Printing and PDF exports -->
		<script>
			var link = document.createElement( 'link' );
			link.rel = 'stylesheet';
			link.type = 'text/css';
			link.href = window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css';
			document.getElementsByTagName( 'head' )[0].appendChild( link );
		</script>

		<!--[if lt IE 9]>
		<script src="lib/js/html5shiv.js"></script>
		<![endif]-->
	</head>

	<body>

		<div class="reveal">

			<!-- Any section element inside of this container is displayed as a slide -->
			<div class="slides">
				<section data-markdown>
					- Git Flow
					- Recommendation
				</section>

				<section data-markdown>
					Git Flow

					- 主要分支
					- 支持性分支
				</section>

				<section data-markdown>
					主要分支

					- master
					- develop

					![](assets/git-branch-3.png)
				</section>

				<section data-markdown>
					支持性分支

					- 特性分支（feature branch）
					- 发布分支（release branch）
					- 热补丁分支（hotfix branch）
				</section>

				<section data-markdown>
					特性分支

					- 可能的分支来源：develop
					- 必须合并回：develop
					- 分支命名约定：feature/*

					![](assets/git-branch-4.png)

				</section>

				<section data-markdown>
					发布分支

					- 可能的分支来源：develop
					- 必须合并回：develop和master
					- 分支命名约定：release/*
				</section>

				<section data-markdown>
					热补丁分支

					- 可能的分支来源：master
					- 必须合并回：develop和master
					- 分支命名约定：hotfix/*
				</section>

				<section data-markdown>
					Recommendation

					- zsh
					- `git add .`
					- `git commit` (without `-m`)
					- `git merge --no-ff`
					- `git rebase`
				</section>

				<section>
					<section>
						<p>zsh</p>
						<p><img src="assets/zsh-1.png" style="border:none; width: 500px;" alt=""></p>
						<ul class="li">
							<li>上次运行命令状态</li>
							<li>是否为git目录</li>
							<li>当前分支</li>
							<li>修改状态</li>
						</ul>
					</section>
					<section>
					<a href="http://github.com/Treri/dotfile">http://github.com/Treri/dotfile</a>
					<pre>
						<code>
git clone http://github.com/Treri/dotfile ~/.dotfile
cd ~/.dotfile
./install.sh zsh_rc
						</code>
					</pre>
					</section>
				</section>

				<section>
					<p><code>git add .</code></p>
				</section>

				<section>
					<section>
						<p><code>git commit</code> (without <code>-m</code>)</p>
						<img src="assets/git-commit-1.png" style="border:none; width: 800px;" alt="">
					</section>
					<section>
						<p>commit log &nbsp;&nbsp;==>&nbsp;&nbsp;commit summary</p>
						<img src="assets/git-commit-2.png" style="border:none; width: 600px;" alt="">
					</section>
					<section>
						<img src="assets/git-commit-3.png" style="border:none; width: 800px;" alt="">
					</section>
				</section>

				<section data-markdown>
					`git merge --no-ff` (no fast forward)

					![](assets/git-branch-5.png)
				</section>

				<section>
					<section data-markdown>
						`git rebase`
					</section>

					<section data-markdown>
						工作状态

						![](assets/git-merge-1.jpg)
					</section>

					<section data-markdown>
						使用`git merge`

						![](assets/git-merge-2.jpg)
					</section>

					<section data-markdown>
						使用`git rebase`

						![](assets/git-merge-3.jpg)

						- Author
						- Commiter
					</section>
				</section>

				<section style="text-align:left">
					目标
					<p>1. 保持commit历史记录线性</p>
					<p>2. 保持分支的产生和合并信息</p>
				</section>

				<section data-markdown>
				## END
				</section>
			</div>

		</div>

		<script src="lib/js/head.min.js"></script>
		<script src="js/reveal.js"></script>
<commit_msg>add git-cherry-pick<commit_after><!doctype html>
<html lang="en">

	<head>
		<meta charset="utf-8">

		<title>Git Flow and Recommendation</title>

		<link rel="stylesheet" href="css/reveal.css">
		<link rel="stylesheet" href="css/theme/black.css" id="theme">

		<!-- Code syntax highlighting -->
		<link rel="stylesheet" href="lib/css/zenburn.css">

		<!-- Printing and PDF exports -->
		<script>
			var link = document.createElement( 'link' );
			link.rel = 'stylesheet';
			link.type = 'text/css';
			link.href = window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css';
			document.getElementsByTagName( 'head' )[0].appendChild( link );
		</script>

		<!--[if lt IE 9]>
		<script src="lib/js/html5shiv.js"></script>
		<![endif]-->
	</head>

	<body>

		<div class="reveal">

			<!-- Any section element inside of this container is displayed as a slide -->
			<div class="slides">
				<section data-markdown>
					- Git Flow
					- Recommendation
				</section>

				<section data-markdown>
					Git Flow

					- 主要分支
					- 支持性分支
				</section>

				<section data-markdown>
					主要分支

					- master
					- develop

					![](assets/git-branch-3.png)
				</section>

				<section data-markdown>
					支持性分支

					- 特性分支（feature branch）
					- 发布分支（release branch）
					- 热补丁分支（hotfix branch）
				</section>

				<section data-markdown>
					特性分支

					- 可能的分支来源：develop
					- 必须合并回：develop
					- 分支命名约定：feature/*

					![](assets/git-branch-4.png)

				</section>

				<section data-markdown>
					发布分支

					- 可能的分支来源：develop
					- 必须合并回：develop和master
					- 分支命名约定：release/*
				</section>

				<section data-markdown>
					热补丁分支

					- 可能的分支来源：master
					- 必须合并回：develop和master
					- 分支命名约定：hotfix/*
				</section>

				<section data-markdown>
					Recommendation

					- zsh
					- `git add .`
					- `git commit` (without `-m`)
					- `git merge --no-ff`
					- `git rebase`
				</section>

				<section>
					<section>
						<p>zsh</p>
						<p><img src="assets/zsh-1.png" style="border:none; width: 500px;" alt=""></p>
						<ul class="li">
							<li>上次运行命令状态</li>
							<li>是否为git目录</li>
							<li>当前分支</li>
							<li>修改状态</li>
						</ul>
					</section>
					<section>
					<a href="http://github.com/Treri/dotfile">http://github.com/Treri/dotfile</a>
					<pre>
						<code>
git clone http://github.com/Treri/dotfile ~/.dotfile
cd ~/.dotfile
./install.sh zsh_rc
						</code>
					</pre>
					</section>
				</section>

				<section>
					<p><code>git add .</code></p>
				</section>

				<section>
					<section>
						<p><code>git commit</code> (without <code>-m</code>)</p>
						<img src="assets/git-commit-1.png" style="border:none; width: 800px;" alt="">
					</section>
					<section>
						<p>commit log &nbsp;&nbsp;==>&nbsp;&nbsp;commit summary</p>
						<img src="assets/git-commit-2.png" style="border:none; width: 600px;" alt="">
					</section>
					<section>
						<img src="assets/git-commit-3.png" style="border:none; width: 800px;" alt="">
					</section>
				</section>

				<section data-markdown>
					`git merge --no-ff` (no fast forward)

					![](assets/git-branch-5.png)
				</section>

				<section>
					<section data-markdown>
						`git rebase`
					</section>

					<section data-markdown>
						工作状态

						![](assets/git-merge-1.jpg)
					</section>

					<section data-markdown>
						使用`git merge`

						![](assets/git-merge-2.jpg)
					</section>

					<section data-markdown>
						使用`git rebase`

						![](assets/git-merge-3.jpg)

						- Author
						- Commiter
					</section>
				</section>

				<section data-markdown>
					`git cherry-pick`

					把一个分支的commit修改应用到另一个分支

					而不涉及其他commit
				</section>

				<section style="text-align:left">
					目标
					<p>1. 保持commit历史记录线性</p>
					<p>2. 保持分支的产生和合并信息</p>
				</section>

				<section data-markdown>
				## END
				</section>
			</div>

		</div>

		<script src="lib/js/head.min.js"></script>
		<script src="js/reveal.js"></script>

{'fraction_non_alphanumeric': 0.1775653282345443, 'fraction_numerical': 0.007138304652644997, 'mean_word_length': 2.2235004108463436, 'pattern_counts': {'":': 0, '<': 237, '<?xml version=': 0, '>': 239, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6902508', 'n_tokens_mistral': 4133, 'n_tokens_neox': 3011, 'n_words': 542}