From 9e39507860f707da6967f6e2cdec8974241d9918 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 31 Jul 2008 22:11:21 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc1-34-g0fe8c --- git-clean.html | 8 +-- git-clean.txt | 6 +- git-describe.html | 6 +- git-describe.txt | 4 +- git-filter-branch.html | 4 +- git-filter-branch.txt | 2 +- git-for-each-ref.html | 4 +- git-for-each-ref.txt | 2 +- git-log.html | 8 +-- git-log.txt | 6 +- git-merge.html | 6 +- git-merge.txt | 4 +- git-send-email.html | 144 +++++++++++++++++++++++++++-------------- git-send-email.txt | 2 +- git-show-ref.html | 4 +- git-show-ref.txt | 2 +- git-show.html | 6 +- git-show.txt | 4 +- git-submodule.html | 6 +- git-submodule.txt | 4 +- git-verify-tag.html | 6 +- git-verify-tag.txt | 4 +- gitk.html | 4 +- gitk.txt | 2 +- user-manual.html | 21 +++--- user-manual.txt | 27 ++++++-- 26 files changed, 182 insertions(+), 114 deletions(-) diff --git a/git-clean.html b/git-clean.html index 0fc3e0c28..3e3fd1eb1 100644 --- a/git-clean.html +++ b/git-clean.html @@ -321,7 +321,7 @@ git-clean(1) Manual Page

SYNOPSIS

-
git clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>…
+
git clean [-d] [-f] [-n] [-q] [-x | -X] [--] <path>…

DESCRIPTION

@@ -329,8 +329,8 @@ git-clean(1) Manual Page from files that are not under version control. If the -x option is specified, ignored files are also removed, allowing to remove all build products. -When optional <paths>… arguments are given, the paths -affected are further limited to those that match them.

+If any optional <path>… arguments are given, only those paths +are affected.

OPTIONS

@@ -407,7 +407,7 @@ affected are further limited to those that match them.

diff --git a/git-clean.txt b/git-clean.txt index 7dcc1ba58..8a114509f 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree SYNOPSIS -------- [verse] -'git clean' [-d] [-f] [-n] [-q] [-x | -X] [--] ... +'git clean' [-d] [-f] [-n] [-q] [-x | -X] [--] ... DESCRIPTION ----------- @@ -16,8 +16,8 @@ Removes files unknown to git. This allows to clean the working tree from files that are not under version control. If the '-x' option is specified, ignored files are also removed, allowing to remove all build products. -When optional `...` arguments are given, the paths -affected are further limited to those that match them. +If any optional `...` arguments are given, only those paths +are affected. OPTIONS diff --git a/git-describe.html b/git-describe.html index 3acc7ab2b..5aa3de89e 100644 --- a/git-describe.html +++ b/git-describe.html @@ -334,11 +334,11 @@ abbreviated object name of the most recent commit.

-<committish> +<committish>…

- The object name of the committish. + Committish object names to describe.

@@ -518,7 +518,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index 7fdda04ba..c4dbc2ae3 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -21,8 +21,8 @@ abbreviated object name of the most recent commit. OPTIONS ------- -:: - The object name of the committish. +...:: + Committish object names to describe. --all:: Instead of using only the annotated tags, use any ref diff --git a/git-filter-branch.html b/git-filter-branch.html index 4567d3b2f..799e37052 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -524,7 +524,7 @@ to other tags will be rewritten to point to the underlying commit.

-<rev-list-options> +<rev-list options>…

@@ -665,7 +665,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 7ba9dab5e..a518ba607 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -167,7 +167,7 @@ to other tags will be rewritten to point to the underlying commit. directory or when there are already refs starting with 'refs/original/', unless forced. -:: +...:: When options are given after the new branch name, they will be passed to 'git-rev-list'. Only commits in the resulting output will be filtered, although the filtered commits can still diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 1d6986992..e029e56ef 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -376,7 +376,7 @@ host language allowing their direct evaluation in that language.

-<pattern> +<pattern>…

@@ -553,7 +553,7 @@ eval "$eval"

diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index 727d84e67..609f9496b 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -47,7 +47,7 @@ OPTIONS `xx`; for example `%00` interpolates to `\0` (NUL), `%09` to `\t` (TAB) and `%0a` to `\n` (LF). -:: +...:: If one or more patterns are given, only refs are shown that match againt at least one pattern, either using fnmatch(3) or literally, in the latter case matching completely or from the diff --git a/git-log.html b/git-log.html index d6f956bc5..12a4dd159 100644 --- a/git-log.html +++ b/git-log.html @@ -842,10 +842,10 @@ each commit introduces are shown.

- Without this flag, "git log -p <paths>…" shows commits that + Without this flag, "git log -p <path>…" shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch - the specified paths; this means that "<paths>…" limits only + the specified paths; this means that "<path>…" limits only commits, and doesn't limit diff for those commits.

@@ -870,7 +870,7 @@ each commit introduces are shown.

-<paths>… +<path>…

@@ -2030,7 +2030,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 05cbac56a..0446bad7e 100644 --- a/git-log.txt +++ b/git-log.txt @@ -41,10 +41,10 @@ include::diff-options.txt[] Print out the ref names of any commits that are shown. --full-diff:: - Without this flag, "git log -p ..." shows commits that + Without this flag, "git log -p ..." shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch - the specified paths; this means that "..." limits only + the specified paths; this means that "..." limits only commits, and doesn't limit diff for those commits. --follow:: @@ -57,7 +57,7 @@ include::diff-options.txt[] Note that only message is considered, if also a diff is shown its size is not included. -...:: +...:: Show only commits that affect any of the specified paths. diff --git a/git-merge.html b/git-merge.html index ee1fdfbdc..3ebfdcafb 100644 --- a/git-merge.html +++ b/git-merge.html @@ -474,11 +474,11 @@ new scripts. It is the same as git merge -m <msg> <remote>

-<remote> +<remote>…

- Other branch head merged into our branch. You need at + Other branch heads to merge into our branch. You need at least one <remote>. Specifying more than one <remote> obviously means you are trying an Octopus.

@@ -801,7 +801,7 @@ Resolve the conflicts. git diff would report only the diff --git a/git-merge.txt b/git-merge.txt index 2db888098..17a15acb0 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -32,8 +32,8 @@ include::merge-options.txt[] it is created). The 'git-fmt-merge-msg' script can be used to give a good default for automated 'git-merge' invocations. -:: - Other branch head merged into our branch. You need at +...:: + Other branch heads to merge into our branch. You need at least one . Specifying more than one obviously means you are trying an Octopus. diff --git a/git-send-email.html b/git-send-email.html index d92f086d5..0c064b4e8 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -3,7 +3,7 @@ - + git-send-email(1) @@ -272,19 +320,19 @@ git-send-email(1) Manual Page

SYNOPSIS

-

git send-email [options] <file|directory> [… file|directory]

+

git send-email [options] <file|directory> [… file|directory]

-

DESCRIPTION

+

DESCRIPTION

-

Takes the patches given on the command line and emails them out.

-

The header of the email is configurable by command line options. If not +

Takes the patches given on the command line and emails them out.

+

The header of the email is configurable by command line options. If not specified on the command line, the user will be prompted with a ReadLine -enabled interface to provide the necessary information.

+enabled interface to provide the necessary information.

-

OPTIONS

+

OPTIONS

-

The options available are:

-
+

The options available are:

+
--bcc
@@ -292,7 +340,7 @@ enabled interface to provide the necessary information.

Specify a "Bcc:" value for each email.

-

The --bcc option must be repeated for each user you want on the bcc list.

+

The --bcc option must be repeated for each user you want on the bcc list.

--cc @@ -301,7 +349,7 @@ enabled interface to provide the necessary information.

Specify a starting "Cc:" value for each email.

-

The --cc option must be repeated for each user you want on the cc list.

+

The --cc option must be repeated for each user you want on the cc list.

--cc-cmd @@ -346,7 +394,7 @@ enabled interface to provide the necessary information.

Specify the sender of the emails. This will default to - the value GIT_COMMITTER_IDENT, as returned by "git-var -l". + the value GIT_COMMITTER_IDENT, as returned by "git var -l". The user will still be prompted to confirm this entry.

