]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d3c2749) | patch
rerere: explain MERGE_RR management helpers
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Jul 2015 05:36:35 +0000 (22:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 23:02:06 +0000 (16:02 -0700)
commit4b68c2a0877b18d1fe591dd7aee55aa1158fada0
tree6841fbba4f08ad2325ed9d5b6dee87be78ef7a50tree | snapshot
parentd3c2749def9563798cea3486f3793ad36d9c1030commit | diff
rerere: explain MERGE_RR management helpers

Explain the internals of rerere as in-code comments, while
sprinkling "NEEDSWORK" comment to highlight iffy bits and
questionable assumptions.

This one covers the "$GIT_DIR/MERGE_RR" file and in-core merge_rr
that are used to keep track of the status of "rerere" session in
progress.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
rerere.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.