diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-30 22:42:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-30 22:42:43 -0800 |
| commit | 76d4e079adba461c127641a1104772a62e38cd81 (patch) | |
| tree | 7a8e335ed577aff47b5a80d8de5a6d7904813c02 /Documentation/config.txt | |
| parent | 2c039da804ee0542ff41d2f22a444d04a2d37856 (diff) | |
| parent | a862f97e98decc317437fa3b04081f68fb4ffbf3 (diff) | |
| download | git-76d4e079adba461c127641a1104772a62e38cd81.tar.gz | |
Merge branch 'master' into sp/mmap
* master:
Documentation/config.txt (and repo-config manpage): mark-up fix.
Teach Git how to parse standard power of 2 suffixes.
Use /dev/null for update hook stdin.
Redirect update hook stdout to stderr.
Remove unnecessary argc parameter from run_command_v.
Automatically detect a bare git repository.
Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
Use PATH_MAX constant for --bare.
Force core.filemode to false on Cygwin.
Fix formatting for urls section of fetch, pull, and push manpages
Fix yet another subtle xdl_merge() bug
i18n: drop "encoding" header in the output after re-coding.
commit-tree: cope with different ways "utf-8" can be spelled.
Move commit reencoding parameter parsing to revision.c
Documentation: minor rewording for git-log and git-show pages.
Documentation: i18n commit log message notes.
t3900: test log --encoding=none
commit re-encoding: fix confusion between no and default conversion.
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d71653dc65..744484b982 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -82,13 +82,13 @@ core.logAllRefUpdates:: only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/<ref>" file is automatically created for branch heads. - - This information can be used to determine what commit - was the tip of a branch "2 days ago". - - This value is true by default in a repository that has - a working directory associated with it, and false by - default in a bare repository. ++ +This information can be used to determine what commit +was the tip of a branch "2 days ago". ++ +This value is true by default in a repository that has +a working directory associated with it, and false by +default in a bare repository. core.repositoryFormatVersion:: Internal variable identifying the repository format and layout |