diff options
| author | Dan Winship <danw@gnome.org> | 2011-07-09 10:56:30 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2012-03-01 13:25:53 -0500 |
| commit | ce11237046a1af9728f7d0544c6aae8eb1d5c7d3 (patch) | |
| tree | 7e867a995230ad0aaf8b33301f550287249229ef /Makefile | |
| parent | e422eea9999a02262d3bad996879378ce1824541 (diff) | |
apply: add --continue/--skip/--abort
Rather than failing completely when git-am fails to apply a patch,
write out our current state to git-am's temporary directory, and then
tell the user to use "git bz apply --continue/--skip/--abort" after
handling the merge failure. When the user uses one of those options,
read back our state, pass the flag on to git-am, and (assuming git-am
succeeds), continue with the next patch.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions