Merge pull request #129 from snaewe/fix-merging-rebase
authordscho <johannes.schindelin@gmx.de>
Thu, 15 Aug 2013 19:30:55 +0000 (12:30 -0700)
committerdscho <johannes.schindelin@gmx.de>
Thu, 15 Aug 2013 19:30:55 +0000 (12:30 -0700)
commitcee9ebdf3a1609a5562deadd4cc0b1084362b4c2
tree75584cf5a08d568a49a61f7917a0017a842873f3
parentab173bb3bc3852b04e2958abac61bc6f65c7a64a
parent9c1c7680d4827fa55092f78646d43de3ed1a1ab3
Merge pull request #129 from snaewe/fix-merging-rebase

merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet