git ready - restoring lost commits
So, you just executed git reset --hard HEAD^ and discarded your last commit. But now you realize you really needed those changes. Don’t panic—Git likely still has your commit. When you reset, the discarded commit enters a “dangling†state, remaining in Git’s datastore until garbage collection runs. As long as you haven’t run git gc since the reset, you should be able to recover your lost commit. S
Package Maintenance Guide
This page provides some basic instructions for day-to-day usage of the git-based package maintenance system for Fedora. It is intended primarily for new and current Fedora package maintainers, but does briefly cover anonymous read-only use of the system. It is not a guide to RPM packaging per se. Some pre-existing knowledge of git may be useful, but is not a pre-requisite. In fact, Fedora packagin
vflare: Linux kernel workflow with Git
You worked on some part of Linux kernel. It works great. Now, how to generate the patch series and send it out for review? For this, I always used to generate diffs, create a set of draft mails (one for each patch) in KMail or Thunderbird, and send all these mails one-by-one. This workflow quickly became a big headache. Then I learned Git (and some related tools) to do all this from command line a
Linuxカーãƒãƒ«é–‹ç™ºã«ãŠã‘ã‚‹git使用方法 - Linuxã¨ã‹
git, Linux, Kernel最近gitãŒè©±é¡Œã‚‰ã—ã„。カーãƒãƒ«é–‹ç™ºã«ãŠã‘る個人的ãªä½¿ç”¨æ–¹æ³•ã®ãƒ¡ãƒ¢ã€‚ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæ§‹æˆ mainline/ +-- linux-2.6/ gitレãƒã‚¸ãƒˆãƒªç½®ãå ´ +-- workdir/ 作æ¥ç”¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª +-- / ツリー毎ã«ãƒ–ランãƒã‚’ãã£ã¦ä½œæ¥ gitインストールã„ã¾ã©ãã®ãƒ‡ã‚£ã‚¹ãƒˆãƒªãƒ“ューションã ã¨ã€gitã®ãƒ‘ッケージãŒã‚ã‚‹ã®ã§ã€ãれを導入ã™ã‚‹ã®ãŒç°¡å˜ã€‚ãŸã ã—ã€git-new-workdirã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’使ã„ãŸã„ã®ã§ã€ã©ã“ã‹ã‚‰ã‹ã‚‚ã£ã¦ãã‚‹å¿…è¦ãŒã‚る。gitã®contrib/workdirディレクトリé…下ã«å˜åœ¨ã™ã‚‹ã€‚ソースã‹ã‚‰ã‚³ãƒ³ãƒ‘イルã—ãªã„å ´åˆã§ã‚‚ã€ã‚½ãƒ¼ã‚¹ãƒ‘ッケージを展開ã—ã¦ãƒ‘スã®é€šã£ãŸå ´æ‰€ã«é…置。レãƒã‚¸ãƒˆãƒªã®åˆæœŸåŒ–ã¨ã‚«ãƒ¼ãƒãƒ«ã‚½ãƒ¼ã‚¹å…¥æ‰‹gitレãƒã‚¸ãƒˆãƒªã‚’åˆæœŸåŒ–ã™ã‚‹ã€‚gitレãƒã‚¸ãƒˆãƒªã¯linux-2.6é…下ã«ç½®ãã“ã¨ã«ã™ã‚‹ã€‚ [linux-2.6]$
Git Cheat Sheets JP
è¨å®š 基本 ブランムリモート・リãƒã‚¸ãƒˆãƒª git-stash git-svn å‚考 ä¿®æ£å±¥æ´ è¨å®š Git ã«ã¯æ§˜ã€…ãªã‚ªãƒ—ションè¨å®šãŒã‚る。ä¸ã«ã¯æŒ™å‹•ã‚’大ãã変ãˆã‚‹ã‚‚ã®ã‚‚ã‚ã‚‹ã®ã§æ³¨æ„ãŒå¿…è¦ã§ã‚る。 è¨å®šã‚’ã™ã¹ã¦è¡¨ç¤ºã™ã‚‹ $ git config --list システム(/etc/gitconfig) ã®è¨å®š $ git config --system --list ã‚„ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã”㨠(~/.gitconfig) ã®è¨å®š $ git config --global --list ãªã©è¡¨ç¤ºã™ã‚‹å¯¾è±¡ã‚’絞るã“ã¨ã‚‚ã§ãる。 ユーザåã¨ãƒ¡ãƒ¼ãƒ«ãƒ»ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’è¨å®šã™ã‚‹ $ git config --global user.name "John Doe" $ git config --global user.email "[email protected]" コミットã™ã‚‹æ™‚ã«è¨˜éŒ²ã•ã‚Œã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¨ãƒ¡
Re: [git pull] drm-next
On Sun, 29 Mar 2009, Dave Airlie wrote: > > My plans from now on are just to send you non-linear trees, whenever I > merge a patch into my next tree thats when it stays in there, I'll pull > Eric's tree directly into my tree and then I'll send the results, I > thought we cared about a clean merge history but as I said without some > document in the kernel tree I've up until now had no real idea wh
Gitを使ã„ã“ãªã™ãŸã‚ã®20ã®ã‚³ãƒžãƒ³ãƒ‰ | OSDN Magazine
Linuxカーãƒãƒ«ã‚„Ruby on Railsã€Perlãªã©ã€è¿‘年多ãã®å¤§è¦æ¨¡ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§æŽ¡ç”¨ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ãŒã€ŒGitã€ã 。Gitã«ã¯éžå¸¸ã«å¤šæ•°ã®ã‚³ãƒžãƒ³ãƒ‰ãŒç”¨æ„ã•ã‚Œã¦ã„ã‚‹ãŒã€æ—¥å¸¸çš„ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã¯20個程度ã¨è¨€ã‚ã‚Œã¦ã„る。本記事ã§ã¯ã€Gitを使ã„ã“ãªã™ãŸã‚ã«è¦šãˆã‚‹ã¹ã20個ã®Git基本コマンドを紹介ã™ã‚‹ã€‚ Linuxカーãƒãƒ«ã‚„Ruby on Railsã€Perlãªã©ã€è¿‘年多ãã®å¤§è¦æ¨¡ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§æŽ¡ç”¨ã•ã‚Œã¦ã„ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ãŒã€ŒGitã€ã 。Gitã«ã¯éžå¸¸ã«å¤šæ•°ã®ã‚³ãƒžãƒ³ãƒ‰ãŒç”¨æ„ã•ã‚Œã¦ã„ã‚‹ãŒã€æ—¥å¸¸çš„ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã¯20個程度ã¨è¨€ã‚ã‚Œã¦ã„る。本記事ã§ã¯ã€Gitを使ã„ã“ãªã™ãŸã‚ã«è¦šãˆã‚‹ã¹ã20個ã®Git基本コマンドを紹介ã™ã‚‹ã€‚ ãªãŠã€Gitã®åŸºæœ¬çš„ãªè€ƒãˆæ–¹ã‚„使ã„æ–¹ã«ã¤ã„ã¦ã¯åˆ†æ•£ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ Git入門ã§ã‚‚紹介ã—ã¦ã„ã‚‹ã®ã§ã€ãã¡ã‚‰ã‚‚å‚ç…§ã—ã¦ã»ã—ã„。
2008-09-28 - 未æ¥ã®ã„ã¤ã‹/hyoshiokã®æ—¥è¨˜
http://www.jipdec.or.jp/procon/workshop/ 日時：平æˆ20å¹´10月1日（水）11:00〜16:15 å ´æ‰€ï¼šANAインターコンãƒãƒãƒ³ã‚¿ãƒ«ãƒ›ãƒ†ãƒ«æ±äº¬ã€€åœ°ä¸‹1階「グãƒãƒ¼ãƒªãƒ¼ã€ å‚åŠ è²»ï¼šç„¡æ–™ å‚åŠ ç”³ã—è¾¼ã¿ï¼šhttp://www.jipdec.or.jp/procon/workshop/kojin.html 講演： 「ゲームã¨äººç”Ÿã¨ãƒ—ãƒã‚°ãƒ©ãƒ ã€æ ªå¼ä¼šç¤¾ãƒ“サイド　å—治　一徳 æ°ã€‚「ã©ã“ã§ã‚‚ã„ã£ã—ょã€ã‚’作ã£ãŸäºº プãƒã‚°ãƒ©ãƒ 言語「Rubyã€é–‹ç™ºè€…ã¾ã¤ã‚‚㨠ゆãã²ã‚æ°ã«ã‚ˆã‚‹ãƒ•ãƒªãƒ¼ãƒˆãƒ¼ã‚¯ 「プãƒã‚³ãƒ³å¯©æŸ»å§”員・入é¸è€…ã¨ã®ãƒ•ãƒªãƒ¼ãƒ‡ã‚£ã‚¹ã‚«ãƒƒã‚·ãƒ§ãƒ³ã€ ã‚ãŸã—もフリーディスカッションã«å‡ºã¾ã™ã€‚プãƒã‚³ãƒ³å…¥è³žè€…ã®çš†ã•ã‚“ã¨ãŠè©±ã‚’ã™ã‚‹ã€‚ã„ã‚ã‚“ãªã“ã¨ã‚’èžããŸã„ãªã‚。ã„ã‚ã„ã‚ãªã“ã¨ã‚’語りãŸã„ãªã‚。 å¦ç”Ÿã®çš†ã•ã‚“ã¸ã®ãŠé¡˜ã„：上記ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’å‹äººçŸ¥äººã¸ãŠã—らã›ã—ã¦ãã ã•ã„。ãã—ã¦å¯èƒ½ãªã‚‰å‚åŠ ã—ã¦ã
git-pullã€git-pull --rebaseã‚’ã‚ãる冒険＋コンフリクトã—ãŸå ´åˆã®ä½œæ¥ - satoko's blog - s21g
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 git-pullã§ç§ãªã‚Šã®è§£é‡ˆã§ ahaï¼ãŒæ¥ãŸã®ã§ãƒ¡ãƒ¢ã—ã¾ã™ã€‚ ã“ã‚Œã‹ã‚‰ã¯ git-pull --rebaseã«ã—よー 下記をãã®ã¾ã¾ã¨ã„ã†æ„Ÿã˜ãªã®ã§ã™ãŒï½— http://www8.atwiki.jp/git_jp/pub/Documentation.ja/user-manual.html#using-git-rebase ãã†ã„ãˆã°ãƒˆãƒƒãƒã•ã‚“ãŒè¨€ã£ã¦ãŸï¼šgit-pull --rebaseを使ã†ã¨ã„ã„よ git-pullよりgit-pull --rebaseを使ã†ã¨ã„ã„よ(ãŸã ã—ã¨ã„ã†æ³¨æ„(下記太å—)ãŒã‚ã‚‹ã®ã§ãã®è¾ºã¯æ³¨æ„。ã»ã¨ã‚“ã©ã®äººã¯é–¢ä¿‚ãªã„ã¨æ€ã†ã‚“ã ã‘ã©ã€‚。。) Here's a tip for keeping up
ã›ã£ã‹ã¡ãªäººã®ãŸã‚ã® git 入門 - git をインストールã—ã€å…±åŒã§é–‹ç™ºã§ãる環境を整ãˆã‚‹ã¾ã§ - 僕ã¯ç™ºå±•é€”上技術者
subversion ã«ä»£ã‚ã‚‹æ–°ã—ã„ソース管ç†ã‚·ã‚¹ãƒ†ãƒ ã¨ã„ã†ã“ã¨ã§ git ãŒæ³¨ç›®ã•ã‚Œã¦ã„るよã†ã 。 » Git - Fast Version Control System subversion ã¨å¤§ããé•ã†ã¨ã“ã‚ã¯ã€åˆ†æ•£ã•ã‚ŒãŸãƒ¬ãƒã‚¸ãƒˆãƒªãŒãƒãƒ¼ã‚«ãƒ«ãƒžã‚·ãƒ³ã«ç½®ã‹ã‚Œã¦ã„る点。ã“ã‚Œã¯ã€ãƒãƒƒãƒˆã«ã¤ãªãŒã£ã¦ã„ãªãã¦ã‚‚ソースをコミットã§ãã‚‹ã¨ã„ã†ã“ã¨ã§ã€æœ€è¿‘ã¯é›»è»Šã®ãªã‹ã§ã‚‚コードを書ã„ãŸã‚Šã™ã‚‹åƒ•ã«ã¯ã†ã£ã¦ã¤ã‘。 マニュアルやãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«ã¯å……実ã—ã¦ã„ã‚‹ã®ã ãŒã€åƒ•ã¯ã¨ã‚Šã‚ãˆãšæœ€åˆã«ãƒ„ールを触ã£ã¦ã¿ã¦ã€ã–ã£ã¨å…¨ä½“åƒã‚’ã¤ã‹ã¿ã€ãã‚Œã‹ã‚‰ç´°éƒ¨ã‚’調ã¹ãŸã„質ãªã®ã§ã€ã‚‚ã£ã¨ã¦ã£ã¨ã‚Šæ—©ã体験ã§ãるガイドを探ã—ãŸã¨ã“ã‚ã€ã‚ã¾ã‚Šé©åˆ‡ãªã‚‚ã®ãŒè¦‹ã¤ã‹ã‚‰ãªã‹ã£ãŸã€‚ ãã“ã§ã€ãƒ¬ãƒã‚¸ãƒˆãƒªã‚’作りã€ãれをリモートã«ã‚るサーãƒãƒ¼ã«ç½®ã„ãŸã‚ã¨ã€subversion ã§è¨€ãˆã° svn commit ã‚„ svn update ãªã©ã«ã‚ãŸã‚‹ã‚³ãƒžãƒ³
1
リリースã€éšœå®³æƒ…å ±ãªã©ã®ã‚µãƒ¼ãƒ“スã®ãŠçŸ¥ã‚‰ã›
最新ã®äººæ°—エントリーã®é…ä¿¡
j次ã®ãƒ–ックマーク
kå‰ã®ãƒ–ックマーク
lã‚ã¨ã§èªã‚€
eコメント一覧を開ã
oページを開ã
DVCSAnalysis - support - Analysis of Git and Mercurial - Google Code
Rebasing and merging: some git best practices [LWN.net]
BiwaSlide
http://video.google.com/videoplay?docid=1251251453592758541
{{#tags}}- {{label}}
{{/tags}}