@@ -429,7 +477,7 @@ enabled interface to provide the necessary information.

Username for SMTP-AUTH. In place of this option, the following configuration variables can be specified:

-
    +

    • sendemail.smtpuser @@ -440,10 +488,10 @@ sendemail.smtpuser sendemail.<identity>.smtpuser (see sendemail.identity).

      • -
    -

    However, --smtp-user always overrides these variables.

    -

    If a username is not specified (with --smtp-user or a -configuration variable), then authentication is not attempted.

    +
+

However, --smtp-user always overrides these variables.

+

If a username is not specified (with --smtp-user or a +configuration variable), then authentication is not attempted.

--smtp-pass @@ -454,9 +502,9 @@ configuration variable), then authentication is not attempted.

argument is specified, then the empty string is used as the password.

-

In place of this option, the following configuration variables -can be specified:

-
    +

    In place of this option, the following configuration variables +can be specified:

    +

    • sendemail.smtppass @@ -467,13 +515,13 @@ sendemail.smtppass sendemail.<identity>.smtppass (see sendemail.identity).

      • -
    -

    However, --smtp-pass always overrides these variables.

    -

    Furthermore, passwords need not be specified in configuration files +

+

However, --smtp-pass always overrides these variables.

+

Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with --smtp-user or a configuration variable), but no password has been specified (with --smtp-pass or a configuration variable), then the -user is prompted for a password while the input is masked for privacy.

+user is prompted for a password while the input is masked for privacy.

--smtp-encryption @@ -577,13 +625,13 @@ user is prompted for a password while the input is masked for privacy.

Default is the value of the sendemail.to configuration value; if that is unspecified, this will be prompted for.

-

The --to option must be repeated for each user you want on the to list.

+

The --to option must be repeated for each user you want on the to list.

- + -

CONFIGURATION

+

CONFIGURATION

-
+
sendemail.identity
@@ -697,25 +745,25 @@ sendemail.smtpssl Legacy boolean that sets smtpencryption=ssl if enabled.

-
+
-

Author

+

Author

-

Written by Ryan Anderson <ryan@michonline.com>

-

git-send-email is originally based upon -send_lots_of_email.pl by Greg Kroah-Hartman.

+

Written by Ryan Anderson <ryan@michonline.com>

+

git-send-email is originally based upon +send_lots_of_email.pl by Greg Kroah-Hartman.

-

Documentation

+

Documentation

-

Documentation by Ryan Anderson

+

Documentation by Ryan Anderson

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-send-email.txt b/git-send-email.txt index afbb294a7..e2437f30c 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -56,7 +56,7 @@ The --cc option must be repeated for each user you want on the cc list. --from:: Specify the sender of the emails. This will default to - the value GIT_COMMITTER_IDENT, as returned by "git-var -l". + the value GIT_COMMITTER_IDENT, as returned by "git var -l". The user will still be prompted to confirm this entry. --in-reply-to:: diff --git a/git-show-ref.html b/git-show-ref.html index e33bf3631..0ee63252e 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -440,7 +440,7 @@ in the .git directory.

-<pattern> +<pattern>…

@@ -529,7 +529,7 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

diff --git a/git-show-ref.txt b/git-show-ref.txt index 9a4389981..2f173fff3 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt @@ -84,7 +84,7 @@ OPTIONS (5) otherwise output the line. -:: +...:: Show references matching one or more patterns. diff --git a/git-show.html b/git-show.html index fc6d5d73a..735cbe214 100644 --- a/git-show.html +++ b/git-show.html @@ -340,11 +340,11 @@ control how the changes the commit introduces are shown.

-<object> +<object>…

- The name of the object to show. + The names of objects to show. For a more complete list of ways to spell object names, see "SPECIFYING REVISIONS" section in git-rev-parse(1).

@@ -850,7 +850,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

diff --git a/git-show.txt b/git-show.txt index 1642cfd82..48b612e2a 100644 --- a/git-show.txt +++ b/git-show.txt @@ -33,8 +33,8 @@ This manual page describes only the most frequently used options. OPTIONS ------- -:: - The name of the object to show. +...:: + The names of objects to show. For a more complete list of ways to spell object names, see "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. diff --git a/git-submodule.html b/git-submodule.html index d13362077..4d00e64cf 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -504,11 +504,11 @@ summary

