The answer, as given, is to use format-patch but since the question was how to cherry-pick from another folder, here is a piece of code to do just that: $ git –git-dir=../<some_other_repo>/.git \ format-patch -k -1 –stdout <commit SHA> | \ git am -3 -k Explanation from Cong Ma comment Aug 28 ’14 git format-patch … Read more
For Git 1.x $ git add -u This tells git to automatically stage tracked files — including deleting the previously tracked files. For Git 2.0 To stage your whole working tree: $ git add -u :/ To stage just the current path: $ git add -u .
Certainly, how it’s done depends on your shell. In Bash, you can use single quotes around the message and can just leave the quote open, which will make Bash prompt for another line, until you close the quote. Like this: git commit -m ‘Message goes here’ Alternatively, you can use a “here document” (also known … Read more
Use the BFG Repo-Cleaner, a simpler, faster alternative to git-filter-branch specifically designed for removing unwanted files from Git history. Carefully follow the usage instructions, the core part is just this: $ java -jar bfg.jar –strip-blobs-bigger-than 100M my-repo.git Any files over 100MB in size (that aren’t in your latest commit) will be removed from your Git … Read more
I’d like to add an answer here that is really just a conglomerate of other answers, but I think it may be more complete. You know you have a Git submodule when you have these two things. Your .gitmodules has an entry like so: [submodule “SubmoduleTestRepo”] path = SubmoduleTestRepo url = https://github.com/jzaccone/SubmoduleTestRepo.git You have a … Read more
Try rm -f ./.git/index.lock In your repository directory. The error message is rather explicit as to what causes it typically, so if you have no other git processes running (which is the normal case), go ahead and delete that file.
Basically, git commit “records changes to the repository” while git push “updates remote refs along with associated objects“. So the first one is used in connection with your local repository, while the latter one is used to interact with a remote repository. Here is a nice picture from Oliver Steele, that explains the Git model … Read more
You can configure an individual repo to use a specific user / email address which overrides the global configuration. From the root of the repo, run git config user.name “Your Name Here” git config user.email your@email.com whereas the default user / email is configured in your ~/.gitconfig git config –global user.name “Your Name Here” git … Read more
Try git fetch so that your local repository gets all the new info from Github. It just takes the information about new branches and no actual code. After that, the git checkout should work fine. You basically see the branch, but you don’t have a local copy yet!… You can simply fetch and then checkout … Read more
You can do an interactive rebase and choose edit for the commit whose date you would like to alter. When the rebase process stops for amending the commit you type in for instance: git commit –amend –date=”Wed Feb 16 14:00 2011 +0100″ –no-edit P.S. –date=now will use the current time. Afterward, you continue your interactive … Read more