git-commit

I need some help. It is possible to only show one commit id? Since git log -3 show the log from 1 - 3, I just want to show only 3. What possible command will match for it? I use the command git log -3 --pretty=format:"%h" the result is ffbef87 cf0e073 1c76c5d I only want to display the 1c76c5d only. Enrico Campidoglio You can use git show referencing the third parent from your current commit (i.e. the second ancestor from HEAD ). Also, git show accepts the same format string as git log : git show HEAD~2 --pretty=format:"%h" --no-patch Update ( 2016-12-01 ) An even better way would be to use

When I use git commit --amend or git rebase -i , vim opens up for me to make changes. If I then change my mind and exit vim without making any changes, a commit is still made which shows up in git reflog . How do I exit the editor without committing anything? To get git to not make a change when you are executing git commit --amend or git rebase -i . Just delete the message (and save). All git does is look for a non empty message to see if a valid commit happened. Since there is a commit message (because you commited something before) git thinks that its a valid commit or rebase. EDY

I want to see all TODO comments that only I wrote and that exist in the current code base that is git managed. What I've got so far is printing all TODO comments that I've ever created or modified during the complete git history: git log -p --author="My name" -S TODO | grep "\+.*TODO" But this tool chain lists all TODO comments ever written, even those that I've already resolved and thus removed again from code. Is there a tool that can search the current code base line-by-line, check if it contains "TODO" and if this line was authored by me and then print those lines? You can combine git

Usually, I just run git add file git commit git push but if I amend the commit before pushing it (with git commit --amend ), the next push fails with hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. How can I let git push the changes without merging branches? I only have one branch ( master ) and I'm the only person using this repo so why is it saying this? git branch -a: * master

In all the Git tutorials I've read they say that you can do: git init git add . git commit When I do that I get a big text file opened up. None of the tutorials seem to address this, so I don't know what to do with the file or what to put in it if anything. vikhyat You're meant to put the commit message in this text file, then save and quit. You can change the default text editor that git uses with this command: git config --global core.editor "nano" You have to change nano to whatever command would normally open your text editor. Will Robertson As mentioned by Ben Collins , without the -m "..

This question already has an answer here: Git Commit Messages : 50/72 Formatting 5 answers I find myself managing very many files (over 60 but below 70) and my commit messages so far follow this pattern: when I have added something like on layout.css , my commit message is "added something on layout.css file" , and when I remove something, my commit message is "removed something from layout.css file" . Some files down the line, I look at my commits feed and added... and removed... messages dominate. Sometimes I don't remember what I removed or what I added in layout.css since I make so many

I am writing a script that requires checking whether a particular commit is a Merge/Revert commit or not, and I am wondering if there is a git trick for that. What I came up with so far (and I definitely don't want to depend on the commit message here) is to check HASH^2 and see if I don't get an error, is there a better way? Figuring out if something is a merge is easy. That's all commits with more than one parent. To check for that, you can do, for example $ git cat-file -p $commit_id If there's more than one `parent' line in the output, you found a merge. For reverts it's not as easy.