From 89d4e0f4569738d0b1885879bf6ed88a972cd3da Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Feb 2007 00:34:59 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-50-gb7581 --- RelNotes-1.5.0.1.txt | 21 +++++++++++++++++++-- RelNotes-1.5.1.txt | 25 +++++++++++++++---------- core-intro.txt | 3 ++- git-checkout.html | 9 +++++---- git-checkout.txt | 7 ++++--- git-merge.html | 4 ++-- git-merge.txt | 2 +- git-name-rev.html | 13 +++++++++++-- git-name-rev.txt | 6 +++++- git-rebase.html | 22 +++++++++++++--------- git-rebase.txt | 24 +++++++++++++++--------- git-rerere.html | 5 ++--- git-rerere.txt | 3 +-- git-reset.html | 6 +++--- git-reset.txt | 4 ++-- git-runstatus.html | 4 ++-- git-runstatus.txt | 2 +- git-status.html | 4 ++-- git-status.txt | 2 +- git.html | 5 +++-- tutorial-2.html | 6 +++--- tutorial-2.txt | 4 ++-- 22 files changed, 114 insertions(+), 67 deletions(-) diff --git a/RelNotes-1.5.0.1.txt b/RelNotes-1.5.0.1.txt index 982282a89..5dff2a212 100644 --- a/RelNotes-1.5.0.1.txt +++ b/RelNotes-1.5.0.1.txt @@ -7,14 +7,31 @@ Fixes since v1.5.0 * Documentation updates - Clarifications and corrections to 1.5.0 release notes. + - The main documentation did not link to git-remote documentation. + - Clarified introductory text of git-rebase documentation. + + - Converted remaining mentions of update-index on Porcelain + documents to git-add/git-rm. + * Bugfixes - git-daemon marks the listening sockets with FD_CLOEXEC so that it won't be leaked into the children. + - segfault from git-blame when the mandatory pathname + parameter was missing was fixed; usage() message is given + instead. + +* Tweaks + + - sliding mmap() inefficiently mmaped the same region of a + packfile with an access pattern that used objects in the + reverse order. This has been made more efficient. + -- -O=v1.5.0-7-g37b73cf +exec >/var/tmp/1 +O=v1.5.0-24-g460ca30 echo O=`git describe maint` -git shortlog --no-merges $O.. +git shortlog --no-merges $O..maint diff --git a/RelNotes-1.5.1.txt b/RelNotes-1.5.1.txt index 1bb6cc1c5..4d371866c 100644 --- a/RelNotes-1.5.1.txt +++ b/RelNotes-1.5.1.txt @@ -19,21 +19,26 @@ Updates since v1.5.0 - "git diff" learned --ignore-space-at-eol. This is a weaker form of --ignore-space-change. + - "git name-rev" learned --refs=, to limit the tags + used for naming the given revisions only to the ones + matching the given pattern. + * Updated behaviour of existing commands. - - "git diff" outputs a trailing HT when pathnames have embedded - SP on +++/--- header lines, in order to help "GNU patch" to - parse its output. "git apply" was already updated to accept - this modified output format since ce74618d (Sep 22, 2006). + - "git diff" outputs a trailing HT when pathnames have embedded + SP on +++/--- header lines, in order to help "GNU patch" to + parse its output. "git apply" was already updated to accept + this modified output format since ce74618d (Sep 22, 2006). * Hooks - - The sample update hook to show how to send out notification - e-mail was updated to show only new commits that appeared in - the repository. Earlier, it showed new commits that appeared - on the branch. + - The sample update hook to show how to send out notification + e-mail was updated to show only new commits that appeared in + the repository. Earlier, it showed new commits that appeared + on the branch. -- -O=v1.5.0-20-ga44a0c9 +exec >/var/tmp/1 +O=v1.5.0-49-g69bc0e2 echo O=`git describe master` -git shortlog --no-merges $O.. +git shortlog --no-merges $O..master ^maint diff --git a/core-intro.txt b/core-intro.txt index 24b060b91..eea44d9d5 100644 --- a/core-intro.txt +++ b/core-intro.txt @@ -106,7 +106,8 @@ directory tree, and renaming a file does not change the object that file is associated with in any way. A blob is typically created when gitlink:git-update-index[1] -is run, and its data can be accessed by gitlink:git-cat-file[1]. +(or gitlink:git-add[1]) is run, and its data can be accessed by +gitlink:git-cat-file[1]. Tree Object ~~~~~~~~~~~ diff --git a/git-checkout.html b/git-checkout.html index 14b659e36..843465cba 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -347,7 +347,8 @@ working tree.

