IRCloggy #git 2016-11-07

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2016-11-07
	← TSS_ left	00:01
	→ TSS_ joined	00:03
	← dede_ left	00:04
	← converge left	00:06
	← romerocesar left	00:06
	→ Anja joined	00:07
	→ shaggycat joined	00:07
	← TSS_ left	00:07
	← CEnnis91 left	00:08
	→ TSS_ joined	00:09
	← finalbeta left	00:09
	→ yohnnyjoe joined	00:11
m___	hello	00:12
gitinfo	m___: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	00:12
	→ dodobrain joined	00:13
	← dodobrain left	00:13
	→ dodobrain joined	00:13
	← dodobrain left	00:13
	→ thiago joined	00:14
	→ venmx joined	00:14
	→ dodobrain joined	00:14
	← fahadash left	00:16
	← thiago left	00:18
	← venmx left	00:19
	→ _cyril_ joined	00:19
	→ johnmilton joined	00:21
Gfurst	so something really weird happened	00:22
	on a submodule	00:22
	this repo specifically used for assets, has tons of small images and etc, those pratically untouched and even before I used git-lfs	00:23
	→ jadesark joined	00:23
	← _cyril_ left	00:23
Gfurst	for some reason a few of those images start getting "modified" even though I did nothing and they didn't actually change, but because of that git is giving a huge hassle and even checkout -- ... them will not work	00:24
	Maple__ → France	00:24
	← justanotheruser left	00:24
	→ causasui joined	00:25
	→ nettoweb joined	00:25
	← EricPoe left	00:26
Gfurst	so even if I checkout the problem files it still says they are modified	00:26
	→ EricPoe joined	00:27
	← Starky left	00:27
	← TSS_ left	00:28
	← nwkj86 left	00:28
	← pokalyis left	00:30
	← relipse left	00:30
	← overlord_tm left	00:31
	France → Ukraine	00:33
	← ayjay_t left	00:33
	→ thiago joined	00:34
	Ukraine → Maple__	00:34
	→ TSS_ joined	00:35
	→ Siegfried joined	00:38
	→ _cyril_ joined	00:40
	→ qws-user-1229 joined	00:42
	← qws-user-1228 left	00:42
	← nfk left	00:42
	← TSS_ left	00:44
	→ TSS_ joined	00:45
	← thiago left	00:46
	← Samual left	00:48
	← JamesBaxter left	00:49
	→ red82 joined	00:50
	← nettoweb left	00:50
	→ nettoweb joined	00:51
	← TSS_ left	00:52
	→ Samual joined	00:54
	→ ejb joined	00:56
	← dhollinger left	00:57
	→ sauron_ joined	00:57
	→ dhollinger joined	00:58
	← yohnnyjoe left	00:58
	← sauron_ left	00:59
	→ Ender13 joined	00:59
	→ JamesBaxter joined	01:03
	← sdothum left	01:03
	→ sdothum joined	01:05
	→ mehola joined	01:06
	← ramsub07 left	01:06
	← johnmilton left	01:06
	→ fahadash joined	01:07
	← afuentes left	01:07
	→ Kaisyu joined	01:11
	← jfelchner left	01:11
	← doener left	01:13
	← babilen left	01:13
	← aidalgol left	01:16
	→ raijin joined	01:18
	→ babilen joined	01:20
	→ fstd_ joined	01:22
	← fstd left	01:22
	fstd_ → fstd	01:22
	→ aidalgol joined	01:23
	← shaggycat left	01:23
	← nettoweb left	01:25
	→ romerocesar joined	01:25
	→ hahuang61 joined	01:26
	← manuel left	01:29
	← m0viefreak left	01:32
	→ liuzhen joined	01:32
	← nidr0x left	01:33
	→ cdown joined	01:33
	← snthsnth left	01:35
	← ejb left	01:35
	← svm_invictvs left	01:38
	→ venmx joined	01:44
	← cdown left	01:45
	← leeN left	01:46
	← venmx left	01:49
	→ Jameser joined	01:52
	← red82 left	01:54
	← bruce_lee left	01:54
	→ bruce_lee joined	01:55
	← bruce_lee left	01:55
	→ bruce_lee joined	01:55
	← jbitdrop left	01:57
	→ dreiss joined	02:00
	→ xall_ joined	02:04
	→ WizJin joined	02:04
	← popmystack left	02:05
	← _ADN_ left	02:05
	→ morenoh149 joined	02:06
	→ Urbany joined	02:06
	→ fuzzmz joined	02:07
	→ thiago joined	02:09
	→ svm_invictvs joined	02:09
	→ lindenle joined	02:09
	← xall_ left	02:09
	← apotry left	02:12
	→ a_thakur joined	02:13
	→ cdown joined	02:13
	← JamesBaxter left	02:13
	← mellernoia left	02:14
	← govg left	02:15
	← a_thakur left	02:16
	→ JamesBaxter joined	02:17
	→ pokalyis joined	02:19
	← Gfurst left	02:20
	← EricPoe left	02:22
	→ finalbeta joined	02:24
	← jason237 left	02:26
	← cdown left	02:29
	→ flopsec joined	02:30
	→ arand__ joined	02:31
	→ arescorpio joined	02:31
	→ red82 joined	02:32
	← dreiss left	02:32
	→ nd_ joined	02:33
	← netj left	02:34
	→ xall_ joined	02:35
	→ netj joined	02:35
	← hahuang61 left	02:36
	← nd- left	02:36
	→ steelsw0rd joined	02:37
	← thiago left	02:39
	← d^sh left	02:41
	→ d^sh joined	02:43
	Maple__ → Maple	02:45
	← xall_ left	02:45
	Maple → Maple__	02:45
	← ilbot3 left	02:45
	→ ilbot3 joined	02:49
	→ st33lsw0rd joined	02:49
	← st33lsw0rd left	02:49
	→ Limes joined	02:49
	→ thiago joined	02:51
	← JamesBaxter left	02:51
	→ snthsnth joined	02:51
	← barteks2x left	02:52
	→ scottxu joined	02:52
	→ xall_ joined	02:52
	← thiago left	03:01
	→ jezze joined	03:01
	→ aavrug joined	03:01
	→ SwiftMatt joined	03:02
	← aavrug left	03:02
	← robogoat left	03:02
	→ aavrug joined	03:03
	→ jnewt1 joined	03:04
jnewt1	i have a file i pulled from a project I haven't worked on in a long time. it has a bunch of the <<<<<<HEAD <CODE> ======= <OTHER_CODE> >>>>>>><SOME_SHA>	03:06
	→ archaic joined	03:06
	→ kbs joined	03:06
nedbat	jnewt1: those are conflict markers	03:06
jnewt1	yes.	03:06
	i've seen them when merging	03:07
nedbat	jnewt1: is the file like that in the repo?	03:07
jnewt1	nedbat: yeah, just pulled it	03:08
	→ JamesBaxter joined	03:08
jnewt1	so what i want to do is get rid of them, and all the code in one side or the other, all at once, across the whole file	03:09
	i assume the code between <<<<HEAD and ===== was the most recent, so i'd like to start there. how do i get rid of the markers and the non HEAD code?	03:10
nedbat	jnewt1: i don't know a way other than firing up your text editor	03:11
jnewt1	that's no fun	03:12
	← Ender13 left	03:12
	← snthsnth left	03:13
	← Limes left	03:13
kadoban	jnewt1: You can use a mergetool. meld is okay	03:14
	There's a few others	03:14
	→ venmx joined	03:15
	→ Raed joined	03:15
	→ Andrew_K joined	03:15
	← fahadash left	03:16
	→ yohnnyjoe joined	03:19
jnewt1	so git can't interpret these markers it created?	03:20
Hello71	git merge --ours	03:20
	← menip left	03:20
Hello71	or git checkout --ours	03:20
Random832	jnewt1: whoever checked it in screwed up	03:20
	← venmx left	03:20
Hello71	oh, you mean that	03:21
	yeah, GIGO	03:21
kadoban	jnewt1: Why would it? The markers are there for cases when git isn't smart enough to merge it. That's your job.	03:21
	If you do it wrong, what is git supposed to do about it?	03:21
	→ BSAlb joined	03:22
jnewt1	kadoban: allow me to checkout which to keep (ie HEAD or some other SHA), as marked in the file, without the markers is what i think git should do, whether or not it does is the question	03:24
Hello71	the markers are part of the file	03:25
	← BSaboia left	03:25
jnewt1	Hello71, checkout --ours doesn't work, although it seems like that's what i want	03:25
	← peepsalot left	03:25
	→ guampa joined	03:28
nedbat	jnewt1: if the markers are in the file in the repo, there's nothing git can do to get rid of them.	03:30
	→ thiago joined	03:31
	→ govg joined	03:31
	→ peepsalot joined	03:32
	→ BenderRodriguez joined	03:32
	→ snthsnth joined	03:34
	← hexagoxel left	03:35
	→ hahuang61 joined	03:35
	← chachasmooth left	03:37
	→ cqi joined	03:37
	→ chachasmooth joined	03:39
	→ lagothri1 joined	03:39
	← inflames left	03:39
	→ rchavik joined	03:39
	← SpeakerToMeat left	03:40
	→ hexagoxel joined	03:40
	→ ochorocho__ joined	03:41
	← lagothrix left	03:42
	← drbean left	03:42
	→ akushner joined	03:42
	← ochorocho__ left	03:45
	→ drbean joined	03:47
	→ boombatower joined	03:51
	→ a_thakur joined	03:52
	→ acetakwas joined	03:53
	← Corosauce left	03:54
	→ Corosauce joined	03:54
	← liuzhen left	03:55
	← hahuang61 left	03:57
	→ inflames joined	03:57
	← thiago left	03:58
	→ justanotheruser joined	04:00
	← jezze left	04:00
	→ thiago joined	04:00
	→ jost_ joined	04:01
	← govg left	04:02
	← kbs left	04:02
	← jost__ left	04:04
	→ jason237 joined	04:04
	→ blackwind_123 joined	04:04
	← JamesBaxter left	04:06
	← _cyril_ left	04:08
	← acetakwas left	04:08
	→ ac3takwas joined	04:08
	→ OS-11711 joined	04:10
	← Anja left	04:10
	← OS-11711 left	04:10
	→ OS-11711 joined	04:10
	← mquin left	04:11
	← OS-11711 left	04:11
	→ mquin joined	04:12
	← thiago left	04:14
	← jadesark left	04:14
	→ Vortex35 joined	04:14
	→ dsdeiz joined	04:15
	→ Oatmeal joined	04:15
	→ Anja joined	04:15
	← Vortex34 left	04:16
	← a3Dman left	04:18
	→ _cyril_ joined	04:26
	← xall_ left	04:27
	→ liuzhen joined	04:28
	→ yohnnyjo1 joined	04:30
	← yohnnyjo1 left	04:30
	← yohnnyjoe left	04:31
	← floatingman left	04:36
	→ howdoi joined	04:36
	← snthsnth left	04:37
	→ floatingman joined	04:38
	← cqi left	04:39
	← theskillwithin left	04:41
	→ nilg joined	04:41
	→ xall_ joined	04:43
	→ venmx joined	04:45
	→ lightstalker joined	04:48
	← liuzhen left	04:48
	→ askb joined	04:49
	← boz_v1 left	04:50
	← venmx left	04:50
	← finalbeta left	04:52
	→ finalbeta joined	04:52
	→ subhojit777 joined	04:52
	← snowkidind left	04:53
	← rmichnik left	04:55
	→ resurtm joined	04:57
	← aidalgol left	04:58
	← kyan left	04:58
	← mehola left	05:00
