There’s rarely a good reason to do this, but the parameter is –allow-empty for empty commits (no files changed), in contrast to –allow-empty-message for empty commit messages. You can also read more by typing git help commit or visiting the online documentation. While the tree object (which has a hash of its own) will be … Read more
To remove the last two commits locally I’d suggest using: git reset –hard HEAD^^ Rebase is a completely different operation that won’t help you here.
you could write a script, which diffs the given tree against a revision range in your repository. assume we first fetch the changed tree (without history) into our own repository: git remote add foreign git://… git fetch foreign we then output the diffstat (in short form) for each revision we want to match against: for … Read more
git add adds your modified files to the queue to be committed later. Files are not committed git commit commits the files that have been added and creates a new revision with a log… If you do not add any files, git will not commit anything. You can combine both actions with git commit -a … Read more
git checkout -b NEW_BRANCH_NAME COMMIT_ID This will create a new branch called ‘NEW_BRANCH_NAME’ and check it out. (“check out” means “to switch to the branch”) git branch NEW_BRANCH_NAME COMMIT_ID This just creates the new branch without checking it out. in the comments many people seem to prefer doing this in two steps. here’s how to … Read more
That’s a typo. You’ve accidently set user.mail with no e in email. Fix it by setting user.email in the global configuration with git config –global user.email “you@example.com”
How can I display these open transactions and commit or cancel them? There is no open transaction, MySQL will rollback the transaction upon disconnect. You cannot commit the transaction (IFAIK). You display threads using SHOW FULL PROCESSLIST See: http://dev.mysql.com/doc/refman/5.1/en/thread-information.html It will not help you, because you cannot commit a transaction from a broken connection. What … Read more
There is a guide to splitting commits in the rebase manpage. The quick summary is: Perform an interactive rebase including the target commit (e.g. git rebase -i <commit-to-split>^ branch) and mark it to be edited. When the rebase reaches that commit, use git reset HEAD^ to reset to before the commit, but keep your work … Read more
You can override any checks that Git does by using “force push”. Use this command in the terminal: git push -f origin master However, you will potentially ignore the existing work that is in remote. You are effectively rewriting the remote’s history to be exactly like your local copy.
The actual commit stuck in by git commit is whatever is in the index once the pre-commit hook finishes. This means that you can change files in the pre-commit hook, as long as you git add them too. Here’s my example pre-commit hook, modified from the .sample: #!/bin/sh # # An example hook script to … Read more