Git Diff: практическое руководство

Michael Zippo 27.11.2021

–ö–æ–º–∞–Ω–¥–∞ git diff –ø–æ–∫–∞–∑—ã–≤–∞–µ—Ç —Ä–∞–∑–ª–∏—á–∏—è –º–µ–∂–¥—É —Ñ–∞–π–ª–∞–º–∏ –≤ –¥–≤—É—Ö —Ñ–∏–∫—Å–∞—Ü–∏—è—Ö –∏–ª–∏ –º–µ–∂–¥—É –≤–∞—à–∏–º —Ç–µ–∫—É—â–∏–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–µ–º –∏ –ø—Ä–µ–¥—ã–¥—É—â–µ–π —Ñ–∏–∫—Å–∞—Ü–∏–µ–π. –≠—Ç–∞ –∫–æ–º–∞–Ω–¥–∞ –æ—Ç–æ–±—Ä–∞–∂–∞–µ—Ç –∏–∑–º–µ–Ω–µ–Ω–∏—è, –æ–±–æ–∑–Ω–∞—á–µ–Ω–Ω—ã–µ –∑–∞–≥–æ–ª–æ–≤–∫–∞–º–∏ –∏ –º–µ—Ç–∞–¥–∞–Ω–Ω—ã–º–∏ –¥–ª—è —Ñ–∞–π–ª–æ–≤, –∫–æ—Ç–æ—Ä—ã–µ –±—ã–ª–∏ –∏–∑–º–µ–Ω–µ–Ω—ã.

–ö–æ–≥–¥–∞ –≤—ã —Ä–∞–±–æ—Ç–∞–µ—Ç–µ —Å —Å–∏—Å—Ç–µ–º–æ–π –∫–æ–Ω—Ç—Ä–æ–ª—è –≤–µ—Ä—Å–∏–π Git, –≤—ã –º–æ–∂–µ—Ç–µ —Å—Ä–∞–≤–Ω–∏—Ç—å –¥–∞–Ω–Ω—ã–µ –≤ –≤–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏ —Å –¥—Ä—É–≥–∏–º–∏ –∏—Å—Ç–æ—á–Ω–∏–∫ –¥–∞–Ω–Ω—ã—Ö. –ù–∞–ø—Ä–∏–º–µ—Ä, –≤—ã –º–æ–∂–µ—Ç–µ —Å—Ä–∞–≤–Ω–∏—Ç—å –¥–≤–∞ —Ä–∞–∑–Ω—ã—Ö –∫–æ–º–º–∏—Ç–∞ –¥—Ä—É–≥ —Å –¥—Ä—É–≥–æ–º –∏–ª–∏ —Å –¥–≤—É–º—è —Ñ–∞–π–ª–∞–º–∏.

–ó–¥–µ—Å—å –∏ –ø–æ—è–≤–ª—è–µ—Ç—Å—è —Ñ—É–Ω–∫—Ü–∏—è diff. Diffing - —ç—Ç–æ —Ñ—É–Ω–∫—Ü–∏—è, –∫–æ—Ç–æ—Ä–∞—è –ø—Ä–∏–Ω–∏–º–∞–µ—Ç –¥–≤–∞ –≤–≤–æ–¥–∞ –∏ –ø—Ä–µ–¥—Å—Ç–∞–≤–ª—è–µ—Ç —Å—É—â–µ—Å—Ç–≤—É—é—â–∏–µ –∏–∑–º–µ–Ω–µ–Ω–∏—è –º–µ–∂–¥—É —ç—Ç–∏–º–∏ –∏—Å—Ç–æ—á–Ω–∏–∫–∞–º–∏ –¥–∞–Ω–Ω—ã—Ö. –§—É–Ω–∫—Ü–∏–∏ Diff –º–æ–≥—É—Ç –≤—ã–ø–æ–ª–Ω—è—Ç—å—Å—è –¥–ª—è –≤–µ—Ç–≤–µ–π, —Ñ–∞–π–ª–æ–≤ –∏ –∫–æ–º–º–∏—Ç–æ–≤.

–í —ç—Ç–æ–º —Ä—É–∫–æ–≤–æ–¥—Å—Ç–≤–µ —Å –ø—Ä–∏–º–µ—Ä–∞–º–∏ –æ–±—Å—É–∂–¥–∞—é—Ç—Å—è –æ—Å–Ω–æ–≤—ã —Å—Ä–∞–≤–Ω–µ–Ω–∏—è —Å Git –∏ —Å–ø–æ—Å–æ–±—ã –∏—Å–ø–æ–ª—å–∑–æ–≤–∞–Ω–∏—è –∫–æ–º–∞–Ω–¥—ã git diff. –ö –∫–æ–Ω—Ü—É —á—Ç–µ–Ω–∏—è —ç—Ç–æ–≥–æ —Ä—É–∫–æ–≤–æ–¥—Å—Ç–≤–∞ –≤—ã —Å—Ç–∞–Ω–µ—Ç–µ —ç–∫—Å–ø–µ—Ä—Ç–æ–º –≤ –∏—Å–ø–æ–ª—å–∑–æ–≤–∞–Ω–∏–∏ –∫–æ–º–∞–Ω–¥—ã git diff.

–ö–æ–º–∞–Ω–¥–∞ Git Diff

–ö–æ–º–∞–Ω–¥–∞ git diff –æ—Ç–æ–±—Ä–∞–∂–∞–µ—Ç —Ä–∞–∑–ª–∏—á–∏—è –º–µ–∂–¥—É —Ñ–∞–π–ª–∞–º–∏ –≤ –¥–≤—É—Ö –∫–æ–º–º–∏—Ç–∞—Ö. –∏–ª–∏ –º–µ–∂–¥—É —Ñ–∏–∫—Å–∞—Ü–∏–µ–π –∏ –≤–∞—à–∏–º —Ç–µ–∫—É—â–∏–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–µ–º. –í—ã –º–æ–∂–µ—Ç–µ –≤–∏–¥–µ—Ç—å, –∫–∞–∫–æ–π —Ç–µ–∫—Å—Ç –±—ã–ª –¥–æ–±–∞–≤–ª–µ–Ω, —É–¥–∞–ª–µ–Ω –∏ –∏–∑–º–µ–Ω–µ–Ω –≤ —Ñ–∞–π–ª–µ.

