From: Junio C Hamano Date: Sat, 3 Nov 2007 02:46:46 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.5-529-ge3d6d X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ae0ab27c80a24b52c6c1bbd3fb8325cb22eb2da;p=git.git Autogenerated HTML docs for v1.5.3.5-529-ge3d6d --- diff --git a/core-tutorial.html b/core-tutorial.html index 4618ffce7..5c6766f76 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1055,7 +1055,7 @@ that branch, and do some work there.

$ git checkout mybranch
 $ echo "Work, work, work" >>hello
-$ git commit -m 'Some work.' -i hello
+$ git commit -m "Some work." -i hello

Here, we just added another line to hello, and we used a shorthand for doing both git-update-index hello and git commit by just giving the @@ -1077,7 +1077,7 @@ hasn't happened in the master branch at all. Then do

$ echo "Play, play, play" >>hello
 $ echo "Lots of fun" >>example
-$ git commit -m 'Some fun.' -i hello example
+$ git commit -m "Some fun." -i hello example

since the master branch is obviously in a much better mood.

Now, you've got two branches, and you decide that you want to merge the @@ -1885,8 +1885,8 @@ in both of them. You could merge in diff-fix first and then commit-fix next, like this:

-
$ git merge -m 'Merge fix in diff-fix' diff-fix
-$ git merge -m 'Merge fix in commit-fix' commit-fix
+
$ git merge -m "Merge fix in diff-fix" diff-fix
+$ git merge -m "Merge fix in commit-fix" commit-fix

Which would result in:

