Ciro Santilli @cirosantilli  40

n02119789: kit fox, Vulpes macrotis
n02100735: English setter
n02096294: Australian terrier

n03255030: dumbbell
href="ht:
n02102040: English springer, English springer spaniel

n01440764: tench, Tinca tinca
n01443537: goldfish, Carassius auratus
n01484850: great white shark, white shark, man-eater, man-eating shark, Carcharodon carcharias

n02119789 1 kit_fox
n02100735 2 English_setter
n02110185 3 Siberian_husky

{0: 'tench, Tinca tinca',
 1: 'goldfish, Carassius auratus',
 2: 'great white shark, white shark, man-eater, man-eating shark, Carcharodon carcharias',

n01440764 tench, Tinca tinca
n01443537 goldfish, Carassius auratus
n01484850 great white shark, white shark, man-eater, man-eating shark, Carcharodon carcharias

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