aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-cherry.txt
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2006-03-26 15:29:28 -0500
committerJunio C Hamano <junkio@cox.net>2006-03-26 19:07:43 -0800
commit8978d043c35ad068e280dbbdc31e06524ea0ab56 (patch)
treea2711dcaba671bff89832b4fad304eaad7811883 /Documentation/git-cherry.txt
parentfb18a2edf7f3d1585b6330b7dde110b992d3b97c (diff)
downloadgit-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.gz
git-8978d043c35ad068e280dbbdc31e06524ea0ab56.tar.xz
Document git-rebase behavior on conflicts.
Diffstat (limited to 'Documentation/git-cherry.txt')
0 files changed, 0 insertions, 0 deletions