「 月別アーカイブ:2015年01月 」 一覧
-
-
tinydns 属性文字チートシート
ネームサーバーはtinydns が好きです。 けど、普段BINDばっかり使っていると tinydns の書式を忘れてしまいますね。 なので、メモ。 tinydnsの属性文字の意味 属性文字 意味 生成 ...
-
-
RHEL系OSのパッケージ管理の便利ワザ
2015/01/31 -Linux
RHEL系OSのパッケージ管理で知っておくと便利な小ネタをご紹介しようと思います。 インストールしたパッケージの更新履歴を見る
12# rpm -qa <パッケージ名> --changelog使って ...
-
-
VMware ESX 上の CentOS 7 に VMwareTools をインストール
2015/01/31 -Linux
VMware ESX 上で稼働するMinimal インストールな CentOS 7 に VMware Toolsを入れた時のメモ。 必要なパッケージをインストール CentOS 7 をMinimal ...
-
-
Linux のキーボードのキー配列を一時的に変更する
2015/01/26 -Linux
英字キー配列のキーボードを使っていて、 日本語キー配列を使うように設定された環境を触る時. 『|』とかまともに打てずに困ることがあると思います。 なので、一時的にキー配列を変えてしまいましょう! ...
-
-
MacOSX Yosemite にrvmでRuby-1.8.7をインストールする
Yosemiteにインストールしているrvm で Ruby-1.8.7 を インストールしようとしたところ下記のエラーが発生して、インストール失敗しました。 [crayon-5ae2e353a2c9f ...
-
-
Macのターミナルのログを自動保存する
2015/01/24 -Mac
history から流れてしまったコマンドを確認したい時や、 事故があった場合に身の潔白を証明するためにターミナルのログがあると役立ちます。 設定はとても簡単で、 /etc/profile に下記を追 ...
-
-
わしのvim
2015/01/22 -Vim
いろんなブログとかを見まくってvim を育てています。 私が今使っているvim の設定内容を晒すついでに、設定の手順も乗っけておきます。 ステキ vim 環境を手に入れる事前準備 ステキvim に欠か ...
-
-
自動インデントが有効になっているvimにクリップボードからペーストする際のtips
2015/01/22 -Vim
vim で autoindent や smartindent を有効にした状態で、 クリップボードから複数行を貼り付けるとインデントがおかしくなることがあります。 この時、vim の実行モードをコマ ...
-
-
CentOS 7 インストール後のホスト名設定、ネットワーク設定
2015/01/19 -Linux
CentOS 7 をインストールした後、ホスト名と静的IPの設定を行いました。 CentOS 6 で使えていたコマンドが使えなくて、手間取ったので、メモ。 ホスト名を変更する CentOS7はCent ...
-
-
brew update 失敗時の対処法
2015/01/19 -Mac
brew update を実行したところ下記のエラーが発生
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288$ sudo brew updateerror: Your local changes to the following files would be overwritten by merge:.gitignoreCODEOFCONDUCT.mdCONTRIBUTING.mdLICENSE.txtLibrary/Contributions/brew_bash_completion.shLibrary/Contributions/brew_fish_completion.fishLibrary/Contributions/brew_zsh_completion.zshLibrary/Contributions/example-formula.rbLibrary/ENV/4.3/bsdmakeLibrary/ENV/4.3/ccLibrary/ENV/4.3/gitLibrary/ENV/4.3/pod2manLibrary/ENV/4.3/svnLibrary/Formula/a2ps.rbLibrary/Formula/aalib.rbLibrary/Formula/abcde.rbLibrary/Formula/abcm2ps.rbLibrary/Formula/abcmidi.rbLibrary/Formula/abnfgen.rbLibrary/Formula/ace.rbLibrary/Formula/ack.rbLibrary/Formula/acme.rbLibrary/Formula/acpica.rbLibrary/Formula/activemq-cpp.rbLibrary/Formula/adns.rbLibrary/Formula/adobe-air-sdk.rbLibrary/Formula/aescrypt.rbLibrary/Formula/afflib.rbLibrary/Formula/afsctool.rbLibrary/Formula/aget.rbLibrary/Formula/aha.rbLibrary/Formula/aircrack-ng.rbLibrary/Formula/akka.rbLibrary/Formula/align.rbLibrary/Formula/alpine.rbLibrary/Formula/amap.rbLibrary/Formula/amtterm.rbLibrary/Formula/analog.rbLibrary/Formula/android-ndk.rbLibrary/Formula/android-platform-tools.rbLibrary/Formula/android-sdk.rbLibrary/Formula/ansible.rbLibrary/Formula/ansifilter.rbLibrary/Formula/ant.rbLibrary/Formula/antlr.rbLibrary/Formula/apache-spark.rbLibrary/Formula/ape.rbLibrary/Formula/apgdiff.rbLibrary/Formula/apib.rbLibrary/Formula/apngasm.rbLibrary/Formula/app-engine-java-sdk.rbLibrary/Formula/appscale-tools.rbLibrary/Formula/aqbanking.rbLibrary/Formula/arabica.rbLibrary/Formula/arangodb.rbLibrary/Formula/argp-standalone.rbLibrary/Formula/argus-clients.rbLibrary/Formula/argus.rbLibrary/Formula/aria2.rbLibrary/Formula/arp-scan.rbLibrary/Formula/asciidoc.rbLibrary/Formula/asn1c.rbLibrary/Formula/aspell.rbLibrary/Formula/assimp.rbLibrary/Formula/astyle.rbLibrary/Formula/at-spi2-atk.rbLibrary/Formula/at-spi2-core.rbLibrary/Formula/atf.rbLibrary/Formula/atk.rbLibrary/Formula/atomicparsley.rbLibrary/Formula/atool.rbLibrary/Formula/ats2-postiats.rbLibrary/Formula/aubio.rbLibrary/Formula/auctex.rbLibrary/Formula/audiofile.rbLibrary/Formula/augeas.rbLibrary/Formula/auto-scaling.rbLibrary/Formula/autoconf-archive.rbLibrary/Formula/autoconf.rbLibrary/Formula/autoenv.rbLibrary/Formula/autogen.rbLibrary/Formula/autojump.rbLibrary/Formula/automake.rbLibrary/Formula/autossh.rbLibrary/Formula/avfs.rbLibrary/Formula/avian.rbLibrary/Formula/avidemux.rbLibrary/Formula/avra.rbLibrary/Formula/aws-cfn-tools.rbLibrary/Formula/aws-elasticache.rbLibrary/Formula/aws-elasticbeanstalk.rbLibrary/Formula/aws-sns-cli.rbLibrary/Formula/awscli.rbLibrary/Formula/axel.rbLibrary/Formula/b43-fwcutter.rbLibrary/Formula/babeld.rbLibrary/Formula/babl.rbLibrary/Formula/bacula-fd.rbLibrary/Formula/bam.rbLibrary/Formula/bash-git-prompt.rbLibrary/Formula/bash.rbLibrary/Formula/bashdb.rbLibrary/Formula/bashish.rbLibrary/Formula/bats.rbLibrary/Formula/bazaar.rbLibrary/Formula/bbftp-client.rbLibrary/Formula/bchunk.rbLibrary/Formula/bcpp.rbLibrary/Formula/bcrypt.rbLibrary/Formula/bdw-gc.rbLibrary/Formula/beecrypt.rbLibrary/Formula/berkeley-db.rbLibrary/Formula/berkeley-db4.rbLibrary/Formula/betty.rbLibrary/Formula/bfg.rbLibrary/Formula/bib-tool.rbLibrary/Formula/bibtex2html.rbLibrary/Formula/bibutils.rbLibrary/Formula/bind.rbLibrary/Formula/binutils.rbLibrary/Formula/binwalk.rbLibrary/Formula/bip.rbLibrary/Formula/bison.rbLibrary/Formula/bitchx.rbLibrary/Formula/bitlbee.rbLibrary/Formula/blink1.rbLibrary/Formula/blitz.rbLibrary/Formula/blueutil.rbLibrary/Formula/bmon.rbLibrary/Formula/boost-bcp.rbLibrary/Formula/boost-build.rbLibrary/Formula/boost-python.rbLibrary/Formula/boost.rbLibrary/Formula/boot2docker.rbLibrary/Formula/botan.rbLibrary/Formula/boxes.rbLibrary/Formula/bpm-tools.rbLibrary/Formula/brew-gem.rbLibrary/Formula/bro.rbLibrary/Formula/bsdiff.rbLibrary/Formula/bsdmake.rbLibrary/Ferror: The following untracked working tree files would be overwritten by merge:.yardoptsLibrary/.rubocop.ymlLibrary/Aliases/actor-frameworkLibrary/Aliases/libcafLibrary/Aliases/libgmeLibrary/Aliases/nimLibrary/ENV/pkgconfig/10.6/sqlite3.pcLibrary/ENV/pkgconfig/10.6/zlib.pcLibrary/ENV/pkgconfig/10.7/sqlite3.pcLibrary/ENV/pkgconfig/10.7/zlib.pcLibrary/ENV/pkgconfig/10.8/sqlite3.pcLibrary/ENV/pkgconfig/10.8/zlib.pcLibrary/ENV/scm/gitLibrary/ENV/scm/svnLibrary/Formula/abduco.rbLibrary/Formula/abi-compliance-checker.rbLibrary/Formula/aescrypt-packetizer.rbLibrary/Formula/afl-fuzz.rbLibrary/Formula/apr-util.rbLibrary/Formula/apr.rbLibrary/Formula/aptly.rbLibrary/Formula/arpon.rbLibrary/Formula/artifactory.rbLibrary/Formula/asciinema.rbLibrary/Formula/baresip.rbLibrary/Formula/blucat.rbLibrary/Formula/bwctl.rbLibrary/Formula/camlp4.rbLibrary/Formula/carthage.rbLibrary/Formula/cctools.rbLibrary/Formula/chapel.rbLibrary/Formula/chinadns-c.rbLibrary/Formula/clang-format.rbLibrary/Formula/closure-linter.rbLibrary/Formula/commonmark.rbLibrary/Formula/cpp-netlib.rbLibrary/Formula/cproto.rbLibrary/Formula/ctunnel.rbLibrary/Formula/davmail.rbLibrary/Formula/deis.rbLibrary/Formula/distribution.rbLibrary/Formula/dnscrypt-wrapper.rbLibrary/Formula/dsd.rbLibrary/Formula/duck.rbLibrary/Formula/ebook-tools.rbLibrary/Formula/epeg.rbLibrary/Formula/euler-py.rbLibrary/Formula/fabric.rbLibrary/Formula/ffts.rbLibrary/Formula/fibjs.rbLibrary/Formula/finatra.rbLibrary/Formula/flow.rbLibrary/Formula/game-music-emu.rbLibrary/Formula/gammaray.rbLibrary/Formula/gauge.rbLibrary/Formula/gdnsd.rbLibrary/Formula/gifify.rbLibrary/Formula/git-review.rbLibrary/Formula/gitfs.rbLibrary/Formula/glbinding.rbLibrary/Formula/glide.rbLibrary/Formula/gnatsd.rbLibrary/Formula/groovysdk.rbLibrary/Formula/gtkextra.rbLibrary/Formula/h2o.rbLibrary/Formula/hardlink-osx.rbLibrary/Formula/hashcash.rbLibrary/Formula/hh.rbLibrary/Formula/i2util.rbLibrary/Formula/icdiff.rbLibrary/Formula/id3ed.rbLibrary/Formula/idris.rbLibrary/Formula/ios-class-guard.rbLibrary/Formula/jenv.rbLibrary/Formula/jooby-bootstrap.rbLibrary/Formula/jrnl.rbLibrary/Formula/jsoncpp.rbLibrary/Formula/julius.rbLibrary/Formula/kore.rbLibrary/Formula/kyua.rbLibrary/Formula/lastpass-cli.rbLibrary/Formula/libbpg.rbLibrary/Formula/libgit2-glib.rbLibrary/Formula/libgroove.rbLibrary/Formula/libhdhomerun.rbLibrary/Formula/libiomp.rbLibrary/Formula/libjson-rpc-cpp.rbLibrary/Formula/libmarisa.rbLibrary/Formula/libpointing.rbLibrary/Formula/libsoxr.rbLibrary/Formula/lsh.rbLibrary/Formula/ltl2ba.rbLibrary/Formula/lutok.rbLibrary/Formula/makefile2graph.rbLibrary/Formula/mdp.rbLibrary/Formula/megatools.rbLibrary/Formula/memo.rbLibrary/Formula/mitie.rbLibrary/Formula/moco.rbLibrary/Formula/mvnvm.rbLibrary/Formula/mvptree.rbLibrary/Formula/mysql-sandbox.rbLibrary/Formula/nailgun.rbLibrary/Formula/nave.rbLibrary/Formula/nikto.rbLibrary/Formula/nut.rbLibrary/Formula/odo.rbLibrary/Formula/odt2txt.rbLibrary/Formula/open-zwave.rbLibrary/Formula/openh264.rbLibrary/Formula/osquery.rbLibrary/Formula/pcsc-lite.rbLibrary/Formula/perl.rbLibrary/Formula/pgcli.rbLibrary/Formula/pinentry-mac.rbLibrary/Formula/powerman.rbLibrary/Formula/pup.rbLibrary/Formula/pwntools.rbLibrary/Formula/queequeg.rbLibrary/Formula/rbenv-bundle-exec.rbLibrary/Formula/rbenv-bundler-ruby-version.rbLibrary/Formula/redshift.rbLibrary/Formula/restund.rbLibrary/Formula/rgbds.rbLibrary/Formula/rmate.rbLibrary/Formula/rocket.rbLibrary/Formula/scalastyle.rbLibrary/Formula/signify-osx.rbLibrary/Formula/simple-amqp-client.rbLibrary/Formula/skinny.rbLibrary/Formula/smali.rbLibrary/Formula/snappystream.rbLibrary/Formula/snow.rbLibrary/Formula/speech-tools.rbLibrary/Formula/spoof-mac.rbLibrary/Formula/src.rbLibrary/Formula/sslmate.rbLibrary/Formula/stlink.rbLibrary/Formula/stoken.rbLibrary/Formula/sublAbortingError: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master対処法 以下のコマンドを走らせて解決しました。 [crayon-5ae2e ...