| 2021-06-25 |
| ← betelgeuse left | 00:00 |
| → betelgeuse joined | 00:01 |
| ← betelgeuse left | 00:04 |
| → betelgeuse joined | 00:05 |
| → venmx joined | 00:07 |
| → kikijiki joined | 00:08 |
| ← betelgeuse left | 00:08 |
| → betelgeuse joined | 00:10 |
| ← betelgeuse left | 00:13 |
| → betelgeuse joined | 00:14 |
| ← kikijiki left | 00:15 |
| ← betelgeuse left | 00:17 |
| → Gustavo6046_ joined | 00:18 |
| → betelgeuse joined | 00:18 |
| ← blahboybaz left | 00:19 |
| ← Murr left | 00:19 |
| ← vicfred left | 00:19 |
| ← Gustavo6046 left | 00:19 |
| → Murr joined | 00:19 |
| Gustavo6046_ → Gustavo6046 | 00:20 |
| ← betelgeuse left | 00:21 |
| → Codaraxis_ joined | 00:22 |
| → betelgeuse joined | 00:23 |
| ← Codaraxis left | 00:25 |
| ← betelgeuse left | 00:26 |
| → betelgeuse joined | 00:27 |
| ← betelgeuse left | 00:30 |
| → ferdna joined | 00:31 |
| → betelgeuse joined | 00:32 |
| ← betelgeuse left | 00:34 |
| → betelgeuse joined | 00:36 |
| ← betelgeuse left | 00:39 |
| → betelgeuse joined | 00:40 |
| ← alzgh left | 00:43 |
| ← betelgeuse left | 00:43 |
| → PaMeDa joined | 00:44 |
| → betelgeuse joined | 00:45 |
| ← Sasazuka left | 00:46 |
| ← apauli left | 00:47 |
| ← betelgeuse left | 00:48 |
| ← venmx left | 00:48 |
| → betelgeuse joined | 00:49 |
| → venmx joined | 00:50 |
| ← betelgeuse left | 00:52 |
| → betelgeuse joined | 00:53 |
| ← betelgeuse left | 00:56 |
| → betelgeuse joined | 00:58 |
| ← pulse left | 00:59 |
| → nate1 joined | 01:01 |
| ← betelgeuse left | 01:01 |
| → betelgeuse joined | 01:02 |
| ← betelgeuse left | 01:05 |
| → sheepduck joined | 01:05 |
| ← Codaraxis_ left | 01:06 |
| ← FFY00_ left | 01:06 |
| → Codaraxis_ joined | 01:06 |
| ← nate1 left | 01:06 |
| → betelgeuse joined | 01:07 |
| ← betelgeuse left | 01:09 |
| → kikijiki joined | 01:10 |
| → betelgeuse joined | 01:11 |
| ← betelgeuse left | 01:14 |
| ← zebrag left | 01:14 |
| ← BUSY left | 01:15 |
| ← Quack left | 01:15 |
| → betelgeuse joined | 01:15 |
| → Quack joined | 01:16 |
| → drew` joined | 01:18 |
| ← betelgeuse left | 01:18 |
| → rewrit3 joined | 01:18 |
| drew` → drew | 01:19 |
| → betelgeuse joined | 01:19 |
| ← betelgeuse left | 01:22 |
| ← venmx left | 01:24 |
| → betelgeuse joined | 01:24 |
| ← betelgeuse left | 01:26 |
| → betelgeuse joined | 01:28 |
| ← mgedmin left | 01:30 |
| ← betelgeuse left | 01:31 |
| → pete443 joined | 01:31 |
| → betelgeuse joined | 01:32 |
| ← pete443_ left | 01:32 |
| → mgedmin joined | 01:32 |
| ← betelgeuse left | 01:35 |
| → betelgeuse joined | 01:37 |
| ← tang^ left | 01:37 |
| ← jsrnop left | 01:39 |
| ← betelgeuse left | 01:39 |
| → betelgeuse joined | 01:41 |
| → nate1 joined | 01:41 |
| → id joined | 01:42 |
| id → Nay | 01:42 |
| ← Nay left | 01:43 |
| ← betelgeuse left | 01:44 |
| → betelgeuse joined | 01:45 |
| → Aye joined | 01:46 |
| Aye → id | 01:46 |
| → Nay joined | 01:47 |
| ← betelgeuse left | 01:48 |
| ← Nay left | 01:49 |
| ← id left | 01:49 |
| → betelgeuse joined | 01:50 |
| ← YuGiOhJCJ left | 01:50 |
| → venmx joined | 01:50 |
| → YuGiOhJCJ joined | 01:50 |
| → Aye joined | 01:52 |
| Aye → id | 01:52 |
| ← betelgeuse left | 01:52 |
| → qunzhong_luxian joined | 01:53 |
| → FFY00 joined | 01:53 |
| → betelgeuse joined | 01:54 |
| ← venmx left | 01:54 |
| id → Aye | 01:54 |
| ← Aye left | 01:56 |
| ← betelgeuse left | 01:57 |
| → betelgeuse joined | 01:58 |
| → jsrnop joined | 01:59 |
| ← qunzhong_luxian left | 01:59 |
| ← betelgeuse left | 02:01 |
| → betelgeuse joined | 02:03 |
| ← xkuru left | 02:03 |
| ← betelgeuse left | 02:05 |
| → betelgeuse joined | 02:07 |
| → venmx joined | 02:08 |
| ← betelgeuse left | 02:10 |
| → betelgeuse joined | 02:11 |
| ← venmx left | 02:12 |
| ← betelgeuse left | 02:14 |
| → betelgeuse joined | 02:15 |
| ← GoLiath_ left | 02:16 |
| ← betelgeuse left | 02:18 |
| → betelgeuse joined | 02:20 |
| ← betelgeuse left | 02:23 |
| → adlternative joined | 02:23 |
| ← Scotty_Trees left | 02:23 |
| → betelgeuse joined | 02:24 |
| → venmx joined | 02:24 |
| ← kikijiki left | 02:24 |
| ← betelgeuse left | 02:27 |
| ← nate1 left | 02:28 |
| → betelgeuse joined | 02:28 |
| ← venmx left | 02:28 |
| → bandaid joined | 02:29 |
| → nate1 joined | 02:29 |
| → ServerStatsDisco joined | 02:31 |
| ← betelgeuse left | 02:31 |
| → betelgeuse joined | 02:33 |
| ← sheepduck left | 02:33 |
| → finn_elija joined | 02:36 |
| FinnElija → Guest9344 | 02:36 |
| ← Guest9344 left | 02:36 |
| finn_elija → FinnElija | 02:36 |
| ← betelgeuse left | 02:36 |
| ← nate1 left | 02:37 |
| → betelgeuse joined | 02:37 |
| ← betelgeuse left | 02:40 |
| → betelgeuse joined | 02:41 |
| → venmx joined | 02:42 |
| ← betelgeuse left | 02:44 |
| ← venmx left | 02:46 |
| → betelgeuse joined | 02:46 |
| ← betelgeuse left | 02:49 |
| → betelgeuse joined | 02:50 |
| ← gast0n left | 02:52 |
| ← betelgeuse left | 02:53 |
| → betelgeuse joined | 02:55 |
| ← betelgeuse left | 02:58 |
| → fstd joined | 02:58 |
| → blue_penquin joined | 02:59 |
| → betelgeuse joined | 02:59 |
| → hbautista_ joined | 03:02 |
| ← betelgeuse left | 03:02 |
| ← fstd_ left | 03:02 |
| → venmx joined | 03:03 |
| → betelgeuse joined | 03:03 |
| ← venmx left | 03:04 |
| ← ferdna left | 03:05 |
| ← betelgeuse left | 03:06 |
| → betelgeuse joined | 03:08 |
| → zunino joined | 03:09 |
| ← betelgeuse left | 03:11 |
| → betelgeuse joined | 03:12 |
| ← betelgeuse left | 03:15 |
| → betelgeuse joined | 03:16 |
| ← hbautista_ left | 03:17 |
| → aquijoule_ joined | 03:18 |
| ← betelgeuse left | 03:19 |
| ← aquijoule__ left | 03:20 |
| → betelgeuse joined | 03:21 |
| ← betelgeuse left | 03:24 |
| ← hmmmas left | 03:25 |
| → betelgeuse joined | 03:25 |
| ← betelgeuse left | 03:28 |
| ← hoochmonger left | 03:28 |
| → betelgeuse joined | 03:30 |
| ← anton left | 03:32 |
| → Dreadnaught joined | 03:32 |
| ← betelgeuse left | 03:33 |
| → anton joined | 03:33 |
| → betelgeuse joined | 03:34 |
| ← Kulrak left | 03:35 |
| ← zunino left | 03:36 |
| ← Vonter left | 03:37 |
| ← betelgeuse left | 03:37 |
| → forgotmynick joined | 03:38 |
| → betelgeuse joined | 03:39 |
| → Lord_of_Life_ joined | 03:39 |
| → Vonter joined | 03:39 |
| ← Lord_of_Life left | 03:39 |
| Lord_of_Life_ → Lord_of_Life | 03:40 |
| ← anton left | 03:41 |
| ← betelgeuse left | 03:42 |
| → anton joined | 03:42 |
| → betelgeuse joined | 03:43 |
| ← debsan left | 03:43 |
| ← betelgeuse left | 03:46 |
| ← jasbrg left | 03:46 |
| → betelgeuse joined | 03:47 |
| → Xenguy joined | 03:50 |
| ← betelgeuse left | 03:50 |
| → betelgeuse joined | 03:52 |
| ← betelgeuse left | 03:55 |
| → betelgeuse joined | 03:56 |
| ← shailangsa left | 03:57 |
| ← betelgeuse left | 03:59 |
| → betelgeuse joined | 04:00 |
| ← adlternative left | 04:01 |
| ← betelgeuse left | 04:03 |
| ← Crispy left | 04:04 |
| → Crispy joined | 04:04 |
| → betelgeuse joined | 04:05 |
| ← justache left | 04:05 |
| → justache joined | 04:06 |
| ← betelgeuse left | 04:08 |
| ← skapata left | 04:08 |
| → betelgeuse joined | 04:09 |
| ← AbleBacon left | 04:10 |
| → shailangsa joined | 04:11 |
| ← vishal left | 04:12 |
| ← betelgeuse left | 04:12 |
| → betelgeuse joined | 04:13 |
| ← bandaid left | 04:14 |
| → vishal joined | 04:14 |
| ← betelgeuse left | 04:16 |
| → betelgeuse joined | 04:18 |
| ← Murr left | 04:19 |
| → Murr joined | 04:19 |
| ← betelgeuse left | 04:21 |
| ← lgc left | 04:22 |
| → betelgeuse joined | 04:22 |
| ← betelgeuse left | 04:25 |
| → Scotty_Trees joined | 04:26 |
| → betelgeuse joined | 04:26 |
| ← arcatech left | 04:29 |
| ← betelgeuse left | 04:30 |
| → betelgeuse joined | 04:31 |
| → nate1 joined | 04:33 |
| ← betelgeuse left | 04:34 |
| → betelgeuse joined | 04:35 |
| ← nate1 left | 04:37 |
| ← betelgeuse left | 04:38 |
| → betelgeuse joined | 04:40 |
| ← betelgeuse left | 04:43 |
| → betelgeuse joined | 04:44 |
| ← betelgeuse left | 04:47 |
| → betelgeuse joined | 04:49 |
| ← betelgeuse left | 04:52 |
| → betelgeuse joined | 04:53 |
| → venmx joined | 04:53 |
| ← betelgeuse left | 04:56 |
| ← venmx left | 04:57 |
| → betelgeuse joined | 04:57 |
| ← betelgeuse left | 05:00 |
| ← YuGiOhJCJ left | 05:01 |
| → betelgeuse joined | 05:02 |
| → onizu joined | 05:04 |
| ← travaldo left | 05:05 |
| ← betelgeuse left | 05:05 |
|
onizu
| hi | 05:06 |
| → betelgeuse joined | 05:06 |
|
onizu
| if I worked on a repository (made changes and committed) and then access it on another computer with the same user, what do I need to do to sync the changes? | 05:07 |
|
ikke
| do you have ssh access? | 05:07 |
| ← betelgeuse left | 05:09 |
| → betelgeuse joined | 05:11 |
|
onizu
| yes ikke | 05:13 |
| ← betelgeuse left | 05:13 |
|
onizu
| but it's github | 05:13 |
|
| and connected via vscode | 05:13 |
|
ikke
| Did you push your changes to github? | 05:14 |
|
onizu
| yes, I did | 05:14 |
|
ikke
| then you can fetch from github, checkout the branch, and make sure it's up-to-date | 05:14 |
|
onizu
| it's 'master' | 05:15 |
| → betelgeuse joined | 05:15 |
|
onizu
| so I have to do git fetch? | 05:15 |
|
ikke
| that's step ine | 05:15 |
|
| one* | 05:15 |
|
onizu
| what is git pull? | 05:17 |
| ← betelgeuse left | 05:18 |
|
onizu
| I did 'git fetch'. Now I also have some changes done in the 2nd computer which I hadn't committed | 05:18 |
| → betelgeuse joined | 05:19 |
|
onizu
| "git fetch is the command that tells your local git to retrieve the latest meta-data info from the original (yet doesn't do any file transferring. ... git pull on the other hand does that AND brings (copy) those changes from the remote repository." | 05:19 |
|
ikke
| onizu: git pull is a shortcut command, which, in my opinion, you should only start using when you know what it does | 05:19 |
|
onizu
| so 'git fetch' is a safer option, to check | 05:20 |
|
ikke
| yes | 05:20 |
|
| then you can decide to merge, rebase, whatever | 05:20 |
|
| If you have local uncommitted changes, it's good pratice to commit them first | 05:21 |
|
onizu
| ok. 'git status' says: On branch master - Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) - Changes not staged for commit: (use "git add <file>..." to update what will be committed) | 05:22 |
| ← betelgeuse left | 05:22 |
|
onizu
| ikke: if I commit my local changes, and they seem to conflict with the changes I have recently done on another computer and pushed to the repo, what will happen? | 05:22 |
|
ikke
| then it will result in merge conflict when you merge or rebase | 05:23 |
|
| and you need to solve them before you can continue | 05:23 |
|
onizu
| ok | 05:23 |
|
| so I must first commit & push these changes on the 2nd computer? | 05:23 |
| → betelgeuse joined | 05:23 |
| ← AnAverageHuman left | 05:25 |
| ← betelgeuse left | 05:26 |
|
onizu
| I committed the changes on 2nd-comp. Now on doing 'git push' it says: ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com...' Updates were rejected because the tip of your current branch is behind its remote counterpart. | 05:27 |
|
ikke
| git rebase @{upstream} | 05:28 |
| → betelgeuse joined | 05:28 |
|
onizu
| I did git pull | 05:29 |
|
| :/ | 05:29 |
| ← betelgeuse left | 05:31 |
| → AnAverageHuman joined | 05:31 |
| → betelgeuse joined | 05:32 |
| ← betelgeuse left | 05:35 |
|
ikke
| Ok, it then probably did a merge | 05:35 |
| ← thiago left | 05:36 |
| → betelgeuse joined | 05:37 |
| ← betelgeuse left | 05:40 |
| → betelgeuse joined | 05:41 |
| ← betelgeuse left | 05:44 |
| → betelgeuse joined | 05:45 |
| → venmx joined | 05:47 |
| → ekathva joined | 05:47 |
| ← betelgeuse left | 05:48 |
| ← zmt01 left | 05:49 |
| → betelgeuse joined | 05:50 |
| ← venmx left | 05:52 |
| ← ekathva left | 05:52 |
| ← betelgeuse left | 05:53 |
| → betelgeuse joined | 05:54 |
| → aak_ joined | 05:55 |
|
aak_
| Hi all :-) | 05:55 |
| → unixbhaskar joined | 05:56 |
|
aak_
| I have a hard time understanding submodules and branching. | 05:56 |
|
| Let's say I have a superproject A on branch master and add a submodule B tracking branch submodule_master | 05:56 |
| ← betelgeuse left | 05:57 |
|
aak_
| If I know switch to a branch on superproject A that does not have the submodule and switch back to the master branch, then the submodule branch shows as "no branch" | 05:57 |
| ← forgotmynick left | 05:57 |
|
aak_
| why is that happening, and how can I solve that? | 05:57 |
|
| know=now... sorry | 05:57 |
| → betelgeuse joined | 05:58 |
| → cpackham[m] joined | 05:59 |
|
aak_
| The problem with the submodule showing "no branch" is that "submodule update --remote --merge" won't work to pull the latest changes in the submodules branch then | 05:59 |
| ← betelgeuse left | 06:01 |
| → betelgeuse joined | 06:03 |
| ← betelgeuse left | 06:06 |
| → betelgeuse joined | 06:07 |
| ← betelgeuse left | 06:10 |
| → betelgeuse joined | 06:12 |
| ← betelgeuse left | 06:14 |
| ← AnAverageHuman left | 06:15 |
| → wender joined | 06:15 |
| → furrymcgee joined | 06:16 |
| → betelgeuse joined | 06:16 |
| → lucerne joined | 06:17 |
| ← betelgeuse left | 06:19 |
| ← Murr left | 06:19 |
| → Murr joined | 06:19 |
| ← computeiro left | 06:19 |
| → betelgeuse joined | 06:20 |
| ← betelgeuse left | 06:23 |
| → betelgeuse joined | 06:24 |
| → adlternative joined | 06:27 |
| ← betelgeuse left | 06:27 |
| → betelgeuse joined | 06:29 |
| ← aak_ left | 06:29 |
| ← betelgeuse left | 06:32 |
| → jhulten joined | 06:33 |
| → betelgeuse joined | 06:33 |
| ← betelgeuse left | 06:36 |
| → betelgeuse joined | 06:38 |
| → xrisovalantis joined | 06:41 |
| ← betelgeuse left | 06:41 |
| → betelgeuse joined | 06:42 |
| ← betelgeuse left | 06:45 |
| → betelgeuse joined | 06:46 |
| → forgotmynick joined | 06:48 |
| ← betelgeuse left | 06:50 |
| → jazzy joined | 06:50 |
| → dimi1947 joined | 06:50 |
| → betelgeuse joined | 06:51 |
| → a6a45081-2b83 joined | 06:52 |
| ← betelgeuse left | 06:54 |
| → betelgeuse joined | 06:55 |
| ← jhulten left | 06:56 |
| ← betelgeuse left | 06:59 |
| → betelgeuse joined | 07:00 |
| → rfuentess joined | 07:01 |
| ← betelgeuse left | 07:03 |
| → betelgeuse joined | 07:04 |
| ← unluckyshrubbery left | 07:04 |
| ← betelgeuse left | 07:07 |
| → betelgeuse joined | 07:09 |
|
cbreak
| it's normal for submodules to not be on a branch | 07:09 |
| ← betelgeuse left | 07:12 |
| ← drew left | 07:13 |
| → betelgeuse joined | 07:13 |
| ← betelgeuse left | 07:13 |
| ← keypusher left | 07:16 |
| → jhulten joined | 07:16 |
| → drew joined | 07:18 |
| ← jhulten left | 07:21 |
| ← malteger left | 07:24 |
| → raindrop joined | 07:25 |
| ← a6a45081-2b83 left | 07:27 |
| → malteger joined | 07:27 |
| ← stkrdknmibalz left | 07:33 |
| → arash joined | 07:43 |
| ← arash left | 07:49 |
| → gas51627 joined | 07:49 |
| → arash joined | 07:51 |
| ← bket left | 08:01 |
| ← sudoforge left | 08:04 |
| → bket joined | 08:08 |
| ← frobnic left | 08:09 |
| ← jazzy left | 08:09 |
| → frobnic joined | 08:10 |
| ← aquijoule_ left | 08:10 |
| → aquijoule_ joined | 08:10 |
| → otisolsen70 joined | 08:11 |
| ← frobnic left | 08:16 |
| ← raindrop left | 08:16 |
| → frobnic joined | 08:21 |
| → theoceaniscool joined | 08:24 |
| ← drew left | 08:24 |
| → phylaz joined | 08:25 |
| → drew joined | 08:27 |
| → alzgh joined | 08:28 |
| → hegstal joined | 08:28 |
| ← phylaz left | 08:31 |
| → phylaz joined | 08:32 |
| ← bket left | 08:32 |
| ← phylaz left | 08:34 |
| → bket joined | 08:34 |
| → seL4 joined | 08:35 |
| → phylaz joined | 08:35 |
|
seL4
| if you started a pull request then later someone else makes a commit editing the file and you have to add another commit after that to reedit the file, can you rebase the commits? | 08:36 |
|
| assuming inbetween pull request and commit editing the file there are other commits | 08:36 |
| ← furrymcgee left | 08:40 |
| ← seL4 left | 08:41 |
| ← hnOsmium0001 left | 08:44 |
| → LemurP joined | 08:44 |
| ← frobnic left | 08:48 |
| → frobnic joined | 08:49 |
| → raindrop joined | 08:51 |
| ← bket left | 08:55 |
| → bket_ joined | 08:55 |
| ← madewokherd left | 08:56 |
| ← forgotmynick left | 08:58 |
| → unluckyshrubbery joined | 09:10 |
| ← unixbhaskar left | 09:13 |
| ← Betal left | 09:16 |
| → unixbhaskar joined | 09:19 |
| → viral_mutant[m] joined | 09:21 |
| → pulse joined | 09:30 |
| ← LemurP left | 09:35 |
| → pretty_dumm_guy joined | 09:38 |
| ← raindrop left | 09:42 |
| ← pony left | 09:47 |
| → pony joined | 09:47 |
| → keypusher joined | 09:47 |
| → woohoiV5 joined | 09:50 |
| ← arash left | 09:50 |
| → arash joined | 09:50 |
|
cbreak
| seL4: sure | 09:53 |
|
| just don't forget to tell who ever you requested to pull from you that your branch history changed | 09:53 |
| ← lacrymology left | 10:06 |
| → TomyWork joined | 10:06 |
| ← Scotty_Trees left | 10:11 |
| → Scotty_Trees joined | 10:18 |
| → LemurP joined | 10:19 |
| ← bin101_ left | 10:25 |
| → bin101 joined | 10:28 |
| ← ServerStatsDisco left | 10:28 |
| ← cpackham[m] left | 10:28 |
| ← viral_mutant[m] left | 10:28 |
| → Rubin joined | 10:30 |
| → skapata joined | 10:30 |
| ← skapata left | 10:30 |
| → skapata joined | 10:30 |
| → vdamewood joined | 10:32 |
| ← rewrit3 left | 10:33 |
| ← unixbhaskar left | 10:35 |
| → pinage404 joined | 10:37 |
| → cpackham[m] joined | 10:37 |
| → tuxayo joined | 10:37 |
| → heftig[m] joined | 10:37 |
| → bLeDy[m] joined | 10:37 |
| → morguldir joined | 10:37 |
| → kadoban joined | 10:37 |
| → Kamui joined | 10:37 |
| → Guest3894 joined | 10:37 |
| → novasharper joined | 10:37 |
| → dieggsy joined | 10:37 |
| → ServerStatsDisco joined | 10:37 |
| → elemongw[m] joined | 10:37 |
| → crysisanon[m] joined | 10:37 |
| → thetourist108 joined | 10:37 |
| → inkbottle[m] joined | 10:37 |
| → nazarii[m] joined | 10:37 |
| → viral_mutant[m] joined | 10:37 |
| → silvio[m] joined | 10:37 |
| ← Scotty_Trees left | 10:40 |
| → Scotty_Trees joined | 10:41 |
| → qpdb joined | 10:44 |
| ← bket_ left | 10:48 |
| → hoochmonger joined | 11:08 |
| ← chronon left | 11:11 |
| → bket joined | 11:14 |
| → GoLiath_ joined | 11:17 |
| ← GoLiath_ left | 11:28 |
| ← gas51627 left | 11:48 |
| → rewrit3 joined | 11:56 |
| → zebrag joined | 11:59 |
| Guest3894 → blue_penquin[m] | 11:59 |
| → alfredb joined | 12:00 |
| ← bket left | 12:01 |
| ← hoochmonger left | 12:06 |
| → Wuzzy joined | 12:10 |
| → henko joined | 12:19 |
| → azed joined | 12:22 |
| ← wender left | 12:27 |
| jgn → jg | 12:34 |
| ← hegstal left | 12:35 |
| → hegstal joined | 12:36 |
| ← rewrit3 left | 12:36 |
| → Torr joined | 12:36 |
| ← alzgh left | 12:36 |
| ← Vonter left | 12:39 |
| → rewrit3 joined | 12:39 |
| → AnAverageHuman joined | 12:44 |
| → gh34 joined | 12:45 |
| ← rewrit3 left | 12:48 |
| jg → jgn | 12:50 |
| → GoLiath_ joined | 12:52 |
| → debsan joined | 12:53 |
| spaceplo_ → SpacePlod | 12:54 |
| ← Tobbi_ left | 12:54 |
| → Tobbi_ joined | 12:55 |
| → kikijiki joined | 12:57 |
| → Crassus joined | 13:01 |
| → qunzhong_luxian joined | 13:02 |
| ← kikijiki left | 13:04 |
| ← Xenguy left | 13:12 |
| → jazzy joined | 13:12 |
| ← adlternative left | 13:17 |
| ← Codaraxis_ left | 13:18 |
| → madewokherd joined | 13:18 |
| → adlternative joined | 13:18 |
| → Codaraxis_ joined | 13:18 |
| → odoood joined | 13:18 |
| ← Crassus left | 13:20 |
| ← ketas left | 13:20 |
| ← dimi1947 left | 13:21 |
| ← blue_penquin left | 13:29 |
| ← igemnace left | 13:31 |
| → raindrop joined | 13:34 |
| ← pretty_dumm_guy left | 13:36 |
| → ghost43 joined | 13:38 |
| → bket joined | 13:42 |
| ← GoLiath_ left | 13:42 |
| → jasbrg joined | 13:47 |
| → dimi1947 joined | 13:48 |
| ← tejr left | 13:51 |
| → tejr joined | 13:52 |
| ← keypusher left | 13:53 |
| → duckonomy joined | 13:56 |
| ← otisolsen70 left | 13:57 |
| → AbleBacon joined | 13:57 |
| ← dimi1947 left | 13:59 |
| → dimi1947 joined | 14:00 |
| ← jinsun left | 14:00 |
| → jinsun joined | 14:01 |
| ← bket left | 14:03 |
| → thiago joined | 14:04 |
| ← acid left | 14:09 |
| → acid joined | 14:10 |
| ← madewokherd left | 14:21 |
| ← Notgnoshi left | 14:22 |
| ← azed left | 14:24 |
| → ketas joined | 14:27 |
| ← FFY00 left | 14:28 |
| → keypusher joined | 14:28 |
| → FFY00 joined | 14:29 |
| → cousteau joined | 14:29 |
| → thiago_ joined | 14:37 |
| ← thiago_ left | 14:41 |
| ← raindrop left | 14:43 |
| → madewokherd joined | 14:47 |
| → Guest42 joined | 14:48 |
| → bket joined | 14:48 |
| ← theoceaniscool left | 14:51 |
| → winircuser-318 joined | 14:53 |
| ← qunzhong_luxian left | 14:58 |
| → arcatech joined | 14:58 |
| → Notgnoshi joined | 15:03 |
| ← jaggz left | 15:04 |
| → m0viefreak joined | 15:07 |
| → AnAverageHuman_ joined | 15:07 |
| ← AnAverageHuman left | 15:07 |
| → zmt00 joined | 15:07 |
| → tang^ joined | 15:11 |
| ← tang^ left | 15:14 |
| → mehwork joined | 15:17 |
|
mehwork
| is there a way to just list the files that were modified in a branch but were already committed? | 15:17 |
| → tang^ joined | 15:18 |
|
mehwork
| nm, googled it after i asked (a no no) git diff --name-only develop | 15:19 |
| ← xrisovalantis left | 15:21 |
| ← TomyWork left | 15:22 |
| → lgc joined | 15:22 |
| ← Guest42 left | 15:22 |
| → betelgeuse joined | 15:26 |
| ← betelgeuse left | 15:29 |
| → betelgeuse joined | 15:30 |
| ← mehwork left | 15:30 |
| ← betelgeuse left | 15:33 |
| ← filePeter left | 15:33 |
| ← odoood left | 15:34 |
| → betelgeuse joined | 15:35 |
| ← betelgeuse left | 15:38 |
| → betelgeuse joined | 15:39 |
| → reset joined | 15:40 |
| ← betelgeuse left | 15:42 |
| → betelgeuse joined | 15:43 |
| → neobrain joined | 15:43 |
| → odoood joined | 15:44 |
| → Guest42 joined | 15:44 |
| → alzgh joined | 15:45 |
| ← betelgeuse left | 15:46 |
| → betelgeuse joined | 15:48 |
| ← betelgeuse left | 15:51 |
| → betelgeuse joined | 15:52 |
| → s0ullight joined | 15:55 |
| → thiago_ joined | 15:55 |
| ← betelgeuse left | 15:55 |
| ← gothicserpent left | 15:56 |
| → betelgeuse joined | 15:57 |
| ← betelgeuse left | 16:00 |
| → betelgeuse joined | 16:01 |
| ← betelgeuse left | 16:04 |
| → zeenk joined | 16:07 |
| ← Guest42 left | 16:11 |
| → sudoforge joined | 16:12 |
| ← Murr left | 16:18 |
| → Murr joined | 16:18 |
| ← AnAverageHuman_ left | 16:20 |
| → gothicserpent joined | 16:22 |
| → supernovah joined | 16:27 |
| → gas51627 joined | 16:31 |
| ← pulse left | 16:33 |
|
gas51627
| Hi, this is man of rev-list. Why does it say that line A--Q is the first parent of each merge, while below it says that M, N, O, P, Q are merges? http://imgur.com/a/DzEHYt6 | 16:34 |
|
ikke
| man git rev-list | 16:34 |
|
gitinfo
| the git-rev-list manpage is available at https://gitirc.eu/git-rev-list.html | 16:34 |
| → raindrop joined | 16:35 |
|
ikke
| gas51627: both can be true at the same time | 16:35 |
|
| M is the first parent of merge-commit N | 16:36 |
| → Guest42 joined | 16:36 |
|
ikke
| even though M itself is a merge commit | 16:36 |
|
gas51627
| ikke: yes it can, but not for Q though | 16:36 |
|
| Q is just a merge and not a first parent of any merge | 16:37 |
| ← thiago_ left | 16:37 |
|
ikke
| "The horizontal line of history A---Q is taken to be the first parent of each merge." | 16:37 |
|
| So it says, just consider that part of the history the first parent | 16:38 |
|
| so it does not mean that Q must be the first parent of a merge | 16:38 |
|
gas51627
| Just to be sure, first parent means that it's where merge done into? | 16:39 |
|
ikke
| no | 16:39 |
|
gas51627
| (Second parent is from) | 16:39 |
| → pulse joined | 16:40 |
|
ikke
| A merge has 2 parents | 16:40 |
|
| those are the to commits that were merged into the merge commit | 16:40 |
|
| s/to/two | 16:40 |
|
gas51627
| Yes, but you merge into a branch | 16:40 |
|
| So first parent is the parent in the branch you are merging to | 16:41 |
| → AnAverageHuman joined | 16:41 |
|
gas51627
| And second parent is the commit in the branch you are merging from | 16:41 |
|
| That's what i meant | 16:41 |
|
ikke
| yes, if you have branch foo checked out, and merge bar into it, then the commit foo points to is the first parent, and the commit bar points to is the 2nd parent | 16:41 |
|
gas51627
| Thank you | 16:42 |
| → Guest53__ joined | 16:43 |
| ← Guest53__ left | 16:43 |
| → Guest53 joined | 16:44 |
| ← cousteau left | 16:46 |
| ← gothicserpent left | 16:48 |
| → vicfred joined | 16:48 |
| ← winircuser-318 left | 16:49 |
| → feriman joined | 16:50 |
| → gothicserpent joined | 16:50 |
| → gast0n joined | 16:51 |
| ← vdamewood left | 16:52 |
| ← rfuentess left | 16:53 |
| ← zmt00 left | 16:59 |
| ← madewokherd left | 17:05 |
| ← Guest42 left | 17:17 |
| ← Dotz0cat left | 17:17 |
| ← Guest53 left | 17:18 |
| → hnOsmium0001 joined | 17:19 |
| ← henko left | 17:20 |
| → bjwyman_ joined | 17:21 |
| ← bjwyman left | 17:24 |
| → madewokherd joined | 17:28 |
| ← tg left | 17:30 |
|
anddam
| is using --word-diff-regex or an external script the only way to see whitespaces change in diff? | 17:32 |
| ← dimi1947 left | 17:32 |
| → Sasazuka joined | 17:33 |
| → chronon joined | 17:38 |
| → dimi1947 joined | 17:40 |
| → Dotz0cat joined | 17:43 |
| → Guest53 joined | 17:45 |
| ← gothicserpent left | 17:49 |
| ← arash left | 17:51 |
| → gothicserpent joined | 17:51 |
| → arash joined | 17:52 |
| → hbautista joined | 17:53 |
| ← s0ullight left | 17:53 |
| → zmt00 joined | 17:55 |
|
gas51627
| Another question about the rev-list man. At the end of the picture it says that "rule to only follow the treesame parent, removed B". Does this mean that because M is treesame to both A and B. Only A was followed? | 17:57 |
| ← onizu left | 18:03 |
| ← Guest53 left | 18:12 |
| ← Gustavo6046 left | 18:23 |
| ← ano left | 18:25 |
| → ano joined | 18:25 |
| ← dimi1947 left | 18:32 |
| ← Noisytoot left | 18:33 |
| → Noisytoot joined | 18:34 |
| → Gustavo6046 joined | 18:49 |
| → PuercoPop joined | 18:55 |
| ← AnAverageHuman left | 18:56 |
| ← Kill-Anirnals left | 19:00 |
| → Guest53 joined | 19:00 |
| ← LuKaRo left | 19:01 |
| → LuKaRo_ joined | 19:03 |
| → furrymcgee joined | 19:07 |
| → staticvoidmaine joined | 19:18 |
| → seL4 joined | 19:19 |
| → Pacific_ joined | 19:20 |
| ← arash left | 19:23 |
| ← seL4 left | 19:26 |
| → Pacific__ joined | 19:26 |
| → qunzhong_luxian joined | 19:28 |
| → gareppa joined | 19:28 |
| → pretty_dumm_guy joined | 19:28 |
| ← gareppa left | 19:30 |
| ← Pacific_ left | 19:30 |
| ← Pacific__ left | 19:33 |
| ← qunzhong_luxian left | 19:33 |
| → qunzhong_luxian joined | 19:34 |
| ← alfredb left | 19:36 |
| ← arcatech left | 19:42 |
| → Taro42 joined | 19:44 |
|
Taro42
| Hello. I have a question about --verify-signatures: Do I really need to set the trust level of every public key to 5 / ultimate? I tried anything less than 5 and git complained about it being untrustworthy. This is weird because ultimate trust usually implies that I'm the owner, but there may be other keys that I trust, but I wouldn't want to set it to set that trust level regardless. | 19:45 |
|
| e.g. git pull --verify-signatures | 19:45 |
|
| henk: thanks for the reminder btw. I completely forgot about it. | 19:45 |
| → arcatech joined | 19:46 |
| → orbyt joined | 19:50 |
| ← LemurP left | 19:57 |
| ← simon816 left | 20:01 |
| ← Guest53 left | 20:01 |
| → Guest53__ joined | 20:01 |
| → GoLiath_ joined | 20:02 |
| → Betal joined | 20:04 |
| → hqdruxn08 joined | 20:10 |
| → simon816 joined | 20:11 |
| ← hqdruxn08_ left | 20:11 |
| ← cehteh left | 20:14 |
| ← pulse left | 20:15 |
| → pulse joined | 20:15 |
| ← staticvoidmaine left | 20:20 |
| ← gas51627 left | 20:21 |
| ← Guest53__ left | 20:23 |
| → cehteh joined | 20:30 |
| ← aquijoule_ left | 20:31 |
| → aquijoule_ joined | 20:32 |
| aquijoule_ → richbridger | 20:32 |
| ← hbautista left | 20:35 |
| ← richbridger left | 20:36 |
| → richbridger joined | 20:37 |
| → hqdruxn08_ joined | 20:38 |
| → Vonter joined | 20:42 |
| ← hqdruxn08 left | 20:42 |
| ← qunzhong_luxian left | 20:43 |
| → hbautista joined | 20:44 |
| ← odoood left | 20:48 |
| ← feriman left | 20:49 |
| ← raindrop left | 20:51 |
| → hqdruxn08 joined | 20:54 |
| ← hqdruxn08_ left | 20:56 |
| → hqdruxn08_ joined | 20:57 |
| → theoceaniscool joined | 20:58 |
| ← hqdruxn08 left | 20:59 |
| → oirad joined | 21:06 |
| → Guest53 joined | 21:06 |
| ← Guest53 left | 21:09 |
| ← GoLiath_ left | 21:10 |
| ← madewokherd left | 21:11 |
| ← zeenk left | 21:14 |
| ← Nalt left | 21:15 |
| ← gh34 left | 21:17 |
| ← Vonter left | 21:17 |
| → Guest53 joined | 21:18 |
|
PuercoPop
| I remember reading there was a term to search the git mailing list when looking for good first issues but I can't seem to find the page where I read it. Anyone got any idea what it was? | 21:19 |
| ← Guest53 left | 21:21 |
| → Guest53__ joined | 21:22 |
|
ikke
| #leftoverbits | 21:23 |
| → odoood joined | 21:30 |
|
PuercoPop
| ikke: Thanks! | 21:31 |
| → madewokherd joined | 21:44 |
| ← Guest53__ left | 21:45 |
| ← cinix left | 21:46 |
| → lionkor joined | 21:52 |
| → kenanmarasli joined | 21:58 |
| ← odoood left | 21:59 |
| → Codaraxis joined | 22:10 |
| ← Codaraxis_ left | 22:14 |
| ← Murr left | 22:18 |
| → Murr joined | 22:18 |
| → Pacific__ joined | 22:20 |
| ← Pacific__ left | 22:25 |
| ← debsan left | 22:27 |
| ← kenanmarasli left | 22:30 |
| → iamtheranger joined | 22:31 |
| → Guest53 joined | 22:32 |
| ← Guest53 left | 22:41 |
| ← furrymcgee left | 23:03 |
| ← tang^ left | 23:04 |
| → mikail joined | 23:08 |
| → mikail_ joined | 23:08 |
| ← mikail_ left | 23:09 |
| ← oirad left | 23:13 |
| ← Scotty_Trees left | 23:20 |
| ← mikail left | 23:20 |
| → ferdna joined | 23:23 |
| → Scotty_Trees joined | 23:30 |
| → Pent joined | 23:41 |
| → zebrag_ joined | 23:48 |
| ← zebrag left | 23:48 |
| → hmmmas joined | 23:50 |
| ← lionkor left | 23:54 |
| ← hmmmas left | 23:55 |