merge-strategies.txt: fix simple capitalization error

Elijah Newren committed about 5 years ago

merge-strategies.txt: avoid giving special preference to patience algorithm

Elijah Newren committed about 5 years ago

merge-strategies.txt: do not imply using copy detection is desired

Elijah Newren committed about 5 years ago

merge-strategies.txt: update wording for the resolve strategy

Elijah Newren committed about 5 years ago

Documentation: edit awkward references to `git merge-recursive`

Elijah Newren committed about 5 years ago

directory-rename-detection.txt: small updates due to merge-ort optimizations

Elijah Newren committed about 5 years ago

git-rebase.txt: correct antiquated claims about --rebase-merges

Elijah Newren committed about 5 years ago

l10n: pt_PT: update git-po-helper

Daniel Santos committed about 5 years ago

l10n: pt_PT: remove trailing comments

Daniel Santos committed about 5 years ago

l10n: pt_PT: translation tables

Daniel Santos committed about 5 years ago

l10n: id: po-id for 2.33.0 (round 1)

Bagas Sanjaya committed about 5 years ago

Merge branch 'tr-loc-v2.33' of github.com:bitigchi/git-po

Jiang Xin committed about 5 years ago

l10n: tr: v2.33.0 round 1

Emir Sarı committed about 5 years ago

Merge branch 'fr_v2.33_rnd1' of github.com:jnavila/git

Jiang Xin committed about 5 years ago

The eighth batch

Junio C Hamano committed about 5 years ago

Merge branch 'tb/mingw-rmdir-symlink-to-directory'

Junio C Hamano committed about 5 years ago

Merge branch 'ar/doc-markup-fix'

Junio C Hamano committed about 5 years ago

Merge branch 'ab/getcwd-test'

Junio C Hamano committed about 5 years ago

Merge branch 'rs/use-fspathhash'

Junio C Hamano committed about 5 years ago

Merge branch 'pb/merge-autostash-more'

Junio C Hamano committed about 5 years ago