@@ -1948,7 +1948,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 5df97a1f9..99817c533 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -828,7 +828,7 @@ that branch, and do some work there. ------------------------------------------------ $ git checkout mybranch $ echo "Work, work, work" >>hello -$ git commit -m 'Some work.' -i hello +$ git commit -m "Some work." -i hello ------------------------------------------------ Here, we just added another line to `hello`, and we used a shorthand for @@ -853,7 +853,7 @@ hasn't happened in the `master` branch at all. Then do ------------ $ echo "Play, play, play" >>hello $ echo "Lots of fun" >>example -$ git commit -m 'Some fun.' -i hello example +$ git commit -m "Some fun." -i hello example ------------ since the master branch is obviously in a much better mood. @@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then 'commit-fix' next, like this: ------------ -$ git merge -m 'Merge fix in diff-fix' diff-fix -$ git merge -m 'Merge fix in commit-fix' commit-fix +$ git merge -m "Merge fix in diff-fix" diff-fix +$ git merge -m "Merge fix in commit-fix" commit-fix ------------ Which would result in: diff --git a/diff-format.txt b/diff-format.txt index 001503205..9709c35c9 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -1,5 +1,5 @@ -The output format from "git-diff-index", "git-diff-tree" and -"git-diff-files" are very similar. +The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar. These commands all compare two sets of things; what is compared differs: @@ -62,7 +62,8 @@ respectively. diff format for merges ---------------------- -"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option +"git-diff-tree", "git-diff-files" and "git-diff --raw" +can take '-c' or '--cc' option to generate diff output also for merge commits. The output differs from the format described above in the following way: @@ -86,10 +87,10 @@ Generating patches with -p -------------------------- When "git-diff-index", "git-diff-tree", or "git-diff-files" are run -with a '-p' option, they do not produce the output described above; -instead they produce a patch file. You can customize the creation -of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS -environment variables. +with a '-p' option, or "git diff" without the '--raw' option, they +do not produce the output described above; instead they produce a +patch file. You can customize the creation of such patches via the +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables. What the -p option produces is slightly different from the traditional diff format. @@ -137,8 +138,8 @@ file made it into the new one. combined diff format -------------------- -git-diff-tree and git-diff-files can take '-c' or '--cc' option -to produce 'combined diff', which looks like this: +"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or +'--cc' option to produce 'combined diff', which looks like this: ------------ diff --combined describe.c diff --git a/everyday.html b/everyday.html index aff69dc47..93c1bc425 100644 --- a/everyday.html +++ b/everyday.html @@ -442,7 +442,7 @@ Use a tarball as a starting point for a new repository. $ cd frotz $ git-init $ git add . (1) -$ git commit -m 'import of frotz source tree.' +$ git commit -m "import of frotz source tree." $ git tag v2.43 (2)
    @@ -794,7 +794,7 @@ $ git merge topic/one topic/two && git merge hold/linus (8) $ git checkout maint $ git cherry-pick master~4 (9) $ compile/test -$ git tag -s -m 'GIT 0.99.9x' v0.99.9x (10) +$ git tag -s -m "GIT 0.99.9x" v0.99.9x (10) $ git fetch ko && git show-branch master maint 'tags/ko-*' (11) $ git push ko (12) $ git push ko v0.99.9x (13) @@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/everyday.txt b/everyday.txt index 08c61b1f1..ce7c170d6 100644 --- a/everyday.txt +++ b/everyday.txt @@ -109,7 +109,7 @@ $ tar zxf frotz.tar.gz $ cd frotz $ git-init $ git add . <1> -$ git commit -m 'import of frotz source tree.' +$ git commit -m "import of frotz source tree." $ git tag v2.43 <2> ------------ + @@ -300,7 +300,7 @@ $ git merge topic/one topic/two && git merge hold/linus <8> $ git checkout maint $ git cherry-pick master~4 <9> $ compile/test -$ git tag -s -m 'GIT 0.99.9x' v0.99.9x <10> +$ git tag -s -m "GIT 0.99.9x" v0.99.9x <10> $ git fetch ko && git show-branch master maint 'tags/ko-*' <11> $ git push ko <12> $ git push ko v0.99.9x <13> diff --git a/git-add.html b/git-add.html index 8b9d24f24..b491d5701 100644 --- a/git-add.html +++ b/git-add.html @@ -316,7 +316,7 @@ commit.

    --n +-n, --dry-run

    @@ -324,7 +324,7 @@ commit.

    --v +-v, --verbose

    @@ -570,7 +570,7 @@ diff

    diff --git a/git-add.txt b/git-add.txt index 2fe735555..963e1ab1e 100644 --- a/git-add.txt +++ b/git-add.txt @@ -50,10 +50,10 @@ OPTIONS and `dir/file2`) can be given to add all files in the directory, recursively. --n:: +-n, \--dry-run:: Don't actually add the file(s), just show if they exist. --v:: +-v, \--verbose:: Be verbose. -f:: diff --git a/git-branch.html b/git-branch.html index 4229be714..957b9da8e 100644 --- a/git-branch.html +++ b/git-branch.html @@ -396,7 +396,7 @@ to delete remote-tracking branches.

    --v +-v, --verbose

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

    diff --git a/git-branch.txt b/git-branch.txt index b7285bcdb..5e81aa4ee 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -85,7 +85,7 @@ OPTIONS -a:: List both remote-tracking branches and local branches. --v:: +-v, --verbose:: Show sha1 and commit subject line for each head. --abbrev=:: diff --git a/git-diff-files.html b/git-diff-files.html index 41c6bc487..f1fcd2ed6 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -739,8 +739,8 @@ omit diff output for unmerged entries and just show "Unmerged".

    Output format

    -

    The output format from "git-diff-index", "git-diff-tree" and -"git-diff-files" are very similar.

    +

    The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.

    These commands all compare two sets of things; what is compared differs:

    @@ -878,7 +878,8 @@ respectively.

    diff format for merges

    -

    "git-diff-tree" and "git-diff-files" can take -c or --cc option +

    "git-diff-tree", "git-diff-files" and "git-diff --raw" +can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

      @@ -919,10 +920,10 @@ all parents.

      Generating patches with -p

      When "git-diff-index", "git-diff-tree", or "git-diff-files" are run -with a -p option, they do not produce the output described above; -instead they produce a patch file. You can customize the creation -of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS -environment variables.

      +with a -p option, or "git diff" without the --raw option, they +do not produce the output described above; instead they produce a +patch file. You can customize the creation of such patches via the +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

      What the -p option produces is slightly different from the traditional diff format.

        @@ -979,8 +980,8 @@ file made it into the new one.

      combined diff format

      -

      git-diff-tree and git-diff-files can take -c or --cc option -to produce combined diff, which looks like this:

      +

      "git-diff-tree", "git-diff-files" and "git-diff" can take -c or +--cc option to produce combined diff, which looks like this:

      diff --combined describe.c
