diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-12-28 12:00:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-30 12:33:11 -0800 |
| commit | 663a8566beb5387530641abe71a8d8b2dafd08b3 (patch) | |
| tree | 5d67411eef51e8afa398daefa7ae96615cb7c853 /Documentation/git-replace.txt | |
| parent | 34a332221c581585ad06ed43eff12fb7e675cc1d (diff) | |
| download | git-663a8566beb5387530641abe71a8d8b2dafd08b3.tar.gz | |
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/git-replace.txt')
| -rw-r--r-- | Documentation/git-replace.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 7a078280d3..0a02f70657 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 |