From eba1bd9372d9482d3942c4428423b67561e4849d Mon Sep 17 00:00:00 2001 From: Shubheksha Jalan Date: Mon, 13 Feb 2017 15:51:00 +0530 Subject: [PATCH] Update FAQ.md - Fix error in the section about squashing commits. - Add a link to the golang wiki for plugins for various editors. --- opensource/FAQ.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opensource/FAQ.md b/opensource/FAQ.md index b5ef63437d..77cbce1233 100644 --- a/opensource/FAQ.md +++ b/opensource/FAQ.md @@ -53,7 +53,7 @@ Set your local repo to track changes upstream, on the `docker` repository. ## How do I format my Go code Run `gofmt -s -w filename.go` on each changed file before committing your changes. -Most editors have plug-ins that do the formatting automatically. +Most [editors have plug-ins](https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins) that do the formatting automatically. ## What is the pre-pull request checklist @@ -112,7 +112,7 @@ Always rebase and squash your commits before making a pull request. If you run into trouble, `git --rebase abort` removes any changes and gets you back to where you started. -4. Squash the `pick` keyword with `squash` on all but the first commit. +4. Replace the `pick` keyword with `squash` on all but the first commit. ``` pick 1a79f55 Tweak some of images @@ -135,4 +135,4 @@ force the previous change to be overwritten. ``` $ git push -f origin my-keen-feature - ``` \ No newline at end of file + ```