Document git-rebase behavior on conflicts.
authorJ. Bruce Fields <bfields@fieldses.org>
Sun, 26 Mar 2006 20:29:28 +0000 (15:29 -0500)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 03:07:43 +0000 (19:07 -0800)
commit8978d043c35ad068e280dbbdc31e06524ea0ab56
treea2711dcaba671bff89832b4fad304eaad7811883
parentfb18a2edf7f3d1585b6330b7dde110b992d3b97c
Document git-rebase behavior on conflicts.
Documentation/git-rebase.txt