From: Junio C Hamano Date: Wed, 3 Jan 2007 22:02:12 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc0-gd222 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb692951e67c8ca212ce6d14228dac6d93160801;p=git.git Autogenerated HTML docs for v1.5.0-rc0-gd222 --- diff --git a/config.txt b/config.txt index 2f4fc2525..4318bf933 100644 --- a/config.txt +++ b/config.txt @@ -145,6 +145,21 @@ branch..merge:: this option, `git pull` defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. +color.branch:: + A boolean to enable/disable color in the output of + gitlink:git-branch[1]. May be set to `true` (or `always`), + `false` (or `never`) or `auto`, in which case colors are used + only when the output is to a terminal. Defaults to false. + +color.branch.:: + Use customized color for branch coloration. `` is one of + `current` (the current branch), `local` (a local branch), + `remote` (a tracking branch in refs/remotes/), `plain` (other + refs), or `reset` (the normal terminal color). The value for + these configuration variables can be one of: `normal`, `bold`, + `dim`, `ul`, `blink`, `reverse`, `reset`, `black`, `red`, + `green`, `yellow`, `blue`, `magenta`, `cyan`, or `white`. + color.diff:: When true (or `always`), always use colors in patch. When false (or `never`), never. When set to `auto`, use @@ -155,11 +170,8 @@ color.diff.:: specifies which part of the patch to use the specified color, and is one of `plain` (context text), `meta` (metainformation), `frag` (hunk header), `old` (removed - lines), or `new` (added lines). The value for these - configuration variables can be one of: `normal`, `bold`, - `dim`, `ul`, `blink`, `reverse`, `reset`, `black`, - `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or - `white`. + lines), or `new` (added lines). The values of these + variables may be specified as in color.branch.. color.pager:: A boolean to enable/disable colored output when the pager is in @@ -177,7 +189,7 @@ color.status.:: `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), or `untracked` (files which are not tracked by git). The values of - these variables may be specified as in color.diff.. + these variables may be specified as in color.branch.. diff.renameLimit:: The number of files to consider when performing the copy/rename diff --git a/git-branch.html b/git-branch.html index f9cf223ad..924667a4c 100644 --- a/git-branch.html +++ b/git-branch.html @@ -273,7 +273,7 @@ git-branch(1) Manual Page

SYNOPSIS

-
git-branch [-r | -a] [-v [--abbrev=<length>]] +
git-branch [--color | --no-color] [-r | -a] [-v [--abbrev=<length>]] git-branch [-l] [-f] <branchname> [<start-point>] git-branch (-m | -M) [<oldbranch>] <newbranch> git-branch (-d | -D) [-r] <branchname>…
@@ -352,6 +352,23 @@ to delete remote-tracking branches.

+--color +
+
+

+ Color branches to highlight current, local, and remote branches. +

+
+
+--no-color +
+
+

+ Turn off branch colors, even when the configuration file gives the + default to color output. +

+
+
-r
@@ -494,7 +511,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index c464bd2fd..e872fc89f 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -8,7 +8,7 @@ git-branch - List, create, or delete branches. SYNOPSIS -------- [verse] -'git-branch' [-r | -a] [-v [--abbrev=]] +'git-branch' [--color | --no-color] [-r | -a] [-v [--abbrev=]] 'git-branch' [-l] [-f] [] 'git-branch' (-m | -M) [] 'git-branch' (-d | -D) [-r] ... @@ -60,6 +60,13 @@ OPTIONS -M:: Move/rename a branch even if the new branchname already exists. +--color:: + Color branches to highlight current, local, and remote branches. + +--no-color:: + Turn off branch colors, even when the configuration file gives the + default to color output. + -r:: List or delete (if used with -d) the remote-tracking branches. diff --git a/git-repo-config.html b/git-repo-config.html index ed5373e49..5510abeca 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -772,6 +772,31 @@ branch.<name>.merge

+color.branch +
+
+

+ A boolean to enable/disable color in the output of + git-branch(1). May be set to true (or always), + false (or never) or auto, in which case colors are used + only when the output is to a terminal. Defaults to false. +

