path: root/Documentation
diff options
authorJunio C Hamano <>2006-03-27 07:44:14 (GMT)
committerJunio C Hamano <>2006-03-27 07:44:14 (GMT)
commitd93067d9c7fb210766c7282d662289f54d53f93a (patch)
treea463ad3ce94a987ec3d00e10eaa98ede1fe0495d /Documentation
parentf4e96f97e85c145616bc2e23e9441bc0daa2906e (diff)
parentb0a3de42316a4e8f1d561cbe12b7bb282631a0d6 (diff)
Merge branch 'master' into next
* master: Optionally do not list empty directories in git-ls-files --others Document git-rebase behavior on conflicts. Fix error handling for nonexistent names
Diffstat (limited to 'Documentation')
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 59f6adc..796d049 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/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.
+ Do not list empty directories. Has no effect without --directory.
Show unmerged files in the output (forces --stage)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index b36276c..4a7e67a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/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