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

xai1981 id:xai1981

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

${{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 addã‚’å–ã‚Šæ¶ˆã™
ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿®æ£å¾Œã€git addã—ãŸãŒã€ã‚„ã£ã±ã‚Šã‚„ã‚ãŸã„ã€‚ $ git reset HEAD ç‰¹å®šã®ãƒ•ã‚¡ã‚¤ãƒ«ã®addã ã‘ã‚’å–ã‚Šæ¶ˆã—ãŸã„å ´åˆã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«åã‚’æŒ‡å®šã™ã‚‹ã€‚ $ git reset HEAD <ãƒ•ã‚¡ã‚¤ãƒ«å> ã‚ã‹ã‚‹ Git Kindleç‰ˆ
xai1981 2021/01/26
git

command
ãƒªãƒ³ã‚¯
Git ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆè§£æ¶ˆæ‰‹é † - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
xai1981 2021/01/08
qiita

git
ãƒªãƒ³ã‚¯
NEC LAVIEå…¬å¼ã‚µã‚¤ãƒˆ > ã‚µãƒ¼ãƒ“ã‚¹ï¼†ã‚µãƒãƒ¼ãƒˆ > Q&A > Q&Aç•ªå· 019410
Windows 8.1ã€ä»–â€¦ã€€ï¼ˆã™ã¹ã¦è¡¨ç¤ºã™ã‚‹ï¼‰ã€€ã€€ã€€ã€€ï¼ˆæŠ˜ã‚ŠãŸãŸã‚€ï¼‰ Windows 8.1 Pro Windows 8 Windows 8 Pro
xai1981 2020/11/09
git

source_tree
ãƒªãƒ³ã‚¯
Git ç®¡ç†ã—ã¦ã„ã‚‹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã™ã‚‹ - Corredor
xai1981 2020/11/04
git

command
ãƒªãƒ³ã‚¯
git ç®¡ç†ã‚’ã‚„ã‚ã‚‹ - Qiita
tester@b4b4r07:~/git_test$ ls abc def tester@b4b4r07:~/git_test$ git init Initialized empty Git repository in /Users/tester/git_test/.git/ tester@b4b4r07:~/git_test (master #%)$ git add . tester@b4b4r07:~/git_test (master #)$ git commit -m 'first commit' [master (root-commit) 42698c8] first commit 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 abc create mode 100644 def tester
xai1981 2020/03/11
qiita

git
ãƒªãƒ³ã‚¯
[Git] Gitã®mergeã§vimdiffã‚’åˆ©ç”¨ã™ã‚‹ - Qiita
ç›®çš„ pullã—ãŸã¨ãã«ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆãŒç™ºç”Ÿã—ãŸã¨ããªã©vimdiffã‚’åˆ©ç”¨ã—ã¦ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã‚’è§£æ¶ˆã™ã‚‹ æ‰‹é † 1. ä½¿ã„ã©ã“ã‚ ä¾‹ãˆã°ä»¥ä¸‹ã®ã‚ˆã†ã«git pullãŒå¤±æ•—ã—ã¦æ‰‹å‹•ã§mergeã™ã‚‹å¿…è¦ãŒã§ã¦ããŸã¨ãã«åˆ©ç”¨ã—ã¾ã™ $ git pull ï½ž Auto-merging aaa CONFLICT (content): Merge conflict in aaa Automatic merge failed; fix conflicts and then commit the result.
xai1981 2019/12/09
qiita

git

merge
ãƒªãƒ³ã‚¯
SourceTreeã‚’æœ€å°åŒ–ã—ãŸã‚ã¨æˆ»ã‚‰ãªã„æ™‚ã¯ - ãŠä»•äº‹ãƒ¡ãƒ¢ -y3b5ã®æ—¥è¨˜
Windows10 Pro 64bit ï¼‹ SourceTree3.0.8ã§ç¢ºèªã€‚ å…ˆã«çµè«–ã‚’æ›¸ãã¨ã€ŒSourceTreeã€ã®[ãƒ„ãƒ¼ãƒ«]-[ã‚ªãƒ—ã‚·ãƒ§ãƒ³]-[ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ãŒãªã„ã¨ãã«æ›´æ–°ã™ã‚‹]ã«ãƒã‚§ãƒƒã‚¯ã‚’å…¥ã‚Œã‚‹ã¨æ”¹å–„ã™ã‚‹ã‹ã‚‚ãã€‚ ã„ã‚ã‚“ãªã‚¢ãƒ—ãƒªã‚’èµ·å‹•ã—ã¦ã„ã‚‹æ™‚ã«ç”»é¢ãŒé‚ªé”ãªã®ã§ã€ä¸è¦ãªã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã‚’æœ€å°åŒ–ã™ã‚‹ã‘ã©ã€Alt + Tabã§SourceTreeã®ç”»é¢ãŒè¡¨ç¤ºã§ããªã‹ã£ãŸã€‚ ã‚¿ã‚¹ã‚¯ãƒãƒ¼ã®SourceTreeã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’å½“ã¦ã¦ã€Alt + Space ã§ã€Œå…ƒã®ã‚µã‚¤ã‚ºã«æˆ»ã™ã€ã‚’ã‚„ã£ã¦ã„ãŸã‘ã©ã€ã²ã¨æ‰‹é–“å¤šã„ã®ãŒå«Œã ã£ãŸã€‚ ãªã«ã‹ãƒãƒƒãƒˆã«æƒ…å ±ã¯ãªã„ã‹ã¨æ¤œç´¢ã—ãŸãŒã€æµ·å¤–ã®ãƒ•ã‚©ãƒ¼ãƒ©ãƒ ã§ç™ºè¦‹ï¼ Solved: SourceTree v3.0.6 minimize and maximize probl em è‡ªåˆ†ã®PCã§ã‚„ã£ã¦ã¿ãŸã‚‰ç„¡äº‹ã«è§£æ¶ˆã€‚ ã‚¹ãƒˆãƒ¬ã‚¹ã®å…ƒãŒä¸€ã¤æ¸›ã£ã¦ã‚ˆã‹ã£ãŸã€‚
xai1981 2019/09/24
git

application

customize
ãƒªãƒ³ã‚¯
https://codeday.me/jp/qa/20190515/830052.html
xai1981 2019/09/11
ã‚ã¨ã§èªã‚€

git
ãƒªãƒ³ã‚¯
Git ã§å¤‰æ›´ã‚’ patch ãƒ•ã‚¡ã‚¤ãƒ«ã«ã™ã‚‹ / patch ã‚³ãƒžãƒ³ãƒ‰ã§é©ç”¨ã™ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
xai1981 2019/06/05
qiita

git

patch
ãƒªãƒ³ã‚¯
gitã§Untracked filesã‚’å‰Šé™¤ã™ã‚‹ - write ahead log
ä½œæ¥ã—ã¦ã„ã‚‹ã¨gitã§è¿½è·¡ã—ãŸããªã„ãƒ•ã‚¡ã‚¤ãƒ«ãŒãŸãã•ã‚“ç”Ÿæˆã•ã‚Œã¦,é‚ªé”ã«ãªã‚‹äº‹ãŒã‚ˆãã‚ã‚‹. git cleanã¨ã„ã†ä¸€æ‹¬ã§å‰Šé™¤ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ãŒã‚ã£ãŸ. ä½¿ã„æ–¹ å‰Šé™¤ã™ã‚‹å¯¾è±¡ã‚’ç¢ºèªã™ã‚‹ $git clean -n å®Ÿéš›ã«å‰Šé™¤ã™ã‚‹ $git clean -f ä¸Šè¨˜ã ã¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯å‰Šé™¤å¯¾è±¡ã«ãªã‚‰ãªã„. å‰Šé™¤ã™ã‚‹å¯¾è±¡ã‚’ç¢ºèªã™ã‚‹(ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚å¯¾è±¡) $git clean -nd å®Ÿéš›ã«å‰Šé™¤ã™ã‚‹(ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚å¯¾è±¡) $git clean -fd
xai1981 2019/06/05
git
ãƒªãƒ³ã‚¯
git add ã®å–ã‚Šæ¶ˆã—æ–¹æ³•ã¨ã€é–¢é€£ã‚³ãƒžãƒ³ãƒ‰ã¾ã¨ã‚ | WWWã‚¯ãƒªã‚¨ã‚¤ã‚¿ãƒ¼ã‚º
git add ã—ã¦ã‚¹ãƒ†ãƒ¼ã‚¸ã—ã¦ã—ã¾ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–ã‚Šæ¶ˆã—ã™ã‚‹ Git ã‚³ãƒžãƒ³ãƒ‰ã«ã¤ã„ã¦ã§ã™ã€‚å‹¢ã„ã‚ˆã git add ã—ãŸã¯ã„ã„ã‘ã©ãƒ»ãƒ»ã€ã‚ã‚Œï¼Ÿå…ƒã«æˆ»ã›ãªã„ãƒ»ãƒ»ãƒ»ã€‚ã¨ã„ã†ã®ã¯ã‚ˆãã‚ã‚‹è©±ã§ã™ã€‚ ä»Šå›žã€git add ã®å–ã‚Šæ¶ˆã—æ–¹ã‚’ãƒžã‚¹ã‚¿ãƒ¼ã—ã¦ã€ã†ã¾ãã‚³ãƒŸãƒƒãƒˆã‚’ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã—ã¾ã—ã‚‡ã†ã€‚ git add ã¨ã¯ï¼Ÿ ã¾ãšã¯ãŠã•ã‚‰ã„ã§ã™ãŒã€git add ã¯ã€ä½œæ¥ãƒ„ãƒªãƒ¼ï¿½ã®æ›´æ–°å†…å®¹ã‚’ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«åæ˜ ã™ã‚‹ãŸã‚ã® Git ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«è¿½åŠ ã•ã‚ŒãŸå¤‰æ›´å†…å®¹ã¯ã€ã€Œgit commitã€ã‚’å®Ÿè¡Œã—ãŸéš›ã«ã€ãã®ã‚³ãƒŸãƒƒãƒˆã«å«ã¾ã‚Œã‚‹äº‹ã«ãªã‚Šã¾ã™ã€‚ ã•ã¦ã€ä»Šå›žã®ãƒ†ãƒ¼ãƒžã¯ã€Œã„ã£ãŸã‚“ git add ã—ã¦ã—ã¾ã£ãŸã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ä¸Šã®å¤‰æ›´å†…å®¹ã¯ã€ã©ã†ã‚„ã£ã¦å–ã‚Šæ¶ˆã™ã®ã‹ï¼Ÿã€ã¨ã„ã†å•é¡Œã§ã—ãŸã€‚ã•ã£ããè¦‹ã¦ã„ãã¾ã—ã‚‡ã†ã€‚ git add ã—ãŸå¤‰æ›´ã‚’ã€å…¨ã¦ä¸€æ‹¬ã§å–ã‚Šæ¶ˆã™æ–¹æ³• git reset ã§ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’ HE
xai1981 2019/06/05
git
ãƒªãƒ³ã‚¯
vbacã§ã‚¨ã‚¯ã‚»ãƒ«VBAã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’Gitãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã™ã‚‹æ–¹æ³•
ã¿ãªã•ã‚“ã€ã“ã‚“ã«ã¡ã¯ï¼ ãã‚ãã‚ãƒãƒ¼ãƒ ãƒ—ãƒ¬ã‚¤ã‚‚è©¦ã—ãŸã„ã‚¿ã‚«ãƒã‚·(@ntakahashi0505)ã§ã™ã€‚ ä»¥å‰ã“ã‚Œã‚‰ã®è¨˜äº‹ã§éžã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã®ãŸã‚ã®åˆå¿ƒè€…å‘ã‘Gitãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚„ã€Gitãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã«ä¾¿åˆ©ãªSource Treeã®ä½¿ã„æ–¹ã«ã¤ã„ã¦ãŠä¼ãˆã—ã¦ãã¾ã—ãŸã€‚
xai1981 2019/06/05
excel

git

vba
ãƒªãƒ³ã‚¯
Gitãƒ¬ãƒã‚¸ãƒˆãƒªã‚’ç§»è¡Œã™ã‚‹æ–¹æ³• - tanacasinoã®ãƒ¡ãƒ¢
æ—¢å˜ã®Gitãƒ¬ãƒã‚¸ãƒˆãƒªã‚’ã€Githubã‚„BitBucketã®ã‚ˆã†ãªãƒ›ã‚¹ãƒ†ã‚£ãƒ³ã‚°ã‚µãƒ¼ãƒã«ç§»è¡Œã—ãŸã‚Šã€é€†ã«ãƒãƒ¼ã‚«ãƒ«ã‚µãƒ¼ãƒã®GitBucketã‚„GitLabãªã©ã«ç§»è¡Œã—ãŸã„å ´åˆã€ã¾ã‚å˜ç´”ã«pushã™ã‚Œã°ã„ã„ã‚„ã‚“ã¨æ€ã£ãŸã‚‰ã€æ€ã†ã‚ˆã†ãªçµæžœã«ãªã‚‰ãªã‹ã£ãŸã‚Šã€é¢å€’ãªæ‰‹é †ã«ãªã£ã¦ã—ã¾ã£ãŸã‚Šã—ã¦ã—ã¾ã£ãŸã€‚ ã©ã†ã‚‚è‡ªåˆ†ã®ãƒ¯ãƒ¼ã‚ãƒ³ã‚°ã®ãƒ¬ãƒã‚¸ãƒˆãƒªã‹ã‚‰é£›ã°ãã†ã¨ã™ã‚‹ã¨ã€tagã ã£ãŸã‚Šbranchã ã£ãŸã‚ŠãŒç§»è¡Œã§ãã¦ã„ãªã„ã‹ã£ãŸã‚Šã™ã‚‹ã®ã§ã™ã€‚ ããã‚‹ã¨ã€ã„ã£ãŸã‚“ãƒãƒ¼ã‚«ãƒ«ã«ãƒªãƒ¢ãƒ¼ãƒˆã¨åŒåã®ãƒ–ãƒ©ãƒ³ãƒä½œã£ã¦(checkoutã—ã¦)ã‹ã‚‰ã€push --all, --tags ã¨ã‹ã—ã¦ã‚‹å¥´ã¨ã‹ã‚ã‚Šã¾ã™ãŒãã‚Œã¯é¢å€’ã ãªãã‚„ã ãªãã¿ãŸã„ãªã€‚ æœ€çµ‚çš„ã«ã¯ã€ã“ã‚ŒãŒä¸€ç•ªæ¥½ãªæ‰‹é †ã‹ãªã¨æ€ã†æ‰‹é †ã«è¡Œãã¤ã‘ãŸã®ã§ã“ã“ã«è¨˜ã™ã€‚ $ git clone --mirror <SOURCE_REPOSITORY_URL> $ cd <REPOSIT
xai1981 2019/06/05
git
ãƒªãƒ³ã‚¯
ä½œæ¥åˆ¥Gitã‚³ãƒžãƒ³ãƒ‰é›† - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
xai1981 2019/03/29
ã‚ã¨ã§èªã‚€

qiita

git

command
ãƒªãƒ³ã‚¯
Gitã§ãƒ–ãƒ©ãƒ³ãƒã‚’å‰Šé™¤ã—ã‚ˆã†ã¨ã—ã¦æ€’ã‚‰ã‚ŒãŸæ™‚ã®å¯¾å¿œæ–¹æ³• - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
xai1981 2018/11/12
qiita

git
ãƒªãƒ³ã‚¯
åŒä¸€ç«¯æœ«ã§ç•°ãªã‚‹githubã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«pushã™ã‚‹ã¨ãã®æ‰‹é †
xai1981 2018/10/21
git

qiita
ãƒªãƒ³ã‚¯
ç•°ãªã‚‹ãƒ¬ãƒã‚¸ãƒˆãƒªé–“ã§ã®ãƒžãƒ¼ã‚¸
ã‚„ã‚ŠãŸã„ã“ã¨ ãŸã¾ãŸã¾æ¥å‹™ä¸ã«ã€ç•°ãªã‚‹ãƒ–ãƒ©ãƒ³ãƒé–“ã§ãƒžãƒ¼ã‚¸ã‚’è¡Œã†å¿…è¦ãŒã‚ã‚Šã¾ã—ãŸã€‚ çŠ¶æ³ã¨ã—ã¦ã¯ã€ç•°ãªã‚‹ãƒ¬ãƒã‚¸ãƒˆãƒªé–“ã®ãƒžãƒ¼ã‚¸ã‚’è¡Œã„ãŸã„å ´åˆã§ã€ãƒ™ãƒ¼ã‚¹ã¨ãªã‚‹ãƒ–ãƒ©ãƒ³ãƒã®bugfixã‚’ãƒžãƒ¼ã‚¸ã—ãŸã„å ´åˆã«åˆ©ç”¨ã—ã¾ã—ãŸã€‚ç°¡å˜ãªã‚“ã§ã™ãŒã€æ„å¤–ã¨æ…£ã‚Œã¦ã„ãªã„ã¨ä¸€çž¬é›£ã—ãæ„Ÿã˜ã‚‹ã¨æ€ã„ã¾ã™ã€‚(ãã‚‚ãã‚‚ãªãœãƒ¬ãƒã‚¸ãƒˆãƒªãŒåˆ¥ã€…ãªã®ã‹ã¯ã¾ãŸåˆ¥ã®è©±ã§) å®Ÿè£… baseãƒ¬ãƒã‚¸ãƒˆãƒª Bison é¡žä¼¼ãƒ¬ãƒã‚¸ãƒˆãƒª Gollira ã¨ã—ã¾ã™ã€‚ Bison/masterã®ãƒã‚°ãƒ•ã‚£ãƒƒã‚¯ã‚¹ã‚’Gollira/masterã«ãƒžãƒ¼ã‚¸ã—ãŸã„å ´åˆã®å®Ÿè£…ã§ã™ã€‚ æ‰‹é †ã¨ã—ã¦ã¯ã€ 1. Gollira/masterã«ç§»å‹• 2. remoteã«Bisonãƒ¬ãƒã‚¸ãƒˆãƒªã‚’è¿½åŠ 3. fetchã™ã‚‹ 4. mergeã™ã‚‹ git remote add bison git@github.com:neonankiti/Bison.git //ã“ã‚Œã§bison(è‡ªåˆ†
xai1981 2018/10/21
git

merge

qiita
ãƒªãƒ³ã‚¯
gitã§bareãƒªãƒã‚¸ãƒˆãƒªã‚’åŒæœŸã™ã‚‹æ–¹æ³•
ä»¥å‰èª¿ã¹ãŸãƒã‚¿ã§ã™ãŒã€ã“ã“ã«ãƒ¡ãƒ¢ã—ã¦ãŠãã¾ã™ã€‚ ï¼ˆæœ€è¿‘ãƒ–ãƒã‚°ã®æ›´æ–°ãŒæ»žã£ã¦ã„ãŸãŸã‚ï¼‰ gitã«ã¯æ™®é€šã®ãƒªãƒã‚¸ãƒˆãƒªã¨bareãƒªãƒã‚¸ãƒˆãƒªãŒã‚ã‚Šã¾ã™ã€‚æ™®é€šã®ãƒªãƒã‚¸ãƒˆãƒªã¯ã€ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å«ã‚€ãƒªãƒã‚¸ãƒˆãƒªã§ã€bareãƒªãƒã‚¸ãƒˆãƒªã¯.gitãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ä¸èº«ã®ã¿ã‚’å«ã‚€ãƒªãƒã‚¸ãƒˆãƒªã§ã™ã€‚ bareãƒªãƒã‚¸ãƒˆãƒªã¯ã€ % git init --bare hoge ã®ã‚ˆã†ã«ä½œã‚Šã¾ã™ã€‚ã‚µãƒ¼ãƒã«bareãƒªãƒã‚¸ãƒˆãƒªã‚’ä½œã£ã¦ã€ãã“ã«ã¿ã‚“ãªã§pushã™ã‚‹ã‚ˆã†ãªä½¿ã„æ–¹ã¯ä¸€èˆ¬çš„ã§ã—ã‚‡ã†ã€‚ã¡ãªã¿ã«ã€pushå…ˆãŒbareãƒªãƒã‚¸ãƒˆãƒªã§ã¯ãªã‹ã£ãŸã‚Šã™ã‚‹ã¨ã€ãƒ¯ãƒ¼ãƒ‹ãƒ³ã‚°ãŒã§ãŸã‚Šã—ã¾ã™ã€‚ ã•ã¦ã€ä¾‹ãˆã°2ã¤ã®ãƒãƒ¼ãƒ ãŒãã‚Œãžã‚Œåˆ¥ã€…ã®ãƒªãƒ¢ãƒ¼ãƒˆã‚µãƒ¼ãƒã‚’ä½¿ã£ã¦åˆ¥ã®bareãƒªãƒã‚¸ãƒˆãƒªã«pushã—ã¦ã„ãŸã¨ã—ã¾ã™ã€‚ãã®2ã¤ã®bareãƒªãƒã‚¸ãƒˆãƒªã‚’åŒæœŸã—ãŸã„ã¨ã—ã¾ã™ã€‚bareãƒªãƒã‚¸ãƒˆãƒªã«ã¯ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã¨ã„ã†æ¦‚å¿µãŒãªã„ã®ã§ã€git mergeã¯ä½¿ãˆ
xai1981 2018/10/21
git
ãƒªãƒ³ã‚¯
[macOSå‘ã‘] gitã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã¯GitUpãŒã„ã„ãžã€‚ - Qiita
ãƒ„ã‚¤ãƒƒã‚¿ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã‚„ã§(ï¾Žï¾žï½¿ï½¯ã€€https://twitter.com/JotaroUT ã„ã‚ã„ã‚ä½¿ã£ã¦ã¿ãŸã‘ã©GitUpã€ã‚„ã‚ã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚ Macbookã‚’ã‚¹ã‚¿ãƒã§é–‹ã„ã¦ã¯ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’gitã§ç®¡ç†ã™ã‚‹æ©Ÿä¼šã®å¤šã„ã§ã‚ã‚ã†è«¸å…„ãƒ»è«¸å§‰ã®ãŸã‚ã«ã€ç‹¬æ–ã§ã‚¤ã‚±ã¦ã‚‹ãªã¨æ€ã£ãŸgitã®GUIã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«ã¤ã„ã¦ç´¹ä»‹ã—ãŸã„ã€‚ãã®åã‚‚GitUpã€‚ GitUp : http://gitup.co/ GitUpã¨ã¯ GitUpã¯macOSç”¨ã«é–‹ç™ºã•ã‚ŒãŸgitã®GUIã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã§ã‚ã‚‹ã€‚ å…¬å¼ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ã«ã€ Work quickly, safely, and without headaches. ã¨ã‚ã‚‹ã‚ˆã†ã«ã€ç¢ºã‹ã«ä½¿ã£ã¦ã„ã‚‹é–“ã¯é ç—›ãŒã—ãªã„æ°—ãŒã™ã‚‹ã€‚å¤§ããªç‰¹å¾´ã¨ã—ã¦ã¯ã€è¬³ã„æ–‡å¥ã®é€šã‚Šã€ æ—©ã„ã€‚ ã–ã£ãã‚Šã—ãŸä½¿ã„æ–¹ ã‚³ãƒŸãƒƒãƒˆã‚’å‚ç…§ã™ã‚‹ã€‚ ã“ã“ã§ã¯ã€openFrameworks (https://op
xai1981 2018/10/21
qiita

git
ãƒªãƒ³ã‚¯
1ã¤ã®ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã«è¤‡æ•°ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã‚’ç™»éŒ²ã™ã‚‹
ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã«è¤‡æ•°ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã‚’è¨å®šã™ã‚‹æ–¹æ³•ã«ãªã‚Šã¾ã™ã€‚remote add ã‚’ä½¿ã£ã¦originã¨åˆ¥ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã‚’ãƒ©ãƒ™ãƒ«ã«è¨å®šã—ã¦ç®¡ç†ã™ã‚‹ã“ã¨ãŒã§ãã‚‹ã‚ˆã†ã§ã™ã€‚ è¤‡æ•°ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã‚’ç®¡ç†ã—ã¦ã€ä½œæ¥ã™ã‚‹ã“ã¨ãŒã‚ã‚‹ã®ã§ãƒ¡ãƒ¢ã¨ã—ã¦æ®‹ã—ã¦ãŠãã¾ã™ã€‚ ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã®ç¢ºèª ç¾åœ¨ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã‚’ç¢ºèªã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰
xai1981 2018/10/19
git
ãƒªãƒ³ã‚¯
1 2 3 4 æ¬¡ã®ãƒšãƒ¼ã‚¸