Cherry-pick commit to target branch and reset source branch. Assuming, you want to move the latest commit from source branch to target, do: git checkout target git cherry-pick source git checkout source git reset –hard source^ If the commit wasn’t the last, you will have to use git rebase -i instead of the last command … Read more
It can simply mean that, until you make your first add and first commit, you have no branch (not even a master one), hence no HEAD referencing any branch. See more in “Why do I need to explicitly push a new branch?”.
I’m not sure what version of git this requires, but with recent versions you can also do: git tag -l –format=”%(contents)” <tag name> to get only the tag message by itself.
There is currently no way to use git push to create a repository on the remote. The best you can do is write a one-liner script something like this: #!/bin/bash ssh $1 “git init –bare $2” && git push ssh://$1/$2 Hopefully you can ssh in; if you can’t, you could use some kind of filesystem … Read more
If your goal is indeed to keep one version or the other, then yes, you will want to use: git checkout <–theirs|–ours> <path> git add <path> Of course, as you say, it’s not ideal. If there’s any way you can avoid this, you should. If you can, try to adopt workflow habits which avoid changing … Read more
You missed a hook. The one you want is commit-msg: This hook is invoked by git commit, and can be bypassed with –no-verify option. It takes a single parameter, the name of the file that holds the proposed commit log message. Exiting with non-zero status causes the git commit to abort. So for example: #!/bin/sh … Read more
Instead of creating a new .gitignore file, you should use the .git/info/exclude file to setup ignore rules specific to your clone of the repo. So, basically, go to your project root, and run cd $PROJECT_ROOT echo “*.iml” >> .git/info/exclude Note that the the pattern *.iml will take care of files of kind .*.iml as well, … Read more
I wouldn’t commit any specific IDE configuration into the repository. 2 important reasons are: IDE configuration almost always involves absolute paths in disk, where different users may not have the same… You don’t want to constraint all users to use the same IDE config…
Plug the USB drive into Desktop, and assuming it’s showing up as J: Initialise a bare repo that will act as the remote: git init –bare J:\repo_name cd to the local repo and: git remote add usb J:\repo_name git checkout master git push usb master The master branch is synced with the usb remote. Now … Read more
Use the –date option when you commit: git commit –date “Wed Feb 16 14:00 2037 +0100” Here are the supported date formats: https://git-scm.com/docs/git-commit#_date_formats