From 8e818804898f62c46bfc9b5794da6a70a1a10c86 Mon Sep 17 00:00:00 2001 From: auchri Date: Wed, 21 Oct 2015 16:31:55 +0200 Subject: [PATCH] Add instructions to change commit message... ...to CONTRIBUTING.md --- CONTRIBUTING.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 009176a17c..f906731af4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,7 @@ This document describes how you can contribute to Telegram Desktop. Please read * [What contributions are accepted](#what-contributions-are-accepted) * [Sign your work](#sign-your-work) + * [Change commit message of a pushed commit](#change-commit-message-of-a-pushed-commit) * [Build instructions](#build-instructions) * [Pull upstream changes into your fork regularly](#pull-upstream-changes-into-your-fork-regularly) * [How to get your pull request accepted](#how-to-get-your-pull-request-accepted) @@ -49,12 +50,26 @@ By making a contribution to this project, I certify that: (e) I am granting this work into the public domain. ``` -Then you just add a line to every git commit message that states: +Then you just add a line to every **git commit message** that states: Signed-off-by: Random J Developer (github: rndjdev_github) Replacing Random Developer’s details with your name, email address and GitHub username. +### Change commit message of a pushed commit + +If you already pushed a commit and forgot to add the signature to the commit message, follow these steps to change the message of the commit: + +1. Open `Git Bash` (or `Git Shell`) +2. Enter following command to change the commit message of the most recent commit: `git commit --amend` +3. Press i to get into Insert-mode +4. Change the commit message (and add the [signature](#sign-your-work) at the and) +5. After editing the message, press ESC to get out of the Insert-mode +6. Write `:wq` and press Enter to save the new message or write `:q!` to discard your changes +7. Enter `git push --force` to push the commit with the new commit message to the remote repository + +For more info, see [GitHub Help][help_change_commit_message]. + ## Build instructions * [Visual Studio 2013][msvc] @@ -122,5 +137,6 @@ Don't forget to [sign your patch](#sign-your-work) to put it in the public domai [xcode_old]: XCODEold.md [qtcreator]: QTCREATOR.md [help_fork_repo]: https://help.github.com/articles/fork-a-repo/ +[help_change_commit_message]: https://help.github.com/articles/changing-a-commit-message/ [commit_message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html [pr]: ../../compare/