+
+
+color.branch.<slot> +
+
+

+ Use customized color for branch coloration. <slot> is one of + current (the current branch), local (a local branch), + remote (a tracking branch in refs/remotes/), plain (other + refs), or reset (the normal terminal color). The value for + these configuration variables can be one of: normal, bold, + dim, ul, blink, reverse, reset, black, red, + green, yellow, blue, magenta, cyan, or white. +

+
+
color.diff
@@ -790,11 +815,8 @@ color.diff.<slot> specifies which part of the patch to use the specified color, and is one of plain (context text), meta (metainformation), frag (hunk header), old (removed - lines), or new (added lines). The value for these - configuration variables can be one of: normal, bold, - dim, ul, blink, reverse, reset, black, - red, green, yellow, blue, magenta, cyan, or - white. + lines), or new (added lines). The values of these + variables may be specified as in color.branch.<slot>.

@@ -827,7 +849,7 @@ color.status.<slot> added or updated (files which are added but not committed), changed (files which are changed but not added in the index), or untracked (files which are not tracked by git). The values of - these variables may be specified as in color.diff.<slot>. + these variables may be specified as in color.branch.<slot>.

@@ -1212,7 +1234,7 @@ receive.denyNonFastForwards
diff --git a/git-tag.html b/git-tag.html index 5977f4775..2a1259fd8 100644 --- a/git-tag.html +++ b/git-tag.html @@ -273,7 +273,7 @@ git-tag(1) Manual Page

SYNOPSIS

-
git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg> | -F <file>] +
git-tag [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg> | -F <file>] <name> [<head>] git-tag -l [<pattern>]
@@ -293,6 +293,7 @@ written (i.e. a lightweight tag).

committer identity for the current user is used to find the GnuPG key for signing.

-d <tag> deletes the tag.

+

-v <tag> verifies the gpg signature of the tag.

-l <pattern> lists tags that match the given pattern (or all if no pattern is given).

@@ -340,6 +341,14 @@ if no pattern is given).

+-v +
+
+

+ Verify the gpg signature of given the tag +

+
+
-l <pattern>
@@ -381,7 +390,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tag.txt b/git-tag.txt index 48b82b86f..80bece077 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -9,7 +9,7 @@ git-tag - Create a tag object signed with GPG SYNOPSIS -------- [verse] -'git-tag' [-a | -s | -u ] [-f | -d] [-m | -F ] +'git-tag' [-a | -s | -u ] [-f | -d | -v] [-m | -F ] [] 'git-tag' -l [] @@ -35,6 +35,8 @@ GnuPG key for signing. `-d ` deletes the tag. +`-v ` verifies the gpg signature of the tag. + `-l ` lists tags that match the given pattern (or all if no pattern is given). @@ -55,6 +57,9 @@ OPTIONS -d:: Delete an existing tag with the given name +-v:: + Verify the gpg signature of given the tag + -l :: List tags that match the given pattern (or all if no pattern is given). diff --git a/tutorial.html b/tutorial.html index 6b693d6bc..a29d12242 100644 --- a/tutorial.html +++ b/tutorial.html @@ -318,15 +318,18 @@ of all the files to the repository.

$ git diff
-

to review your changes. When you're done,

+

to review your changes. When you're done, tell git that you +want the updated contents of these files in the commit and then +make a commit, like this:

-
$ git commit file1 file2...
+
$ git add file1 file...
+$ git commit
-

will again prompt your for a message describing the change, and then +

This will again prompt your for a message describing the change, and then record the new versions of the files you listed. It is cumbersome -to list all files and you can say -a (which stands for all) -instead.

+to list all files and you can say git commit -a (which stands for all) +instead of running git add beforehand.

$ git commit -a
@@ -335,7 +338,7 @@ instead.

begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for -example, use the first line on the Subject line and the rest of the +example, use the first line on the Subject: line and the rest of the commit in the body.

Git tracks content not files

@@ -389,6 +392,12 @@ and/or git commit -a.

$ git log -p
+