Remramm	No you can use git to checkout a specific version	05:02
	by using `git checkout master -- myfile` for instance	05:02
	→ govg joined	05:03
	→ Rickmasta joined	05:04
Remramm	--ours, --theirs and --merge should also work, but you have to pass paths	05:04
	← pijiu left	05:07
	→ wxg joined	05:11
	← a_thakur left	05:12
askb	Getting a git cli error "fatal: Paths with -a does not make sense." when using option `git commit -asm`, while -a -s -m works. Any suggestions appreciated ?	05:12
	→ a_thakur joined	05:12
	→ daey_ joined	05:13
	→ ELFreder1ch joined	05:14
	← ELFrederich left	05:14
	← daey left	05:16
	← a_thakur left	05:17
	→ laumann joined	05:17
	→ a_thakur joined	05:19
	← led_belly left	05:20
	← cagedwisdom left	05:22
	← CheckDavid left	05:23
Remramm	None of those should work, options -s and -m don't exist	05:24
	← madewokherd left	05:24
	← Kaisyu left	05:24
Remramm	Wait you said git-commit, not git-add	05:24
	I get the same error here, -m (--message) without a value doesn't work	05:25
	← laumann left	05:26
	→ zumba_ad_ joined	05:26
Remramm	do you pass some other argument after those flags?	05:26
	← robotroll left	05:27
	← sdothum left	05:28
	← resurtm left	05:28
	← Cabanossi left	05:29
	→ sdothum joined	05:29
	← d0nn1e left	05:30
	→ snthsnth joined	05:31
	← svm_invictvs left	05:31
	← Doginal left	05:31
	→ Cabanossi joined	05:31
	→ svm_invictvs joined	05:32
	→ d0nn1e joined	05:32
	→ cagedwisdom joined	05:35
	→ phanimahesh joined	05:35
	← sangy left	05:40
	→ hahuang61 joined	05:41
	→ antwon joined	05:41
	→ resurtm joined	05:41
	← pks left	05:42
	→ jfelchner joined	05:42
	← antwon left	05:42
	→ pks joined	05:42
	→ ayjay_t joined	05:43
	→ liuzhen joined	05:44
	→ ome joined	05:45
	← hahuang61 left	05:45
	← dodobrain left	05:48
	→ DreamsandCode joined	05:49
	← DreamsandCode left	05:50
	→ dan2k3k4 joined	05:50
	→ ngperfex joined	05:51
	← jfelchner left	05:52
	← zumba_ad_ left	05:52
	← dan2k3k4 left	05:53
	← netj left	05:54
	→ netj joined	05:56
	→ mehola joined	05:58
	→ thiago joined	05:58
	→ Vinnie_win joined	06:00
	← bket left	06:02
	→ boz_v1 joined	06:02
	→ finalbeta1 joined	06:03
	← Vinnie_win_w left	06:03
	← finalbeta left	06:03
	→ shpew12 joined	06:04
	← sdothum left	06:04
	→ sdothum joined	06:06
	→ ArchNoob joined	06:08
	→ dreiss joined	06:08
	← arescorpio left	06:09
	→ bket joined	06:09
	← Rickmasta left	06:10
	→ barteks2x joined	06:10
	← sdothum left	06:11
	← robattila256 left	06:11
	← xall_ left	06:11
	→ brillenfux joined	06:12
	→ fatalhalt joined	06:12
	← _cyril_ left	06:15
	← Darren_ left	06:16
	→ venmx joined	06:16
	→ sdothum joined	06:16
	← barteks2x left	06:16
	← thiago left	06:17
	→ jozwior joined	06:21
	← venmx left	06:21
	→ a3Dman joined	06:23
	← subhojit777 left	06:25
	← dreiss left	06:27
	→ subhojit777 joined	06:28
	← bl0w3d_0ut left	06:29
	← red82 left	06:31
	← finalbeta1 left	06:33
	→ finalbeta joined	06:33
	→ cqi joined	06:35
	← nbrogan left	06:36
	← govg left	06:36
	→ synthmeat joined	06:36
	→ overlord_tm joined	06:37
	→ robattila256 joined	06:38
	← ArchNoob left	06:39
	→ hahuang61 joined	06:41
	→ ochorocho__ joined	06:43
	→ thiago joined	06:43
	← cagedwisdom left	06:44
	→ venmx joined	06:46
	← hahuang61 left	06:46
	← ochorocho__ left	06:48
	← flavius left	06:51
	→ ThomasLocke joined	06:52
	← ThomasLocke left	06:52
	→ ThomasLocke joined	06:52
	← d^sh left	06:53
	→ d^sh joined	06:54
	→ qt-x joined	06:54
	← jozwior left	06:55
	→ cagedwisdom joined	06:58
	→ brk_ joined	06:58
	← ac3takwas left	06:59
	→ Raging_Hog joined	06:59
	← pokalyis left	06:59
	→ LucaTM joined	07:00
	← dermoth left	07:00
	→ dermoth joined	07:00
	← underpantz_ left	07:01
	→ ThunderChicken joined	07:03
	← ThunderChicken left	07:03
	→ ThunderChicken joined	07:03
	→ pijiu joined	07:05
	← thiago left	07:05
	← svm_invictvs left	07:06
	→ thiago joined	07:07
	→ ac3takwas joined	07:07
	→ rscata joined	07:09
	← cbreak left	07:09
	→ ahmedelgabri joined	07:10
	→ _cyril_ joined	07:11
	→ dan2k3k4 joined	07:11
	→ cbreak joined	07:12
	← sdothum left	07:13
	← _cyril_ left	07:16
	← fatalhalt left	07:17
	→ cdown joined	07:17
	← ahmedelgabri left	07:20
	→ freimatz joined	07:23
	← boombatower left	07:23
	→ zeroed joined	07:25
	← zeroed left	07:25
	→ zeroed joined	07:25
	→ jozwior joined	07:26
	→ afusion joined	07:28
	→ conrad_ joined	07:32
	→ JeroenT joined	07:33
	→ Kaisyu joined	07:33
	→ meauses joined	07:34
	→ flavius joined	07:34
	→ _cyril_ joined	07:35
	← JeroenT left	07:35
	← thiago left	07:38
	→ jnavila joined	07:39
	← _cyril_ left	07:39
	→ elect joined	07:42
	→ hahuang61 joined	07:42
	← GodEater` left	07:43
	→ GodEater joined	07:43
	← GodEater left	07:43
	→ GodEater joined	07:43
	→ f4 joined	07:44
	← hahuang61 left	07:48
	→ MrWoohoo joined	07:48
	→ Sceorem joined	07:48
	→ ferr joined	07:48
	→ thiago joined	07:49
	→ lb1c joined	07:50
	← realz left	07:51
	→ realz joined	07:52
	→ lss8 joined	07:53
	→ danslo joined	07:56
	→ JeroenT joined	07:58
	← JeroenT left	07:58
	→ JeroenT joined	07:59
	→ Endarked joined	08:02
	→ eduardas_m joined	08:02
	→ BSab joined	08:06
	→ afusion_ joined	08:10
	→ PCatinean joined	08:11
	← BSAlb left	08:11
	← zeroed left	08:12
	← danslo left	08:12
	← afusion left	08:13
	← a3Dman left	08:13
	← Shentino left	08:14
	← ngperfex left	08:14
	→ Shentino joined	08:14
	→ govg joined	08:17
	← a_thakur left	08:18
	→ zeroed joined	08:19
	← zeroed left	08:19
	→ zeroed joined	08:19
	← cworth left	08:20
	→ ngperfex joined	08:20
	→ danslo joined	08:21
	← Jameser left	08:21
	← thiago left	08:21
	→ laumann joined	08:21
	← snthsnth left	08:21
	← danslo left	08:22
	← ome left	08:22
	→ thiago joined	08:23
	→ a_thakur joined	08:23
	→ apotry joined	08:25
	→ Alienpruts joined	08:26
	← cqi left	08:28
	→ _ng joined	08:29
	← SwiftMatt left	08:29
	← mablae left	08:31
	← Goplat left	08:34
	← thiago left	08:34
	→ thiago joined	08:35
	→ ahmedelgabri joined	08:37
	→ afusion joined	08:39
	← JeroenT left	08:40
	→ JeroenT joined	08:40
	← cagedwisdom left	08:40
	← jozwior left	08:43
	→ sdlnv joined	08:43
	→ hahuang61 joined	08:43
	← afusion_ left	08:43
	← JeroenT left	08:45
	→ ochorocho__ joined	08:45
Seveas	suggestion: use -a -s -m insted of -asm. -asm is probably interpreted as -a sm	08:46
	← Anja left	08:46
	← KeelOfSteel left	08:47
	→ Anja joined	08:47
	→ JeroenT joined	08:48
	← stemid left	08:48
	← hahuang61 left	08:48
	← shpew12 left	08:48
	→ milestone joined	08:49
milestone	hi all	08:49
	i have cloned a repo from github	08:49
	→ Glooomy joined	08:49
	← Glooomy left	08:49
milestone	then i made changes to the code	08:49
	then i commited the changes to my local repo	08:49
	then i forked it on github (so i can push it)	08:49
	i added my new forked repo vie git add remote name url	08:50
	← ochorocho__ left	08:50
milestone	but when i run git push name branch	08:50
	i am getting an error	08:50
	← govg left	08:50
milestone	error: src refspec … does not match any	08:50
	error: failed to push some refs to repo	08:50
	→ Glooomy joined	08:51
	→ a3Dman joined	08:52
	← mikecmpbll left	08:52
	→ cagedwisdom joined	08:52
	→ Darcidride joined	08:52
Seveas	milestone: so you're pushing a branch that does not exist.	08:53
milestone	Seveas: no, the branch is remotely tracked	08:53
	and present on github	08:53
	in my fork	08:53
	Seveas: but git status reports: HEAD detached from	08:53
	← thiago left	08:53
Seveas	ah, so you probably did git checkout name/branch	08:54
	← Ardethian left	08:54
	← lss8 left	08:54
	→ flaviodesousa joined	08:54
milestone	hmm. now I ran git checkout master and git reports… Warning: you are leaving 3 commits behind, not connected to any of your branches:	08:54
Seveas	that means you're not on a branch and you've been igonring warnings about a detached HEAD at every commit	08:54
milestone	ok, git shows me what to do i guess	08:55
	→ jozwior joined	08:55
	→ Ardethian joined	08:55
milestone	If you want to keep them by creating a new branch, this may be a good time	08:55
	→ danslo joined	08:55
Seveas	yeah, in the last output, it'll have told you what to do	08:55
milestone	Seveas: thanks	08:55
	git is great	08:55
	→ ArchNoob joined	08:56
	→ fees joined	08:57
	→ snthsnth joined	08:58
	→ GavinMagnus joined	08:58
	→ dodobrain joined	09:00
	→ encod3 joined	09:01
	← gfixler left	09:01
	← synthmeat left	09:02
	→ synthmeat joined	09:02
	→ mikecmpbll joined	09:02
	→ encod3_ joined	09:03
	→ systemovich joined	09:05
	→ byte512 joined	09:06
	← encod3 left	09:07
	← snthsnth left	09:08
	→ afusion_ joined	09:09
	→ ocbtec joined	09:11
	→ kamog` joined	09:11
	← brillenfux left	09:12
	← afusion left	09:13
	→ sea-gull joined	09:13
	→ ramsub07 joined	09:13
	→ kurkale6ka joined	09:13
	← kamog left	09:13
	→ afusion joined	09:14
	→ clmsy joined	09:16
	← afusion_ left	09:16
	→ govg joined	09:17
	← danslo left	09:18
	→ sdlnv_ joined	09:19
	← systemovich left	09:19
	← sdlnv left	09:22
	→ marcogmonteiro joined	09:22
	→ thiago joined	09:22
	→ sdlnv__ joined	09:24
	→ cworth joined	09:26
	← sdlnv_ left	09:28
	← Darcidride left	09:33
	→ chele joined	09:34
	→ nettoweb joined	09:35
	→ danslo joined	09:36
	← cdown left	09:36
	← Endarked left	09:38
	← a3Dman left	09:39
	→ Serpent7776 joined	09:39
	← flavius left	09:40
	→ brillenfux joined	09:41
	← robattila256 left	09:41
	← overlord_tm left	09:44
	→ hahuang61 joined	09:44
	← cworth left	09:45
	→ sagerdearia joined	09:45
	← phanimahesh left	09:48
	→ Endarked joined	09:48
	← hahuang61 left	09:49
	→ courrier joined	09:51
	← bmahe left	09:51
	→ mischat joined	09:52
	← danslo left	09:52
	← mischat left	09:52
	→ Snugglebash joined	09:52
	← Snugglebash left	09:52
	→ mischat joined	09:52
	→ flavius joined	09:52
	→ Snugglebash joined	09:52
	→ cworth joined	09:53
	→ danslo joined	09:53
	→ a3Dman joined	09:53
	← a_thakur left	09:54
	→ a_thakur_ joined	09:54
	← realz left	09:55
	→ realz joined	09:55
	→ overlord_tm joined	09:57
	→ phanimahesh joined	09:59
	← cagedwisdom left	10:01
	→ tvw joined	10:04
	← def_jam left	10:04
	← eb0t_ left	10:05
	→ afusion_ joined	10:07
	→ achadwick joined	10:08
	→ leeN joined	10:08
	← byte512 left	10:09
	← afusion left	10:09
	→ paws_ joined	10:10
	← a_thakur_ left	10:11
	→ a_thakur joined	10:11
	← lindenle left	10:12
	janx → janx\|beach	10:13
	← Andrew_K left	10:13
	→ rnsanchez joined	10:13
	→ Andrew_K\|2 joined	10:13
	→ lindenle joined	10:13
	→ jbitdrop joined	10:13
	→ P4nther joined	10:14
	← afusion_ left	10:15
	→ andrew710 joined	10:16
	→ King_Hual joined	10:17
	← cyphase left	10:19
	← P4nther left	10:21
	→ cyphase joined	10:23
	→ Darcidride joined	10:25
	→ Darcidride_ joined	10:26
