summaryrefslogtreecommitdiff
path: root/Documentation/git-replace.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-05-11 18:15:59 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-12 15:23:48 -0700
commit900f2814b8da951a450f5762dabb1b248dd77abc (patch)
tree936ac5bd34c4d7ba6d879a209db80a2065364862 /Documentation/git-replace.txt
parentfetch/pull doc: untangle meaning of bare <ref> (diff)
downloadtgif-900f2814b8da951a450f5762dabb1b248dd77abc.tar.xz
refactor "ref->merge" flag
Each "struct ref" has a boolean flag that is set by the fetch code to determine whether the ref should be marked as "not-for-merge" or not when we write it out to FETCH_HEAD. It would be useful to turn this boolean into a tri-state, with the third state meaning "do not bother writing it out to FETCH_HEAD at all". That would let us add extra refs to the set of refs to be stored (e.g., to store copies of things we fetched) without impacting FETCH_HEAD. This patch turns it into an enum that covers the tri-state case, and hopefully makes the code more explicit and easier to read. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-replace.txt')
0 files changed, 0 insertions, 0 deletions