git-commit

Recently in a project with multiple people, a commit was made as seen in the image below. Marked in red you can see a commit with the description/comment of 'Merge?'. This commit added numerous files and altered numerous others and was never intended to take place. Using atlassian-sourcetree what do I need to do to roll everything back to the commit highlighted in blue? (I am 8 commits behind as seen in the screenshot.) If you have pushed the commits upstream... Select the commit you would like to roll back to and reverse the changes by clicking Reverse File , Reverse Hunk or Reverse Selected

This question already has an answer here: How can I recover a lost commit in Git? 3 answers I am surprised, I couldn't find the answer to this on SO. Can we recover/restore deleted commits in git? For example, this is what I did: # Remove the last commit from my local branch $ git reset --hard HEAD~1 # Force push the delete $ git push --force Now, is there a way to get back the commit which was deleted? Does git record(log) the delete internally? To get back to that commit you can use the reflog to look up it's ref. Reference logs, or "reflogs", record when the tips of branches and other

I have a release branch named release/X.X.X.X which contains all feature branches I want to deploy to production. The release branch is made on top of master which is the current state of production. On every release day I make sure our release branch contains only those changes planned for the release. I use this command to compare the release and master branch: git log release/X.X.X.X ^master --no-merges . I then manually check the commits for keywords like "SHR-1234" which represent ticket numbers in our ticket management system. I need to compare each commit with a list of ticket numbers

I get the following error when running Git commit: c:/Program/ Files/ /(x86/)/Notepad++/notepad++.exe: -c: line 0: syntax error near unexpected token `(' c:/Program/ Files/ /(x86/)/Notepad++/notepad++.exe: -c: line 0: `c:/Pr ogram/ Files/ /(x86/)/Notepad++/notepad++.exe \$@\' error: There was a problem with the editor 'c:/Program/ Files/ /(x86/) /Notepad++/notepad++.exe'. Please supply the message using either -m or -F option. What does it mean? How can I fix it? I was just running into this, and found your question trying to figure it out. I too assumed it needed escape characters for the

I'm looking for a way to write the Signed-off-by: tag automatically when I commit. I tried configuring it through the .git/config file (Reference) . I put these lines of code: [alias] commit = commit -s This did not work. As commented below, you can not edit git's own alias (like commit). (Reference) I also tried using the command (Reference) : git config --global format.signoff true Also had no effect. This explains why. I'm looking for any solution that automatically places the tag and allows me to edit the commit message directly on git, without having to use a system alias. [Edit made

So I read a lot about how to change previous commit's email address but for some reason mine is not updating. I did like 40 commits to my private repo with my local email (nameofMyComputer@kevin.local) which is bad since this email is not associated(and it can't be) with github. I then remembered that I needed to set the git.config before and so I did: git config user.email "newemail@example.com" and did a test commit and it worked perfectly. Is there a way I can revert all my previous commits to this new email? I read this question on SO Change the author and committer name and e-mail of

I'm new to Git and a bit confused. I have a Master branch and have created a second feature branch. If I make changes in my feature branch and then switch to Master, will my changes be lost if I don't commit? Where does stash come into play, is it something you do before you switch branches (but don't want to commit) or is it to simply revert some changes so you can get back to previous code temporarily? You can't change to another branch unless you clean your tree. This is done by committing your changes, reverting them or saving them to the stash. You probably don't want to use stash for

I changed my global Git configuration to sign all commits. I also use gpg-agent so that I don't have to type my password every time. Now every time I make a new commit I see the following five lines printed to my console: [blank line] You need a passphrase to unlock the secret key for user: "John Doe <mail@gmail.com>" 2048-bit RSA key, ID ABCDEF12, created 2016-01-01 [blank line] Even worse, when I do a simple stash, this message is printed twice , needlessly filling my console (I assume for one for each of the two commit objects that are created). Is there a way to suppress this output? VonC