From: Junio C Hamano Date: Fri, 30 Mar 2007 08:52:26 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.1-rc3-20-gaa453 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3aa81825100a7380b2dec081876323507b150a95;p=git.git Autogenerated HTML docs for v1.5.1-rc3-20-gaa453 --- diff --git a/RelNotes-1.5.1.txt b/RelNotes-1.5.1.txt index 8461fb437..f48d816c7 100644 --- a/RelNotes-1.5.1.txt +++ b/RelNotes-1.5.1.txt @@ -86,11 +86,16 @@ Updates since v1.5.0 to run after each revision is checked out to determine if it is good or bad, to automate the bisection process. + - "git log" family learned a new traversal option --first-parent, + which does what the name suggests. + * Updated behaviour of existing commands. - "git fsck" does not barf on corrupt loose objects. + - "git rm" does not remove newly added files without -f. + - "git archimport" allows remapping when coming up with git branch names from arch names. @@ -183,7 +188,7 @@ Updates since v1.5.0 -- exec >/var/tmp/1 -O=v1.5.1-rc1-63-g12d6697 +O=v1.5.1-rc3-18-ge881192 echo O=`git describe master` git shortlog --no-merges $O..master ^maint diff --git a/git-mergetool.html b/git-mergetool.html index 32065ec25..847458077 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -295,13 +295,10 @@ with merge conflicts.

Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.

-
-
-
If a merge resolution program is not specified, 'git mergetool'
+
If a merge resolution program is not specified, git mergetool
 will use the configuration variable merge.tool.  If the
-configuration variable merge.tool is not set, 'git mergetool'
-will pick a suitable default.
-
+configuration variable merge.tool is not set, git mergetool +will pick a suitable default.

@@ -319,7 +316,7 @@ will pick a suitable default. diff --git a/git-mergetool.txt b/git-mergetool.txt index 5baaaca0b..34288fe08 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -26,11 +26,11 @@ OPTIONS Use the merge resolution program specified by . Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. - - If a merge resolution program is not specified, 'git mergetool' - will use the configuration variable merge.tool. If the - configuration variable merge.tool is not set, 'git mergetool' - will pick a suitable default. ++ +If a merge resolution program is not specified, 'git mergetool' +will use the configuration variable merge.tool. If the +configuration variable merge.tool is not set, 'git mergetool' +will pick a suitable default. Author ------ diff --git a/git-rev-parse.html b/git-rev-parse.html index 78422066f..dd187e412 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -684,14 +684,14 @@ its all parents.

Here are a handful examples:

-
D                A B D
-D F              A B C D F
-^A G             B D
-^A F             B C F
-G...I            C D F G I
-^B G I           C D F G I
-F^@              A B C
-F^! H            D F H
+
D                G H D
+D F              G H I J D F
+^G D             H D
+^D B             E I J F B
+B...C            G H D E B C
+^D B C           E I J F B C
+C^@              I J F
+F^! D            G H D F

Author

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

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index ccc66aae7..a8bf6561e 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -265,14 +265,14 @@ its all parents. Here are a handful examples: - D A B D - D F A B C D F - ^A G B D - ^A F B C F - G...I C D F G I - ^B G I C D F G I - F^@ A B C - F^! H D F H + D G H D + D F G H I J D F + ^G D H D + ^D B E I J F B + B...C G H D E B C + ^D B C E I J F B C + C^@ I J F + F^! D G H D F Author ------ diff --git a/git-svnimport.html b/git-svnimport.html index 4e08b1064..3ddd20992 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -287,7 +287,7 @@ git-svnimport(1) Manual Page repository, or incrementally import into an existing one.

SVN access is done by the SVN::Perl module.

git-svnimport assumes that SVN repositories are organized into one -"trunk" directory where the main development happens, "branch/FOO" +"trunk" directory where the main development happens, "branches/FOO" directories for branches, and "/tags/FOO" directories for tags. Other subdirectories are ignored.

git-svnimport creates a file ".git/svn2git", which is required for @@ -534,7 +534,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index b166cf332..bdae7d87d 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -27,7 +27,7 @@ repository, or incrementally import into an existing one. SVN access is done by the SVN::Perl module. git-svnimport assumes that SVN repositories are organized into one -"trunk" directory where the main development happens, "branch/FOO" +"trunk" directory where the main development happens, "branches/FOO" directories for branches, and "/tags/FOO" directories for tags. Other subdirectories are ignored. diff --git a/git.html b/git.html index d8e343fb8..34ea71136 100644 --- a/git.html +++ b/git.html @@ -2317,7 +2317,7 @@ contributors on the git-list <git@vger.kernel.org>.