@@ -1113,7 +1114,7 @@ two unresolved merge parents with the working tree file
      diff --git a/git-diff-index.html b/git-diff-index.html index f415f9a48..5f29967a3 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -727,8 +727,8 @@ entries in the index are compared.

      Output format

      -

      The output format from "git-diff-index", "git-diff-tree" and -"git-diff-files" are very similar.

      +

      The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.

      These commands all compare two sets of things; what is compared differs:

      @@ -866,7 +866,8 @@ respectively.

      diff format for merges

      -

      "git-diff-tree" and "git-diff-files" can take -c or --cc option +

      "git-diff-tree", "git-diff-files" and "git-diff --raw" +can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

        @@ -907,10 +908,10 @@ all parents.

        Generating patches with -p

        When "git-diff-index", "git-diff-tree", or "git-diff-files" are run -with a -p option, they do not produce the output described above; -instead they produce a patch file. You can customize the creation -of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS -environment variables.

        +with a -p option, or "git diff" without the --raw option, they +do not produce the output described above; instead they produce a +patch file. You can customize the creation of such patches via the +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

        What the -p option produces is slightly different from the traditional diff format.

          @@ -967,8 +968,8 @@ file made it into the new one.

        combined diff format

        -

        git-diff-tree and git-diff-files can take -c or --cc option -to produce combined diff, which looks like this:

        +

        "git-diff-tree", "git-diff-files" and "git-diff" can take -c or +--cc option to produce combined diff, which looks like this:

        diff --combined describe.c
@@ -1195,7 +1196,7 @@ always have the special all-zero sha1.
        diff --git a/git-diff-tree.html b/git-diff-tree.html index 02401c308..a1448a5a0 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1209,8 +1209,8 @@ HEAD commits it finds, which is even more interesting.

        Output format

        -

        The output format from "git-diff-index", "git-diff-tree" and -"git-diff-files" are very similar.

        +

        The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.

        These commands all compare two sets of things; what is compared differs:

        @@ -1348,7 +1348,8 @@ respectively.

        diff format for merges

        -

        "git-diff-tree" and "git-diff-files" can take -c or --cc option +

        "git-diff-tree", "git-diff-files" and "git-diff --raw" +can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

          @@ -1389,10 +1390,10 @@ all parents.

          Generating patches with -p

          When "git-diff-index", "git-diff-tree", or "git-diff-files" are run -with a -p option, they do not produce the output described above; -instead they produce a patch file. You can customize the creation -of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS -environment variables.

          +with a -p option, or "git diff" without the --raw option, they +do not produce the output described above; instead they produce a +patch file. You can customize the creation of such patches via the +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

          What the -p option produces is slightly different from the traditional diff format.

            @@ -1449,8 +1450,8 @@ file made it into the new one.

          combined diff format

          -

          git-diff-tree and git-diff-files can take -c or --cc option -to produce combined diff, which looks like this:

          +

          "git-diff-tree", "git-diff-files" and "git-diff" can take -c or +--cc option to produce combined diff, which looks like this:

          diff --combined describe.c
@@ -1583,7 +1584,7 @@ two unresolved merge parents with the working tree file
          diff --git a/git-diff.html b/git-diff.html index 57ac59bd9..22a1cb03f 100644 --- a/git-diff.html +++ b/git-diff.html @@ -786,6 +786,369 @@ and the range notations ("<commit>..<commit>" and
    +

    Output format

    +
    +

    The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.

    +

    These commands all compare two sets of things; what is +compared differs:

    +
    +
    +git-diff-index <tree-ish> +
    +
    +

    + compares the <tree-ish> and the files on the filesystem. +

    +
    +
    +git-diff-index --cached <tree-ish> +
    +
    +

    + compares the <tree-ish> and the index. +

    +
    +
    +git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…] +
    +
    +

    + compares the trees named by the two arguments. +

    +
    +
    +git-diff-files [<pattern>…] +
    +
    +

    + compares the index and the files on the filesystem. +

    +
    +
    +

    An output line is formatted this way:

    +
    +
    +
    in-place edit  :100644 100644 bcd1234... 0123456... M file0
