diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-22 21:27:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-22 21:27:37 -0800 |
| commit | e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1 (patch) | |
| tree | b0974609d67763a8580bba07839a528c6fab7042 /Documentation | |
| parent | 2470653196fa8461ff5895c521519e947482eae1 (diff) | |
| parent | 75b62b489af7b62a5518c3f199d2a2776205e088 (diff) | |
| download | git-e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1.tar.gz git-e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1.tar.xz | |
Merge branch 'maint'
* maint:
git-diff: fix combined diff
Fix 'git commit -a' in a newly initialized repository
Include git-gui credits file in dist.
Document the new core.bare configuration option.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f5c846f41..9d045d883 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -142,6 +142,18 @@ core.preferSymlinkRefs:: This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link. +core.bare:: + If true this repository is assumed to be 'bare' and has no + working directory associated with it. If this is the case a + number of commands that require a working directory will be + disabled, such as gitlink:git-add[1] or gitlink:git-merge[1]. ++ +This setting is automatically guessed by gitlink:git-clone[1] or +gitlink:git-init[1] when the repository was created. By default a +repository that ends in "/.git" is assumed to be not bare (bare = +false), while all other repositories are assumed to be bare (bare += true). + core.logAllRefUpdates:: Updates to a ref <ref> is logged to the file "$GIT_DIR/logs/<ref>", by appending the new and old |