#!/bin/sh rm -fr .git *.txt .gitignore git init echo init.sh>.gitignore && git add .gitignore && git commit -m "Initial Commit" echo b>b.txt && git add b.txt && git commit -m "master 1" git branch other echo c>c.txt && git add c.txt && git commit -m "master 2" echo d>d.txt && git add d.txt && git commit -m "master 3" git checkout other echo e>e.txt && git add e.txt && git commit -m "other 1" echo
![Gitでブランチを統合する方法 — 裏紙](https://cdn-ak-scissors.b.st-hatena.com/image/square/9bbf5d0b44ccb731329bd5bd411ddae8587c7271/height=288;version=1;width=512/http%3A%2F%2Fbackpaper0.github.io%2F_images%2Fgit_rebase_merge_1.png)