Feature #10034: Translation web platform
Feature #15079: Integrate the platform with our Git and ikiwiki infrastructure
Feature #15082: Have the Weblate Git communicate with our main Git repository
update_weblate_git.py: don't create merge commits when we could fast-forward
That is, after having prepared the index for the merge commit, if "git diff --cached remote" is empty, i.e. if we haven't done anything on top of applying the changes from the remote branch, then drop everything and fast-forward merge.
Goal: don't create tons of unneeded merge commits in our Git history.
- Status changed from Confirmed to Resolved
- Status changed from Resolved to In Progress
- Assignee set to hans
- Assignee changed from hans to hefee
- Status changed from In Progress to Resolved
- Assignee deleted (
@intrigeri: ab0169d1ad230078207961744e36427a87831b82 had not triggered Redmine to be mentioned here. So far let's close it and hopefully never need to reopen it again ;-D
Also available in: Atom