From: Junio C Hamano Date: Mon, 27 Mar 2006 07:51:03 +0000 (+0000) Subject: Autogenerated HTML docs for v1.2.4-gb0a3de4 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f02e09f2b8259643f2cb156fd7ceec3113f8204f;p=git.git Autogenerated HTML docs for v1.2.4-gb0a3de4 --- diff --git a/git-ls-files.html b/git-ls-files.html index ed81380b..810e7071 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -352,6 +352,14 @@ shown:

+--no-empty-directory +
+
+

+ Do not list empty directories. Has no effect without --directory. +

+
+
-u|--unmerged
@@ -660,7 +668,7 @@ otherwise, it is a shell glob pattern, suitable for diff --git a/git-ls-files.txt b/git-ls-files.txt index e813f842..980c5c91 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -52,6 +52,9 @@ OPTIONS If a whole directory is classified as "other", show just its name (with a trailing slash) and not its whole contents. +--no-empty-directory:: + Do not list empty directories. Has no effect without --directory. + -u|--unmerged:: Show unmerged files in the output (forces --stage) diff --git a/git-rebase.html b/git-rebase.html index 91aa5cfa..88addf01 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -316,6 +316,20 @@ git-rebase --onto master~1 master topic / D---E---F---G master +

In case of conflict, git-rebase will stop at the first problematic commit +and leave conflict markers in the tree. After resolving the conflict manually +and updating the index with the desired resolution, you can continue the +rebasing process with

+
+
+
git am --resolved --3way
+
+

Alternatively, you can undo the git-rebase with

+
+
+
git reset --hard ORIG_HEAD
+rm -r .dotest
+

OPTIONS

@@ -362,7 +376,7 @@ D---E---F---G master
diff --git a/git-rebase.txt b/git-rebase.txt index b36276c7..4a7e67a4 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -48,6 +48,18 @@ would be: / D---E---F---G master +In case of conflict, git-rebase will stop at the first problematic commit +and leave conflict markers in the tree. After resolving the conflict manually +and updating the index with the desired resolution, you can continue the +rebasing process with + + git am --resolved --3way + +Alternatively, you can undo the git-rebase with + + git reset --hard ORIG_HEAD + rm -r .dotest + OPTIONS ------- ::