Pulling in a single commit would be a cherry-pick and would rewrite the commit ID (and mark you as the committer while retaining the author). The process is pretty straightforward, though: git fetch git://github.com/user/project.git git cherry-pick <SHA-COMMIT-ID> You get the SHA from the repository log, for example: git log –oneline b019cc0 Check whether we have … Read more
This error message: error: remote unpack failed: unable to create temporary object directory indicates that the Git repository at the server (not your Git) is out of space, or running into similar server problems,1 or installed incorrectly. That is, given: To: http://git.int.censoredlink/scm/freeb/freebrep.git you will have to log in to the machine that serves HTTP traffic … Read more
On GitHub specifically, you now can see the branch a given commit is part of. The blog post “Branch and Tag Labels For Commit Pages” details: If the commit is not on the default branch, the indicator will show the branches which contain the commit. If the commit is part of an unmerged pull request, … Read more
To add to “.gitignore exclude folder but include specific subfolder”, one good way to debug those .gitignore file is to use git check-ignore (Git 1.8.4+): git check-ignore -v my_folder/my_file.md You would see it is still ignored because of the my_folder/ rule. That is because it is not possible to re-include a file if a parent … Read more
As far back as commit c64b9b8 (git 0.99, May 2005), time has always been referred as <date> Date in ‘seconds since epoch’ commit 6eb8ae0 defines date as an unsigned long since April 2005. TLDR; date before unix epoch can be stored, but cannot be sure to be correctly represented. But that has evolved since 2014 … Read more
Yes, you can push any local branch to any remote branch. The syntax is git push <remote name, e.g. origin> <local branch name>:<remote branch name> If your current branch (the one you want to push) is called develop, the command would be git push ME develop:x
If you’d like to see the staged changes in a diff, you can still use git diff, you just need to pass the –staged flag: david@pav:~/dummy_repo$ echo “Hello, world” > hello.txt david@pav:~/dummy_repo$ git status # On branch master # # Initial commit # # Untracked files: # hello.txt nothing added to commit but untracked files … Read more
In $ git reflog you should find some of your commits. Once you find the latest commit that you want to move to you should reset back to your commit id $ git reset _Your_Hash_ , as $ git reset –soft just reset the files and not the index or working tree.
This should only be the case if you’re amending an already-pushed commit. Generally you should never do that as you’re then modifying published history. In your case however, you should be able to get away with push -f, which will overwrite the remote commit with your amended revision.