summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2013-12-28 11:00:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-30 20:33:11 (GMT)
commit663a8566beb5387530641abe71a8d8b2dafd08b3 (patch)
tree5d67411eef51e8afa398daefa7ae96615cb7c853 /Documentation
parent34a332221c581585ad06ed43eff12fb7e675cc1d (diff)
downloadgit-663a8566beb5387530641abe71a8d8b2dafd08b3.zip
git-663a8566beb5387530641abe71a8d8b2dafd08b3.tar.gz
git-663a8566beb5387530641abe71a8d8b2dafd08b3.tar.bz2
replace info: rename 'full' to 'long' and clarify in-code symbols
Enum names SHORT/MEDIUM/FULL were too broad to be descriptive. And they clashed with built-in symbols on platforms like Windows. Clarify by giving them REPLACE_FORMAT_ prefix. Rename 'full' format in "git replace --format=<name>" to 'long', to match others (i.e. 'short' and 'medium'). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-replace.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 7a07828..0a02f70 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -72,7 +72,7 @@ OPTIONS
--format=<format>::
When listing, use the specified <format>, which can be one of
- 'short', 'medium' and 'full'. When omitted, the format
+ 'short', 'medium' and 'long'. When omitted, the format
defaults to 'short'.
FORMATS
@@ -84,7 +84,7 @@ The following format are available:
<replaced sha1>
* 'medium':
<replaced sha1> -> <replacement sha1>
-* 'full'
+* 'long':
<replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)
CREATING REPLACEMENT OBJECTS