moritz	.oO( what if git was one of us? )	10:28
	→ mablae joined	10:28
	← Darcidride left	10:31
	← wizardedit left	10:31
	→ fakenerd joined	10:31
	→ solf1re joined	10:32
	← GavinMagnus left	10:32
	→ troulouliou_div2 joined	10:33
	← dan2k3k4 left	10:35
	→ GavinMagnus joined	10:35
	← ArchNoob left	10:36
icedwater	Cxcf: did you get an answer to your HW3/HW6 issue?	10:36
	← liuzhen left	10:38
icedwater	If I understand correctly, you made one branch for each homework assignment, but while you were on the branch for HW3, you made some changes to HW6 and now you want HW3's copy of the HW6 file to remain as it was, as all changes on HW6 should be tracked on the HW6 branch, right?	10:38
	← Learath2 left	10:38
	→ SpeakerToMeat joined	10:38
	kamog` → kamog	10:39
icedwater	My instinct would be to stash the changes to HW6 (git stash --save if you have to stash things separately), then checkout HW6. Once on the correct branch, you can git stash pop, then add/commit the relevant changes in the branch.	10:39
	← GavinMagnus left	10:40
	← phanimahesh left	10:40
	→ GavinMagnus joined	10:40
	→ micdo_ joined	10:44
	→ cdown joined	10:44
	← lindenle left	10:45
	→ hahuang61 joined	10:46
	→ phanimahesh joined	10:46
	→ qpdb joined	10:48
	→ interrobangd joined	10:48
	→ usm4n joined	10:49
	← govg left	10:49
	← troulouliou_div2 left	10:50
	← hahuang61 left	10:50
	← andrew710 left	10:50
	← dsdeiz left	10:52
	→ rbern joined	10:53
	← Blkt left	10:53
	← mischat left	10:53
	← mehola left	10:54
	← meauses left	10:55
	→ meauses joined	10:56
	→ red82 joined	10:57
	← BSab left	10:58
	→ govg joined	10:58
	→ BSaboia joined	10:58
	← energizer left	10:58
	→ Blkt joined	10:59
	← ramsub07 left	11:00
	→ mischat joined	11:00
	→ rmichnik joined	11:00
	← venmx left	11:02
	→ usm4n_ joined	11:04
	← ac3takwas left	11:05
	→ Nikitaw99 joined	11:06
	← usm4n left	11:06
	→ allaroundArtist joined	11:07
	← allaroundArtist left	11:07
	→ wizardedit joined	11:09
	← wizardedit left	11:09
	→ wizardedit joined	11:09
	← JeroenT left	11:10
	← Glooomy left	11:11
	→ venmx joined	11:11
	→ piwne joined	11:12
	→ eivarv joined	11:14
	→ ac3takwas joined	11:17
	→ Rickmasta joined	11:20
	→ MrMojito joined	11:23
	← MrMojito left	11:23
	→ MrMojito joined	11:23
	← Rickmasta left	11:25
	← askb left	11:26
	← ac3takwas left	11:27
	→ ac3takwas joined	11:28
	→ ieee joined	11:30
	→ dan2k3k4 joined	11:31
	→ usm4n joined	11:32
	→ MafiaInc joined	11:32
	qpdb → Guest56439	11:33
	← Guest56439 left	11:33
	→ qpdb joined	11:34
	← usm4n_ left	11:34
	← fakenerd left	11:34
	← danslo left	11:35
	→ fakenerd joined	11:35
	→ Cavallari joined	11:35
	→ _cyril_ joined	11:36
	→ nfk joined	11:36
	→ goTAN joined	11:36
	→ fuchstronaut joined	11:37
	→ afuentes joined	11:39
	← fakenerd left	11:40
	← _cyril_ left	11:40
	← leeN left	11:40
	← eivarv left	11:41
	→ JeroenT joined	11:41
	← venmx left	11:42
	← Snugglebash left	11:42
	← govg left	11:42
	→ star_prone joined	11:42
	← overlord_tm left	11:44
	→ jeffreylevesque joined	11:45
	→ hahuang61 joined	11:46
	← flavius left	11:46
	← Karazhan left	11:47
	→ dimi1947 joined	11:47
	→ Karazhan joined	11:47
	→ re1 joined	11:48
	← hahuang61 left	11:51
	← netj left	11:52
	→ netj joined	11:52
	→ manuel_ joined	11:53
	→ lmatteis joined	11:53
	→ dsdeiz joined	11:54
	→ tharuin joined	11:56
	← usm4n left	11:58
	→ overlord_tm joined	11:59
	→ flavius joined	11:59
tharuin	Hey as a git-user, but still noob, I've run into this problem: I do have 1 + X repositories, one which is the backend, and X others representing different clients. All of these definately don't share stuff, so they are split into their own repos. Now I do feel like I need a master-repo, which contains config files and cmmon documentation for all of them,	11:59
	especially for workflows like CI, provisioning and deploying. But I only heard bad stuff about submodules, but at the same time I'd like to have this master-repo which just has all the other repos as folders inside, but just splitted lol. Is there a way to go for this or should I gtfo and just deal with it	11:59
	← boxrick1_ left	12:00
moritz	tharuin: you can have a separate repo with config files, or things like ansible playbooks that deploy the config	12:00
	tharuin: and then let your CI system or so worry about correlating the versions	12:00
	→ boxrick1 joined	12:01
	→ danslo joined	12:01
tharuin	so I should rather have all repo's without links and version every of them by tags or something	12:01
	→ quackgyver joined	12:01
moritz	I don't know how complex your setup is, but we haven't needed explicit verification so far	12:02
	we have GoCD piplines, and in that pipeline, the version of the config repo and of the code repo are fixed	12:02
	so we modify both as needed, and the code changes trigger a new pipeline instance, which uses the latest config	12:03
	that works well enough for us	12:03
	→ mischat_ joined	12:03
tharuin	That is too complex for that case, it is all rather simple, but I need to track the versions right, so I thought submodules would be perfect. But I guess I'll just separate configs completely	12:03
moritz	GoCD isn't more complex than Jenkins, IMHO	12:05
	→ mischat__ joined	12:05
moritz	anyway, you can use submodules if you feel you need it; they just suck :/	12:05
	→ kedare joined	12:05
tharuin	We've used submodules for a customer some time ago and I know that it somehow took us a few days at some point to fix some issue, and googling also says to not use them lol	12:06
	← mischat left	12:07
	← mischat_ left	12:08
	← cdown left	12:09
	← dan2k3k4 left	12:10
	← f4 left	12:10
	← a_thakur left	12:11
	→ a_thakur joined	12:12
	→ ams__ joined	12:14
	← ams__ left	12:14
	→ ams__ joined	12:15
fuchstronaut	is there a way to peak into a file on a certain branch without switching branches?	12:15
	← goTAN left	12:16
osse	fuchstronaut: git show branch:path/to/file	12:16
	← PCatinean left	12:16
	→ PCatinean joined	12:17
fuchstronaut	thank you	12:17
	← zeroed left	12:18
	← ac3takwas left	12:20
	→ fahadash joined	12:21
	→ ac3takwas joined	12:22
	← Andrew_K\|2 left	12:23
	→ Starky joined	12:24
	← davimore left	12:28
	← aavrug left	12:30
	← jeffreylevesque left	12:31
	→ zeroed joined	12:31
	← ac3takwas left	12:32
	→ jknetl joined	12:33
	→ bsanford joined	12:34
	← jstimm left	12:35
	→ annoymouse256 joined	12:35
	→ ac3takwas joined	12:35
	→ Learath2 joined	12:35
	→ wrouesnel joined	12:38
	→ p1ngarn joined	12:45
	→ goTAN joined	12:46
	← moop left	12:46
	← lmatteis left	12:46
	→ venmx joined	12:47
	→ hahuang61 joined	12:47
	→ lmatteis joined	12:48
	→ moop joined	12:48
	← goTAN left	12:48
	← corpsicle left	12:49
	← jknetl left	12:50
	← hahuang61 left	12:52
	→ mehola joined	12:53
	← PioneerAxon left	12:54
	→ johnmilton joined	12:55
	→ ramsub07 joined	12:55
	← raijin left	12:56
	→ PioneerAxon joined	12:57
	→ mischat joined	12:58
	← nanga left	12:58
	→ nanga joined	12:58
	← nanga left	12:58
	→ nanga joined	12:58
	→ corpsicle joined	12:58
	→ govg joined	12:58
	← mehola left	12:58
	→ NimeshNeema joined	12:58
	→ dviola joined	13:00
	← Cavallari left	13:00
	→ Cavallari joined	13:00
	← mischat__ left	13:01
	→ jast joined	13:02
	← corpsicle left	13:04
	→ jknetl joined	13:04
	← zeroed left	13:06
	← nanga left	13:07
	→ aax joined	13:07
	→ sdothum joined	13:08
	← qt-x left	13:10
	→ pirate21994 joined	13:11
	← flavius left	13:12
	→ ArchNoob joined	13:14
	← dimi1947 left	13:15
	→ ak5 joined	13:15
	← thiago left	13:18
	→ nilg` joined	13:18
	→ thiago joined	13:20
	← sdlnv__ left	13:21
	→ Rickmasta joined	13:21
	→ synthroid joined	13:22
	→ zumba_ad_ joined	13:22
	← mablae left	13:22
	→ corpsicle joined	13:22
	→ jeffreylevesque joined	13:24
	← qpdb left	13:25
	← red82 left	13:25
	← Rickmasta left	13:25
	→ flavius joined	13:26
	→ irco joined	13:29
	← subhojit777 left	13:33
	← flavius left	13:34
	← JeroenT left	13:34
	→ xall_ joined	13:35
	→ Mo joined	13:36
	→ CheckDavid joined	13:36
