Merge branch 'rs/obsd-getcwd-workaround' into next

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index a5afd602d8eb6cf6fdfbb20863e913a5318c354d..4f6bed61a92b74e4540b71e0e0cac7cba60302ca 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -675,7 +675,7 @@ on this 'subsystem'.  You might end up with a history like the
 following:
 
 ------------
-    o---o---o---o---o---o---o---o---o  master
+    o---o---o---o---o---o---o---o  master
         \
          o---o---o---o---o  subsystem
                           \