##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r1098:5d0049e7 default
r2784:e8c62649 default
Show More
setup.cfg
43 lines | 789 B | text/x-ini | IniLexer
project: added all source files and assets
r1 [aliases]
test = pytest
[egg_info]
tag_build =
tag_svn_revision = false
# Babel configuration
[compile_catalog]
domain = rhodecode
directory = rhodecode/i18n
statistics = true
[extract_messages]
add_comments = TRANSLATORS:
output_file = rhodecode/i18n/rhodecode.pot
msgid-bugs-address = marcin@rhodecode.com
copyright-holder = RhodeCode GmbH
no-wrap = true
i18n: added JS extractors to work with the standard extract_messages command.
r326 keywords =
lazy_ugettext
_ngettext
_gettext
i18n: expose custom name to catch the translation strings.
r1098 gettext_translator
project: added all source files and assets
r1
[init_catalog]
domain = rhodecode
input_file = rhodecode/i18n/rhodecode.pot
output_dir = rhodecode/i18n
[update_catalog]
domain = rhodecode
input_file = rhodecode/i18n/rhodecode.pot
output_dir = rhodecode/i18n
previous = true
[build_sphinx]
source-dir = docs/
build-dir = docs/_build
all_files = 1
[upload_sphinx]
upload-dir = docs/_build/html