{"id":316,"date":"2012-05-08T12:27:44","date_gmt":"2012-05-08T03:27:44","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=316"},"modified":"2015-07-14T16:34:37","modified_gmt":"2015-07-14T07:34:37","slug":"git-vs-mercurial-why-git","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/git-vs-mercurial-why-git","title":{"rendered":"Git \u5bfe Mercurial: \u306a\u305c Git \u3092\u9078\u3076\u306e\u304b\uff1f"},"content":{"rendered":"
\u3053\u308c\u306f Atlassian DVCS \u30ac\u30a4\u30c9 \u00bb<\/a> \u306e\u4e00\u8a18\u4e8b\u3067\u3059\u3002<\/div>\n

\u4eca\u56de\u306f Atlassian \u306e\u958b\u767a\u8005\u3067\u3042\u308b Charles O’Farrell<\/a> \u306b\u3088\u308b\u30b2\u30b9\u30c8\u30d6\u30ed\u30b0\u3067\u3059\u3002\u30c1\u30fc\u30e0\u304c DVCS \u3068\u3057\u3066 Git \u3092\u9078\u629e\u3059\u308b\u7406\u7531\u306b\u3064\u3044\u3066\u8aac\u660e\u3057\u307e\u3059\u3002Charles \u306f\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3092\u307b\u3068\u3093\u3069 DVCS \u4e0a\u3067\u884c\u3044\u3001\u307e\u305f ClearCase \u304b\u3089 Git \u3078\u30e6\u30fc\u30b6\u30fc\u3092\u79fb\u884c<\/a>\u3055\u305b\u308b\u4f5c\u696d\u3092\u884c\u3063\u3066\u304d\u307e\u3057\u305f\u3002<\/em><\/p>\n

\u524d\u56de\u306e\u8a18\u4e8b\u3067\u306f\u3001\u5206\u6563\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u3068\u3057\u3066\u30c1\u30fc\u30e0\u304c\u306a\u305c Mercurial \u3092\u9078\u629e\u3059\u308b\u306e\u304b<\/a>\u306b\u3064\u3044\u3066\u8003\u3048\u3066\u307f\u307e\u3057\u305f\u3002\u4eca\u56de\u306f\u3001\u5206\u6563\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0 (DVCS) \u3068\u3057\u3066\u00a0\u306a\u305c Git<\/strong> \u304c\u6709\u529b\u306a\u9078\u629e\u80a2\u3067\u3042\u308b\u306e\u304b\u306b\u3064\u3044\u3066\u8003\u3048\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n

1970 \u5e74\u306e\u9ece\u660e\u671f\u304b\u3089\u3001\u30ae\u30fc\u30af\u305f\u3061\u306f\u3069\u3061\u3089\u304c\u5584\u3067\u3069\u3061\u3089\u304c\u60aa\u304b\u3068\u3044\u3046\u8840\u306a\u307e\u3050\u3055\u3044\u8ad6\u4e89\u3092\u9577\u3044\u9593\u884c\u3063\u3066\u304d\u307e\u3057\u305f\u3002\u305d\u308c\u304c\u00a0Vim \u3068 Emacs \u3068\u306e\u9593\u306e\u6226\u3044\u3067\u3059\u3002\u6700\u8fd1\u3067\u306f\u3001\u305d\u308c\u3068\u306f\u5225\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8\u306b\u3064\u3044\u3066\u3001\u30ae\u30fc\u30af\u305f\u3061\u306f\u672c\u6765\u306e\u4ed5\u4e8b\u305d\u3063\u3061\u306e\u3051\u306b\u4f55\u6642\u9593\u3082\u304b\u3051\u3066\u30d6\u30ed\u30b0\u4e0a\u3067\u305d\u306e\u8b70\u8ad6\u3092\u884c\u3044\u3001\u81ea\u5206\u305f\u3061\u306e\u6b63\u3057\u3055\u3092\u4e3b\u5f35\u3057\u305f\u308a\u3057\u3066\u3044\u307e\u3059\u3002\u3053\u3053\u3067\u8a00\u3063\u3066\u3044\u308b\u306e\u306f\u3082\u3061\u308d\u3093\u3001Git\u00a0\u3068 Mercurial \u306e\u9593\u306b\u3042\u308b\u53b3\u3057\u3044\u5bfe\u7acb\u306e\u3053\u3068\u3067\u3059\u3002<\/p>\n

\u4eca\u56de\u306e\u30d6\u30ed\u30b0\u3067\u306f\u3001Git \u3068\u3044\u3046\u3001\u3048\u3048\u3001\u307e\u3042\u300c\u52dd\u3061\u7d44\u300d\u306e\u7acb\u5834\u3092\u3068\u308a\u3001\u306a\u305c\u3053\u306e\u58ee\u5927\u306a\u95d8\u4e89\u306b\u304a\u3044\u3066 Git \u304c\u512a\u4f4d\u306b\u306a\u308a\u3064\u3064\u3042\u308b\u306e\u304b\u3001\u305d\u306e\u8aac\u5f97\u529b\u306e\u3042\u308b\u7406\u7531\u306b\u3064\u3044\u3066\u3044\u304f\u3064\u304b\u898b\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n

“\u9000\u5c48\u306a” \u6ce8\u610f\u4e8b\u9805<\/h2>\n

\u307e\u305a\u3001\u79c1\u306f Git \u304c\u5b8c\u74a7\u3067\u3042\u308b\u3068\u4e3b\u5f35\u3059\u308b\u306e\u306b\u306f\u307e\u3063\u305f\u304f\u5411\u3044\u3066\u3044\u306a\u3044\u4eba\u7269\u3067\u3042\u308b\u3068\u3044\u3046\u3053\u3068\u3092\u6b63\u76f4\u306b\u8a8d\u3081\u307e\u3059\u3002\u3048\u3048\u3001\u3061\u3063\u3068\u3082\u5411\u3044\u3066\u3044\u307e\u305b\u3093\u3002\u3053\u308c\u307e\u3067\u79c1\u306f\u3001\u3068\u3066\u3082\u305f\u304f\u3055\u3093\u306e\u6642\u9593\u3092\u8cbb\u3084\u3057\u3066\u3001Git \u304c\u5168\u304f\u4e88\u671f\u3057\u306a\u3044\u52d5\u4f5c\u3092\u884c\u3046\u3068\u3044\u3046\u3053\u3068\u3092\u8aac\u660e\u3057\u3066\u304d\u307e\u3057\u305f\u3002\u7279\u306b\u3001\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u30b3\u30de\u30f3\u30c9\u306e\u300c\u30e2\u30fc\u30c9\u300d\u306e\u9055\u3044\u3092\u8aac\u660e\u3057\u306a\u3051\u308c\u3070\u306a\u3089\u306a\u304f\u306a\u3063\u305f\u6642\u306b\u306f\u3001\u3044\u3064\u3082\u7dca\u5f35\u3057\u3066\u3001\u306a\u3093\u3068\u304b\u5207\u308a\u629c\u3051\u3088\u3046\u3068\u632f\u821e\u3063\u3066\u3044\u307e\u3057\u305f\u3002\u307e\u305f\u00a0\u00a0msysgit \u306f Windows \u7528 Git\u00a0\u3068\u3057\u3066\u672c\u5f53\u306b\u7d20\u6674\u3089\u3057\u3044\u30ea\u30ea\u30fc\u30b9\u3060\u3063\u305f\u306e\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u6642\u9593\u304c\u7d4c\u3063\u3066\u307f\u308b\u3068\u3001\u3042\u3044\u304b\u308f\u3089\u305a\u4e8c\u6d41\u3067\u3042\u308b\u3088\u3046\u306b\u611f\u3058\u3066\u3044\u307e\u3059\u3002<\/p>\n

\u3068\u306f\u8a00\u3046\u3082\u306e\u306e\u3001\u79c1\u306f\u3082\u3068\u3082\u3068 Mercurial \u3067\u59cb\u3081\u305f DVCS \u4eba\u751f\u3092\u305d\u306e\u5f8c Git\u00a0\u306b\u5207\u308a\u66ff\u3048\u3001Mercurial\u306e\u65b9\u304c\u3088\u304b\u3063\u305f\u3068\u601d\u3046\u3053\u3068\u306f\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002<\/p>\n

\u305d\u308c\u306f\u306a\u305c\u3067\u3057\u3087\u3046\u304b\uff1f<\/p>\n

\u30b9\u30c8\u30ec\u30fc\u30b8\u30d5\u30a9\u30fc\u30de\u30c3\u30c8<\/h2>\n

\u79c1\u306b\u3068\u3063\u3066\u3001Git\u306e\u6301\u3064\u552f\u4e00\u6700\u5927\u306e\u5dee\u5225\u5316\u8981\u56e0\u306f\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u30d5\u30a9\u30fc\u30de\u30c3\u30c8<\/a>\u3067\u3059\u3002Git\u00a0\u306b\u3064\u3044\u3066\u79c1\u306e\u597d\u304d\u306a\u90e8\u5206\u306e\u591a\u304f\u306f\u3001\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u4fdd\u5b58\u65b9\u6cd5\u3068\u305d\u308c\u306b\u5bfe\u3059\u308b\u8003\u3048\u65b9\u306b\u95a2\u308f\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n

Mercurial \u306f\u8ffd\u8a18\u5c02\u7528\u30ed\u30b0\u306b\u5168\u3066\u3092\u304b\u3051\u3066\u3044\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u3086\u3063\u304f\u308a\u3068\u56de\u308b\u30c7\u30a3\u30b9\u30af\u4e0a\u306e\u30c7\u30a3\u30b9\u30af\u30b7\u30fc\u30af\u3092\uff08\u975e\u5e38\u306b\u5408\u7406\u7684\u306b\uff09\u6700\u9069\u5316\u3059\u308b\u305f\u3081\u3067\u3059\u3002\u4e00\u65b9\u00a0Git \u306f\u3001\u30cf\u30c3\u30b7\u30e5\u5316\u3055\u308c\u305f\u5358\u7d14\u306a\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306b\u3001\u5168\u3066\u306e\u30b3\u30df\u30c3\u30c8 \/ \u30d5\u30a1\u30a4\u30eb\u3092\u683c\u7d0d\u3057\u3066\u3044\u307e\u3059\u3002\u5168\u30b3\u30df\u30c3\u30c8\u3001\u5168\u30d5\u30a1\u30a4\u30eb\u306e\u5168\u30d0\u30fc\u30b8\u30e7\u30f3\u306f\u5225\u306e\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u3068\u3057\u3066\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306b\u4fdd\u7ba1\u3055\u308c\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002\u3054\u304f\u521d\u671f\u306e\u3053\u308d\u3001\u30d1\u30c3\u30af\u30d5\u30a1\u30a4\u30eb\u3092\u5c0e\u5165\u3059\u308b\u4ee5\u524d\u306f\u3001\u3053\u306e\u30d7\u30ed\u30bb\u30b9\u306f\u3072\u3069\u304f\u975e\u52b9\u7387\u7684\u3067\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u305d\u306e\u30a2\u30a4\u30c7\u30a2\u306f\u3057\u3063\u304b\u308a\u3068\u3057\u305f\u3082\u306e\u3067\u3042\u308a\u3001\u4eca\u65e5\u306b\u304a\u3044\u3066\u3082\u7528\u3044\u3089\u308c\u3066\u3044\u307e\u3059\u3002\u6ce8\u76ee\u3059\u3079\u304d\u70b9\u306f\u3001\u5404\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30a4\u30c7\u30f3\u30c6\u30a3\u30c6\u30a3\u306f\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u30cf\u30c3\u30b7\u30e5\u3060\u3068\u3044\u3046\u3053\u3068\u3067\u3042\u308a\u3001\u305d\u308c\u306f\u5168\u3066\u304c\u4e0d\u5909\u3067\u3042\u308b\u3053\u3068\u3092\u610f\u5473\u3057\u3066\u3044\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u3088\u3046\u306b\u30b7\u30f3\u30d7\u30eb\u306a\u4f55\u304b\u3092\u5909\u66f4\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u307e\u305a\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 \u305d\u308c\u306f\u4ee5\u4e0b\u306e\u3053\u3068\u306b\u3064\u306a\u304c\u3063\u3066\u3044\u304d\u307e\u3059…<\/p>\n

Git \u306e\u65b9\u304c\u5c65\u6b74\u304c\u5b89\u5168<\/h2>\n

\u3048\u3048\u3001\u672c\u5f53\u3067\u3059\uff01<\/p>\n

Git \u304c\u300c\u7834\u58ca\u7684\u300d\u3067\u3042\u308b\u3068\u8a00\u308f\u308c\u308b\u3068\u3001\u3044\u3064\u3082\u672c\u5f53\u306b\u3044\u3089\u3044\u3089\u3057\u307e\u3059\u3002\u9006\u306b\u3001\u5b9f\u969b\u306b\u306f Git \u306f\u5168\u3066\u306e DVCS \u306e\u4e2d\u3067\u3082\u3063\u3068\u3082\u5b89\u5168\u3060\u3068\u8a00\u3044\u305f\u3044\u3050\u3089\u3044\u3067\u3059\u3002\u4e0a\u8a18\u3057\u305f\u3088\u3046\u306b\u3001\u5b9f\u969b\u306b\u306f Git\u00a0\u306f\u30e6\u30fc\u30b6\u30fc\u306b\u4f55\u3082\u5909\u66f4\u3055\u305b\u305a\u3001\u305f\u3060\u65b0\u3057\u3044\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3060\u3051\u3067\u3059\u3002\u3067\u306f\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u4f55\u304c\u8d77\u3053\u308b\u306e\u3067\u3057\u3087\u3046\u304b\uff1fGit\u541b\u3001\u306a\u305c\u541b\u306f\u5909\u66f4\u3092\u4fdd\u5b58\u3057\u306a\u3044\u3093\u3060\u3044?!?<\/p>\n

\"\"<\/p>\n

Git \u306f\u5b9f\u969b\u306b\u306f\u5168\u3066\u306e<\/em>\u5909\u66f4\u3092\u7ba1\u7406\u3057\u3001reflog<\/a> \u5185\u306b\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059\u3002\u5168\u3066\u306e\u30b3\u30df\u30c3\u30c8\u304c\u4e00\u610f\u3067\u3042\u308a\u4e0d\u5909\u306a\u306e\u3067\u3001reflog \u304c\u3059\u3079\u304d\u3053\u3068\u306f\u3001\u305d\u308c\u3089\u3078\u306e\u53c2\u7167\u3092\u4fdd\u5b58\u3059\u308b\u3068\u3044\u3046\u3053\u3068\u3060\u3051\u3067\u3059\u300230\u65e5\u5f8c\u306b\u3001Git \u306f reflog \u304b\u3089\u30a8\u30f3\u30c8\u30ea\u30fc\u3092\u524a\u9664\u3057\u3001\u3088\u3046\u3084\u304f\u305d\u306e\u6642\u306b\u30ac\u30fc\u30d9\u30c3\u30b8\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u304c\u884c\u308f\u308c\u307e\u3059\u3002\u304a\u5206\u304b\u308a\u3067\u3057\u3087\u3046\u304b\u3001\u307e\u3060\u53c2\u7167\u3055\u308c\u3066\u3044\u308b\u3082\u306e\u3092 Git \u306f\u524a\u9664\u3057\u307e\u305b\u3093\u3002\u30d6\u30e9\u30f3\u30c1\u306f\u30b3\u30df\u30c3\u30c8\u3078\u306e\u53c2\u7167\u3092\u4fdd\u3064\u305f\u3081\u306b\u3082\u3063\u3068\u3082\u4fbf\u5229\u306a\u65b9\u6cd5\u3067\u3067\u3042\u308b\u3053\u3068\u306f\u660e\u3089\u304b\u3067\u3059\u3002\u3057\u304b\u3057\u3082\u3046\u4e00\u3064\u306e\u65b9\u6cd5\u3067\u3042\u308b reflog \u3067\u306f\u3001\u30e6\u30fc\u30b6\u30fc\u306f\u305d\u308c\u306b\u3064\u3044\u3066\u8003\u3048\u308b\u5fc5\u8981\u3059\u3089\u3042\u308a\u307e\u305b\u3093\uff01<\/p>\n

\u5bfe\u5fdc\u3059\u308b\u30b3\u30de\u30f3\u30c9 reflog \u306b\u3088\u308a\u3001\u3053\u306e\u5909\u66f4\u5c65\u6b74\u3092\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u305d\u308c\u306f\u3061\u3087\u3046\u3069\u00a0‘git log’\u00a0\u30b3\u30de\u30f3\u30c9\u3067\u901a\u5e38\u306e\u30b3\u30df\u30c3\u30c8\u306e\u5c65\u6b74\u3092\u898b\u308c\u308b\u306e\u3068\u540c\u3058\u3067\u3059\u3002\u3053\u306e\u3053\u3068\u306f\u3001\u5e38\u306b\u899a\u3048\u3066\u304a\u3044\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8<\/div>\n<\/td>\n
\n
&<\/span>gt; git reflog<\/span>
\n5adb986 HEAD@<\/span>{<\/span>0<\/span>}<\/span>: rebase: Use JSONObject instead of strings<\/span>
\n6a34803 HEAD@<\/span>{<\/span>1<\/span>}<\/span>: checkout: moving from finagle to 6a3480325f3beeecbafd351d30877694963a3f01^0<\/span>
\n74bd03e HEAD@<\/span>{<\/span>2<\/span>}<\/span>: commit: Use JSONObject instead of strings<\/span>
\n36c9142 HEAD@<\/span>{<\/span>3<\/span>}<\/span>: checkout: moving from 36c9142e81482f6c3eb8ad110642206a4ea3dfec to finagle
\n36c9142 HEAD@<\/span>{<\/span>4<\/span>}<\/span>: commit: Finagle and basic folder\/<\/span>json
\n1090fb7 HEAD@<\/span>{<\/span>5<\/span>}<\/span>: commit: Ignore Eclipse files
\nd6e3e63 HEAD@<\/span>{<\/span>6<\/span>}<\/span>: checkout: moving from master to d6e3e63889fd98e89e12e53a79bf96b53cbf9396^0<\/span><\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u5c65\u6b74\u306e\u518d\u4f5c\u6210<\/h2>\n

Mercurial\u00a0\u306b\u3064\u3044\u3066\u3001\u79c1\u304c\u3069\u3046\u3057\u3066\u3082\u597d\u304d\u306b\u306a\u308c\u306a\u304b\u3063\u305f\u306e\u306f\u3001\u30b3\u30df\u30c3\u30c8\u3092\u3055\u304b\u306e\u307c\u3063\u3066\u5fae\u4fee\u6b63\u3059\u308b\u306e\u304c\u3068\u3066\u3082\u96e3\u3057\u3044\u3068\u3044\u3046\u70b9\u3067\u3059\u3002\u300c\u306a\u305c\u305d\u308c\u304c\u3084\u308a\u305f\u3044\u3093\u3067\u3059\u304b\uff1f\u300d\u3068\u3042\u306a\u305f\u306f\u601d\u3046\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u304c\u591a\u304f\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u5f71\u97ff\u3092\u4e0e\u3048\u305f\u308a\u3001\u91cd\u5927\u306a\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306b\u95a2\u308f\u3063\u3066\u3044\u308b\u3088\u3046\u306a\u5834\u5408\u3001\u30b3\u30df\u30c3\u30c8\u304c\u5305\u62ec\u7684\u306a\u30b9\u30c8\u30fc\u30ea\u30fc\u3092\u8aac\u660e\u3057\u3066\u3044\u308b\u3068\u3001\u30ec\u30d3\u30e5\u30fc\u304c\u3068\u3066\u3082\u7c21\u5358\u306b\u306a\u308a\u307e\u3059\u3002 Git \u3067\u306f\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u4ee5\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u7de8\u96c6\u3059\u308b\u305f\u3081\u306b\u300c\u6642\u9593\u3092\u3055\u304b\u306e\u307c\u308b\u300d\u3053\u3068\u306f\u5bb9\u6613\u3067\u3059\u3002 \u7d50\u679c\u3068\u3057\u3066\u3001Git \u5185\u306e\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u306f\u3001\u5909\u66f4\u304c\u5b9f\u969b\u306b\u884c\u308f\u308c\u305f\u9806\u5e8f\u306b\u305d\u3063\u305f\u5fe0\u5b9f\u306a (\u3057\u304b\u3057\u30d0\u30e9\u30d0\u30e9\u306e) \u8a18\u9332\u3067\u306f\u306a\u304f\u3001\u6ce8\u610f\u6df1\u304f\u4f5c\u6210\u3055\u308c\u305f\u30b9\u30c8\u30fc\u30ea\u30fc\u306b\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n

Mercurial \u306b\u3082\u3001\u57fa\u672c\u7684\u306b\u306f\u305d\u308c\u3068\u540c\u3058\u4e8b\u3092\u884c\u3046\u62e1\u5f35\u6a5f\u80fd\u304c\u3042\u308a\u3001\u305d\u308c\u306f Mercurial Queues<\/a> \u3068\u547c\u3070\u308c\u3066\u3044\u307e\u3059\u3002Mercurial Queues \u3068\u306f\u3001\u5b9f\u969b\u306e\u30b3\u30df\u30c3\u30c8\u3092\u6700\u7d42\u7684\u306b\u6c7a\u5b9a\u3059\u308b\u524d\u306b\u518d\u30aa\u30fc\u30c0\u30fc\u3067\u304d\u308b\u3088\u3046\u306b\u3001\u30d7\u30ea\u30b3\u30df\u30c3\u30c8\u3092\u7a4d\u307f\u91cd\u306d\u308b\u65b9\u6cd5\u3067\u3059\u3002MQ \u306b\u306f\u7d30\u304b\u304f\u5206\u304b\u308c\u305f\u305f\u304f\u3055\u3093\u306e\u30b3\u30de\u30f3\u30c9\u00a0(SVN \u306b\u306f\u306a\u3044\u3082\u306e\uff01) \u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6<\/div>\n<\/td>\n
\n
hg qnew firstpatch
\nhg qrefresh
\nhg qdiff
\nhg qnew secondpatch
\nhg qrefresh
\nhg qcommit<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

Git \u306b\u304a\u3044\u3066\u306f\u3001\u901a\u5e38\u3069\u304a\u308a\u305f\u3060\u30b3\u30df\u30c3\u30c8\u3057\u3001\u4f55\u3092\u3059\u308b\u304b\u306f\u5f8c\u3067\u8003\u3048\u308c\u3070\u3044\u3044\u306e\u3067\u3059\u3002\u305d\u3057\u3066\u305d\u306e\u8003\u3048\u308b\u3068\u304d\u306b\u306a\u3063\u305f\u3089\u3001\u77e5\u308b\u3079\u304d\u3053\u3068\u306f\u672c\u5f53\u306b\u305f\u3063\u305f\u4e00\u3064\u3067\u3059\u3002\u305d\u308c\u304c\u3001\u30a4\u30f3\u30bf\u30e9\u30af\u30c6\u30a3\u30d6\u306a\u00a0rebase \u3067\u3059\u3002\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3048\u3070\u3001\u30c6\u30ad\u30b9\u30c8\u30a8\u30c7\u30a3\u30bf\u3092\u8d77\u52d5\u3057\u3001\u6e80\u8db3\u3059\u308b\u307e\u3067 Git \u306e\u5c65\u6b74\u3092\u5909\u66f4\u3067\u304d\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8
\n9
\n10
\n11
\n12
\n13
\n14
\n15
\n16
\n17
\n18
\n19
\n20
\n21
\n22<\/div>\n<\/td>\n
\n
&<\/span>gt; git rebase<\/span> –interactive<\/span> origin\/<\/span>master
\npick 94f56db Debug an error raised when importing view
\nsquash 772e7e8 Re-join comments using DELIM
\nreword a04f10e Error on filter branch – print line
\npick e09b0a2 Added troubleshooting for<\/span> msysgit + Cygwin
\nfixup 276c49a Added troubleshooting for<\/span> missing master_cc branch
\npick a2c08f6 Added exclude configuration
\npick 4c09e5e Ignore errors from _really_ long file<\/span> paths
\npick 9f38cf0 Actually, use fnmatch for<\/span> exclude# Rebase f698827..9f38cf0 onto f698827<\/span>
\n#<\/span>
\n# Commands:<\/span>
\n# p, pick = use commit<\/span>
\n# r, reword = use commit, but edit the commit message<\/span>
\n# e, edit = use commit, but stop for amending<\/span>
\n# s, squash = use commit, but meld into previous commit<\/span>
\n# f, fixup = like “squash”, but discard this commit’s log message<\/span>
\n# x, exec = run command (the rest of the line) using shell<\/span>
\n#<\/span>
\n# If you remove a line here THAT COMMIT WILL BE LOST.<\/span>
\n# However, if you remove everything, the rebase will be aborted.<\/span><\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

Mercurial \u306b\u3082\u307b\u307c\u540c\u7b49\u306e histedit<\/a> \u62e1\u5f35\u6a5f\u80fd\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u3053\u308c\u306f strip<\/a> \u3092\u7528\u3044\u3066\u901a\u5e38\u306e\u8ffd\u8a18\u5c02\u7528\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u66f4\u65b0\u3057\u3001\u5916\u90e8<\/em>\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30d5\u30a1\u30a4\u30eb\u3092\u306f\u304d\u3060\u3059\u3082\u306e\u3067\u3059\u3002\u3053\u306e\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u304b\u3089\u3069\u306e\u3088\u3046\u306b\u5909\u66f4\u3092\u7167\u4f1a\u3059\u308b\u306e\u304b\u306f\u7591\u554f\u3067\u3059\u3002\u3069\u306e\u304f\u3089\u3044\u306e\u671f\u9593\u3001\u305d\u308c\u3092\u3068\u3063\u3066\u304a\u304f\u3079\u304d\u3067\u3057\u3087\u3046\u304b\uff1f\u305d\u308c\u3092\u5fa9\u5143\u3059\u308b\u306e\u306b\u5b9f\u884c\u3059\u308b\u65b0\u3057\u3044\u30b3\u30de\u30f3\u30c9\u3082\u5fc5\u8981\u3067\u306f\u306a\u3044\u3067\u3057\u3087\u3046\u304b\uff1f<\/p>\n

Git \u306b\u8a71\u3092\u623b\u3057\u307e\u3059\u3002 reflog \u306e30\u65e5\u9593\u304c\u7d42\u4e86\u3057\u305f\u5f8c\u3001\u30b3\u30df\u30c3\u30c8\u3092\u5931\u3046\u3053\u3068\u304c\u5fc3\u914d\u3055\u308c\u307e\u3059\u3002Git \u306e1\u304b\u6708\u5f8c\u306e\u30ac\u30fc\u30d9\u30c3\u30b8\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u6b62\u3081\u308b\u65b9\u6cd5\u3055\u3048\u3042\u308c\u3070\u3088\u3044\u306e\u3067\u3059\u304c\u3002\u5c06\u6765\u3001\u53c2\u7167\u3059\u308b\u304b\u3082\u3057\u308c\u306a\u3044\u306e\u3067\u300c\u5ff5\u306e\u305f\u3081\u300d\u3068\u3044\u3046\u30e9\u30d9\u30eb\u3092\u4ed8\u3051\u308b\u65b9\u6cd5\u3055\u3048\u3042\u308c\u3070…<\/p>\n

\u30d6\u30e9\u30f3\u30c1\u306e\u3088\u3046\u306b\uff1f<\/p>\n

\u305d\u306e\u3068\u304a\u308a\u3067\u3059\uff01\u3053\u308c\u3089\u306e Git\u00a0\u306e\u300c\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u300d\u306f\u5358\u306a\u308b\u30b3\u30df\u30c3\u30c8\u306a\u306e\u3067\u3001\u30d6\u30e9\u30f3\u30c1\u304c\u7121\u304f\u3066\u3082 reflog \u306f\u4f7f\u3048\u307e\u3059\u3002\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u3069\u3046\u6271\u3046\u3079\u304d\u304b\u3092\u77e5\u308b\u305f\u3081\u306b\u3001\u307e\u305f\u5225\u306e\u30b3\u30de\u30f3\u30c9\u30bb\u30c3\u30c8\u3092\u899a\u3048\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n

\u300c\u3082\u306e\u3054\u3068\u306f\u3067\u304d\u308b\u3060\u3051\u30b7\u30f3\u30d7\u30eb\u306b\u3057\u3088\u3046\u3002\u305f\u3060\u3057\u3001\u30b7\u30f3\u30d7\u30eb\u306b\u3057\u3059\u304e\u306a\u3044\u3088\u3046\u306b\u300d<\/p>\n

Git \u3067\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210<\/h2>\n

Git \u306b\u304a\u3051\u308b\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210\u306f\u3001\u9577\u3044\u9593\u3001\u300c\u30ad\u30e9\u30fc\u6a5f\u80fd\u300d\u3067\u3057\u305f\u3002Mercurial \u3067\u3042\u308c\u3070\u3001\u5404\u30d6\u30e9\u30f3\u30c1\u3054\u3068\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30af\u30ed\u30fc\u30f3\u3059\u308b\u3053\u3068\u3092\u304d\u3063\u3068\u3059\u3059\u3081\u308b\u3067\u3057\u3087\u3046\uff08\u305d\u3057\u3066\u4eca\u3067\u3082\u3059\u3059\u3081\u3066\u3044\u307e\u3059<\/a>\uff09\u3002\u3067\u3082\u3061\u3087\u3063\u3068\u5f85\u3063\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u308c\u306f DVCS<\/p>\n

\u3067\u3042\u3063\u3066\u3001 SVN \u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3088\u306d\uff1f\u307e\u305f\u3001Mercurial \u306b\u306f\u5b9f\u969b\u306b\u300c\u30d6\u30e9\u30f3\u30c1\u300d\u30b3\u30de\u30f3\u30c9\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u3042\u308b\u30b3\u30df\u30c3\u30c8\u306b\u6c38\u4e45\u306b\u30e9\u30d9\u30eb\u4ed8\u3051\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3067\u3059\u3002\u4e00\u5ea6\u9069\u7528\u3055\u308c\u308b\u3068\u3001\u6700\u7d42\u7684\u306b\u30de\u30fc\u30b8\u3059\u308b\u304b\u30af\u30ed\u30fc\u30ba\u3059\u308b\u5834\u5408\u3092\u9664\u3044\u3066\u3001\u4fee\u6b63\u3059\u308b\u3053\u3068\u306f\u4e0d\u53ef\u80fd\u306b\u306a\u308a\u307e\u3059\u3002\u591a\u304f\u306e\u8981\u671b\u306b\u3088\u308a\u3001 Git \u30d6\u30e9\u30f3\u30c1\u3092\u76f4\u63a5\u7684\u306b\u307e\u306d\u305f\u3082\u306e\u3068\u3057\u3066\u3001\u3064\u3044\u306b\u30d6\u30c3\u30af\u30de\u30fc\u30af<\/a>\u62e1\u5f35\u6a5f\u80fd\u304c\u5c0e\u5165\u3055\u308c\u307e\u3057\u305f\u3002\u305f\u3060\u3001\u6700\u521d\u306f\u30d6\u30c3\u30af\u30de\u30fc\u30af\u3092\u30b5\u30fc\u30d0\u30fc\u306b\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u304c\u3002<\/p>\n

\u3057\u304b\u3057\u3001\u76f8\u5909\u308f\u3089\u305a Git \u306b\u306f\u3072\u3068\u3064\u5f37\u307f\u304c\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002Mercurial \u306e\u30d6\u30c3\u30af\u30de\u30fc\u30af\u306f\u4e00\u3064\u306e\u540d\u524d\u7a7a\u9593\u3092\u5171\u6709\u3057\u3066\u3057\u307e\u3046<\/a>\u306e\u3067\u3059\u3002\u3053\u308c\u304c\u4f55\u3092\u610f\u5473\u3059\u308b\u306e\u304b\u3092\u7406\u89e3\u3059\u308b\u305f\u3081\u306b\u3001\u8ab0\u304b\u304c\u3044\u304f\u3064\u304b\u306e\u5909\u66f4\u3092\u30b5\u30fc\u30d0\u30fc\u306b\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u3068\u3044\u3046\u3001\u3088\u304f\u3042\u308b\u30b7\u30ca\u30ea\u30aa\u3092\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8
\n9
\n10<\/div>\n<\/td>\n
\n
\n

&<\/span>gt; git fetch<\/span>
\nFrom bitbucket.org:atlassian\/<\/span>helloworld
\n*<\/span> [<\/span>new branch]<\/span> test<\/span> –&<\/span>gt; origin\/<\/span>test<\/span>
\n565ad9c..9e4b1b8 master –&<\/span>gt; origin\/<\/span>master<\/p>\n

&<\/span>gt; git log<\/span> –graph<\/span> –oneline<\/span> –decorate<\/span> –all<\/span>
\n*<\/span> 9e4b1b8 (<\/span>origin\/<\/span>master, origin\/<\/span>test<\/span>)<\/span> Remove unused variable
\n|<\/span> *<\/span> 565ad9c (<\/span>HEAD, master)<\/span> Added Hello example
\n|\/<\/span>
\n*<\/span> 46f0ac9 Initial commit<\/p>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u672c\u5f53\u306e\u30de\u30b9\u30bf\u30fc\u30d6\u30e9\u30f3\u30c1\u304c\u3069\u308c\u304b\u5206\u304b\u308a\u307e\u3059\u304b\uff1f\u3082\u3061\u308d\u3093\u3001\u3053\u308c\u306b\u4f55\u304b\u554f\u984c\u304c\u3042\u308b\u3068\u3044\u3046\u308f\u3051\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u305f\u307e\u305f\u307e<\/strong> ‘master’ \u3068\u3044\u3046\u540c\u3058\u540d\u524d\u3092\u6301\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u304c\u3075\u305f\u3064\u3042\u308b\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u30b5\u30fc\u30d0\u30fc\u306e\u540d\u524d\u7a7a\u9593 (\u3053\u306e\u5834\u5408\u3067\u306f\u5143\u306e\u65b9) \u3092\u898b\u308c\u3070\u3001\u3069\u3061\u3089\u304c\u3069\u3061\u3089\u3067\u3042\u308b\u306e\u304b\u304c\u308f\u304b\u308a\u307e\u3059\u3002<\/p>\n

Mercurial \u3067\u306f\u3069\u3046\u3067\u3057\u3087\u3046\uff1f<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8
\n9
\n10
\n11
\n12
\n13
\n14
\n15
\n16
\n17<\/div>\n<\/td>\n
\n
\n

&<\/span>gt; hg pull
\npulling from default
\nimporting bookmark test<\/span>
\ndivergent bookmark master stored as<\/span> master@<\/span>default<\/p>\n

&<\/span>gt; hg glog
\no changeset: 2<\/span>:98c63da09bb1
\n|<\/span> bookmark: master@<\/span>default
\n|<\/span> bookmark: test<\/span>
\n|<\/span> summary: Third commit
\n|<\/span>
\n|<\/span> o changeset: 1<\/span>:d9989a0da93e
\n|<\/span> |<\/span> bookmark: master
\n|<\/span> |<\/span> summary: Second commit
\n|\/<\/span>
\no changeset: 0<\/span>:2e92d3b3d020
\nsummary: First commit<\/p>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u30d7\u30eb\u3092\u884c\u3046\u3068\u3001\u81ea\u5206\u306e\u30de\u30b9\u30bf\u30fc\u3068\u885d\u7a81\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u304c\u3072\u3068\u3064\u3042\u308a\u3001\u885d\u7a81\u3057\u306a\u3044 ‘test’ \u30d6\u30e9\u30f3\u30c1\u304c\u3042\u308b\u3068\u308f\u304b\u308b\u3067\u3057\u3087\u3046\u3002 \u540d\u524d\u7a7a\u9593\u306e\u6982\u5ff5\u304c\u306a\u3044\u306e\u3067\u3001\u3069\u306e\u30d6\u30c3\u30af\u30de\u30fc\u30af\u304c\u30ed\u30fc\u30ab\u30eb\u3067\u3001\u3069\u308c\u304c\u30ea\u30e2\u30fc\u30c8\u306a\u306e\u304b\u3092\u77e5\u308b\u3059\u3079\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u305d\u3057\u3066\u305d\u308c\u3089\u3092\u306a\u3093\u3068\u547c\u3076\u306e\u304b\u306b\u3088\u3063\u3066\u306f\u3001\u307e\u305f\u885d\u7a81\u304c\u8d77\u304d\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093<\/em>\u3002<\/p>\n

\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0<\/h2>\n

\u3053\u308c\u306f Git \u306b\u3064\u3044\u3066\u597d\u304d\u5acc\u3044\u304c\u5225\u308c\u308b\u3082\u306e\u3067\u3059\u3002Git \u306b\u306f\u7d1b\u3089\u308f\u3057\u3044\u3053\u3068\u306b\u300c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u300d\u3068\u547c\u3070\u308c\u308b\u3001\u5947\u5999\u306a\u3082\u306e\u304c\u3042\u308a\u307e\u3059\u3002\u300c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u300d\u306e\u3053\u3068\u3092\u3001\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u9818\u57df\u3068\u547c\u3076\u4eba\u3082\u4e2d\u306b\u306f\u3044\u307e\u3059\u3002\u547c\u3073\u65b9\u306f\u306a\u3093\u3067\u3082\u3088\u3044\u306e\u3067\u3059\u304c\u3002<\/p>\n

Git \u5185\u3067\u30b3\u30df\u30c3\u30c8\u306b\u8ffd\u52a0\u3055\u308c\u308b\u3082\u306e\u306f\u5168\u3066\u3001\u6700\u521d\u306b\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u901a\u904e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3069\u306e\u3088\u3046\u306b\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8ffd\u52a0\u3067\u304d\u308b\u306e\u3067\u3057\u3087\u3046\u304b\uff1f’git add’ \u3092\u547c\u3073\u51fa\u3059\u3053\u3068\u306b\u3088\u3063\u3066\u3067\u3059\u3002\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u3092\u4f7f\u3046 SVN\u00a0\u30e6\u30fc\u30b6\u30fc\u306b\u3068\u3063\u3066\u3053\u308c\u306f\u7406\u306b\u304b\u306a\u3063\u305f\u3082\u306e\u3067\u3059\u304c\u3001\u3059\u3067\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u5bfe\u3057\u3066\u884c\u3046\u6642\u306f\u5c11\u3057\u6df7\u4e71\u3059\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u5fc3\u306b\u7559\u3081\u3066\u304a\u304f\u3079\u304d\u3053\u3068\u306f\u3001\u300c\u8ffd\u52a0\u300d\u3057\u3066\u3044\u308b\u306e\u306f\u5909\u66f4\u3067\u3042\u308a\u3001\u30d5\u30a1\u30a4\u30eb\u305d\u306e\u3082\u306e\u3067\u306f\u306a\u3044\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u3053\u308c\u306b\u3064\u3044\u3066\u826f\u3044\u3068\u601d\u3046\u306e\u306f\u3001\u6bce\u56de\u30b3\u30df\u30c3\u30c8\u3055\u308c\u308b\u3082\u306e\u304c\u4f55\u306a\u306e\u304b\u6b63\u78ba\u306b<\/strong>\u5206\u304b\u308b\u3068\u3044\u3046\u70b9\u3067\u3059\u3002<\/p>\n

\u3053\u308c\u3092\u8a73\u3057\u304f\u8aac\u660e\u3059\u308b\u305f\u3081\u306b\u3001\u79c1\u304c\u4ed6\u306e\u4f55\u3088\u308a\u3082\u591a\u304f\u4f7f\u7528\u3057\u3066\u3044\u308b\u30b3\u30de\u30f3\u30c9\u3092\u4f8b\u306b\u6319\u3052\u307e\u3057\u3087\u3046\u3002\u305d\u308c\u304c\u3001\u30d1\u30c3\u30c1\u3067\u3059\u3002\u30d1\u30c3\u30c1\u3092\u4f7f\u3046\u3053\u3068\u3067\u3001\u30aa\u30fc\u30eb\u30fb\u30aa\u30a2\u30fb\u30ca\u30c3\u30b7\u30f3\u30b0\u306e\u30a2\u30d7\u30ed\u30fc\u30c1\u3067\u306f\u306a\u304f\u3001\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u7279\u5b9a\u306e\u00a0hunk \u3084\u30b9\u30cb\u30da\u30c3\u30c8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8
\n9
\n10
\n11
\n12
\n13
\n14
\n15
\n16
\n17
\n18
\n19
\n20
\n21
\n22
\n23
\n24
\n25<\/div>\n<\/td>\n
\n
\n

&<\/span>gt; git add<\/span> –patch<\/span><\/p>\n

diff<\/span> –git<\/span> a\/<\/span>OddEven.java b\/<\/span>OddEven.java
\nindex 99c0659..911da1b 100644<\/span>
\n—<\/span> a\/<\/span>OddEven.java
\n+++ b\/<\/span>OddEven.java
\n@@<\/span> –32<\/span>,6<\/span> +32<\/span>,7<\/span> @@<\/span> public class OddEven {<\/span>
\n*<\/span> Object)<\/span> and initializes it by calling the constructor. The next line of code calls
\n*<\/span> the “showDialog()”<\/span> method, which<\/span> brings up a prompt to ask you for<\/span> a number
\n*\/<\/span>
\n+ System.out.println(<\/span>“Debug”<\/span>)<\/span>;
\nOddEven number = new OddEven(<\/span>)<\/span>;
\nnumber.showDialog(<\/span>)<\/span>;
\n}<\/span>
\nStage this hunk [<\/span>y,n,q,a,d,\/<\/span>,j,J,g,e,?]<\/span>? n
\n@@<\/span> –49<\/span>,7<\/span> +50<\/span>,7<\/span> @@<\/span> public class OddEven {<\/span>
\n*<\/span> After that, this method calls a second method, calculate(<\/span>)<\/span> that will
\n*<\/span> display either “Even”<\/span> or “Odd.”<\/span>
\n*\/<\/span>
\n– this.input = Integer.parseInt(<\/span>JOptionPane.showInputDialog(<\/span>“Please Enter A Number”<\/span>)<\/span>)<\/span>;
\n+ this.input = Integer.parseInt(<\/span>JOptionPane.showInputDialog(<\/span>“Please enter a number”<\/span>)<\/span>)<\/span>;
\nthis.calculate(<\/span>)<\/span>;
\n}<\/span> catch (<\/span>final NumberFormatException e)<\/span> {<\/span>
\n\/*<\/span>
\nStage this hunk [<\/span>y,n,q,a,d,\/<\/span>,K,g,e,?]<\/span>? y<\/p>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u30c7\u30d0\u30c3\u30b0\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u3092\u524a\u9664\u3057\u5fd8\u308c\u305f\u3053\u3068\u304c\u304a\u5206\u304b\u308a\u3067\u3057\u3087\u3046\u3002\u30b3\u30df\u30c3\u30c8\u3059\u308b\u524d\u306b\u30c1\u30a7\u30c3\u30af\u3059\u308b\u306e\u306f\u3044\u3044\u7fd2\u6163\u3067\u3059\u306d\uff01\u3053\u3053\u3067\u3046\u308c\u3057\u3044\u306e\u306f\u3001\u304a\u671b\u307f\u306a\u3089\u3001\u30c7\u30d0\u30c3\u30b0\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u3092\u305d\u306e\u307e\u307e\u306b\u3057\u3066\u304a\u3044\u3066\u3001\u5f8c\u304b\u3089\u00a0‘hunk’\u00a0\u3092\u53d7\u3051\u5165\u308c\u308b\u3053\u3068\u3082\u3067\u304d\u308b\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u3059\u3079\u3066\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u306b\u3042\u308b\u306e\u306b\u3001\u9593\u9055\u3044\u306b\u6c17\u4ed8\u3044\u305f\u5f8c\u3067\u518d\u7de8\u96c6\u3059\u308b\u5fc5\u8981\u306f\u306a\u3044\u306e\u3067\u3059\u3002<\/p>\n

\u5f53\u7136\u306a\u304c\u3089\u3001Mercurial \u306b\u3082\u3053\u306e\u632f\u308b\u821e\u3044\u3092\u6a21\u5023\u3057\u305f\u00a0Record \u62e1\u5f35\u6a5f\u80fd<\/a>\u304c\u3042\u308a\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u305d\u308c\u306f\u5358\u306a\u308b\u62e1\u5f35\u6a5f\u80fd\uff08\u3042\u308b\u3044\u306f\u5c11\u306a\u304f\u3068\u3082\u57fa\u672c\u7684\u306a\u3082\u306e\uff09\u3067\u3042\u308b\u306e\u3067\u3001\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u3092\u4e00\u6642\u7684\u306a\u5834\u6240\u306b\u30b3\u30d4\u30fc\u3057\u3001\u52d5\u4f5c\u3057\u3066\u3044\u308b\u30b9\u30c8\u30ec\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u3092\u66f4\u65b0\u3057\u3001\u30b3\u30df\u30c3\u30c8\u3057\u305f\u4e0a\u3067\u5909\u66f4\u3092\u5143\u306b\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u3082\u3057\u9593\u9055\u3048\u305f\u5834\u5408\u306f\u3001\u6700\u521d\u304b\u3089\u3084\u308a\u306a\u304a\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002Git\u00a0\u306e\u30a2\u30d7\u30ed\u30fc\u30c1\u306e\u7d20\u6674\u3089\u3057\u3044\u70b9\u306f\u3001\u57fa\u672c\u7684\u306a\u30ec\u30d9\u30eb\u306b\u304a\u3044\u3066\u3001Git \u304c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u53d6\u308a\u6271\u3046\u306e\u3067\u3001\u30d5\u30a1\u30a4\u30eb\u306b\u89e6\u308c\u308b\u5fc5\u8981\u304c\u306a\u3044\u3068\u3044\u3046\u70b9\u3067\u3059\u3002\u5909\u66f4\u3092\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3057\u305f\u5f8c\u3001status \u3092\u5b9f\u884c\u3059\u308b\u6642\u306b\u3001\u5148\u306b\u9032\u3081\u308b\u524d\u306b\u5168\u3066\u6b63\u3057\u3044\u304b\u3069\u3046\u304b\u3092\u30c0\u30d6\u30eb\u30c1\u30a7\u30c3\u30af\u3067\u304d\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8
\n9
\n10
\n11
\n12
\n13
\n14<\/div>\n<\/td>\n
\n
\n

&<\/span>gt; git status<\/span><\/p>\n

# On branch master<\/span>
\n# Changes to be committed:<\/span>
\n# (use “git reset HEAD …” to unstage)<\/span>
\n#<\/span>
\n# modified: OddEven.java<\/span>
\n#<\/span>
\n# Changes not staged for commit:<\/span>
\n# (use “git add …” to update what will be committed)<\/span>
\n# (use “git checkout — …” to discard changes in working directory)<\/span>
\n#<\/span>
\n# modified: OddEven.java<\/span>
\n#<\/span><\/p>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u3092\u30c6\u30b9\u30c8\u3059\u308b\u3053\u3068\u304c\u5fc3\u914d\u306a\u4eba\u306e\u305f\u3081\u306b\u3001\u30b3\u30df\u30c3\u30c8\u3055\u308c\u306a\u3044\u3082\u306e\u3092\u5168\u3066\u4e00\u6642\u7684\u306b\u30a2\u30fc\u30ab\u30a4\u30d6\u3059\u308b ‘git stash -keep- index’ \u304c\u3042\u308a\u307e\u3059\u3002\u4f59\u8ac7\u3067\u3059\u304c\u3001\u3053\u306e stash \u306f\u3001\u5f53\u7136\u306a\u304c\u3089\u4ed6\u306e\u30b3\u30df\u30c3\u30c8\u3068\u307e\u3063\u305f\u304f\u540c\u3058\u3088\u3046\u306b\u683c\u7d0d\u3055\u308c\u3001\u524d\u8ff0\u306e reflog \u306b\u3088\u3063\u3066\u898b\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n

\n\n\n\n
\n
1
\n2<\/div>\n<\/td>\n
\n
&<\/span>gt; git reflog<\/span> –all<\/span>
\nb7004ea refs\/<\/span>stash@<\/span>{<\/span>0<\/span>}<\/span>: WIP on master: 46f0ac9 Initial commit<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u8cac\u4efb\u306e\u306a\u3059\u308a\u5408\u3044 (blame \u3054\u3063\u3053)<\/h2>\n

Git \u306b\u3064\u3044\u3066\u9762\u767d\u3044\u306e\u306f\u3001\u5b9f\u969b\u306b\u540d\u524d\u306e\u5909\u66f4\u3092\u8ffd\u8de1\u3057\u3066\u3044\u306a\u3044\u3068\u3044\u3046\u3053\u3068\u3067\u3059\u3002\u3053\u308c\u306f\u4e00\u90e8<\/a>\u306e\u4eba\u305f\u3061<\/a>\u306b\u3068\u3063\u3066\u61f8\u5ff5\u306e\u6750\u6599\u306b\u306a\u308a\u307e\u3059\u304c\u3001Git \u306f\u300c\u6b63\u3057\u3044\u3053\u3068\u300d\u2122\u3092\u884c\u306a\u3063\u3066\u3044\u308b\u3068\u79c1\u306f\u601d\u3044\u307e\u3059\u3002\u3067\u306f\u3068\u3082\u304b\u304f<\/a>\u3001\u540d\u524d\u5909\u66f4\u3068\u306f\u4f55\u306a\u306e\u3067\u3057\u3087\u3046\uff1f\u305f\u3060\u3001\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240\u304b\u3089\u5225\u306e\u5834\u6240\u3078\u79fb\u52d5\u3055\u305b\u3066\u3044\u308b\u3060\u3051\u3067\u3059\u3002\u3057\u304b\u3057\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u4e00\u90e8\u3060\u3051<\/em>\u3092\u79fb\u52d5\u3055\u305b\u305f\u3089\u4f55\u304c\u8d77\u3053\u308b\u3067\u3057\u3087\u3046\u304b\uff1fGit blame \u306f\u4fbf\u5229\u306a\u30b3\u30de\u30f3\u30c9\u3067\u3001\u901a\u5e38\u306f\u30d5\u30a1\u30a4\u30eb\u306e\u5404\u884c\u306b\u6700\u5f8c\u306b\u89e6\u308c\u305f\u30b3\u30df\u30c3\u30c8\u3092\u8868\u793a\u3057\u307e\u3059\u3002 \u9b54\u6cd5\u306e ‘-C’ \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u7528\u3044\u308b\u3053\u3068\u306b\u3088\u308a\u3001\u30d5\u30a1\u30a4\u30eb\u3092\u307e\u305f\u3044\u3067<\/em>\u79fb\u52d5\u3057\u305f\u884c\u3092\u691c\u51fa\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002\uff08\u3053\u306e\u5834\u5408\u306e ‘-s’ \u306f\u3001\u65e5\u4ed8\u3084\u4f5c\u8005\u3068\u3044\u3063\u305f\u30ce\u30a4\u30ba\u3092\u96a0\u3059\u305f\u3081\u306b\u4f7f\u3063\u3066\u3044\u307e\u3059\u3002\uff09<\/p>\n

\n\n\n\n
\n
1
\n2
\n3
\n4
\n5
\n6
\n7
\n8
\n9
\n10
\n11<\/div>\n<\/td>\n
\n
\n

&<\/span>gt; git blame<\/span> -s<\/span> -C<\/span> OddEven.java<\/p>\n

d46f0ac9 OddEven.java public void run(<\/span>)<\/span> {<\/span>
\nd46f0ac9 OddEven.java OddEven number = new OddEven(<\/span>)<\/span>;
\nd46f0ac9 OddEven.java number.showDialog(<\/span>)<\/span>;
\nd46f0ac9 OddEven.java }<\/span>
\nd46f0ac9 OddEven.java
\n565ad9cd Hello.java public static void main(<\/span>final String[<\/span>]<\/span> args)<\/span> {<\/span>
\n565ad9cd Hello.java new Hello(<\/span>)<\/span>;
\n565ad9cd Hello.java }<\/span>
\nd46f0ac9 OddEven.java }<\/span><\/p>\n<\/div>\n<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<\/div>\n

\u5168\u3066\u306e\u884c\u304c\u3053\u306e\u4e00\u3064\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u7531\u6765\u3057\u3066\u3044\u308b\u308f\u3051\u3067\u306f\u306a\u3044\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u60aa\u3044\u30e4\u30c4\u3068\u540c\u7b49\u306e\u62e1\u5f35\u6a5f\u80fd\u306f\u3001Mercurial \u306b\u306f\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n

\u307e\u3068\u3081<\/h2>\n

Git\u3092\u4f7f\u3046\u3068\u3044\u3046\u3053\u3068\u306f\u3001\u300c\u4f55\u304b\u3092\u3057\u3066\u304a\u304f\u3079\u304d\u3060\u300d\u3068\u8a00\u3046\u5fc5\u8981\u304c\u306a\u3044\u3068\u3044\u3046\u3053\u3068\u3067\u3059<\/a>\u3002\u3057\u304b\u3057\u3001Mercurial \u3092\u4f7f\u3046\u5834\u5408\u306b\u306f\u3001\u5168\u304f\u540c\u3058\u3053\u3068\u8a00\u3063\u305f\u3053\u3068\u304c\u4f55\u5ea6\u304b\u3042\u308a\u307e\u3059\u3002\u30b3\u30df\u30c3\u30c8\u306e\u30ea\u30d9\u30fc\u30b9\u3084\u4fee\u6b63\u3092\u3057\u305f\u304f\u306a\u3063\u305f\u3068\u304d\u3001\u3042\u308b\u3044\u306f\u30b7\u30f3\u30b0\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30d6\u30e9\u30f3\u30c1\uff08\u5225\u540d\u30d6\u30c3\u30af\u30de\u30fc\u30af\uff09\u3092\u4f7f\u7528\u3057\u305f\u304f\u306a\u3063\u305f\u3068\u304d\uff08\u3053\u3046\u3057\u305f\u3053\u3068\u306f\u3001\u6bce\u65e5\u884c\u306a\u3063\u3066\u3044\u308b\u306e\u3067\u3059\u304c\uff09\u306b\u306f\u3001Mercurial \u3092\u5feb\u9069\u306b\u4f7f\u3048\u306a\u304f\u306a\u3063\u3066\u3057\u307e\u3044\u307e\u3059\u3002 \u8ffd\u8a18\u5c02\u7528\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306f\u3001\u610f\u56f3\u7684\u306b\u3053\u306e\u632f\u308b\u821e\u3044\u3092\u8003\u616e\u306b\u5165\u308c\u305a\u306b\u8a2d\u8a08\u3055\u308c\u3066\u3044\u307e\u3059\u3002\uff08GitHub\u00a0\u306e\uff09Scott Chacon \u306f Mercurial \u304c\u307e\u308b\u3067 “Git Lite<\/a>” \u306e\u3088\u3046\u3060\u3068\u8a00\u3044\u307e\u3057\u305f\u304c\u3001\u79c1\u3082\u540c\u3058\u3088\u3046\u306b\u601d\u3044\u307e\u3059\u3002<\/p>\n

Git\u00a0\u306f\u5b8c\u74a7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u304b\u3057\u3001\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304c\u7d20\u6674\u3089\u3057\u3044\u3068\u3044\u3046\u3053\u3068\u3088\u308a\u3082\u3001\u3082\u3063\u3068\u5927\u4e8b\u306a\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u3082\u3061\u308d\u3093\u3001Git \u304c\u3082\u3046\u5c11\u3057\u826f\u304f\u3067\u304d\u3066\u3044\u3066\u3001\u4e0d\u53ef\u89e3\u306a\u30a8\u30e9\u30fc\u304c\u5c11\u306a\u304f\u3001Windows \u4e0a\u3067\u3082\u3063\u3068\u901f\u304f\u52d5\u4f5c\u3057\u305f\u308a\u3059\u308c\u3070\u3001\u305d\u308c\u306f\u3044\u3044\u3053\u3068\u3060\u3068\u601d\u3044\u307e\u3059\u3002\u3057\u304b\u3057\u3001\u7d50\u5c40\u306e\u3068\u3053\u308d\u3001\u3053\u308c\u3089\u306f\u305f\u3060\u8868\u9762\u4e0a\u306e\u3053\u3068\u306b\u3059\u304e\u307e\u305b\u3093\u3002\u3082\u3057\u597d\u304d\u3067\u306f\u306a\u3044\u30b3\u30de\u30f3\u30c9\u304c\u3042\u308c\u3070\u3001\u3069\u3046\u305e\u30a8\u30a4\u30ea\u30a2\u30b9\u3092\u66f8\u3044\u3066\u304f\u3060\u3055\u3044\u3002Windows \u4e0a\u3067\u306e\u4f7f\u7528\u3092\u3084\u3081\u3066\u304f\u3060\u3055\u3044\uff08\u5197\u8ac7\u3067\u3059\uff09\u3002\u30ea\u30dd\u30b8\u30c8\u30ea\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306f\u3001DVCS \u30c4\u30fc\u30eb\u306b\u3088\u3063\u3066\u53ef\u80fd\u306b\u306a\u308b\u3053\u3068\u3092\u3001\u4eca\u3082\u5c06\u6765\u3082\u63a8\u9032\u3057\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n

Git \u3068 Mercurial \u306e\u30c1\u30fc\u30c8\u30b7\u30fc\u30c8<\/h2>\n

\u3053\u306e\u8a18\u4e8b\u3068\u3001Git \u306b\u5bfe\u3059\u308b Mercurial \u306e\u512a\u4f4d\u6027<\/a>\u3092\u8aac\u660e\u3057\u305f\u524d\u56de\u306e\u8a18\u4e8b\u306b\u3088\u308a\u3001\u4e21\u30b7\u30b9\u30c6\u30e0\u306e\u9577\u6240\u3001\u77ed\u6240\u304c\u660e\u3089\u304b\u306b\u306a\u308c\u3070\u3044\u3044\u306a\u3068\u601d\u3063\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u30b7\u30ea\u30fc\u30ba<\/a>\u306e\u6b21\u306e\u8a18\u4e8b\u306f\u3001\u96c6\u4e2d\u578b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0 Subversion \u304b\u3089 Git \u3042\u308b\u3044\u306f Mercurial \u3078\u79fb\u884c\u3059\u308b\u30e6\u30fc\u30b6\u30fc\u5411\u3051\u306e “\u30c1\u30fc\u30c8\u30b7\u30fc\u30c8” \u3092\u63d0\u4f9b\u3059\u308b\u4e88\u5b9a\u3067\u3059\u3002<\/p>\n

\uff08\u67fb\u8aad\uff1a\u30b0\u30ed\u30fc\u30b9\u30a8\u30af\u30b9\u30d1\u30fc\u30c8\u30ca\u30fc\u30ba\u682a\u5f0f\u4f1a\u793e<\/a>\u3000\u548c\u667a\u53f3\u6842\uff09<\/p>\n

*\u672c\u30d6\u30ed\u30b0\u306f Atlassian Blogs \u3092\u7ffb\u8a33\u3057\u305f\u3082\u306e\u3067\u3059\u3002\u672c\u6587\u4e2d\u306e\u65e5\u6642\u306a\u3069\u306f\u6295\u7a3f\u5f53\u6642\u306e\u3082\u306e\u3067\u3059\u306e\u3067\u3054\u4e86\u627f\u304f\u3060\u3055\u3044\u3002
\n*\u539f\u6587 : 2012 \u5e74 3 \u6708 13 \u65e5\u6295\u7a3f \"Git vs Mercurial: Why Git?<\/a>\"<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"

\u3053\u308c\u306f Atlassian DVCS \u30ac\u30a4\u30c9 \u00bb \u306e\u4e00\u8a18\u4e8b\u3067\u3059\u3002 \u4eca\u56de\u306f Atlassian \u306e\u958b\u767a\u8005\u3067\u3042\u308b Charles O’Farrell \u306b\u3088\u308b\u30b2\u30b9\u30c8\u30d6\u30ed\u30b0\u3067\u3059…<\/p>\n","protected":false},"author":9,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"bitbucket_subtitle":"","footnotes":""},"categories":[1],"tags":[554,86,87,88,89,90,91,92,93],"coauthors":[],"class_list":["post-316","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-bitbucket","tag-dvcs","tag-fisheye","tag-hg","tag-mercurial","tag-subversion","tag-svn","tag-switch_dvcs","tag-93"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/316","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/users\/9"}],"replies":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/comments?post=316"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/316\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=316"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=316"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=316"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=316"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}