revert: Save command-line options for continuing operation
authorRamkumar Ramachandra <artagnon@gmail.com>
Thu, 4 Aug 2011 10:39:09 +0000 (16:09 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Aug 2011 22:40:44 +0000 (15:40 -0700)
commit6f0322633b2659d26d1c7b20d4af1fba33978690
treec5c253dbd2c322c9a00d4eb18c13bddc28f26f44
parent04d3d3cfc4a26f003c5ae2b5598cc975a31e4395
revert: Save command-line options for continuing operation

In the same spirit as ".git/sequencer/head" and ".git/sequencer/todo",
introduce ".git/sequencer/opts" to persist the replay_opts structure
for continuing after a conflict resolution.  Use the gitconfig format
for this file so that it looks like:

  [options]
  signoff = true
  record-origin = true
  mainline = 1
  strategy = recursive
  strategy-option = patience
  strategy-option = ours

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Helped-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/revert.c
t/t3510-cherry-pick-sequence.sh