summaryrefslogtreecommitdiffstats
path: root/git-replace.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 12:33:07 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 12:33:07 -0800
commit21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d (patch)
treedeb6d03b38893fa4dba338ae565980a5086fa585 /git-replace.txt
parent9906f1f2277410d5f7fedc74ded20e8490812568 (diff)
downloadgit-htmldocs-21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d.tar.gz
Autogenerated HTML docs for v1.8.5.2-309-ga2501
Diffstat (limited to 'git-replace.txt')
-rw-r--r--git-replace.txt19
1 files changed, 18 insertions, 1 deletions
diff --git a/git-replace.txt b/git-replace.txt
index f373ab48d..0a02f7065 100644
--- a/git-replace.txt
+++ b/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 'long'. When omitted, the format
+ defaults to 'short'.
+
+FORMATS
+-------
+
+The following format are available:
+
+* 'short':
+ <replaced sha1>
+* 'medium':
+ <replaced sha1> -> <replacement sha1>
+* 'long':
+ <replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)
+
CREATING REPLACEMENT OBJECTS
----------------------------