{"id":535333,"date":"2021-09-03T12:57:42","date_gmt":"2021-09-03T04:57:42","guid":{"rendered":"http:\/\/4563.org\/?p=535333"},"modified":"2021-09-03T12:57:42","modified_gmt":"2021-09-03T04:57:42","slug":"%e4%bd%a0%e4%bb%ac%e5%9c%a8%e7%94%a8-git-%e5%90%88%e5%b9%b6%e6%97%b6%e4%bd%86%e4%b8%8d%e6%8b%85%e5%bf%83%e8%87%aa%e5%b7%b1%e6%93%8d%e4%bd%9c%e5%a4%b1%e8%af%af%e6%8a%8a%e4%bb%a3%e7%a0%81%e5%bc%84","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=535333","title":{"rendered":"\u4f60\u4eec\u5728\u7528 git \u5408\u5e76\u65f6\u4f46\u4e0d\u62c5\u5fc3\u81ea\u5df1\u64cd\u4f5c\u5931\u8bef\u628a\u4ee3\u7801\u5f04\u4e22?"},"content":{"rendered":"
\n
\n
\n

\u4f60\u4eec\u5728\u7528 git \u5408\u5e76\u65f6\u4f46\u4e0d\u62c5\u5fc3\u81ea\u5df1\u64cd\u4f5c\u5931\u8bef\u628a\u4ee3\u7801\u5f04\u4e22? <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : yuann72 <\/span> <\/i> 7<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
<\/p>\n

\u8fd9\u51e0\u5929\u7528 rebase \u7684 2 \u4e2a\u4e8b\u4f8b<\/p>\n

\u4e8b\u4f8b 1:<\/h1>\n

<\/p>\n

rebase \u524d\u7684\u63d0\u4ea4\u5386\u53f2\u5927\u6982\u8fd9\u6837: <\/p>\n\n\n\n\n\n\n\n\n
\u63d0\u4ea4\u65f6\u95f4<\/th>\ncommit message<\/th>\n<\/tr>\n<\/thead>\n
10:01<\/td>\nA1<\/td>\n<\/tr>\n
10:02<\/td>\nB<\/td>\n<\/tr>\n
10:03<\/td>\nA2<\/td>\n<\/tr>\n
10:04<\/td>\nC<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

\u6211\u60f3\u628a A1 \u548c A2 \u5408\u5e76, \u7528 webstorm \u8fdb\u884c rebase: <\/p>\n\n\n\n\n\n\n\n\n
action<\/th>\ncommit message<\/th>\n<\/tr>\n<\/thead>\n
pick<\/td>\nA1<\/td>\n<\/tr>\n
squash<\/td>\nA2<\/td>\n<\/tr>\n
pick<\/td>\nB<\/td>\n<\/tr>\n
pick<\/td>\nC<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

\u7136\u540e\u70b9 start rebase, rebase \u5b8c\u53ea\u5269\u4e0b A1, B, C 3 \u4e2a commit, \u8fd9\u65f6 npm \u5f00\u59cb\u62a5\u9519\u63d0\u793a\u6709\u4e2a\u6587\u4ef6\u4e0d\u5b58\u5728, \u770b\u4e86 A1 commit \u7684\u5185\u5bb9\u53d1\u73b0\u8fd9\u4e2a\u6587\u4ef6\u5728 A1 commit \u91cc\u88ab\u5220\u4e86, \u4f46\u662f\u539f\u672c\u7684 A1, A2 commit \u91cc\u5e76\u6ca1\u6709\u5220\u8fd9\u4e2a\u6587\u4ef6 \u63a5\u7740\u5c31\u662f git reflog \u627e\u56de rebase \u524d\u7684 commit id, git reset \u6062\u590d\u5230 git rebase \u524d, \u518d\u8bd5\u4e00\u6b21 rebase \u8fd8\u662f\u4e00\u6837 \u8bd5\u4e86\u51e0\u6b21\u540e\u53d1\u73b0\u4e0b\u9762\u8fd9\u6837\u8fdb\u884c rebase \u5c31\u80fd\u8fbe\u5230\u6211\u7684\u76ee\u7684, \u53ea\u5269\u4e0b A1, B, C 3 \u4e2a commit, \u6587\u4ef6\u4e5f\u6ca1\u4e22 <\/p>\n\n\n\n\n\n\n\n\n
action<\/th>\ncommit message<\/th>\n<\/tr>\n<\/thead>\n
pick<\/td>\nA2<\/td>\n<\/tr>\n
squash<\/td>\nA1<\/td>\n<\/tr>\n
pick<\/td>\nB<\/td>\n<\/tr>\n
pick<\/td>\nC<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

\u4e8b\u4f8b 2:<\/h1>\n

<\/p>\n

\u4f7f\u7528 webstorm \u53f3\u4e0b\u89d2 git \u5206\u652f\u91cc\u7684 “Rebase Current onto Selected” \u5c06\u670d\u52a1\u5668\u7aef\u7684\u5206\u652f\u5185\u5bb9\u7528 rebase \u7684\u65b9\u5f0f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f \u7ed3\u679c\u5408\u5e76\u4e00\u534a\u53f3\u4e0b\u89d2\u5f39\u51fa\u7ea2\u8272\u611f\u53f9\u53f7, \u62a5\u9519\u4fe1\u606f\u5927\u6982\u8fd9\u6837”\u6587\u4ef6\u8def\u5f84 Permission XXXX”, \u63a5\u7740\u8fd8\u662f git reflog \u627e\u56de rebase \u524d\u7684 commit id \u6062\u590d\u540e\u518d\u8bd5\u4e00\u6b21\u5c31\u6ca1\u62a5\u9519\u4e86 rebase \u5408\u5e76\u662f\u5408\u5e76\u5b8c\u4e86, \u4f46\u6211\u6682\u5b58\u533a\u90a3\u4e9b\u4fee\u6539\u5b8c\u8fd8\u6ca1\u63d0\u4ea4\u7684\u6587\u4ef6\u90fd\u4e0d\u89c1\u4e86! \u67e5\u4e86\u641c\u7d22\u5f15\u64ce\u540e\u7528 git stash pop \u6062\u590d\u51fa\u6765<\/p>\n

\u4e8b\u4f8b 1 \u53ef\u80fd\u662f\u6211\u64cd\u4f5c\u5931\u8bef\u6216\u6587\u4ef6\u51b2\u7a81\u5bfc\u81f4, \u4e5f\u5c31\u8fd8\u597d\u662f\u4e00\u4e2a\u5b8c\u6574\u7684\u6587\u4ef6\u88ab\u5408\u5e76\u4e22\u4e86, rebase \u5b8c\u7acb\u9a6c\u5c31\u53d1\u73b0\u4e86, \u5982\u679c\u662f\u67d0\u51e0\u884c\u4ee3\u7801\u5408\u5e76\u4e22\u4e86, \u90a3\u4ee5\u6211\u8fd9\u7684\u6d4b\u8bd5\u7a0b\u5ea6\u53ef\u80fd\u8981\u5230\u751f\u4ea7\u73af\u5883\u51fa bug \u62a5\u9519\u624d\u4f1a\u53d1\u73b0\u3002\u4e5f\u8fd8\u597d\u6211\u662f\u63d0\u4ea4\u5b8c C commit \u540e\u5c31\u8fdb\u884c rebase \u4e8b\u4f8b 2 \u6211\u5c31\u62c5\u5fc3\u8981\u662f git stash \u91cc\u6ca1\u6709\u6211\u7684\u6587\u4ef6, \u6216\u8005\u88ab\u6211\u778e\u64cd\u4f5c\u628a git stash \u6e05\u7a7a\u4e86\u90a3\u5c31\u5b8c\u4e86<\/p>\n

\u6240\u4ee5\u6211\u73b0\u5728\u7528 git \u547d\u4ee4\u65f6\u4f1a\u5f88\u8c28\u614e, \u751f\u6015\u6709\u4e9b\u4ee3\u7801\u7ed9\u6211\u5f04\u4e22\u4e86. \u7279\u522b\u662f\u5408\u5e76\u51b2\u7a81\u5904\u7406\u6587\u4ef6\u51b2\u7a81\u7684\u65f6\u5019, \u9762\u5bf9\u8fd9\u51e0\u4e2a\u6708\u524d\u7f16\u8f91\u7684\u4ee3\u7801, \u6211\u4e5f\u4e0d\u77e5\u9053\u54ea\u8fb9\u7684\u7248\u672c\u662f\u6b63\u786e\u7684\u4ee3\u7801<\/p>\n<\/p><\/div>\n

\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (41<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : af463419014 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    tar -zcvf xxx
    \u5408\u5e76\u524d\u76f4\u63a5\u6253\u4e2a\u672c\u5730\u538b\u7f29\u5305,\u5f04\u4e71\u5c31\u5220\u6389\u91cd\u65b0\u89e3\u538b\u64cd\u4f5c <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : yuann72 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @af463419014 #1 \u6211\u62c5\u5fc3\u4ee3\u7801\u5408\u5e76\u4e22\u4e86\u81ea\u5df1\u90fd\u6ca1\u53d1\u73b0 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ayase252 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u53ef\u80fd\u5f04\u4e22\u7684\u3002git reflog \u91cc\u9762\u6709\u6240\u6709\u7684\u64cd\u4f5c\u5386\u53f2\uff0c\u641e\u574f\u4e86 reset –hard \u56de\u6765\u5c31\u884c\u4e86\uff0c\u8ddf\u64a4\u56de\u4e00\u6837\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : yuann72 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @ayase252 #3 \u5408\u5e76\u4e22\u7684\u65f6\u5019\u6ca1\u53d1\u73b0\uff0c\u7b49\u5230\u53d1\u73b0\u7684\u65f6\u5019\u53ef\u80fd\u5df2\u7ecf\u4ea7\u751f\u7ebf\u4e0a BUG \u4e86\u3002\u6211\u62c5\u5fc3\u7684\u662f\u8fd9\u4e00\u70b9 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : renmu123 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u4ece\u6765\u6ca1\u6709\u5f04\u4e22\u8fc7\u6587\u4ef6\uff0c\u6211\u90fd\u662f commit \u4e4b\u540e\u518d\u8fdb\u884c merge <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : revlis7 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u90a3\u4f60\u6709\u6ca1\u6709\u60f3\u8fc7\u5373\u4fbf\u6ca1\u6709\u64cd\u4f5c\u5931\u8bef\uff0cgit \u7684 auto merge \u4e5f\u662f\u6709\u53ef\u80fd\u5bfc\u81f4\u4ee3\u7801\u51fa\u73b0 Bug \u7684\uff1f
    \u8fd9\u4e2a\u4e0d\u662f\u4f60\u5982\u4f55\u64cd\u4f5c\u7684\u95ee\u9898\uff0c\u4f60\u9700\u8981\u7684\u662f Review \u548c Test <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : wudicgi <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u57fa\u672c\u4e0d\u7528 rebase, \u800c\u4e14\u4e00\u822c merge \u90fd\u662f\u5f3a\u5236 no fast-forward
    \u53e6\u5916\u6015\u4e22\u5386\u53f2\u7684\u8bdd\uff0c\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u65b0\u5206\u652f\u518d\u64cd\u4f5c
    \u6ca1\u521b\u5efa\u7684\u8bdd\u5176\u5b9e reflog \u4e5f\u80fd\u627e\u56de\u6765\uff0c\u5c31\u662f\u8fd8\u5f97\u4eba\u5de5\u6838\u5bf9\u4e00\u4e0b <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : bwt <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u81ea\u4ece git \u7528\u719f\u7ec3\u540e\u5c31\u6ca1\u4e22\u8fc7\u4e86\uff0crebase \u6211\u6bd4\u8f83\u4e60\u60ef\u547d\u4ee4\u884c\uff0c\u5408\u5e76\u51b2\u7a81\u4ee3\u7801\u65f6\u6bd4\u8f83\u76f4\u89c2 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : creanme <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u4e4b\u524d\u6709\u6b21 git pull (rebase) \u4e0b\u6765\uff0c\u53d1\u73b0\u6709\u4e2a\u6587\u4ef6\u5904\u4e8e\u88ab\u5220\u9664\u72b6\u6001\uff0c\u4e0d\u592a\u660e\u767d\u4e3a\u5565\u4f1a\u8fd9\u6837\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Mutoo <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u65e2\u7136\u4f60\u7528\u7684\u662f webstorm \u90a3\u5c31\u5b8c\u5168\u6ca1\u5e76\u8981\u62c5\u5fc3\u4e86\uff0c\u56e0\u4e3a webstorm \u8fd8\u63d0\u4f9b local history\uff0c\u5c31\u7b97\u4f60\u6574\u4e2a commit \u90fd\u539f\u5730\u6d88\u5931\uff0c\u901a\u8fc7 local history \u4e5f\u53ef\u4ee5\u8fd8\u539f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : yuann72 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @creanme #9 \u8fd9\u95ee\u9898\u6709\u9047\u5230\u8fc7 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u4e3b<\/span> \u8cc7\u6df1\u5927\u4f6c : yuann72 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @revlis7 #6 \u554a\u8fd9\uff0c\u6211\u4e00\u76f4\u4ee5\u4e3a GIT \u662f\u4e2a\u5f88\u6210\u719f\u7684\u8f6f\u4ef6\uff0c\u539f\u6765\u81ea\u52a8\u5408\u5e76\u662f\u4f1a\u51fa bug \u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : beidounanxizi <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @yuann72 \u90a3\u53eb fast foward
    \u81ea\u5df1\u5982\u679c\u4e0d\u61c2\u4ec0\u4e48\u53eb\u505a git conflict \u7684\u8bdd
    \u53bb\u4e86\u89e3\u4e0b \u4ec0\u4e48\u6837\u7684\u60c5\u51b5 \u624d\u4f1a\u4ea7\u751f conflict ,
    \u81ea\u5df1\u5728\u4e0d\u540c\u7684\u5206\u652f \u5bf9\u540c\u6587\u4ef6 \u4fee\u6539\u4e5f\u4f1a conflict \u5462
    reflog + reset –hard \u65f6\u5149\u96a7\u9053\u5c40\u4e86\u89e3\u4e0b?! <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : QingStone <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @creanme #9 \u53ef\u80fd\u662f\u8fdc\u7a0b\u4e0a\u6709\u4eba\u63d0\u4ea4\u4e86\u4e00\u4e2a\u5220\u9664\u8be5\u6587\u4ef6\u7684\u63d0\u4ea4\u8bb0\u5f55 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ampedee <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u9762\u5bf9\u672a\u77e5\u5f53\u7136\u5bb9\u6613\u6050\u60e7\uff0c\u5f04\u61c2 git \u6bcf\u4e00\u6b21 merge\uff0crebase \u80cc\u540e\u7684\u539f\u7406\u8fd9\u4e9b\u90fd\u662f\u65e5\u5e38\u64cd\u4f5c\u3002
    \u53ef\u4ee5\u770b\u4e0b\u6211\u5199\u7684\u5173\u4e8e git \u539f\u7406\u548c\u64a4\u9500\u64cd\u4f5c\u7684\u535a\u5ba2\uff1a https:\/\/www.waynerv.com\/posts\/git-undo-intro\/
    \u53e6\u5916\u9700\u8981\u5408\u5e76\u51e0\u4e2a\u6708\u524d\u7f16\u8f91\u7684\u4ee3\u7801\u8bf4\u660e\u4f60\u4eec\u9700\u8981\u6539\u8fdb\u5de5\u4f5c\u6d41\uff0c\u4e00\u4e2a\u5206\u652f\u4e0d\u5e94\u8be5\u5b58\u5728\u8fd9\u4e48\u4e45 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : msg7086 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @yuann72 #12
    \uff1f
    \u5c31\u7b97\u4e0d\u7528 Git \u4e5f\u4f1a\u51fa bug \u5462\uff0c\u8fd9\u7ba1 Git \u5565\u4e8b\u3002
    \u4e00\u4e2a\u4eba\u6539\u4e86\u6587\u4ef6 A\uff0c\u53e6\u4e00\u4e2a\u4eba\u6539\u4e86\u6587\u4ef6 B\uff0c\u4f60\u600e\u4e48\u77e5\u9053\u8fd9\u4e24\u4e2a\u6587\u4ef6\u5206\u522b\u6539\u5b8c\u4ee5\u540e\u7a0b\u5e8f\u80fd\u6b63\u5e38\u8fd0\u884c\uff1f
    \u81f3\u4e8e\u8fd9\u4e2a\u5e16\u5b50\u91cc\u7684\u95ee\u9898\uff1a
    \u5982\u679c\u4f60\u63d0\u4ea4\u8bb0\u5f55\u91cc A2 \u548c B \u6709\u51b2\u7a81\u7684\u8bdd\uff0c\u90a3\u4e48 A2 \u548c B \u662f\u4e0d\u80fd\u968f\u4fbf\u4ea4\u6362\u4f4d\u7f6e\u7684\u3002
    \u6362\u53e5\u8bdd\u8bf4\uff0c\u4ea4\u6362 A2 \u548c B \u662f\u9700\u8981\u624b\u52a8\u5904\u7406\u7684\u3002
    \u6240\u4ee5\u5982\u679c\u8fd9\u4e2a\u64cd\u4f5c\u6211\u6765\u505a\u7684\u8bdd\uff0c\u4f1a\u662f
    1. \u5728 A1 \u4e0a\u65b0\u5efa\u4e00\u4e2a\u5206\u652f tmp \u3002
    2. \u628a A2 cherry pick \u5230 tmp \u4e0a\uff0c\u7136\u540e\u89e3\u51b3\u51b2\u7a81\u3002
    3. \u628a A1 \u548c A2 squash \u6210 A \u3002
    4. \u628a B cherry pick \u5230 tmp \u4e0a\uff0c\u7136\u540e\u89e3\u51b3\u51b2\u7a81\u3002
    5. \u628a C cherry pick \u5230 tmp \u4e0a\u3002
    6. \u628a\u539f\u6765\u7684\u5206\u652f\u6307\u5411 C \u3002
    \u8fd9\u6837\u5f97\u5230\u4e00\u4e2a A-B-C \u3002\u8fd9\u4e48\u64cd\u4f5c\u5e94\u8be5\u662f\u6700\u7a33\u59a5\u7684\u65b9\u6848\u4e86\u3002
    \u7136\u540e\u5173\u4e8e\u5728\u8fd8\u6ca1\u6709\u63d0\u4ea4\u7684\u65f6\u5019\u53bb Rebase \u7684\u95ee\u9898\uff1a
    \u4e0d\uff01\u8981\uff01\u8fd9\uff01\u4e48\uff01\u505a\uff01
    Rebase \u662f\u5728\u63d0\u4ea4\u94fe\u4e0a\u7684\u64cd\u4f5c\u3002\u5904\u7406\u63d0\u4ea4\u94fe\u7684\u65f6\u5019\u672c\u5730\u6587\u4ef6\u5939\u662f\u8981\u6e05\u7a7a\u7684\u3002
    \uff08\u5176\u5b9e\u4e0d\u9700\u8981\u5b8c\u5168\u6e05\u7a7a\uff0c\u65e0\u51b2\u7a81 untracked \u6587\u4ef6\u53ef\u4ee5\u4fdd\u7559\uff0c\u4f46\u662f\u5f88\u591a Git \u8f6f\u4ef6\u4e3a\u4e86\u5b89\u5168\uff0c\u662f\u8981\u5b8c\u5168\u6e05\u7a7a\u7684\u3002\uff09
    \u5f53\u4f60\u70b9\u51fb Rebase \u6309\u94ae\u7684\u65f6\u5019\uff0c\u5176\u5b9e\u5c31\u662f\u5728\u544a\u8bc9 Git\uff0c
    \u6e05\u7a7a\u6211\u672c\u5730\u7684\u6587\u4ef6\u5939\uff0c\u4ee5\u4fbf\u4fee\u6539\u63d0\u4ea4\uff0c\u505a Rebase \u3002
    \u6240\u4ee5\u4f60\u4fee\u6539\u7684\u6587\u4ef6\u5f53\u7136\u4f1a\u6d88\u5931\u6389\uff0c\u56e0\u4e3a\u4ed6\u4eec\u88ab\u81ea\u52a8 Stash \u4e86\u3002
    \u7136\u540e\u5982\u679c Rebase \u51fa\u73b0\u4e86\u4efb\u4f55\u95ee\u9898\uff0cStash \u5c31\u4e0d\u4f1a\u88ab\u81ea\u52a8 pop \u3002
    \u53e6\u5916 Stash pop \u7684\u65f6\u5019\u4e5f\u53ef\u80fd\u51fa\u73b0\u95ee\u9898\u3002
    \u8fd9\u4e9b\u65f6\u5019\u90fd\u8981\u624b\u52a8 Stash apply \u5e76\u4fee\u590d\u6f5c\u5728\u7684\u95ee\u9898\u3002
    \u4f46\u662f\u8fd9\u79cd\u64cd\u4f5c\u662f\u5f88\u5bb9\u6613\u51fa\u9519\u7684\uff0c\u5982\u679c\u6ca1\u6709\u7279\u6b8a\u9700\u6c42\uff0c\u8fd8\u662f\u5efa\u8bae\u5148 commit \u6210\u63d0\u4ea4\uff0c\u6c38\u4e45\u5199\u5165 Git \u6570\u636e\u5e93\uff0c\u7136\u540e\u518d\u505a Rebase \u4e4b\u7c7b\u7684\u64cd\u4f5c\u3002\u7136\u540e\u53ef\u4ee5\u50cf\u89e3\u51b3\u95ee\u9898 1 \u91cc\u6211\u63d0\u5230\u7684\u65b9\u6cd5\u4e00\u6837\uff0c\u5efa\u4e00\u4e2a tmp \u5206\u652f\u6765\u64cd\u4f5c\uff0c\u64cd\u4f5c\u5b8c\u4ee5\u540e\u518d\u628a\u5206\u652f\u5207\u8fc7\u53bb\u3002
    \u4e34\u65f6 commit \u5728\u64cd\u4f5c\u5b8c\u4ee5\u540e\u8fd8\u53ef\u4ee5 undo \u56de staged \uff08\u76f8\u5f53\u4e8e reset soft HEAD~1 \uff09\uff0c\u6240\u4ee5\u8fd9\u4e2a\u64cd\u4f5c\u662f\u6ca1\u6709\u526f\u4f5c\u7528\u7684\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : muzuiget <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709 git reflog\uff0c\u517b\u6210\u826f\u597d\u4e60\u60ef\u5c31\u884c\uff0c\u5f00\u65b0\u5206\u652f\u5199\u65b0\u7279\u6027\uff0c\u771f\u8981\u5927\u64cd\u4f5c\uff0c\u6574\u4e2a\u4ed3\u5e93\u6253\u5305\u5907\u4efd\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : xuanbg <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4ee3\u7801\u7ed3\u6784\u6ca1\u6bdb\u75c5\u5c31\u4e0d\u592a\u4f1a\u53d1\u751f\u5408\u5e76\u51b2\u7a81\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : youmilk <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5148 commit \u518d merge\/rebase\uff0c\u7136\u540e idea \u8fd8\u6709 localHistory \u4e5f\u80fd\u627e\u56de\u4ee3\u7801\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : vicnicLight007 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u7528 sourceTree\uff0c\u5408\u5e76\u4e4b\u540e\u4e0d\u63d0\u4ea4\uff0c\u53d1\u73b0\u95ee\u9898\u8d2e\u85cf\u4e00\u4e0b\u53d8\u52a8\uff0c\u7136\u540e\u5220\u9664\u8d2e\u85cf\uff0c\u7f8e\u6ecb\u6ecb <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Felldeadbird <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u4f1a\u4e22\u4ee3\u7801\u554a\u3002\u6015\u4e22\u5c31\u5f00\u591a 2 \u4e2a\u5206\u652f\u5404\u81ea\u7559\u5e95\u3002\u6216\u8005\u989d\u5916\u5f00\u4e00\u4e2a\u4e34\u65f6\u5206\u652f\uff0c\u4e24\u8005\u5408\u5e76\u3002\u6574\u7406\u597d\u4e34\u65f6\u5206\u652f\u540e\uff0c\u5728\u5408\u5e76\u4e3b\u5206\u652f\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Euthpic <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u62c5\u5fc3\uff0c\u5408\u51fa\u95ee\u9898\u7684\u8bdd\u53ef\u4ee5 revert\uff0c\u6216\u8005 merge \u524d\u5f00\u4e2a backup branch \u3002\u4e22\u4ee3\u7801\u4f1a\u51fa\u95ee\u9898\uff0c\u4e0d\u4e22\u4ee3\u7801\u96be\u9053\u5c31\u4e0d\u4f1a\u51fa\u95ee\u9898\u5417\uff1f\u91cd\u8981\u7684\u662f\u6709\u6539\u52a8\u7684\u5730\u65b9\u6d4b\u8bd5\u6709\u6ca1\u6709\u56de\u5f52\u5230 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : wangsd <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    WebStorm \u6709\u672c\u5730\u5386\u53f2\u8bb0\u5f55 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Hstar <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4ee5\u524d\u56e2\u961f\u5185\u6709\u4eba\u7ecf\u5e38\u5408\u5e76\u51fa\u9519\uff0c\u6211\u4eec\u590d\u76d8\u4e86\u4e0b\u53d1\u73b0\u90fd\u662f\u56e0\u4e3a merge \u65f6\u6839\u672c\u4e0d\u770b diff \u65e0\u8111\u5408\u5e76 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : bugsnail <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    1. \u5148 commit \u518d\u5408\u5e76
    2. \u5c3d\u91cf\u7528\u56fe\u5f62\u5316\u754c\u9762, \u5982 sourcetree + beyond compare <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : fregie <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u53ea\u8981 commit \u4e86\uff0c\u51e0\u4e4e\u5c31\u6ca1\u4ec0\u4e48\u53ef\u80fd\u4f1a\u4e22\u3002
    \u5e94\u8be5\u52a0\u81ea\u52a8\u5316\u6d4b\u8bd5\u9632\u6b62\u5408\u5e76\u5206\u652f\u9519\u8bef\u5bfc\u81f4\u7684\u95ee\u9898 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : chenmobuys <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5408\u5e76\u65f6\u6709\u51b2\u7a81\uff0c\u5c31\u4e0d\u8981\u5f3a\u5236\u5408\u5e76\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ooxiaoming <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u53ea\u8981 git \u4e86\u5c31\u6ca1\u6709\u627e\u4e0d\u5230\u7684\u65f6\u5019… <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : mangoDB <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u53ea\u8981\u4fdd\u8bc1\u64cd\u4f5c\u6d41\u7a0b\u6b63\u786e\uff0c\u4e0d\u8f7b\u6613\u7684 checkout\/reset –hard\uff0c\u5c31\u4e0d\u4f1a\u4e22\u4ee3\u7801\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : LemonK <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u517b\u6210\u597d\u4e60\u60ef\u5c31\u4e0d\u4f1a\u6709\u95ee\u9898\u30021. \u5c3d\u91cf\u4e0d\u8981\u4e24\u4e2a\u5206\u652f\u6539\u540c\u4e00\u4e2a\u5730\u65b9\uff0c\u4e0d\u8981\u6709\u957f\u65f6\u95f4\u6ca1\u5408\u5e76\u7684\u5206\u652f\u30022. \u5408\u5e76\u7684\u65f6\u5019\u8ba4\u771f\u770b diff \u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : oxromantic <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e0d\u653e\u5fc3\u7684\u8bdd\uff0c\u5408\u5e76\u4ee3\u7801\u8fd9\u79cd\u4e8b\u60c5\u4ea4\u7ed9\u4e13\u4eba\u8d1f\u8d23\uff0c\u540c\u65f6\u517c\u987e review \u4ee3\u7801 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : xingheng <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    1. \u4e0d\u80fd\u4fdd\u8bc1 rebase \u80fd\u4e00\u6b65\u5230\u4f4d\u7684\u8bdd\u5c31\u7528 cherry-pick
    2. \u4e0d\u8981\u8f7b\u4fe1\u90a3\u4e2a GUI \u5c01\u88c5\u7684 git \u64cd\u4f5c\uff0c\u4eb2\u529b\u4eb2\u4e3a <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Trim21 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4f60\u53ef\u4ee5\u65b0\u5efa\u4e24\u4e2a\u5206\u652f\u8fdb\u884c\u64cd\u4f5c\uff0c\u5408\u5e76\u4e4b\u540e diff \u5408\u5e76\u4e4b\u524d\u7684 commit\u2026 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : pocarisweat <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @msg7086
    \u4ed6\u7406\u89e3\u9519\u4e86\uff0c\u4ed6\u4ee5\u4e3a\u662f Git \u4f1a\u51fa bug\uff0c\u800c\u4e0d\u662f\u4ee3\u7801\u5e93\u51fa\u73b0 bug <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Huelse <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4fdd\u6301 add .\u548c\u7ecf\u5e38 stash save “…”\uff0c\u5c31\u6ca1\u9047\u5230\u8fc7\u95ee\u9898\uff0c\u9664\u975e\u6709\u4e2a\u5c0f\u5154\u5d3d\u5b50\u5077\u5077\u52a8\u6211\u7535\u8111\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : CokeMine <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u4e00\u822c\u80fd\u901a\u8fc7 reflog \u627e\u56de\u6765 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : suzic <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6709\u4e22\u8fc7\u4e24\u6b21 git reflog \u627e\u56de\u4e86 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : QHKZ <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u7406\u89e3 git \u6570\u636e\u6a21\u578b\u5f88\u91cd\u8981\uff0c\u64cd\u4f5c git \u6570\u636e\u5386\u53f2\u5e93\u552f\u4e00\u5b8c\u5168\u53ef\u63a7\u7684\u65b9\u5f0f\u662f\u4f7f\u7528 CLI \u800c\u4e0d\u662f\u4f7f\u7528 GUI \u6309\u94ae\uff0c\u867d\u7136 CLI \u7684\u8bbe\u8ba1\u5f88 horrible \u3002\u63a8\u8350\u770b\u4e00\u4e0b linus \u5728 Google \u7684 git \u63a8\u9500\u6f14\u8bb2\uff08 0 \u51e0\u5e74\u7684\u89c6\u9891\uff09\u4ee5\u53ca MIT \u7684 missing.csail.mit.edu \u7684\u7cfb\u5217\u8bfe\u7a0b\uff0c\u91cc\u9762\u63a8\u8350\u7684\u4e00\u4e9b\u8d44\u6e90\u6709\u4e00\u5b9a\u7684\u5e2e\u52a9\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : EastLord <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u6015\u522b\u4eba\u628a\u6211\u7684\u4ee3\u7801\u5f04\u4e22 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : shadowfish0 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5bb3\uff0c\u591a\u4eba\u5f00\u53d1\u65f6\u4ee3\u7801\u7edf\u4e00\u683c\u5f0f\u5316\u8fd8\u662f\u592a\u91cd\u8981\u4e86\uff0c\u5f88\u591a\u65f6\u5019\u5408\u5e76\u51b2\u7a81\u6211\u4e00\u770b\u6ee1\u9875\u7684\u7a7a\u683c\u3001\u6362\u884c\u533a\u522b\uff0c\u76f4\u63a5\u61d2\u5f97\u770b\u4e86\u8df3\u8fc7\uff0c\u4f46\u662f\u6709\u65f6\u5019\u5f80\u5f80\u4e00\u4e9b\u4e1a\u52a1\u4fee\u6539\u5c31\u6df7\u5728\u8fd9\u91cc\u9762…\u641e\u5f97\u4ee3\u7801\u4e22\u4e86\u90fd\u4e0d\u77e5\u9053 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : 2i2Re2PLMaDnghL <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u662f\u7684\uff0c\u4ee3\u7801\u4fdd\u8bc1\u6b63\u786e\u62f7\u8d1d\u662f\u672c\u8d28\u96be\u7684\uff0c\u6d89\u53ca\u591a\u4eba\u5fc5\u987b\u8981\u5199\u6d4b\u8bd5\u3002
    \u5176\u5b9e\u5c31\u50cf\u751f\u7269\u4fee\u6539\u81ea\u5df1\u7684 DNA \u4e00\u6837\uff0c\u4e5f\u6709\u7b80\u5355\u7684\u6d4b\u8bd5\u907f\u514d\u53d1\u751f\u5947\u8469\u53d8\u5f02\uff08\u4f1a\u5bfc\u81f4\u7ec6\u80de\u6b7b\u4ea1\u6216\u764c\u53d8\uff09\u3002\u9664\u4e86\u5bf9 DNA \u8fdb\u884c\u7b80\u5355\u6392\u9664\u5916\uff0c\u7ec6\u80de\u4e5f\u4f1a\u88ab\u68c0\u67e5\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u4f60\u4eec\u5728\u7528 git \u5408\u5e76\u65f6\u4f46\u4e0d\u62c5\u5fc3\u81ea…<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/535333"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=535333"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/535333\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=535333"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=535333"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=535333"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}