{"thread":{"id":"6447","subject":"git-am and git-rebase inconsistency","startedAt":"2007-01-19T23:53:11Z","lastAt":"2007-01-20T00:25:26Z","messageCount":2,"participants":["David Kågedal","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"32105","messageId":"873b66infc.fsf@morpheus.local","threadId":"6447","inReplyTo":null,"subject":"git-am and git-rebase inconsistency","fromName":"David Kågedal","fromEmail":"davidk@lysator.liu.se","sentAt":"2007-01-19T23:53:11Z","receivedAt":"2007-01-19T23:53:11Z","isPatch":false,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"The git-am and git-rebase commands have some similarities in that both\ntry to apply patches and may fail in the middle.  Both commands can be\nrerun to continue the application.  The --skip option is used in both\nto skip one patch, but when a conflict has been resolved, git-rebase\nuses --continue, and git-am uses --resolved for what seems to me to be\nthe equivalent action.\n\nIt would probably be good, although not terribly important, if these\ncommands were change to be in harmony.  But I'm not sure which option\nI like best...\n\n-- \nDavid Kågedal\n"},{"id":"32111","messageId":"7vzm8ebl3d.fsf@assigned-by-dhcp.cox.net","threadId":"6447","inReplyTo":"873b66infc.fsf@morpheus.local","subject":"Re: git-am and git-rebase inconsistency","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-01-20T00:25:26Z","receivedAt":"2007-01-20T00:25:26Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Kågedal <davidk@lysator.liu.se> writes:\n\n> The git-am and git-rebase commands have some similarities in that both\n> try to apply patches and may fail in the middle.  Both commands can be\n> rerun to continue the application.  The --skip option is used in both\n> to skip one patch, but when a conflict has been resolved, git-rebase\n> uses --continue, and git-am uses --resolved for what seems to me to be\n> the equivalent action.\n>\n> It would probably be good, although not terribly important, if these\n> commands were change to be in harmony.  But I'm not sure which option\n> I like best...\n\nWell, git-rebase did not have any options like them in the\nbeginning, so a logical option would be to add --resolved as a\nsynonym to the latter.\n"}]}