-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathdots.txt
35 lines (21 loc) · 829 Bytes
/
dots.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Example history:
================
A - B - C - D - E - F - G - H master
\
\
I - J - K - L feature
NOTE: The meaning changes based on what git subcommand you run.
log, rev-list, cherry-pick, ...
===============================
These usages of dots resolve to a *set* of commits:
feature..master = E F G H
master..feature = I J K L
master...feature = feature...master = E F G H I J K L
git diff specifically:
======================
git diff produces a comparison between two commits so these usages always
resolve to *two* commits:
master..feature = master feature = H L
master...feature = $(git merge-base feature master) feature = D L
feature...master = $(git merge-base master feature) master = D H
For example: 'git diff feature...master' is the same as 'git diff D H'.