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

Jonathan Nieder committed Sep 24, 2013 at 23:35 UTC 80f165a58a41ffd37ec24022db8e568bc5165075

No changes.