tokkee.org

Code

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b073b7a e1622bf)

author	Junio C Hamano <gitster@pobox.com>
	Wed, 25 Nov 2009 19:45:07 +0000 (11:45 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 25 Nov 2009 19:45:07 +0000 (11:45 -0800)
commit	ad7ace714d353ef49045bc37c1363e8fc904792d
tree	7cefc4953bac3061de09d5380719f12c6e4fcef3	tree \| snapshot
parent	b073b7a990deb1cb3425db45642fa18c8b3cb65c	commit \| diff
parent	e1622bfcbad680225ad5c337e4778df88389227e	commit \| diff

Merge branch 'rs/work-around-grep-opt-insanity'

* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()

Conflicts:
git-instaweb.sh

git-am.sh	diff1 \|	diff2 \|	blob \| history
git-bisect.sh	diff1 \|	diff2 \|	blob \| history
git-filter-branch.sh	diff1 \|	diff2 \|	blob \| history
git-instaweb.sh	diff1 \|	diff2 \|	blob \| history
git-mergetool--lib.sh	diff1 \|	diff2 \|	blob \| history
git-rebase--interactive.sh	diff1 \|	diff2 \|	blob \| history
git-rebase.sh	diff1 \|	diff2 \|	blob \| history
git-sh-setup.sh	diff1 \|	diff2 \|	blob \| history
git-submodule.sh	diff1 \|	diff2 \|	blob \| history

Git - the stupid content tracker