Merge branch 'master' of github.com:alshopov/git-po

Jiang Xin committed about 4 years ago

Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po

Jiang Xin committed about 4 years ago

l10n: README: fix typo

Arthur Milchior committed about 4 years ago

revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis

Jeff King committed about 4 years ago

git-merge-tree.txt: add a section on potentional usage mistakes

Elijah Newren committed about 4 years ago

merge-tree: add a --allow-unrelated-histories flag

Elijah Newren committed about 4 years ago

merge-tree: allow `ls-files -u` style info to be NUL terminated

Elijah Newren committed about 4 years ago

merge-ort: optionally produce machine-readable output

Elijah Newren committed about 4 years ago

merge-ort: store more specific conflict information

Elijah Newren committed about 4 years ago

merge-ort: make `path_messages` a strmap to a string_list

Johannes Schindelin committed about 4 years ago

merge-ort: store messages in a list, not in a single strbuf

Johannes Schindelin committed about 4 years ago

merge-tree: provide easy access to `ls-files -u` style info

Elijah Newren committed about 4 years ago

merge-tree: provide a list of which files have conflicts

Elijah Newren committed about 4 years ago

merge-ort: remove command-line-centric submodule message from merge-ort

Elijah Newren committed about 4 years ago

merge-ort: provide a merge_get_conflicted_files() helper function

Elijah Newren committed about 4 years ago

merge-tree: support including merge messages in output

Elijah Newren committed about 4 years ago

merge-ort: split out a separate display_update_messages() function

Elijah Newren committed about 4 years ago

merge-tree: implement real merges

Elijah Newren committed about 4 years ago

merge-tree: add option parsing and initial shell for real merge function

Elijah Newren committed about 4 years ago

merge-tree: move logic for existing merge into new function

Elijah Newren committed about 4 years ago