–í–æ—Ç —Å–∏–Ω—Ç–∞–∫—Å–∏—Å –∫–æ–º–∞–Ω–¥—ã git diff:

–ü–æ —É–º–æ–ª—á–∞–Ω–∏—é –∫–æ–º–∞–Ω–¥–∞ git diff –æ—Ç–æ–±—Ä–∞–∂–∞–µ—Ç –≤—Å–µ –Ω–µ–∑–∞—Ñ–∏–∫—Å–∏—Ä–æ–≤–∞–Ω–Ω—ã–µ –∏–∑–º–µ–Ω–µ–Ω–∏—è –≤ –≤–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏.

–ú—ã –º–æ–∂–µ–º –≤–∏–¥–µ—Ç—å —É–¥–∞–ª–µ–Ω–Ω—ã–µ —Å—Ç—Ä–æ–∫–∏ –∏–∑ –Ω–∞—à–µ–≥–æ –∏—Å—Ö–æ–¥–Ω–æ–≥–æ —Ñ–∞–π–ª–∞, –∞ —Ç–∞–∫–∂–µ –ª—é–±—ã–µ —Å—Ç—Ä–æ–∫–∏, –¥–æ–±–∞–≤–ª–µ–Ω–Ω—ã–µ –∏–ª–∏ –∏–∑–º–µ–Ω–µ–Ω–Ω—ã–µ –≤ –Ω–∞—à–µ–º –∏—Å—Ö–æ–¥–Ω–æ–º —Ñ–∞–π–ª–µ. –ß–∞—Å—Ç–æ Git diff –∏—Å–ø–æ–ª—å–∑—É–µ—Ç—Å—è –¥–ª—è —Å—Ä–∞–≤–Ω–µ–Ω–∏—è –≤–µ—Ç–≤–µ–π –≤ —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏ Git.

81% —É—á–∞—Å—Ç–Ω–∏–∫–æ–≤ –∑–∞—è–≤–∏–ª–∏, —á—Ç–æ –æ–Ω–∏ –ø–æ—á—É–≤—Å—Ç–≤–æ–≤–∞–ª–∏ —Å–µ–±—è –±–æ–ª–µ–µ —É–≤–µ—Ä–µ–Ω–Ω—ã–º–∏ –≤ —Å–≤–æ–∏—Ö –ø–µ—Ä—Å–ø–µ–∫—Ç–∏–≤–∞—Ö —Ä–∞–±–æ—Ç—ã –≤ —Ç–µ—Ö–Ω–∏—á–µ—Å–∫–∏—Ö —Å–ø–µ—Ü–∏–∞–ª–∏—Å—Ç–∞—Ö –ø–æ—Å–ª–µ –ø–æ—Å–µ—â–µ–Ω–∏—è —É—á–µ–±–Ω–æ–≥–æ –∫—É—Ä—Å–∞. –ü—Ä–æ–π–¥–∏—Ç–µ –∫—É—Ä—Å –æ–±—É—á–µ–Ω–∏—è —Å–µ–≥–æ–¥–Ω—è.

–°—Ä–µ–¥–Ω–∏–π –≤—ã–ø—É—Å–∫–Ω–∏–∫ —É—á–µ–±–Ω–æ–≥–æ –ª–∞–≥–µ—Ä—è –ø–æ—Ç—Ä–∞—Ç–∏–ª –º–µ–Ω–µ–µ —à–µ—Å—Ç–∏ –º–µ—Å—è—Ü–µ–≤ –Ω–∞ –ø–µ—Ä–µ—Ö–æ–¥–Ω—É—é –∫–∞—Ä—å–µ—Ä—É, –æ—Ç –Ω–∞—á–∞–ª–∞ —É—á–µ–±–Ω–æ–≥–æ –ª–∞–≥–µ—Ä—è –¥–æ –ø–æ–∏—Å–∫–∞ —Å–≤–æ–µ–π –ø–µ—Ä–≤–æ–π —Ä–∞–±–æ—Ç—ã.

–í—ã –º–æ–∂–µ—Ç–µ —Å—Ä–∞–≤–Ω–∏—Ç—å —Ñ–∞–π–ª—ã –º–µ–∂–¥—É –¥–≤—É–º—è —Ñ–∞–π–ª–∞–º–∏. Git —Ñ–∏–∫—Å–∏—Ä—É–µ—Ç , —É–∫–∞–∑–∞–≤ –∏–º—è —Å—Å—ã–ª–∫–∏, –∫–æ—Ç–æ—Ä–∞—è —Å—Å—ã–ª–∞–µ—Ç—Å—è –Ω–∞ –∫–æ–º–º–∏—Ç—ã, –∫–æ—Ç–æ—Ä—ã–µ –≤—ã —Ö–æ—Ç–∏—Ç–µ —Å—Ä–∞–≤–Ω–∏—Ç—å. –°—Å—ã–ª–∫–∞ –º–æ–∂–µ—Ç –±—ã—Ç—å –∏–¥–µ–Ω—Ç–∏—Ñ–∏–∫–∞—Ç–æ—Ä–æ–º —Ñ–∏–∫—Å–∞—Ü–∏–∏ –∏–ª–∏ HEAD, –∫–æ—Ç–æ—Ä—ã–π –æ—Ç–Ω–æ—Å–∏—Ç—Å—è –∫ —Ç–µ–∫—É—â–µ–π –≤–µ—Ç–≤–∏.

–î–∞–≤–∞–π—Ç–µ —Å—Ä–∞–≤–Ω–∏–º –¥–≤–∞ –∫–æ–º–º–∏—Ç–∞ –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏ Git.

