git-commit

I am trying to revert to an earlier git commit but get the error "bad revision". Why? Here is a transcript (with author names removed): Ellen@ELLEN-PC /c/Users/Susan Mills/git/hello-github (master) $ git status # On branch master nothing to commit, working directory clean Ellen@ELLEN-PC /c/Users/Susan Mills/git/hello-github (master) $ git log | head commit e3eb30cc7ca6d4cd10de755b63821cad75da1e83 Date: Wed Feb 5 17:54:32 2014 -0800 I changed my greeting. commit 063ac580e28bab524286dac7b0a8f88d9e7d365f Date: Mon Feb 3 07:53:19 2014 -0800 Ellen@ELLEN-PC /c/Users/Susan Mills/git/hello-github

How do I craft customized commit message template? I would like to have something like: # Short (50 chars or fewer) summary of changes # More detailed explanatory text Add following to your ~/.gitconfig : [commit] template = ~/.git-commit-message Create ~/.git-commit-message file with following content: # Short (50 chars or fewer) summary of changes # More detailed explanatory text Ref. commit.template in http://git-scm.com/docs/git-config 来源： https://stackoverflow.com/questions/31873577/custom-git-commit-message-template

I'm looking for a good description of what happens if one commits during rebase and how this could be 'reverted' in an easy way. Let's consider a scenario, where a large commit is rebased. During rebase a conflict appears and user begins merging changes. Now, imagine a scenario where you were almost done, but you didn't call git rebase --continue - for whatever reason (be it long weekend or such). The next week you just resumed working, stil during rebase. Finally, you call git commit --amend to append the changes to the last commit and... they end up in the commit you were rebasing into.

I have two long-running branches dev , and a far future release called future . We create fixes for the supported release by branching from the tag that exhibits the bug, fix it, and then open pull-requests to the two branches. If there is a conflict in the 'future' branch, our developers are suppose to create a new branch, resolve the conflicts, and open another PR to future. Unfortunately, our team is large enough that plenty of these second PRs haven't been made. I need to now figure out which exact commits caused conflicts. I can do this manually by running git blame on each conflicted

I have some commits that I don't want in my project, but there's a commit based on them which I do want in it. This is my GitHub "Network" graph of the repository (ASCII, as I still cannot post images): []--[]--[_] | | | ------->| ---------->[·]--[·]--[*] (-> means a merge) I want to delete the changes made in the two [·] commits, and base the [*] one on the [_] one above. I've tryed merging and rebasing, but they apply the changes of the unwanted commits. Is it possible? Sorry if I'm not clear, English isn't my mother language. Thanks in advance. I can give you two options: Interactive rebase

I have a commits in my git history 1.commit 4930da17d8dd23d650ed38435d8b421816a0c451 Date: Sat Dec 5 14:34:18 2015 +0530 2.commit e1ebbbb599ee20ebec3ca92c26266d9fd16e7ccc Date: Sat Dec 5 13:22:20 2015 +0530 3.commit 1c4a11a80eb054d24dafec2efed0b0282188e687 Date: Sat Dec 5 12:11:50 2015 +0530 4.commit b4ab3c164a3a8d93e0a71a94b5c561cb5e20ebf6 Date: Sat Dec 5 12:09:56 2015 +0530 5.commit 167b1d10258381f09663ce61fa88ce3bbcd404c4 Date: Sat Dec 5 12:09:21 2015 +0530 6.commit c61bcadac673e1c83f4c14b66d56e23b12fa3198 Date: Sat Dec 5 12:07:58 2015 +0530 In that 3rd and 4th commit contains a wrong code,