Merge branch 'cc/replace-with-the-same-type'

* cc/replace-with-the-same-type:
  Doc: 'replace' merge and non-merge commits
  t6050-replace: use some long option names
  replace: allow long option names
  Documentation/replace: add Creating Replacement Objects section
  t6050-replace: add test to clean up all the replace refs
  t6050-replace: test that objects are of the same type
  Documentation/replace: state that objects must be of the same type
  replace: forbid replacing an object with one of a different type

diff --cc builtin/replace.c
index 301b45ce6a453c472566278521bb51fcbd91ee10,d4d1b75aded73dd0224096dbd2a82012e01ac8d6..b1bd3ef9946761b146a38d5977a7378175cda047
--- 1/builtin/replace.c
--- 2/builtin/replace.c
+++ b/builtin/replace.c
@@@ -118,9 -128,9 +128,9 @@@ int cmd_replace(int argc, const char **
  {
        int list = 0, delete = 0, force = 0;
        struct option options[] = {
-               OPT_BOOL('l', NULL, &list, N_("list replace refs")),
-               OPT_BOOL('d', NULL, &delete, N_("delete replace refs")),
-               OPT_BOOL('f', NULL, &force, N_("replace the ref if it exists")),
 -              OPT_BOOLEAN('l', "list", &list, N_("list replace refs")),
 -              OPT_BOOLEAN('d', "delete", &delete, N_("delete replace refs")),
 -              OPT_BOOLEAN('f', "force", &force, N_("replace the ref if it exists")),
++              OPT_BOOL('l', "list", &list, N_("list replace refs")),
++              OPT_BOOL('d', "delete", &delete, N_("delete replace refs")),
++              OPT_BOOL('f', "force", &force, N_("replace the ref if it exists")),
                OPT_END()
        };