summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2013-12-11 08:46:13 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-12 11:53:49 -0800
commit34a332221c581585ad06ed43eff12fb7e675cc1d (patch)
treeb3c3e7ea994f22796de256493fc087a16ddbf111
parentbuiltin/replace: unset read_replace_refs (diff)
downloadtgif-34a332221c581585ad06ed43eff12fb7e675cc1d.tar.xz
Documentation/git-replace: describe --format option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-replace.txt19
1 files changed, 18 insertions, 1 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index f373ab48d4..7a078280d3 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -10,7 +10,7 @@ SYNOPSIS
[verse]
'git replace' [-f] <object> <replacement>
'git replace' -d <object>...
-'git replace' -l [<pattern>]
+'git replace' [--format=<format>] [-l [<pattern>]]
DESCRIPTION
-----------
@@ -70,6 +70,23 @@ OPTIONS
Typing "git replace" without arguments, also lists all replace
refs.
+--format=<format>::
+ When listing, use the specified <format>, which can be one of
+ 'short', 'medium' and 'full'. When omitted, the format
+ defaults to 'short'.
+
+FORMATS
+-------
+
+The following format are available:
+
+* 'short':
+ <replaced sha1>
+* 'medium':
+ <replaced sha1> -> <replacement sha1>
+* 'full'
+ <replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)
+
CREATING REPLACEMENT OBJECTS
----------------------------