[B! git] sotarokã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

sotarok id:sotarok

gitã«é–¢ã™ã‚‹sotarokã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (92)

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

${{author_name}}$
{{author_name}}{{created}}
{{ #comment }}{{ comment }}{{ /comment }}
- {{ label }}

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

Gitã®ã‚³ãƒŸãƒƒãƒˆãƒãƒƒã‚·ãƒ¥å€¤ã¯ä½•ã‚’å…ƒã«ã©ã†ã‚„ã£ã¦ç”Ÿæˆã•ã‚Œã¦ã„ã‚‹ã®ã‹ | ãƒ¡ãƒ«ã‚«ãƒªã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ãƒªãƒ³ã‚°
ã“ã‚“ã«ã¡ã¯ã€‚ã‚µãƒ¼ãƒã‚µã‚¤ãƒ‰ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã® @DQNEO ã§ã™ã€‚ å‰å›žã®ã€ŒGitã®ã¤ãã‚Šã‹ãŸã€ã«ç¶šã„ã¦Gitã®ã‚³ã‚¢ãªéƒ¨åˆ†ã®ãŠè©±ã§ã™ã€‚ Gitã®ã‚³ãƒŸãƒƒãƒˆãƒãƒƒã‚·ãƒ¥å€¤ã¨ã¯ä½•ã‹ Gitã‚’ä½¿ã£ã¦ã„ã‚‹ã¨å¿…ãšã‚³ãƒŸãƒƒãƒˆãƒãƒƒã‚·ãƒ¥å€¤ã¨ã„ã†ã‚‚ã®ãŒå‡ºã¦ãã¾ã™ã€‚9e47c22ã¿ãŸã„ãªã‚¢ãƒ¬ã§ã™ã€‚ ã“ã‚Œã¯ã‚ã‚‹ç‰¹å®šã®ã‚³ãƒŸãƒƒãƒˆã‚’æŒ‡ã—ç¤ºã™IDã¨ã—ã¦ä½¿ã†ã“ã¨ãŒã§ãã¾ã™ã€‚ ã§ã¯è³ªå•ã§ã™ã€‚ ã“ã®ã‚³ãƒŸãƒƒãƒˆãƒãƒƒã‚·ãƒ¥å€¤ã¯ã€Œä½•ã‚’å…ƒã«ã€ã€Œã©ã†ã‚„ã£ã¦ã€è¨ˆç®—ã•ã‚Œã¦ã„ã‚‹ã§ã—ã‚‡ã†ã‹ï¼Ÿ ã€Œã‚ã‚‹ç‰¹å®šã®ã‚³ãƒŸãƒƒãƒˆã€ã¨ã¯ãã‚‚ãã‚‚ä½•ãªã®ã‹ ã“ã®å•é¡Œã‚’è€ƒãˆã‚‹å‰ã«ã€ã¾ãšã€Œã‚³ãƒŸãƒƒãƒˆã¨ã¯ä½•ã‹ã€ã‚’æ˜Žã‚‰ã‹ã«ã—ã¦ãŠãã¾ã—ã‚‡ã†ã€‚ ã‚³ãƒŸãƒƒãƒˆã¨ã„ã†ã¨ã€Œã‚³ãƒŸãƒƒãƒˆã™ã‚‹è¡Œç‚ºã€ã™ãªã‚ã¡ã€Œå‹•ä½œã€ã®ã“ã¨ã‚’æƒ³åƒã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚ ã—ã‹ã—Gitã®å†…éƒ¨æ§‹é€ çš„è¦³ç‚¹ã‹ã‚‰è¨€ã†ã¨ã€GitãŒç®¡ç†è¨˜éŒ²ã—ã¦ã„ã‚‹ã®ã¯ã‚³ãƒŸãƒƒãƒˆè¡Œç‚ºã®çµæžœç”Ÿæˆã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ã®æ–¹ã§ã™ã€‚ ã“ã®ã€Œã‚³ãƒŸãƒƒãƒˆã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ã€ã®ã“ã¨ã‚’ã€Œã‚³ãƒŸãƒƒ
sotarok 2016/02/09
Gitæ·±æŽ˜ã‚Šã‚·ãƒªãƒ¼ã‚º (æ¬¡ã¯ tree ã«ã¤ã„ã¦æœŸå¾…)

git

mercari
ãƒªãƒ³ã‚¯
Git Large File Storage
An open source Git extension for versioning large files Git Large File Storage (LFS) replaces large files such as audio samples, videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server like GitHub.com or GitHub Enterprise. Getting Started Download and install the Git command line extension. Once downloaded and installed, set up Git LFS for y
sotarok 2015/04/09
git

git-lfs
ãƒªãƒ³ã‚¯
Introduction - Gogs: A painless self-hosted Git service
Vision The Gogs project aims to build a simple, stable and extensible self-hosted Git service that can be set up in the most painless way. With Go, this can be done with an independent binary distribution across all platforms that Go supports, including Linux, macOS, Windows and ARM-based systems. Core values Simple to install: Run the binary, or run as a Docker container. Cross-platform: Runs on
sotarok 2015/03/25
ä»Šæ›´çŸ¥ã£ãŸã€‚å¤šåˆ†ä½¿ã‚ãªã„ã‘ã©ãªã‚“ã‹ã™ã”ã„ã€‚

go

git
ãƒªãƒ³ã‚¯
Gitlet
Gitlet is an implemention of Git in JavaScript. Over the last six years, I've become better at using Git for version control. But my conceptions of the index, the working copy, the object graph and remotes have just grown fuzzier. Sometimes, I can only understand something by implementing it. So, I wrote Gitlet, my own version of Git. I pored over tutorials. I read articles about internals. I trie
sotarok 2015/01/23
git

javascript
ãƒªãƒ³ã‚¯
GitHubã§ã®â€Merge pull requestâ€ã®å¼Šå®³ | POSTD
ç§ã¯ GitHub ãŒå¤§å¥½ãã§ã™ã€‚GitHubã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ã¸ã® ã‚³ãƒ³ãƒˆãƒªãƒ“ãƒ¥ãƒ¼ã‚·ãƒ§ãƒ³ ï¼ˆå¯„ä¸Žè²¢çŒ®ï¼‰ã‚’ä½•åå€ã‚‚å®¹æ˜“ã«ã€ãã—ã¦æ¥½ã—ã„ã‚‚ã®ã«ã—ãŸã¨æ€ã„ã¾ã™ã€‚ã§ã™ãŒã€GitHubãŒPull Requestã¨ã„ã†webã®UIå½¢å¼ã§å‰é¢ã«æŠ¼ã—å‡ºã—ã¦ã„ã‚‹ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ã® ãƒ¡ãƒ³ãƒ†ãƒŠãƒ¼ ã®ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ãŒã€ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆå“è³ªã¨ã‚³ãƒ³ãƒˆãƒªãƒ“ãƒ¥ãƒ¼ã‚·ãƒ§ãƒ³ã‚’å—ã‘ã¤ã‘ã‚‹ã‚¹ãƒ”ãƒ¼ãƒ‰ã®å¼Šå®³ã«ãªã‚‹ã¨ã„ã†ã“ã¨ã«æ°—ãŒã¤ãã¾ã—ãŸã€‚ãã“ã§ã€GitHubã® Pull Request ã«ã‚ã‚‹ã€ŒMerge pull requestã€ãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹å‰ã«ã€å°‘ã—ãŠè©±ã‚’ã•ã›ã¦ãã ã•ã„ã€‚ ãƒ¡ãƒ³ãƒ†ãƒŠãƒ¼ã®ç´¹ä»‹ ã‚¸ã‚§ãƒ¼ãƒ³ã¯ãã“ãã“ã®æˆåŠŸã‚’åŽã‚ã¦ã„ã‚‹ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒ¡ãƒ³ãƒ†ãƒŠãƒ¼ã§ã™ã€‚å½¼å¥³ã¯æ¯Žé€±ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®GitHubãƒªãƒã‚¸ãƒˆãƒªã«ä¸ŠãŒã‚‹æ–°ã—ã„ Issue ã‚’ç¢ºèªã—ã€ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å¯¾ã—é€Ÿã‚„ã‹ã«ãƒ•ã‚£ãƒ¼ãƒ‰ãƒãƒƒã‚¯ã‚’è¿”ã—ã¾ã™ã€‚ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ã™ã¹ã¦å®Ÿè¡Œã™ã‚‹æ™‚
sotarok 2014/07/10
ã‚“ãƒ¼ãªã‚‹ã»ã©ã€ã‚ˆãç†è§£ã§ãã‚‹ã€‚ä¸€æ–¹ã§ã€ãƒ„ãƒ¼ãƒ«ã®å¤‰å®¹ã«ã‚ˆã£ã¦åƒãæ–¹ã¯å¤‰ã‚ã£ã¦ãã‚‹ã ã‚ã†ã¨ã‚‚æ€ã†ã€‚ã€Œæ£ã—ã„ã‘ã©æ‰‹é–“ãŒã‹ã‹ã‚‹æ–¹ã€ã«ã¯äººã¯æµã‚Œãªã„ã‹ã‚‰ã€‚(ã¤ã¾ã‚ŠGitHubã®WebUIä¸Šã§ã“ã‚ŒãŒæº€ãŸã›ã‚Œã°)

git

github
ãƒªãƒ³ã‚¯
Git Rich Quick: The Development Process for the iOS Version of LINE Â« LINE Engineers' Blog
[æ—¥æœ¬èªžãƒãƒ¼ã‚¸ãƒ§ãƒ³] Hi there. My name is Hayaishi, and Iâ€™m part of the Techno logy Strategy Department here at LINE. Iâ€™d like to share a few details about the development process of the iOS version of the LINE app in this blog entry. The Development Environment for the iOS LINE App Managing the Source Code We manage our source code with Git. We also use GitHub Enterprise as our Git repository browser wh
sotarok 2014/04/22
git

ios

development
ãƒªãƒ³ã‚¯
ãƒ†ã‚¹ãƒˆãƒ•ã‚¡ãƒ¼ã‚¹ãƒˆãªGitãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã«ã¤ã„ã¦ - kazuhoã®ãƒ¡ãƒ¢ç½®ãå ´
Gitã®ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã«é–¢ã™ã‚‹è©±é¡ŒãŒã€ã¾ãŸç››ã‚Šä¸ŠãŒã£ã¦ã„ã‚‹ã‚ˆã†ãªã®ã§ã€åƒ•ãŒå¥½ã‚“ã§ä½¿ã£ã¦ã„ã‚‹ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã«ã¤ã„ã¦æ›¸ãã¾ã™ã€‚ å¯¾è±¡ã¨ã—ã¦ã„ã‚‹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ã€GitHubã‚„GitHub Enterpriseç‰ã‚’ä½¿ã£ã¦é–‹ç™ºã•ã‚Œã¦ã„ã‚‹ã€ãƒªãƒªãƒ¼ã‚¹ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã‚‰ãšã«masterã«ãƒªãƒªãƒ¼ã‚¹ã‚¿ã‚°ã‚’æ‰“ã£ã¦ã„ãã ã‘ã§ååˆ†ãªç¨‹åº¦ã®ã€ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹ï¼ˆã®éƒ¨å“ï¼‰ã‚„ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã™ã€‚ ã¾ãšã€ä»¥ä¸‹ã®ï¼’ç‚¹ã‚’åŽŸå‰‡ã¨ã—ã¦è€ƒãˆã¦ã„ã¾ã™ã€‚ origin masterã‚’å£Šã•ãªã„ origin masterã®ï¼ˆ1st parentã‚’ãŸã©ã‚‹ãƒ„ãƒªãƒ¼ï¼‰ã«ãƒ†ã‚¹ãƒˆã‚’é€šã‚‰ãªã„commitã‚’å…¥ã‚Œãªã„ã‚ˆã†åŠªã‚ã¾ã™ å¤‰æ›´ã®ä¸»é¡Œã‚’å¸¸ã«æ˜Žç¢ºã«ã™ã‚‹ å‰è€…ã®ç†ç”±ã¯ã€masterã‚’ã„ã¤ã§ã‚‚ãƒªãƒªãƒ¼ã‚¹å¯èƒ½ãªå“è³ªã«ä¿ã¤ãŸã‚ã¨(â†12:44è¿½è¨˜)git bisectã™ã‚‹ã¨ãã«å›°ã‚‰ãªã„ã‚ˆã†ã«ã™ã‚‹ãŸã‚ã€‚ãã—ã¦ã€ã“ã‚Œã‚‰ã®åŽŸå‰‡ã‹ã‚‰ã€ä»¥ä¸‹ã®ã‚ˆã†ãªãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã§ä½œæ¥ã™ã‚‹ã“
sotarok 2014/02/05
git
ãƒªãƒ³ã‚¯
git-flowã§ã‚‚github flowã§ã‚‚ãªã„ã€Gitæœ¬å®¶æŽ¨å¥¨ã®ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼
ã“ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã¯Â git.gitÂ (è¨³æ³¨: Git ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®gitãƒªãƒã‚¸ãƒˆãƒª) ãã‚Œè‡ªèº«ã§ä½¿ã‚ã‚Œã¦ã„ã‚‹ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã®è¦ç´ ã‚’æ›¸ãã¨ã‚ã€ ãã‚Œã‚’ä½¿ã„ãŸã„ã¨æ€ã‚ã›ã‚‹ã“ã¨ã‚’æ„å›³ã—ã¦ã„ã¾ã™ã€‚ å¤šãã®ã‚¢ã‚¤ãƒ‡ã‚¢ãŒä¸€èˆ¬ã«é©ç”¨ã§ãã¾ã™ãŒã€ ã‚ˆã‚Šå°‘äººæ•°ãŒå‚åŠ ã™ã‚‹å°ã•ãªãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ å®Œå…¨ãªãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã‚’å¿…è¦ã¨ã™ã‚‹ã®ã¯ç¨€ã§ã™ã€‚ ç§ãŸã¡ã¯ã‚¯ã‚¤ãƒƒã‚¯ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã®ãŸã‚ã«ã²ã¨ã¾ã¨ã¾ã‚Šã®Â ãƒ«ãƒ¼ãƒ«Â ã‚’ã¨ã‚Šã¾ã¨ã‚ã€ æ–‡ç« ã§ãã‚Œãžã‚Œã®ãƒ«ãƒ¼ãƒ«ã¸ã®å‹•æ©Ÿã‚’ä¸Žãˆã¾ã™ã€‚ è¨€è‘‰é€šã‚Šã«ã¨ã‚‰ãªã„ã‚ˆã†ã«ã—ã¦ãã ã•ã„; é‡è¦–ã™ã¹ããªã®ã¯ã€ã“ã®æ–‡æ›¸ã®ã‚ˆã†ãªmanãƒšãƒ¼ã‚¸ã®è¨˜è¿°ã‚ˆã‚Šã‚‚ ã‚ãªãŸãŒãã†ã™ã¹ãç†ç”±ã®æ–¹ã§ã™ã€‚
sotarok 2014/02/03
git
ãƒªãƒ³ã‚¯
Git ã® diff ã‚’ç¾Žã—ãè¡¨ç¤ºã™ã‚‹ãŸã‚ã«å¿…è¦ãªãŸã£ãŸ 1 ã¤ã®è¨å®š #git - è©©ã¨å‰µä½œãƒ»æ€ç´¢ã®ã²ã‚ã°
Git ã«åŒæ¢±ã•ã‚Œã¦ã„ã‚‹ contrib/diff-highlight ã‚’ä½¿ã„ã¾ã™ã€‚ ã‚ã¨ã¯ README ã«æ›¸ã„ã¦ã‚ã‚‹ã“ã¨ã®å¼•ãå†™ã—ã§ã™ãŒã€PATH ã®é€šã£ãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ç½®ã„ã¦ã€~/.gitconfig ã«ä»¥ä¸‹ã®ã‚ˆã†ã«è¨å®šã‚’æ›¸ãã€‚ [pager] log = diff-highlight | less show = diff-highlight | less diff = diff-highlight | less ã™ã‚‹ã¨ã€å¯¾å¿œã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã®å‡ºåŠ›ãŒã“ã‚“ãªé¢¨ã«ãªã‚Šã¾ã™ã€‚ è¡Œãƒ¬ãƒ™ãƒ«ã® diff ã«åŠ ãˆã¦ã€å˜èªžãƒ¬ãƒ™ãƒ«ã§ã® diff ã‚‚ãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚Œã€GitHub ã§ã® diff ã®ã‚ˆã†ã«æç”»ã•ã‚Œã¾ã—ãŸã€‚ çµ„ã¿è¾¼ã¿ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ --color-words ã¨ã„ã†ã®ãŒã‚ã‚Šã¾ã™ãŒã€ã“ã¡ã‚‰ã‚’ä½¿ã†ã¨è¡Œãƒ¬ãƒ™ãƒ«ã® diff æƒ…å ±ãŒå¤±ã‚ã‚Œã‚‹ã®ã§ã€å°‘ã—ä¸ä¾¿ã ã£ãŸã‚ã‘ã§ã™ãã€‚ã¨ã™ã¹ã¦ README ã«æ›¸ã„ã¦ã‚
sotarok 2013/12/09
ã¹ã‚“ã‚Šã ã£ãŸ

git
ãƒªãƒ³ã‚¯
GitHub ã§ Pull Request ã‚’ Merge ã—ãŸã‚‰ã‚³ãƒ¼ãƒ‰ãŒæ¶ˆãˆãŸè©±
ä¼šç¤¾ã§ä½¿ã£ã¦ã‚‹ GitHub ã®ãƒ—ãƒ©ã‚¤ãƒ™ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã§ master ãƒ–ãƒ©ãƒ³ãƒã«å¯¾ã—ã¦å‡ºã¦ã‚‹ Pull Request ã‚’ Merge ã—ãŸã‚‰ã‚³ãƒ¼ãƒ‰ãŒæ¶ˆãˆã‚‹ã¨ã„ã†çäº‹ãŒã‚ã£ãŸã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã™ã‚‹ commit ã¨ã‹ãªã„ã«ã‚‚ã‹ã‹ã‚ã‚‰ãšã€å…¨æ¶ˆã—ã•ã‚Œã¦ã—ã¾ã£ãŸã€‚ã¡ãªã¿ã«åŒã˜ Merge ã‚’æ‰‹ã‚‚ã¨ã§ã‚„ã‚‹ã¨ã‚³ãƒ¼ãƒ‰ãŒæ¶ˆãˆãŸã‚Šã¯ã›ãšã¡ã‚ƒã‚“ã¨ Merge ã•ã‚ŒãŸã€‚æ¥µã‚ã¦è¬Žãªç¾è±¡ã ã£ãŸã€‚ master ãƒ–ãƒ©ãƒ³ãƒãŒç©ºã«ãªã‚‹ã¨ãƒ‡ãƒ—ãƒã‚¤ãŒã§ããªããªã£ã¦ä¸éƒ½åˆãŒã‚ã‚‹ã®ã§ï¼ˆ Webistrano ä¸Šã§ãƒ‡ãƒ—ãƒã‚¤ã™ã‚‹ã¨ã master ãƒ–ãƒ©ãƒ³ãƒã‹ã‚‰ã—ã‹ãƒ‡ãƒ—ãƒã‚¤ã§ããªã„ã‚ˆã†ãªãƒ¬ã‚·ãƒ”ã«ãªã£ã¦ã‚‹ï¼‰ã€ã‚³ãƒ¼ãƒ‰ãŒæ¶ˆæ»…ã—ãŸãƒ–ãƒ©ãƒ³ãƒã‚’ bukkowaremaster ã«ãƒªãƒãƒ¼ãƒ ã—ã¦æ‰‹ã‚‚ã¨ã§ Merge ã—ãŸãƒ–ãƒ©ãƒ³ãƒã‚’ force push ã—ã¦ã—ã®ã„ã ã€‚ GitHub ã«å•ã„åˆã‚ã›ã¦ã¿ãŸã¨ã“ã‚ã€ã¬ã‚‹ã„æ„Ÿã˜ã®ä¸€æ¬¡è¿”ä¿¡ãŒæ¥ãŸã®ã§åŽŸå› æ•™ãˆã¦
sotarok 2013/12/09
git

github
ãƒªãƒ³ã‚¯
pull request ã‚’åˆ©ç”¨ã—ãŸé–‹ç™ºãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼
pull request ã‚’åˆ©ç”¨ã—ãŸé–‹ç™ºãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã®è©±ã—ã§ã™ãŒã€ã‚ã‚“ã¾ã‚Šãƒ—ãƒ«ãƒªã®è©±ã—ã—ã¦ãªã„ã—ã€ã‚³ãƒ¼ãƒ‰ãƒ¬ãƒ“ãƒ¥ãƒ¼çš„ãªãŠè©±ã—ãŒå¤šã„ã§ã™â€¦ã€‚
sotarok 2013/10/04
git

github

development
ãƒªãƒ³ã‚¯
git rebaseã‚’ä½¿ã†ã¨ãã®ãƒ«ãƒ¼ãƒ« | Yakst
Re: [git pull] drm-next Linus Torvalds Sun, 29 Mar 2009 14:48:18 -0700 (è¨³æ³¨ : Daveã®rebaseã®ã‚„ã‚Šæ–¹ãŒå¥½ã¿ã§ãªã„ã¨ã„ã†Linusã«å¯¾ã—ã¦) > 2009å¹´5æœˆ29æ—¥(æ—¥æ›œæ—¥) Dave Airlieã®ç™ºè¨€ > > ä»Šã‹ã‚‰è‡ªåˆ†ãŒã—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹ã®ã¯ã€ç›´ç·šã˜ã‚ƒãªã„ãƒ„ãƒªãƒ¼ã‚’é€ã‚ã†ã¨ã—ã¦ã„ã‚‹ã ã‘ã ã€‚ > ãƒ‘ãƒƒãƒã‚’è‡ªåˆ†ã®æ¬¡ã®ãƒ„ãƒªãƒ¼ã«ãƒžãƒ¼ã‚¸ã™ã‚‹æ™‚ã¯ã„ã¤ã§ã‚‚ã€ãã“ã«ãã‚ŒãŒã‚ã‚‹ã‹ã‚‰ã ã€‚ > è‡ªåˆ†ã¯ã€Ericã®ãƒ„ãƒªãƒ¼ã‚’è‡ªåˆ†ã®ãƒ„ãƒªãƒ¼ã«ç›´æŽ¥ãƒ—ãƒ«ã—ã¦ã€ãã®çµæžœã‚’é€ã‚ã†ã¨ã—ã¦ã„ã‚‹ã€‚ > ãã‚Œã„ãªãƒžãƒ¼ã‚¸å±¥æ´ã«ã¤ã„ã¦æ³¨æ„ã—ã¦ã„ã‚‹ã¨ã¯æ€ã£ã¦ã„ã‚‹ã‘ã©ã€å‰ã«è¨€ã£ãŸã‚ˆã†ã«ã€ > ã‚«ãƒ¼ãƒãƒ«ãƒ„ãƒªãƒ¼ã«é–¢ã—ã¦ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãŒä½•ã‚‚ãªã„çŠ¶æ…‹ã§ã¯ã€å›ãŒã©ã†ã—ãŸã„ã®ã‹ > æœ¬å½“ã®ã¨ã“ã‚ã¯ä»Šã®ä»Šã¾ã§åˆ†ã‹ã‚‰ãªã„ã‚ˆã€‚ è‡ªåˆ†ãŒæ±‚ã‚ã¦ã„ã‚‹ã®ã¯ã€ãã‚Œã„ãªå±¥æ´ã ã€‚ã§ã‚‚ã€ãã‚Œ
sotarok 2013/08/06
git
ãƒªãƒ³ã‚¯
Git ã«ãƒ‘ãƒƒãƒã‚’é€ã£ã¦å–ã‚Šè¾¼ã¾ã‚ŒãŸè©±
Git ã®æŒ™å‹•ã«å¤‰ãªã¨ã“ã‚ã‚’è¦‹ã¤ã‘ãŸã®ã§ã€ãƒ‘ãƒƒãƒã‚’ä½œã£ã¦ Git ã®ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆã«æŠ•ã’ã¦ã¿ãŸã¨ã“ã‚ã€ä½•åº¦ã‹ã®ãƒ¬ãƒ“ãƒ¥ãƒ¼ã‚’çµŒã¦ã€ç„¡äº‹ã«å–ã‚Šè¾¼ã¾ã‚ŒãŸã€‚ Git ã«è²¢çŒ®ã—ãŸã„äººã¨ã‹ã€ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹é–‹ç™ºã®æµã‚Œã«èˆˆå‘³ãŒã‚ã‚‹äººã‚‚ã„ã‚‹ã ã‚ã†ã‹ã‚‰ã€ä½œæ¥ã®æµã‚Œã‚’æ›¸ã„ã¦ãŠãã“ã¨ã«ã™ã‚‹ã€‚ 1. ãƒã‚°ã‚’ç™ºè¦‹ã™ã‚‹ ä½•ã¯ã¨ã‚‚ã‚ã‚Œã€ä¿®æ£ã—ãŸã„ã¨ã“ã‚ã‚’è¦‹ã¤ã‘ã‚‹ã¨ã“ã‚ã‹ã‚‰ã€‚ å…ˆæ—¥ã€git difftool --dir-diff ãŒä¾¿åˆ©ã™ãŽã¦æ³£ããã†ã§ã™ ã¨ã„ã†è¨˜äº‹ã‚’æ›¸ã„ãŸãŒã€difftool --dir-diff ã®æŒ™å‹•ã‚’èª¿ã¹ã¦ã„ã‚‹ã†ã¡ã«ã€ä¸€æ™‚ãƒ•ã‚¡ã‚¤ãƒ«æ›¸ãæˆ»ã—æ¡ä»¶ãŒå¤‰ãªã“ã¨ã«æ°—ã¥ã„ãŸã€‚ æ‰‹å…ƒã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå¤ã„ã®ã‹ã¨ã‚‚æ€ã£ãŸãŒã€master ãƒ–ãƒ©ãƒ³ãƒã§ã‚‚å†ç¾ã—ãŸã®ã§ã€ã¡ã‚‡ã£ãã‚‰æ·±å…¥ã‚Šã—ã¦ã¿ãŸã€‚git difftool ã¯ Perl ã‚¹ã‚¯ãƒªãƒ—ãƒˆã ã£ãŸã®ã§ã€ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã« print ã‚’è¿½åŠ ã—ã¤ã¤æŒ™å‹•ã‚’æŽ¢ã£ã¦ã„ã£ãŸã€‚ã—ã°ã‚‰ãèª¿
sotarok 2013/07/24
oss

git
ãƒªãƒ³ã‚¯
Learn Git Branching
A interactive Git visualization tool to educate and challenge!
sotarok 2013/03/18
git
ãƒªãƒ³ã‚¯
Gitã¨Jenkinsã‚’ä½¿ã£ã¦Chefã‚’é‹ç”¨ã™ã‚‹ - GeekFactory
Chefã¯ãƒªãƒã‚¸ãƒˆãƒªã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã™ã‚‹ä»•çµ„ã¿ã‚’æŒã£ã¦ã„ã¾ã™ãŒã€ãƒãƒ¼ãƒ ã§ã®å”èª¿ä½œæ¥ã‚’è€ƒãˆã‚‹ã¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã‚’ä½¿ã†æ–¹ãŒé‹ç”¨ã—ã‚„ã™ã„ã¨è€ƒãˆã¾ã™ã€‚æœ¬ç¨¿ã§ã¯ã€Gitã¨Jenkinsã‚’ä½¿ã£ã¦Chefã‚’é‹ç”¨ã™ã‚‹ãŸã‚ã®1ã¤ã®ãƒ‘ã‚¿ãƒ¼ãƒ³ã‚’è€ƒãˆã¾ã™ã€‚ ä»¥ä¸‹ãŒã‚ã‚‹ã“ã¨ã‚’å‰æã¨ã—ã¾ã™ã€‚ Chef Server Chef Client Gitãƒªãƒã‚¸ãƒˆãƒª Jenkins åŸºæœ¬çš„ãªè€ƒãˆæ–¹ Cookbookã‚’Gitãƒªãƒã‚¸ãƒˆãƒªã§ç®¡ç†ã—ã¾ã™ã€‚é–‹ç™ºè€…ãŒgit pushã™ã‚‹ã¨åŒæ™‚ã«Chef Serverã®CookbookãŒæ›´æ–°ã•ã‚Œã‚‹ã‚ˆã†ã«ã—ã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€Gitãƒªãƒã‚¸ãƒˆãƒªã¨Chef ServerãŒåŒæœŸã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ ã¾ãŸã€å¾Œç¶šã‚¸ãƒ§ãƒ–ã¨ã—ã¦å„ã‚µãƒ¼ãƒã§Chef ClientãŒå®Ÿè¡Œã•ã‚Œã‚‹ã‚ˆã†ã«ã—ã¾ã™ã€‚ãƒ“ãƒ«ãƒ‰ãƒ‘ã‚¤ãƒ—ãƒ©ã‚¤ãƒ³ã‚’çµ„ã‚€ã“ã¨ã§ã€Staging Environmentã«ãŠã‘ã‚‹Chef Clientã€Producti
sotarok 2013/03/02
git

chef

jenkins
ãƒªãƒ³ã‚¯
Wrangling Git
This is a combination of all the slides of the various versions of this talk that I've given over the years. It presents a lot of the more intermediateâ€¦
sotarok 2013/02/06
git
ãƒªãƒ³ã‚¯
GTE Git branching model | Geisha Tokyo Engineers' Blog
Engineer blog from Geisha Tokyo Entertainment, Inc. ã“ã‚“ã«ã¡ã¯ã€ã‚¢ãƒ—ãƒªé–‹ç™ºãƒ—ãƒã‚°ãƒ©ãƒž ryoco ã¨ç”³ã—ã¾ã™ã€‚ æœ€è¿‘ git é–‹ç™ºã«ã—ã¦æ—ã£ãŸã¨ã„ã†ã‚¹ãƒ©ã‚¤ãƒ‰ã‚’èªã¿ã¾ã—ã¦ã€å®Ÿã¯çš†ã€ä»–ç¤¾ã® git ã®ä½¿ã„ã‹ãŸã«èˆˆå‘³ãŒã‚ã‚‹ã®ã§ã¯ã¨æ€ã„æ›¸ã„ã¦ã¿ã¾ã—ãŸã€‚ ã¾ãã€ä»–ç¤¾ã®é–‹ç™ºã‚¹ã‚¿ã‚¤ãƒ«ã¨ã„ã†ã®ã¯çš†çŸ¥ã‚ŠãŸã„æ‰€ã§ã™ã‚ˆã! ã¨ã„ã†è¨³ã§ã€å¼Šç¤¾ã®ã¨ã‚ã‚‹webã‚¢ãƒ—ãƒªã®VCSã®æ´å²ã¨ä½¿ã„æ–¹ã®ç´¹ä»‹ã§ã”ã–ã„ã¾ã™ã€‚ 9ãƒ¶æœˆãã‚‰ã„å‰ã¾ã§ svn ã§é‹ç”¨ã—ã¦ã„ã¾ã—ãŸãŒã€é–‹ç™ºè€…ãŒå¢—ãˆãŸã®ã§ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã‚‹äº‹ãŒå¤šããªã‚Šã€git ã«å¤‰æ›´ã—ã¾ã—ãŸã€‚ ãƒ–ãƒ©ãƒ³ãƒé–‹ç™ºã‚’ã™ã‚‹æ™‚ã¯ã€svnã‚ˆã‚Šgitã®æ–¹ãŒã¯ã‚‹ã‹ã«ä¾¿åˆ©ã ã‹ã‚‰ã§ã™ã€‚ä¾‹ãˆã°ã€branchã‚’åˆ‡ã‚‹ã®ãŒé«˜é€Ÿã€conflictãŒå°‘ãªã„ãªã©ã®ç‚¹ã§å„ªã‚Œã¦ã„ã¾ã™ã€‚ä»–ã«ã‚‚ã‚ã‚Šã¾ã™ãŒè‰²ã€…ãªæ‰€ã§è¦‹ã‚‹ã®ã§çœç•¥ã€‚ å› ã¿ã«é–‹ç™ºè¦æ¨¡ã¯ç¾åœ¨5~6äººã§ã™ã€‚
sotarok 2013/02/04
git
ãƒªãƒ³ã‚¯
git reset ã«ã¤ã„ã¦ã‚‚ã¾ã¨ã‚ã¦ã¿ã‚‹ - murankã®æ—¥è¨˜
å‰å›ž git diff ã‚’å›³ã«æ›¸ã„ã¦ã¿ãŸã¨ã“ã‚ã€è‡ªåˆ†ã®ä¸ã§æ„å¤–ã¨æ•´ç†ã§ããŸã®ã§ã€ã“ã‚Œã¾ãŸãªã‚“ã¨ãªãä½¿ã£ã¦ã„ãŸ git reset ã«ã¤ã„ã¦ã‚‚ã¾ã¨ã‚ã¦ã¿ãŸã€‚ ã¨ã‚Šã‚ãˆãšçµè«–ã‚’å…ˆã«ã¾ã¨ã‚ã‚ˆã†ã€‚ git reset ã¨ã¯ï¼Ÿ HEAD ã®ä½ç½®ã‚’å¤‰æ›´ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã€‚ ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã«ã‚ˆã£ã¦ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã®å†…å®¹ã‚‚å¤‰æ›´ã§ãã‚‹ã€‚ git reset ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã¯ï¼Ÿ --softã€--mixed(ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãªã—ã¨åŒç‰)ã€--hard ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒã‚ã‚Šã€å½±éŸ¿åº¦ã®å°ã•ã„é †ã«ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹ã€‚ --soft HEAD ã®ä½ç½®ã®ã¿ã‚’å¤‰æ›´ã™ã‚‹ã€‚ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã«ã¯å½±éŸ¿ãªã—ã€‚ --mixed (ã¾ãŸã¯ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãªã—) HEAD ã®ä½ç½®ã¨ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å¤‰æ›´ã™ã‚‹ã€‚ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã«ã¯å½±éŸ¿ãªã—ã€‚ --hard HEADã®ä½ç½®ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã‚’ã™ã¹ã¦å¤‰æ›´ã™ã‚‹ã€‚ ã•ã¦ã€git reset
sotarok 2013/01/31
git
ãƒªãƒ³ã‚¯
Git - Book (æ—¥æœ¬èªžè¨³)
The entire Pro Git book, written by Scott Chacon and Ben Straub and published by Apress, is available here. All content is licensed under the Creative Commons Attribution Non Commercial Share Alike 3.0 license. Print versions of the book are available on Amazon.com. The version found here has been updated with corrections and additions from hundreds of contributors. If you see an error or have a s
sotarok 2013/01/31
git
ãƒªãƒ³ã‚¯
ã€ç¿»è¨³ã€‘Gitã‚’ãƒœãƒˆãƒ ã‚¢ãƒƒãƒ—ã‹ã‚‰ç†è§£ã™ã‚‹
John Wiegleyã•ã‚“ã® "Git from the bottom up" ã‚’ç¿»è¨³ã—ã¾ã—ãŸã€‚ å…ƒPDFã¯ã“ã¡ã‚‰ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ï¼š http://newartisans.com/2008/04/git-from-the-bottom-up/ å…ƒè¨˜äº‹ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ãŒã‚¯ãƒªã‚¨ã‚¤ãƒ†ã‚£ãƒ–ã‚³ãƒ¢ãƒ³ã‚ºã®BY-SAã§ã‚ã£ãŸãŸã‚ã€ã“ã®ç¿»è¨³ã‚‚BY-SAã¨ãªã‚Šã¾ã™ã€‚ ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã‚’å®ˆã£ã¦è‡ªç”±ã«ã”åˆ©ç”¨ãã ã•ã„ã€‚ï¼ˆè©³ã—ãã¯è¨˜äº‹å†…ã®æœ€åˆã«ã‚‚æ›¸ã„ã¦ã‚ã‚Šã¾ã™ï¼‰ ç¿»è¨³ãƒŸã‚¹ã®æŒ‡æ‘˜ã‚„æ”¹å–„ã®ææ¡ˆç‰ãŒã‚ã‚Œã°ãƒ–ãƒã‚°ã‚³ãƒ¡ãƒ³ãƒˆã‚„Twitter(@oshow)ãªã©ã§é æ…®ãªãã©ã†ãžã€‚ Git ã‚’ãƒœãƒˆãƒ ã‚¢ãƒƒãƒ—ã‹ã‚‰ç†è§£ã™ã‚‹ Wed, 2 Dec 2009 by John Wiegley ç§ãŒ Git ã‚’ç†è§£ã—ã‚ˆã†ã¨èª¿æŸ»ã—ãŸæ™‚ã€é«˜ç´šãªã‚³ãƒžãƒ³ãƒ‰ã®è¦–ç‚¹ã‹ã‚‰çœºã‚ã‚‹ã‚ˆã‚Šãƒœãƒˆãƒ ã‚¢ãƒƒãƒ—å¼ã«ç†è§£ã™ã‚‹ã“ã¨ãŒå½¹ç«‹ã£ãŸã€‚ãã—ã¦ãƒœãƒˆãƒ ã‚¢ãƒƒãƒ—è¦–ç‚¹ã§è¦‹ã‚‹ Git ãŒ
sotarok 2013/01/29
git
ãƒªãƒ³ã‚¯
1 2 3 4 5 æ¬¡ã®ãƒšãƒ¼ã‚¸