–î–ª—è —ç—Ç–æ–≥–æ —Å–Ω–∞—á–∞–ª–∞ –Ω—É–∂–Ω–æ –ø–æ–ª—É—á–∏—Ç—å –∏–¥–µ–Ω—Ç–∏—Ñ–∏–∫–∞—Ç–æ—Ä—ã –∫–æ–º–º–∏—Ç–æ–≤, —Ñ–∞–π–ª—ã –∫–æ—Ç–æ—Ä—ã—Ö –≤—ã —Ö–æ—á—É —Å—Ä–∞–≤–Ω–∏—Ç—å. –≠—Ç—É –∑–∞–¥–∞—á—É –º–æ–∂–Ω–æ –≤—ã–ø–æ–ª–Ω–∏—Ç—å —Å –ø–æ–º–æ—â—å—é –∫–æ–º–∞–Ω–¥—ã git log & ndash; pretty = oneline, –∫–æ—Ç–æ—Ä–∞—è –≤–æ–∑–≤—Ä–∞—â–∞–µ—Ç –∫—Ä–∞—Ç–∫—É—é —Å–≤–æ–¥–∫—É –≤—Å–µ—Ö –∫–æ–º–º–∏—Ç–æ–≤ –≤ —Ä–µ–ø–æ:

–≠—Ç–∞ –∫–æ–º–∞–Ω–¥–∞ –≤–æ–∑–≤—Ä–∞—â–∞–µ—Ç:

Git Diff –º–µ–∂–¥—É –≤–µ—Ç–≤—è–º–∏

–ß—Ç–æ–±—ã —Å—Ä–∞–≤–Ω–∏—Ç—å –¥–≤–µ –≤–µ—Ç–∫–∏ Git —Å –ø–æ–º–æ—â—å—é –∫–æ–º–∞–Ω–¥—ã diff, —É–∫–∞–∂–∏—Ç–µ –¥–≤–µ –≤–µ—Ç–∫–∏, –∫–æ—Ç–æ—Ä—ã–µ –≤—ã —Ö–æ—Ç–∏—Ç–µ —Å—Ä–∞–≤–Ω–∏—Ç—å –≤ –∫–∞—á–µ—Å—Ç–≤–µ –∞—Ä–≥—É–º–µ–Ω—Ç–æ–≤. –í–∞–º –Ω—É–∂–Ω–æ –∏—Å–ø–æ–ª—å–∑–æ–≤–∞—Ç—å –¥–≤–µ —Ç–æ—á–∫–∏ –º–µ–∂–¥—É –∫–∞–∂–¥—ã–º –∏–º–µ–Ω–µ–º –≤–µ—Ç–∫–∏. –≠—Ç–∏ —Ç–æ—á–∫–∏ —É–∫–∞–∑—ã–≤–∞—é—Ç, —á—Ç–æ –≤—ã —Ö–æ—Ç–∏—Ç–µ –ø—Ä–æ—á–∏—Ç–∞—Ç—å –ø–æ—Å–ª–µ–¥–Ω—é—é —Ñ–∏–∫—Å–∞—Ü–∏—é –≤ –∫–∞–∂–¥–æ–π –∏–∑ –≤–µ—Ç–≤–µ–π –∏ —Å—Ä–∞–≤–Ω–∏—Ç—å –∏—Ö:

–ü—Ä–µ–¥–ø–æ–ª–æ–∂–∏–º, –º—ã —Ö–æ—Ç–µ–ª —Å—Ä–∞–≤–Ω–∏—Ç—å –≤–µ—Ç–∫—É " master " —Å –≤–µ—Ç–∫–æ–π –ø–æ–¥ –Ω–∞–∑–≤–∞–Ω–∏–µ–º " dev-v0.9 " –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏. –ú—ã –º–æ–≥–ª–∏ —Å–¥–µ–ª–∞—Ç—å —ç—Ç–æ —Å –ø–æ–º–æ—â—å—é —ç—Ç–æ–π –∫–æ–º–∞–Ω–¥—ã:

–ü—Ä–∏ –≤—ã–ø–æ–ª–Ω–µ–Ω–∏–∏ —ç—Ç–æ–π –∫–æ–º–∞–Ω–¥—ã –±—É–¥–µ—Ç –∑–∞–ø—É—â–µ–Ω–æ —Å—Ä–∞–≤–Ω–µ–Ω–∏–µ –º–µ–∂–¥—É " master " –∏ " dev-v0.9 " –≤ –Ω–∞—à–µ–π –∫–æ–¥–æ–≤–æ–π –±–∞–∑–µ.

–¢–æ—á–Ω–æ —Ç–∞–∫ –∂–µ –≤—ã –º–æ–∂–µ—Ç–µ —Å—Ä–∞–≤–Ω–∏–≤–∞—Ç—å –æ–ø—Ä–µ–¥–µ–ª–µ–Ω–Ω—ã–µ —Ñ–∞–π–ª—ã –≤ –¥–≤—É—Ö —Ä–∞–∑–Ω—ã—Ö –≤–µ—Ç–≤—è—Ö. –ø–æ—ç—Ç–æ–º—É –≤—ã –º–æ–∂–µ—Ç–µ –∏—Å–ø–æ–ª—å–∑–æ–≤–∞—Ç—å —Ç–æ—Ç –∂–µ —Å–∏–Ω—Ç–∞–∫—Å–∏—Å, —á—Ç–æ –∏ –≤—ã—à–µ, –∏ –¥–æ–ø–æ–ª–Ω–∏—Ç–µ–ª—å–Ω–æ —É–∫–∞–∑–∞—Ç—å —Ñ–∞–π–ª, –∫–æ—Ç–æ—Ä—ã–π —Ö–æ—Ç–∏—Ç–µ —Å—Ä–∞–≤–Ω–∏—Ç—å.