-<path> +<path>…

- Path to submodule(s). When specified this will restrict the command + Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add).

@@ -533,7 +533,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 35efeefb3..bf33b0cba 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -146,8 +146,8 @@ OPTIONS (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules. -:: - Path to submodule(s). When specified this will restrict the command +...:: + Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add). diff --git a/git-verify-tag.html b/git-verify-tag.html index 6b0e06fba..82a3be4df 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -330,11 +330,11 @@ git-verify-tag(1) Manual Page
-<tag> +<tag>…

- SHA1 identifier of a git tag object. + SHA1 identifiers of git tag objects.

@@ -353,7 +353,7 @@ git-verify-tag(1) Manual Page
diff --git a/git-verify-tag.txt b/git-verify-tag.txt index ba837df4b..84e70a023 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt @@ -15,8 +15,8 @@ Validates the gpg signature created by 'git-tag'. OPTIONS ------- -:: - SHA1 identifier of a git tag object. +...:: + SHA1 identifiers of git tag objects. Author ------ diff --git a/gitk.html b/gitk.html index 421726883..e172903ea 100644 --- a/gitk.html +++ b/gitk.html @@ -397,7 +397,7 @@ frequently used options.

-<path> +<path>…

@@ -492,7 +492,7 @@ such as display options, font, and colors.

diff --git a/gitk.txt b/gitk.txt index e02ecf574..6e827cd11 100644 --- a/gitk.txt +++ b/gitk.txt @@ -58,7 +58,7 @@ frequently used options. For a more complete list of ways to spell object names, see "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1]. -:: +...:: Limit commits to the ones touching files in the given paths. Note, to avoid ambiguity wrt. revision names use "--" to separate the paths diff --git a/user-manual.html b/user-manual.html index 35cef3557..b33e2e8a4 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,4 +1,4 @@ -Git User's Manual (for version 1.5.3 or newer)

Git User's Manual (for version 1.5.3 or newer)

Table of Contents

Preface
1. Repositories and Branches
How to get a git repository
How to check out a different version of a project
Understanding History: Commits
Understanding history: commits, parents, and reachability
Understanding history: History diagrams
Understanding history: What is a branch?
Manipulating branches
Examining an old version without creating a new branch
Examining branches from a remote repository
Naming branches, tags, and other references
Updating a repository with git-fetch
Fetching branches from other repositories
2. Exploring git history
How to use bisect to find a regression
Naming commits
Creating tags
Browsing revisions
Generating diffs
Viewing old file versions
Examples
Counting the number of commits on a branch
Check whether two branches point at the same history
Find first tagged version including a given fix
Showing commits unique to a given branch
Creating a changelog and tarball for a software release
Finding commits referencing a file with given content
3. Developing with git
Telling git your name
Creating a new repository
How to make a commit
Creating good commit messages
Ignoring files
How to merge
Resolving a merge
Getting conflict-resolution help during a merge
Undoing a merge
Fast-forward merges
Fixing mistakes
Fixing a mistake with a new commit
Fixing a mistake by rewriting history
Checking out an old version of a file
Temporarily setting aside work in progress
Ensuring good performance
Ensuring reliability
Checking the repository for corruption
Recovering lost changes
4. Sharing development with others
Getting updates with git-pull
Submitting patches to a project
Importing patches to a project
Public git repositories
Setting up a public repository
Exporting a git repository via the git protocol
Exporting a git repository via http
Pushing changes to a public repository
What to do when a push fails
Setting up a shared repository
Allowing web browsing of a repository
Examples
Maintaining topic branches for a Linux subsystem maintainer
5. Rewriting history and maintaining patch series
Creating the perfect patch series
Keeping a patch series up to date using git-rebase
Rewriting a single commit
Reordering or selecting from a patch series
Other tools
Problems with rewriting history
Why bisecting merge commits can be harder than bisecting linear history
6. Advanced branch management
Fetching individual branches
git fetch and fast-forwards
Forcing git-fetch to do non-fast-forward updates
Configuring remote branches
7. Git concepts
The Object Database
Commit Object
Tree Object
Blob Object
Trust
Tag Object
How git stores objects efficiently: pack files
Dangling objects
Recovering from repository corruption
The index
8. Submodules
Pitfalls with submodules
9. Low-level git operations
Object access and manipulation
The Workflow
working directory -> index
index -> object database
object database -> index
index -> working directory
Tying it all together
Examining the data
Merging multiple trees
Merging multiple trees, continued
10. Hacking git
Object storage format
A birds-eye view of Git's source code
11. GIT Glossary
A. Git Quick Reference
Creating a new repository
Managing branches
Exploring history
Making changes
Merging
Sharing your changes
Repository maintenance
B. Notes and todo list for this manual

