If you like the method in the link you’ve posted, have a look at Git Flow. It’s a set of scripts he created for that workflow. But to answer your question: $ git checkout -b myFeature dev Creates MyFeature branch off dev. Do your work and then $ git commit -am “Your message” Now merge … Read more
This works for both git log and gitk – the 2 most common ways of viewing history. You don’t need to use the whole name: git log –author=”Jon” will match a commit made by “Jonathan Smith” git log –author=Jon and git log –author=Smith would also work. The quotes are optional if you don’t need any … Read more
Try: git format-patch -1 <sha> or git format-patch -1 HEAD According to the documentation link above, the -1 flag tells Git how many commits should be included in the patch; -<n> Prepare patches from the topmost commits. Apply the patch with the command: git am < file.patch
To reset both the working copy of my-file.txt and its state in the Git index to that of HEAD: git checkout HEAD — my-file.txt — means “treat every argument after this point as a filename”. More details in this answer. Thanks to VonC for pointing this out.
Remove directory from Git and local Checkout ‘master’ with both directories: git rm -r one-of-the-directories // This deletes from filesystem git commit . -m “Remove duplicated directory” git push origin <your-git-branch> (typically ‘master’, but not always) Remove directory from Git but NOT local To remove this directory from Git but not delete it entirely from … Read more
In git revert -m, the -m option specifies the parent number. This is needed because a merge commit has more than one parent, and Git does not know automatically which parent was the mainline, and which parent was the branch you want to un-merge. When you view a merge commit in the output of git … Read more
None of these solutions worked for me. Instead, I elaborate on @Martin v. Löwis ‘s mention of setting a config file for SSH. SSH will look for the user’s ~/.ssh/config file. I have mine setup as: Host gitserv Hostname remote.server.com IdentityFile ~/.ssh/id_rsa.github IdentitiesOnly yes # see NOTES below And I add a remote git repository: … Read more
Remove existing .DS_Store files from the repository: find . -name .DS_Store -print0 | xargs -0 git rm -f –ignore-unmatch Add this line: .DS_Store to the file .gitignore, which can be found at the top level of your repository (or create the file if it isn’t there already). You can do this easily with this command … Read more
Create a users file (i.e. users.txt) for mapping SVN users to Git: user1 = First Last Name <email@address.com> user2 = First Last Name <email@address.com> … You can use this one-liner to build a template from your existing SVN repository: svn log -q | awk -F ‘|’ ‘/^r/ {gsub(/ /, “”, $2); sub(” $”, “”, $2); … Read more
git rebase -i will do it. First, start with a clean working directory: git status should show no pending modifications, deletions, or additions. Now, you have to decide which commit(s) you want to split. A) Splitting the most recent commit To split apart your most recent commit, first: $ git reset HEAD~ Now commit the … Read more