–ü—Ä–µ–¥–ø–æ–ª–æ–∂–∏–º, –º—ã —Ö–æ—Ç–∏–º —Å—Ä–∞–≤–Ω–∏—Ç—å —Ñ–∞–π–ª README.md —Å –Ω–∞—à–∏–º " master " –∏ " dev-v0.9 " –≤–µ—Ç–≤–∏. –ú—ã –º–æ–≥–ª–∏ –±—ã —Å–¥–µ–ª–∞—Ç—å —ç—Ç–æ —Å –ø–æ–º–æ—â—å—é —Å–ª–µ–¥—É—é—â–µ–≥–æ –∫–æ–¥–∞:

–≠—Ç–æ –ø–æ–∑–≤–æ–ª–∏—Ç —Å—Ä–∞–≤–Ω–∏—Ç—å —Ñ–∞–π–ª README.md (–∫–æ—Ç–æ—Ä—ã–π –Ω–∞—Ö–æ–¥–∏—Ç—Å—è –≤ –Ω–∞—à–µ–º —Ç–µ–∫—É—â–µ–º –∫–∞—Ç–∞–ª–æ–≥–µ, –æ–±–æ–∑–Ω–∞—á–µ–Ω–Ω—ã–π —Å–∏–Ω—Ç–∞–∫—Å–∏—Å–æ–º " ./") —Å " master " –∏ " dev-v0.9 " –≤–µ—Ç–≤–µ–π.

–ü—Ä–∏–º–µ—Ä –∫–æ–º–∞–Ω–¥—ã Git Diff

–ü—Ä–µ–¥–ø–æ–ª–æ–∂–∏–º, –º—ã –∏–Ω–∏—Ü–∏–∞–ª–∏–∑–∏—Ä–æ–≤–∞–ª–∏ –ø—É—Å—Ç–æ–π —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–π –∏ —Ö–æ—Ç–∏–º –∑–∞–ø—É—Å—Ç–∏—Ç—å –Ω–∞—à —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–π —Å –ø–æ–º–æ—â—å—é —Ñ–∞–π–ª–∞ README.md. –ú—ã —Å–æ–∑–¥–∞–ª–∏ —Ñ–∞–π–ª README.md –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏, –∫–æ—Ç–æ—Ä—ã–π —Å–æ–¥–µ—Ä–∂–∏—Ç —Å–ª–µ–¥—É—é—â–µ–µ –ø—Ä–µ–¥–ª–æ–∂–µ–Ω–∏–µ:

–≠—Ç–æ –ø—Ä–∏–º–µ—Ä —Ñ—É–Ω–∫—Ü–∏–∏ Git diff.

–ü–æ–¥–≥–æ—Ç–æ–≤–∫–∞ —Ñ–∞–π–ª–æ–≤ –∏ —Ñ–∏–∫—Å–∞—Ü–∏—è

< p> –ú—ã —Å–æ–±–∏—Ä–∞–µ–º—Å—è —Å–æ–∑–¥–∞—Ç—å —Ñ–∏–∫—Å–∞—Ü–∏—é —Å —ç—Ç–∏–º —Ñ–∞–π–ª–æ–º —Å –ø–æ–º–æ—â—å—é –∫–æ–º–∞–Ω–¥—ã git commit:

–≠—Ç–æ –ø–æ–∑–≤–æ–ª—è–µ—Ç –Ω–∞–º —Å–æ—Ö—Ä–∞–Ω—è—Ç—å –∏–∑–º–µ–Ω–µ–Ω–∏—è, –∫–æ—Ç–æ—Ä—ã–µ –º—ã –≤–Ω–µ—Å–ª–∏ –≤ –Ω–∞—à —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–π. –ö–æ–º–∞–Ω–¥–∞ git –≤–æ–∑–≤—Ä–∞—â–∞–µ—Ç:

–ï—Å–ª–∏ –º—ã –∑–∞–ø—É—Å—Ç–∏–º –∫–æ–º–∞–Ω–¥—É git diff –Ω–∞ —ç—Ç–æ–º —ç—Ç–∞–ø–µ, –Ω–∏—á–µ–≥–æ –Ω–µ –ø—Ä–æ–∏–∑–æ–π–¥–µ—Ç. –≠—Ç–æ –ø–æ—Ç–æ–º—É, —á—Ç–æ –Ω–∞—à —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–π –±—ã–ª –∏–Ω–∏—Ü–∏–∞–ª–∏–∑–∏—Ä–æ–≤–∞–Ω, –∏ –Ω–µ—Ç –Ω–∏–∫–∞–∫–∏—Ö –∏–∑–º–µ–Ω–µ–Ω–∏–π –º–µ–∂–¥—É –∫–∞–∫–∏–º–∏-–ª–∏–±–æ —Ñ–∞–π–ª–∞–º–∏ –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏. –¢–µ–ø–µ—Ä—å, –∫–æ–≥–¥–∞ —É –Ω–∞—Å –µ—Å—Ç—å –±–∞–∑–æ–≤—ã–π —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–π, –º—ã –º–æ–∂–µ–º –∏–∑–º–µ–Ω–∏—Ç—å —Å–æ–¥–µ—Ä–∂–∏–º–æ–µ —Ñ–∞–π–ª–æ–≤ –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏. –≠—Ç–æ –ø–æ–∑–≤–æ–ª–∏—Ç –Ω–∞–º —É–≤–∏–¥–µ—Ç—å –∫–æ–º–∞–Ω–¥—É git diff –≤ –¥–µ–π—Å—Ç–≤–∏–∏.

–ü—Ä–µ–¥–ø–æ–ª–æ–∂–∏–º, –º—ã —Ö–æ—Ç–∏–º –¥–æ–±–∞–≤–∏—Ç—å –ø—Ä–µ–¥–ª–æ–∂–µ–Ω–∏–µ " –ú—ã —Ç–æ–ª—å–∫–æ —á—Ç–æ –¥–æ–±–∞–≤–∏–ª–∏ —ç—Ç—É —Å—Ç—Ä–æ–∫—É –≤ –Ω–∞—à —Ñ–∞–π–ª. & Rdquo; –≤ —Ñ–∞–π–ª README.md. –ú—ã –º–æ–≥–ª–∏ –±—ã —Å–¥–µ–ª–∞—Ç—å —ç—Ç–æ —Å –ø–æ–º–æ—â—å—é —ç—Ç–æ–π –∫–æ–º–∞–Ω–¥—ã:

