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

BoBpp id:BoBpp

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

${{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}}

zshã®ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã«ãƒªãƒã‚¸ãƒˆãƒªã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦ã¿ã‚‹ Â· ã‘ã‚“ã”ã®ãŠå±‹æ•·
zshã®ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã«ä»Šã„ã‚‹ãƒ‘ã‚¹ã®ãƒªãƒã‚¸ãƒˆãƒªã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦ã¿ã‚‹ã“ã¨ã«ã—ã¾ã™ã€‚æœ€çµ‚ç›®æ¨™ã¯ã“ã‚“ãªæ„Ÿã˜ã€‚ ãƒ–ãƒ©ãƒ³ãƒåã‚’è¡¨ç¤º å…¨ã¦ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¦ãã‚Œã„ãªçŠ¶æ…‹ã§ã‚ã‚Œã°ç·‘è‰² addã•ã‚Œã¦ã„ãªã„ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Œã°+ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã¦èµ¤è‰² commitã•ã‚Œã¦ã„ãªã„ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Œã°!ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã¦é»„è‰² ã¡ãªã¿ã«ã“ã®è¨˜äº‹ã«æ›¸ã„ã¦ã‚ã‚‹ã“ã¨ã¯ zsh ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ 4.3.10 ä»¥ä¸Šã«é™ã£ã¦æœ‰åŠ¹ã§ã™ã€‚ ã•ã¦ã€ã“ã‚Œã‚’å®Ÿç¾ã™ã‚‹ã«ã¯ vcs_info ã¨ã„ã†ã‚‚ã®ã‚’ä½¿ã„ã¾ã™ã€‚ä»¥ä¸‹ã®ã‚ˆã†ãªè¨˜è¿°ã‚’ ~/.zshrc ã«è¿½åŠ ã—ã¾ã™ã€‚ # ã“ã®è¡Œã¯ç¾åœ¨ã®ãƒ‘ã‚¹ã‚’è¡¨ç¤ºã™ã‚‹è¨å®šã§ã™ã€‚ãƒ–ãƒ©ãƒ³ãƒã‚’è¡¨ç¤ºã—ã¦è‰²ã‚’ã¤ã‘ã‚‹è¨å®šã¨ã¯é–¢ä¿‚ã‚ã‚Šã¾ã›ã‚“ RPROMPT="%{${fg[blue]}%}[%~]%{${reset_color}%}" autoload -Uz vcs_info setopt prompt_subst zstyle ':vcs_i
BoBpp 2017/02/02
zsh

git
ãƒªãƒ³ã‚¯
vcs_info ã®ä½¿ã„æ–¹ ã‚ã‚‹ã„ã¯ prompt_subst ã®ã‚¹ã‚¹ãƒ¡ - s9g
ã¿ãªã•ã‚“ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã—ã¦ã¾ã™ã‹? äººç”Ÿã‚‚ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã—ãŸã„ã§ã™ã. zsh ä¸Šã§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã‚’æ‰±ã†å ´åˆã«ä¾¿åˆ©ãª vcs_info ã®ä½¿ã„æ–¹ã§ã™. ã—ã‹ã—ãªãŒã‚‰è‡ªåˆ†ã§è‡ªåˆ†ã®ä½¿ã† VCS ã‚’ä½¿ã£ã¦ãŒã‚ŠãŒã‚Šã‚¹ã‚¯ãƒªãƒ—ãƒˆæ›¸ã„ãŸã»ã†ãŒã„ã„ã‚ˆã†ãªæ°—ã‚‚ã—ã¾ã™ãŒæ°—ã®ã›ã„ã§ã™. ä»¥ä¸‹ã®ã‚ˆã†ãªã‚‚ã®ã‚’ $ZDOTDIR/.zshrc ã«æ›¸ãã ã‘ã§ã™ PROMPT ã®ã‚ãŸã‚Šã¯å„è‡ªèª¿æ•´ã®ã“ã¨. setopt prompt_subst autoload -Uz add-zsh-hook autoload -Uz vcs_info zstyle ':vcs_info:*' formats '%s' '%b' '%i' '%c' '%u' zstyle ':vcs_info:*' actionformats '%s' '%b' '%i' '%c' '%u' '%a' zstyle ':vcs_
BoBpp 2017/02/01
zsh

git

