summaryrefslogtreecommitdiff
path: root/Documentation/git-reflog.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-06-03 12:06:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-03 12:06:45 -0700
commit6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08 (patch)
treebc3d2b2c238b57f89df7b8483e9fa5e369513a8e /Documentation/git-reflog.txt
parentMerge branch 'dt/api-doc-setup-gently' (diff)
parentrerere: fix for merge.conflictstyle (diff)
downloadtgif-6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08.tar.xz
Merge branch 'fc/rerere-conflict-style'
* fc/rerere-conflict-style: rerere: fix for merge.conflictstyle
Diffstat (limited to 'Documentation/git-reflog.txt')
0 files changed, 0 insertions, 0 deletions