From bc40deabbce2fec844c57bf933143babe549bce3 Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Wed, 19 Sep 2012 00:25:28 +0100 Subject: Doc: shallow clone deepens _to_ new depth Clarify that 'depth=' specifies the new depth from the remote's branch tip. It does not add the depth to the existing shallow clone. (details from pack-protocol.txt). Clarify that tags are not fetched. (details from shallow.txt) Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/fetch-options.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 39d326abc..b4d6476ac 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -10,7 +10,8 @@ --depth=:: Deepen the history of a 'shallow' repository created by `git clone` with `--depth=` option (see linkgit:git-clone[1]) - by the specified number of commits. + to the specified number of commits from the tip of each remote + branch history. Tags for the deepened commits are not fetched. ifndef::git-pull[] --dry-run:: -- cgit v1.2.1 From 3f8c5a41f10ac35ac362d6e2f125b559d580d3e7 Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Wed, 19 Sep 2012 00:25:31 +0100 Subject: Doc: separate gitignore pattern sources Use separate bulleted paragraphs for the three different gitignore pattern sources. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/gitignore.txt | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'Documentation') diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index c1f692a71..96639e02b 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -41,18 +41,24 @@ precedence, the last matching pattern decides the outcome): variable 'core.excludesfile'. Which file to place a pattern in depends on how the pattern is meant to -be used. Patterns which should be version-controlled and distributed to -other repositories via clone (i.e., files that all developers will want -to ignore) should go into a `.gitignore` file. Patterns which are -specific to a particular repository but which do not need to be shared -with other related repositories (e.g., auxiliary files that live inside -the repository but are specific to one user's workflow) should go into -the `$GIT_DIR/info/exclude` file. Patterns which a user wants git to -ignore in all situations (e.g., backup or temporary files generated by -the user's editor of choice) generally go into a file specified by -`core.excludesfile` in the user's `~/.gitconfig`. Its default value is -$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, -$HOME/.config/git/ignore is used instead. +be used. + + * Patterns which should be version-controlled and distributed to + other repositories via clone (i.e., files that all developers will want + to ignore) should go into a `.gitignore` file. + + * Patterns which are + specific to a particular repository but which do not need to be shared + with other related repositories (e.g., auxiliary files that live inside + the repository but are specific to one user's workflow) should go into + the `$GIT_DIR/info/exclude` file. + + * Patterns which a user wants git to + ignore in all situations (e.g., backup or temporary files generated by + the user's editor of choice) generally go into a file specified by + `core.excludesfile` in the user's `~/.gitconfig`. Its default value is + $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or + empty, $HOME/.config/git/ignore is used instead. The underlying git plumbing tools, such as 'git ls-files' and 'git read-tree', read -- cgit v1.2.1 From a73d379063dcb8f86065fdacad95e285830e13ef Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Wed, 19 Sep 2012 00:25:32 +0100 Subject: Doc add: link gitignore Use a gitignore link rather than the gitrepository- layout link. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 9c1d39572..fd9e36b99 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -155,7 +155,7 @@ Configuration The optional configuration variable `core.excludesfile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See linkgit:gitrepository-layout[5]. +those in info/exclude. See linkgit:gitignore[5]. EXAMPLES -- cgit v1.2.1 From 068c6745fe1c414e9a611eee4f991c6c9c6e0307 Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Wed, 19 Sep 2012 00:25:33 +0100 Subject: Doc clean: add See Also link 'git clean' is controlled by gitignore. Provide See Also link for it. Use of core.excludesfile is implied. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/git-clean.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation') diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 79fb98414..9f42c0d0e 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -63,6 +63,10 @@ OPTIONS Remove only files ignored by git. This may be useful to rebuild everything from scratch, but keep manually created files. +SEE ALSO +-------- +linkgit:gitignore[5] + GIT --- Part of the linkgit:git[1] suite -- cgit v1.2.1 From f0970faa9627c17fc6065bdef136391e82b3055e Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Wed, 19 Sep 2012 00:25:34 +0100 Subject: Doc branch: show -vv option and alternative Indicate that the -v option can be given twice in the short options. Without it users pass over the option. Also indicate the alternate 'git remote show' method. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 47235bea0..4f441311c 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -129,11 +129,13 @@ This option is only applicable in non-verbose mode. use `git branch --list ` to list matching branches. -v:: +-vv:: --verbose:: When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print - the name of the upstream branch, as well. + the name of the upstream branch, as well (see also `git remote + show `). -q:: --quiet:: -- cgit v1.2.1