From 2b13527e6477916ed5cb6f1858d9d0e5381d236d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Mar 2006 07:45:42 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.2.4-g5a1f --- git-branch.html | 13 ++++++++----- git-branch.txt | 10 +++++++--- git-checkout.html | 25 ++++++++++++++----------- git-checkout.txt | 23 +++++++++++++---------- git-commit.html | 4 +++- git-commit.txt | 4 ++++ git-init-db.html | 20 ++++++++++++++------ git-init-db.txt | 18 +++++++++++++----- git-rebase.html | 8 ++++---- git-rebase.txt | 6 +++--- git-show-branch.html | 4 ++-- git-show-branch.txt | 2 +- git.html | 10 +++++++++- git.txt | 3 +++ 14 files changed, 98 insertions(+), 52 deletions(-) diff --git a/git-branch.html b/git-branch.html index 8abc4751..dcf5da7b 100644 --- a/git-branch.html +++ b/git-branch.html @@ -272,14 +272,17 @@ git-branch(1) Manual Page

SYNOPSIS

-

git-branch [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]

+
+
git-branch [[-f] <branchname> [<start-point>]] +git-branch (-d | -D) <branchname>

DESCRIPTION

If no argument is provided, show available branches and mark current -branch with star. Otherwise, create a new branch of name <branchname>.

-

If a starting point is also specified, that will be where the branch is +branch with star. Otherwise, create a new branch of name <branchname>. +If a starting point is also specified, that will be where the branch is created, otherwise it will be created at the current HEAD.

+

With a -d or -D option, <branchname> will be deleted.

OPTIONS

@@ -329,7 +332,7 @@ created, otherwise it will be created at the current HEAD.

Examples

-Start development off of a know tag +Start development off of a known tag
@@ -372,7 +375,7 @@ commits from todo branch.
diff --git a/git-branch.txt b/git-branch.txt index 4cd0cb90..71ecd858 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -7,16 +7,20 @@ git-branch - Create a new branch, or remove an old one SYNOPSIS -------- -'git-branch' [(-d | -D) ] | [[-f] []] +[verse] +'git-branch' [[-f] []] +'git-branch' (-d | -D) DESCRIPTION ----------- If no argument is provided, show available branches and mark current branch with star. Otherwise, create a new branch of name . - If a starting point is also specified, that will be where the branch is created, otherwise it will be created at the current HEAD. +With a `-d` or `-D` option, `` will be deleted. + + OPTIONS ------- -d:: @@ -39,7 +43,7 @@ OPTIONS Examples ~~~~~~~~ -Start development off of a know tag:: +Start development off of a known tag:: + ------------ $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6 diff --git a/git-checkout.html b/git-checkout.html index f84db99c..d8ec4847 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -272,14 +272,17 @@ git-checkout(1) Manual Page

SYNOPSIS

-

git-checkout [-f] [-b <new_branch>] [-m] [<branch>] [<paths>…]

+
+
git-checkout [-f] [-b <new_branch>] [-m] [<branch>] +git-checkout [-m] [<branch>] <paths>…

DESCRIPTION

-

When <paths> are not given, this command switches branches, by +

When <paths> are not given, this command switches branches by updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if -specified, <new_branch>.

+specified, <new_branch>. Using -b will cause <new_branch> to +be created.

When <paths> are given, this command does not switch branches. It updates the named paths in the working tree from the index file (i.e. it runs git-checkout-index -f -u). In @@ -296,7 +299,7 @@ given paths before updating the working tree.

- Force an re-read of everything. + Force a re-read of everything.

@@ -312,11 +315,11 @@ given paths before updating the working tree.

- If you have local modifications to a file that is - different between the current branch and the branch you - are switching to, the command refuses to switch - branches, to preserve your modifications in context. - With this option, a three-way merge between the current + If you have local modifications to one or more files that + are different between the current branch and the branch to + which you are switching, the command refuses to switch + branches in order to preserve your modifications in context. + However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch.

@@ -374,7 +377,7 @@ that branch. You should instead write:

  • After working in a wrong branch, switching to the correct -branch you would want to is done with: +branch would be done using:

    @@ -438,7 +441,7 @@ $ git update-index frotz
    diff --git a/git-checkout.txt b/git-checkout.txt index 556e733c..985bb2f8 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -7,15 +7,18 @@ git-checkout - Checkout and switch to a branch SYNOPSIS -------- -'git-checkout' [-f] [-b ] [-m] [] [...] +[verse] +'git-checkout' [-f] [-b ] [-m] [] +'git-checkout' [-m] [] ... DESCRIPTION ----------- -When are not given, this command switches branches, by +When are not given, this command switches branches by updating the index and working tree to reflect the specified branch, , and updating HEAD to be or, if -specified, . +specified, . Using -b will cause to +be created. When are given, this command does *not* switch branches. It updates the named paths in the working tree from @@ -29,17 +32,17 @@ given paths before updating the working tree. OPTIONS ------- -f:: - Force an re-read of everything. + Force a re-read of everything. -b:: Create a new branch and start it at . -m:: - If you have local modifications to a file that is - different between the current branch and the branch you - are switching to, the command refuses to switch - branches, to preserve your modifications in context. - With this option, a three-way merge between the current + If you have local modifications to one or more files that + are different between the current branch and the branch to + which you are switching, the command refuses to switch + branches in order to preserve your modifications in context. + However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch. + @@ -82,7 +85,7 @@ $ git checkout -- hello.c ------------ . After working in a wrong branch, switching to the correct -branch you would want to is done with: +branch would be done using: + ------------ $ git checkout mytopic diff --git a/git-commit.html b/git-commit.html index 4965cb9e..16f2211f 100644 --- a/git-commit.html +++ b/git-commit.html @@ -282,6 +282,8 @@ git-commit(1) Manual Page -a is specified, and makes a commit object. The command VISUAL and EDITOR environment variables to edit the commit log message.

    +

    Several environment variable are used during commits. They are +documented in git-commit-tree(1).

    This command can run commit-msg, pre-commit, and post-commit hooks. See hooks for more information.

    @@ -480,7 +482,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-commit.txt b/git-commit.txt index 214ed235..d04b342a 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -18,6 +18,10 @@ Updates the index file for given paths, or all modified files if VISUAL and EDITOR environment variables to edit the commit log message. +Several environment variable are used during commits. They are +documented in gitlink:git-commit-tree[1]. + + This command can run `commit-msg`, `pre-commit`, and `post-commit` hooks. See link:hooks.html[hooks] for more information. diff --git a/git-init-db.html b/git-init-db.html index 34249dbb..1b4fb27e 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -3,7 +3,7 @@ - +