From: Junio C Hamano Date: Tue, 6 May 2008 06:35:40 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5.1-147-g867f X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47d68a53947d51de4f67b6b7e4e7f76e71e16fb5;p=git.git Autogenerated HTML docs for v1.5.5.1-147-g867f --- diff --git a/config.txt b/config.txt index 824e416e9..00f089fee 100644 --- a/config.txt +++ b/config.txt @@ -921,6 +921,10 @@ remote..push:: The default set of "refspec" for linkgit:git-push[1]. See linkgit:git-push[1]. +remote..mirror:: + If true, pushing to this remote will automatically behave + as if the `\--mirror` option was given on the command line. + remote..skipDefaultUpdate:: If true, this remote will be skipped by default when updating using the update subcommand of linkgit:git-remote[1]. diff --git a/git-branch.html b/git-branch.html index 6e1bc8bd0..17c047127 100644 --- a/git-branch.html +++ b/git-branch.html @@ -273,7 +273,7 @@ git-branch(1) Manual Page

SYNOPSIS

-
git-branch [--color | --no-color] [-r | -a] +
git-branch [--color | --no-color] [-r | -a] [--merged | --no-merged] [-v [--abbrev=<length> | --no-abbrev]] [--contains <commit>] git-branch [--track | --no-track] [-l] [-f] <branchname> [<start-point>] @@ -288,7 +288,9 @@ Option -r causes the remote-tracking branches to be listed, and option -a shows both. With --contains <commit>, shows only the branches that contains the named commit (in other words, the branches whose -tip commits are descendant of the named commit).

+tip commits are descendant of the named commit). +With --merged, only branches merged into HEAD will be listed, and +with --no-merged only branches not merged into HEAD will be listed.

In its second form, a new branch named <branchname> will be created. It will start out with a head equal to the one given as <start-point>. If no <start-point> is given, the branch will be created with a head @@ -453,6 +455,30 @@ clean up all obsolete remote-tracking branches.

+--contains <commit> +
+
+

+ Only list branches which contain the specified commit. +

+
+
+--merged +
+
+

+ Only list branches which are fully contained by HEAD. +

+
+
+--no-merged +
+
+

+ Do not list branches which are fully contained by HEAD. +

+
+
<branchname>
@@ -549,6 +575,29 @@ currently checked out) does not have all commits from test branch.

If you are creating a branch that you want to immediately checkout, it's easier to use the git checkout command with its -b option to create a branch and check it out with a single command.

+

The options --contains, --merged and --no-merged serves three related +but different purposes:

+
    +
  • +

    +--contains <commit> is used to find all branches which will need + special attention if <commit> were to be rebased or amended, since those + branches contain the specified <commit>. +

    +
    • +
  • +

    +--merged is used to find all branches which can be safely deleted, + since those branches are fully contained by HEAD. +

    +
    • +
  • +

    +--no-merged is used to find branches which are candidates for merging + into HEAD, since those branches are not fully contained by HEAD. +

    +
    • +

Author

@@ -564,7 +613,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index 6f07a17a2..c824d8874 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -8,7 +8,7 @@ git-branch - List, create, or delete branches SYNOPSIS -------- [verse] -'git-branch' [--color | --no-color] [-r | -a] +'git-branch' [--color | --no-color] [-r | -a] [--merged | --no-merged] [-v [--abbrev= | --no-abbrev]] [--contains ] 'git-branch' [--track | --no-track] [-l] [-f] [] @@ -24,6 +24,8 @@ and option `-a` shows both. With `--contains `, shows only the branches that contains the named commit (in other words, the branches whose tip commits are descendant of the named commit). +With `--merged`, only branches merged into HEAD will be listed, and +with `--no-merged` only branches not merged into HEAD will be listed. In its second form, a new branch named will be created. It will start out with a head equal to the one given as . @@ -118,6 +120,15 @@ OPTIONS --no-track:: Ignore the branch.autosetupmerge configuration variable. +--contains :: + Only list branches which contain the specified commit. + +--merged:: + Only list branches which are fully contained by HEAD. + +--no-merged:: + Do not list branches which are fully contained by HEAD. + :: The name of the branch to create or delete. The new branch name must pass all checks defined by @@ -175,6 +186,18 @@ If you are creating a branch that you want to immediately checkout, it's easier to use the git checkout command with its `-b` option to create a branch and check it out with a single command. +The options `--contains`, `--merged` and `--no-merged` serves three related +but different purposes: + +- `--contains ` is used to find all branches which will need + special attention if were to be rebased or amended, since those + branches contain the specified . + +- `--merged` is used to find all branches which can be safely deleted, + since those branches are fully contained by HEAD. + +- `--no-merged` is used to find branches which are candidates for merging + into HEAD, since those branches are not fully contained by HEAD. Author ------ diff --git a/git-config.html b/git-config.html index f8cf71a07..dda9357f5 100644 --- a/git-config.html +++ b/git-config.html @@ -2195,6 +2195,15 @@ remote.<name>.push

