A merge commit is just like another commit, the state of your repository at a given point in time plus the history it evolved from. The one thing special about a merge commit is that it has at least two predecessors, therefore a plain vanilla diff doesn’t make sense, you can only compare the merge … Read more
That’s caused by the different standards used in line endings (LineFeed or LF in Linux and CarriageReturn + LineFeed or CRLF in Windows). You can set the encoding you want by either of the following ways: Click the LF or CRLF button on the status bar (near the bottom right corner), then select LF or … Read more
The correct way to do this is to use git log as follows. git log -1 –pretty=”format:%ci” /path/to/repo/anyfile.any -1 restricts it to the very last time the file changed %ci is just one of the date formats you can choose from others here at https://git-scm.com/docs/pretty-formats
For me none of the suggested solutions worked so I tried to fix it myself and I resolved it. I was getting this error on my AWS EC2 UBUNTU instance. I edited the ssh config (or add it if it does not exist). nano ~/.ssh/config And I added the following Host github.com Hostname ssh.github.com Port … Read more
Here’s how to do it with rebase and keep both the commit date and the author date: git -c rebase.instructionFormat=”%s%nexec GIT_COMMITTER_DATE=”%cD” GIT_AUTHOR_DATE=”%aD” git commit –amend –no-edit –reset-author” rebase -f <commit/branch before wrong author and email, or –root to rebase all> Based off this Reddit thread.
The “size” of a commit can mean different things. If you mean how much disk storage it takes up… that’s very tricky to tell in Git and probably unproductive. Whereas something like SVN stores commits as deltas, when you change a file in Git it stores a new copy of the file as an object … Read more
A simple git fetch –tags worked for me.
Use the Gitlens extension. It supports various options. Once installed, you can use Alt+B to show the full file blame information.
Use wildcards: Solution/*/bin/Debug Solution/*/bin/Release With version 1.8.2 of Git, you can also use the ** wildcard to match any level of subdirectories: **/bin/Debug/ **/bin/Release/
If you want to find all commits where the commit message contains a given word, use $ git log –grep=word If you want to find all commits where “word” was added or removed in the file contents (to be more exact: where the number of occurrences of “word” changed), i.e., search the commit contents, use … Read more