thodg/got/lib

Diff

• Show log

  Commit

• Hash : fdf3c2d3
  Author :
  Date : 2021-06-17T09:01:05
  

  use Patience diff for merging during cherrypick/backout/histedit/rebase
  
  This has been shown to prevent mis-merges in some cases. It's probably
  not a final solution. We should look at what Git's "recursive merge"
  is doing and implement something similar.
  
  Keep using Myers during update/unstage. The advantage of Myers is that
  it produces smaller conflict chunks, and there are no known cases of
  mis-merges which affect update/unstage.
  

• Files

• arraylist.h
• blame.c
• buf.c
• buf.h
• commit_graph.c
• deflate.c
• delta.c
• delta_cache.c
• deltify.c
• diff.c
• diff3.c
• diff_atomize_text.c
• diff_debug.h
• diff_internal.h
• diff_main.c
• diff_main.h
• diff_myers.c
• diff_output.c
• diff_output.h
• diff_output_edscript.c
• diff_output_plain.c
• diff_output_unidiff.c
• diff_patience.c
• diffreg.c
• error.c
• fetch.c
• fileindex.c
• gitconfig.c
• got_lib_deflate.h
• got_lib_delta.h
• got_lib_delta_cache.h
• got_lib_deltify.h
• got_lib_diff.h
• got_lib_fileindex.h
• got_lib_gitconfig.h
• got_lib_gotconfig.h
• got_lib_inflate.h
• got_lib_lockfile.h
• got_lib_object.h
• got_lib_object_cache.h
• got_lib_object_create.h
• got_lib_object_idcache.h
• got_lib_object_idset.h
• got_lib_object_parse.h
• got_lib_pack.h
• got_lib_privsep.h
• got_lib_repository.h
• got_lib_sha1.h
• got_lib_worktree.h
• gotconfig.c
• inflate.c
• lockfile.c
• object.c
• object_cache.c
• object_create.c
• object_idset.c
• object_parse.c
• opentemp.c
• pack.c
• path.c
• privsep.c
• rcsutil.c
• rcsutil.h
• reference.c
• repository.c
• sha1.c
• utf8.c
• worktree.c

• Properties

• Git HTTP	https://git.kmx.io/thodg/got.git
  Git SSH	git@git.kmx.io:thodg/got.git
  Public access ?	public
  Description	https://gameoftrees.org/
  Users
  Tags	0.9 0.8 0.72 0.71 0.70 0.7 0.69 0.68 0.67 0.66 0.65 0.64 0.63 0.62 0.61 0.60 0.6 0.59 0.58 0.57 0.56 0.55 0.54 0.53 0.52 0.51 0.50 0.5 0.49 0.48 0.47 0.46 0.45 0.44 0.43 0.42 0.41 0.40 0.4 0.39 0.38 0.37 0.36 0.35 0.34 0.33 0.32 0.31 0.30 0.3 0.29 0.28 0.27 0.26 0.25 0.24 0.23 0.22 0.21 0.20 0.2 0.19 0.18 0.17 0.16 0.15 0.14 0.13 0.12 0.11 0.10 0.1