"–ö–∞—Ä—å–µ—Ä–Ω–∞—è –∫–∞—Ä–º–∞ –≤–æ—à–ª–∞ –≤ –º–æ—é –∂–∏–∑–Ω—å, –∫–æ–≥–¥–∞ —è –±–æ–ª—å—à–µ –≤—Å–µ–≥–æ –≤ –Ω–µ–π –Ω—É–∂–¥–∞–ª–∞—Å—å, –∏ –±—ã—Å—Ç—Ä–æ –ø–æ–º–æ–≥–ª–∞ –º–Ω–µ –ø—Ä–æ–π—Ç–∏ –∫—É—Ä—Å –æ–±—É—á–µ–Ω–∏—è. –ß–µ—Ä–µ–∑ –¥–≤–∞ –º–µ—Å—è—Ü–∞ –ø–æ—Å–ª–µ –æ–∫–æ–Ω—á–∞–Ω–∏—è —É—á–µ–±—ã —è –Ω–∞—à–µ–ª —Ä–∞–±–æ—Ç—É —Å–≤–æ–µ–π –º–µ—á—Ç—ã, –∫–æ—Ç–æ—Ä–∞—è —Å–æ–æ—Ç–≤–µ—Ç—Å—Ç–≤–æ–≤–∞–ª–∞ –º–æ–∏–º —Ü–µ–Ω–Ω–æ—Å—Ç—è–º. –∏ —Ü–µ–ª–∏ –≤ –∂–∏–∑–Ω–∏! "

–í–µ–Ω–µ—Ä–∞, –∏–Ω–∂–µ–Ω–µ—Ä-–ø—Ä–æ–≥—Ä–∞–º–º–∏—Å—Ç Rockbot

–ü—Ä–∏–≤–µ–¥–µ–Ω–Ω–∞—è –≤—ã—à–µ –∫–æ–º–∞–Ω–¥–∞ –¥–æ–±–∞–≤–ª—è–µ—Ç –Ω–∞—à–µ –ø—Ä–µ–¥–ª–æ–∂–µ–Ω–∏–µ –≤ —Ñ–∞–π–ª README.md.

–≠—Ç–æ –æ–∑–Ω–∞—á–∞–µ—Ç, —á—Ç–æ —Ç–µ–ø–µ—Ä—å –µ—Å—Ç—å —Ä–∞–∑–Ω–∏—Ü–∞ –º–µ–∂–¥—É –Ω–∞—à–∏–º –∏—Å—Ö–æ–¥–Ω—ã–º —Ñ–∞–π–ª–æ–º README.md –∏ —Ç–µ–∫—É—â–∏–º —Ñ–∞–π–ª–æ–º README.md –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏.

–í—ã–ø–æ–ª–Ω–∏–≤ –∫–æ–º–∞–Ω–¥—É git diff, –º—ã –º–æ–∂–µ–º —É–≤–∏–¥–µ—Ç—å —Ä–∞–∑–ª–∏—á–∏—è –º–µ–∂–¥—É —ç—Ç–∏–º–∏ –¥–≤—É–º—è —Ñ–∞–π–ª–∞–º–∏. –ü–æ —É–º–æ–ª—á–∞–Ω–∏—é –∫–æ–º–∞–Ω–¥–∞ git diff —Å–æ–∑–¥–∞–µ—Ç —Ä–∞–∑–Ω–∏—Ü—É –¥–ª—è –≤—Å–µ—Ö —Ñ–∞–π–ª–æ–≤ –º–µ–∂–¥—É –ø–æ—Å–ª–µ–¥–Ω–µ–π —Ñ–∏–∫—Å–∞—Ü–∏–µ–π –∏ —Ç–µ–∫—É—â–∏–º —Å–æ—Å—Ç–æ—è–Ω–∏–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏—è.

–ó–∞–ø—É—Å—Ç–∏—Ç—å Git Diff Between Commits

< p> –ö–æ–≥–¥–∞ –º—ã –∑–∞–ø—É—Å–∫–∞–µ–º –∫–æ–º–∞–Ω–¥—É, –≤–æ–∑–≤—Ä–∞—â–∞–µ—Ç—Å—è —Å–ª–µ–¥—É—é—â–∏–π –æ—Ç–≤–µ—Ç:

–≠—Ç–æ –ø—Ä–∏–º–µ—Ä —Ñ—É–Ω–∫—Ü–∏–∏ Git diff.

–≠—Ç–æ —Ç–∏–ø–∏—á–Ω—ã–π —Ä–µ–∑—É–ª—å—Ç–∞—Ç –∫–æ–º–∞–Ω–¥—ã git diff. –ù–∞—à —Ä–µ–∑—É–ª—å—Ç–∞—Ç –ø–æ–∫–∞–∑—ã–≤–∞–µ—Ç, —á—Ç–æ –±—ã–ª–æ –¥–æ–±–∞–≤–ª–µ–Ω–æ –∏–ª–∏ —É–¥–∞–ª–µ–Ω–æ –≤ –Ω–∞—à —Ñ–∞–π–ª –≤ –∫–æ–º–±–∏–Ω–∏—Ä–æ–≤–∞–Ω–Ω–æ–º —Ñ–æ—Ä–º–∞—Ç–µ diff.

–ö–æ–º–∞–Ω–¥–∞ git diff –≤–æ–∑–≤—Ä–∞—â–∞–µ—Ç —Å–ø–∏—Å–æ–∫ –≤—Å–µ—Ö –∏–∑–º–µ–Ω–µ–Ω–∏–π –≤–æ –≤—Å–µ—Ö —Ñ–∞–π–ª–∞—Ö –º–µ–∂–¥—É –Ω–∞—à–µ–π –ø–æ—Å–ª–µ–¥–Ω–µ–π —Ñ–∏–∫—Å–∞—Ü–∏–µ–π –∏ –Ω–∞—à–∏–º —Ç–µ–∫—É—â–∏–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–µ–º.

