diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-09 10:56:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-09 10:56:26 -0800 |
| commit | a9645b780b698703cd7dee25051d6ce39b0544c6 (patch) | |
| tree | 4a5d6f044bfa66ce73b105089813a593637cbf1c /Documentation | |
| parent | d2d188d92203997d260e8a21695b85c18b002d8f (diff) | |
| parent | 5bcce8494a2ee09250404b8b086cbd62f9506703 (diff) | |
| download | git-a9645b780b698703cd7dee25051d6ce39b0544c6.tar.gz git-a9645b780b698703cd7dee25051d6ce39b0544c6.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: bisect: change a few instances of "git-cmd" to "git cmd"
Documentation: rev-list: change a few instances of "git-cmd" to "git cmd"
checkout: Don't crash when switching away from an invalid branch.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-bisect.txt | 6 | ||||
| -rw-r--r-- | Documentation/rev-list-options.txt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index c7981efcd..39034ec7d 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -26,7 +26,7 @@ on the subcommand: git bisect log git bisect run <cmd>... -This command uses 'git-rev-list --bisect' to help drive the +This command uses 'git rev-list --bisect' to help drive the binary search process to find which change introduced a bug, given an old "good" commit object name and a later "bad" commit object name. @@ -101,7 +101,7 @@ $ git bisect visualize to see the currently remaining suspects in 'gitk'. `visualize` is a bit too long to type and `view` is provided as a synonym. -If 'DISPLAY' environment variable is not set, 'git-log' is used +If 'DISPLAY' environment variable is not set, 'git log' is used instead. You can even give command line options such as `-p` and `--stat`. @@ -215,7 +215,7 @@ tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or work around other problem this bisection is not interested in") applied to the revision being tested. -To cope with such a situation, after the inner 'git-bisect' finds the +To cope with such a situation, after the inner 'git bisect' finds the next revision to test, with the "run" script, you can apply that tweak before compiling, run the real test, and after the test decides if the revision (possibly with the needed tweaks) passed the test, rewind the diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 966276b16..68a253f97 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -285,7 +285,7 @@ See also linkgit:git-reflog[1]. History Simplification ~~~~~~~~~~~~~~~~~~~~~~ -When optional paths are given, 'git-rev-list' simplifies commits with +When optional paths are given, 'git rev-list' simplifies commits with various strategies, according to the options you have selected. Suppose you specified `foo` as the <paths>. We shall call commits @@ -466,14 +466,14 @@ Limit output to the one commit object which is roughly halfway between the included and excluded commits. Thus, if ----------------------------------------------------------------------- - $ git-rev-list --bisect foo ^bar ^baz + $ git rev-list --bisect foo ^bar ^baz ----------------------------------------------------------------------- outputs 'midpoint', the output of the two commands ----------------------------------------------------------------------- - $ git-rev-list foo ^midpoint - $ git-rev-list midpoint ^bar ^baz + $ git rev-list foo ^midpoint + $ git rev-list midpoint ^bar ^baz ----------------------------------------------------------------------- would be of roughly the same length. Finding the change which |