Mo	Hi, I tried to clone via 'git p4 ' and this worked for all other P4 depots but is failing with this one like this: http://dpaste.com/23C4H12 Any idea?	13:36
	→ _cyril_ joined	13:36
	← ArchNoob left	13:37
	→ fakenerd joined	13:38
	→ JeroenT joined	13:39
	→ snowkidind joined	13:40
	← _cyril_ left	13:41
	→ durham joined	13:41
	→ hahuang61 joined	13:48
	→ barteks2x joined	13:49
	← hahuang61 left	13:53
	→ rnsanchez_ joined	13:53
	← Endarked left	13:54
	→ cdown joined	13:54
	← rnsanchez left	13:55
	← synthroid left	13:58
	→ synthroid joined	13:58
	← durham left	13:59
	→ cdg joined	13:59
	→ noidea joined	14:00
	← noidea left	14:00
	→ noidea joined	14:00
	← Cavallari left	14:01
	→ _noblegas joined	14:01
	← a_thakur left	14:02
	← rishi` left	14:05
	→ rishi joined	14:06
	→ tlaxkit joined	14:07
	← bannakaffalatta left	14:07
	→ Dougie187 joined	14:08
	→ durham joined	14:10
	→ al-damiri joined	14:10
	→ l0v38ug joined	14:11
	→ ExoUNX joined	14:11
	→ altendky joined	14:13
	← paws_ left	14:13
	← guampa left	14:13
	← dodobrain left	14:13
	→ flavius joined	14:13
	→ hs366 joined	14:15
	← Mo left	14:15
	← l0v38ug left	14:15
	← hs366 left	14:16
	→ cdown_ joined	14:16
	→ Mo joined	14:16
	→ gho5t joined	14:17
	→ goTAN joined	14:19
	← cdown left	14:19
	→ CEnnis91 joined	14:19
	→ hs366 joined	14:20
	← overlord_tm left	14:20
	→ Endarked joined	14:21
	← nilg` left	14:21
	← goTAN left	14:22
	→ JamesBaxter joined	14:22
	→ overlord_tm joined	14:22
	→ red82 joined	14:23
	→ d0nkeyBOB joined	14:23
	← thiago left	14:25
	← JeroenT left	14:26
	→ Ryanar joined	14:26
	→ Es0teric joined	14:27
	→ thiago joined	14:27
	← danslo left	14:27
	→ ShekharReddy joined	14:29
	← d0nkeyBOB left	14:29
	← Ryanar left	14:31
	→ danslo joined	14:32
	← nettoweb left	14:32
	→ dan2k3k4 joined	14:32
	← ShekharReddy left	14:33
	← Es0teric left	14:34
	→ Junior joined	14:35
	→ Es0teric joined	14:36
	← mischat left	14:36
	→ d0nkeyBOB joined	14:36
	→ mischat joined	14:37
	← alex1a left	14:37
	→ JeroenT joined	14:37
	→ guampa joined	14:37
	→ noecc joined	14:38
	→ sangy joined	14:38
	→ Xethron joined	14:39
	→ kpease joined	14:40
	← Raging_Hog left	14:42
	→ lindenle joined	14:43
	← encod3_ left	14:45
	← MafiaInc left	14:46
	→ ajf- joined	14:46
	→ Ordentlig joined	14:46
	→ encod3 joined	14:46
	→ shinnya joined	14:47
	→ Ryanar joined	14:47
	← lindenle left	14:48
	→ hahuang61 joined	14:49
	→ AaronMT joined	14:49
	← Ryanar left	14:50
	→ Yorlik joined	14:52
	← pirate21994 left	14:53
	← govg left	14:53
	→ pirate21994 joined	14:53
Yorlik	Quick n00b question: How would I have to change the following entry in ".gitmodules" to set the branch of the submodule to be "5.2.x": [submodule "lua"]	14:54
	path = deps/lua	14:54
	url = https://github.com/lua/lua	14:54
	← hahuang61 left	14:54
	→ govg joined	14:55
	← manuel_ left	14:56
	→ eivarv joined	14:58
	→ liuzhen joined	15:00
	← pijiu left	15:01
	→ boombatower joined	15:02
	→ Darren_ joined	15:02
	→ e14 joined	15:03
	→ mmlb_ joined	15:04
	← overlord_tm left	15:04
	← sangy left	15:05
	← Es0teric left	15:06
	← ramsub07 left	15:06
danslo	Yorlik: just add 'branch = <branch name>' apparently, http://stackoverflow.com/a/18797720	15:07
Yorlik	Thanks !	15:08
	Been searching this like crazy but failed	15:08
	→ todd_dsm joined	15:08
	→ Es0teric joined	15:08
	→ sangy joined	15:09
	→ jstimm joined	15:09
	← Ordentlig left	15:10
	← liuzhen left	15:10
	← jstimm left	15:10
	→ kulelu88 joined	15:10
	→ LeBlaaanc joined	15:10
	→ jstimm joined	15:11
	← star_prone left	15:11
	← eivarv left	15:12
	← LeBlaaanc left	15:13
	→ phaleth joined	15:14
	→ ash_workz joined	15:14
	→ LeBlaaanc joined	15:15
	← ferr left	15:15
	→ nicksloa_ joined	15:16
	← zumba_ad_ left	15:18
	→ zumba_ad_ joined	15:18
	→ anonymuse joined	15:18
	← durham left	15:19
	← phanimahesh left	15:19
	← asti left	15:19
	← solf1re left	15:19
	→ mablae joined	15:20
	→ EricPoe joined	15:20
	← sweatsuit left	15:21
	← zumba_ad_ left	15:21
	→ Rickmasta joined	15:22
Seveas	Yorlik: that's a fairly new feature. Submodules generally don't care what branch they're on, they just track which commit should be checked out.	15:22
	← eduardas_m left	15:23
	→ sweatsuit joined	15:23