+copy-edit      :100644 100644 abcd123... 1234567... C68 file1 file2
+rename-edit    :100644 100644 abcd123... 1234567... R86 file1 file3
+create         :000000 100644 0000000... 1234567... A file4
+delete         :100644 000000 1234567... 0000000... D file5
+unmerged       :000000 000000 0000000... 0000000... U file6
    +
    +

    That is, from the left to the right:

    +
      +
    1. +

      +a colon. +

      +
      2. +
    2. +

      +mode for "src"; 000000 if creation or unmerged. +

      +
      3. +
    3. +

      +a space. +

      +
      4. +
    4. +

      +mode for "dst"; 000000 if deletion or unmerged. +

      +
      5. +
    5. +

      +a space. +

      +
      6. +
    6. +

      +sha1 for "src"; 0{40} if creation or unmerged. +

      +
      7. +
    7. +

      +a space. +

      +
      8. +
    8. +

      +sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree". +

      +
      9. +
    9. +

      +a space. +

      +
      10. +
    10. +

      +status, followed by optional "score" number. +

      +
      11. +
    11. +

      +a tab or a NUL when -z option is used. +

      +
      12. +
    12. +

      +path for "src" +

      +
      13. +
    13. +

      +a tab or a NUL when -z option is used; only exists for C or R. +

      +
      14. +
    14. +

      +path for "dst"; only exists for C or R. +

      +
      15. +
    15. +

      +an LF or a NUL when -z option is used, to terminate the record. +

      +
      16. +
    +

    <sha1> is shown as all 0's if a file is new on the filesystem +and it is out of sync with the index.

    +

    Example:

    +
    +
    +
    :100644 100644 5be4a4...... 000000...... M file.c
    +
    +

    When -z option is not used, TAB, LF, and backslash characters +in pathnames are represented as \t, \n, and \\, +respectively.

    +
    +

    diff format for merges

    +
    +

    "git-diff-tree", "git-diff-files" and "git-diff --raw" +can take -c or --cc option +to generate diff output also for merge commits. The output differs +from the format described above in the following way:

    +
      +
    1. +

      +there is a colon for each parent +

      +
      2. +
    2. +

      +there are more "src" modes and "src" sha1 +

      +
      3. +
    3. +

      +status is concatenated status characters for each parent +

      +
      4. +
    4. +

      +no optional "score" number +

      +
      5. +
    5. +

      +single path, only for "dst" +

      +
      6. +
    +

    Example:

    +
    +
    +
    ::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM      describe.c
    +
    +

    Note that combined diff lists only files which were modified from +all parents.

    +
    +

    Generating patches with -p

    +
    +

    When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +with a -p option, or "git diff" without the --raw option, they +do not produce the output described above; instead they produce a +patch file. You can customize the creation of such patches via the +GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

    +

    What the -p option produces is slightly different from the traditional +diff format.

    +
      +
    1. +

      +It is preceded with a "git diff" header, that looks like + this: +

      +
      +
      +
      diff --git a/file1 b/file2
      +
      +

      The a/ and b/ filenames are the same unless rename/copy is +involved. Especially, even for a creation or a deletion, +/dev/null is _not_ used in place of a/ or b/ filenames.

      +

      When rename/copy is involved, file1 and file2 show the +name of the source file of the rename/copy and the name of +the file that rename/copy produces, respectively.

      +
      2. +
    2. +

      +It is followed by one or more extended header lines: +

      +
      +
      +
      old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>..<hash> <mode>
      +
      +
      3. +
    3. +

      +TAB, LF, double quote and backslash characters in pathnames + are represented as \t, \n, \" and \\, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes. +

      +
      4. +
    +

    The similarity index is the percentage of unchanged lines, and +the dissimilarity index is the percentage of changed lines. It +is a rounded down integer, followed by a percent sign. The +similarity index value of 100% is thus reserved for two equal +files, while 100% dissimilarity means that no line from the old +file made it into the new one.

    +
    +

    combined diff format

    +
    +

    "git-diff-tree", "git-diff-files" and "git-diff" can take -c or +--cc option to produce combined diff, which looks like this:

    +
    +
    +
    diff --combined describe.c
