author | Junio C Hamano <gitster@pobox.com> | |
Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800) | ||
commit | 7010146f90abf0e4954690f6cd38a8463786fec7 | |
tree | 2ea131c2e7a1f2b6042f847dad79bdf4a431f1b2 | tree | snapshot |
parent | 87a23e77c6ffc5713eff3a4a4da036731da2dc3f | commit | diff |
parent | 043a4492b3b7da6496617201c369cff6ab7c26f2 | commit | diff |
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
* rr/sequencer:
sequencer: factor code out of revert builtin
revert: prepare to move replay_action to header
Conflicts:
builtin/revert.c
sequencer.c | diff1 | | diff2 | | blob | history |