diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-25 20:45:07 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-25 20:45:07 +0100 |
| commit | ad7ace714d353ef49045bc37c1363e8fc904792d (patch) | |
| tree | 7cefc4953bac3061de09d5380719f12c6e4fcef3 /builtin-init-db.c | |
| parent | Explicitly truncate bswap operand to uint32_t (diff) | |
| parent | Protect scripted Porcelains from GREP_OPTIONS insanity (diff) | |
| download | git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.xz git-ad7ace714d353ef49045bc37c1363e8fc904792d.zip | |
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
Diffstat (limited to 'builtin-init-db.c')
0 files changed, 0 insertions, 0 deletions