From 1871429985588e18cff322d9c2d6f02886ebbed8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 10 Nov 2007 11:26:34 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.5-628-ga1309 --- core-tutorial.html | 31 +++++- core-tutorial.txt | 17 ++- howto-index.html | 11 +- howto-index.txt | 6 ++ howto/recover-corrupted-blob-object.txt | 134 ++++++++++++++++++++++++ 5 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 howto/recover-corrupted-blob-object.txt diff --git a/core-tutorial.html b/core-tutorial.html index 5c6766f76..ebf7da11b 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1143,12 +1143,13 @@ have to do _that_ merge again.

environment, is git show-branch.

-
$ git show-branch --topo-order master mybranch
+
$ git-show-branch --topo-order --more=1 master mybranch
 * [master] Merge work in mybranch
  ! [mybranch] Some work.
 --
 -  [master] Merge work in mybranch
-*+ [mybranch] Some work.

+*+ [mybranch] Some work.
+*  [master^] Some fun.

The first two lines indicate that it is showing the two branches and the first line of the commit log message from their @@ -1165,9 +1166,31 @@ because mybranch has not been merged to incorporate these commits from the master branch. The string inside brackets before the commit log message is a short name you can use to name the commit. In the above example, master and mybranch -are branch heads. master~1 is the first parent of master +are branch heads. master^ is the first parent of master branch head. Please see git-rev-parse documentation if you see more complex cases.

+
+ + + +
+
Note
+		Without the —more=1 option, git-show-branch would not output the +[master^] commit, as [mybranch] commit is a common ancestor of +both master and mybranch tips. Please see git-show-branch +documentation for details.
+
+
+ + + +
+
Note
+		If there were more commits on the master branch after the merge, the +merge commit itself would not be shown by git-show-branch by +default. You would need to provide —sparse option to make the +merge commit visible in this case.
+

Now, let's pretend you are the one who did all the work in mybranch, and the fruit of your hard work has finally been merged to the master branch. Let's go back to mybranch, and run @@ -1948,7 +1971,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 99817c533..ebd2492bc 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -931,12 +931,13 @@ Another useful tool, especially if you do not always work in X-Window environment, is `git show-branch`. ------------------------------------------------ -$ git show-branch --topo-order master mybranch +$ git-show-branch --topo-order --more=1 master mybranch * [master] Merge work in mybranch ! [mybranch] Some work. -- - [master] Merge work in mybranch *+ [mybranch] Some work. +* [master^] Some fun. ------------------------------------------------ The first two lines indicate that it is showing the two branches @@ -954,10 +955,22 @@ because `mybranch` has not been merged to incorporate these commits from the master branch. The string inside brackets before the commit log message is a short name you can use to name the commit. In the above example, 'master' and 'mybranch' -are branch heads. 'master~1' is the first parent of 'master' +are branch heads. 'master^' is the first parent of 'master' branch head. Please see 'git-rev-parse' documentation if you see more complex cases. +[NOTE] +Without the '--more=1' option, 'git-show-branch' would not output the +'[master^]' commit, as '[mybranch]' commit is a common ancestor of +both 'master' and 'mybranch' tips. Please see 'git-show-branch' +documentation for details. + +[NOTE] +If there were more commits on the 'master' branch after the merge, the +merge commit itself would not be shown by 'git-show-branch' by +default. You would need to provide '--sparse' option to make the +merge commit visible in this case. + Now, let's pretend you are the one who did all the work in `mybranch`, and the fruit of your hard work has finally been merged to the `master` branch. Let's go back to `mybranch`, and run diff --git a/howto-index.html b/howto-index.html index 465e10182..182c0c341 100644 --- a/howto-index.html +++ b/howto-index.html @@ -300,6 +300,15 @@ shown at http://www.kernel.org/pub/software/scm/git/docs/.

+

Some tricks to reconstruct blob objects in order to fix +a corrupted repository.

+