When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts -and mark the resolved paths with git update-index.

+and mark the resolved paths with git add (or git rm if the merge +should result in deletion of the path).

<new_branch> @@ -487,11 +488,11 @@ fatal: merge program failed

At this point, git diff shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with -git update-index as usual:

+git add as usual:

$ edit frotz
-$ git update-index frotz
+$ git add frotz
@@ -510,7 +511,7 @@ $ git update-index frotz diff --git a/git-checkout.txt b/git-checkout.txt index e4ffde4fd..1ae77be45 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -61,7 +61,8 @@ OPTIONS + When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts -and mark the resolved paths with `git update-index`. +and mark the resolved paths with `git add` (or `git rm` if the merge +should result in deletion of the path). :: Name for the new branch. @@ -179,11 +180,11 @@ fatal: merge program failed At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with -`git update-index` as usual: +`git add` as usual: + ------------ $ edit frotz -$ git update-index frotz +$ git add frotz ------------ diff --git a/git-merge.html b/git-merge.html index 34c16dec1..a851ff1a8 100644 --- a/git-merge.html +++ b/git-merge.html @@ -545,7 +545,7 @@ Decide not to merge. The only clean-up you need are to reset

Resolve the conflicts. git-diff would report only the conflicting paths because of the above 2. and 3.. Edit the - working tree files into a desirable shape, git-update-index + working tree files into a desirable shape, git-add or git-rm them, to make the index file contain what the merge result should be, and run git-commit to commit the result.

@@ -570,7 +570,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-merge.txt b/git-merge.txt index e53ff4b4e..9c08efa53 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -136,7 +136,7 @@ After seeing a conflict, you can do two things: * Resolve the conflicts. `git-diff` would report only the conflicting paths because of the above 2. and 3.. Edit the - working tree files into a desirable shape, `git-update-index` + working tree files into a desirable shape, `git-add` or `git-rm` them, to make the index file contain what the merge result should be, and run `git-commit` to commit the result. diff --git a/git-name-rev.html b/git-name-rev.html index c42f5380b..2ee23be0a 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -272,7 +272,8 @@ git-name-rev(1) Manual Page

SYNOPSIS

-

git-name-rev [--tags] ( --all | --stdin | <committish>… )

+

git-name-rev [--tags] [--refs=<pattern>] + ( --all | --stdin | <committish>… )

DESCRIPTION

@@ -291,6 +292,14 @@ format parsable by git-rev-parse.

+--refs=<pattern> +
+
+

+ Only use refs whose names match a given shell pattern. +

+
+
--all
@@ -342,7 +351,7 @@ not the context.

diff --git a/git-name-rev.txt b/git-name-rev.txt index 37fbf66ef..5b5c4c865 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt @@ -8,7 +8,8 @@ git-name-rev - Find symbolic names for given revs SYNOPSIS -------- -'git-name-rev' [--tags] ( --all | --stdin | ... ) +'git-name-rev' [--tags] [--refs=] + ( --all | --stdin | ... ) DESCRIPTION ----------- @@ -22,6 +23,9 @@ OPTIONS --tags:: Do not use branch names, but only tags to name the commits +--refs=:: + Only use refs whose names match a given shell pattern. + --all:: List all commits reachable from all refs diff --git a/git-rebase.html b/git-rebase.html index e7f45f9da..c149d5b53 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -277,19 +277,23 @@ git-rebase(1) Manual Page

DESCRIPTION

-

git-rebase replaces <branch> with a new branch of the same name. When -the --onto option is provided the new branch starts out with a HEAD equal -to <newbase>, otherwise it is equal to <upstream>. It then attempts to -create a new commit for each commit from the original <branch> that does -not exist in the <upstream> branch.

+

If <branch> is specified, git-rebase will perform an automatic +git checkout <branch> before doing anything else. Otherwise +it remains on the current branch.

+

All changes made by commits in the current branch but that are not +in <upstream> are saved to a temporary area. This is the same set +of commits that would be shown by git log <upstream>..HEAD.

