diff --git a/doc/devel/gitwash/contributor_git_faq b/doc/devel/gitwash/contributor_git_faq
new file mode 100644
index 000000000000..7bd7bb59d71b
--- /dev/null
+++ b/doc/devel/gitwash/contributor_git_faq
@@ -0,0 +1,18 @@
+.. highlight:: bash
+
+.. _contrib-faq:
+
+
+==============================
+Frequently Asked Git Questions
+==============================
+
+How do I squash commits?
+========================
+
+stub
+
+I pushed to my fork's master branch, what now?
+==============================================
+
+stub
\ No newline at end of file
diff --git a/doc/devel/gitwash/index.rst b/doc/devel/gitwash/index.rst
index 9ee965d626ff..d5cbab0fa2d0 100644
--- a/doc/devel/gitwash/index.rst
+++ b/doc/devel/gitwash/index.rst
@@ -15,5 +15,4 @@ Contents:
    git_development
    git_resources
    dot2_dot3
-
-
+   contributor_git_faq