From: Junio C Hamano Date: Fri, 7 Feb 2014 19:55:11 +0000 (-0800) Subject: Merge branch 'ow/manpages-typofix' X-Git-Tag: v1.9.0-rc3~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/efe5f1d25d198ae8796b6f095c2cffae270bb9b6?ds=inline;hp=-c Merge branch 'ow/manpages-typofix' Various typofixes, all looked correct. * ow/manpages-typofix: Documentation: fix typos in man pages --- efe5f1d25d198ae8796b6f095c2cffae270bb9b6 diff --combined Documentation/git-clone.txt index 49878570bf,3865658878..bf3dac0cef --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@@ -181,7 -181,12 +181,7 @@@ objects from the source repository int --depth :: Create a 'shallow' clone with a history truncated to the - specified number of revisions. A shallow repository has a - number of limitations (you cannot clone or fetch from - it, nor push from nor into it), but is adequate if you - are only interested in the recent history of a large project - with a long history, and would want to send in fixes - as patches. + specified number of revisions. --[no-]single-branch:: Clone only the history leading to the tip of a single branch, @@@ -208,7 -213,7 +208,7 @@@ --separate-git-dir=:: Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, - then make a filesytem-agnostic Git symbolic link to there. + then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree. diff --combined Documentation/gitcli.txt index 3f33ca5507,c814a3c5ce..1c3e109cb3 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@@ -28,7 -28,7 +28,7 @@@ arguments. Here are the rules they can be disambiguated by placing `--` between them. E.g. `git diff -- HEAD` is, "I have a file called HEAD in my work tree. Please show changes between the version I staged in the index - and what I have in the work tree for that file". not "show difference + and what I have in the work tree for that file", not "show difference between the HEAD commit and the work tree as a whole". You can say `git diff HEAD --` to ask for the latter. @@@ -72,11 -72,11 +72,11 @@@ scripting Git * splitting short options to separate words (prefer `git foo -a -b` to `git foo -ab`, the latter may not even work). - * when a command line option takes an argument, use the 'sticked' form. In + * when a command line option takes an argument, use the 'stuck' form. In other words, write `git foo -oArg` instead of `git foo -o Arg` for short options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg` for long options. An option that takes optional option-argument must be - written in the 'sticked' form. + written in the 'stuck' form. * when you give a revision parameter to a command, make sure the parameter is not ambiguous with a name of a file in the work tree. E.g. do not write @@@ -165,7 -165,7 +165,7 @@@ $ git foo -o Ar ---------------------------- However, this is *NOT* allowed for switches with an optional value, where the -'sticked' form must be used: +'stuck' form must be used: ---------------------------- $ git describe --abbrev HEAD # correct $ git describe --abbrev=10 HEAD # correct diff --combined Documentation/gitweb.conf.txt index db4154f9d5,b845a45691..952f503afb --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@@ -630,13 -630,13 +630,13 @@@ need to set this element to empty list override:: If this field has a true value then the given feature is - overriddable, which means that it can be configured + overridable, which means that it can be configured (or enabled/disabled) on a per-repository basis. + Usually given "" is configurable via the `gitweb.` config variable in the per-repository Git configuration file. + - *Note* that no feature is overriddable by default. + *Note* that no feature is overridable by default. sub:: Internal detail of implementation. What is important is that @@@ -849,43 -849,6 +849,43 @@@ time zones in the form of "+/-HHMM", su + Project specific override is not supported. +extra-branch-refs:: + List of additional directories under "refs" which are going to + be used as branch refs. For example if you have a gerrit setup + where all branches under refs/heads/ are official, + push-after-review ones and branches under refs/sandbox/, + refs/wip and refs/other are user ones where permissions are + much wider, then you might want to set this variable as + follows: ++ +-------------------------------------------------------------------------------- +$feature{'extra-branch-refs'}{'default'} = + ['sandbox', 'wip', 'other']; +-------------------------------------------------------------------------------- ++ +This feature can be configured on per-repository basis after setting +$feature{'extra-branch-refs'}{'override'} to true, via repository's +`gitweb.extraBranchRefs` configuration variable, which contains a +space separated list of refs. An example: ++ +-------------------------------------------------------------------------------- +[gitweb] + extraBranchRefs = sandbox wip other +-------------------------------------------------------------------------------- ++ +The gitweb.extraBranchRefs is actually a multi-valued configuration +variable, so following example is also correct and the result is the +same as of the snippet above: ++ +-------------------------------------------------------------------------------- +[gitweb] + extraBranchRefs = sandbox + extraBranchRefs = wip other +-------------------------------------------------------------------------------- ++ +It is an error to specify a ref that does not pass "git check-ref-format" +scrutiny. Duplicated values are filtered. + EXAMPLES -------- diff --combined Documentation/user-manual.txt index 248dcabd50,4555807b78..d4f9804462 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@@ -1,5 -1,5 +1,5 @@@ Git User Manual -_______________ +=============== Git is a fast distributed revision control system. @@@ -3795,7 -3795,7 +3795,7 @@@ like so $ git update-index filename ------------------------------------------------- - but to avoid common mistakes with filename globbing etc, the command + but to avoid common mistakes with filename globbing etc., the command will not normally add totally new entries or remove old entries, i.e. it will normally just update existing cache entries.