diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 15:17:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 15:17:07 -0700 |
| commit | f6336167e9f233d3a68c8ded18b172ba50cde743 (patch) | |
| tree | 68dc04b198e56b0f03539a648dc2af84c41ee685 /Documentation | |
| parent | 611d8139e4e0a78797a0821074fc94a4f8d74b7b (diff) | |
| parent | d99ebf081797dbb43ff618ff59f4c607b0acf045 (diff) | |
| download | git-f6336167e9f233d3a68c8ded18b172ba50cde743.tar.gz git-f6336167e9f233d3a68c8ded18b172ba50cde743.tar.xz | |
Merge branch 'jc/grep-c'
* jc/grep-c:
Split grep arguments in a way that does not requires to add /dev/null.
Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
Add test to check recent fix to "git add -u"
Documentation/git-archive.txt: a couple of clarifications.
Fix the rename detection limit checking
diff --no-index: do not forget to run diff_setup_done()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-archive.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-config.txt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index f2080eb6a..e1e2d60fe 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -15,7 +15,8 @@ SYNOPSIS DESCRIPTION ----------- Creates an archive of the specified format containing the tree -structure for the named tree. If <prefix> is specified it is +structure for the named tree, and writes it out to the standard +output. If <prefix> is specified it is prepended to the filenames in the archive. 'git-archive' behaves differently when given a tree ID versus when @@ -31,7 +32,7 @@ OPTIONS ------- --format=<fmt>:: - Format of the resulting archive: 'tar', 'zip'... The default + Format of the resulting archive: 'tar' or 'zip'. The default is 'tar'. --list, -l:: diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 5b794f439..a592b61e2 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -142,7 +142,7 @@ FILES If not set explicitly with '--file', there are three files where git-config will search for configuration options: -.git/config:: +$GIT_DIR/config:: Repository specific configuration file. (The filename is of course relative to the repository root, not the working directory.) |