Merge git://repo.or.cz/git-gui into maint

diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt
index ee9e8fa9090f88d1eb45ddbdb73866e0dc1fd53d..6edb9f12b87e2bc24fb69c8615e1798bb813e14e 100644 (file)
--- a/Documentation/git-p4import.txt
+++ b/Documentation/git-p4import.txt
@@ -93,7 +93,7 @@ perforce branch into a branch named "jammy", like so:
 ------------
 $ mkdir -p /home/sean/import/jam
 $ cd /home/sean/import/jam
-$ git init-db
+$ git init
 $ git p4import //public/jam jammy
 ------------