+remote.<name>.mirror +
+
+

+ If true, pushing to this remote will automatically behave + as if the --mirror option was given on the command line. +

+
+
remote.<name>.skipDefaultUpdate
@@ -2428,7 +2437,7 @@ web.browser
diff --git a/git-filter-branch.html b/git-filter-branch.html index 0628c213a..3c7d6000a 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -419,10 +419,16 @@ that, use git-rebase(1) instead).

use "--tag-name-filter cat" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul.

-

Note that there is currently no support for proper rewriting of -tag objects; in layman terms, if the tag has a message or signature -attached, the rewritten tag won't have it. Sorry. (It is by -definition impossible to preserve signatures at any rate.)

+

Nearly proper rewriting of tag objects is supported. If the tag has +a message attached, a new tag object will be created with the same message, +author, and timestamp. If the tag has a signature attached, the +signature will be stripped. It is by definition impossible to preserve +signatures. The reason this is "nearly" proper, is because ideally if +the tag did not change (points to the same object, has the same name, etc.) +it should retain any signature. That is not the case, signatures will always +be removed, buyer beware. There is also no support for changing the +author or timestamp (or the tag message for that matter). Tags which point +to other tags will be rewritten to point to the underlying commit.

--subdirectory-filter <directory> @@ -605,7 +611,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 6454e49bf..8d80f0d07 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -133,10 +133,16 @@ use "--tag-name-filter cat" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul. + -Note that there is currently no support for proper rewriting of -tag objects; in layman terms, if the tag has a message or signature -attached, the rewritten tag won't have it. Sorry. (It is by -definition impossible to preserve signatures at any rate.) +Nearly proper rewriting of tag objects is supported. If the tag has +a message attached, a new tag object will be created with the same message, +author, and timestamp. If the tag has a signature attached, the +signature will be stripped. It is by definition impossible to preserve +signatures. The reason this is "nearly" proper, is because ideally if +the tag did not change (points to the same object, has the same name, etc.) +it should retain any signature. That is not the case, signatures will always +be removed, buyer beware. There is also no support for changing the +author or timestamp (or the tag message for that matter). Tags which point +to other tags will be rewritten to point to the underlying commit. --subdirectory-filter :: Only look at the history which touches the given subdirectory. diff --git a/git-push.html b/git-push.html index 67862c716..cd77cd3bc 100644 --- a/git-push.html +++ b/git-push.html @@ -345,7 +345,9 @@ the remote repository.

be mirrored to the remote repository. Newly created local refs will be pushed to the remote end, locally updated refs will be force updated on the remote end, and deleted refs - will be removed from the remote end. + will be removed from the remote end. This is the default + if the configuration option remote.<remote>.mirror is + set.

@@ -730,7 +732,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-push.txt b/git-push.txt index 058594913..f06d94e31 100644 --- a/git-push.txt +++ b/git-push.txt @@ -70,7 +70,9 @@ the remote repository. be mirrored to the remote repository. Newly created local refs will be pushed to the remote end, locally updated refs will be force updated on the remote end, and deleted refs - will be removed from the remote end. + will be removed from the remote end. This is the default + if the configuration option `remote..mirror` is + set. \--dry-run:: Do everything except actually send the updates. diff --git a/git-remote.html b/git-remote.html index 375211371..f41e9ff8a 100644 --- a/git-remote.html +++ b/git-remote.html @@ -310,7 +310,9 @@ up to point at remote's <master> branch instead of whatever branch the HEAD at the remote repository actually points at.