–ï—Å–ª–∏ –≤—ã —Ö–æ—Ç–∏—Ç–µ –¥–ª—è –ø–æ–ª—É—á–µ–Ω–∏—è –∏–∑–º–µ–Ω–µ–Ω–∏–π, –≤–Ω–µ—Å–µ–Ω–Ω—ã—Ö –≤ –∫–æ–Ω–∫—Ä–µ—Ç–Ω—ã–π —Ñ–∞–π–ª –≤ —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏, –≤—ã –º–æ–∂–µ—Ç–µ —É–∫–∞–∑–∞—Ç—å —ç—Ç–æ—Ç —Ñ–∞–π–ª –≤ –∫–∞—á–µ—Å—Ç–≤–µ —Ç—Ä–µ—Ç—å–µ–≥–æ –ø–∞—Ä–∞–º–µ—Ç—Ä–∞. –ü—Ä–µ–¥–ø–æ–ª–æ–∂–∏–º, –º—ã —Ö–æ—Ç–∏–º –≤–∏–¥–µ—Ç—å —Ç–æ–ª—å–∫–æ –∏–∑–º–µ–Ω–µ–Ω–∏—è, –≤–Ω–µ—Å–µ–Ω–Ω—ã–µ –≤ —Ñ–∞–π–ª README.md.

–í —ç—Ç–æ–º –ø—Ä–∏–º–µ—Ä–µ –º—ã –∏–∑–º–µ–Ω–∏–ª–∏ —Ç–æ–ª—å–∫–æ —Ñ–∞–π–ª README.md, –ø–æ—ç—Ç–æ–º—É –≤ –ª—é–±–æ–º —Å–ª—É—á–∞–µ –±—É–¥—É—Ç –æ—Ç–æ–±—Ä–∞–∂–∞—Ç—å—Å—è —Ç–æ–ª—å–∫–æ —ç—Ç–∏ –∏–∑–º–µ–Ω–µ–Ω–∏—è. –ù–æ –µ—Å–ª–∏ –±—ã –º—ã —Ä–∞–±–æ—Ç–∞–ª–∏ —Å –±–æ–ª—å—à–∏–º —Ä–µ–ø–æ, –º—ã –º–æ–≥–ª–∏ –±—ã –∑–∞—Ö–æ—Ç–µ—Ç—å —Å—Ä–∞–≤–Ω–∏—Ç—å —Ç–æ–ª—å–∫–æ –∏–∑–º–µ–Ω–µ–Ω–∏—è –≤ –æ–¥–Ω–æ–º —Ñ–∞–π–ª–µ. –î–ª—è —ç—Ç–æ–≥–æ –º—ã –º–æ–≥–ª–∏ –±—ã –∏—Å–ø–æ–ª—å–∑–æ–≤–∞—Ç—å —ç—Ç—É –∫–æ–º–∞–Ω–¥—É:

–≠—Ç–∞ –∫–æ–º–∞–Ω–¥–∞ –ø–æ–∑–≤–æ–ª—è–µ—Ç –Ω–∞–º —Å—Ä–∞–≤–Ω–∏—Ç—å –Ω–∞—à—É —Ç–µ–∫—É—â—É—é –≤–µ—Ä—Å–∏—é —Ñ–∞–π–ª–∞ README.md —Å –ø–æ—Å–ª–µ–¥–Ω–µ–π –≤–µ—Ä—Å–∏–µ–π, –∑–∞—Ñ–∏–∫—Å–∏—Ä–æ–≤–∞–Ω–Ω–æ–π –≤ –Ω–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏.

Git Diff Breakdown

Git diffs –∏–º–µ–µ—Ç –Ω–æ–º–µ—Ä –∫–æ–º–ø–æ–Ω–µ–Ω—Ç–æ–≤, –∫–æ—Ç–æ—Ä—ã–µ –º—ã –º–æ–∂–µ–º –∏—Å–ø–æ–ª—å–∑–æ–≤–∞—Ç—å –¥–ª—è –∞–Ω–∞–ª–∏–∑–∞ –∏–∑–º–µ–Ω–µ–Ω–∏–π –º–µ–∂–¥—É —Ñ–∞–π–ª–æ–º –≤ —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏. –î–∞–≤–∞–π—Ç–µ —Ä–∞–∑–±–µ—Ä–µ–º –∏—Ö —Å–æ —Å—Å—ã–ª–∫–æ–π –Ω–∞ –Ω–∞—à –ø—Ä–µ–¥—ã–¥—É—â–∏–π –ø—Ä–∏–º–µ—Ä.

–í—Ö–æ–¥–Ω—ã–µ —Ñ–∞–π–ª—ã

–ü–µ—Ä–≤—ã–º –∫–æ–º–ø–æ–Ω–µ–Ω—Ç–æ–º –Ω–∞—à–µ–≥–æ —Å—Ä–∞–≤–Ω–µ–Ω–∏—è —è–≤–ª—è—é—Ç—Å—è –≤—Ö–æ–¥–Ω—ã–µ —Ñ–∞–π–ª—ã . –≠—Ç–∞ —á–∞—Å—Ç—å diff —Å–æ–æ–±—â–∞–µ—Ç –Ω–∞–º, –∫–∞–∫–∏–µ —Ñ–∞–π–ª—ã —Å—Ä–∞–≤–Ω–∏–≤–∞—é—Ç—Å—è –≤ diff.