+

The current branch is reset to <upstream>, or <newbase> if the +--onto option was supplied. This has the exact same effect as +git reset --hard <upstream> (or <newbase>).

+

The commits that were previously saved into the temporary area are +then reapplied to the current branch, one by one, in order.

It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run git rebase --continue. Another option is to bypass the commit that caused the merge failure with git rebase --skip. To restore the original <branch> and remove the .dotest working files, use the command git rebase --abort instead.

-

Note that if <branch> is not specified on the command line, the currently -checked out branch is used.

Assume the following history exists and the current branch is "topic":

@@ -393,7 +397,7 @@ file you edit, you need to tell git that the conflict has been resolved, typically this would be done with

-
git update-index <filename>
+
git add <filename>

After resolving the conflict manually and updating the index with the desired resolution, you can continue the rebasing process with

@@ -591,7 +595,7 @@ a rebase. Upon completion, <branch> will be the current branch.

diff --git a/git-rebase.txt b/git-rebase.txt index f2ef1f7dc..2f417a8f8 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -13,11 +13,20 @@ SYNOPSIS DESCRIPTION ----------- -git-rebase replaces with a new branch of the same name. When -the --onto option is provided the new branch starts out with a HEAD equal -to , otherwise it is equal to . It then attempts to -create a new commit for each commit from the original that does -not exist in the branch. +If is specified, git-rebase will perform an automatic +`git checkout ` before doing anything else. Otherwise +it remains on the current branch. + +All changes made by commits in the current branch but that are not +in are saved to a temporary area. This is the same set +of commits that would be shown by `git log ..HEAD`. + +The current branch is reset to , or if the +--onto option was supplied. This has the exact same effect as +`git reset --hard ` (or ). + +The commits that were previously saved into the temporary area are +then reapplied to the current branch, one by one, in order. It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure @@ -26,9 +35,6 @@ that caused the merge failure with `git rebase --skip`. To restore the original and remove the .dotest working files, use the command `git rebase --abort` instead. -Note that if is not specified on the command line, the currently -checked out branch is used. - Assume the following history exists and the current branch is "topic": ------------ @@ -142,7 +148,7 @@ file you edit, you need to tell git that the conflict has been resolved, typically this would be done with - git update-index + git add After resolving the conflict manually and updating the index with the diff --git a/git-rerere.html b/git-rerere.html index 2a2beef86..c279b3b81 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -437,8 +437,7 @@ If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually resolve it. Note that git-rerere leaves the index file alone, so you still need to do the final sanity checks with git diff -(or git diff -c) and git update-index when you are -satisfied.

+(or git diff -c) and git add when you are satisfied.

As a convenience measure, git-merge automatically invokes git-rerere when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand @@ -482,7 +481,7 @@ conflict.

diff --git a/git-rerere.txt b/git-rerere.txt index 139b6eb77..7ff9b05e6 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -163,8 +163,7 @@ If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually resolve it. Note that `git-rerere` leaves the index file alone, so you still need to do the final sanity checks with `git diff` -(or `git diff -c`) and `git update-index` when you are -satisfied. +(or `git diff -c`) and `git add` when you are satisfied. As a convenience measure, `git-merge` automatically invokes `git-rerere` when it exits with a failed automerge, which diff --git a/git-reset.html b/git-reset.html index 86fcfd3b5..4e8ea5fac 100644 --- a/git-reset.html +++ b/git-reset.html @@ -419,13 +419,13 @@ Switch to "topic/wip" branch and keep working.
-Undo update-index +Undo add 
$ edit                                     (1)
-$ git-update-index frotz.c filfre.c
+$ git add frotz.c filfre.c
 $ mailx                                    (2)
 $ git reset                                (3)
 $ git pull git://info.example.com/ nitfol  (4)
@@ -566,7 +566,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 04475a921..5b55cda51 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -94,11 +94,11 @@ current HEAD. <2> Rewind the master branch to get rid of those three commits. <3> Switch to "topic/wip" branch and keep working. -Undo update-index:: +Undo add:: + ------------ $ edit <1> -$ git-update-index frotz.c filfre.c +$ git add frotz.c filfre.c $ mailx <2> $ git reset <3> $ git pull git://info.example.com/ nitfol <4> diff --git a/git-runstatus.html b/git-runstatus.html index ccbb05dc7..3043c3554 100644 --- a/git-runstatus.html +++ b/git-runstatus.html @@ -279,7 +279,7 @@ git-runstatus(1) Manual Page