+index fabadb8,cc95eb0..4866510
+--- a/describe.c
++++ b/describe.c
+@@@ -98,20 -98,12 +98,20 @@@
+        return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
+  }
+
+- static void describe(char *arg)
+ -static void describe(struct commit *cmit, int last_one)
+++static void describe(char *arg, int last_one)
+  {
+ +      unsigned char sha1[20];
+ +      struct commit *cmit;
+        struct commit_list *list;
+        static int initialized = 0;
+        struct commit_name *n;
+
+ +      if (get_sha1(arg, sha1) < 0)
+ +              usage(describe_usage);
+ +      cmit = lookup_commit_reference(sha1);
+ +      if (!cmit)
+ +              usage(describe_usage);
+ +
+        if (!initialized) {
+                initialized = 1;
+                for_each_ref(get_name);
    +
    +
      +
    1. +

      +It is preceded with a "git diff" header, that looks like + this (when -c option is used): +

      +
      +
      +
      diff --combined file
      +
      +

      or like this (when --cc option is used):

      +
      +
      +
      diff --c file
      +
      +
      2. +
    2. +

      +It is followed by one or more extended header lines + (this example shows a merge with two parents): +

      +
      +
      +
      index <hash>,<hash>..<hash>
+mode <mode>,<mode>..<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>
      +
      +

      The mode <mode>,<mode>..<mode> line appears only if at least one of +the <mode> is different from the rest. Extended headers with +information about detected contents movement (renames and +copying detection) are designed to work with diff of two +<tree-ish> and are not used by combined diff format.

      +
      3. +
    3. +

      +It is followed by two-line from-file/to-file header +

      +
      +
      +
      --- a/file
++++ b/file
      +
      +

      Similar to two-line header for traditional unified diff +format, /dev/null is used to signal created or deleted +files.

      +
      4. +
    4. +

      +Chunk header format is modified to prevent people from + accidentally feeding it to patch -p1. Combined diff format + was created for review of merge commit changes, and was not + meant for apply. The change is similar to the change in the + extended index header: +

      +
      +
      +
      @@@ <from-file-range> <from-file-range> <to-file-range> @@@
      +
      +

      There are (number of parents + 1) @ characters in the chunk +header for combined diff format.

      +
      5. +
    +

    Unlike the traditional unified diff format, which shows two +files A and B with a single column that has - (minus — +appears in A but removed in B), + (plus — missing in A but +added to B), or " " (space — unchanged) prefix, this format +compares two or more files file1, file2,… with one file X, and +shows how X differs from each of fileN. One column for each of +fileN is prepended to the output line to note how X's line is +different from it.

    +

    A - character in the column N means that the line appears in +fileN but it does not appear in the result. A + character +in the column N means that the line appears in the last file, +and fileN does not have that line (in other words, the line was +added, from the point of view of that parent).

    +

    In the above example output, the function signature was changed +from both files (hence two - removals from both file1 and +file2, plus ++ to mean one line that was added does not appear +in either file1 nor file2). Also two other lines are the same +from file1 but do not appear in file2 (hence prefixed with +).

    +

    When shown by git diff-tree -c, it compares the parents of a +merge commit with the merge result (i.e. file1..fileN are the +parents). When shown by git diff-files -c, it compares the +two unresolved merge parents with the working tree file +(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka +"their version").

    +

    EXAMPLES

    @@ -948,7 +1311,7 @@ Output diff in reverse.
    diff --git a/git-diff.txt b/git-diff.txt index ce0f50246..11c4216c4 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -82,6 +82,9 @@ include::diff-options.txt[] the diff to the named paths (you can give directory names and get diff for all files under them). +Output format +------------- +include::diff-format.txt[] EXAMPLES -------- diff --git a/git-filter-branch.html b/git-filter-branch.html index b601400b2..254fc57db 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -454,7 +454,7 @@ definition impossible to preserve signatures at any rate.)

    --f\|--force +-f|--force

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

    diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 385ecc900..895d75031 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -152,7 +152,7 @@ definition impossible to preserve signatures at any rate.) does this in the '.git-rewrite/' directory but you can override that choice by this parameter. --f\|--force:: +-f|--force:: `git filter-branch` refuses to start with an existing temporary directory or when there are already refs starting with 'refs/original/', unless forced. diff --git a/git-mv.html b/git-mv.html index f53d03dbe..1556fdf90 100644 --- a/git-mv.html +++ b/git-mv.html @@ -312,7 +312,7 @@ committed.

    --n +-n, --dry-run

    @@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>

    diff --git a/git-mv.txt b/git-mv.txt index 2c9cf743c..3b8ca76df 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -34,7 +34,7 @@ OPTIONS condition. An error happens when a source is neither existing nor controlled by GIT, or when it would overwrite an existing file unless '-f' is given. --n:: +-n, \--dry-run:: Do nothing; only show what would happen diff --git a/git-reset.html b/git-reset.html index c510bcd39..7b334cdb8 100644 --- a/git-reset.html +++ b/git-reset.html @@ -522,7 +522,7 @@ need to get to the other branch for a quick bugfix.

    $ git checkout feature ;# you were working in "feature" branch and
 $ work work work       ;# got interrupted
