From 5fd874e4e3d6b48b5cd1b65c0d7bc38ab93192e4 Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Mon, 17 Apr 2017 12:42:08 -0700 Subject: [PATCH 1/2] DOC: (WIP) tricky git FAQ, the stubs --- doc/devel/gitwash/index.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From 849c4521f3d956379933ec5389e35a68bcf4517f Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Mon, 17 Apr 2017 12:46:30 -0700 Subject: [PATCH 2/2] DOC: (WIP) tricky git FAQ, the stubs --- doc/devel/gitwash/contributor_git_faq | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/devel/gitwash/contributor_git_faq 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