chiark / gitweb /
~mdw / profile / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ca53ef) | patch
emerge-hack: A new script for Git merging.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 26 Feb 2008 17:32:04 +0000 (17:32 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 26 Feb 2008 17:36:45 +0000 (17:36 +0000)
commit547fb8af43f4a641026efe17f3af85139aba7fd7
tree6294578d7c05043e2d52ae01d0c8e943ed696453tree | snapshot
parent3ca53efc5489066f294d6aa40f6fa926c1ad68facommit | diff
emerge-hack: A new script for Git merging.

emerge-hack pretends to be an Emacs and takes arguments as for emerge;
but instead it runs ediff, which is much nicer.
emerge-hack [new file with mode: 0755] blob
gitconfig diff | blob | blame | history
setup diff | blob | blame | history
Dotfiles and other configuration.