How to search in commit messages using command line?
—git help log
Git
git-diff to ignore ^M
GitHub suggests that you should make sure to only use \n as a newline character in git-handled repos. There’s an option to auto-convert: Of course, this is said to convert crlf to lf, while you want to convert cr to lf. I hope this still works … And then convert your files: core.autocrlf is described on the … Read more
How to create a local branch from an existing remote branch?
you want to create branch on base of remote-A, make changes on it and then push them on remote-A? make changes on remote-B
How do I “un-revert” a reverted Git commit?
git cherry-pick <original commit sha>Will make a copy of the original commit, essentially re-applying the commit Reverting the revert will do the same thing, with a messier commit message:git revert <commit sha of the revert> Either of these ways will allow you to git push without overwriting history, because it creates a new commit after the revert.When … Read more
Why is .gitignore not ignoring my files?
.gitignore only ignores files that are not part of the repository yet. If you already git added some files, their changes will still be tracked. To remove those files from your repository (but not from your file system) use git rm –cached on them.
Git merge reports “Already up-to-date” though there is a difference
The message “Already up-to-date” means that all the changes from the branch you’re trying to merge have already been merged to the branch you’re currently on. More specifically it means that the branch you’re trying to merge is a parent of your current branch. Congratulations, that’s the easiest merge you’ll ever do. 🙂 Use gitk … Read more
Specify an SSH key for git push for a given domain
Even if the user and host are the same, they can still be distinguished in ~/.ssh/config. For example, if your configuration looks like this: Then you just use gitolite-as-alice and gitolite-as-bob instead of the hostname in your URL: Note You want to include the option IdentitiesOnly yes to prevent the use of default ids. Otherwise, … Read more
How to get Git to clone into current directory
Solution: On this case, the solution was using the dot, so: rm -rf .* && git clone ssh://[email protected]/home/user/private/repos/project_hub.git . rm -rf .* && may be omitted if we are absolutely sure that the directory is empty. Credits go to: @James McLaughlin on comments below.
How do I run git log to see changes only for a specific branch?
Assuming that your branch was created off of master, then while in the branch (that is, you have the branch checked out): or If you are not in the branch, then you can add the branch name to the “git log” command, like this: If your branch was made off of origin/master, then say origin/master … Read more
Resetting remote to a certain commit
Assuming that your branch is called master both here and remotely, and that your remote is called origin you could do: However, you should avoid doing this if anyone else is working with your remote repository and has pulled your changes. In that case, it would be better to revert the commits that you don’t … Read more