Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix

* ps/reflog-migrate-fixes:
  refs: fix invalid old object IDs when migrating reflogs
  refs: stop unsetting REF_HAVE_OLD for log-only updates
  refs/files: detect race when generating reflog entry for HEAD
  refs: fix identity for migrated reflogs
  ident: fix type of string length parameter
  builtin/reflog: implement subcommand to write new entries
  refs: export `ref_transaction_update_reflog()`
  builtin/reflog: improve grouping of subcommands
  Documentation/git-reflog: convert to use synopsis type

diff --cc builtin/reflog.c
index 3acaf3e32c2714ad84855079bde28f35ea0d6995,a1b4e02204178f3ccdfc4eb733be7b2627e34c20..f2bc1dc34fd71888bf22566ab630db09e94cbe80
--- 1/builtin/reflog.c
--- 2/builtin/reflog.c
+++ b/builtin/reflog.c
@@@ -3,6 -3,8 +3,8 @@@
  #include "builtin.h"
  #include "config.h"
  #include "gettext.h"
 -#include "object-store.h"
+ #include "hex.h"
++#include "odb.h"
  #include "revision.h"
  #include "reachable.h"
  #include "wildmatch.h"

diff --cc ident.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc refs.h
Simple merge

diff --cc refs/files-backend.c
Simple merge

diff --cc t/meson.build
Simple merge