summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 19:55:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 19:55:28 (GMT)
commit860cc3a4f9c3ac21fcd37bbe30f40ab073f01299 (patch)
tree72954a742c39d14c6cc44e5524b215abab4dc7bd /Documentation
parentb82b096b8c3a29ad5115483cc8e8a433e26703ee (diff)
parentc0cb4a067972700f0682fbab13768bcc7dc7a3c3 (diff)
downloadgit-860cc3a4f9c3ac21fcd37bbe30f40ab073f01299.zip
git-860cc3a4f9c3ac21fcd37bbe30f40ab073f01299.tar.gz
git-860cc3a4f9c3ac21fcd37bbe30f40ab073f01299.tar.bz2
Merge branch 'jc/diff-relative'
* jc/diff-relative: diff --relative: help working in a bare repository diff --relative: output paths as relative to the current subdirectory
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 8d35cbd..8dc5b00 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -170,6 +170,14 @@ endif::git-format-patch[]
Swap two inputs; that is, show differences from index or
on-disk file to tree contents.
+--relative[=<path>]::
+ When run from a subdirectory of the project, it can be
+ told to exclude changes outside the directory and show
+ pathnames relative to it with this option. When you are
+ not in a subdirectory (e.g. in a bare repository), you
+ can name which subdirectory to make the output relative
+ to by giving a <path> as an argument.
+
--text::
Treat all files as text.