GitHub - arl/gitmux: :computer: Git in your tmux status barYou signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session. Dismiss alert
git mergeã®ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆè§£æ¶ˆã«vimdiffを使ㆠ- ã—ãŠãƒ¡ãƒ¢
普段ã‹ã‚‰Vimを使ã†ã‚ˆã†ãªãã®é“ã®äººã«ã¯æœ‰åã‹ã¨æ€ã„ã¾ã™ãŒã€XcodeやらVSCodeやらを使ã†äººã€…ã«ã¨ã£ã¦ã‚‚ã€ãŠã™ã™ã‚ã§ãã‚‹ã®ã§æ›¸ã„ã¦ã¿ã¾ã—ãŸã€‚ 自分もiOSã‚„ã‚‹å‰ã¯Emacsユーザーã§ã€æ£ç›´ã‚ã‚“ã¾ã‚ŠVimã¯æ…£ã‚Œã¦ã„ãªã„ã®ã§ã™ãŒã€ãã‚Œã§ã‚‚使ã„ã‚„ã™ã„ã§ã™ã€‚ git mergetoolを使ㆠコンフリクトを解消ã™ã‚‹éš›ã«ã€ã‚¨ãƒ‡ã‚£ã‚¿ã‚’使ã£ã¦è©²å½“部分を編集ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ãŒã€ git mergetoolを利用ã™ã‚‹ã¨ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã—ãŸç®‡æ‰€ã ã‘を外部ツールã§è¡¨ç¤ºã—ã¦ãれるã®ã§ã€ç´ æ—©ã編集ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚ vimdiff以外ã«ã‚‚VSCodeãªã©ä»–ã®ãƒ„ールを利用ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚(個人的ã«ã¯ã€vimdiffãŒä¸€ç•ªã‚·ãƒ¼ãƒ レスã«ç·¨é›†ã§ãã‚‹ã¨æ„Ÿã˜ã¦ã„ã¾ã™) git mergeã®å¾Œã€git mergetool -t vimdiffを打ã¤ã“ã¨ã§ã€vimdiffを利用ã—ãŸç·¨é›†ã«ç§»è¡Œã§ãã¾ã™ã€‚ 毎回利用ã™ã‚‹å ´åˆã¯
pass - ArchWiki
パスワードストアをåˆæœŸåŒ–: $ pass init <gpg-id or email> パスワードを挿入ã€ã‚ã‹ã‚Šã‚„ã™ã„階層åを指定ã™ã‚‹: $ pass insert archlinux.org/wiki/username パスワードストアを確èª: $ pass Password Store └── archlinux.org └── wiki └── username æ–°ã—ã„ランダムãªãƒ‘スワードを生æˆã€<n> ã¯ç”Ÿæˆã™ã‚‹ãƒ‘スワードã®é•·ã• (æ•°å—) ã«ç½®ãæ›ãˆã¦ãã ã•ã„: $ pass generate archlinux.org/wiki/username <n> パスワードをå†å–å¾—ã€gpg ã®ãƒ‘スワードã®å…¥åŠ›ã‚’求ã‚られã¾ã™: $ pass archlinux.org/wiki/username Xorg を使ã£ã¦ã„㦠xclip をインストールã—ã¦ã„ã‚‹å ´åˆã€ä»¥ä¸‹ã®ã‚³ãƒžãƒ³ãƒ‰ã§å–å¾—ã—ãŸãƒ‘スワ
GitHub - jj-vcs/jj: A Git-compatible VCS that is both simple and powerful
Jujutsu is a powerful version control system for software projects. You use it to get a copy of your code, track changes to the code, and finally publish those changes for others to see and use. It is designed from the ground up to be easy to use—whether you're new or experienced, working on brand new projects alone, or large scale software projects with large histories and teams. Jujutsu is unlik
GitHub ã®åŸºç¤Ž - 管ç†ã®åŸºæœ¬ã¨è£½å“ã®æ©Ÿèƒ½ãƒ‘ート 1/2 - Training
ã“ã®ãƒ–ラウザーã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œãªããªã‚Šã¾ã—ãŸã€‚ Microsoft Edge ã«ã‚¢ãƒƒãƒ—グレードã™ã‚‹ã¨ã€æœ€æ–°ã®æ©Ÿèƒ½ã€ã‚»ã‚ュリティ更新プãƒã‚°ãƒ©ãƒ ã€ãŠã‚ˆã³ãƒ†ã‚¯ãƒ‹ã‚«ãƒ« サãƒãƒ¼ãƒˆã‚’利用ã§ãã¾ã™ã€‚
å¦ç¿’ã‚’å‚ç…§ | Microsoft Docs
ã“ã®ãƒ–ラウザーã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œãªããªã‚Šã¾ã—ãŸã€‚ Microsoft Edge ã«ã‚¢ãƒƒãƒ—グレードã™ã‚‹ã¨ã€æœ€æ–°ã®æ©Ÿèƒ½ã€ã‚»ã‚ュリティ更新プãƒã‚°ãƒ©ãƒ ã€ãŠã‚ˆã³ãƒ†ã‚¯ãƒ‹ã‚«ãƒ« サãƒãƒ¼ãƒˆã‚’利用ã§ãã¾ã™ã€‚
今年もミクシィã®22æ–°å’æŠ€è¡“ç ”ä¿®ã®è³‡æ–™ã¨å‹•ç”»ã‚’公開ã—ã¾ã™ï¼
ç ”ä¿®è³‡æ–™ãƒ»å‹•ç”»ä¸€è¦§Gitç ”ä¿®ï¼ˆ å‹•ç”» / スライド ï¼‰ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ç ”ä¿®ï¼ˆ å‹•ç”» / スライド1, 2 / SQL演習環境 ）è¨è¨ˆãƒ»ãƒ†ã‚¹ãƒˆç ”修（ å‹•ç”» / スライド ï¼‰ã‚³ãƒ³ãƒ†ãƒŠç ”ä¿®ï¼ˆ å‹•ç”» / スライド1, 2 ）iOSã‚¢ãƒ—ãƒªé–‹ç™ºç ”ä¿®ï¼ˆ å‹•ç”» / スライド / リãƒã‚¸ãƒˆãƒª ）Androidã‚¢ãƒ—ãƒªé–‹ç™ºç ”ä¿®ï¼ˆ å‹•ç”» / スライド / リãƒã‚¸ãƒˆãƒª ）フãƒãƒ³ãƒˆã‚¨ãƒ³ãƒ‰ç ”修（ å‹•ç”» / スライド / リãƒã‚¸ãƒˆãƒª ）ゲーム開発(Unity)ç ”ä¿®ï¼ˆ å‹•ç”» / スライド1, 2, 3, 4, 5, 6 / リãƒã‚¸ãƒˆãƒª ）Flutterç ”ä¿®ï¼ˆ å‹•ç”» / スライド / リãƒã‚¸ãƒˆãƒª ）AIç ”ä¿®ï¼ˆ スライド1, 2, 3, 4 / リãƒã‚¸ãƒˆãƒª ）セã‚ãƒ¥ãƒªãƒ†ã‚£ç ”ä¿®ï¼ˆ スライド ）ãƒãƒ¼ãƒ é–‹ç™ºç ”ä¿®ï¼ˆ スライド ）Gitç ”ä¿®ãƒãƒ¼ãƒ 開発ã§ã® Git (+GitHub) ã®ä½¿ã„æ–¹ã¨Git ã®å†…部的ãªæŒ™å‹•ã«ã¤ã„ã¦å¦ã¶ç ”ä¿®ã§ã™ã€‚後åŠ
Kernel/Dev/KernelGitGuide - Ubuntu Wiki
Git is the source code management tool used by the Linux kernel developer community. Ubuntu has adopted this tool for our own Linux kernel source code so that we can interact better with the community and the other kernel developers. Installing GIT To use git you must have the git package installed on your system, which you can install like this: sudo apt install git Obtaining the kernel sources f
IIJ Bootcamp
IIJ ã§å®Ÿæ–½ã—ã¦ã„る新人å‘ã‘ã®ãƒãƒ³ã‚ºã‚ªãƒ³è³‡æ–™é›†ã§ã™ã€‚
別リãƒã‚¸ãƒˆãƒªã®ã‚³ãƒŸãƒƒãƒˆã‚’パッãƒã¨ã—ã¦å½“ã¦ã‚‹ (git format-patch & git am)
A fashion developer. Interested in life engineering. ã‚„ã‚ŠãŸã„ã“ã¨ç¨¼åƒä¸ã®ç¾è¡Œãƒªãƒã‚¸ãƒˆãƒªã¨ã€ãƒªãƒ‹ãƒ¥ãƒ¼ã‚¢ãƒ«ä¸ã®ãƒªãƒã‚¸ãƒˆãƒªãŒä¸¦è¡Œç¨¼å‹•ã—ã¦ã„るシーンを想定ã—ã¦ã„る。 ビジãƒã‚¹ãƒã‚¸ãƒƒã‚¯ã¯ãã®ã¾ã¾å¼•ã継ãŽã€ãƒ•ãƒ¬ãƒ¼ãƒ ワークをã™ã’替ãˆãŸã„。 リニューアル作æ¥ã¯å…¨ã別ã®æ–°ã—ã„リãƒã‚¸ãƒˆãƒªã§å®Ÿæ–½ã—ã¦ã„ãŸãŒã€ç¾è¡Œãƒªãƒã‚¸ãƒˆãƒªã®æ”¹ä¿®ã‚‚背後ã§ç¶šã„ã¦ã„ãŸã€‚ 共通ã§ã‚るビジãƒã‚¹ãƒã‚¸ãƒƒã‚¯ã®åŒæœŸã‚’ã¨ã‚‹ãŸã‚ã«ã€ãŠäº’ã„ã®ãƒªãƒã‚¸ãƒˆãƒªã®å¤‰æ›´åˆ†ã‚’パッãƒåŒ–ã—ã€ä¸€é€£ã®ã‚³ãƒŸãƒƒãƒˆç¾¤ã‚’å–ã‚Šè¾¼ã¿ãŸã„。 実ç¾æ–¹æ³•ä»¥ä¸‹ã®ã‚„り方㯠コミット日時ãŒç¶æŒã•ã‚Œã‚‹ã€‚ ã¤ã¾ã‚Šã€ã‚³ãƒŸãƒƒãƒˆã¯é€šå¸¸é€šã‚Šä¸¦ã¶ãŒæ—¥æ™‚ãŒæ™‚系列ã§ä¸¦ã°ãªã„。 （Gitçš„ã«ã¯ã‚³ãƒŸãƒƒãƒˆãŒéŽåŽ»ã‹ã‚‰æœªæ¥ã¸ã‚レイã«ä¸¦ã°ãªãã¦ã‚‚よã„模様） パッãƒã‚’作æˆã™ã‚‹å–ã‚Šè¾¼ã¿ãŸã„内容ãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¦ã„るリãƒã‚¸ãƒˆãƒªã®ãƒ–ランãƒã§ä»¥ä¸‹ã‚’実行。abcd123ã¯é–‹å§‹ã‚³ãƒŸãƒƒãƒˆã®S
Yoctoã§Linuxカーãƒãƒ«è§¦ã‚‹ã¨ãã®Tips - Qiita
ã“ã¨ã‚ã‚‹ã”ã¨ã«ã€ŒYoctoã§å–ã£ã¦ããŸã‚³ãƒ¼ãƒ‰ã§é–‹ç™ºã—ã¡ã‚ƒãƒ€ãƒ¡ã€ã¨ã¯ã„ã‚れるもã®ã®ã€ãƒ“ルド環境ãŒã‚る以上ã¯ã‚½ãƒ¼ã‚¹ã‚’触りãŸã„ã®ãŒäººæƒ…。 ã¨ã„ã†ã‚ã‘ã§Yoctoã§Linuxカーãƒãƒ«è§¦ã‚‹ã¨ãã®Tipsを記載ã—ã¦ã¿ã‚‹ 以下ターゲットãŒi.MX6ã®ç’°å¢ƒã«ã¤ã„ã¦è¨˜è¼‰ã•ã‚Œã¦ã„ã‚‹ã®ã§ã€ãれ以外ã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã§ã¯é©å®œèªã¿æ›¿ãˆã‚‹ã“ã¨ã€‚ 最é‡è¦äº‹é …: gitリãƒã‚¸ãƒˆãƒªã¯ä½œã‚Šç›´ã•ã‚Œã‚‹ 基本的ã«do_unpackタスクãŒèµ°ã‚‹ã¨ã€gitリãƒã‚¸ãƒˆãƒªã”ã¨ä¸€ã‹ã‚‰ä½œã‚Šç›´ã•ã‚Œã‚‹ã€‚ ãã®ãŸã‚コード修æ£ã—ã¦git commitã—ã¦ä¸€å®‰å¿ƒã€ã¨æ€ã£ã¦ã„ã‚‹ã¨æ³£ãを見るã“ã¨ã«ãªã‚‹ã€‚ do_unpackã¯do_cleansstateã—ãŸã‚Šãƒ¬ã‚·ãƒ”ファイルを修æ£ã—ãŸã‚Šã™ã‚‹ã¨ç°¡å˜ã«èµ°ã£ã¦ã—ã¾ã†ãŸã‚è¦æ³¨æ„。 カーãƒãƒ«ã‚½ãƒ¼ã‚¹ã¯ã©ã“ã«ã‚る㋠以下ã§ç¢ºèªå¯èƒ½
ミクシィã®21æ–°å’æŠ€è¡“ç ”ä¿®ã®è³‡æ–™ã¨å‹•ç”»ã‚’公開ã—ã¾ã™ï¼
æ ªå¼ä¼šç¤¾MIXIã«æ‰€å±žã®é–‹ç™ºè€…ã«ã‚ˆã‚‹æŠ€è¡“知見や開発ノウãƒã‚¦ã€ã‚«ãƒ³ãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ãƒ¬ãƒãƒ¼ãƒˆãªã©ã€é–‹ç™ºã«é–¢ã™ã‚‹æƒ…å ±ã‚’å…±æœ‰ã™ã‚‹ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ãƒ»ãƒ–ãƒã‚°ã§ã™ã€‚
GitHub - arxanas/git-branchless: High-velocity, monorepo-scale workflow for Git
git-branchless is a suite of tools which enhances Git in several ways: It makes Git easier to use, both for novices and for power users. Examples: git undo: a general-purpose undo command. See the blog post git undo: We can do better. The smartlog: a convenient visualization tool. git restack: to repair broken commit graphs. Speculative merges: to avoid being caught off-guard by merge conflicts. I
git gc ã®ä»•çµ„ã¿ã‚’原ç†ã‹ã‚‰ç†è§£ã—ã¦ã‚µã‚¤ã‚ºã‚’ 136MB → 7.2MB(95%減)ã¾ã§å‰Šæ¸›ã—ãŸæ™‚ã®å‹‰å¼·ãƒ¡ãƒ¢
個人用メモã§ã™ã€‚ 「git gcã£ã¦ã‚ã‚“ã¾ã—容é‡æ¸›ã‚‰ãªã„よãªã〠ã¨æ€ã£ãŸã®ãŒå‹•æ©Ÿã§ã™ã€‚調ã¹ãŸã‘ã©ãƒ‘ッã¨è…‘ã«è½ã¡ã‚‹è¨˜äº‹ãŒãªã‹ã£ãŸã®ã§ã€Œè‡ªåˆ†ã§ git ã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰è¦‹ãŸæ–¹ãŒã„ã„ãªã€ã¨æ€¥ã«ãƒ¢ãƒãƒ™ç™ºå‹•ã—ã¦ã‚°ãƒ¯ã£ã¨å‹‰å¼·ã—ã¾ã—ãŸã€‚ã¾ãŸã¤ã„ã§ã«æ´å²æ”¹å¤‰ã®æ–¹æ³•ã‚‚調ã¹ãŸã®ã§ã™ãŒã€å…¬å¼ã§æ—¢ã« WARNING ãŒå‡ºã¦ã‚‹ã»ã©éžæŽ¨å¥¨åŒ–ã•ã‚Œã¦ã‚‹filter-branchを使用ã—ã¦ã‚‹è¨˜äº‹ãŒå¤šã‹ã£ãŸã®ã§ã€2021 å¹´ç¾åœ¨ã§å¤šåˆ†ä¸€ç•ªæŽ¨å¥¨ã•ã‚Œã¦ã‚‹filter-repoを使ã£ã¦ã‚„る方法もã¾ã¨ã‚ã¾ã—ãŸã€‚ ã¡ãªã¿ã«å®¹é‡æ¸›ã‚‰ã—ã¦ã‚‚高速化ã™ã‚‹ã‹ã¨ã„ã†ã¨ãã“ã¾ã§å˜ç´”ã§ã¯ãªã„ã§ã™ã€‚ãã‚‚ãも減らã•ãªãã¦ã‚‚ partial clone 㧠blob オブジェクトを必è¦æœ€ä½Žé™ã«æŒ‡å®šã—ã¦æ˜”ã® blob をデフォルトã§æŒã£ã¦ã“ãªã„よã†ã«ã—ãŸã‚Š(--no-checkoutã¨ä½µç”¨ã™ã‚‹ã¨ã‚ˆã‚ŠåŠ¹æžœæœ‰ã‚‹)ã€ãã®å¾Œæœ¬å½“ã«è‡ªåˆ†ãŒå¿…è¦ãªã‚„ã¤ã ã‘ sparse-
The Missing Semester of Your CS Education
The Missing Semester of Your CS Education IAP 2026 Classes teach you all about advanced topics within CS, from operating systems to machine learning, but there’s one critical subject that’s rarely covered, and is instead left to students to figure out on their own: proficiency with their tools. We’ll teach you how to master the command-line, use a powerful text editor, use fancy features of versio
Gitã®ã‚³ãƒŸãƒƒãƒˆæ—¥æ™‚ã‚’ä¿®æ£ã™ã‚‹æ–¹æ³• - zzzmisa's blog
忘れãŒã¡ãªã®ã§ãƒ¡ãƒ¢ã§ã™ã€‚ ç›´å‰ã®ã‚³ãƒŸãƒƒãƒˆæ—¥æ™‚ã‚’ä¿®æ£ç¾çŠ¶ã®ã‚³ãƒŸãƒƒãƒˆæ—¥æ™‚を確èªã—ã¾ã™ã€‚ $ git log --pretty=fuller commit 62c6282c9b6a3f20659559a5d975dc16a33cb7cd (HEAD -> master) Author: zzzmisa <__@mail.com> AuthorDate: Sat Sep 21 14:04:18 2019 Commit: zzzmisa <__@mail.com> CommitDate: Sat Sep 21 14:04:18 2019 ... コミット時間を 15:00 ã¸ä¿®æ£ã™ã‚‹ã“ã¨ã«ã—ã¾ã™ã€‚ ã¾ãšã¯ã€AuthorDate ã‚’ä¿®æ£ã—ã¾ã™ã€‚ $ git commit --amend --date="Sat Sep 21 15:00:00 2019 +0900" エディタãŒç«‹ã¡ä¸ŠãŒã‚‹ã®ã§ä¿å˜ã—ã¦çµ‚了
ランã‚ング
ランã‚ング
メンテナンス
リリースã€éšœå®³æƒ…å ±ãªã©ã®ã‚µãƒ¼ãƒ“スã®ãŠçŸ¥ã‚‰ã›
最新ã®äººæ°—エントリーã®é…ä¿¡
j次ã®ãƒ–ックマーク
kå‰ã®ãƒ–ックマーク
lã‚ã¨ã§èªã‚€
eコメント一覧を開ã
oページを開ã
Cargo.lock ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã™ã‚‹ã‚„å¦ã‚„
Radicle Explorer
Easiest Way To Build Mainline Linux Kernel in Debian/Ubuntu – James' Personal Site
GitHub - nikochiko/autosaved: Never worry about losing your code. Written in Go
{{#tags}}- {{label}}
{{/tags}}