Preface

Git is a fast distributed revision control system.

This manual is designed to be readable by someone with basic UNIX +Git User's Manual (for version 1.5.3 or newer)

Git User's Manual (for version 1.5.3 or newer)

Table of Contents

Preface
1. Repositories and Branches
How to get a git repository
How to check out a different version of a project
Understanding History: Commits
Understanding history: commits, parents, and reachability
Understanding history: History diagrams
Understanding history: What is a branch?
Manipulating branches
Examining an old version without creating a new branch
Examining branches from a remote repository
Naming branches, tags, and other references
Updating a repository with git-fetch
Fetching branches from other repositories
2. Exploring git history
How to use bisect to find a regression
Naming commits
Creating tags
Browsing revisions
Generating diffs
Viewing old file versions
Examples
Counting the number of commits on a branch
Check whether two branches point at the same history
Find first tagged version including a given fix
Showing commits unique to a given branch
Creating a changelog and tarball for a software release
Finding commits referencing a file with given content
3. Developing with git
Telling git your name
Creating a new repository
How to make a commit
Creating good commit messages
Ignoring files
How to merge
Resolving a merge
Getting conflict-resolution help during a merge
Undoing a merge
Fast-forward merges
Fixing mistakes
Fixing a mistake with a new commit
Fixing a mistake by rewriting history
Checking out an old version of a file
Temporarily setting aside work in progress
Ensuring good performance
Ensuring reliability
Checking the repository for corruption
Recovering lost changes
4. Sharing development with others
Getting updates with git-pull
Submitting patches to a project
Importing patches to a project
Public git repositories
Setting up a public repository
Exporting a git repository via the git protocol
Exporting a git repository via http
Pushing changes to a public repository
What to do when a push fails
Setting up a shared repository
Allowing web browsing of a repository
Examples
Maintaining topic branches for a Linux subsystem maintainer
5. Rewriting history and maintaining patch series
Creating the perfect patch series
Keeping a patch series up to date using git-rebase
Rewriting a single commit
Reordering or selecting from a patch series
Other tools
Problems with rewriting history
Why bisecting merge commits can be harder than bisecting linear history
6. Advanced branch management
Fetching individual branches
git fetch and fast-forwards
Forcing git-fetch to do non-fast-forward updates
Configuring remote branches
7. Git concepts
The Object Database
Commit Object
Tree Object
Blob Object
Trust
Tag Object
How git stores objects efficiently: pack files
Dangling objects
Recovering from repository corruption
The index
8. Submodules
Pitfalls with submodules
9. Low-level git operations
Object access and manipulation
The Workflow
working directory -> index
index -> object database
object database -> index
index -> working directory
Tying it all together
Examining the data
Merging multiple trees
Merging multiple trees, continued
10. Hacking git
Object storage format
A birds-eye view of Git's source code
11. GIT Glossary
A. Git Quick Reference
Creating a new repository
Managing branches
Exploring history
Making changes
Merging
Sharing your changes
Repository maintenance
B. Notes and todo list for this manual

Preface

Git is a fast distributed revision control system.

This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of git.

Chapter 1, Repositories and Branches and Chapter 2, Exploring git history explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -238,10 +238,10 @@ $ git bisect good v2.6.18
$ git bisect bad master
Bisecting: 3537 revisions left to test after this
[65934a9a028b88e83e2b0f8b36618fe503349f8e] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6]