–ú—ã —Å—Ä–∞–≤–Ω–∏–≤–∞–µ–º —Ñ–∞–π–ª README.md –≤ —Ç–µ–∫—É—â–µ–π –≤–µ—Ä—Å–∏–∏ –Ω–∞—à–µ–≥–æ –∫–æ–¥–∞ —Å —Ñ–∞–π–ª–æ–º README.md –≤ –ø–æ—Å–ª–µ–¥–Ω–µ–π –≤–µ—Ä—Å–∏–∏ –Ω–∞—à–µ–≥–æ –∫–æ–¥–∞. –∫–æ–¥. –≠—Ç–æ —É–∫–∞–∑–∞–Ω–æ –≤ –ø–µ—Ä–≤–æ–π —Å—Ç—Ä–æ–∫–µ –Ω–∞—à–µ–≥–æ –∫–æ–¥–∞:

–ú–µ—Ç–∞–¥–∞–Ω–Ω—ã–µ

–ó–∞—Ç–µ–º –Ω–∞—à diff —Å–æ–¥–µ—Ä–∂–∏—Ç –º–µ—Ç–∞–¥–∞–Ω–Ω—ã–µ –¥–ª—è –Ω–∞—à–µ–≥–æ —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏—è Git. –≠—Ç–∏ –º–µ—Ç–∞–¥–∞–Ω–Ω—ã–µ –æ—Ç–æ–±—Ä–∞–∂–∞—é—Ç –º–µ—Ç–∫–∏ –≤–µ—Ä—Å–∏–∏ –æ–±—ä–µ–∫—Ç–∞, –∏—Å–ø–æ–ª—å–∑—É–µ–º—ã–µ Git –¥–ª—è –æ—Ç—Å–ª–µ–∂–∏–≤–∞–Ω–∏—è –∏–∑–º–µ–Ω–µ–Ω–∏–π, –≤–Ω–µ—Å–µ–Ω–Ω—ã—Ö –≤–∞–º–∏ –≤ —Ñ–∞–π–ª.

–≠—Ç–∞ –∏–Ω—Ñ–æ—Ä–º–∞—Ü–∏—è —Ä–µ–¥–∫–æ –∏—Å–ø–æ–ª—å–∑—É–µ—Ç—Å—è –≤ –±–æ–ª—å—à–∏–Ω—Å—Ç–≤–µ —Å–ª—É—á–∞–µ–≤ –∫–æ–º–∞–Ω–¥—ã diff. –í –Ω–∞—à–µ–º –ø—Ä–∏–º–µ—Ä–µ –≤—ã—à–µ –º–µ—Ç–∞–¥–∞–Ω–Ω—ã–µ –≤—ã–≥–ª—è–¥—è—Ç —Å–ª–µ–¥—É—é—â–∏–º –æ–±—Ä–∞–∑–æ–º:

–ò–∑–º–µ–Ω–∏—Ç—å –º–∞—Ä–∫–µ—Ä—ã

–°–ª–µ–¥—É—é—â–∞—è —á–∞—Å—Ç—å –≤—ã–≤–æ–¥–∞ Git diff - —ç—Ç–æ –º–∞—Ä–∫–µ—Ä—ã –∏–∑–º–µ–Ω–µ–Ω–∏–π . –≠—Ç–∏ –º–∞—Ä–∫–µ—Ä—ã —à–∞–±–ª–æ–Ω–æ–≤ —Ñ–∞–π–ª–æ–≤ —Å–æ–æ–±—â–∞—é—Ç –Ω–∞–º, –∫–∞–∫–æ–π —Ç–∏–ø –∏–∑–º–µ–Ω–µ–Ω–∏–π –±—ã–ª –≤–Ω–µ—Å–µ–Ω –≤ –Ω–∞—à–∏ —Ñ–∞–π–ª—ã. –ú–∞—Ä–∫–µ—Ä—ã –∏–∑–º–µ–Ω–µ–Ω–∏–π –¥–ª—è –Ω–∞—à–µ–≥–æ –ø—Ä–∏–º–µ—Ä–∞ –≤—ã—à–µ:

–≠—Ç–∏ –º–∞—Ä–∫–µ—Ä—ã —Å–æ–æ–±—â–∞—é—Ç –Ω–∞–º, —á—Ç–æ –∏–∑–º–µ–Ω–µ–Ω–∏—è –∏–∑ —Ñ–∞–π–ª–∞ / README.md –±—ã–ª–∏ –≤–Ω–µ—Å–µ–Ω—ã (–æ–±–æ–∑–Ω–∞—á–µ–Ω—ã –∑–Ω–∞–∫–æ–º –º–∏–Ω—É—Å), –∫–æ—Ç–æ—Ä—ã–µ –æ—Ç—Ä–∞–∂–µ–Ω—ã –≤ b / README.md (–æ–±–æ–∑–Ω–∞—á–µ–Ω—ã –∑–Ω–∞–∫–∞–º–∏ –ø–ª—é—Å).

–ò–∑–º–µ–Ω–µ–Ω–∏—è –∫–æ–¥–∞

–ù–∞–∫–æ–Ω–µ—Ü, –Ω–∞—à diff –≤–æ–∑–≤—Ä–∞—â–∞–µ—Ç —Å–ø–∏—Å–æ–∫ –∏–∑–º–µ–Ω–µ–Ω–∏–π, –≤–Ω–µ—Å–µ–Ω–Ω—ã—Ö –≤ –Ω–∞—à –∫–æ–¥ . –í –æ—Ç–ª–∏—á–∏–µ –æ—Ç –ø–æ–ª–Ω–æ–≥–æ —Å—Ä–∞–≤–Ω–µ–Ω–∏—è —Ñ–∞–π–ª–æ–≤, diff –ø–æ–∫–∞–∑—ã–≤–∞–µ—Ç —Ç–æ–ª—å–∫–æ —Ç–µ —Ä–∞–∑–¥–µ–ª—ã —Ñ–∞–π–ª–∞, –∫–æ—Ç–æ—Ä—ã–µ –±—ã–ª–∏ –∏–∑–º–µ–Ω–µ–Ω—ã. –í –Ω–∞—à–µ–º –ø—Ä–∏–º–µ—Ä–µ –º—ã –¥–æ–±–∞–≤–∏–ª–∏ –æ–¥–Ω—É —Å—Ç—Ä–æ–∫—É –≤ –Ω–∞—à —Ñ–∞–π–ª, –∫–æ—Ç–æ—Ä–∞—è –≤–µ—Ä–Ω—É–ª–∞ —Å–ª–µ–¥—É—é—â–∏–π —Ä–µ–∑—É–ª—å—Ç–∞—Ç:

