git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af742b9 e1622bf)
Merge branch 'rs/work-around-grep-opt-insanity' into maint
authorJunio C Hamano <redacted>
Thu, 3 Dec 2009 21:53:58 +0000 (13:53 -0800)
committerJunio C Hamano <redacted>
Thu, 3 Dec 2009 21:53:58 +0000 (13:53 -0800)
* rs/work-around-grep-opt-insanity:
  Protect scripted Porcelains from GREP_OPTIONS insanity
  mergetool--lib: simplify guess_merge_tool()

1  2 
git-am.sh patch | diff1 | diff2 | blob | history
git-instaweb.sh patch | diff1 | diff2 | blob | history
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history

diff --cc git-am.sh
Simple merge
diff --cc git-instaweb.sh
Simple merge
diff --cc git-rebase--interactive.sh
Simple merge
git clone https://git.99rst.org/PROJECT