Yorlik	which way ever had worked - I needed a way to fixate it somewhere.	15:23
	Since Lua has mooved to 5.3.3 already but I needed 5.2	15:24
	→ eivarv joined	15:25
	← jknetl left	15:27
	← Rickmasta left	15:27
	← Es0teric left	15:29
	→ jknetl joined	15:29
	→ nettoweb joined	15:30
	← xall_ left	15:31
	← nettoweb left	15:31
	→ clearcut joined	15:31
	→ Es0teric joined	15:31
	← brk_ left	15:31
	→ xall_ joined	15:33
	→ pks_ joined	15:34
	← ahf left	15:34
	← sunny256 left	15:35
	→ eduardas_m joined	15:35
	← demize left	15:35
	← Xethron left	15:35
	→ ahf joined	15:35
	→ sunny256 joined	15:35
	→ demize- joined	15:36
	← finalbeta left	15:36
	→ finalbeta joined	15:36
	← pks left	15:37
	pks_ → pks	15:37
	→ _cyril_ joined	15:37
	← Mo left	15:38
	mmlb_ → mmlb	15:38
	→ stemid joined	15:39
	← dsop left	15:40
	→ xaa__ joined	15:40
	→ finalbeta1 joined	15:40
	→ watabou_ joined	15:40
	← _noblegas left	15:41
	← flupke left	15:41
	← saidelike left	15:41
	← fcrick left	15:41
	← jleclanche left	15:41
	← unholycrab left	15:41
	← al-damiri left	15:42
	← lmatteis left	15:42
	← fahadash left	15:42
	← timwis left	15:42
	← barq left	15:42
	← FritzLakritz left	15:42
	← bcardarella left	15:42
	← teadrop_ left	15:42
	← janx\|beach left	15:42
	← Urbany left	15:42
	← fuzzmz left	15:42
	← _cyril_ left	15:42
	← CheckDavid left	15:42
	← moop left	15:42
	← howdoi left	15:42
	← Eugene left	15:42
	← midgetspy left	15:42
	← meZee left	15:42
	← joco42 left	15:42
	← sfan786_ left	15:42
	← martin_g left	15:42
	← wenzowski left	15:42
	← techntoke__ left	15:42
	← pizzaops left	15:42
	← beckyconning__ left	15:42
	← spr0tsuki left	15:42
	← prosody left	15:42
	← shennyg left	15:42
	← kutenai left	15:42
	← Tee_Pee left	15:42
	← belak left	15:42
	← stealthii left	15:42
	← oncall-pokemon left	15:42
	← joseph_arnstein_ left	15:42
	← amaged__ left	15:42
	← aendrew left	15:42
	← Siegfried left	15:42
	← watabou left	15:42
	← Keridos left	15:42
	← elmcrest left	15:42
	← discopatrick left	15:42
	← doppo left	15:42
	← tobiasvl left	15:42
	← davisonio left	15:42
	→ Sna4x8 joined	15:43
	→ dsop joined	15:43
	← mmlb left	15:43
	← aax left	15:43
	← ams__ left	15:43
	← boxrick1 left	15:43
	← zacts left	15:43
	← montyboy left	15:43
	← rom1504 left	15:43
	← swift1_ left	15:43
	← theresajayne left	15:43
	← xkr47 left	15:43
	→ lmatteis joined	15:43
	← mkoskar left	15:43
	← nezZario left	15:43
	← SegFaultAX left	15:43
	← Furai left	15:43
	← demize- left	15:43
	← finalbeta left	15:43
	← Peng_ left	15:43
	→ demize joined	15:44
	→ tvl joined	15:44
	→ Lowell joined	15:44
	→ martin_g joined	15:44
	tvl → tobiasvl	15:44
	→ aendrew joined	15:44
	→ oncall-pokemon joined	15:45
	→ mroth joined	15:45
	→ FritzLakritz joined	15:45
	→ xkr47 joined	15:45
	→ unholycrab joined	15:45
	→ sfan786_ joined	15:45
	→ moop joined	15:45
	→ reuf_ joined	15:45
	→ joseph_arnstein_ joined	15:45
	← clearcut left	15:45
	← ghostlight left	15:45
	→ lxnch joined	15:45
	← jstimm left	15:45
	→ howdoi joined	15:45
	← JeroenT left	15:45
	← reuf_ left	15:45
	→ techntoke__ joined	15:46
	→ adambrenecki joined	15:46
	→ sebhoss joined	15:46
	→ pizzaops joined	15:46
	→ mischat_ joined	15:46
	→ CheckDavid joined	15:46
	→ trig-ger joined	15:46
	→ jleclanche joined	15:46
	→ ams__ joined	15:47
	← brillenfux left	15:47
	→ theresajayne joined	15:47
	→ fahadash joined	15:47
	→ prosody joined	15:47
	→ belak joined	15:47
	→ janx\|beach joined	15:47
	→ stealthii joined	15:47
	→ amaged__ joined	15:48
	→ shennyg joined	15:48
	→ wenzowski joined	15:48
	→ barq joined	15:48
	→ bcardarella joined	15:48
	→ davisonio joined	15:48
	→ fcrick joined	15:48
	→ epic_ joined	15:48
	→ marvi joined	15:48
	→ kutenai joined	15:48
	→ _noblegas joined	15:48
	→ meZee joined	15:48
	→ al-damiri joined	15:48
	→ Keridos joined	15:48
	→ teadrop_ joined	15:48
	→ twisted` joined	15:48
	→ jstimm joined	15:49
	→ timwis joined	15:49
	→ midgetspy joined	15:49
	→ joco42 joined	15:49
	→ elmcrest joined	15:49
	← mischat left	15:49
	→ Eugene joined	15:49
	→ nezZario joined	15:49
	→ doppo joined	15:49
	→ angelsl joined	15:49
	→ saidelike joined	15:50
	← wxg left	15:50
	→ hahuang61 joined	15:50
	→ Tee_Pee joined	15:50
	→ nettoweb joined	15:51
	← p1ngarn left	15:51
	→ ochorocho__ joined	15:51
	→ skobes joined	15:51
	← Endarked left	15:51
	→ flupke joined	15:52
	→ beckyconning__ joined	15:52
	← Khisanth left	15:52
	→ boxrick1 joined	15:52
	→ spr0tsuki joined	15:52
	→ SegFaultAX joined	15:53
	← rscata left	15:53
	→ nettoweb1 joined	15:53
	→ Peng_ joined	15:53
	→ rom1504 joined	15:54
	→ swift1_ joined	15:54
	→ mkoskar joined	15:54
	→ Filiphe joined	15:54
	→ kyan joined	15:54
	→ chrysaor joined	15:54
	→ discopatrick joined	15:54
	→ Furai joined	15:55
	→ montyboy joined	15:55
	← hahuang61 left	15:55
	← ochorocho__ left	15:55
	← PioneerAxon left	15:55
	← govg left	15:55
	→ mmlb_ joined	15:55
	→ mischat joined	15:56
	← micdo_ left	15:56
	→ JeroenT joined	15:56
	→ ghostlight joined	15:56
	← nettoweb left	15:57
	→ nettoweb_ joined	15:57
	→ sylario joined	15:58
	← nettoweb1 left	15:58
	→ nettoweb joined	15:59
	← mischat_ left	16:00
	→ PioneerAxon joined	16:00
	← chele left	16:02
	← ojdo left	16:03
	← nettoweb_ left	16:03
	→ barteks2- joined	16:03
	← barteks2x left	16:03
	→ LBV_User joined	16:03
	← ngperfex left	16:03
	→ fakenerd_ joined	16:04
	← jason237 left	16:04
	→ Endarked joined	16:04
	→ Khisanth joined	16:05
	→ madewokherd joined	16:06
	← fakenerd left	16:06
	→ durham joined	16:07
	→ yoh joined	16:07
	← JeroenT left	16:07
	← nfk left	16:08
	← eduardas_m left	16:08
	← nettoweb left	16:08
	→ nettoweb1 joined	16:08
	→ nanga joined	16:08
yoh	Could someone digest for me -- is gc --prune=now safe or not? ;) doc says that "Unless the repository is quiescent, you will lose newly created objects ..." but I am not sure what it means for repo to be quiescent... if I have everything committed and all useful commits pointed to by branches/tags -- would I loose anything?	16:09
	← barteks2- left	16:09
	nicksloa_ → nicksloan	16:09
	← rchavik left	16:09
	→ Ryanar joined	16:09
	→ renlo joined	16:09
	→ barteks2x joined	16:09
	← mischat left	16:10
	→ ojdo joined	16:10
HedgeMage	yoh: "quiescent" means exactly that: everything is committed, and there are no loose/unreferenced commits floating around without being connected to a branch	16:10
	or at least none that you care about, I guess	16:10
yoh	so, theoretically, in my case (all committed, pointed by branches) it should be safe to prune=now, correct?	16:11
	← akushner left	16:12
	→ lacour joined	16:12
	→ nettoweb joined	16:12
	← kyan left	16:12
	← nettoweb1 left	16:13
	← Sceorem left	16:13
yoh	asking so persistently since I think in one of the cases I ran in the situation that an object was not found later :-/ but unfortunately I haven't caught an exact sequence of events, so may be there was some index which wasn't yet committed	16:14
	→ ptx0 joined	16:14
	← martin_g left	16:14
	→ sammyo joined	16:14
	→ gareppa joined	16:14
	← sammyo left	16:14
	→ martin_g joined	16:14
yoh	would 'git fsck' catch such issues, i.e. that after some operation some objects referenced by branches etc are not reachable/found?	16:15
	← fakenerd_ left	16:15
ptx0	i've got a missing file i'm trying to locate in a repository, i created a branch with a fix / new file, and pushed it. my coworker then force pushed(?) over my branch and my commits aren't in the 'g log' but in Assembla they are still visible (but I cannot view them for some reason)	16:15
	← cdown_ left	16:15
ptx0	yoh: git fsck --lost-found	16:15
yoh	ptx0: cool, thanks! will do !	16:15
	← Yorlik left	16:16
	← danslo left	16:16
	→ wxg joined	16:16
HedgeMage	yoh: when in doubt, back up, but yes git fsck should warn you and then go ahead and prune	16:17
yoh	HedgeMage: yes -- I have backups (thanks btrfs for cheap snapshots ;) )	16:17
HedgeMage	heh :)	16:17
	→ cdown joined	16:17
	← synthroid left	16:18
	→ vuoto joined	16:19
	← ayjay_t left	16:20
	→ ayjay_t joined	16:20
	→ nettoweb1 joined	16:21
	→ davidfetter_ge joined	16:21
yoh	HedgeMage: well... FWIW those are also sent to the backup server by btrfs (btrbk is really neat for that)	16:21
	← laumann left	16:21
	→ OliverJAsh joined	16:22
OliverJAsh	When using `git add --patch`, the go to next/previous hunk options don't work across files. Is there a solution to this?	16:22
	I often skip a hunk accidentally and need to go back	16:22
	← piwne left	16:22
	← nettoweb left	16:23
	← CheckDavid left	16:23
	← gareppa left	16:23
	→ byte512 joined	16:23
	← railssmith left	16:23
	← wrouesnel left	16:23
	→ ArchNoob joined	16:24
moritz	OliverJAsh: git add -i allows that, iirc	16:24
	→ jason237 joined	16:24
	← nettoweb1 left	16:25
	← ThomasLocke left	16:25
	← jstimm left	16:25
	→ zine joined	16:26
fuchstronaut	How can I change the last commit on a branch that i already pushed?	16:26
	i know noone has pulled it	16:26
	→ tyreld joined	16:27
	→ svm_invictvs joined	16:27
grawity	`git push --force` something else	16:27
fuchstronaut	grawity: so I git amend and then do git push force?	16:28
grawity	yes	16:28
	→ Lipp joined	16:29
	← hs366 left	16:29
ptx0	i found my files but i used an old git tree directory reflog to merge the commits	16:29
	probably owuld have had to rewrite the stuff if i didn't have that dir, right?	16:29
	← xall_ left	16:30
	→ joki joined	16:30
	← durham left	16:30
	← ahmedelgabri left	16:30
	→ durham joined	16:31
	→ ahmedelgabri joined	16:31
	→ zeorin joined	16:31
zeorin	!deploy	16:31
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	16:31
	← zeorin left	16:33
	← zine left	16:33
	← Darcidride_ left	16:33
	→ ramsub07 joined	16:35
	← durham left	16:35
	← renlo left	16:36
	→ gareppa joined	16:36
	→ odxw joined	16:36
	← averagedan left	16:36
	→ jccn joined	16:38
	← odxw left	16:38
	← ArchNoob left	16:39
	→ nettoweb joined	16:39
	← ahmedelgabri left	16:40
	← svm_invictvs left	16:41
	→ Sdieb joined	16:42
	← nilg left	16:43
	→ doener joined	16:44
	→ beagleGuy joined	16:45
	→ jstimm joined	16:45
	← bket left	16:45
	← ac3takwas left	16:45
	→ bket joined	16:45
	→ a_thakur joined	16:46
	← clmsy left	16:47
	→ InfoTest joined	16:47
	→ SwiftMatt joined	16:48
	→ LastWish joined	16:49
	← kulelu88 left	16:49
	→ averagedan joined	16:50
	→ hahuang61 joined	16:51
	← dan2k3k4 left	16:53
	← snowkidind left	16:53
	← kedare left	16:54
	← nicksloan left	16:55
	← a3Dman left	16:56
	← hahuang61 left	16:56
	→ nicksloan joined	16:56
	← gareppa left	16:56
	← Sdieb left	16:57
	← tlaxkit left	16:57
	→ tlaxkit joined	16:58
	→ svm_invictvs joined	16:58
	← LastWish left	16:58
	← Serpent7776 left	16:59
	→ logikos joined	17:00
	→ pijiu joined	17:01
	← jstimm left	17:01
	→ lordjancso joined	17:01
logikos	i did a commit (local, no push to remote) that had more staged files in it that an thought it had at the time i wrote the commit message .. can i undo just the commit command so that I can change my staged files and commit message ?	17:01
	← pijiu left	17:02
logikos	i do not want it to modify the content of any files, just remove the last commit and message	17:02
	→ pijiu joined	17:02
	← boombatower left	17:02
grawity	git reset HEAD^	17:03
	← interrobangd left	17:03
	← pijiu left	17:03
	→ boombatower joined	17:04
	→ pijiu joined	17:04
	→ synthroid joined	17:04
	← meauses left	17:04
	← horatiohb left	17:05
	← pijiu left	17:05
logikos	ty	17:05
	→ pijiu joined	17:05
	→ Raging_Hog joined	17:05
	← pijiu left	17:06
	→ pijiu joined	17:06
	→ synthroi_ joined	17:07
	← lordjancso left	17:07
	→ patarr_ joined	17:07
	← patarr_ left	17:07
	← tlaxkit left	17:07
	→ a_thakur_ joined	17:08
	← pijiu left	17:08
	→ barteks2x_ joined	17:08
	← barteks2x_ left	17:08
	→ pijiu joined	17:09
	← pijiu left	17:10
	← synthroid left	17:10
	→ pijiu joined	17:10
	← a_thakur left	17:11
	→ akushner joined	17:11
	← jnavila left	17:11
	→ _cyril_ joined	17:11
	← pijiu left	17:12
	→ hahuang61 joined	17:12
	→ bratchley joined	17:14
	← EricPoe left	17:15
	→ govg joined	17:15
	← cdown left	17:15
	← kriskropd left	17:16
	← emg left	17:16
	→ cdown joined	17:16
	→ cdown_ joined	17:18
	→ renlo joined	17:18
	← a_thakur_ left	17:19
	← pirate21994 left	17:19
	← mroth left	17:20
	→ mroth joined	17:20
	← cdown left	17:21
	→ EricPoe joined	17:21
	← Noldorin left	17:22
	← BSaboia left	17:22
	→ BSaboia joined	17:22
	→ Rickmasta joined	17:23
	→ laumann joined	17:25
	→ a3Dman joined	17:26
	← renlo left	17:26
	→ lindenle joined	17:27
	← Rickmasta left	17:28
	← mikecmpbll left	17:31
	→ synthroid joined	17:31
	← _noblegas left	17:32
	→ jstein_ joined	17:33
	← Raging_Hog left	17:33
	← nicksloan left	17:33
	→ nbrogan joined	17:33
hiwk	I'm in branch A. I want to switch to branch B, do something there, switch back to A, and have non-tampered timestamps. Is that possible?	17:33
	right now, A-B-A followed by make re-makes way too much	17:34
	→ Noldorin joined	17:34
	← Noldorin left	17:34
	← synthroi_ left	17:34
	→ Noldorin joined	17:34
	jstein_ → jstein	17:35
	→ tang^ joined	17:36
	→ nilg joined	17:36
	→ lordjancso joined	17:36
	→ Darcidride joined	17:36
	→ dan2k3k4 joined	17:36
	← kurkale6ka left	17:37
	→ renlo joined	17:38
	← encod3 left	17:38
Seveas	hiwk: no.	17:39
	git doesn't do anything with file timestamps, so if you check out a branch where the file differs, the timestamp will be updated	17:40
	→ oskarkv joined	17:40
	← Es0teric left	17:41
	← gho5t left	17:41
	← ajf- left	17:42
	← freimatz left	17:43
	← _cyril_ left	17:44
	→ nicksloan joined	17:44
	→ emg joined	17:44
	← ramsub07 left	17:46
	← joki left	17:47
hiwk	Seveas: ok. I guess I have to have one clone for compiling and another for branch switching then :/	17:47
	← EricPoe left	17:48
	← nicksloan left	17:48
	→ nicksloan joined	17:49
	→ _cyril_ joined	17:49
	→ ochorocho__ joined	17:51
	→ sunri5e joined	17:53
	← ochorocho__ left	17:53
	← SwiftMatt left	17:53
	← Alienpruts left	17:53
	→ aard_ joined	17:54
	← eivarv left	17:55
	→ SwiftMatt joined	17:55
osse	hiwk: man git-work-tree	17:55
	hmm	17:55
	hiwk: man git-work\tree	17:55
	→ RedneckDonut joined	17:55
osse	hiwk: man git-worktree	17:55
gitinfo	hiwk: the git-worktree manpage is available at http://jk.gs/git-worktree.html	17:55
	← Nikitaw99 left	17:55
osse	there we go	17:55
	← nuck left	17:56
	← nilg left	17:56
	→ danslo_ joined	17:56
	→ meauses joined	17:56
	← jknetl left	17:57
	← cdg left	17:58
	← elect left	18:01
	→ click joined	18:04
	→ gho5t joined	18:04
	→ robotroll joined	18:04
	→ shpew12 joined	18:05
	← finalbeta1 left	18:05
	← shpew12 left	18:06
	← Bass10 left	18:08
	← Filiphe left	18:09
	← RedneckDonut left	18:09
	← Learath2 left	18:10
	→ ahmedelgabri joined	18:12
	← click left	18:13
	← barteks2x left	18:15
	← vuoto left	18:15
	→ barteks2x joined	18:16
	← SwiftMatt left	18:17
	← dsantiago left	18:17
	→ ShekharReddy joined	18:18
	→ grimdox joined	18:19
	← grimdox left	18:19
	→ grimdox joined	18:21
	← meauses left	18:21
	→ daniel_rose joined	18:21
	← grimdox left	18:21
	← danslo_ left	18:22
	→ fenris_kcf joined	18:23
	← tyreld left	18:23
	→ Gfurst joined	18:23
	← _ng left	18:23
fenris_kcf	saluton. how should i interpret and handle "modified content"-entries for submodules listed at "git status"?	18:23
Gfurst	hey guys, any of you use git-lfs on windows? I'm having a issue where connection is refused and there is a window(?) for git credential manager?	18:23
	the window picture https://www.dropbox.com/s/0bdhzuxj5hisnit/Untitled.jpg?dl=0	18:23
	← e14 left	18:25
	→ Es0teric joined	18:25
	← diogenese left	18:26
	→ e14 joined	18:27
	→ eivarv joined	18:27
	← annoymouse256 left	18:28
osse	fenris_kcf: cd to the location, run git status and see what it says	18:28
	→ diogenese joined	18:28
	→ Learath2 joined	18:29
	← dan2k3k4 left	18:29
fenris_kcf	oh, tkx, osse!	18:30
	*thx	18:30
	← conrad_ left	18:30
	→ cdg joined	18:30
	→ btree joined	18:31
	← ShekharReddy left	18:32
	→ meauses joined	18:33
	← OliverJAsh left	18:34
	→ vuoto joined	18:35
	← doener left	18:35
	← cdown_ left	18:36
	→ solrize joined	18:37
	← btree left	18:37
solrize	i'm using a web host that runs the litespeed web server, does anyone know if there's a git-http-backend config for that?	18:38
	← causasui left	18:39
	→ causasui joined	18:39
	→ robattila256 joined	18:39
	← meauses left	18:39
	← marcogmonteiro left	18:41
	→ CamonZ joined	18:42
	← gho5t left	18:48
	→ Sasazuka joined	18:49
Gfurst	I'm having problems with windows credentials and lfs-test-server	18:50
	→ kyan joined	18:51
	→ sobersabre joined	18:51
	← anonymuse left	18:51
	← daniel_rose left	18:51
	→ sea-gull_ joined	18:51
sobersabre	hi. I am unclear when this happened, but so far when I did a git commit, only CHANGES in the index would be committed.	18:52
	→ anonymuse joined	18:52
	→ daniel_rose joined	18:52
sobersabre	now when I commit, I see ALL changed files, incl. changes outside the index, get into the commit.	18:52
	I'm on git 2.7.4	18:52
	← eivarv left	18:53
kadoban	sobersabre: Did you use -a ? Or make some weird alias?	18:53
sobersabre	kadoban: maybe an alias. checking....	18:53
	← Endarked left	18:53
	← Darcidride left	18:54
	→ WayToDoor joined	18:54
	→ Endarked joined	18:54
sobersabre	kadoban: the only thing related to my LOCAL git config I did was setting [push] default=matching	18:54
	→ gkatsev joined	18:55
	← bocaneri left	18:55
kadoban	sobersabre: Check your shell config or something? Are you sure you didn't just typo as well? It's fairly easy to add unintended options to commands, I've done it many times.	18:55
sobersabre	I have some SHELL aliases gca, etc. but I did not use it	18:55
	how can I identify shell's config for git?!?!? is there a thing like this that doesn't show in 'alias' or 'env' output ?	18:56
kadoban	Would depend on the shell I guess. I wouldn't really know how you can check in any of them personally.	18:56
	← anonymuse left	18:56
	→ dsantiago joined	18:57
	→ eivarv joined	18:57
Gfurst	anyone else have issues with windows credential (wincred) and lfs custom server?	18:58
	← jephsf left	18:59
	← achadwick left	18:59
	← dsantiago left	18:59
	→ dsantiag_ joined	18:59
	→ Achylles joined	19:00
	→ jephsf joined	19:01
	→ harry1 joined	19:01
	← morenoh149 left	19:02
	← harry1 left	19:02
	← bket left	19:02
	→ morenoh149 joined	19:03
	→ meauses joined	19:03
	→ harrymoreno joined	19:03
morenoh149	how do I make a pre-commit hook?	19:03
	I wrote a python script an put it in .git/hooks/pre-commit	19:03
	is that enough?	19:03
	← msonntag left	19:03
	→ msonntag joined	19:05
kadoban	morenoh149: Yep. You have to make sure it's executable and that it's set up to run as a python script, that should be it.	19:07
	→ jstimm joined	19:09
kadoban	morenoh149: Note that pre-commit hooks can be a bit tricky in logic. Git doesn't do anything magic with them, so by default you're testing things as they exist in the working directory, no as they will be commited.	19:09
	→ ethylomat joined	19:10
	← robotroll left	19:10
	← venmx left	19:10
	← d0nn1e left	19:11
	← meauses left	19:12
	→ d0nn1e joined	19:12
	→ anonymuse joined	19:13
	← ethylomat left	19:15
	→ ethylomat joined	19:15
	→ brillenfux joined	19:15
	→ ionelmanolache joined	19:16
	← brillenfux left	19:17
	→ tyreld joined	19:18
	← jstimm left	19:18
	→ snthsnth joined	19:19
	← averagedan left	19:19
	← vuoto left	19:19
	← quackgyver left	19:20
	← matoro left	19:20
	→ jstimm joined	19:20
	← PCatinean left	19:21
	← ethylomat left	19:21
	→ railssmith joined	19:23
	→ danslo_ joined	19:23
	→ ToBeFree joined	19:23
	→ Gsham joined	19:23
	→ Rickmasta joined	19:24
	→ dtrott joined	19:25
	← Lipp left	19:25
	← e14 left	19:25
	← renlo left	19:26
dtrott	Whats the easiest way to get a different return code from Git if there has (or has not) been a commit to the master branch in the last minute - sorry writing a Kludge for an already very Kludgey build server.	19:27
	← danslo_ left	19:28
osse	dtrott: fetch once a minute	19:29
	← howdoi left	19:29
osse	then check .git/FETCH_HEAD	19:29
	← cdg left	19:29
	← d0nkeyBOB left	19:29
	← Rickmasta left	19:29
	→ meauses joined	19:30
	→ d0nkeyBOB joined	19:30
	→ ResidentBiscuit joined	19:31
	← InfoTest left	19:32
	→ EricPoe joined	19:32
	← LiENUS left	19:33
	→ nwkj86 joined	19:37
dtrott	osse:Not really what I was looking for, I think I have found a solution: if [[ $(git log -p "master@{1 minute ago}..master@{now}" \| wc -c ) -ne 0 ]]	19:38
	Super kludgey, but it fits in the spirit of todays work ….	19:38
	→ HoierM joined	19:39
	← anonymuse left	19:39
	→ hanthings joined	19:39
	→ anonymus_ joined	19:39
osse	the -p takes the cake :p	19:40
	if (( $(git rev-list --count "master@{1 minute ago}..master@{now}") > 0 )); then	19:40
dtrott	Thanks, thats a lot better.	19:41
	← Es0teric left	19:42
	→ renlo joined	19:42
	→ nawwmz joined	19:44
	→ matoro joined	19:44
	→ paulgoulden joined	19:44
	→ cagedwisdom joined	19:46
	← BSaboia left	19:46
	→ leeN joined	19:46
	← treehug88 left	19:46
	→ bket joined	19:47
	→ Es0teric joined	19:48
	→ shpew12 joined	19:48
	→ dan2k3k4 joined	19:49
	← lmatteis left	19:49
	→ overlord_tm joined	19:50
	← dpower left	19:50
	← snthsnth left	19:50
	→ dpower joined	19:50
	→ pandeiro joined	19:52
	→ mjuszczak joined	19:53
	← mjuszczak left	19:53
	→ e14 joined	19:54
	→ gho5t joined	19:54
	→ gho5t_ joined	19:54
	← resurtm left	19:56
	→ vuoto joined	19:56
	→ GenZai joined	19:57
	← paulgoulden left	19:57
	← Ryanar left	20:00
	→ paulgoulden joined	20:00
	← jstimm left	20:00
	← ionelmanolache left	20:01
	← gho5t left	20:02
	← nbrogan left	20:03
	→ VagabondAzulien joined	20:04
	→ Ryanar joined	20:04
	← hanthings left	20:05
	← johnmilton left	20:05
	→ nbrogan joined	20:06
	← paulgoulden left	20:06
	→ jimi_ joined	20:09
	← romerocesar left	20:10
	→ mellernoia joined	20:11
	← pandeiro left	20:12
	← meauses left	20:13
	← Dougie187 left	20:18
	→ courrier_ joined	20:22
	← courrier left	20:23
	→ alex1a joined	20:23
	→ Dougie187 joined	20:23
	→ jargan joined	20:23
	→ mar77i_ joined	20:24
	← jast left	20:24
	← _cyril_ left	20:24
	← mar77i left	20:24
	← hyperair left	20:25
	← xehbit left	20:25
	→ hyperair joined	20:25
	→ revoltingPeasant joined	20:25
	→ xehbit joined	20:25
	← red82 left	20:26
	← m1dnight_ left	20:27
	→ Rodya_ joined	20:27
	→ ochorocho__ joined	20:27
	← Gsham left	20:28
	← synthroid left	20:28
	→ m1dnight_ joined	20:29
	← dan2k3k4 left	20:30
	→ _cyril_ joined	20:31
	← d0nkeyBOB left	20:33
	← jstein left	20:34
	→ Gsham joined	20:35
	→ d0nkeyBOB joined	20:36
	← emg left	20:38
	← HoierM left	20:39
sobersabre	hi. I have a branch x, and out of its head there's a branch y with 3 commits.	20:39
	I would like to start pointing at the second commit in y, so that y has only 1 commit	20:39
	I have ran git checkout <2nd hash in y>	20:39
kadoban	What do you mean that you want to start pointing at it?	20:40
	← d0nkeyBOB left	20:40
sobersabre	if I do 'git branch -f x' would the branch head become my current commit ?	20:40
osse	yes	20:40
sobersabre	kadoban: x branch is just a pointer. It currently points at its head, which is 3 commits behind y.	20:41
	→ d0nkeyBOB joined	20:41
sobersabre	osse: thanks.	20:41
	osse: for some reason after that I still am seeing 'detached:x'	20:41
	← phaleth left	20:41
osse	sobersabre: you have to check it out	20:42
	git checkout x	20:42
	→ ionelmanolache joined	20:43
sobersabre	osse: yep, I did some sweet sweet git loggin' and it looks ok.	20:43
	→ vucks96 joined	20:44
	← rnsanchez_ left	20:45
	← Gsham left	20:45
	dmc → Absolem	20:45
	← renlo left	20:46
	→ Gsham joined	20:46
	→ renlo joined	20:47
	← ionelmanolache left	20:47
	← lordjancso left	20:49
	← dsdeiz left	20:49
	← mellernoia left	20:51
	→ red82 joined	20:52
	→ theseb joined	20:53
	← chris123456 left	20:54
	← renlo left	20:55
theseb	anyone know why http://ethereumclassic.org redirects to the github page...https://ethereumclassic.github.io/ but the HTTPS version won't redirect?	20:55
kadoban	Because whoever set it up didn't set it up correctly?	20:56
	← LBV_User left	20:56
	← red82 left	20:56
	→ einnjo joined	20:58
	← noecc left	21:00
	← Emperor_Earth left	21:01
	← d0nkeyBOB left	21:01
theseb	kadoban: ok good so i'm not crazy..i'm not a DNS guru but registrars can do this?	21:01
	(redirect ssl'd domains?)	21:02
	← tyreld left	21:02
	→ annoymouse256 joined	21:03
ammunta	kadoban: probably because they couldn't be bothered to get a cert	21:03
	→ m0viefreak joined	21:05
	← Endarked left	21:05
kadoban	theseb: Well, you can't really do redirects like that on the DNS level. At least, that site isn't. It's connecting to whatever server runs ethereumclassic.org, and that server is saying "Hey look over there! -->" (a 302 response, in HTTP-speak)	21:05
	theseb: And that web server just isn't set up to allow connections via HTTPS	21:06
	→ Orion3k joined	21:06
	← atomi left	21:06
	→ MickyW joined	21:06
kadoban	Probably because of ammunta's reasoning	21:06
	gitinfo set mode: +v	21:08
MickyW	Im using git for windows. Pearson git-GUI. Having a pure local repo. No branches. Today I started a database check and got two messages about "dangling blobs". I am completely lost despite trying to get some help myself in the internet. I would like to know: 1. Is that a critical situation? 2. May I (in case that I can't fix it tonight) switch of the computer without making things worser? 3. What may I do to fix? Would be very kind, if you coul	21:08
	d give me some hints.	21:08
	→ akanksha__ joined	21:08
	→ dsdeiz joined	21:08
	← dsdeiz left	21:08
	→ dsdeiz joined	21:08
	→ emg joined	21:08
	→ atomi joined	21:08
	→ Faylite joined	21:09
	→ cdg joined	21:09
kadoban	As far as I know, nothing on the DNS level really interacts with TLS at all, at least in this manner. If the redirect were happening via DNS, like a CNAME I guess it would be, it'd work identically for HTTP and HTTPS, if the final server accepted connections via both.	21:10
	MickyW: I don't think dangling blobs are an actual problem by themselves, though maybe wait for confirmation from someone else.	21:10
MickyW	kadoban: I am the only user. The repo is purely local. Not even a connection to internet.	21:11
kadoban	AFAIK you can get dangling blobs simply by doing 'git add' several times before you commit or probably other ways as well.	21:11
MickyW	kadoban: Thats probably true. I got impatient today, when the git-gui does comparison of a great file, which I didnt wanted to commit.	21:13
	→ Limes joined	21:13
	← emg left	21:13
MickyW	Clicked "in advance" to the other file and entered commit message, expecting that event buffer will do. That occured about two or three times (I do not do it that way regularily, but today I was too impatient).	21:14
	← atomi left	21:14
	→ atomi joined	21:15
	→ Lipp joined	21:15
	← Lipp left	21:16
	→ ramsub07 joined	21:16
kadoban	I don't really use git-gui, I'm not sure what you're talking about.	21:16
MickyW	kadoban: I think thats like "disturbing" a running comparison by starting an "add".	21:17
	→ Endarked joined	21:18
MickyW	kadoban: Not sure if they at all may interfere each other. But that's the only irregularity I remember. (Just in order to declare each possible cause to you).	21:19
	← Gsham left	21:19
kadoban	MickyW: AFAIK you don't actually have a problem just because of dangling blobs. Is anything else not working as you expect?	21:20
	→ renlo joined	21:20
	→ askb joined	21:20
	→ lalilulelo joined	21:21
	→ HoierM joined	21:21
	← Endarked left	21:22
MickyW	kadoban: Can't say that as I stopped using git or to do anything related to git or the files at all. (Had to leave then). As far as I can see, all commits (I remember) are listed. Didn't try anything so far. But I am used to take warnings serious (like with compiler warnings), which may be superflous in this case.	21:22
	← lalilulelo left	21:23
MickyW	kadoban: Maybe me I am too ... :-) But this is the first time ever having problems (say warnings) from git. That impressed me a lot. :-)	21:23
	→ crayon joined	21:24
	← courrier_ left	21:24
kadoban	MickyW: I believe the warning exists because the "blobs" won't exist forever, since it's dangling it'll get cleaned up eventually.	21:24
	← crayon left	21:24
	→ crayon joined	21:24
	→ danslo_ joined	21:24
MickyW	kadoban: Additionally git is a riddle to me. Would prefer to dismantle a watch and reconstruct it instead.	21:25
	→ lalilulelo joined	21:25
	← daniel_rose left	21:25
	← nettoweb left	21:26
	→ Rickmasta joined	21:26
	→ daniel_rose joined	21:26
MickyW	kadoban: But doesn't that mean, that I did something wrong or in the wrong sequence?	21:26
kadoban	I don't think so. Maybe hang around and see if anyone disagrees.	21:26
MickyW	kadoban: One more question if you allow: Do you think that will "heal" itself? Say, with a database compression or likewise?	21:27
kadoban	Dangling blobs eventually get garbage collected, if you call that healing.	21:28
	→ MarceColl joined	21:28
	← MarceColl left	21:29
	← danslo_ left	21:29
MickyW	kadoban: For me it sounds like something wasn't commited, even if I can't see any irregularity. As far as I can see, the blobs will hang around if do not do anything about them.	21:29
	→ pbrewczynski joined	21:29
	→ MarceColl joined	21:29
	→ Mobutils joined	21:29
	→ nettoweb joined	21:29
MickyW	kadoban: I mean, shouldn't that blobs anyhow incorporated into the repo?	21:30
	← daniel_rose left	21:30
	← Rickmasta left	21:30
MickyW	kadoban: Sorry. Don't want to be too talkative or even insisting, but I am really desperate.	21:30
kadoban	If you add a file, change it, add it again, and commit, why would the first blob make it anywhere? It should be dangling.	21:31
	→ chris123456 joined	21:32
	← MarceColl left	21:32
	mar77i_ → mar77i	21:32
	→ MarceColl joined	21:32
	← ieee left	21:32
	← jost_ left	21:32
MickyW	kadoban: Hmm. Its only that all files are added a long time ago and I only did changes and commits since then.	21:33
	← eivarv left	21:34
	→ emg joined	21:35
MickyW	kadoban: Sorry. That's not true. I recently added some more files. That was two days before I think. But maybe that blobs hung around for some days either and I didn't knew it, because I didn't start the database check until today. Hmm.	21:35
	← Rodya_ left	21:35
MickyW	kadoban: OK. From what I told you, you would say, that the situation is not critical - means possible data loss? Right?	21:36
	→ eivarv joined	21:37
	← Es0teric left	21:37
	→ jstimm joined	21:40
	← ResidentBiscuit left	21:40
	← ahmedelgabri left	21:40
	→ ResidentBiscuit joined	21:40
	← jstimm left	21:40
	→ jstimm joined	21:41
	← dsantiag_ left	21:41
	← anonymus_ left	21:42
	→ anonymuse joined	21:42
	← annoymouse256 left	21:46
	← shinnya left	21:47
	→ Es0teric joined	21:47
	← EricPoe left	21:48
	→ mischat joined	21:48
	→ finalbeta joined	21:48
	← dviola left	21:49
	← gho5t_ left	21:49
	← MarceColl left	21:50
	→ MarceColl joined	21:50
	→ rmbeer joined	21:52
rmbeer	hello	21:52
	← MarceColl left	21:52
	← mischat left	21:52
rmbeer	is good practice comment the codes or always depend of git for recover lines?	21:52
	→ MarceColl joined	21:52
Zarthus	why an "either this or that" when you can do both? :)	21:53
	← jimi_ left	21:54
	← MarceColl left	21:54
	→ Snugglebash joined	21:54
	→ eb0t joined	21:54
MickyW	I think these are different matters. Comments will not recover and vice versa.	21:54
	← rmichnik left	21:55
	← fees left	21:55
kadoban	rmbeer: Do you mean comment out code to keep it? That's usually useless when you can just delete it and get it from history if you need it. Not always though.	21:55
	← eb0t left	21:55
	→ MarceColl joined	21:55
	← ExoUNX left	21:56
	→ eb0t joined	21:56
	← lalilulelo left	21:56
	← laumann left	21:57
	→ thebope joined	21:58
	← jeffreylevesque left	21:58
	← oskarkv left	21:59
MickyW	rmbeer: In case you meant commenting out code I would say, that depends on your usual workflow in such cases. Both are options but deleted lines will probably get out of scope of your mind. That may be compensated by revising commit history and/or using branches instead. But I usually comment out code which I intend to revise in short.	21:59
	→ mischat joined	21:59
	← a3Dman left	21:59
	← ochorocho__ left	21:59
	← eivarv left	22:01
	← utrack left	22:03
	← blackwind_123 left	22:04
	← MrWoohoo left	22:05
	→ blackwind_123 joined	22:06
	→ romerocesar joined	22:07
	← Ryanar left	22:09
	→ cyan__ joined	22:09
	→ utrack joined	22:10
	→ Gsham joined	22:10
	→ eivarv joined	22:11
	← Snugglebash left	22:12
	← Es0teric left	22:12
	→ a3Dman joined	22:13
	→ snowkidind joined	22:13
	← vuoto left	22:15
	→ aidalgol joined	22:16
	← anonymuse left	22:18
	→ anonymuse joined	22:18
	← mablae left	22:19
	→ mablae joined	22:20
	→ pijiu joined	22:21
MickyW	Is there a way to see, what's in my dangling blobs?	22:21
	← dsdeiz left	22:22
	← LucaTM left	22:23
	← anonymuse left	22:23
	→ LaptopBrain joined	22:23
	← noidea left	22:23
thiago	git show them	22:24
	← MarceColl left	22:25
	→ danslo_ joined	22:26
MickyW	thiago: Thank you.	22:27
	← romerocesar left	22:28
MickyW	kadoban: Thank you too, for answers.	22:28
kadoban	Anytime	22:29
	→ mellernoia joined	22:29
	← danslo_ left	22:30
	← ramsub07 left	22:31
	← cyan__ left	22:31
	← theseb left	22:31
	→ theskillwithin joined	22:31
	← eivarv left	22:32
	← nicksloan left	22:32
	← e14 left	22:34
	← leTali left	22:34
	→ eivarv joined	22:34
	← sangy left	22:35
	→ shgysk8zer0 joined	22:36
	→ lucazz joined	22:39
	← mischat left	22:40
	→ mischat joined	22:41
	← WayToDoor left	22:42
	← apotry left	22:42
	← askb left	22:43
	→ WayToDoor joined	22:43
	→ WaReZ joined	22:44
	→ mycelium joined	22:45
	← mischat left	22:45
	← vucks96 left	22:46
	← miklcct left	22:46
	← JamesBaxter left	22:46
	→ miklcct joined	22:47
MickyW	Oh. git fsck --lost-found found one dangling commit, one dangling tree and three(!) dangling blobs.	22:47
	← fenris_kcf left	22:48
MickyW	That's definitely not my day today.	22:48
	Only two blobs. Sorry.	22:49
osse	that's common	22:50
MickyW	Really? Oh.	22:50
osse	git commit --amend; # whoops, the previous commit object is now dangling	22:50
	← morenoh149 left	22:50
	← GenZai left	22:51
osse	git rebase # don't get me started	22:51
	git add file; modify file more; git add file (again) # welp, we gotta a dangling blob, boys	22:52
MickyW	Think, the latter is the case.	22:52
	Dont know what to do now. But I think I don't have a knack for such things today.	22:53
osse	are you actually (in the human sense) looking for something you lost?	22:53
	if not, forget about it	22:53
	← thebope left	22:53
	→ leTali joined	22:54
MickyW	osse: Not so far, yet. But got unsecure now. Maybe I miss something which I do not know,that I miss it.	22:54
	kadoban said something similar but didn't know then that there are dangling trees and commits too.	22:55
	→ askb joined	22:56
	← aard_ left	22:56
	← ResidentBiscuit left	22:57
MickyW	However. Too tired and too bugged now. Will shift it until tomorrow and thotoughly go through it.	22:57
osse	MickyW: just so you know, this is advanced stuff. most people never get there	22:59
	and those that do mostly do so because they need to, because they as scientists say "fucked up"	23:00
MickyW	:-)	23:00
	→ johnmilton joined	23:00
	← cagedwisdom left	23:00
Sonderblade	doesnt dangling just mean it is not reachable from a branch?	23:00
MickyW	As far as I understood that. Yes.	23:00
osse	Sonderblade: no, that's unreachable. dangling means that it's unreachable, but also unreachable from other unreachable objects	23:01
	it's like unreachable squared	23:01
MickyW	Ah. Thats a difference. Indeed.	23:01
osse	there is no deeper circle of hell	23:01
Sonderblade	so it's a special type of garbage?	23:02
osse	just a different one	23:02
	→ dling joined	23:03
osse	Sonderblade: ok, imagine you have this history: A - B - C - D - E (master). Now you do 'git reset --hard C' so you have A - B - C (master). D and E are now unreachable. D is reachable from E, so not dangling. E is not reachable from anywhere => dangling.	23:03
MickyW	That is uncritical in case I did that reset by intent. Right?	23:04
osse	yep	23:04
	uncritical even if they didn't, for up to two weeks or something like that	23:05
	(that's the minimum git keeps garbage around before deleting it)	23:05
MickyW	Ah.	23:05
	→ morenoh149 joined	23:06
rmbeer	MickyW, kadoban , thank. now thinking by remove lines of code. :)	23:06
MickyW	And otherwise? How may I reconnect D to C?	23:06
osse	MickyW: it is already connected.	23:06
	there just isn't any reference pointing to D or E, so that's what you gotta do	23:06
	→ dan2k3k4 joined	23:07
	→ madebymarkca joined	23:07
	← crayon left	23:08
	← jccn left	23:08
	← AaronMT left	23:08
MickyW	But doesn't that mean, that a reference from D to C is missing? (That what I consider "unconnected" - am I wrong).	23:08
	Some ?s missing.	23:08
	← Gsham left	23:09
MickyW	Do you make distinction between "connection" and "reference"?	23:09
osse	MickyW: yes there is a distinction. Every commit knows which commit is its parent. That's how the chain is formed	23:10
MickyW	Yes.	23:10
	I thought I already knew that.	23:10
	→ cagedwisdom joined	23:13
	← justanotheruser left	23:13
MickyW	So information in D that C is its parent is deleted?	23:14
osse	no	23:14
	it's stored inside D	23:14
	D still exists	23:14
	you just don't know how to get to D.	23:15
	→ mischat joined	23:15
	→ Rodya_ joined	23:15
MickyW	Where is that info stored?	23:15
osse	inside the commit object	23:16
	← LeBlaaanc left	23:16
MickyW	So that comit object is distinct from a "data object" - that mysterious "blob", isn't it?	23:17
	← chris123456 left	23:17
osse	yes	23:17
	inside the commit object is also info about a tree object. that tree object that refer to other trees or blobs	23:17
	tree = "directory". blob = "file"	23:18
	sort of	23:18
MickyW	Ah. OK.	23:19
	Have to read about that. Thank you.	23:19
osse	!bottomup	23:19
gitinfo	'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)	23:19
	← mischat left	23:20
MickyW	Uh. Fine. Thank you.	23:20
	← hahuang61 left	23:21
	← nettoweb left	23:21
	← sea-gull_ left	23:22
	→ justanotheruser joined	23:22
	→ jwcapps joined	23:22
	→ ws2k3 joined	23:22
	gitinfo set mode: +v	23:22
	← HoierM left	23:22
jwcapps	Why does $ git checkout -p give me patch does not apply, even if I don't actually edit the hunk	23:23
osse	does it say "doesn not apply to the index" ?	23:24
	← eivarv left	23:24
	→ xall_ joined	23:24
	→ vacho joined	23:24
vacho	Saved working directory and index state WIP on master: 26197e4 Merge master with 'origin/WCP-209'	23:25
	HEAD is now at 26197e4 Merge master with 'origin/WCP-209'	23:25
	I can't stash in git.. getting this response:	23:25
	Saved working directory and index state WIP on master	23:25
	any idea?	23:25
jwcapps	osse: it just says patch does not apply	23:25
	osse: even if I just go through and type y for all hunks	23:26
	→ ramsub07 joined	23:26
vacho	I just want to reset my branch and start fresh from remote branch	23:26
osse	vacho: git reset --hard remote/branch	23:27
	→ Rickmasta joined	23:27
	← finalbeta left	23:27
osse	presumably git reset --hard origin/WCP-209	23:27
	jwcapps: i don't know then	23:27
	→ finalbeta joined	23:27
vacho	fatal: ambiguous argument 'origin/WCP-209': unknown revision or path not in the working tree.	23:27
osse	find whatever is the right thing	23:28
vacho	osse: ?	23:29
	→ tyreld joined	23:29
	← WaReZ left	23:29
vacho	I just want to reset so I can continue my work, not sure why git is giving this	23:29
	← Darren_ left	23:29
osse	vacho: what is the name of the remote branch ?	23:29
	i can't know that	23:30
vacho	osse: how can I find out?	23:30
	← Sasazuka left	23:30
vacho	I want origin master from remote	23:30
osse	then it's origin/master	23:30
	← Faylite left	23:30
vacho	thx that worked really well.	23:31
	→ Darren_ joined	23:32
	← Rickmasta left	23:32
	← Darren_ left	23:32
	→ hahuang61 joined	23:32
	← akanksha__ left	23:32
	← jwcapps left	23:33
	→ e14 joined	23:33
	→ cdown joined	23:33
	→ Sasazuka joined	23:34
	→ sangy joined	23:34
MickyW	Thank you all for reading and patience. Good night (or whatever good). Bye.	23:34
	← kpease left	23:35
	← MickyW left	23:35
stoned	Hello, I have modified files accidentally, but not committed my changes. How can I restore the files to the last commit?	23:35
	← johnmilton left	23:35
	← netj left	23:35
	→ netj joined	23:36
	→ mikecmpbll joined	23:36
	← Kaisyu left	23:36
	→ dsdeiz joined	23:37
	← dsdeiz left	23:37
	→ dsdeiz joined	23:37
thiago	stoned: type git status. It will tell you what to do.	23:37
	← einnjo left	23:37
	→ anonymuse joined	23:37
	→ Marbug joined	23:37
	← e14 left	23:38
vacho	osse: thank u !	23:39
	← vacho left	23:39
	← Marbug_ left	23:41
	→ led_belly joined	23:41
stoned	thiago: thanks!	23:43
	→ e14 joined	23:44
	→ venmx joined	23:46
	→ Vinnie_win_r joined	23:48
	← e14 left	23:48
	← tyreld left	23:50
	← Vinnie_win left	23:50
	← askb left	23:51
stoned	now I seem to have lost some files	23:52
	They are live on my website, but when I check my local repository, they're not there	23:52
	→ aax joined	23:54
	← Sna4x8 left	23:55
	← fahadash left	23:56
	← xaa__ left	23:58
	← GavinMagnus left	23:58
stoned	I don't udnerstand what happened	23:58
	https://stoned.io/authors/jasmine-miller/Solitude-And-Grace-Original-Poem-By-Jasmine-Miller/	23:58
	It's the most_recent.html file that is clearly live on my website, which I git pull on my server, but it's not in the repository on remote or local	23:59
	how did that disappear?	23:59
	← irco left	23:59

Logs Search ←Prev date Next date→

Channels Documentation