Ciro Santilli @cirosantilli  40

git fetch

#!/usr/bin/env bash

mkdir git-tips
cd git-tips
git init

for i in 1 2 3 4 5; do
  echo $i > f
  git add f
  git commit -m $i
done

git checkout HEAD~2
git checkout -b my-feature

for i in 6 7; do
  echo $i > f
  git add f
  git commit -m $i
done

5 master
|
4
|
3
|
2
|
1 first commit

7   master
|\
| \
6  \
|\  \
| |  |
3 4  5
| |  |
| /  /
|/  /
2  /
| /
1/  first commit

git merge

5
|
4 7
| |
3 6
|/
2
|
1

7
|\
4 6
| |
3 5
|/
2
|
1

6
^
|
3->4
^  |
|  v
2<-5
^
|
1