diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2011-08-04 16:09:09 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-04 15:40:44 -0700 |
| commit | 6f0322633b2659d26d1c7b20d4af1fba33978690 (patch) | |
| tree | c5c253dbd2c322c9a00d4eb18c13bddc28f26f44 /diffcore-break.c | |
| parent | revert: Save data for continuing after conflict resolution (diff) | |
| download | tgif-6f0322633b2659d26d1c7b20d4af1fba33978690.tar.xz | |
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>
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions