Merge branch 'rr/sequencer'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800)
commit7010146f90abf0e4954690f6cd38a8463786fec7
tree2ea131c2e7a1f2b6042f847dad79bdf4a431f1b2
parent87a23e77c6ffc5713eff3a4a4da036731da2dc3f
parent043a4492b3b7da6496617201c369cff6ab7c26f2
Merge branch 'rr/sequencer'

* rr/sequencer:
  sequencer: factor code out of revert builtin
  revert: prepare to move replay_action to header

Conflicts:
builtin/revert.c
sequencer.c