From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 27 Mar 2006 07:51:09 +0000 (+0000)
Subject: Autogenerated man pages for v1.2.4-gb0a3de4
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e758d01a359e9354bca497cab2bd455304789015;p=git.git

Autogenerated man pages for v1.2.4-gb0a3de4
---

diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1
index 88a9fc5e..9eb011a8 100755
--- a/man1/git-ls-files.1
+++ b/man1/git-ls-files.1
@@ -72,6 +72,10 @@ Show stage files in the output
 If a whole directory is classified as "other", show just its name (with a trailing slash) and not its whole contents\&.
 
 .TP
+\-\-no\-empty\-directory
+Do not list empty directories\&. Has no effect without \-\-directory\&.
+
+.TP
 \-u|\-\-unmerged
 Show unmerged files in the output (forces \-\-stage)
 
@@ -220,7 +224,7 @@ otherwise, it is a shell glob pattern, suitable for consumption by fnmatch(3) wi
 
 An example:
 
-.IP
+.nf
     $ cat \&.git/ignore
     # ignore objects and archives, anywhere in the tree\&.
     *\&.[oa]
@@ -233,6 +237,8 @@ An example:
         \-\-exclude='Documentation/*\&.[0\-9]' \\
         \-\-exclude\-from=\&.git/ignore \\
         \-\-exclude\-per\-directory=\&.gitignore
+.fi
+
 .SH "SEE ALSO"
 
 
diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index 43ffaa3e..ad7864cb 100755
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.1
@@ -76,6 +76,21 @@ would be:
 D\-\-\-E\-\-\-F\-\-\-G master
 .fi
 
+
+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
+
+.nf
+git am \-\-resolved \-\-3way
+.fi
+
+
+Alternatively, you can undo the git\-rebase with
+
+.nf
+git reset \-\-hard ORIG_HEAD
+rm \-r \&.dotest
+.fi
+
 .SH "OPTIONS"
 
 .TP