| 2022-06-12 |
| ← fstd left | 00:03 |
| → fstd joined | 00:05 |
| ← _xor left | 00:08 |
| ← littlebobeep left | 00:08 |
| ← ThorMojito left | 00:12 |
| → robszarka joined | 00:12 |
| → Betal joined | 00:14 |
| ← szarka left | 00:15 |
| ← hbautista_ left | 00:24 |
| ← magic_ninja left | 00:28 |
| → nate4 joined | 00:29 |
| ← nate3 left | 00:29 |
| ← Neo001 left | 00:30 |
| ← bloody left | 00:30 |
| → bloody joined | 00:31 |
| → rabdog joined | 00:31 |
| ← nate4 left | 00:31 |
| → nate4 joined | 00:31 |
| → bambanxx joined | 00:37 |
| → Neo001 joined | 00:46 |
| ← Neo001 left | 00:47 |
| ← Lord_of_Life left | 00:49 |
| → Lord_of_Life joined | 00:51 |
| → dionysus69 joined | 00:53 |
| ← EvilDMP left | 00:56 |
| → jjakob joined | 00:58 |
| ← jjakob left | 01:00 |
| → laureee joined | 01:04 |
| ← nate4 left | 01:05 |
| → pasky joined | 01:05 |
| → nate4 joined | 01:05 |
| → littlebobeep joined | 01:10 |
| → ThorMojito joined | 01:12 |
| ← ThorMojito left | 01:13 |
| → donofrio__ joined | 01:14 |
| ← donofrio_ left | 01:18 |
| → ThorMojito joined | 01:20 |
| ← dionysus69 left | 01:24 |
| ← structoha left | 01:25 |
| ← ThorMojito left | 01:25 |
| ← nate4 left | 01:28 |
| → structoha joined | 01:28 |
| → cixx joined | 01:29 |
| ← littlebobeep left | 01:33 |
| ← terminaldweller left | 01:34 |
| ← cixx left | 01:34 |
| ← pretty_dumm_guy left | 01:35 |
| → terminaldweller joined | 01:36 |
| → ThorMojito joined | 01:38 |
| ← palasso left | 01:41 |
| → cixx joined | 01:45 |
| ← ThorMojito left | 01:48 |
| ← cixx left | 01:50 |
| ← structoha left | 01:55 |
| → littlebobeep joined | 02:00 |
| → cixx joined | 02:00 |
| ← dtux left | 02:02 |
| → mrap joined | 02:07 |
| ← mrap left | 02:07 |
| → mrap joined | 02:07 |
| ← mrap left | 02:07 |
| → mrap joined | 02:07 |
| → ThorMojito joined | 02:07 |
| ← mrap left | 02:12 |
| ← ThorMojito left | 02:14 |
| ← littlebobeep left | 02:21 |
| ← sobkas left | 02:21 |
| → sa0 joined | 02:25 |
| → structoha joined | 02:26 |
| ← Teacup left | 02:28 |
| → ThorMojito joined | 02:28 |
| → hamburgler joined | 02:29 |
| → littlebobeep joined | 02:30 |
| → Teacup joined | 02:30 |
| ← ThorMojito left | 02:32 |
| ← pulse left | 02:34 |
| → gurkenglas joined | 02:34 |
| → txtsd joined | 02:39 |
| ← brettgilio left | 02:41 |
| → ThorMojito joined | 02:41 |
| ← structoha left | 02:43 |
| ← tirnanog left | 02:43 |
| → structoha joined | 02:43 |
| ← littlebobeep left | 02:45 |
| ← hamburgler left | 02:46 |
| ← keypusher left | 02:46 |
| → keypusher joined | 02:46 |
| → nate4 joined | 02:50 |
| ← onizu left | 02:54 |
| → littlebobeep joined | 02:56 |
| ← sa0 left | 02:59 |
| ← littlebobeep left | 03:00 |
| ← gurkenglas left | 03:01 |
| → littlebobeep joined | 03:01 |
| → Quantum-Tiger joined | 03:03 |
| ← Quantum-Tiger left | 03:04 |
| ← littlebobeep left | 03:11 |
| → gurkenglas joined | 03:20 |
| ← ThorMojito left | 03:21 |
| → littlebobeep joined | 03:23 |
| → hamburgler joined | 03:26 |
| ← hamburgler left | 03:26 |
| ← ano left | 03:30 |
| ← littlebobeep left | 03:30 |
| ← gildasio left | 03:30 |
| ← ghost43 left | 03:30 |
| → ghost43 joined | 03:30 |
| → ano joined | 03:30 |
| → littlebobeep joined | 03:30 |
| → vicfred joined | 03:31 |
| → gildasio joined | 03:31 |
|
Henry151
| hey y'all. I forked a project on github, then i cloned my fork. Since then, there have been some updates to the master of the project i forked, and I want those to be reflected in the master of my fork. How do I achieve this? | 03:34 |
|
| oh nevermind i figured it out | 03:35 |
| → structoha1 joined | 03:35 |
|
Thaodan
| Henry151: Just don't diverge master unless you really want to. | 03:36 |
|
| Then you can just pull master and rebase topic branches. | 03:37 |
|
Henry151
| yep i am only making changes in branches | 03:37 |
|
| the solution i found just now was i navigated to my fork on github and saw a button that said "fetch upstream" and clicked that | 03:38 |
|
| seemed to do exactly what i wanted | 03:38 |
| ← structoha left | 03:39 |
| → littlebo1eep joined | 03:43 |
| ← littlebobeep left | 03:44 |
| ← gast0n left | 03:47 |
| ← skapata left | 03:48 |
| ← cixx left | 03:51 |
| → cixx joined | 03:51 |
| ← cixx left | 03:53 |
| → skapata joined | 03:55 |
| → cixx joined | 03:57 |
| → Wh0 joined | 03:59 |
| ← crb left | 04:01 |
| → crb joined | 04:03 |
| ← Murr left | 04:05 |
| → Murr joined | 04:05 |
| ← Wh0 left | 04:06 |
| → hamburgler joined | 04:19 |
| ← junktext left | 04:20 |
| → junktext joined | 04:22 |
| ← gurkenglas left | 04:22 |
| → FH_thecat joined | 04:22 |
| ← hamburgler left | 04:27 |
| ← Xaldafax left | 04:28 |
| ← cixx left | 04:37 |
| → cixx joined | 04:38 |
| ← bambanxx left | 04:40 |
| → Sazhen86 joined | 04:50 |
| → madewokherd` joined | 04:54 |
| → lgc joined | 04:55 |
| ← madewokherd left | 04:56 |
| ← cixx left | 04:56 |
| → cixx joined | 04:57 |
| ← lgc left | 04:57 |
| ← cixx left | 04:58 |
| ← Sazhen86 left | 05:00 |
| → Wh0 joined | 05:01 |
| → cixx joined | 05:02 |
| ← vicfred left | 05:05 |
| → hamburgler joined | 05:14 |
| → sa0 joined | 05:20 |
| → V__ joined | 05:25 |
| ← Wh0 left | 05:28 |
| ← bloody left | 05:29 |
| ← jab416171 left | 05:32 |
| → jab416171 joined | 05:37 |
| ← thekingofbandit left | 05:39 |
| → ^vanessa^ joined | 05:40 |
| ← _vanessa_ left | 05:43 |
| ← nate4 left | 05:44 |
| → nate4 joined | 05:45 |
| → The_Blode joined | 05:46 |
| → hbautista_ joined | 05:52 |
| ← nate4 left | 05:54 |
| ← bket left | 05:55 |
| ← sa0 left | 05:55 |
| → bket joined | 05:56 |
| ← bket left | 05:57 |
| ← structoha1 left | 05:58 |
| → Wh0 joined | 05:59 |
| → coot joined | 06:01 |
| ← V__ left | 06:01 |
| → bket joined | 06:02 |
| ← hbautista_ left | 06:04 |
| → feriman joined | 06:05 |
| → trafficjam joined | 06:06 |
| ← Wh0 left | 06:12 |
| → nate4 joined | 06:16 |
| ← squirrel left | 06:19 |
| ← thiago left | 06:21 |
| ← littlebo1eep left | 06:25 |
| → littlebobeep joined | 06:36 |
| → SteveR joined | 06:36 |
| ← nate4 left | 06:41 |
| ← littlebobeep left | 06:51 |
| → nate4 joined | 06:55 |
| → littlebobeep joined | 06:55 |
| → phcerdan joined | 06:58 |
| ← great_taste left | 07:00 |
| → palasso joined | 07:03 |
| → theoceaniscool joined | 07:06 |
| ← littlebobeep left | 07:07 |
| → srinidhi joined | 07:11 |
| → littlebobeep joined | 07:13 |
| ← nate4 left | 07:13 |
|
trafficjam
| hey | 07:21 |
| ← trafficjam left | 07:23 |
| → Peng joined | 07:36 |
| ← Betal left | 07:37 |
| ← Peng left | 07:38 |
| → Peng joined | 07:39 |
| ← laureee left | 07:43 |
| → EvilDMP joined | 07:44 |
| → sa0 joined | 07:53 |
| ← bket left | 07:54 |
| → nate4 joined | 07:56 |
| → bket joined | 07:57 |
| ← GoGi left | 08:04 |
| ← SteveR left | 08:05 |
| → GoGi joined | 08:08 |
| ← GoGi left | 08:08 |
| → GoGi joined | 08:08 |
| ← EvilDMP left | 08:10 |
| ← littlebobeep left | 08:13 |
| ← sudoforge left | 08:14 |
| ← nate4 left | 08:14 |
| ← dustinm left | 08:16 |
| → littlebobeep joined | 08:16 |
| ← littlebobeep left | 08:23 |
| ← sa0 left | 08:24 |
| ← randm left | 08:25 |
| → randm joined | 08:25 |
| ← ajfriesen1 left | 08:26 |
| → ajfriesen1 joined | 08:26 |
| → dustinm joined | 08:27 |
| → littlebobeep joined | 08:27 |
| ← troyt left | 08:29 |
| → EvilDMP joined | 08:35 |
| → troyt joined | 08:35 |
| → zeenk joined | 08:36 |
| → squirrel joined | 08:45 |
| → kenanmarasli joined | 08:50 |
| → igemnace joined | 08:57 |
| ← EvilDMP left | 09:00 |
| → EvilDMP joined | 09:00 |
| ← phcerdan left | 09:00 |
| ← EvilDMP left | 09:01 |
| → EvilDMP joined | 09:01 |
| ← igemnace left | 09:05 |
| → igemnace joined | 09:06 |
| ← littlebobeep left | 09:12 |
| → dionysus69 joined | 09:18 |
| → littlebobeep joined | 09:22 |
| → bkircher joined | 09:23 |
| → cdown joined | 09:25 |
| ← cdown left | 09:27 |
| → csm3105 joined | 09:33 |
| → gurkenglas joined | 09:48 |
| ← jimm left | 10:00 |
| ← feriman left | 10:02 |
| → nyah joined | 10:04 |
| ← Murr left | 10:05 |
| → Murr joined | 10:05 |
| → feriman joined | 10:09 |
| ← feriman left | 10:10 |
| ← littlebobeep left | 10:12 |
| → natrys joined | 10:13 |
| ← coot left | 10:13 |
| → feriman joined | 10:13 |
| → nate4 joined | 10:13 |
| ← feriman left | 10:14 |
| ← skapata left | 10:16 |
| ← bkircher left | 10:17 |
| ← jazzy left | 10:17 |
| → feriman joined | 10:17 |
| → littlebobeep joined | 10:18 |
| ← vishal left | 10:23 |
| → sa0 joined | 10:23 |
| → vishal joined | 10:25 |
| → dig joined | 10:25 |
| → ___nick___ joined | 10:26 |
| ← EvilDMP left | 10:26 |
| ← LuKaRo left | 10:32 |
| → pretty_dumm_guy joined | 10:34 |
| → LuKaRo joined | 10:37 |
| ← pretty_dumm_guy left | 10:42 |
| ← littlebobeep left | 10:45 |
| ← nate4 left | 10:45 |
| → littlebobeep joined | 10:47 |
| ← csm3105 left | 10:54 |
| → EvilDMP joined | 10:55 |
| ← sa0 left | 10:55 |
| ← ___nick___ left | 11:01 |
| → pulse joined | 11:01 |
| → ThorMojito joined | 11:13 |
| → littlebo1eep joined | 11:17 |
| ← littlebobeep left | 11:18 |
| → ___nick___ joined | 11:19 |
| → pretty_dumm_guy joined | 11:19 |
| ← littlebo1eep left | 11:22 |
| → littlebobeep joined | 11:22 |
| ← littlebobeep left | 11:24 |
| → littlebobeep joined | 11:27 |
| → nate4 joined | 11:29 |
| → sobkas joined | 11:30 |
| → Saloframes joined | 11:42 |
| ← boxframes_ left | 11:42 |
| ← littlebobeep left | 11:42 |
| ← nate4 left | 11:43 |
| → littlebobeep joined | 11:49 |
| → KlungelSmurf joined | 11:53 |
| → liberaider joined | 11:53 |
| → Xenguy joined | 11:53 |
| → acebrianjuan joined | 11:54 |
| → sudoforge joined | 11:55 |
|
liberaider
| Is there something more efficient than `git log` for extracting commit data? Particularly with the `--shortstat` option, it's very slow for large repos... on the order of minutes. | 11:56 |
| → Wh0 joined | 11:56 |
|
ikke
| liberaider: depends on what you want to do with it, but there a fast-export interface | 11:57 |
| → pyeveryt_ joined | 11:57 |
|
liberaider
| ikke: I'm looking to get some key data out. Primary sha, author, dates, parent hashes, and change stats. | 11:58 |
| → jafarlihi joined | 11:59 |
| → coot joined | 12:00 |
|
liberaider
| It doesn't look like fast-export can include --shortstat data. | 12:01 |
| ← pyeveryt_ left | 12:01 |
|
ikke
| It gives you the raw object data | 12:02 |
| ← knolle left | 12:02 |
|
ikke
| I'm not sure if there is a faster way for git log data | 12:02 |
| → john_johnk joined | 12:04 |
| ← moldorcoder7 left | 12:05 |
| → jjakob joined | 12:05 |
| ← littlebobeep left | 12:06 |
| → vdamewood joined | 12:06 |
| → sa0 joined | 12:07 |
| → knolle joined | 12:09 |
| → tyson2 joined | 12:09 |
|
liberaider
| ikke: it's kind of surprising, but I guess there's not much demand for optimizing it. | 12:11 |
| ← runlevel_0 left | 12:13 |
| ← sa0 left | 12:14 |
| → littlebobeep joined | 12:14 |
|
ikke
| not sure if it's faster | 12:15 |
| ← cixx left | 12:15 |
|
ikke
| but you can look at using rev-list + diff-tree | 12:15 |
| → cixx joined | 12:20 |
| ← Wh0 left | 12:23 |
| → odoood joined | 12:26 |
| ← odoood left | 12:29 |
| ← utis_ left | 12:33 |
| ← coot left | 12:34 |
| → odoood joined | 12:34 |
| ← dig left | 12:34 |
| → ozoned joined | 12:37 |
| ← MiniontobyPI left | 12:40 |
| ← odoood left | 12:40 |
| → cvmn joined | 12:40 |
| ← Dotz0cat left | 12:41 |
| → han-solo joined | 12:41 |
| → odoood__ joined | 12:41 |
| ← ozoned left | 12:43 |
|
liberaider
| ikke: thanks, I'll try that option | 12:47 |
| → ozoned joined | 12:49 |
| → Dotz0cat joined | 12:49 |
| → clf059 joined | 12:51 |
| ← odoood__ left | 12:51 |
| ← jafarlihi left | 12:53 |
| → coot joined | 12:53 |
| → rgrinberg joined | 12:57 |
| ← ozoned left | 12:58 |
| ← ThorMojito left | 13:00 |
| → pyevery__ joined | 13:02 |
| ← clf059 left | 13:02 |
| ← littlebobeep left | 13:02 |
| ← pyevery__ left | 13:07 |
| → ThorMojito joined | 13:11 |
| → littlebobeep joined | 13:11 |
| ← tyson2 left | 13:13 |
| ← liberaider left | 13:18 |
| → Kays joined | 13:19 |
| → eroux joined | 13:19 |
| ← YuGiOhJCJ left | 13:23 |
| ← EvilDMP left | 13:24 |
| → structoha1 joined | 13:24 |
| ← OnkelTem left | 13:25 |
| → Wh0 joined | 13:27 |
| → OnkelTem joined | 13:30 |
| → odoood joined | 13:33 |
| ← ThorMojito left | 13:34 |
| → tirnanog joined | 13:34 |
| ← sobkas left | 13:37 |
| ← natrys left | 13:39 |
| → natrys joined | 13:39 |
| ← acebrianjuan left | 13:39 |
| → dig joined | 13:39 |
| → jimm joined | 13:40 |
| ← srinidhi left | 13:41 |
| ← structoha1 left | 13:43 |
| → sobkas joined | 13:43 |
| → srinidhi joined | 13:43 |
| → ZexMan112 joined | 13:44 |
| ← ZexMan112 left | 13:45 |
| → ThorMojito joined | 13:50 |
| ← odoood left | 13:53 |
| → _vanessa_ joined | 13:56 |
| → nate4 joined | 13:56 |
| ← ^vanessa^ left | 13:58 |
| ← squirrel left | 14:02 |
| ← littlebobeep left | 14:03 |
| → odoood joined | 14:03 |
| ← zeenk left | 14:03 |
| → littlebobeep joined | 14:05 |
| → V__ joined | 14:06 |
| ← coot left | 14:06 |
| → m0viefreak joined | 14:07 |
| ← Wh0 left | 14:09 |
| → whoo joined | 14:09 |
| ← V__ left | 14:12 |
| ← sobkas left | 14:13 |
| ← littlebobeep left | 14:15 |
| ← nate4 left | 14:15 |
| → sobkas joined | 14:16 |
| → diego joined | 14:18 |
| diego → Guest8840 | 14:18 |
| ← Guest8840 left | 14:19 |
| ← pretty_dumm_guy left | 14:20 |
| ← john_johnk left | 14:20 |
| ← cvmn left | 14:24 |
| ← odoood left | 14:24 |
| ← jimm left | 14:27 |
| ← ThorMojito left | 14:27 |
| → littlebobeep joined | 14:28 |
| → liberaider joined | 14:33 |
| → ThorMojito joined | 14:34 |
| → EvilDMP joined | 14:35 |
| → pycurious joined | 14:36 |
| → zebrag joined | 14:36 |
|
pycurious
| I've a ssh/git issue. If I do a "git pull"- it hangs. If I then do nslookup git.myserver.com. Then do a ssh git.myserver.com; then do git pull it works. Any ideas how to fix this? I'm on a mac | 14:36 |
|
| And I've to do that from that bash shell. If I do the nslookup/ssh from another bash shell - that still hangs up git. | 14:37 |
| ← natrys left | 14:38 |
| → jimm joined | 14:41 |
| → cvmn joined | 14:41 |
| → odoood joined | 14:43 |
| → acebrianjuan joined | 14:44 |
| ← ThorMojito left | 14:45 |
| ← sobkas left | 14:45 |
| ← cvmn left | 14:48 |
| → sobkas joined | 14:48 |
| → nuh^ joined | 14:50 |
| → ThorMojito joined | 14:53 |
| ← ThorMojito left | 14:53 |
| ← odoood left | 14:56 |
| → FFY00 joined | 14:56 |
| → thiago joined | 14:57 |
| → no_gravity joined | 14:59 |
|
no_gravity
| What sometimes bites me in the ass is that "git reset --hard" does not delete files that have been put into the working dir but are not in the repo. Why is that? | 15:00 |
| → gast0n joined | 15:00 |
| ← vdamewood left | 15:02 |
| → odoood joined | 15:02 |
| → SteveR joined | 15:10 |
|
SteveR
| hi there | 15:14 |
|
| how can i generate the patch file | 15:14 |
|
no_gravity
| SteveR: "the patch file"? | 15:15 |
|
SteveR
| yes.. | 15:16 |
|
| i have something that we build from fetching the upstream repo | 15:16 |
|
| the upstream repo should not have any change made | 15:16 |
|
| but using a patch, we should do changes | 15:16 |
| ← sobkas left | 15:16 |
|
no_gravity
| I fail to parse the question. | 15:17 |
| ← littlebobeep left | 15:19 |
|
SteveR
| its alright | 15:20 |
| → madewokherd joined | 15:20 |
| → unluckyshrubbery joined | 15:20 |
| ← ___nick___ left | 15:20 |
| → sobkas joined | 15:21 |
| → ___nick___ joined | 15:22 |
| ← ___nick___ left | 15:23 |
| ← madewokherd` left | 15:24 |
| ← EvilDMP left | 15:24 |
| → ___nick___ joined | 15:24 |
| → ThorMojito joined | 15:25 |
| → littlebobeep joined | 15:26 |
| ← rgrinberg left | 15:30 |
| → nate4 joined | 15:32 |
| → coot joined | 15:35 |
| → ferdna joined | 15:36 |
| → soman joined | 15:39 |
| ← SteveR left | 15:39 |
| ← ThorMojito left | 15:39 |
| → ThorMojito joined | 15:49 |
| ← sobkas left | 15:50 |
| → ThorMojito1 joined | 15:54 |
| → sobkas joined | 15:55 |
| → rgrinberg joined | 15:55 |
| ← ThorMojito left | 15:56 |
| ← whoo left | 15:57 |
| → EvilDMP joined | 15:58 |
| ← no_gravity left | 15:59 |
| → sa0 joined | 16:01 |
| ← Murr left | 16:04 |
| → Murr joined | 16:05 |
| → whoo joined | 16:11 |
| ← rgrinberg left | 16:11 |
| → great_taste joined | 16:11 |
| ← odoood left | 16:14 |
| → Sulky joined | 16:18 |
| ← sobkas left | 16:23 |
| ← whoo left | 16:25 |
| → whoo joined | 16:26 |
|
tirnanog
| commit some changes - perhaps in a distinct branch - then generate a patch series with git format-patch, perhaps. | 16:26 |
| → sobkas joined | 16:28 |
| ← m0viefreak left | 16:28 |
| ← whoo left | 16:41 |
| → zeenk joined | 16:43 |
| ← pycurious left | 16:49 |
| ← mven left | 16:50 |
| → justsomeguy joined | 16:52 |
| ← sobkas left | 16:55 |
| → sobkas joined | 16:58 |
| → rgrinberg joined | 16:58 |
| → hqdruxn08__ joined | 17:00 |
| ← elastic_dog left | 17:02 |
| → node1 joined | 17:02 |
| → pretty_dumm_guy joined | 17:03 |
| ← o[_] left | 17:03 |
| ← hqdruxn08_ left | 17:04 |
| ← sa0 left | 17:04 |
| → Maxattax97 joined | 17:04 |
| ← littlebobeep left | 17:06 |
| ← rgrinberg left | 17:06 |
| → dtux joined | 17:08 |
| → elastic_dog joined | 17:08 |
| ← han-solo left | 17:10 |
| ← nuh^ left | 17:11 |
| → han-solo joined | 17:11 |
| → littlebobeep joined | 17:13 |
| ← dtux left | 17:17 |
| → junebug joined | 17:21 |
| ← junebug left | 17:21 |
| → bloody joined | 17:25 |
| ← sobkas left | 17:26 |
| ← ThorMojito1 left | 17:27 |
| → runlevel_0 joined | 17:30 |
| → sobkas joined | 17:32 |
| → ^vanessa^ joined | 17:35 |
| → whoo joined | 17:36 |
| → nuh^ joined | 17:37 |
| ← _vanessa_ left | 17:37 |
| → john_johnk joined | 17:40 |
| ← node1 left | 17:41 |
| → sa0 joined | 17:42 |
| fr0bnic_ → frobnic | 17:47 |
| ← zeenk left | 17:52 |
| ← john_johnk left | 17:55 |
| → csm3105 joined | 18:01 |
| ← sobkas left | 18:04 |
| ← Murr left | 18:04 |
| → Murr joined | 18:05 |
| → ThorMojito joined | 18:05 |
| ← dig left | 18:06 |
| → hnOsmium0001 joined | 18:06 |
| → Yruama joined | 18:07 |
| → sobkas joined | 18:08 |
| ← csm3105 left | 18:12 |
| ← ThorMojito left | 18:12 |
| ← sa0 left | 18:15 |
| → csm3105 joined | 18:15 |
| ← troyt left | 18:18 |
| ← lmat left | 18:22 |
| → ThorMojito joined | 18:23 |
| ← Teacup left | 18:25 |
| → Teacup joined | 18:26 |
| ← TonyStone left | 18:28 |
| ← BSaboia left | 18:29 |
| → BSaboia joined | 18:30 |
| ← oprypin left | 18:31 |
| ← adanwan left | 18:31 |
| → adanwan joined | 18:31 |
| → oprypin joined | 18:32 |
| → m0viefreak joined | 18:32 |
| ← sobkas left | 18:34 |
| ← hamburgler left | 18:36 |
| → sobkas joined | 18:38 |
| → odoood joined | 18:40 |
| → TonyStone joined | 18:42 |
| → hamburgler joined | 18:43 |
| ← EvilDMP left | 18:45 |
| → arescorpio joined | 18:49 |
| → V__ joined | 18:51 |
| ← whoo left | 18:54 |
| ← han-solo left | 18:55 |
| ← ThorMojito left | 18:55 |
| ← littlebobeep left | 18:56 |
| → jazzy joined | 18:56 |
| → han-solo joined | 18:58 |
| ← liberaider left | 18:59 |
| ← noord left | 19:00 |
| → zeenk joined | 19:00 |
| → noord joined | 19:02 |
| ← noord left | 19:04 |
| → gildasio1 joined | 19:06 |
| ← sobkas left | 19:06 |
| → noord joined | 19:06 |
| ← ferdna left | 19:06 |
| ← gildasio left | 19:07 |
| ← nate4 left | 19:08 |
| → littlebobeep joined | 19:08 |
| → EvilDMP joined | 19:09 |
| → Oiyqlk joined | 19:09 |
| → liberaider joined | 19:12 |
| → sobkas joined | 19:14 |
| ← odoood left | 19:14 |
| ← Oiyqlk left | 19:14 |
| ← noord left | 19:16 |
| → noord joined | 19:16 |
| → hbautista_ joined | 19:16 |
| ← justsomeguy left | 19:16 |
| → int3rested joined | 19:18 |
| → Guest69 joined | 19:18 |
| → phcerdan joined | 19:19 |
| → littlebo1eep joined | 19:19 |
| ← littlebobeep left | 19:20 |
| → structoha1 joined | 19:20 |
| ← int3rested left | 19:21 |
| ← hbautista_ left | 19:22 |
| ← jjakob left | 19:24 |
| → nate4 joined | 19:25 |
| ← structoha1 left | 19:26 |
| → hbautista joined | 19:32 |
| ← OnkelTem left | 19:36 |
| → Smashcat joined | 19:37 |
| ← cixx left | 19:38 |
| → tyson2 joined | 19:38 |
|
Smashcat
| Anyone know why git on windows shows modifications to all files in a repo I've checked out (on a samba share) and using git on the linux server itself shows no changes? There have been no changes, but I've just installed git on windows. Is it safe to use the windows version of git in this case, or will it screw everything up? | 19:39 |
| → OnkelTem joined | 19:39 |
| ← littlebo1eep left | 19:40 |
| ← sobkas left | 19:41 |
| → littlebobeep joined | 19:42 |
| → structoha1 joined | 19:42 |
| → cixx joined | 19:43 |
|
BtbN
| Windows has dumb line endings, and you probably didn't configure git correctly to ignore them | 19:43 |
|
Smashcat
| I didn't save anything though. Just installed git on windows, and did a "git status" | 19:44 |
| → sobkas joined | 19:44 |
| → fxbrain_ joined | 19:45 |
|
osse
| run ''file some/file.java' and 'git show some/file.java | file -' and tell what they say | 19:45 |
|
Smashcat
| Whatever, I've backed up the repo, so can try a push and see if it meeses it up and check in the backup again if it does... | 19:45 |
| ← nate4 left | 19:46 |
|
osse
| what setting did you pick for the line ending thing on install? | 19:46 |
|
BtbN
| Why not fix it properly instead, and set the right eol handling? | 19:46 |
|
Smashcat
| I set it to use unix line endings, as I do in all my IDEs and text editors. | 19:46 |
|
BtbN
| Well, there's your issue then | 19:47 |
|
| it seems a bunch of windows line endings, and obviously those are different than the unix ones in your repo | 19:47 |
|
| so all files changed | 19:47 |
|
Smashcat
| Yeah, all the files have the same line endings, so that must be the problem :) | 19:47 |
|
osse
| not if they configured git to use unix ones | 19:47 |
|
Smashcat
| They're already unix line endings. | 19:47 |
|
osse
| then the issue is something else | 19:48 |
|
Smashcat
| Doesn't matter, windows pushed it ok, so I can carry on using that now, and not use the linux cmd line version, so all good. | 19:48 |
|
osse
| you made a commit? | 19:48 |
|
Smashcat
| Just took a while as it had to push the entire repor back in. | 19:49 |
|
| Yep committed all changes back in for the whole repo. | 19:49 |
|
osse
| eww | 19:49 |
| ← han-solo left | 19:49 |
|
Smashcat
| <shrug> :) | 19:49 |
|
BtbN
| rip all contributors who have patches in the work. They all broken now | 19:50 |
|
Smashcat
| Since it's only me, I think they're ok with it :) | 19:50 |
| ← JanC left | 19:51 |
| → JanC joined | 19:51 |
|
osse
| but it is the boring solution | 19:52 |
|
| will never know what was happening :( | 19:52 |
|
Smashcat
| The history showed no changes at all. That's all I know. Windows git now works properly though. Making a change to 1 file results in only 1 file being synced. | 19:55 |
| ← coot left | 19:56 |
| → jjakob joined | 19:56 |
| → littlebo1eep joined | 19:57 |
|
nedbat
| Smashcat: and you won't have to work from the Linux machine anymore? | 19:57 |
|
Smashcat
| ... and doing a git pull from the linux cmd line shows it's already up to date too. So must be something when windows git encounters a repo on linux for the first time. | 19:57 |
|
nedbat
| Smashcat: have you tried making a change from the linux side? | 19:58 |
|
osse
| sounds like you pushed nothing | 19:58 |
|
Smashcat
| I only used to use the linux cmd line because I was too lazy to configure git on windows for my various IDEs. | 19:59 |
| ← littlebobeep left | 19:59 |
|
Smashcat
| osse: Yep, it showed all files in red as modified in windows, and pushed them. The history shows all the files were updated in github with that commit, wuth no changes to any of them. | 19:59 |
|
osse
| link? | 20:00 |
|
Smashcat
| It's a private repo for this | 20:01 |
|
| Making a change to one file from the linux side results in all files modified again :) | 20:01 |
| ← dionysus69 left | 20:01 |
|
Smashcat
| So I'll stop using the linux side. | 20:01 |
|
nedbat
| Smashcat: there are ways to make this work if you like | 20:03 |
|
Smashcat
| nedbat: Seems like a bug? | 20:03 |
|
nedbat
| Smashcat: it's not a bug: it's git trying to reconcile incompatible line-ending standards. | 20:03 |
|
| Smashcat: but you can tell git what you want | 20:04 |
|
osse
| (or executable bit standards= | 20:04 |
| → Guest72 joined | 20:04 |
|
nedbat
| s/line-ending/file characteristic/ | 20:04 |
|
Smashcat
| But if I changed only 1 file, why would it then think every file, including binary files, are all changed? | 20:04 |
| ← ___nick___ left | 20:04 |
| ← Murr left | 20:04 |
|
osse
| that's something we can find out. what did those commands I showed print? | 20:05 |
| → Murr joined | 20:05 |
|
osse
| the files were probably all changed before you made changes to that one file | 20:05 |
|
Smashcat
| osse: No, I shut down the windows IDE. Then checked git status, and it showed no changes at all. Did a pull, and it was up to date. Then changed 1 source file. Then git status showed every single file and directory in the repo as "modified" | 20:06 |
|
| All text files are UNIX line endings. | 20:06 |
|
osse
| are you sure? | 20:06 |
| ← Guest72 left | 20:07 |
|
osse
| maybe they aren't in git | 20:07 |
|
Smashcat
| Yes, all my IDEs save as UNIX. And using the file command I can see they're UNIX | 20:07 |
|
| (except for the binary files, obviously) | 20:07 |
| ← csm3105 left | 20:08 |
|
osse
| what about my other command | 20:08 |
|
Smashcat
| Everything in the directory I'm using is in git. | 20:08 |
| → squirrel joined | 20:08 |
|
Smashcat
| osse: Just scrolled back to fine the other command. Yep it shows the Git commit number | 20:09 |
|
osse
| no it doesn't | 20:10 |
|
| oh my bad | 20:10 |
|
Smashcat
| yes it does | 20:10 |
|
osse
| 'git show HEAD:some/file.java | file -' | 20:10 |
|
| there | 20:10 |
| ← sobkas left | 20:11 |
| → aliheym joined | 20:12 |
| ← FH_thecat left | 20:13 |
| ← tyson2 left | 20:13 |
|
Smashcat
| osse: Sorry, back now: Shows /dev/stdin: ASCII text | 20:13 |
|
osse
| ok good | 20:14 |
|
| same as it said for a regular file right | 20:14 |
|
Smashcat
| Yep, all the same | 20:14 |
| → sobkas joined | 20:15 |
| ← phcerdan left | 20:16 |
|
Smashcat
| osse: Thanks for taking a look, but I won't be using the linux cmd line any more anyway, as the windows side is working fine now. | 20:16 |
| → junebug joined | 20:16 |
| ← structoha1 left | 20:18 |
| ← Leonarbro left | 20:26 |
| ← soman left | 20:28 |
| ← Guest69 left | 20:30 |
| → nate4 joined | 20:30 |
| ← jjakob left | 20:31 |
| → YuGiOhJCJ joined | 20:34 |
| ← V__ left | 20:35 |
| → troyt joined | 20:36 |
| → structoha1 joined | 20:40 |
|
Smashcat
| osse: Just thought I'd share the resolution to this. It was the filemode setting. I had set it to false in the global config, but the local config on the linux side doesn't pick that up. So I set it in the local config for the repo and the problem disappeared :) | 20:41 |
| ← sobkas left | 20:41 |
| → ThorMojito joined | 20:43 |
| ← ThorMojito left | 20:43 |
| ← nuh^ left | 20:44 |
| ← nate4 left | 20:44 |
| → sobkas joined | 20:45 |
|
osse
| Woohoo! | 20:45 |
| → sa0 joined | 20:46 |
| → mven joined | 20:48 |
| ← m0viefreak left | 20:52 |
| → odoood joined | 20:53 |
| ← odoood left | 20:53 |
| → dionysus69 joined | 20:59 |
| ← sa0 left | 20:59 |
| ← liberaider left | 20:59 |
| → nuh^ joined | 21:04 |
| → moldorcoder7 joined | 21:05 |
| → wakeup joined | 21:07 |
| ← FFY00 left | 21:09 |
| → donofrio_ joined | 21:14 |
| ← skered left | 21:17 |
| ← donofrio__ left | 21:17 |
| → skered joined | 21:17 |
| ← zeenk left | 21:18 |
| ← OnkelTem left | 21:19 |
| ← gurkenglas left | 21:19 |
| ← feriman left | 21:21 |
| → OnkelTem joined | 21:21 |
| ← cweiss07653212 left | 21:23 |
| ← zer0bitz left | 21:23 |
| → ferdna joined | 21:23 |
| ← sobkas left | 21:24 |
| → skapata joined | 21:26 |
| ← skapata left | 21:26 |
| → skapata joined | 21:26 |
| → sobkas joined | 21:27 |
| ← lord| left | 21:31 |
| → gurkenglas joined | 21:33 |
| → Jong joined | 21:33 |
| ← zebrag left | 21:33 |
| → tyson2 joined | 21:35 |
| → ThorMojito joined | 21:36 |
| → nate4 joined | 21:37 |
| → feriman joined | 21:38 |
| ← nate4 left | 21:41 |
| ← junebug left | 21:42 |
| ← littlebo1eep left | 21:42 |
| ← angrysiamese left | 21:42 |
| → angrysiamese joined | 21:43 |
| → teut joined | 21:44 |
| → junebug joined | 21:44 |
| → auk joined | 21:45 |
| → mven2 joined | 21:47 |
| ← gurkenglas left | 21:48 |
| ← mven left | 21:48 |
| mven2 → mven | 21:48 |
| → littlebobeep joined | 21:50 |
| → Guest2 joined | 21:50 |
| ← arescorpio left | 21:55 |
| ← sobkas left | 21:56 |
| ← ThorMojito left | 21:57 |
| ← cixx left | 21:58 |
| ← littlebobeep left | 22:00 |
| → sobkas joined | 22:02 |
| → Leonarbro joined | 22:03 |
| → saline_retry_ joined | 22:03 |
| saline_retry_ → auk_ | 22:05 |
| ← dionysus69 left | 22:05 |
| → Sulky_ joined | 22:05 |
| ← auk left | 22:06 |
| ← feriman left | 22:06 |
| → vikonen5 joined | 22:06 |
| → bdeferme3 joined | 22:06 |
| → sentriz_ joined | 22:06 |
| → fdisotto_ joined | 22:07 |
| → DreamweaverN joined | 22:07 |
| → nochi joined | 22:07 |
| → MrBenC joined | 22:07 |
| ← MrC left | 22:07 |
| MrBenC → MrC | 22:07 |
| → wynn joined | 22:08 |
| → Gamah_ joined | 22:08 |
| → toralf_ joined | 22:09 |
| → mgedmin_ joined | 22:09 |
| → _val__ joined | 22:09 |
| → d1b_ joined | 22:09 |
| → abelvesa_ joined | 22:09 |
| → mikap joined | 22:09 |
| → eqw_ joined | 22:10 |
| → mrmango17_ joined | 22:10 |
| → gutts_ joined | 22:10 |
| → myme1 joined | 22:10 |
| ← junebug left | 22:12 |
| ← acebrianjuan left | 22:13 |
| → lord| joined | 22:13 |
| ← teut left | 22:14 |
| ← Sulky left | 22:14 |
| ← sentriz left | 22:14 |
| ← mgedmin left | 22:14 |
| ← myme left | 22:14 |
| ← _val_ left | 22:14 |
| ← Furai left | 22:14 |
| ← Ranhir left | 22:14 |
| ← mrmango17 left | 22:14 |
| ← Muzer left | 22:14 |
| ← Dreamwea- left | 22:14 |
| ← s1b1 left | 22:14 |
| ← eqw left | 22:14 |
| ← toralf left | 22:14 |
| ← bdeferme2 left | 22:14 |
| ← de-vri-es left | 22:14 |
| ← wolf left | 22:14 |
| ← d1b left | 22:14 |
| ← mika left | 22:14 |
| ← gutts left | 22:14 |
| ← Gamah left | 22:14 |
| ← nochi_ left | 22:14 |
| ← vikonen left | 22:14 |
| ← fdisotto left | 22:14 |
| ← dmc left | 22:14 |
| ← graham left | 22:14 |
| ← abelvesa left | 22:14 |
| mgedmin_ → mgedmin | 22:14 |
| sentriz_ → sentriz | 22:14 |
| vikonen5 → vikonen | 22:14 |
| ← FLHerne left | 22:14 |
| → FLHerne joined | 22:15 |
| → dmc joined | 22:15 |
| → junebug joined | 22:16 |
| ← kenanmarasli left | 22:17 |
| ← wakeup left | 22:17 |
| → feriman joined | 22:19 |
| ← junebug left | 22:20 |
| → junebug joined | 22:20 |
| → littlebobeep joined | 22:20 |
| → Ranhir joined | 22:21 |
| → Furai joined | 22:21 |
| → de-vri-es joined | 22:21 |
| → s1b1 joined | 22:23 |
| → graham joined | 22:24 |
| → Muzer joined | 22:26 |
| ← sobkas left | 22:28 |
| → FFY00 joined | 22:29 |
| ← littlebobeep left | 22:29 |
| ← nuh^ left | 22:29 |
| → littlebobeep joined | 22:31 |
| ← tirnanog left | 22:33 |
| → sobkas joined | 22:33 |
| ← theoceaniscool left | 22:33 |
| ← littlebobeep left | 22:38 |
| → cixx joined | 22:40 |
| ← deltab left | 22:43 |
| ← SuperLag left | 22:43 |
| ← feriman left | 22:45 |
| ← cixx left | 22:45 |
| → littlebobeep joined | 22:47 |
| → mft39anton joined | 22:47 |
| ← palasso left | 22:50 |
| ← fxbrain_ left | 22:51 |
| → deltab joined | 22:51 |
| ← igemnace left | 22:51 |
| → littlebo1eep joined | 22:52 |
| ← runlevel_0 left | 22:53 |
| ← littlebobeep left | 22:54 |
| → cweiss07653212 joined | 22:56 |
| mattf_ → mattf | 22:57 |
| → littlebobeep joined | 22:57 |
| → cixx joined | 22:58 |
| ← sobkas left | 22:59 |
| ← littlebo1eep left | 23:02 |
| ← cixx left | 23:03 |
| → sobkas joined | 23:03 |
| ← vicecea left | 23:05 |
| → vicecea joined | 23:05 |
| → littlebo1eep joined | 23:06 |
| → sa0 joined | 23:06 |
| ← littlebobeep left | 23:08 |
| ← Smashcat left | 23:08 |
| ← aliheym left | 23:08 |
| → runlevel_0 joined | 23:09 |
| ← sobkas left | 23:10 |
| ← sa0 left | 23:14 |
| → sa0 joined | 23:14 |
| → cixx joined | 23:16 |
| ← cixx left | 23:21 |
| ← txtsd left | 23:23 |
| → nate4 joined | 23:27 |
| → txtsd joined | 23:27 |
| ← srinidhi left | 23:30 |
| ← nate4 left | 23:31 |
| ← littlebo1eep left | 23:32 |
| → osse joined | 23:35 |
| ← GNUmoon left | 23:37 |
| → littlebobeep joined | 23:37 |
| ← nyah left | 23:41 |
| → dodobrain joined | 23:46 |
| → aidalgol_ joined | 23:48 |
| ← aidalgol left | 23:49 |
| ← mft39anton left | 23:53 |
| → SuperLag joined | 23:55 |