From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 25 Sep 2013 06:35:24 +0000 (-0700)
Subject: Merge branch 'cc/replace-with-the-same-type'
X-Git-Url: https://repo.or.cz/w/git/mingw.git/commitdiff_plain/80f165a58a41ffd37ec24022db8e568bc5165075

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
---

80f165a58a41ffd37ec24022db8e568bc5165075
diff --cc builtin/replace.c
index 301b45ce6a,d4d1b75ade..b1bd3ef994
--- a/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()
  	};