-$ git commit -a -m 'snapshot WIP'                 (1)
+$ git commit -a -m "snapshot WIP"                 (1)
 $ git checkout master
 $ fix fix fix
 $ git commit ;# commit with real log
@@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you
    diff --git a/git-reset.txt b/git-reset.txt index 15e3aca9a..87afa6f8d 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -157,7 +157,7 @@ need to get to the other branch for a quick bugfix. ------------ $ git checkout feature ;# you were working in "feature" branch and $ work work work ;# got interrupted -$ git commit -a -m 'snapshot WIP' <1> +$ git commit -a -m "snapshot WIP" <1> $ git checkout master $ fix fix fix $ git commit ;# commit with real log diff --git a/git-rm.html b/git-rm.html index 3b5a56c27..6e063c6e1 100644 --- a/git-rm.html +++ b/git-rm.html @@ -306,7 +306,7 @@ match either the tip of the branch or the file on disk.

    --n +-n, --dry-run

    @@ -352,7 +352,7 @@ match either the tip of the branch or the file on disk.

    ---quiet +-q, --quiet

    @@ -415,7 +415,7 @@ git-rm -f git-*.sh

    diff --git a/git-rm.txt b/git-rm.txt index be61a8216..48c1d97f9 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -30,7 +30,7 @@ OPTIONS -f:: Override the up-to-date check. --n:: +-n, \--dry-run:: Don't actually remove the file(s), just show if they exist in the index. @@ -51,7 +51,7 @@ OPTIONS \--ignore-unmatch:: Exit with a zero status even if no files matched. -\--quiet:: +-q, \--quiet:: git-rm normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output. diff --git a/git-stripspace.html b/git-stripspace.html index 04bb82d12..6715d85fc 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -282,7 +282,7 @@ git-stripspace(1) Manual Page
    --s\|--strip-comments +-s|--strip-comments

    @@ -313,7 +313,7 @@ git-stripspace(1) Manual Page

    diff --git a/git-stripspace.txt b/git-stripspace.txt index 521235830..f80526ba7 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt @@ -16,7 +16,7 @@ Remove multiple empty lines, and empty lines at beginning and end. OPTIONS ------- --s\|--strip-comments:: +-s|--strip-comments:: In addition to empty lines, also strip lines starting with '#'. :: diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 4b78b8348..d922ccf4c 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -290,7 +290,7 @@ a regular file whose contents is ref: refs/heads/master.

    --q +-q, --quiet

    @@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.

    diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index a88f72286..694cabab2 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -26,7 +26,7 @@ a regular file whose contents is `ref: refs/heads/master`. OPTIONS ------- --q:: +-q, --quiet:: Do not issue an error message if the is not a symbolic ref but a detached HEAD; instead exit with non-zero status silently.