Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
gitã®å¦ç¿ä¸ã®ã¡ã¢ã§ããééããªã©ããã¾ãããããææããã ããã¨ãããããã§ãã ãã° ãã°ã®è¡¨ç¤ºã«ãã¼ã¸ã£ã使ããªã $ GIT_PAGER= git log $ hg log ã°ã©ããã°ã表示ãã $ git log --graph $ hg glog ãã°ã«ãã©ã³ãåã表示ãã $ git log --graph --all --color --pretty=format:'%h %cn %s%Cred%d%Creset' $ git log --oneline --decorate $ hg log ãã©ã³ããæå®ãã¦ãã°ã表示 $ git log ãã©ã³ãå $ hg log -b ãã©ã³ãå ãã°ã«å¤æ´ããããã¡ã¤ã«åã表示ãã $ git log --name-only $ hg log -v diff diffã®ã¿ãå¹ ã4ã«ãã $ git config --globa
Mercurial | 15:54å¾ããç¥æ§ãªãã¸ããªä½ãæã«ã§ããªãã¨å°ããã§ä¸èª¿ã¹ã ããhttp://www.selenic.com/mercurial/wiki/index.cgi/MergingUnrelatedRepositoriesãã hg clone REPO1 work # First pull from both repos... cd work hg pull -f REPO2 hg merge # Then simply merge. hg commit pullã«-fãªãã·ã§ã³ã¤ãããããã ãã£ã¦ã¿ããaã¨bããã£ã¦aã«bãåãè¾¼ã¿ããæã¯aã®ãã£ã¬ã¯ããªã«è¡ãã hg pull -f b hg merge hg commit ã§mergeæåãããæãã æ¬æ ¼çã«ä½¿ãæã¯tips and tricsèªã¿è¾¼ãå¿ è¦ãããhttp://www.selenic.com
åå[@kana1ãã](http://twitter.com/kana1)ã«ãã[ãgitã§ã¢ã¬ããã¨ã«æ»ã108ã®æ¹æ³ã](/tech/git-undo-999)ã大åé¿ã§ä¸éã¯ãã¯ãgit使ããå¤ãã®ãã¨åèªèãã¾ããã ç§ãæ®æ®µã¯gitã使ã£ã¦ãã¾ããããä»äºã§ã¯Mercurialãä»äºã§ä½¿ã£ã¦ããã®ã§ã®ã£ãã£ã¦æ¸ãé£ãã¦ã¿ã¾ãããã ### åé¡1: ã©ã¤ãã©ãªã®æ°æ©è½ã試ãããã«ããããé©å½ãªã³ã¼ããæ¸ãã¦ããã¤ãã³ããããããã§ããããããªã ãã¦åã£ã±ãªããè¡ãè©°ã¾ãããã§ããåºæ¬çã«Mercurialã¯ãã³ããããç©ã¿éãããã®ãå¾ããç·¨éããããã¨ã«å¼±ãã®ã§ãã MQã使ã£ã¦è§£æ±ºãã¦ã¿ã¾ãããã $ hg update -r {revision} $ hg qimport -r {revision+1}:tip $ hg qpop âall $ hg qseries |
ãªãªã¼ã¹ãé害æ å ±ãªã©ã®ãµã¼ãã¹ã®ãç¥ãã
ææ°ã®äººæ°ã¨ã³ããªã¼ã®é ä¿¡
å¦çãå®è¡ä¸ã§ã
j次ã®ããã¯ãã¼ã¯
kåã®ããã¯ãã¼ã¯
lãã¨ã§èªã
eã³ã¡ã³ãä¸è¦§ãéã
oãã¼ã¸ãéã
{{#tags}}- {{label}}
{{/tags}}