Often the overview of the change is useful to get a feel of +each step

+
+
+
$ git log --stat --summary
+

Managing branches

@@ -457,6 +466,13 @@ conflicts,

$ gitk

will show a nice graphical representation of the resulting history.

+

At this point you could delete the experimental branch with

+
+
+
$ git branch -d experimental
+
+

This command ensures that the changes in the experimental branch are +already in the current branch.

If you develop on a branch crazy-idea, then regret it, you can always delete the branch with

@@ -591,7 +607,7 @@ commit.

$ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7
-

But there other ways to refer to commits. You can use any initial +

But there are other ways to refer to commits. You can use any initial part of the name that is long enough to uniquely identify the commit:

@@ -600,8 +616,8 @@ part of the name that is long enough to uniquely identify the commit:

$ git show HEAD # the tip of the current branch $ git show experimental # the tip of the "experimental" branch
-

Every commit has at least one "parent" commit, which points to the -previous state of the project:

+

Every commit usually has one "parent" commit +which points to the previous state of the project:

$ git show HEAD^  # to see the parent of HEAD
@@ -701,10 +717,10 @@ of the file:

$ git diff v2.5:Makefile HEAD:Makefile.in
-

You can also use "git cat-file -p" to see any such file:

+

You can also use "git show" to see any such file:

-
$ git cat-file -p v2.5:Makefile
+
$ git show v2.5:Makefile

Next Steps

@@ -767,7 +783,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index d043e844d..79884d9c7 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -65,16 +65,19 @@ Try modifying some files, then run $ git diff ------------------------------------------------ -to review your changes. When you're done, +to review your changes. When you're done, tell git that you +want the updated contents of these files in the commit and then +make a commit, like this: ------------------------------------------------ -$ git commit file1 file2... +$ git add file1 file... +$ git commit ------------------------------------------------ -will again prompt your for a message describing the change, and then +This will again prompt your for a message describing the change, and then record the new versions of the files you listed. It is cumbersome -to list all files and you can say `-a` (which stands for 'all') -instead. +to list all files and you can say `git commit -a` (which stands for 'all') +instead of running `git add` beforehand. ------------------------------------------------ $ git commit -a @@ -84,7 +87,7 @@ A note on commit messages: Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. Tools that turn commits into email, for -example, use the first line on the Subject line and the rest of the +example, use the first line on the Subject: line and the rest of the commit in the body. @@ -142,6 +145,13 @@ If you also want to see complete diffs at each step, use $ git log -p ------------------------------------------------ +Often the overview of the change is useful to get a feel of +each step + +------------------------------------------------ +$ git log --stat --summary +------------------------------------------------ + Managing branches ----------------- @@ -222,6 +232,15 @@ $ gitk will show a nice graphical representation of the resulting history. +At this point you could delete the experimental branch with + +------------------------------------------------ +$ git branch -d experimental +------------------------------------------------ + +This command ensures that the changes in the experimental branch are +already in the current branch. + If you develop on a branch crazy-idea, then regret it, you can always delete the branch with @@ -381,7 +400,7 @@ commit. $ git show c82a22c39cbc32576f64f5c6b3f24b99ea8149c7 ------------------------------------- -But there other ways to refer to commits. You can use any initial +But there are other ways to refer to commits. You can use any initial part of the name that is long enough to uniquely identify the commit: ------------------------------------- @@ -391,8 +410,8 @@ $ git show HEAD # the tip of the current branch $ git show experimental # the tip of the "experimental" branch ------------------------------------- -Every commit has at least one "parent" commit, which points to the -previous state of the project: +Every commit usually has one "parent" commit +which points to the previous state of the project: ------------------------------------- $ git show HEAD^ # to see the parent of HEAD @@ -510,10 +529,10 @@ of the file: $ git diff v2.5:Makefile HEAD:Makefile.in ------------------------------------- -You can also use "git cat-file -p" to see any such file: +You can also use "git show" to see any such file: ------------------------------------- -$ git cat-file -p v2.5:Makefile +$ git show v2.5:Makefile ------------------------------------- Next Steps