On Sun, Feb 06, 2011 at 04:40:26PM +1100, Michael G Schwern wrote: > On 2011.2.4 1:39 PM, Aaron J. Grier wrote: > > is there a knob for me to always default git merge to --no-commit ? [...] > The real solution is to allow users to make errors, but quickly and > easily detect and undo them. Thus, everything needs an undo button. > Delete the wrong file? Pull it from the trash. [1] Editing a > document wrong? Undo button. Screw up a merge? Throw out that > commit and try again.
I am attempting to recreate my previous workflow in which I could do a final review of what I was about to commit after a merge was completed. I believe the git rationale is that since your commit is local, you can polish things before transferring them to other people, and automatically committing after a successful merge saves a step. I'm asking for trouble by working outside this workflow. my stumbling block was the mapping between foo.bar and [foo] bar = in ~/.gitconfig. the git-config man page hints about the mapping in multiple places, but doesn't have an explicit example of "these git config commands result in the following config file" or vice-versa. I'm still not clear if branch.mergeoptions=no-commit covers all branches, as the option is listed in git-branch docs as branch.<branchname>.mergeoptions. > Here is your git undo button. > > [alias] > undo = reset --hard HEAD^ or using git config: git config alias.undo 'reset --hard HEAD^' ? but maybe I'm digressing into hates-documentation, or config file hate. -- Aaron J. Grier | "Not your ordinary poofy goof." | agr...@poofygoof.com