prompt_subst
ãƒªãƒ³ã‚¯
Jenkinsã®Git Pluginã§ç‰¹å®šã®branchã¸ã®pushã‚’ç„¡è¦–ã™ã‚‹ - Qiita
Jenkinsã®Git Plugin 1.3.0 ä»¥é™ã§ã¯branchã®æŒ‡å®šã«æ£è¦è¡¨ç¾ãŒä½¿ãˆã¾ã™ã€‚ å¦å®šå…ˆèªã¿ä½¿ã£ã¦branchã®é™¤å¤–ãŒã§ãã¾ã™ã€‚ GitLabã«pushã•ã‚ŒãŸã‚‰Jenkinsã§buildé€šã‚‹ã“ã¨ã‚’ç¢ºèªã—ãŸã„ã®ã ã‘ã©ã€ã¨ã¯ã„ãˆã€ŒãŠè©¦ã—branchã§buildã‚³ã‚±ãŸã‹ã‚‰ã¨ã„ã£ã¦èµ¤ããªã‚‹ã¨pushã™ã‚‹(äºº|æ©Ÿä¼š)ãŒæ¸›ã‚Šãã†ã§ã‚¤ãƒ¤ã ãªãƒ¼ã€ã€Œç‰¹å®šbranchã ã‘ç„¡è¦–ã§ããªã„ã‹ãªãƒ¼ã€ã¨æ€ã£ã¦git pluginã®ã‚½ãƒ¼ã‚¹èªã‚“ã§ãŸã‚‰ãªã«ã‚„ã‚‰ç´ æ•µãªã‚³ãƒ¼ãƒ‰ãŒï¼ ã©ã†ã‚„ã‚‰ã“ã®pull reqã§å…¥ã£ãŸã‚ˆã†ã§ã™ã€‚ç´ æ™´ã‚‰ã—ã„ã§ã™ãï¼ï¼ support for using regex directly in BranchSpec if spec string starts with colon. è¨å®šä¾‹ ã•ã£ãã Branches to build > Branch Specifier (blank
BoBpp 2015/03/25
git

jenkins
ãƒªãƒ³ã‚¯
Git
The git plugin provides fundamental git operations for Jenkins projects. It can poll, fetch, checkout, branch, list, merge, tag, and push repositories.
BoBpp 2015/03/25
Environment variables å‚è€ƒã«ãªã‚‹

jenkins

git
ãƒªãƒ³ã‚¯
Windowsç’°å¢ƒã§Gitã‚’é«˜é€ŸåŒ–ã™ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
BoBpp 2015/03/17
git

performance

é«˜é€ŸåŒ–
ãƒªãƒ³ã‚¯
Gitã®ãƒ–ãƒ©ãƒ³ãƒã«åˆ¥åã‚’ã¤ã‘ã‚‹(symbolic-ref)
ã¨ã—ã¾ã™ã€‚ã‚¹ã‚¯ãƒªãƒ—ãƒˆãªã©ã‹ã‚‰ã®åˆ©ç”¨ã‚’è€ƒãˆã‚‹ã¨ã€ã“ã‚Œã‚‰ã®ãƒ–ãƒ©ãƒ³ãƒã‚’ã™ã¹ã¦ x-release1.0 ã¨ã„ã†ãƒ–ãƒ©ãƒ³ãƒåã§æŒ‡å®šã§ãã‚‹ã¨ä¾¿åˆ©ã§ã™(Xã®ãƒªãƒªãƒ¼ã‚¹ãŒè¤‡æ•°ã‚ã‚‹å ´åˆãªã©ç‰¹ã«)ã€‚ãã“ã§ % git --git-dir=/var/lib/git/mod_a.git symbolic-ref refs/heads/x-release1.0 refs/heads/maint1.3 % gitÂ --git-dir=/var/lib/git/mod_b.git symbolic-ref refs/heads/x-release1.0 refs/heads/devel4 % git --git-dir=/var/lib/git/mod_c.git symbolic-ref refs/heads/x-release1.0 refs/heads/master ã‚’å®Ÿè¡Œã™ã‚Œã°ã€å…¨ã¦ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã«å¯¾ã—ã¦ x-re
BoBpp 2014/10/14
git
ãƒªãƒ³ã‚¯
git reset ã«ã¤ã„ã¦ã‚‚ã¾ã¨ã‚ã¦ã¿ã‚‹ - murankã®æ—¥è¨˜
å‰å›ž git diff ã‚’å›³ã«æ›¸ã„ã¦ã¿ãŸã¨ã“ã‚ã€è‡ªåˆ†ã®ä¸ã§æ„å¤–ã¨æ•´ç†ã§ããŸã®ã§ã€ã“ã‚Œã¾ãŸãªã‚“ã¨ãªãä½¿ã£ã¦ã„ãŸ git reset ã«ã¤ã„ã¦ã‚‚ã¾ã¨ã‚ã¦ã¿ãŸã€‚ ã¨ã‚Šã‚ãˆãšçµè«–ã‚’å…ˆã«ã¾ã¨ã‚ã‚ˆã†ã€‚ git reset ã¨ã¯ï¼Ÿ HEAD ã®ä½ç½®ã‚’å¤‰æ›´ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã€‚ ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã«ã‚ˆã£ã¦ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã®å†…å®¹ã‚‚å¤‰æ›´ã§ãã‚‹ã€‚ git reset ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã¯ï¼Ÿ --softã€--mixed(ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãªã—ã¨åŒç‰)ã€--hard ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒã‚ã‚Šã€å½±éŸ¿åº¦ã®å°ã•ã„é †ã«ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹ã€‚ --soft HEAD ã®ä½ç½®ã®ã¿ã‚’å¤‰æ›´ã™ã‚‹ã€‚ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã«ã¯å½±éŸ¿ãªã—ã€‚ --mixed (ã¾ãŸã¯ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãªã—) HEAD ã®ä½ç½®ã¨ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å¤‰æ›´ã™ã‚‹ã€‚ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã«ã¯å½±éŸ¿ãªã—ã€‚ --hard HEADã®ä½ç½®ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ„ãƒªãƒ¼ã‚’ã™ã¹ã¦å¤‰æ›´ã™ã‚‹ã€‚ ã•ã¦ã€git reset
BoBpp 2014/02/17
git

ã¾ã¨ã‚
ãƒªãƒ³ã‚¯
Gitã§Merge Commitã‚’Revertã™ã‚‹æ–¹æ³• - Qiita
ä½•å€‹ã‚‚CommitãŒã‚ã‚‹ã‚ˆã†ãªä¸€ã¤ã®Pull Requestã‚’å…¨ã¦Revertã—ãŸã„ã‚ˆã†ãªã¨ãã«ä½¿ãˆã¾ã™ã€‚ ãã‚‚ãã‚‚Revertã¨ã¯ ã‚ã‚‹ã‚³ãƒŸãƒƒãƒˆã‚’æ‰“ã¡æ¶ˆã™ã‚ˆã†ãªã€å…¨ãé€†ã®ã‚³ãƒŸãƒƒãƒˆã‚’ä½œã‚‹ã“ã¨ã§ã™ã€‚ è¿½åŠ ã—ãŸéƒ¨åˆ†ã‚’å‰Šé™¤ã—ã¦ã€å‰Šé™¤ã—ãŸéƒ¨åˆ†ã‚’è¿½åŠ ã—ã¦ã€å¤‰æ›´ã—ãŸéƒ¨åˆ†ã‚’å¤‰æ›´å‰ã®çŠ¶æ…‹ã«ã™ã‚‹ã‚³ãƒŸãƒƒãƒˆã‚’ä½œæˆã—ã¾ã™ã€‚ å–ã‚Šæ¶ˆã—ãŸã„ã‚³ãƒŸãƒƒãƒˆãŒã‚ã‚‹ã®ã ã‘ã‚Œã©ã€æ—¢ã«ãƒªãƒ¢ãƒ¼ãƒˆã«ã‚³ãƒŸãƒƒãƒˆã—ã¦ã—ã¾ã£ã¦ã€git reset, git rebase -i, git reflogãªã©ã‚’ä½¿ã£ã¦ã®å–ã‚Šæ¶ˆã—ãŒä¸å¯èƒ½ãªã¨ãã«ä½¿ã„ã¾ã™ã€‚ é€šå¸¸ã®Revert æ™®é€šã®commitãªã‚‰ã€revertã¯
BoBpp 2013/10/30
git

git-revert
ãƒªãƒ³ã‚¯
git clone --recursive ä¾¿åˆ© - hitode909ã®æ—¥è¨˜
git cloneã™ã‚‹ã¨ãã«--recursiveã‚’ã¤ã‘ã‚‹ã¨ï¼Œã‚µãƒ–ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚‚cloneã—ã¦ãã‚Œã‚‹ï¼Ž ãƒªãƒã‚¸ãƒˆãƒªãŒã‚µãƒ–ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’æŒã£ã¦ã‚‹ã¨ãã ã‘git submodule update --initã™ã‚‹ã®ã¯é›£ã—ã„ã®ã§ï¼Œå‹æ‰‹ã«ã‚„ã£ã¦ãã‚Œã‚‹ã®ã¯è‰¯ã„ã¨æ€ã†ï¼Ž ã“ã‚“ãªæ„Ÿã˜ï¼Ž % git clone https://github.com/unconed/TermKit.git --recursive Cloning into TermKit... remote: Counting objects: 2574, done. remote: Compressing objects: 100% (1099/1099), done. remote: Total 2574 (delta 1431), reused 2502 (delta 1385) Receiving objects: 100% (2574
BoBpp 2013/10/10
git
ãƒªãƒ³ã‚¯
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ã®ãƒ„ãƒªãƒ¼ã‚’è‡ªåˆ†ã®ãƒ„ãƒªãƒ¼ã«ç›´æŽ¥ãƒ—ãƒ«ã—ã¦ã€ãã®çµæžœã‚’é€ã‚ã†ã¨ã—ã¦ã„ã‚‹ã€‚ > ãã‚Œã„ãªãƒžãƒ¼ã‚¸å±¥æ´ã«ã¤ã„ã¦æ³¨æ„ã—ã¦ã„ã‚‹ã¨ã¯æ€ã£ã¦ã„ã‚‹ã‘ã©ã€å‰ã«è¨€ã£ãŸã‚ˆã†ã«ã€ > ã‚«ãƒ¼ãƒãƒ«ãƒ„ãƒªãƒ¼ã«é–¢ã—ã¦ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãŒä½•ã‚‚ãªã„çŠ¶æ…‹ã§ã¯ã€å›ãŒã©ã†ã—ãŸã„ã®ã‹ > æœ¬å½“ã®ã¨ã“ã‚ã¯ä»Šã®ä»Šã¾ã§åˆ†ã‹ã‚‰ãªã„ã‚ˆã€‚ è‡ªåˆ†ãŒæ±‚ã‚ã¦ã„ã‚‹ã®ã¯ã€ãã‚Œã„ãªå±¥æ´ã ã€‚ã§ã‚‚ã€ãã‚Œ
BoBpp 2013/08/01
git

é‹ç”¨
ãƒªãƒ³ã‚¯
GIT: ãƒžãƒ¼ã‚¸ã‚’å–ã‚Šã‚„ã‚ã‚‹ â€“ BmathLog
ãƒžãƒ¼ã‚¸ã—ãŸçµæžœã‚’ commit ã™ã‚‹å‰ ãƒžãƒ¼ã‚¸ã—ã‚ˆã†ã¨æ€ã£ãŸã‘ã©ã€ç«¶åˆãŒã‚ã£ã¦ã€ã„ã‚ã„ã‚ã¿ã¦ãŸã‚‰ã‚„ã‚„ã£ã±ã‚Šå…ƒã«æˆ»ã—ãŸã„ã€ ãã‚“ãªã¨ã $ git reset --hard HEAD ã“ã‚Œã§ git merge ãŒå®Ÿè¡Œã•ã‚Œã‚‹å‰ã®çŠ¶æ…‹ã«æˆ»ã‚‹ã€‚ ãƒžãƒ¼ã‚¸å®Œäº†å¾Œã«å…ƒã«æˆ»ã—ãŸããªã£ãŸ ãƒžãƒ¼ã‚¸ã‚³ãƒŸãƒƒãƒˆã—ãŸã‚ã¨ã ã‘ã©æˆ»ã—ãŸã„ã¨ãã¯ $ git reset --hard ORIG_HEAD ã“ã®ã¨ãæ³¨æ„ã™ã‚‹ã¹ãã¯ã€ãƒžãƒ¼ã‚¸ã™ã‚‹ã¨ãç·¨é›†ä¸ã®ã‚‚ã®ãŒã‚ã£ãŸã‚‰ãã‚Œã‚‚ãƒªã‚»ãƒƒãƒˆã•ã‚Œã¦ã—ã¾ã†ã“ã¨ï¼ˆç·¨é›†ä¸ã®ã‚‚ã®ãŒæ¶ˆãˆã‚‹ï¼‰ã€‚
BoBpp 2013/06/11
git
ãƒªãƒ³ã‚¯
zawã‚’ä½¿ã£ã¦æœ€è¿‘æ›´æ–°ã—ãŸãƒ–ãƒ©ãƒ³ãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹ - $shibayu36->blog;
ä»•äº‹ã§gitä½¿ã£ã¦ã„ã¦ãƒ¬ãƒ“ãƒ¥ãƒ¼ã¨ã‹ã—ã¦ã„ã‚‹ã¨ã€ã©ã†ã‚‚gitã®ãƒ–ãƒ©ãƒ³ãƒåˆ‡ã‚Šæ›¿ãˆãŒã ã‚‹ããªã£ã¦ãã‚‹ã€‚ãã‚Œã§ã€zawã§æ›´æ–°æ—¥æ™‚é †ã§ãƒ–ãƒ©ãƒ³ãƒãŒä¸¦ã‚“ã§ã„ã¦ã€é¸æŠžã™ã‚‹ã¨git checkoutå‡ºæ¥ã‚Œã°ã™ãã«ãƒ–ãƒ©ãƒ³ãƒåˆ‡ã‚Šæ›¿ãˆãŒå‡ºæ¥ã¦ä¾¿åˆ©ã§ã¯ã¨æ€ã„ã‚„ã£ã¦ã¿ãŸã€‚ bindã—ãŸã‚ãƒ¼ã‚’æŠ¼ã™ã¨ã€æ›´æ–°æ—¥æ™‚é †ã§ãƒ–ãƒ©ãƒ³ãƒãŒè¡¨ç¤ºã•ã‚Œã¦ã€Enterã‚’æŠ¼ã™ã¨ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹ã€‚æ›´æ–°æ—¥æ™‚é †ãªã®ã§æ•°å›žã‚ãƒ¼ã‚’æŠ¼ã™ã ã‘ã§ã€ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ãŸã„ãƒ–ãƒ©ãƒ³ãƒã«è¾¿ã‚Šç€ã‘ã‚‹ã“ã¨ãŒå¤šã„ã€‚zawã‚’ä½¿ã£ã¦ã„ã‚‹ã®ã§çµžã‚Šè¾¼ã¿ã‚‚å‡ºæ¥ã‚‹ã€‚ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« zawã‚’ä½¿ã£ã¦ã„ã‚Œã°ã€å°Žå…¥ã¯ç°¡å˜ã€‚ ã¾ãšzawã®sourceã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ä»¥ä¸‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç½®ãã€‚ã‚‚ã—ãã¯é©å½“ãªã¨ã“ã‚ã«ç½®ã„ã¦ã€zawã®loadã®å¾Œã«sourceã‚’ä½¿ã£ã¦loadã™ã‚‹ã€‚ https://github.com/shibayu36/config-file/blob/master/.zsh/zaw-
BoBpp 2013/06/05
git

zsh

zaw.zsh
ãƒªãƒ³ã‚¯
Git submodule ã®åŸºç¤Ž - Qiita
ã“ã®è¨˜äº‹ã¯ Git Advent Calendar 6æ—¥ç›®ã®è¨˜äº‹ã§ã™ï¼ Git submodule ã£ã¦æœ€åˆã‚ã‹ã‚Šã«ãã„ã¨æ€ã†ã®ã§ã€åŸºæœ¬çš„ãªèª¬æ˜Žã‚’ã—ã‚ˆã†ã¨æ€ã„ã¾ã™ã€‚ git submodule ã¨ã¯ git submodule ã¯ã€å¤–éƒ¨ã® git ãƒªãƒã‚¸ãƒˆãƒªã‚’ã€è‡ªåˆ†ã® git ãƒªãƒã‚¸ãƒˆãƒªã®ã‚µãƒ–ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã—ã¦ç™»éŒ²ã—ã€ç‰¹å®šã® commit ã‚’å‚ç…§ã™ã‚‹ä»•çµ„ã¿ã§ã™ã€‚ Subversion ã§ã„ã†ã¨ã“ã‚ã®ã€external ã¨ä¼¼ã¦ã„ã¾ã™ã€‚ ã•ã¦ã€è§£èª¬ã®ãŸã‚ã€æ‰‹å…ƒã«ã€ãƒªãƒã‚¸ãƒˆãƒªA (/path/to/a) ã¨Aã® submodule ã¨ã—ã¦ã€ã‚ˆãä½¿ã†ä¾‹ã¨ã—ã¦ Bootstrap (å…ƒTwitter Bootstrap) ã‚’ç™»éŒ²ã—ã¦ã¿ã¾ã™ã€‚ git submodule ã‚’ç†è§£ã™ã‚‹ã†ãˆã§é‡è¦ãªã®ã¯ã€ ãƒªãƒã‚¸ãƒˆãƒªAãŒæŒ‡ã—ç¤ºã™submoduleã¨ã—ã¦ã®Bootstrapã®commit ç¾åœ¨ã®Bootstr
BoBpp 2013/06/05
git
ãƒªãƒ³ã‚¯
git merge ã§å¸¸ã« --no-ff - Qiita
# master ä¸Šã§ git merge ã™ã‚‹ã¨ãã¯å¸¸ã« --no-ff git config branch.master.mergeoptions "--no-ff" # git merge ã™ã‚‹ã¨ãã¯å¸¸ã« --no-ff(1.7.6ä»¥é™) git config --global merge.ff false ## ã‚ã‚ã›ã¦è¨å®šã—ã¦ãŠãã¨å‰ # master ä¸Šã§ git pull ã™ã‚‹ã¨ãã¯å¸¸ã« rebase git config branch.master.rebase true # git pull ã™ã‚‹ã¨ãã¯å¸¸ã« rebase(1.7.9ä»¥é™) git config --global pull.rebase true # git pull ã™ã‚‹ã¨ãã¯å¸¸ã« rebase(1.8.5ä»¥é™) git config --global pull.rebase preserve
BoBpp 2013/06/05
git
ãƒªãƒ³ã‚¯
master ãƒ–ãƒ©ãƒ³ãƒã«ãƒžãƒ¼ã‚¸æ¸ˆã¿ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã‚’ã¾ã¨ã‚ã¦å‰Šé™¤ã™ã‚‹ git-prune-remote-branch ã¨ã„ã†ã‚¹ã‚¯ãƒªãƒ—ãƒˆã‚’ä½œã£ãŸ - @kyanny's blog
å¿…è¦ã«ãªã£ãŸã®ã§ãã†ã„ã†ã‚‚ã®ã‚’ä½œã‚Šã¾ã—ãŸã€‚ https://github.com/kyanny/git-prune-remote-branch ãƒ‘ã‚¹ã®é€šã£ãŸã¨ã“ã‚ã«ç½®ã„ã¦ Git ã®ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§å®Ÿè¡Œã™ã‚‹ã¨ master ã¨ develop ã«ã™ã§ã«ãƒžãƒ¼ã‚¸æ¸ˆã¿ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã‚’å…¨éƒ¨å‰Šé™¤ã—ã¾ã™ã€‚ --noop ã§ dry-run ãƒ¢ãƒ¼ãƒ‰ã«ãªã‚‹ã®ã§å®Ÿéš›ã«æ¶ˆã™å‰ã«ç¢ºèªã‚‚ã§ãã¾ã™ã€‚ãªã‚“ã§ master ã ã‘ã˜ã‚ƒãªã develop ã‚‚ï¼Ÿã¨ã„ã†ã¨ã€åƒ•ã®ãƒãƒ¼ãƒ ã§ gitflow ã‚’ä½¿ã£ã¦ã„ã‚‹ã‹ã‚‰ã§ã™ã€‚ $ git clone git://github.com/kyanny/git-prune-remote-branch.git $ git-prune-remote-branch --noop $ git-prune-remote-branchgit push --mirror ã˜ã‚ƒãƒ€ãƒ¡ãªã®
BoBpp 2013/05/09
æœ€è¿‘ã ã¨Githubä¸Šã§ãƒ–ãƒ©ãƒ³ãƒæ¶ˆã›ãŸã‚Šã™ã‚‹ã‘ã©ã€ä¸€ç™ºã§æ¶ˆã›ã‚‹ã®ã‚‚ä¾¿åˆ©ãã†ãƒ¼ã€‚

git

github
ãƒªãƒ³ã‚¯
Subversion, Git, Mercurialãã‚Œãžã‚Œã§ã®cherrypicking - wyukawa's diary
ã¤ã¾ã¿é£Ÿã„ã¨ã‹é’ç”°è²·ã„ã¨ã„ã‚ã‚Œã‚‹cherrypickingã¯ã‚ã‚‹ç‰¹å®šã®ã‚³ãƒŸãƒƒãƒˆã‚’ãƒ–ãƒ©ãƒ³ãƒã‹ã‚‰æŠœãå‡ºã—ã¦åˆ¥ã®ãƒ–ãƒ©ãƒ³ãƒã«åæ˜ ã•ã›ã‚‹ã¨ã„ã†ã‚‚ã®ã§ã™ã€‚ Subversion, Git, Mercuriaãã‚Œãžã‚Œã®ã‚„ã‚Šæ–¹ã‚’èª¿ã¹ã¦ã¿ã¾ã—ãŸã€‚ ã¾ãšSubversionã„ã£ã¦ã¿ã¾ã—ã‚‡ã†ã€‚ æº–å‚™ $ svnadmin create repos $ svn checkout file:///tmp/repos work Checked out revision 0. $ cd work/ $ svn mkdir tags branches trunk A tags A branches A trunk $ svn commit -m "add initial dir" Adding branches Adding tags Adding trunk Committed revision 1.trunkã®ç›´ä¸‹ã«
BoBpp 2013/05/01
ã‚‚ã¯ã‚„ git cherry-pick ã£ã¦ svn ã ã¨ã©ã†ã‚„ã‚‹ã‚“ã ã£ã‘ï¼ŸçŠ¶æ…‹ã«ã€‚ã€‚ã€‚

svn

git
ãƒªãƒ³ã‚¯
git pushæ™‚ã«è¡¨ç¤ºã•ã‚Œã‚‹warning: `push.default is unset...`ã®æ„å‘³ã¨è§£æ±ºæ–¹æ³• - Qiita
git pushæ™‚ã«è¡¨ç¤ºã•ã‚Œã‚‹warning: `push.default is unset...`ã®æ„å‘³ã¨è§£æ±ºæ–¹æ³•Git $ g push warning: push.default is unset; its implicit value is changing in Git 2.0 from 'matching' to 'simple'. To squelch this message and maintain the current behavior after the default changes, use: git config --global push.default matching To squelch this message and adopt the new behavior now, use: git config --global push.default
BoBpp 2013/04/26
èª¤pushã‚’é˜²ããŸã‚ã«ã‚‚ matching ã¯ã‚„ã‚ãŸã„ã€‚

git
ãƒªãƒ³ã‚¯
GitHubã®commitã®URLã®æœ«å°¾ã« ?w=1 ã¨ã¤ã‘ã‚‹ã¨å·®åˆ†ãŒã‚ã‹ã‚Šã‚„ã™ã„ï¼ˆæ™‚ãŒã‚ã‚‹ï¼‰ - ç´è±†ã«ã¯åµã‚’å…¥ã‚Œã‚‹æ´¾ã§ã™ã€‚
å„commitã®URL https://github.com/hoge/fuga/commit/xxxxxxxxxxxxxxxxxxxã®æœ«å°¾ã« "?w=1" ã‚’ã¤ã‘ã¦https://github.com/hoge/fuga/commit/xxxxxxxxxxxxxxxxxxx?w=1ã¨ã™ã‚‹ã¨ã€å·®åˆ†ãŒãƒ›ãƒ¯ã‚¤ãƒˆã‚¹ãƒšãƒ¼ã‚¹ã®ã¿ã®è¡Œã‚’çœã„ã¦ã€æ–‡å—ã®å¤‰æ›´ãŒã‚ã£ãŸè¡Œã ã‘ã‚’å·®åˆ†è¡¨ç¤ºã—ã¦ãã‚Œã‚‹ã®ã§ã€ä½•ã‚’å¤‰æ›´ã—ãŸã‹ãŒãƒ”ãƒ³ãƒã‚¤ãƒ³ãƒˆã§ã™ã”ãã‚ã‹ã‚Šã‚„ã™ããªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ ä¾‹ãˆã°ä¸‹è¨˜ã®ä¾‹ã€‚CoffeeScriptå†…ã§ã‚ã‚‹éƒ¨åˆ†ã‚’ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ã«ã—ã¦ã€ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ã—ãŸéƒ¨åˆ†ã®ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã‚’ã”ã£ãã‚Šä¸‹ã’ã¦ã‚‹ã®ã§ã™ãŒã€ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã‚’å¤‰ãˆãŸã ã‘ã®è¡Œã‚‚å…¨éƒ¨å·®åˆ†ã«è¡¨ç¤ºã•ã‚Œã¦ã¦ã€ä½•ã‚’å¤‰ãˆãŸã®ã‹ã²ã¨ç›®ã§ã‚ã‹ã‚Šã¥ã‚‰ã„ã€‚ æ™®é€šã®commitè¡¨ç¤º â†“ ã“ã‚ŒãŒURLã«"?w=1"ã‚’ã¤ã‘ã‚‹ã¨ã“ã†ãªã‚‹ï¼ï¼ï¼ â†“ å˜ã«ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã‚’å¤‰ãˆãŸã ã‘ã®è¡ŒãŒçœã‹ã‚Œ
BoBpp 2013/04/11
git

github
ãƒªãƒ³ã‚¯
gitã®å…¥é–€ç”¨ã®ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«"Learn Git Branching"ã‚’è¨³ã—ãŸ | 48JIGEN *Reloaded*
gitã®å…¥é–€ç”¨ã®ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«"Learn Git Branching"ã‚’è¨³ã—ãŸ 2013/03/18 ã“ã“ã§å…¬é–‹ã—ã¦ã¾ã™ã€‚ã‚¹ãƒžãƒ›ã‹ã‚‰ã ã¨å‹•ã‹ãªã„ã®ã§PCã§è¦‹ã¦ãã ã•ã„ã€‚ http://remore.github.com/learnGitBranching-ja Chromeã¨Firefoxã§ã¯å‹•ä½œç¢ºèªã—ã¦ã¾ã™ã€‚ç¿»è¨³ãƒªã‚½ãƒ¼ã‚¹ã¯githubã«ç½®ã„ã¦ã‚ã‚Šã¾ã™ã€‚ Laern Git Branchingã¯ï¼š ã‚°ãƒ©ãƒ•ã‚£ã‚«ãƒ«ã«gitãƒ„ãƒªãƒ¼ã‚’æ“ä½œã—ãªãŒã‚‰rebaseã¨ã‹mergeã¨ã‹ã‚’å¦ã¹ã‚‹ IDEA * IDEAã•ã‚“ã¨ã‹HackerNewsã¨ã‹ã§ã€1ã‹æœˆãã‚‰ã„å‰ã«è©±é¡Œã«ãªã£ã¦ãŸ MIT Lisenceã§å…¬é–‹ã•ã‚Œã¦ã¦è‡ªåˆ†ã§æ¼”ç¿’å•é¡Œã‚‚ä½œã‚Œã‚‹ ã¨ã„ã†ãƒ„ãƒ¼ãƒ«ã€‚å…¬é–‹ã•ã‚Œã¦ã‹ã‚‰1ã‹æœˆãã‚‰ã„ã—ã‹çµŒã£ã¦ãªã„ã®ã«ã€æ—¢ã«ä¸å›½èªžã€éŸ“å›½èªžã€ãƒ•ãƒ©ãƒ³ã‚¹èªžã®3ã‹å›½èªžã«ç¿»è¨³ã•ã‚Œã¦ã‚‹ã€‚æµ·å¤–ã®äººä»•äº‹ã¯ãˆãƒ¼ã¨æ„Ÿå¿ƒã—ã¾ã—ãŸã€‚ æ˜¥ã ã—æ–°äººã•ã‚“
BoBpp 2013/03/18
git
ãƒªãƒ³ã‚¯
gitã§"svn cat"ã®ã‚ˆã†ã«éŽåŽ»ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸èº«ã‚’ã¿ã‚‹ã‚³ãƒžãƒ³ãƒ‰ - ã™ãŽã‚ƒãƒ¼ã‚“ãƒ¡ãƒ¢
ãšã£ã¨çŸ¥ã‚‰ãªãã¦ã€ä»Šæ—¥èª¿ã¹ã¦åˆã‚ã¦çŸ¥ã£ãŸã®ã§ãƒ¡ãƒ¢ã€‚ gitã§éŽåŽ»ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å–ã‚Šå‡ºã™ - ã²ã“ã«ã£ã - tenmonã‚°ãƒ«ãƒ¼ãƒ— ã‚ˆã‚Š git cat-file -p <SHA1 object name>:<path> è¿½è¨˜ @hokacchaå…ˆè¼©ã‹ã‚‰ git show <SHA1 object name>:<path>ã§ã‚‚åŒã˜ã“ã¨ã§ãã‚‹ã‚ˆã€ã¨æ•™ãˆã¦ã„ãŸã ã„ãŸï¼ ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ ï¼žï¼œ gitã§éŽåŽ»ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã¨ã‹åˆ¥ã®branchã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¦‹ã‚‹ - Webtech Walker ã“ã£ã¡ã®æ–¹ãŒä½™è¨ˆã«ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚‚ã¤ã‘ãšã«æ¸ˆã‚€ã—ä¾¿åˆ©ã‹ã‚‚ï¼
BoBpp 2013/02/27
git
ãƒªãƒ³ã‚¯
1 2 3 4 æ¬¡ã®ãƒšãƒ¼ã‚¸