summaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:57 (GMT)
commitd88949d86eddb62acbc85c16c97587db043d05b1 (patch)
treeda1257a2fbea26867cd6226c308cfd9004db81bb /builtin/remote.c
parent881c019ea6a0a45f97fb8a1865a88b07263a02ca (diff)
parentf427869bde759e32c30e8ba7a4b20837d3806642 (diff)
downloadgit-d88949d86eddb62acbc85c16c97587db043d05b1.zip
git-d88949d86eddb62acbc85c16c97587db043d05b1.tar.gz
git-d88949d86eddb62acbc85c16c97587db043d05b1.tar.bz2
Merge branch 'tg/rerere-doc-updates'
Clarify a part of technical documentation for rerere. * tg/rerere-doc-updates: rerere: add note about files with existing conflict markers rerere: mention caveat about unmatched conflict markers
Diffstat (limited to 'builtin/remote.c')
0 files changed, 0 insertions, 0 deletions