In mirror mode, enabled with --mirror, the refs will not be stored in the refs/remotes/ namespace, but in refs/heads/. This option -only makes sense in bare repositories.

+only makes sense in bare repositories. If a remote uses mirror +mode, furthermore, git push will always behave as if --mirror +was passed.

rm @@ -428,7 +430,7 @@ $ git merge origin diff --git a/git-remote.txt b/git-remote.txt index 2cbd1f764..b20e85197 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -47,9 +47,11 @@ With `-m ` option, `$GIT_DIR/remotes//HEAD` is set up to point at remote's `` branch instead of whatever branch the `HEAD` at the remote repository actually points at. + -In mirror mode, enabled with `--mirror`, the refs will not be stored +In mirror mode, enabled with `\--mirror`, the refs will not be stored in the 'refs/remotes/' namespace, but in 'refs/heads/'. This option -only makes sense in bare repositories. +only makes sense in bare repositories. If a remote uses mirror +mode, furthermore, `git push` will always behave as if `\--mirror` +was passed. 'rm':: diff --git a/git-svn.html b/git-svn.html index c5b2af3a3..26d4d09ab 100644 --- a/git-svn.html +++ b/git-svn.html @@ -604,6 +604,16 @@ environment). This command has the same behaviour.

+create-ignore +
+
+

+ Recursively finds the svn:ignore property on directories and + creates matching .gitignore files. The resulting files are staged to + be committed, but are not committed. +

+
+
show-ignore
@@ -1095,7 +1105,7 @@ should be manually entered with a text-editor or using diff --git a/git-svn.txt b/git-svn.txt index bec9accc8..f4ba1056f 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -188,6 +188,12 @@ All arguments are passed directly to `git blame'. commit. All merging is assumed to have taken place independently of git-svn functions. +'create-ignore':: + + Recursively finds the svn:ignore property on directories and + creates matching .gitignore files. The resulting files are staged to + be committed, but are not committed. + 'show-ignore':: Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to diff --git a/hooks.html b/hooks.html index fd407d49a..37665b7d3 100644 --- a/hooks.html +++ b/hooks.html @@ -374,7 +374,8 @@ properties.

This hook is invoked by git-merge, which happens when a git pull is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. -This hook cannot affect the outcome of git-merge.

+This hook cannot affect the outcome of git-merge and is not executed, +if the merge failed due to conflicts.

This hook can be used in conjunction with a corresponding pre-commit hook to save and restore any form of metadata associated with the working tree (eg: permissions/ownership, ACLS, etc). See contrib/hooks/setgitperms.perl @@ -508,7 +509,7 @@ to abort.

diff --git a/hooks.txt b/hooks.txt index 1283ab4da..d89cc2226 100644 --- a/hooks.txt +++ b/hooks.txt @@ -137,7 +137,8 @@ post-merge This hook is invoked by `git-merge`, which happens when a `git pull` is done on a local repository. The hook takes a single parameter, a status flag specifying whether or not the merge being done was a squash merge. -This hook cannot affect the outcome of `git-merge`. +This hook cannot affect the outcome of `git-merge` and is not executed, +if the merge failed due to conflicts. This hook can be used in conjunction with a corresponding pre-commit hook to save and restore any form of metadata associated with the working tree diff --git a/repository-layout.html b/repository-layout.html index 07eba6e4d..3e4a9d942 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -265,7 +265,10 @@ div.exampleblock-content {

You may find these things in your git repository (.git directory for a repository associated with your working tree, or -project.git directory for a public bare repository).

+project.git directory for a public bare repository. It is +also possible to have a working tree where .git is a plain +ascii file containing gitdir: <path>, i.e. the path to the +real git repository).

objects @@ -582,7 +585,7 @@ shallow
diff --git a/repository-layout.txt b/repository-layout.txt index 693913009..bbaed2e12 100644 --- a/repository-layout.txt +++ b/repository-layout.txt @@ -3,7 +3,10 @@ git repository layout You may find these things in your git repository (`.git` directory for a repository associated with your working tree, or -`'project'.git` directory for a public 'bare' repository). +`'project'.git` directory for a public 'bare' repository. It is +also possible to have a working tree where `.git` is a plain +ascii file containing `gitdir: `, i.e. the path to the +real git repository). objects:: Object store associated with this repository. Usually