–ü–µ—Ä–≤–∞—è —Å—Ç—Ä–æ–∫–∞ - —ç—Ç–æ —Å–≤–æ–¥–∫–∞ –∏–∑–º–µ–Ω–µ–Ω–∏–π, –≤–Ω–µ—Å–µ–Ω–Ω—ã—Ö –≤ –Ω–∞—à —Ñ–∞–π–ª. –≠—Ç–æ –≥–æ–≤–æ—Ä–∏—Ç –Ω–∞–º –æ —Ç–æ–º, —á—Ç–æ –º—ã –¥–æ–±–∞–≤–∏–ª–∏ –æ–¥–Ω—É —Å—Ç—Ä–æ–∫—É –∫–æ–¥–∞ –≤ –Ω–∞—à —Ñ–∞–π–ª (+1), –Ω–∞—á–∏–Ω–∞—è —Å–æ –≤—Ç–æ—Ä–æ–π —Å—Ç—Ä–æ–∫–∏ (2).

–ó–∞—Ç–µ–º –Ω–∞–º –ø–æ–∫–∞–∑—ã–≤–∞—é—Ç —Å–ø–∏—Å–æ–∫ –≤–Ω–µ—Å–µ–Ω–Ω—ã—Ö –∏–∑–º–µ–Ω–µ–Ω–∏–π. –ö–∞–∫ –≤–∏–¥–∏—Ç–µ, –ø–æ—Å–∫–æ–ª—å–∫—É –º—ã –¥–æ–±–∞–≤–∏–ª–∏ —Å—Ç—Ä–æ–∫—É " –ú—ã —Ç–æ–ª—å–∫–æ —á—Ç–æ –¥–æ–±–∞–≤–∏–ª–∏ —ç—Ç—É —Å—Ç—Ä–æ–∫—É –≤ –Ω–∞—à —Ñ–∞–π–ª. & Rdquo ;, —ç—Ç–∞ —Å—Ç—Ä–æ–∫–∞ –ø–æ—è–≤–ª—è–µ—Ç—Å—è –≤ –Ω–∞—à–µ–º —Ñ–∞–π–ª–µ diff. –ó–Ω–∞–∫ –ø–ª—é—Å –≥–æ–≤–æ—Ä–∏—Ç –Ω–∞–º, —á—Ç–æ –º—ã –¥–æ–±–∞–≤–∏–ª–∏ —ç—Ç—É —Å—Ç—Ä–æ–∫—É –≤ —Ñ–∞–π–ª.

–ó–∞–∫–ª—é—á–µ–Ω–∏–µ

Diffing - –ø–æ–ª–µ–∑–Ω–∞—è —Ñ—É–Ω–∫—Ü–∏—è –≤ Git, –∫–æ—Ç–æ—Ä–∞—è –ø–æ–∑–≤–æ–ª—è–µ—Ç –≤–∞–º —Å—Ä–∞–≤–Ω–∏–≤–∞—Ç—å –¥–≤–∞ —Ñ–∞–π–ª–∞, –≤–µ—Ç–∫–∏ –∏–ª–∏ –∫–æ–º–º–∏—Ç—ã –≤ –†–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–π Git. –≠—Ç–æ –ø–æ–∑–≤–æ–ª—è–µ—Ç –≤–∞–º —É–≤–∏–¥–µ—Ç—å, –∫–∞–∫–∏–µ –∏–∑–º–µ–Ω–µ–Ω–∏—è –±—ã–ª–∏ –≤–Ω–µ—Å–µ–Ω—ã —Å –æ–ø—Ä–µ–¥–µ–ª–µ–Ω–Ω–æ–≥–æ –º–æ–º–µ–Ω—Ç–∞ –≤ –≤–∞—à–µ–º —Ä–µ–ø–æ–∑–∏—Ç–æ—Ä–∏–∏.

–í —ç—Ç–æ–º —Ä—É–∫–æ–≤–æ–¥—Å—Ç–≤–µ –æ–±—Å—É–∂–¥–∞–ª–∏—Å—å –æ—Å–Ω–æ–≤—ã —Å—Ä–∞–≤–Ω–µ–Ω–∏—è —Å Git –∏ —Ç–æ, –∫–∞–∫ –∏—Å–ø–æ–ª—å–∑–æ–≤–∞—Ç—å –∫–æ–º–∞–Ω–¥—É git diff –¥–ª—è –≤—ã–ø–æ–ª–Ω–µ–Ω–∏—è –æ–ø–µ—Ä–∞—Ü–∏–∏ —Å—Ä–∞–≤–Ω–µ–Ω–∏—è. –¢–µ–ø–µ—Ä—å —É –≤–∞—Å –µ—Å—Ç—å –∑–Ω–∞–Ω–∏—è, –Ω–µ–æ–±—Ö–æ–¥–∏–º—ã–µ –¥–ª—è —Ç–æ–≥–æ, —á—Ç–æ–±—ã –Ω–∞—á–∞—Ç—å –∏—Å–ø–æ–ª—å–∑–æ–≤–∞—Ç—å –∫–æ–º–∞–Ω–¥—É git diff –≤ –∫–∞—á–µ—Å—Ç–≤–µ —ç–∫—Å–ø–µ—Ä—Ç–∞!

–î–æ–ø–æ–ª–Ω–∏—Ç–µ–ª—å–Ω—ã–µ —É—á–µ–±–Ω—ã–µ —Ä–µ—Å—É—Ä—Å—ã –ø–æ Git —Å–º. –í –Ω–∞—à–µ–º –†—É–∫–æ–≤–æ–¥—Å—Ç–≤–æ –ø–æ –∏–∑—É—á–µ–Ω–∏—é Git .