commit 930c05b6b41e5b71e5b22f7c921257da83e03c5e from: Stefan Sperling date: Sun Apr 19 09:32:17 2020 UTC changes for 0.34 commit - 6a49bdc8c207e4bb0e08b5a92bdbe9ce7c44f3c4 commit + 930c05b6b41e5b71e5b22f7c921257da83e03c5e blob - 284f8a81c0aa7c724b2979626be22412db695975 blob + 649f4a6d0071793ff76a1a2befa38e31afafc56f --- CHANGES +++ CHANGES @@ -1,3 +1,12 @@ +* got 0.34; 2020-04-19 +- make use of new convenience API functions of kcgi 0.12 in gotweb +- make 'got update' skip conflicted files (prevents loss of local changes) +- show a summary of conflicts and related problems after updating/merging files +- add 'got log' -x option to stop logging when a specific commit was traversed +- add 'got log' -R option to reverse commit display order +- clarify wording in got.1 related to local changes/commits/branches +- show bad object ID in "object not found" error messages where possible + * got 0.33; 2020-04-14 - normalize tree entry modes to 0100644 or 0100755 when writing tree objects - fix "searching..." displayed in tog log view while merely scrolling down