[*] git commit -a means almost[*] the same thing as git add -u && git commit. It’s not the same as git add . as this would add untracked files that aren’t being ignored, git add -u only stages changes (including deletions) to already tracked files. [*] There’s a subtle difference if you’re not at … Read more
git log -S searchTerm gives you the commits in which the search term was introduced.
You should be able to recover any files back that you added to the index (e.g, as in your situation, with git add .) although it might be a bit of work. In order to add a file to the index, git adds it to the object database, which means it can be recovered so … Read more
Do git rebase -i –root (point to root instead of pointing to a specific commit) This way, the first commit is also included and you can just reword it like any other commit. The –root option was introduced in Git v1.7.12 (2012). Before then the only option was to use filter-branch or –amend, which is … Read more
You can use: git add –patch <filename> or for short: git add -p <filename> Git will break down your file into what it thinks are sensible “hunks” (portions of the file). It will then prompt you with this question: Stage this hunk [y,n,q,a,d,/,j,J,g,s,e,?]? Here is a description of each option: y stage this hunk for … Read more
You have already performed a filter-branch operation. After filter-branch, Git keeps refs to the old commits around, in case something goes wrong. You can find those in .git/refs/original/…. Either delete that directory and all files within, or use the -f flag to force Git to delete the old references. git filter-branch -f \ –index-filter ‘git … Read more
Do not use git-log for scripting: use either git-rev-list, or git-log with specified custom format (–format=*<sth>* option). There is additional problem with your question: there can exist more than one such TAIL root commit (parentless commit) in a repository (even if we discount disconnected branches, such as ‘html’, ‘man’ and ‘todo’ in git.git repository). This … Read more
For your first question, no, there’s nothing wrong with pushing multiple commits at once. Many times, you may want to break your work down into a few small, logical commits, but only push them up once you feel like the whole series is ready. Or you might be making several commits locally while disconnected, and … Read more
Once you push to the repo, you really don’t want to go about changing history. However, if you are absolutely sure that nobody has pulled/fetched from the repo since your offending commit, you have 2 options. If you want to remove the “bad” commit altogether (and every commit that came after that), do a git … Read more
Commit will simply make record of your changes that you have made on your local machine. It will not mark the change in the remote repository. Commit and Push will do the above and push it to the remote repository. This means that any changes you have made will be saved to the remote repository … Read more