Answers

Here are the answers to the questions given above:

1. Add patterns matching the pathnames of those build artifacts to a .gitignore file.
2. Define a custom diff driver and provide the regular expression pattern matching the main “sections” of code with xfuncname. Also, add an appropriate regular expression defining words in that programming language with wordRegex, and perhaps also define whitespace problems with the whitespace attribute.
3. Use git reset --soft HEAD~2 to rewind the branch and create a joined commit with git commit, or use interactive rebase.
4. Perform a soft reset, git reset --soft HEAD^, construct the first commit with interactive add, test the code with git stash --keep-index, pop the stash if the tests pass, and create the first commit with git commit and the second with git commit -a; there are other solutions.
5. Use git stash to stash away current changes, create a WIP commit, or create a new detached working area for the urgent...