If you run "git branch" at this point, you'll see that git has -temporarily moved you to a new branch named "bisect". This branch -points to a commit (with commit id 65934…) that is reachable from -"master" but not from v2.6.18. Compile and test it, and see whether -it crashes. Assume it does crash. Then:

$ git bisect bad
+temporarily moved you in "(no branch)". HEAD is now detached from any +branch and points directly to a commit (with commit id 65934…) that +is reachable from "master" but not from v2.6.18. Compile and test it, +and see whether it crashes. Assume it does crash. Then:

$ git bisect bad
Bisecting: 1769 revisions left to test after this
[7eff82c8b1511017ae605f0c99ac275a7e21b867] i2c-core: Drop useless bitmaskings

checks out an older version. Continue like this, telling git at each stage whether the version it gives you is good or bad, and notice @@ -249,15 +249,20 @@ that the number of revisions left to test is cut approximately in half each time.

After about 13 tests (in this case), it will output the commit id of the guilty commit. You can then examine the commit with git-show(1), find out who wrote it, and mail them your bug -report with the commit id. Finally, run

$ git bisect reset

to return you to the branch you were on before and delete the -temporary "bisect" branch.

Note that the version which git-bisect checks out for you at each +report with the commit id. Finally, run

$ git bisect reset

to return you to the branch you were on before.

Note that the version which git-bisect checks out for you at each point is just a suggestion, and you're free to try a different version if you think it would be a good idea. For example, occasionally you may land on a commit that broke something unrelated; run

$ git bisect visualize

which will run gitk and label the commit it chose with a marker that says "bisect". Choose a safe-looking commit nearby, note its commit id, and check it out with:

$ git reset --hard fb47ddb2db...

then test, run "bisect good" or "bisect bad" as appropriate, and -continue.

Naming commits

We have seen several ways of naming commits already:

  • +continue.

    Instead of "git bisect visualize" and then "git reset —hard +fb47ddb2db…", you might just want to tell git that you want to skip +the current commit:

    $ git bisect skip

    In this case, though, git may not eventually be able to tell the first +bad one between some first skipped commits and a latter bad commit.

    There are also ways to automate the bisecting process if you have a +test script that can tell a good from a bad commit. See +git-bisect(1) for more information about this and other "git +bisect" features.

Naming commits

We have seen several ways of naming commits already:

  • 40-hexdigit object name
  • branch name: refers to the commit at the head of the given diff --git a/user-manual.txt b/user-manual.txt index 00256ca57..43f4e392f 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -479,10 +479,10 @@ Bisecting: 3537 revisions left to test after this ------------------------------------------------- If you run "git branch" at this point, you'll see that git has -temporarily moved you to a new branch named "bisect". This branch -points to a commit (with commit id 65934...) that is reachable from -"master" but not from v2.6.18. Compile and test it, and see whether -it crashes. Assume it does crash. Then: +temporarily moved you in "(no branch)". HEAD is now detached from any +branch and points directly to a commit (with commit id 65934...) that +is reachable from "master" but not from v2.6.18. Compile and test it, +and see whether it crashes. Assume it does crash. Then: ------------------------------------------------- $ git bisect bad @@ -504,8 +504,7 @@ report with the commit id. Finally, run $ git bisect reset ------------------------------------------------- -to return you to the branch you were on before and delete the -temporary "bisect" branch. +to return you to the branch you were on before. Note that the version which git-bisect checks out for you at each point is just a suggestion, and you're free to try a different @@ -528,6 +527,22 @@ $ git reset --hard fb47ddb2db... then test, run "bisect good" or "bisect bad" as appropriate, and continue. +Instead of "git bisect visualize" and then "git reset --hard +fb47ddb2db...", you might just want to tell git that you want to skip +the current commit: + +------------------------------------------------- +$ git bisect skip +------------------------------------------------- + +In this case, though, git may not eventually be able to tell the first +bad one between some first skipped commits and a latter bad commit. + +There are also ways to automate the bisecting process if you have a +test script that can tell a good from a bad commit. See +linkgit:git-bisect[1] for more information about this and other "git +bisect" features. + [[naming-commits]] Naming commits -------------- -- 2.26.2