Examines paths in the working tree that has changes unrecorded to the index file, and changes between the index file and the current HEAD commit. The former paths are what you _could_ -commit by running git-update-index before running git +commit by running git add (or git rm if you are deleting) before running git commit, and the latter paths are what you _would_ commit by running git commit.

If there is no path that is different between the index file and @@ -355,7 +355,7 @@ of git-commit, and later rewritten in C by Jeff King.

diff --git a/git-runstatus.txt b/git-runstatus.txt index 89d7b9273..8bb52f468 100644 --- a/git-runstatus.txt +++ b/git-runstatus.txt @@ -16,7 +16,7 @@ DESCRIPTION Examines paths in the working tree that has changes unrecorded to the index file, and changes between the index file and the current HEAD commit. The former paths are what you _could_ -commit by running 'git-update-index' before running 'git +commit by running 'git add' (or 'git rm' if you are deleting) before running 'git commit', and the latter paths are what you _would_ commit by running 'git commit'. diff --git a/git-status.html b/git-status.html index b0f685414..422048ebf 100644 --- a/git-status.html +++ b/git-status.html @@ -279,7 +279,7 @@ git-status(1) Manual Page

Examines paths in the working tree that has changes unrecorded to the index file, and changes between the index file and the current HEAD commit. The former paths are what you _could_ -commit by running git-update-index before running git +commit by running git add before running git commit, and the latter paths are what you _would_ commit by running git commit.

If there is no path that is different between the index file and @@ -316,7 +316,7 @@ Junio C Hamano <junkio@cox.net>.

diff --git a/git-status.txt b/git-status.txt index 03871e5d7..e9e193f00 100644 --- a/git-status.txt +++ b/git-status.txt @@ -15,7 +15,7 @@ DESCRIPTION Examines paths in the working tree that has changes unrecorded to the index file, and changes between the index file and the current HEAD commit. The former paths are what you _could_ -commit by running 'git-update-index' before running 'git +commit by running 'git add' before running 'git commit', and the latter paths are what you _would_ commit by running 'git commit'. diff --git a/git.html b/git.html index c64f507d5..08e14fc09 100644 --- a/git.html +++ b/git.html @@ -1837,7 +1837,8 @@ object. The object is totally independent of its location in the directory tree, and renaming a file does not change the object that file is associated with in any way.

A blob is typically created when git-update-index(1) -is run, and its data can be accessed by git-cat-file(1).

+(or git-add(1)) is run, and its data can be accessed by +git-cat-file(1).

Tree Object

The next hierarchical object type is the "tree" object. A tree object is a list of mode/name/blob data, sorted by name. Alternatively, the @@ -2289,7 +2290,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/tutorial-2.html b/tutorial-2.html index 804c39501..e9fe24622 100644 --- a/tutorial-2.html +++ b/tutorial-2.html @@ -485,7 +485,7 @@ what's happening:

@@ -1 +1,2 @@ hello world! +hello world, again -$ git update-index file.txt +$ git add file.txt $ git diff

The last diff is empty, but no new commits have been made, and the @@ -515,7 +515,7 @@ $ git cat-file blob 513feba2 hello world! hello world, again -

So what our "git update-index" did was store a new blob and then put +

So what our "git add" did was store a new blob and then put a reference to it in the index file. If we modify the file again, we'll see that the new modifications are reflected in the "git-diff" output:

@@ -645,7 +645,7 @@ example, creating a new commit.

diff --git a/tutorial-2.txt b/tutorial-2.txt index 8d8999271..af8d43bd1 100644 --- a/tutorial-2.txt +++ b/tutorial-2.txt @@ -227,7 +227,7 @@ $ git diff @@ -1 +1,2 @@ hello world! +hello world, again -$ git update-index file.txt +$ git add file.txt $ git diff ------------------------------------------------ @@ -260,7 +260,7 @@ hello world! hello world, again ------------------------------------------------ -So what our "git update-index" did was store a new blob and then put +So what our "git add" did was store a new blob and then put a reference to it in the index file. If we modify the file again, we'll see that the new modifications are reflected in the "git-diff" output: -- 2.26.2