summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Adam Simpkins <adam@adamsimpkins.net>2008-06-05 02:28:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-06 11:56:43 -0700
commit03300c0ac0dfd6098ff65cff518bfffb05ae4194 (patch)
treeaa135fde48446e06a36ff6b3f66f826db73e1190 /Documentation/merge-strategies.txt
parentUse nonrelative paths instead of absolute paths for cloned repositories (diff)
downloadtgif-03300c0ac0dfd6098ff65cff518bfffb05ae4194.tar.xz
git log --graph: print '*' for all commits, including merges
Previously, merge commits were printed with 'M' instead of '*'. This had the potential to confuse users when not all parents of the merge commit were included in the log output. As Junio has pointed out, merge commits can almost always be easily identified from the log message, anyway. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions