IRCloggy #git 2015-12-10

Provider of IRC logs since 2005.

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

	2015-12-10
	→ blackwind_123 joined	00:01
	→ zarubin joined	00:02
	→ anli joined	00:03
	→ Caelum joined	00:03
	→ sokolowitz joined	00:03
	← quazimodo left	00:05
	← zarubin left	00:07
	← sokolowitz left	00:07
	→ petaflot_ joined	00:08
	← anli left	00:09
	← geri left	00:09
	← circ-user-zsfzv left	00:09
	← WaReZ_ left	00:09
	← s8321414 left	00:09
	← fahadash left	00:11
	→ geri joined	00:11
	← localuser- left	00:11
	→ s8321414 joined	00:12
	← petaflot_ left	00:12
	→ nettoweb joined	00:12
	← s8321414 left	00:12
	← cagedwisdom left	00:13
	← BillCriswell left	00:14
	← espindola left	00:15
	→ s8321414 joined	00:16
	→ localuser- joined	00:17
	→ tang^^ joined	00:18
	← tang^ left	00:21
	← ncthom91 left	00:21
	→ quazimodo joined	00:22
	→ puff` joined	00:23
	→ peoliye joined	00:24
	← jorj_ left	00:24
	→ abacuspowers joined	00:24
	← chitopunk left	00:25
	→ gambler joined	00:26
	← gambler left	00:26
	← dopesong left	00:26
	← puff left	00:27
	→ gambler joined	00:27
	← LeBlaaanc left	00:27
	→ ncthom91 joined	00:28
	← mellernoia left	00:28
	→ LeBlaaanc joined	00:28
	→ Seban joined	00:28
	← Seban left	00:28
	→ zacg joined	00:28
	← zacg left	00:28
	→ zacg joined	00:28
	→ gopar joined	00:29
	← hexagoxel left	00:29
	→ dopesong joined	00:29
	→ boushi__ joined	00:29
	← paul424 left	00:29
	→ daivyk joined	00:29
	← abacuspowers left	00:29
	← noteness left	00:30
	→ hexagoxel joined	00:31
	← alanwill left	00:32
	← boushi_ left	00:32
	→ _cyril_ joined	00:33
	→ boushi joined	00:33
	← boushi__ left	00:35
	← josuebrunel left	00:37
	← _cyril_ left	00:37
	→ petaflot joined	00:38
	← SimonNa left	00:38
	← tvw left	00:38
	→ hahuang65 joined	00:40
	← dopesong left	00:41
	← petaflot left	00:41
	← geri left	00:42
	→ durham_ joined	00:45
	→ lethjakman-l joined	00:47
	← m0viefreak left	00:47
	← tag left	00:48
	→ noteness joined	00:48
	← durham left	00:48
	← durham_ left	00:49
	← hexagoxel left	00:51
	→ geomyidae joined	00:52
	→ hexagoxel joined	00:53
	← diegoviola left	00:54
	→ nnyk joined	00:55
	→ Lyqyd joined	00:56
	← fscala left	00:57
	← fstd left	00:59
	→ fscala joined	00:59
	→ fstd joined	00:59
	→ anth0ny_ joined	01:01
	← kilo_bravo left	01:01
	← imachuchu left	01:01
	→ mehola joined	01:02
	→ boushi_ joined	01:02
	→ daito joined	01:03
	← tang^^ left	01:03
	→ tang^^ joined	01:05
	← mDuff left	01:05
	← boushi left	01:05
	→ atomicb0mb joined	01:05
	→ boushi__ joined	01:05
	← ncthom91 left	01:06
	← mehola left	01:06
	← hexagoxel left	01:07
	← daito left	01:07
	← boushi_ left	01:08
	← s00pcan left	01:08
	→ hexagoxel joined	01:08
	→ s00pcan joined	01:10
	→ DolpheenDream joined	01:10
	← nnyk left	01:10
	→ igli joined	01:10
	← col left	01:10
	← s8321414 left	01:10
	→ diegoviola joined	01:12
	← MrWoohoo left	01:13
	← MrWoohoo2 left	01:13
	← quazimodo left	01:15
	← LeBlaaanc left	01:15
	→ boushi_ joined	01:15
	← diegoviola left	01:15
	→ diegoviola joined	01:15
	← lethjakman-l left	01:16
	→ LeBlaaanc joined	01:16
	→ xtun joined	01:17
	→ faux___ joined	01:18
	← rendar left	01:18
	← boushi__ left	01:18
	← justanotheruser left	01:19
	← dreiss left	01:21
	← anth0ny_ left	01:21
	→ theskillwithin joined	01:21
	→ lethjakman-l joined	01:21
	→ justanotheruser joined	01:22
	← LeBlaaanc left	01:24
	→ arescorpio joined	01:25
	→ garples_ joined	01:25
	→ LeBlaaanc joined	01:25
	← hyperair left	01:28
	→ daito joined	01:29
	→ MarkyC joined	01:30
	→ geekthattweaks joined	01:31
	→ atrigent joined	01:32
	→ italoacasas joined	01:32
	→ puff`` joined	01:33
	← nettoweb left	01:33
	→ _cyril_ joined	01:34
	← MarkyC left	01:34
	→ corehello joined	01:35
	← corehello left	01:35
	→ cagmz joined	01:36
	← puff` left	01:37
	← LeBlaaanc left	01:37
	← lethjakman-l left	01:37
	→ LeBlaaanc joined	01:38
	← _cyril_ left	01:38
	← alexsystemf_- left	01:39
	→ atrigent_ joined	01:39
	→ CKyle joined	01:39
	← atrigent left	01:39
	atrigent_ → atrigent	01:40
	← atomicb0mb left	01:40
	← hackel left	01:40
	← akushner_ left	01:42
	← phrozensilver left	01:43
	→ Oculus joined	01:43
	← Oculus left	01:43
	→ Oculus joined	01:43
	← diegoviola left	01:43
	← cryptsting left	01:43
	← tang^^ left	01:44
	← xaa left	01:45
	→ lethjakman-l joined	01:47
	← CheckDavid left	01:49
	← rorro left	01:49
	← s00pcan left	01:50
	→ cprecioso joined	01:51
	← geomyidae left	01:51
	→ s00pcan joined	01:52
	→ OMGOMG joined	01:52
	← opdavies left	01:54
	← XDS2010 left	01:54
	← knownasilya left	01:54
	← jds left	01:54
	→ XDS2010 joined	01:55
	→ zeller joined	01:55
	→ addshore joined	01:55
	→ braderhart joined	01:55
	→ paperziggurat joined	01:55
	→ trig-ger_ joined	01:55
	→ apipkin joined	01:55
	→ opdavies joined	01:55
	→ spr0tsuki joined	01:55
	→ jds joined	01:55
	→ iamdevnul joined	01:55
	← gopar left	01:55
	← jagob left	01:56
	← wymillerlinux left	01:56
	→ sublimate joined	01:56
	→ eagles0513875_ joined	01:56
	→ sfr^ joined	01:56
	→ nettoweb joined	01:56
	→ knownasilya joined	01:56
	→ jagob joined	01:57
	← peoliye left	01:57
	← puff`` left	01:57
	→ cryptsting joined	01:58
	← sfz- left	01:58
	→ phantombeta\|2 joined	01:58
	← LeBlaaanc left	01:59
	→ harish joined	01:59
	→ jordanl joined	01:59
jordanl	is there an equivalent to `git subtree` that doesn't commit to the local repo?	02:00
	i'm looking for an easy way to pull a subdirectory from an external repo w/o any history or commits	02:00
	→ troyt joined	02:00
jordanl	just get a snapshot of the files at a specific ref	02:01
	← jfran left	02:01
	← phantombeta left	02:01
	→ boushi__ joined	02:01
	← Sasazuka left	02:02
kadoban	jordanl: Sounds like subtree with squash or something	02:02
	← mezod left	02:02
	← phantombeta\|2 left	02:02
	→ phantombeta joined	02:02
kadoban	jordanl: Which is case it's not clear, is already in there. Look for --squash	02:03
	← fuchsi left	02:03
	← Sadeukko left	02:03
	→ Sasazuka joined	02:03
	← cprecioso left	02:03
atrigent	jordanl: it sounds like you want to clone without cloning	02:04
	→ sokolowitz joined	02:04
	→ boushi joined	02:04
	← faux___ left	02:04
	← Ahmed90 left	02:04
	← boushi_ left	02:04
	→ hyperair joined	02:05
igli	you can always clone with --reference, especially if it's a temp checkout	02:05
	oh -s my bad. not sure that's going to make any difference locally	02:06
	← boushi__ left	02:06
jordanl	kadoban: i thought squash still made a commit to the local repo. it just squashed the remote history down to a single local commit.	02:07
	→ gopar joined	02:07
igli	just checkout the ref you want, and then cp or tar the directory out.	02:07
	→ diego1 joined	02:08
	← aidalgol left	02:08
jordanl	yea i could do that. i was just wondering if git had a one-step option	02:08
	← sokolowitz left	02:08
igli	rsync is nice too	02:08
atrigent	jordanl: git repositories are transferred in the form of repo objects	02:09
	→ kalz joined	02:09
atrigent	which means commits, trees, blobs, etc	02:09
kadoban	jordanl: It does. You want to make a change without a commit at all? Sounds like git isn't for you …	02:09
atrigent	and typically you start from a commit	02:09
	→ sfz- joined	02:10
atrigent	git itself can't help you checking out subdirectories or checking out repos without any history at all	02:10
	although you can do shallow clones	02:10
jordanl	kadoban: well, tbh, the local repo is irrelevant. i was just wondering if there was an easy way to clone a subdirectory of a repo	02:10
	← diego1 left	02:10
	→ diego1 joined	02:10
	diego1 → diegoviola	02:11
	→ [0xBEAKER] joined	02:11
atrigent	there isn't even a difficult way to do that	02:11
	it just doesn't make sense due to the way git works	02:11
igli	"an easy way to get a snapshot of the files in a subdirectory at a specific ref" => use the unix tools from a checkout.	02:11
	git is a complement to the rest of the userland, not a replacement for them.	02:12
jordanl	ok... although it sounds like a `git subtree --no-commit` option would do it	02:13
	→ smw_ joined	02:13
	→ petaflot joined	02:13
atrigent	jordanl: where is that option documented?	02:14
jordanl	it's not a real option. i'm suggesting that it could exist and serve my use case.	02:15
igli	it could check your email for you too	02:15
jordanl	since people are starting to get preachy about using unix tools and the use case being senseless.	02:15
atrigent	it sounds like you're making an assumption about how subtree works	02:15
jordanl	i understand it could be done in two steps. i was simply asking if it's possible right now	02:15
igli	no-one said the use-case was senseless, that i saw. isn't that what porcelain is about? or indeed a 2 line shell script?	02:16
	→ roygbiv joined	02:17
	← thiago left	02:17
	→ abacuspowers joined	02:17
	→ rchavik joined	02:19
	← rinwa left	02:19
	→ devoldmx joined	02:19
	← paddyez left	02:19
	→ JackFruh joined	02:20
	← petaflot left	02:21
	← abacuspowers left	02:22
	← Sasazuka left	02:22
	→ nnyk_ joined	02:23
	→ boushi_ joined	02:24
	→ tyll_ joined	02:25
	→ Rodya_ joined	02:25
	← boushi left	02:26
	← jordanl left	02:27
	← tyll left	02:27
	← localuser- left	02:27
	→ localuser- joined	02:27
	← diegoviola left	02:29
	→ MarkyC joined	02:31
	→ Vampire0 joined	02:32
	← [0xBEAKER] left	02:32
	← jagob left	02:32
	→ rubyonrailed joined	02:33
	← Vampire0_ left	02:34
	→ _cyril_ joined	02:34
	← MarkyC left	02:35
	→ gelei007 joined	02:37
	← pks left	02:37
	← codedmart left	02:38
	← s00pcan left	02:38
	→ rubyonra_ joined	02:38
	← rubyonrailed left	02:39
	→ pks joined	02:39
	→ s00pcan joined	02:39
	← _cyril_ left	02:39
	← looper left	02:40
	→ looper joined	02:43
	→ h0h0h0 joined	02:43
	→ rubyonrailed joined	02:44
	← rubyonra_ left	02:45
	← Rodya_ left	02:45
	← phantombeta left	02:46
	← cagmz left	02:46
	→ govg joined	02:46
	govg → Guest95708	02:47
	→ cagmz joined	02:47
	→ diegoviola joined	02:47
igli	if we override remote.pushdefault so that we can pull from upstream, and push to collab, how do i tell it what branch to push to? eg master -> collab:upstream	02:47
	or should i first track master in an upstream branch locally?	02:48
	→ phantombeta joined	02:48
igli	seems like push.default none # might help	02:48
	← localuser- left	02:50
	→ bibiki joined	02:50
	→ localuser- joined	02:50
igli	remote.$foo.push # default set of "refspec" for git-push	02:50
	← devoldmx left	02:50
igli	branch.name.merge seems to be symmetric	02:51
	→ faux___ joined	02:51
igli	yeah ok, just branch -t master upstream then	02:52
	→ devoldmx joined	02:52
	gitinfo set mode: +v	02:52
	← phantombeta left	02:52
bibiki	hi everyone	02:52
gitinfo	bibiki: 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.	02:52
	→ davidosomething joined	02:53
bibiki	I have this .git file in my machine, I clone off of it	02:53
	← h0h0h0 left	02:53
bibiki	now, I want to push to it but it wont let me	02:53
	I am using git-bash, windows 7	02:53
	when I do ls I see that there are no write permissions to the .git file	02:53
	← roygbiv left	02:53
	← gfixler left	02:53
bibiki	I do not know if that is the problem or what	02:54
	anyone has any idea	02:54
igli	sounds likely	02:54
bibiki	and git bash is only capable of adding x permission	02:54
	so I switched to a windows cmd as admin	02:54
igli	oh yay	02:54
bibiki	I run C\full path to my git\git.exe push... still same	02:55
igli	in general, "it doesn't work" or "it wont let me" aren't enough; provide the error message you got, instead.	02:55
	→ codedmart joined	02:55
igli	though you might get some good advice in #bash as well.	02:56
	→ Sasazuka joined	02:56
bibiki	error: failed to push some refs to 'c:/javaW....git'	02:56
	← devoldmx left	02:56
	← go1111111 left	02:57
bibiki	so it failes to push some refs... as the message says	02:57
	but I do git ls-remote	02:57
	→ rubyonra_ joined	02:57
igli	nothing before that?	02:57
	← Poppabear left	02:58
	← Zamerick left	02:58
	→ JuicyParsons joined	02:58
bibiki	nope... unless I skip "origin master"	02:58
	but that is just a warning	02:58
	← Sasazuka left	02:59
bibiki	I even tried --force and it still fails	02:59
	← rubyonrailed left	02:59
igli	that's git level, not fs level	02:59
	→ jagob joined	02:59
	→ ncthom91 joined	02:59
	→ Goplat joined	03:00
	→ jos3ph joined	03:00
	← italoacasas left	03:00
	→ pantsman- joined	03:00
bibiki	so, any idea	03:00
	→ Sasazuka joined	03:00
igli	your problem appears to be lack of write permission, which is outside of git's scope. though idk what a ".git file" is, myself. (some windows thing?)	03:00
	perhaps someone else knows better, wrt windows	03:01
	← nettoweb left	03:02
	→ boushi__ joined	03:02
	→ mehola joined	03:02
	→ italoacasas joined	03:03
	→ nafg_ joined	03:03
bibiki	it that which keeps track of changes. when you have the .git file you have the state of the tracked files	03:03
	like a database	03:04
	← Guest95708 left	03:04
	→ rubyonrailed joined	03:05
	← boushi_ left	03:05
	→ dreiss joined	03:05
	→ viper474 joined	03:05
	← rubyonra_ left	03:05
igli	ok; it's a directory here.	03:05
	← mehola left	03:06
igli	or a one-line file with the name of a directory after gitdir:	03:06
	← diegoviola left	03:07
	→ diegoviola joined	03:07
	← rubyonrailed left	03:09
	→ jeffreylevesque joined	03:09
	← xtun left	03:10
	← Vivekananda left	03:10
	→ xtun joined	03:12
	← codedmart left	03:12
	← bibiki left	03:12
	→ go1111111 joined	03:13
	← localuser- left	03:15
	→ localuser- joined	03:15
	← viper474 left	03:16
	← CKyle left	03:16
	→ viper474 joined	03:16
	← daivyk left	03:16
	→ thiago joined	03:17
	← Psychiatrist left	03:17
igli	hmm i did: git branch -t upstream # which makes a rebasing branch as branch.autosetuprebase=local. however this made a commit on master, which 'upstream' now tracks.	03:19
	← nnyk_ left	03:20
igli	how do i get it so 'upstream' and master have the same commit as origin/master?	03:20
	→ soreau joined	03:21
	← pantsman- left	03:24
igli	hmm nm deleted it and reset master to remote/origin/master cid.	03:26
	← diogenese left	03:27
	→ diogenese joined	03:29
	← localuser- left	03:30
	→ localuser- joined	03:30
	← xtun left	03:31
	→ lubarch joined	03:33
	← italoacasas left	03:34
	← Fudgie left	03:34
	→ madduck joined	03:34
	→ _cyril_ joined	03:35
	← _cyril_ left	03:40
	← viper474 left	03:40
	→ geri joined	03:41
	→ viper474 joined	03:42
	← geri left	03:43
	← viper474 left	03:43
	→ viper474 joined	03:43
	← viper474 left	03:44
	→ viper474 joined	03:45
	← FireArrow133 left	03:49
	→ s8321414 joined	03:49
	→ kp666 joined	03:51
	← tfry left	03:51
	← forbidden404 left	03:52
	→ devoldmx joined	03:52
	← bronson left	03:53
	← daito left	03:53
	← dreiss left	03:55
	← lubarch left	03:55
	→ NeverDie joined	03:57
	← devoldmx left	03:57
	← lethjakman-l left	03:57
	→ scarabx joined	03:57
	← faux___ left	04:00
	→ devoldmx joined	04:00
	→ peoliye joined	04:00
	← hahuang65 left	04:01
	→ nilg joined	04:05
	← Dullin left	04:08
	← viper474 left	04:08
	→ faux___ joined	04:09
	← a3Dman left	04:10
	← arescorpio left	04:11
	← joki left	04:12
	→ CKyle joined	04:13
	→ mehola joined	04:15
	→ Manikandan joined	04:15
	→ joki joined	04:18
	→ a3Dman joined	04:19
	→ abacuspowers joined	04:19
	← faux___ left	04:20
	← smw_ left	04:23
	→ chipotle joined	04:23
	← abacuspowers left	04:24
	← sparetire_ left	04:24
	← diegoviola left	04:26
	← scarabx left	04:26
	← skinux left	04:28
	← chipotle left	04:29
	→ daito joined	04:30
	→ MarkyC joined	04:31
	← Sasazuka left	04:32
	→ diego1 joined	04:34
	← diego1 left	04:34
	→ diego1 joined	04:34
	diego1 → diegoviola	04:34
	← MarkyC left	04:36
	→ chipotle joined	04:36
	→ _cyril_ joined	04:36
	← ncthom91 left	04:39
	← CKyle left	04:39
	→ dreiss joined	04:40
	← _cyril_ left	04:40
	← Noldorin left	04:40
	→ cerkauskas joined	04:41
	← yqt left	04:42
	→ puff`` joined	04:42
	← diegoviola left	04:43
	← Sucks left	04:46
	← gopar left	04:46
	→ xtun joined	04:47
	← boombatower left	04:47
	puff`` → puff	04:48
	← peoliye left	04:50
	→ Sucks joined	04:50
	→ peoliye joined	04:50
	→ jteneyck joined	04:51
	← jteneyck left	04:51
	→ jteneyck joined	04:51
	→ gfixler joined	04:52
	← JuicyParsons left	04:53
	→ bronson joined	04:53
	← chucky_z left	04:55
	← ahr3n left	04:55
	← ffio left	04:56
	→ watabou joined	04:56
	→ hahuang65 joined	04:57
	← bronson left	04:58
	← puff left	04:59
	← dermoth left	05:00
	→ dermoth joined	05:00
	→ Arsonide joined	05:00
Arsonide	So for no reason whatsoever, my pull option stopped working. It just hangs indefinitely, until I have to force git closed, delete the lock, and hard reset.	05:01
	I've waited on it for hours, it's not just being slow, it's getting stuck/frozen.	05:01
	→ rubyonrailed joined	05:01
Arsonide	It's a GUI option but I believe it's a fetch/rebase combo.	05:01
	← hahuang65 left	05:02
Arsonide	and I believe the fetch is hanging	05:02
	when I type git fetch origin into the console, nothing happens	05:02
	← toothrot left	05:05
	→ bburky joined	05:10
	← fscala left	05:11
	→ fscala joined	05:11
	← sgen left	05:13
	← devoldmx left	05:13
atrigent	try -v? or examine traffic with wireshark? or talk to whoever is running the server?	05:13
	← JackFruh left	05:13
	← sdothum left	05:14
	← zacg left	05:15
	← cerkauskas left	05:15
	← mokbu left	05:16
	→ zahlman joined	05:16
	→ zotherstupidguy joined	05:16
	← zotherstupidguy left	05:16
	→ zotherstupidguy joined	05:16
	→ alanwill joined	05:17
	← lindenle left	05:17
	→ ffio joined	05:19
	→ wallyduchamp joined	05:19
	← alanwill left	05:21
	← dreiss left	05:21
	→ arup_r joined	05:22
	→ anth0ny_ joined	05:22
	→ elementalest joined	05:26
	← chipotle left	05:27
	→ chipotle joined	05:28
	→ lactose joined	05:29
	→ ayaz joined	05:29
	→ CussBot joined	05:29
	→ gitius joined	05:30
gitius	hello	05:30
	how do I checkout a specific tag?	05:30
	→ bronson joined	05:30
gitius	tag/release	05:31
	← wallyduchamp left	05:32
	→ ixjlyons joined	05:32
	→ alanwill joined	05:32
preaction	git checkout <tag>	05:33
	→ johan_sun joined	05:33
gitius	by <tag>	05:34
	what do you mean	05:34
	on stackoverflow some people said tags/<tag_name>	05:35
	→ scarabx joined	05:35
gitius	that was from 2009 though	05:35
	← samw left	05:36
preaction	just the tag...	05:36
igli	git tag -l # if you don't know them	05:36
	← danmulvey left	05:37
	→ _cyril_ joined	05:37
preaction	also did you try what the stackoverflow thread said?	05:37
	the point of stackoverflow is to be a repository of knowledge	05:37
	→ samw joined	05:39
	← aboseley left	05:39
	ojacobson snickers.	05:39
	← akiva left	05:39
	→ danmulvey joined	05:40
	← DolpheenDream left	05:41
	← _cyril_ left	05:41
	← weox left	05:42
	← samw left	05:43
	→ aboseley joined	05:43
	← igli left	05:46
	← xtun left	05:49
	← bronson left	05:50
	→ bronson joined	05:51
	→ Yeomra joined	05:54
	→ ashokrajar joined	05:56
	← Wetmelon left	05:56
	→ rubyontails joined	05:57
	← daito left	05:58
	← alanwill left	06:00
	← cagmz left	06:02
	← scarabx left	06:02
	← tpollard left	06:03
	→ daito joined	06:03
	→ sokolowitz joined	06:05
	→ MechtiIde joined	06:05
	→ circ-user-zsfzv joined	06:07
	→ dreiss joined	06:09
	← diogenese left	06:09
	← nafg_ left	06:09
	← sokolowitz left	06:09
	→ diogenese joined	06:10
	← s8321414 left	06:11
	→ rscata joined	06:12
	← localuser- left	06:13
	← Lyqyd left	06:17
	→ anli joined	06:19
	→ abacuspowers joined	06:21
	→ Samual joined	06:23
	← Samual left	06:23
	→ Samual joined	06:23
	sublimate → Auv	06:25
	← abacuspowers left	06:25
	→ ShapeShifter499 joined	06:26
circ-user-zsfzv	I have got a situation where cherry-picking a similar commit kills my refactoring in current commit and when it does not, http://stackoverflow.com/questions/34187857. What are the rules?	06:27
	→ settermjd joined	06:27
	← daito left	06:28
	← ashokrajar left	06:29
	→ ashokrajar joined	06:29
	Auv → sublimate	06:31
	→ MarkyC joined	06:32
	← ashokrajar left	06:34
	→ stee joined	06:34
	→ ashokrajar joined	06:35
	← MarkyC left	06:37
	→ _cyril_ joined	06:37
	→ Kicer86 joined	06:40
	← _cyril_ left	06:42
	← ash_work left	06:43
	→ Oog joined	06:43
	← ashokrajar left	06:43
	→ ashokrajar joined	06:44
	← Sucks left	06:46
	→ puff joined	06:47
	→ Sucks joined	06:48
	← rubyonrailed left	06:51
	→ gopar joined	06:51
	← bburky left	06:53
	→ xtun joined	06:53
	← akshat left	06:54
	← rubyontails left	06:55
	← MechtiIde left	06:57
	→ nbdy joined	06:57
	← Oog left	06:57
	← dreiss left	06:59
	→ JuicyParsons joined	07:00
	← ixjlyons left	07:05
	→ rnat joined	07:05
	→ olshevskiy87 joined	07:05
	→ josuebrunel joined	07:05
	← puff left	07:06
	→ puff joined	07:06
	← garples_ left	07:07
	→ garples joined	07:07
	← garples left	07:08
	→ ahr3n joined	07:08
	→ sokolowitz joined	07:10
	→ andschwa joined	07:10
	← ashokrajar left	07:11
	← arup_r left	07:15
	→ garples joined	07:15
	→ jordanl1 joined	07:16
	← jagob left	07:17
	→ ashokrajar joined	07:17
	→ thierryp_ joined	07:18
	→ arup_r joined	07:20
	→ roelmonnens joined	07:20
	→ mykespb joined	07:21
	→ acolson joined	07:22
	→ _nadim joined	07:22
	← thierryp_ left	07:24
	→ dreiss joined	07:24
	← chipotle left	07:25
	← gitius left	07:25
	→ thierryp joined	07:25
	→ troulouliou_div2 joined	07:27
	→ howdoi joined	07:27
	→ puff` joined	07:28
	← NeverDie left	07:29
	→ daito joined	07:30
	← gopar left	07:30
	→ eijk joined	07:30
	← puff left	07:30
	→ nafg joined	07:30
	→ freimatz joined	07:31
circ-user-zsfzv	Why does it tell you that the whole file is changed if only one line is different, http://stackoverflow.com/questions/34189779?	07:34
	← daito left	07:34
	→ CausaMortis joined	07:36
	→ tfry joined	07:36
	→ geri joined	07:37
	→ _cyril_ joined	07:38
	← geri left	07:39
	→ Alienpruts joined	07:40
	→ ThomasLocke joined	07:42
	← _cyril_ left	07:43
	← Gamecubic left	07:44
	← Goplat left	07:46
	→ SimonNa joined	07:46
	→ ilogger2 joined	08:15
	→ DevAntoine joined	08:15
	→ monokrome joined	08:19
	→ arup_r joined	08:21
	→ thierryp joined	08:21
	→ dvaske joined	08:22
	← arup_r left	08:23
	→ mithenks joined	08:23
	→ chandlerbing joined	08:23
	→ frsk joined	08:26
	→ Tekilla joined	08:26
	→ mokbu joined	08:29
	→ TomyWork joined	08:29
	→ Dullin joined	08:29
	→ arup_r joined	08:30
	← darnir left	08:30
	→ jay-m joined	08:31
	→ ffio joined	08:32
	→ Ravana joined	08:33
	← arup_r left	08:33
	→ leTali joined	08:33
	→ MarkyC joined	08:33
	→ snowdogs joined	08:34
	→ mwhooker joined	08:34
_rgn	Seveas: you around?	08:34
	→ rasto joined	08:35
snowdogs	Hi guys, I'm using Git in Netbeans and am confused about what the "Revision" field is for when creating a new branch. The doc says, "Type a specific revision of the selected item by entering a commit ID, existing branch, or tag name in the Revision field or press Select to view the list of revisions maintained in the repository." I really have no idea what that means though.	08:35
	→ nnyk_ joined	08:35
	→ arup_r joined	08:36
snowdogs	Can i just leave it on "master" if i want to eventually merge with master after working on the new branch?	08:36
	← MarkyC left	08:38
	→ kurkale6ka joined	08:38
	→ geri joined	08:38
	→ _cyril_ joined	08:39
	← nnyk_ left	08:40
	← geri left	08:42
jan_	We're havign loads of problems with git users on cygwin/windows. Workspaces corrupt all the time. I suspect it's the autoamtic garbage collection. gc.auto = 0 and receive.autogc = false are just the ones I need to never, ever run GC without the user explcitly asking for it, right?	08:42
	→ geri joined	08:42
	← arup_r left	08:44
	← _cyril_ left	08:44
	→ ac3takwas joined	08:44
Seveas	_rgn: sup?	08:44
j416	circ-user-zsfzv: I also tried to answer your second question http://stackoverflow.com/a/34197218/1875092	08:45
	→ Hounddog joined	08:45
_rgn	Seveas: it's related to git spindle, i was wondering how to use `git lab repos` outside a git repo with a private instance, couldn't find what the [options] meant in git lab [options] repos	08:46
	then i found http://seveas.github.io/git-spindle/accounts.html	08:46
	→ zeroed joined	08:46
Seveas	_rgn: 'git lab repos' doesn't need you to be in a repo to run it. If it does, that's a bug.	08:47
_rgn	it uses gitlab.com	08:48
	it wasn't obvious from `git lab` help output how to make it use a private instance	08:48
Seveas	it'll use your default account. If that's a gitlab.com account, it'll use that. If it's not a gitlab account it uses your instance	08:48
	→ settermjd joined	08:48
_rgn	oh	08:48
circ-user-zsfzv	j416: Why do you say that I want "no edit" in C if I commit into A?	08:49
Seveas	yes, git lab help could use some improvements there. git lab -h is actually better	08:49
	→ lg188 joined	08:50
Seveas	bug filed: https://github.com/seveas/git-spindle/issues/97 :)	08:50
_rgn	ah....	08:50
	i was trying git lab --help all along	08:50
	which just says No manual entry for git-lab	08:50
Seveas	I do ship manpages in the .deb packages	08:51
	but yeah, this all could be much better. The manpage doesn't even mention --account :/	08:52
	← geri left	08:53
_rgn	so i think i had entry for [gitlab.com] in my .gitspindle, which made `git lab repos` use that by default	08:53
	and if i do `git lab repos` without that entry, it prompts for my gitlab username	08:54
Seveas	it uses the [gitlab] entry by default. If there's no host=foo in that section, it assumes gitlab.com	08:54
_rgn	i have no [gitlab] entry atm	08:55
j416	circ-user-zsfzv: because git-cherr-pick does not fire up the editor by default, it is to match the behaviour of that.	08:55
	→ diegoviola joined	08:55
_rgn	just [gitlab "myprivateinstance"]	08:55
j416	circ-user-zsfzv: see man git-commit and search for --no-edit	08:55
gitinfo	circ-user-zsfzv: the git-commit manpage is available at http://jk.gs/git-commit.html	08:55
	→ Balliad joined	08:55
_rgn	git lab --account myprivateinstance repos works, as expected	08:55
	git lab repos prompts for account details	08:56
Seveas	interesting	08:56
	→ acetakwas joined	08:56
Seveas	I think if a [gitlab] section does not exist, and no --account is given, it'll try to create a [gitlab]. I could change that to check if any [gitlab foo] sections exist and use that	08:57
	→ reim joined	08:57
Seveas	another bug filed.	08:58
	but for now just change [gitlab "myprivateinstance"] to [gitlab] and it should DTRT	08:58
_rgn	also, git lab --account private repos doesn't show my personal repos, it seems to only list repos from a particular namespace	08:59
	← ac3takwas left	08:59
	→ puff`` joined	08:59
Seveas	do you have many repos?	08:59
_rgn	4 personal ones	08:59
	→ Zenrium joined	09:00
Seveas	and in the namespace that it shows?	09:00
_rgn	repos output is 20 lines so maybe limited?	09:00
Seveas	that's what I'm thinking	09:00
_rgn	yeah	09:00
Seveas	pity. That means it's time to dig into glapi.py and see why that is	09:02
	→ dantix__ joined	09:04
	→ nettoweb joined	09:04
	← acetakwas left	09:05
	→ clmsy joined	09:05
	→ DuckHuntDog joined	09:07
	→ doener joined	09:07
	← reim left	09:08
	→ nnyk_ joined	09:08
	← zeroed left	09:09
DuckHuntDog	Hi. I've created a feature branch where I've only changed something.js I've pushed the branch and made a pull request. Now what I had to pull some new stuff from origin/master it suddenly says "your local changes would be overritten by merge: something.js"	09:10
	And I can't build my project before I do a pull...	09:10
	→ zeroed joined	09:11
DuckHuntDog	How does git not recognize that the something.js in my branch is newer than the one in origin/master which is 4 months old?	09:11
	dantix__ → dantix	09:12
masak	DuckHuntDog: maybe you don't have tracking/upstream set?	09:12
	→ geri joined	09:12
	→ marcogmonteiro joined	09:12
	→ DavidDudson joined	09:14
Seveas	DuckHuntDog: you didn't commit your changes to something.js	09:14
	→ Kingsy joined	09:15
	→ cyphase joined	09:16
j416	jan_: corrupt in what way?	09:19
	← clmsy left	09:19
	→ Corosus joined	09:20
	← rasto left	09:21
	→ jokajak joined	09:21
	→ Macaveli joined	09:22
	→ nikio_ joined	09:22
	→ localuser- joined	09:23
nikio_	why am i logged in as some user when i do ssh -T [email@hidden.address]	09:23
	?	09:23
	→ MrWoohoo joined	09:24
	→ MrWoohoo2 joined	09:24
	→ rivarun joined	09:25
	→ fscala joined	09:25
	← thierryp left	09:25
Seveas	because they recognize you based on your ssh key	09:25
j416	nikio_: because you are using your ssh key to do that, and your ssh key tells bitbucket who you are	09:25
canton7	nikio_, bitbucket will look at the ssh key you present, and uses that to decide what user you're authenticating as	09:25
	ting ting ting triple combo!	09:25
j416	it seems we are in agreement yay	09:25
nikio_	but what if i just give a key that i use in some other site	09:26
	← jokajak left	09:26
nikio_	lets say i add it to one of my bit bucket accounts	09:26
j416	nikio_: then it won't recognise you unless they have that key as well	09:26
nikio_	they do	09:26
	→ adac joined	09:26
	← nnyk_ left	09:26
nikio_	maybe im using the wrong key	09:26
	what decides which key is being used when i do ssh -T [email@hidden.address]	09:27
	?	09:27
	→ silverslide joined	09:28
	← mokbu left	09:28
j416	nikio_: it will try all your keys until it finds one that works	09:28
	→ neunon joined	09:29
	← dvaske left	09:29
	← silverslide left	09:29
	→ maxorator joined	09:30
	→ jokajak joined	09:31
jan_	j416: just, broken , like, fatal: unable to read bc18... and sometimes clients have fatal: unable to read tree 58... Or even just files disappearing from the working tree (we know for sure that git (on windows) can't properly update a file that's being held upen by another process)	09:32
	git in windows is a mess	09:32
j416	jan_: eek.	09:32
	→ GT4066 joined	09:32
j416	jan_: sounds like some external thing that is interfering, anti-virus software or the like? hm	09:32
	backup thing maybe	09:32
nikio_	-.- well its not working, i added some key to my bitbucket account but its telling me im logged in as someone else	09:32
	and i cant connect to the remote repo	09:33
	→ vurma joined	09:33
jan_	those all have been disabled, or at least said to not watch any of the git working trees/repositories.	09:33
j416	jan_: odd :/ switch to unix? :P	09:33
jan_	j416: that would be the EASY way out ;-)	09:34
	→ MarkyC joined	09:34
j416	jan_: go for it! :D	09:34
jan_	but unfortunately I can't do that.	09:34
j416	nikio_: did you remove the original key?	09:34
	jan_: git-bash worked well for me when I was on windows, never got cygwin to work nicely	09:34
	→ rasto joined	09:35
j416	jan_: not sure if it changes things but maybe worth a try	09:35
	(i.e. mingw)	09:35
nikio_	nope	09:35
	but now i removed all keys from .ssh	09:35
jan_	it shouldn't matter from where it's ran.	09:35
nikio_	ssh -T [email@hidden.address] is still telling me i am logged in	09:35
	even though i removed the keys	09:35
j416	jan_: true, but when you're at "I'll just try turning it off and on again", anything may be worth trying :D	09:36
moritz	nikio_: does 'ssh-add -l' list the key?	09:36
	→ xtun joined	09:36
jan_	j416: if it were in my workspaces, I'd debug it like hell, but this in other peoples machines and they don't care about the machanics,it just has to work	09:36
nikio_	yes it does	09:37
j416	jan_: :/ good luck with it anyway.	09:37
jan_	j416: I just migrated 300+ devs from CVS to git, and it was HELL	09:37
nikio_	even though its not there	09:37
moritz	nikio_: well, ssh-agent holds keys in memory	09:37
j416	jan_: been there tried that, failed, you're awesome :D	09:37
nikio_	how can i log in	09:37
moritz	nikio_: you can use ssh-add -d to remove them from memory	09:37
nikio_	log out	09:37
moritz	nikio_: man ssh-add	09:38
nikio_	sh.exe": man: command not found	09:38
j416	(but more like 5, not 300.. oh well)	09:38
	← MarkyC left	09:38
	→ colli5ion joined	09:38
	→ wiky joined	09:39
	→ _cyril_ joined	09:40
	→ jstimm joined	09:40
	→ radsy joined	09:41
	← geri left	09:42
	→ cognoscente joined	09:42
	Macaveli → Mac\|AFK	09:42
	→ nnyk_ joined	09:43
	← DuckHuntDog left	09:44
	← _cyril_ left	09:44
nikio_	ok I had to delete the identity	09:46
	→ Anticom joined	09:46
nikio_	and add the right one	09:46
	as I thought	09:46
	thanks for the help	09:46
	→ rinwa joined	09:46
	← mwhooker left	09:51
	→ filisko joined	09:51
	→ sbasso joined	09:52
Seveas	moritz: if one uses gnome-keyring as ssh agent (the default in gnomish environments) ssh-add -d is actually a noop. Frustratingly.	09:53
moritz	Seveas: a. TIL. (I tend to use fvwm2 personally)	09:53
	← cyphase left	09:55
	→ reim joined	09:57
	→ s8321414 joined	09:58
	← cognoscente left	09:58
	→ cognoscente joined	09:59
	← neunon left	10:00
	→ aendrew joined	10:01
	→ XDS2010 joined	10:02
	→ neunon joined	10:02
	→ boxrick1 joined	10:03
	→ barq joined	10:03
	→ tfnico joined	10:03
	→ mjbrender joined	10:03
	→ ec joined	10:03
	→ weox joined	10:04
	→ rendar joined	10:06
	← reim left	10:07
	→ arnatal joined	10:08
	→ BrianBlaze420 joined	10:08
	→ abacuspowers joined	10:09
_rgn	Seveas: how do you select namespace with `git lab create`?	10:12
	it uses my personal namespace by default	10:12
	→ cyphase joined	10:12
	→ mischat joined	10:12
	← mischat left	10:12
	→ mischat_ joined	10:12
Seveas	_rgn: you don't. You like pointing out missing features, don't you? :)	10:13
_rgn	heh guess o	10:13
	← abacuspowers left	10:14
Seveas	hah, beat you to it	10:14
	https://github.com/seveas/git-spindle/issues/99 vs https://github.com/seveas/git-spindle/issues/100	10:14
	← Corosus left	10:15
	← localuser- left	10:15
	← DavidDudson left	10:15
	← ffio left	10:15
	→ localuser- joined	10:15
	→ Corosus joined	10:16
	← localuser- left	10:18
	→ localuser- joined	10:18
_rgn	need to move repos from enterprise github to private gitlab and trying to do as much as possible in cli	10:20
	→ phil22 joined	10:20
phil22	hello	10:20
	→ led_belly joined	10:21
phil22	right now I'm using bug/_descriptive_name as branch naming convention	10:21
	→ notebox joined	10:21
phil22	is it a good thing to add a date to it?	10:21
	when I have many branches, I don't know which is old, which is new etc	10:22
	→ daito joined	10:22
	← diegoviola left	10:23
_ikke_	you can used things like git branch --merged to see which branches are part of the current branch, and should be able to removed safely	10:24
Seveas	phil22: I wouldn't do that. It's easy to see the last commit for each branch	10:25
	git for-each-ref --format '%(authordate) %(refname) %(subject)' refs/heads	10:25
	→ tvw joined	10:26
	← puff`` left	10:28
	→ rnsanchez joined	10:28
	→ ssarah joined	10:28
	→ Ragnar joined	10:29
	← Corosus left	10:29
	→ bronson joined	10:29
	← lg188 left	10:30
	→ codeman joined	10:32
	→ mkoskar joined	10:32
phil22	mmmh ok	10:32
	sounds reasonable	10:32
	← daito left	10:32
	← bronson left	10:34
	→ MarkyC joined	10:34
	→ netcarver joined	10:35
	→ ffio joined	10:35
	← radsy left	10:36
	← MarkyC left	10:39
	→ dharriga1 joined	10:39
	→ triad joined	10:39
	← s8321414 left	10:40
	→ _cyril_ joined	10:41
	→ tinajohnson__ joined	10:41
	→ fracting joined	10:41
	← localuser- left	10:42
	→ localuser- joined	10:42
	→ skylite joined	10:43
	→ zarubin joined	10:43
	← _cyril_ left	10:45
	← zarubin left	10:47
	← mkoskar left	10:48
	→ sokolowitz joined	10:48
	→ mkoskar joined	10:48
	← rinwa left	10:49
	← GT4066 left	10:51
	→ dopesong joined	10:51
	← fracting left	10:51
	← wiky left	10:52
	→ leeN joined	10:52
	→ nfk\|laptop joined	10:53
	→ nnyk joined	10:54
	→ tg joined	10:55
	← nnyk_ left	10:56
	← netcarver left	10:56
	→ Sendoushi joined	10:56
	← nnyk left	10:59
	→ wyoung joined	11:00
	← Sendoushi left	11:00
	← localuser- left	11:00
wyoung	hey, how does one split a repo into two seperate ones? I only want to retain history of files being moved to new repo.	11:00
	→ localuser- joined	11:00
	→ wireshark joined	11:01
	→ Psychiatrist joined	11:02
	← cognoscente left	11:02
rom1504	using git filter-branch	11:02
	something similar to http://stackoverflow.com/questions/4042816/how-can-i-rewrite-history-so-that-all-files-except-the-ones-i-already-moved-ar	11:02
	→ fracting joined	11:03
rom1504	(1. copy original repo A/ into a B/ (and possibly a Backup/ too) 2. remove files from commits in A/ and B/ using filter-branch)	11:03
	→ nnyk joined	11:04
	→ mehola joined	11:04
	← Tekilla left	11:05
	→ s8321414 joined	11:05
	→ shiriru joined	11:06
	← wireshark left	11:06
	← triad left	11:07
	← Zenrium left	11:07
	→ Zenrium joined	11:08
	→ funfunctor joined	11:09
	→ elastix joined	11:09
	← mehola left	11:10
	→ Sendoushi joined	11:11
	→ InfoTest joined	11:11
	→ loren joined	11:11
	← elastix left	11:13
	→ xelxebar joined	11:14
	← maxorator left	11:15
	→ maxorator joined	11:15
	→ presto joined	11:15
	← maxorator left	11:15
	← xtun left	11:17
	→ reim joined	11:17
	← snowdogs left	11:19
Seveas	wyoung: git filter-branch or git subtree split	11:20
	← leeN left	11:20
	→ triad joined	11:20
	→ leeN joined	11:21
	→ a3Dman joined	11:21
	← shiriru left	11:22
	← reim left	11:23
	→ jnavila_ joined	11:23
	→ daivyk joined	11:28
fdv	git svn fetch spits out warnings about empty directories. does anybody know of a way to remove these warnings?	11:29
	(W: -empty_dir / W: +empty_dir)	11:30
	→ dangerousdave joined	11:30
	→ freimatz joined	11:31
fdv	I'm running this in cron job, and I'd like those warnings not to trigger an email	11:31
	so I redirect stdout to /dev/null, but these warnings are sent on stderr	11:32
	sent to stderr	11:32
	→ daito joined	11:33
	← Balliad left	11:34
	→ MarkyC joined	11:35
	→ xtun joined	11:36
	← Psychiatrist left	11:36
	← xtun left	11:37
	→ xtun joined	11:37
	← daito left	11:37
	← xtun left	11:37
	→ xtun joined	11:38
	→ staafl joined	11:38
	→ geri joined	11:39
staafl	What's a good single verb to describe commit+push?	11:39
	← MarkyC left	11:40
	← phil22 left	11:40
	→ _cyril_ joined	11:41
fdv	share?	11:41
	→ Psychiatrist joined	11:42
	← DevAntoine left	11:42
	← xtun left	11:42
	→ xtun joined	11:43
	→ zarubin joined	11:43
	← _cyril_ left	11:47
	→ danmulvey joined	11:47
	← zarubin left	11:48
	→ [Brain] joined	11:48
fdv	staafl: ^	11:49
	→ jost joined	11:49
	← sbasso left	11:49
staafl	fdv, not quite what I'm looking for.	11:50
fdv	by all means ;)	11:50
staafl	It's usually in the context of emails etc where you want to say "do etc in some project then commit and push it"	11:50
fdv	sounds like sharing to me ;)	11:51
staafl	But "commit and push" sounds too clumsy for what's an extremely common sequence of connected operations	11:51
fdv	but of course, it's a little more	11:51
	→ _nadim joined	11:52
staafl	Hmm... well, someone just asked me how to split a folder into a separate repo and I told him to just copy the repo, delete the other folders and "commit and push"	11:52
	→ mellernoia joined	11:52
staafl	In this case it's not really "sharing" since sharing implies someone else	11:53
	→ craigp joined	11:53
fdv	good point	11:53
	← nfk\|laptop left	11:53
fdv	just "push"?	11:54
	(which would imply commit)	11:54
staafl	fdv, yeah, that's might be the best option	11:55
fdv	personally, I'd go for commit & push	11:55
	it's explicit	11:56
	→ Manikandan joined	11:56
	→ nfk\|laptop joined	12:02
	→ devoldmx joined	12:03
	→ elastix joined	12:03
	← localuser- left	12:04
	→ localuser- joined	12:04
	← nnyk left	12:07
wyoung	Seveas: thnx bud	12:07
	← devoldmx left	12:07
	→ circ-user-zsfzv joined	12:08
circ-user-zsfzv	I have noticed that I do not see a couple of important commits done during several last days. Can I restore them?	12:09
	← fracting left	12:09
	→ abacuspowers joined	12:10
	← funfunctor left	12:10
	→ nnyk joined	12:12
	→ lolmaus joined	12:12
lolmaus	I've made commits A, B, C. Then I realized there was a problem in A and B. Can I make commits D and E and squash them into A and B respectively? E. g. AD, BE, C.	12:13
fdv	as long as you haven't pushed	12:13
lolmaus	fdv: I don't mind `push -f`, I'm in a fork and in a feature branch.	12:14
fdv	if you have, you'll need to force push after such a change	12:14
	ok	12:14
lolmaus	fdv, I only know how to squash sequential commits.	12:14
fdv	as long as you don't have other users (or you don't care about them) ;-)	12:14
	yes, but you change their order	12:14
	...first	12:15
	→ harish_ joined	12:15
fdv	rebase --interactive	12:15
	← abacuspowers left	12:16
fdv	So 'pick A; pick B; pick C; pick D; pick E' becomes 'pick A; pick D; pick B; pick E; pick C', then 'pick A; squash D; pick B; squash E; pick C'	12:17
lolmaus	fdv, do you mean I should do two rebases? Or both steps can be done in one rebase?	12:20
	→ denisMone joined	12:20
lolmaus	Dang it, it won't accept the different order. :(	12:22
	Says "could not apply"	12:22
	→ ulkesh joined	12:23
	→ fracting joined	12:24
	← jay-m left	12:25
fdv	lolmaus: one rebase is fine	12:25
	but, as you noticed, they need to apply	12:25
	← InfoTest left	12:25
fdv	lolmaus: create a new branch from A, apply D, B, E and C, and fix problems as you go along, then rename the branches (and set up default push branches as necessary)	12:26
	→ jay-m joined	12:27
fdv	remember it's just a DAG ;)	12:27
	→ lindenle joined	12:27
	← Psychiatrist left	12:27
	← fracting left	12:29
	→ bronson joined	12:29
	→ zotherstupidguy joined	12:31
	← lindenle left	12:33
	← bronson left	12:34
	→ dvaske joined	12:38
	← notebox left	12:39
	→ reim joined	12:39
	→ notebox joined	12:39
	→ xelxebar_ joined	12:40
	← notebox left	12:40
	→ _cyril_ joined	12:42
	→ Jackneill joined	12:42
	→ fracting joined	12:42
	→ irqq joined	12:43
	← xelxebar left	12:43
	← localuser- left	12:46
	← Manikandan left	12:46
	← _cyril_ left	12:47
	→ fabio joined	12:47
	→ lubarch joined	12:48
	← fabio left	12:49
	← colli5ion left	12:50
	→ xfbs joined	12:50
	← elastix left	12:50
	→ roelmonnens joined	12:52
	→ acolson joined	12:52
	→ kadoban joined	12:53
	→ sdothum joined	12:53
	→ Norm_ joined	12:54
	→ taru- joined	12:55
	→ gravitron_ joined	12:55
	Norm_ → Norm	12:55
	→ ajpiano joined	12:55
	→ littlebe1r joined	12:56
	→ overcast joined	12:56
	← danmulvey left	12:56
	→ _xelxebar joined	12:56
	→ sgambino joined	12:56
	← circ-user-zsfzv left	12:56
	→ circ-user-zsfzv joined	12:57
	→ akkad joined	12:57
	→ ygeLN joined	12:58
	→ legumbre joined	12:58
	→ yonatankoren joined	12:58
	→ faux___ joined	12:58
	→ Olipro joined	12:59
	→ fstd joined	12:59
	← xelxebar_ left	12:59
	→ kam270 joined	13:01
	→ DevAntoine joined	13:02
	→ ac3takwas joined	13:02
	← ac3takwas left	13:03
	← faux___ left	13:03
	← irqq left	13:04
	→ faux___ joined	13:04
	← Anticom left	13:07
	→ synthroid joined	13:07
	→ Derega joined	13:09
DevAntoine	hi	13:10
	→ petaflot joined	13:11
	→ Musok joined	13:12
	→ xelxebar joined	13:12
	← Sendoushi left	13:12
	→ shiriru joined	13:14
	← petaflot left	13:14
	← _xelxebar left	13:14
	→ d0nn1e joined	13:17
	→ sebbel joined	13:17
	→ kappy joined	13:17
DevAntoine	I've switch branch with unstaged files in the stash, I've then pop the stash but I have conflicts. I want to go back to the previous branch to avoid all this conflict. I tried to use git reset --hard with git reflog but it did worse, I lose these conflicted files, I don't know what happened oO I wanted to go back to the last line of this gist: https://gist.github.com/anonymous/2dca8996ff5871956d44	13:18
	→ ac3takwas joined	13:19
	→ atomicb0mb joined	13:19
	→ catsup joined	13:20
	→ josuebrunel joined	13:22
	← vurma left	13:23
	← sdothum left	13:24
	→ sdothum joined	13:25
	→ malesca joined	13:26
	→ roygbiv joined	13:26
	← fracting left	13:28
	→ dvaske_ joined	13:28
	→ InfoTest joined	13:29
	→ dvaske__ joined	13:29
	← dvaske left	13:29
	→ jonno11 joined	13:30
	→ JanC joined	13:30
	→ xelxebar_ joined	13:31
	← dvaske_ left	13:33
	← xelxebar left	13:33
	→ jteneyck joined	13:34
	← jteneyck left	13:34
	→ jteneyck joined	13:34
	→ konr joined	13:35
	← ac3takwas left	13:37
	← loren left	13:37
	→ DolpheenDream joined	13:37
	← jteneyck left	13:39
	← Musok left	13:39
	→ mellernoia-work joined	13:40
	→ fracting joined	13:40
	← mellernoia left	13:41
	← mischat_ left	13:41
	→ mischat joined	13:41
	→ _cyril_ joined	13:43
	→ wrouesnel1 joined	13:44
	← lubarch left	13:45
	→ DARSCODE joined	13:46
	← _nadim left	13:46
	← xelxebar_ left	13:46
	→ Sendoushi joined	13:46
	→ _nadim joined	13:46
	→ xelxebar joined	13:46
	← _cyril_ left	13:48
DevAntoine	anyone?	13:48
	→ nafg_ joined	13:49
	→ abc123_ joined	13:50
	→ algae joined	13:51
	→ justanotheruser joined	13:51
dzho	DevAntoine: do you have any remaining uncommitted files?	13:51
	← faux___ left	13:52
	→ cspotcode joined	13:52
	→ David1977\|2 joined	13:52
	→ timmu joined	13:52
	→ elmcrest joined	13:52
	→ huhlig joined	13:52
	→ lonelearner joined	13:53
	→ ionelmc joined	13:53
DevAntoine	dzho: everything disappeared. I checkout back to the previous branch, did another git stash pop without believing and I get back all my files oO	13:53
dzho	so, you have what you want, now?	13:53
	→ B0ltzy joined	13:54
lonelearner	How can I revert a git repo (local only; not shared with anyone) to an earlier commit such that there is no evidence of any commits after the revert point?	13:54
	I tried git reset --hard but I can still see the commits I wanted to lose using `git show`	13:55
	→ nvahalik joined	13:55
	← zeroed left	13:56
	← fracting left	13:56
	→ colli5ion joined	13:57
	← gnarf left	13:57
	→ rdnt joined	13:58
	→ cebor joined	13:58
	→ Nikhil_D joined	13:58
	→ marscher joined	13:59
	→ jrm joined	13:59
	← jrm left	13:59
	→ jrm joined	13:59
	→ cloudcell__ joined	13:59
	→ Laaw joined	14:00
	← denisMone left	14:00
	→ dstarh joined	14:00
	→ nurupo joined	14:00
	← nettoweb left	14:00
	→ slick joined	14:00
	← Kobaz left	14:00
	→ Gamecubic joined	14:00
	→ gnarf joined	14:01
	→ italoacasas joined	14:02
dzho	lonelearner: maybe you want to git reset --hard <commit>	14:02
lonelearner	dzho: like I explained above, I already tried that but I can still see the old commits that I wanted to lose using `git show` and `git log`.	14:03
	← italoacasas left	14:03
	→ Kobaz joined	14:03
	→ italoacasas joined	14:03
	→ loren joined	14:04
	→ devoldmx joined	14:04
	→ daito joined	14:04
	→ krawchyk joined	14:05
	← cebor left	14:05
dzho	lonelearner: sorry, initially you didn't say you specified a commit argument, so I couldn't tell.	14:05
	David1977\|2 → David1977	14:05
	→ cebor joined	14:06
	→ scarabx joined	14:06
	→ mezod joined	14:06
lonelearner	dzho: sorry about that. I should have mentioned. indeed I tried `git reset --hard <old_commit>` but I can still view `git show <older_commit>`	14:06
dzho	weird	14:06
	this is all on master, or what?	14:06
	→ lykinsbd joined	14:07
	← s8321414 left	14:07
	← cebor left	14:08
	← devoldmx left	14:08
	→ zeroed joined	14:08
	← daito left	14:09
	→ fracting joined	14:10
	← Ragnar left	14:10
	→ AaronMT joined	14:10
	→ cebor joined	14:11
ilmari	lonelearner: git keeps unreferenced objects for two weeks by default. you can 'git gc --prune=all' to delete them	14:12
	→ abacuspowers joined	14:12
ilmari	that will delete all commits not referenced by a tag or branch	14:13
	→ ac3takwas joined	14:14
	→ DaddyEric joined	14:14
lonelearner	ilmari, I ran `git gc --prune=all`. I can still see `git show <newer_commit>`.	14:14
	→ ogelami joined	14:15
	← marscher left	14:15
	→ mrkake joined	14:15
	← loren left	14:15
	→ lykinsbd_ joined	14:15
	← kappy left	14:15
ilmari	lonelearner: does 'git tag --contains <newer_commit>' or 'git branch --contains <newer_commit>' show anything?	14:15
	→ quenode joined	14:15
lonelearner	let me check	14:15
	no output for both commands	14:16
	→ Poppa joined	14:16
	→ _Vi joined	14:17
	← abacuspowers left	14:17
	← ac3takwas left	14:17
	→ Ldip joined	14:17
	← dvaske__ left	14:17
ogelami	i'm trying to migrate from svn to git, and by doing "git svn clone [repourl] --no-metadata -A users.txt -s [project name]" i get "Author: [email address] not defined in users.txt file", but i have indeed added that name to users.txt like "[username] = [fullname] <[email address]>"	14:17
	← lykinsbd left	14:18
ogelami	any clue what i might have done wrong? google gave me plenty of results, but most of them being users that have the wrong format in the authors-file	14:19
	→ notebox joined	14:19
	← notebox left	14:20
	← jonno11 left	14:21
	→ notebox joined	14:21
	← atomicb0mb left	14:21
	→ ncthom91 joined	14:21
	→ ac3takwas joined	14:21
	← dopesong left	14:25
	→ King_Hual joined	14:25
	← King_Hual left	14:25
	→ King_Hual joined	14:25
	→ dopesong joined	14:26
	← King_Hual left	14:26
	→ King_Hual joined	14:26
	← King_Hual left	14:26
	→ King_Hual joined	14:26
	← ac3takwas left	14:28
	→ anth0ny_ joined	14:31
	→ chitopunk joined	14:32
	→ Koire joined	14:32
	→ User458764 joined	14:33
	→ _cyril_ joined	14:33
	→ BBBThunda joined	14:34
	→ JohnMaximilian_ joined	14:34
	← ncthom91 left	14:34
	→ atomicb0mb joined	14:34
	→ mizu_no_oto joined	14:34
	→ MarkyC joined	14:35
courrier	Hey guys I've created a all_packages repo that contains submodules to repos package1, package2, but it looks like all_packages tracks a specific commit e.g. package2@c2d8fbd, can I make it pointing to the last available version?	14:36
	← reim left	14:37
	→ bonswouar joined	14:38
	← nvahalik left	14:38
	→ nvahalik joined	14:39
	→ cbonobo joined	14:39
	→ lubarch joined	14:40
	→ jonno11 joined	14:41
canton7	no. that's not how submodules work	14:41
	← B0ltzy left	14:42
	→ zarubin joined	14:43
	→ OliverJAsh joined	14:44
	← jonno11 left	14:45
	→ raven-au joined	14:46
	→ petaflot joined	14:46
	← zarubin left	14:48
	→ relipse joined	14:49
	→ Sasazuka joined	14:50
	← petaflot left	14:50
	→ kpease joined	14:51
	← kpease left	14:52
	← josuebrunel left	14:53
	→ Sucks joined	14:53
	← David1977 left	14:54
	→ jonno11 joined	14:54
	← italoacasas left	14:54
	→ B0ltzy joined	14:54
	→ kpease joined	14:54
	← jonno11 left	14:54
	← lubarch left	14:55
	→ fredbob joined	14:55
	→ faux___ joined	14:55
	→ lubarch joined	14:55
	← sebbel left	14:55
	→ italoacasas joined	14:55
	← B0ltzy left	14:56
	← lubarch left	14:56
	→ lubarch joined	14:56
	→ akshat joined	14:57
	← akshat left	14:58
courrier	canton7: so we can't point to HEAD?	14:58
canton7	courrier, correct	14:58
	→ paulweb515 joined	14:59
courrier	ok thanks canton7 :)	14:59
canton7	submodules are intended for including third-party dependencies. so you will want version X of library Y	14:59
	← paulweb515 left	14:59
	→ paulweb515 joined	14:59
	← Sucks left	15:00
	← xfbs left	15:01
	→ B0ltzy joined	15:01
	← littlebe1r left	15:02
	← fredbob left	15:02
courrier	Yeah I see, I was more looking for something to download and pull the laster version of many repos at once	15:02
	→ uri_ joined	15:03
	→ Sceorem_ joined	15:04
	→ Vile joined	15:04
	← Vile left	15:04
troulouliou_div2	courrier, use submodukes	15:04
	courrier, check git submodule foreach	15:05
	← B0ltzy left	15:06
	→ Sceorem__ joined	15:06
	→ mehola joined	15:06
	→ Dougie187 joined	15:06
troulouliou_div2	courrier, git internaly store in the tree the commit revision of the submodule, so after upgrade jus tcommit the new revision	15:09
courrier	troulouliou_div2: yeah, ok thanks :)	15:10
	← AaronMT left	15:10
	→ petersr joined	15:10
	← Sceorem_ left	15:10
	← User458764 left	15:10
troulouliou_div2	courrier, use somethign liek this : git ls-tree master:<path-to-directory-containing-submodule>	15:11
	and youll notice that the stored value is the commut revision of your submodule	15:11
	← sokolowitz left	15:11
	→ AaronMT joined	15:11
	← mehola left	15:11
	→ fuchsi joined	15:11
	→ phaleth joined	15:11
	← Sendoushi left	15:12
	→ ajf- joined	15:13
	→ Sucks joined	15:13
	← lubarch left	15:14
	→ lubarch joined	15:14
	→ JosephSilber joined	15:14
	→ ncthom91 joined	15:15
	→ noark9 joined	15:17
	← skylite left	15:17
	← lubarch left	15:18
	→ fairuz joined	15:19
	→ lubarch joined	15:19
	→ sbasso joined	15:19
	→ xfbs joined	15:19
	← mischat left	15:19
	→ Guest72694 joined	15:21
	→ Spacew00t joined	15:21
	→ frem joined	15:21
	← fairuz left	15:21
	→ jceb joined	15:21
	← Guest72694 left	15:22
	← xfbs left	15:22
	→ IrishPrime joined	15:22
	→ luksaur joined	15:22
	→ xfbs joined	15:23
	→ Sendoushi joined	15:24
	→ xfbs_ joined	15:25
	→ lykinsbd joined	15:26
	→ rwb joined	15:27
	← sbasso left	15:28
	← xfbs left	15:28
	← xfbs_ left	15:29
	← cyphase left	15:29
	← lykinsbd_ left	15:30
	← anth0ny_ left	15:30
	→ hobodave joined	15:31
	→ sbasso joined	15:31
	← settermjd left	15:31
	→ toogley joined	15:32
	→ Noldorin joined	15:32
	← lonelearner left	15:32
	→ bronson joined	15:33
	→ govg_ joined	15:34
	← _cyril_ left	15:34
	→ h3x89 joined	15:34
	gitinfo set mode: +v	15:35
h3x89	Hi all	15:35
gitinfo	h3x89: 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.	15:35
	→ ac3takwas joined	15:36
	← ajf- left	15:36
	→ acetakwas joined	15:36
	→ NeverDie joined	15:37
	← acetakwas left	15:37
	→ e7d joined	15:37
	← bronson left	15:38
	← sbasso left	15:39
	→ cyphase joined	15:41
	→ thiago joined	15:41
	← scarabx left	15:42
	← hobodave left	15:42
	→ scarabx joined	15:42
	→ ixjlyons joined	15:43
	← fracting left	15:45
guardian	hello, I would like to rebase my current branch to origin/foo -- however, instead of rebasing from the common ancestor of my current branch and origin/foo, I would like to rebase from a specific SHA1	15:46
	← geri left	15:46
	← colli5ion left	15:46
	← govg_ left	15:46
	← cyphase left	15:46
	→ rubyonrailed joined	15:47
kadoban	guardian: That's what the invocation with both and upstream and an --onto is for	15:48
	s/both and/both an/	15:48
	→ sparetire_ joined	15:48
	← shiriru left	15:48
	→ inamoriti joined	15:48
	→ editshare-ericf joined	15:49
canton7	guardian, take a look at the diagrams in man git rebase - find the diagram which matches the operation you want to do, and look at the command associated with it	15:49
gitinfo	guardian: the git-rebase manpage is available at http://jk.gs/git-rebase.html	15:49
	← petersr left	15:49
	→ akshat joined	15:50
guardian	thanks gonna read that again	15:50
	at least that doesn't sound like a strange request to you	15:50
	← Sasazuka left	15:50
	→ xelxebar_ joined	15:50
	→ _cyril_ joined	15:50
canton7	it's the one starting "Here is how you would transplant a topic branch based on one branch to anothe"	15:51
kadoban	guardian: Naw, it's pretty common. And yeah the rebase manpage is really good.	15:51
	← AaronMT left	15:52
	→ govg_ joined	15:52
	→ josuebrunel joined	15:52
	→ reim joined	15:53
	← InfoTest left	15:53
	← xelxebar left	15:54
	→ acetakwas joined	15:54
	→ gancl joined	15:54
	← acetakwas left	15:55
	← Sucks left	15:55
	→ acetakwas joined	15:56
	→ petaflot joined	15:57
	← acetakwas left	15:57
	→ acetakwas joined	15:57
	→ Sucks joined	15:58
	← acetakwas left	15:58
	→ fracting joined	15:59
	→ Ahmed90 joined	15:59
	→ acetakwas joined	15:59
	→ fredbob joined	16:00
	→ kzisme joined	16:01
	→ skul joined	16:01
	← acolson left	16:01
	← lubarch left	16:02
	→ lubarch joined	16:02
	← lubarch left	16:03
	← dopesong left	16:03
	→ noteness joined	16:04
	← fredbob left	16:04
	← Noldorin left	16:04
	→ Technocrat7 joined	16:04
	← govg_ left	16:04
	← rubyonrailed left	16:05
	→ devoldmx joined	16:05
	← h3x89 left	16:05
JosephSilber	How can I change the date on the last x commits, to now?	16:05
	→ Darcidride joined	16:05
	→ daito joined	16:05
JosephSilber	I understand that I'll be rewriting history...	16:05
	Stuff has been pushed.	16:05
	→ elastix joined	16:05
	← thiago left	16:06
kadoban	JosephSilber: … don't? But you probably want filter-branch with env-filter I think, and might have to do a bit of plumbing after that.	16:06
	→ govg_ joined	16:06
	→ lubarch joined	16:06
	→ CKyle joined	16:07
	→ phrozensilver joined	16:07
	← Darcidride left	16:09
	← devoldmx left	16:09
	← _cyril_ left	16:09
	→ hackel joined	16:09
	← daito left	16:09
JosephSilber	kadoban, turns out a simple git rebase -i HEAD^x did it.	16:10
	← roelmonnens left	16:10
JosephSilber	I set the first commit to "edit", then tweaked its message a drop.	16:10
	Now all newer commits are new commits, so they're all created now.	16:11
	→ sbasso joined	16:11
	→ roelmonnens joined	16:11
	→ Darcidride joined	16:11
	← roelmonnens left	16:12
kadoban	Ah, nice.	16:12
	→ roelmonnens joined	16:12
	← roelmonnens left	16:12
	→ abacuspowers joined	16:13
	→ PCatinean joined	16:14
	← Sceorem__ left	16:15
	← lykinsbd left	16:16
	→ abc123 joined	16:17
	← slick left	16:17
	← reim left	16:17
	← gnarf left	16:18
	← abacuspowers left	16:19
	→ cydrobolt joined	16:19
	← cydrobolt left	16:19
	→ cydrobolt joined	16:19
	→ slick joined	16:19
	← abc123_ left	16:19
	abc123 → abc123_	16:19
	→ KettleCookedWork joined	16:19
	→ h3x89 joined	16:19
	→ vogt joined	16:19
	→ Technocrat786 joined	16:20
	→ happy-dude joined	16:21
	→ KettleCookedDude joined	16:21
	→ _cyril_ joined	16:21
	← Technocrat7 left	16:22
	← weox left	16:22
	→ User458764 joined	16:22
	← Darcidride left	16:22
	→ CausaMortis joined	16:22
	→ rubyonrailed joined	16:23
	→ gnarf joined	16:23
	← gancl left	16:23
	← xtun left	16:24
	→ samort7 joined	16:24
	← KettleCookedWork left	16:25
	→ crose joined	16:26
	→ Es0teric joined	16:26
	→ kfpratt joined	16:27
	← toogley left	16:27
	← kfpratt left	16:28
	← synthroid left	16:28
	→ kegster joined	16:29
	→ lindenle joined	16:29
	← CausaMortis left	16:31
	← craigp left	16:31
	→ phantombeta joined	16:32
	→ cagmz joined	16:32
	→ LeBlaaanc joined	16:33
	→ mmlb joined	16:34
	← lindenle left	16:34
	← lubarch left	16:34
	→ lubarch joined	16:34
	→ moei joined	16:35
	← elastix left	16:35
	← sbasso left	16:36
	→ hobodave joined	16:36
	← mkoskar left	16:37
	→ sbasso joined	16:38
	→ kevwil joined	16:39
	→ davidosomething joined	16:39
	→ MechtiIde joined	16:40
	→ dreiss joined	16:40
	→ elastix joined	16:42
	→ zarubin joined	16:43
	→ madewokherd joined	16:44
	← lubarch left	16:44
	→ lubarch joined	16:44
	← lubarch left	16:44
	→ lubarch joined	16:44
	← [Brain] left	16:44
	← nfk\|laptop left	16:45
	← lubarch left	16:45
	← uri_ left	16:45
	→ lubarch joined	16:46
	← lubarch left	16:46
	→ lubarch joined	16:46
	→ uri_ joined	16:46
	→ synthroid joined	16:46
	→ Sasazuka joined	16:46
	← Sucks left	16:47
	→ Karkus joined	16:48
	→ Wetmelon joined	16:48
	← bonswouar left	16:48
	← zarubin left	16:48
	→ KettleCookedWork joined	16:48
	→ s00pcan joined	16:48
	→ espindola joined	16:49
	← LeBlaaanc left	16:49
	→ LeBlaaanc joined	16:50
	→ cousteau joined	16:51
	→ thiago joined	16:51
	→ beastd joined	16:52
	xelxebar_ → xelxebar	16:52
	← KettleCookedDude left	16:52
	→ tag joined	16:54
	← Koire left	16:55
	← tag left	16:55
	→ tag joined	16:55
	→ Techno786 joined	16:56
	← sbasso left	16:57
	→ reim joined	16:57
	← thiago left	16:57
	→ coolno1 joined	16:57
	gitinfo set mode: +v	16:58
coolno1	hello	16:58
gitinfo	coolno1: 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.	16:58
coolno1	hello	16:58
	a newbie here	16:58
	Need some help	16:58
	I am working on patch and have created another branch something like "bug/<bug_id>"	16:59
	I have already submitted one patch set and I am working on improving it further to submit 2nd patch set	16:59
	← Technocrat786 left	16:59
	← nnyk left	17:00
	← s00pcan left	17:00
coolno1	but before that I want to rebase to the master	17:00
	and than rerun my patch against unit test, functional test	17:00
	how do go about this	17:00
	→ waveclaw joined	17:00
ilmari	git checkout master; git pull; git checkout yourbranch; git rebase master	17:01
	→ thiago joined	17:01
	← scarabx left	17:01
	← noark9 left	17:02
	→ s00pcan joined	17:02
	← uri_ left	17:03
	← jnavila_ left	17:03
coolno1	ilmari, thanks for this	17:03
	← DolpheenDream left	17:03
coolno1	git pull --rebase origin master	17:04
	ilmari , can this command be also used git pull --rebase origin master	17:04
	→ scarabx joined	17:04
	→ _uri_ joined	17:04
coolno1	ilmari, how can I save my existing changes in a patch file	17:04
	just to take a backup	17:04
	and if something goes wrong I will reapply the changes on the existing branch	17:05
	← waveclaw left	17:05
	← _uri_ left	17:06
ilmari	git branch yourbranch-backup	17:06
	← Mac\|AFK left	17:06
	→ samw joined	17:08
	← adac left	17:09
	→ _uri_ joined	17:09
	→ skylite joined	17:09
	← _uri_ left	17:09
	← DevAntoine left	17:09
	→ _uri_ joined	17:09
	← OliverJAsh left	17:10
	← tag left	17:10
	→ ig0r_ joined	17:11
	→ sokolowitz joined	17:12
	← hobodave left	17:12
	← coolno1 left	17:12
	→ Manikandan joined	17:13
	→ cdg joined	17:13
	← PCatinean left	17:14
	← dantix left	17:15
	→ hyperair joined	17:15
	← h3x89 left	17:15
	← jay-m left	17:15
	← noteness left	17:16
	→ kaiza joined	17:16
	← kzisme left	17:16
	← sokolowitz left	17:17
	← _Vi left	17:18
	← Dougie187 left	17:18
	→ noteness joined	17:18
	→ coolno1 joined	17:19
	← reim left	17:19
	→ jonmasters joined	17:19
	gitinfo set mode: +v	17:19
coolno1	I have still not achieved the desired result	17:19
ExeciN	does my pull-n-build.sh script look sensible? https://gist.github.com/anonymous/8dd6b773ae577d7ee2da	17:20
coolno1	my master is updated with all the changes	17:20
	→ akushner joined	17:20
	→ tomtix joined	17:20
coolno1	but my local branch is not having the changes to the master	17:20
	→ The_Phoenix joined	17:21
	→ zacg joined	17:21
	← zacg left	17:21
	→ zacg joined	17:21
	← mithenks left	17:22
	→ UmbraMalison joined	17:22
	→ Corosus joined	17:22
	→ toogley joined	17:23
bremner	ExeciN: without looking, pulling in a script is usually not sensible because of potential conflicts	17:23
ExeciN	bremner: I am cleaning it first	17:24
	→ nettoweb joined	17:25
	→ OctoBanana joined	17:25
	← Techno786 left	17:26
	← LeBlaaanc left	17:28
	← jceb left	17:28
	→ LeBlaaanc joined	17:29
	← justanotheruser left	17:29
	← atomicb0mb left	17:30
	→ Technocrat7 joined	17:31
	→ dopesong joined	17:31
	← samort7 left	17:33
ExeciN	oh I wrote git -fd instead of git clean -fd	17:33
	→ justanotheruser joined	17:33
	← faux___ left	17:34
	→ atomicb0mb joined	17:34
	→ hobodave joined	17:35
	→ Noldorin joined	17:36
	← hyperair left	17:36
	← OctoBanana left	17:36
	← kurkale6ka left	17:36
	← Sendoushi left	17:37
	← rubyonrailed left	17:37
	→ anth0ny joined	17:38
	→ imachuchu joined	17:39
bremner	ExeciN: conflicts are related to merging, not cleaning.	17:39
	→ waveclaw joined	17:39
	← ncthom91 left	17:39
	→ Anderson69s_Deb joined	17:40
	→ faux___ joined	17:40
	→ arup_r joined	17:40
	← Anderson69s_Deb left	17:40
	← thiago left	17:41
	→ codedmart joined	17:41
	← Noldorin left	17:42
	← zeroed left	17:42
	→ mDuff joined	17:42
	← zacg left	17:43
	→ zarubin joined	17:43
	→ Anderson69s_Deb joined	17:43
	← waveclaw left	17:44
	← ogelami left	17:44
	← faux___ left	17:45
	→ jagob joined	17:45
	← codedmart left	17:45
	→ lindenle joined	17:46
	→ faux___ joined	17:46
	→ ncthom91 joined	17:47
	→ bronson joined	17:47
	← zarubin left	17:48
	→ ogelami joined	17:51
	← faux___ left	17:51
	→ faux___ joined	17:52
	← atomicb0mb left	17:53
	← TomyWork left	17:53
	← editshare-ericf left	17:55
	→ reim joined	17:55
	← faux___ left	17:57
	← inamoriti left	17:57
	← scarabx left	17:57
	← elastix left	17:58
	← noteness left	17:58
	→ elastix joined	17:58
	→ faux___ joined	17:59
	→ waveclaw joined	17:59
	← freimatz left	18:00
	← wrouesnel1 left	18:00
	← Technocrat7 left	18:00
	→ noteness joined	18:00
	→ durham joined	18:01
	→ rubyonrailed joined	18:01
	→ hyperair joined	18:01
	← dstarh left	18:02
	→ Sendoushi joined	18:02
	← lubarch left	18:02
	← faux___ left	18:03
	← waveclaw left	18:04
	← d0nn1e left	18:05
	→ faux___ joined	18:05
	→ d0nn1e joined	18:05
	→ devoldmx joined	18:05
	→ lubarch joined	18:05
	← lubarch left	18:05
	→ lubarch joined	18:05
	→ daito joined	18:06
	→ settermjd joined	18:06
	← settermjd left	18:06
	← rubyonrailed left	18:07
	← hobodave left	18:08
	→ Oebele joined	18:08
	← elastix left	18:09
	→ skarm joined	18:09
	← User458764 left	18:09
	← faux___ left	18:09
	← devoldmx left	18:10
	→ nydel07 joined	18:10
	← daito left	18:10
	→ benstrumental joined	18:11
	→ faux___ joined	18:11
	→ User458764 joined	18:11
	← LeBlaaanc left	18:12
	→ LeBlaaan_ joined	18:12
	← fuchsi left	18:12
	→ kfoonamalik joined	18:13
	→ tomog999 joined	18:13
	← ncthom91 left	18:14
	← skarm left	18:14
	← faux___ left	18:14
	← ac3takwas left	18:14
	→ faux___ joined	18:14
	← acetakwas left	18:14
	→ weox joined	18:14
	← cagmz left	18:15
	→ eijk joined	18:15
	← ogelami left	18:15
	→ abacuspowers joined	18:15
	→ ac3takwas joined	18:15
	→ gfixler joined	18:16
	← lubarch left	18:17
guardian	I initiated a rebase -i, and I removed a commit. Later another commit doesn't apply anymore. How can I checkout/keep the most recent version of the file?	18:17
	→ lubarch joined	18:17
	← lubarch left	18:17
	→ lubarch joined	18:17
	← lubarch left	18:17
	← reim left	18:18
	→ lubarch joined	18:18
	← lubarch left	18:18
	→ lubarch joined	18:18
	← abacuspowers left	18:20
	→ CheckDavid joined	18:20
	→ mokbu joined	18:22
	← User458764 left	18:22
	→ waveclaw joined	18:22
	→ thiago joined	18:22
	→ tfry joined	18:23
	→ neonalpine joined	18:24
	→ marscher joined	18:24
	← triad left	18:25
	→ Dougie187 joined	18:25
	→ encod3 joined	18:26
	← encod3 left	18:26
	← waveclaw left	18:26
	← JanC left	18:27
	→ HelloAtMega joined	18:28
	→ lykinsbd joined	18:28
	→ JanC joined	18:29
	← marscher left	18:29
	← kfoonamalik left	18:29
	← CKyle left	18:30
	→ acetakwas joined	18:30
	→ hobodave joined	18:31
	← arup_r left	18:31
	← italoacasas left	18:32
	← mokbu left	18:32
	→ fuchsi joined	18:33
	← noteness left	18:33
	← lubarch left	18:34
	→ localuser- joined	18:34
	← Karkus left	18:34
	→ ogelami joined	18:35
	← localuser- left	18:35
	→ noteness joined	18:35
	→ localuser- joined	18:35
	← HelloAtMega left	18:36
	→ nilg joined	18:36
	← akushner left	18:36
	→ jeffreylevesque joined	18:38
	→ akushner joined	18:38
	← akushner left	18:39
	← ogelami left	18:41
	← marcogmonteiro left	18:41
	← lolmaus left	18:41
	← dreiss left	18:42
	← nettoweb left	18:42
	← neonalpine left	18:42
	→ User458764 joined	18:43
	→ zarubin joined	18:43
	→ Synthead joined	18:44
	→ geri joined	18:47
	← noteness left	18:47
	→ paddyez joined	18:47
	← paddyez left	18:47
	→ paddyez joined	18:47
	→ MattMaker joined	18:47
	→ bolin joined	18:47
	→ HelloAtMega joined	18:47
	→ AaronMT joined	18:47
	← zarubin left	18:48
	← ac3takwas left	18:48
	← acetakwas left	18:48
	← thiago left	18:48
	→ lubarch joined	18:49
	← lubarch left	18:49
	→ lubarch joined	18:49
	← lubarch left	18:49
	→ ChoHag joined	18:49
	→ WizJin joined	18:51
ChoHag	Can I run rebase and/or merge without having to register a name and email (which the commands don't even use)?	18:51
	→ rinwa joined	18:51
	→ lubarch joined	18:52
	← lubarch left	18:52
	→ lubarch joined	18:52
	→ ac3takwas joined	18:52
ChoHag	Without the two variables defined in ~/.gitconfig git rebase and git merge both complain that git's missing information it doesn't need.	18:52
	→ noteness joined	18:52
	→ waveclaw joined	18:52
	← lubarch left	18:53
	→ Ragnar joined	18:54
	← HelloAtMega left	18:54
	← MechtiIde left	18:54
	→ HelloAtMega joined	18:54
kadoban	ChoHag: merge certainly needs it for most usages, rebase needs it for many of them … if you're using git, just set the things anyway.	18:55
	→ cryptsting joined	18:55
ChoHag	It's never "just".	18:56
	→ jojovem joined	18:56
ChoHag	If "just" setting them anyway was a satisfactory solution, I'd have "just" done so.	18:57
	← waveclaw left	18:57
	← benstrumental left	18:57
	→ craigp joined	18:57
ChoHag	The workflow under which the rebase is occuring doesn't use the values - I checked - but does bitch at me if I don't tell it what they are.	18:57
	← dopesong left	18:57
	→ nettoweb joined	18:58
ChoHag	Setting them is more hassle than they're worth. Or would be if git didn't insist on them.	18:58
	→ dopesong joined	18:59
ChoHag	Hence telling git to shut up and do what it's told was my preferred solution.	18:59
	→ pantsman- joined	19:00
	← King_Hual left	19:00
circ-user-zsfzv	Hi, how do I recover the couple of commits or branches that I do not see normally in the git list?	19:00
	→ CKyle joined	19:01
	← dopesong left	19:01
	← notebox left	19:02
	← faux___ left	19:03
	→ cagedwisdom joined	19:03
	→ mwhooker joined	19:03
	← Manikandan left	19:05
	← skylite left	19:05
qsuscs	ChoHag: !xy	19:06
gitinfo	ChoHag: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	19:06
	→ neonalpine joined	19:07
	← neonalpine left	19:07
circ-user-zsfzv	The problem is that I did a lot of playing with my repository and there are a lot of commits with the same message in 'git reflog'. There are totally 100 commits in reflog. Can I browse them?	19:07
	← MattMaker left	19:08
	→ editshare-ericf joined	19:08
	→ faux___ joined	19:09
	← filisko left	19:09
	→ SimonNa joined	19:09
	→ rafalcpp joined	19:10
	→ Darcidride joined	19:10
ChoHag	What?	19:10
	This doesn't even smell like an XY problem.	19:10
	Git complains that values it doesn't use are not set and refuses to continue until they are.	19:11
	I worked around it with the -c flag.	19:11
	And values of 'none', which, surprise surprise, don't show up in the git log that's about to get thrown away anyway.	19:12
	I would prefer a "do what you're fucking told, you're the computer and I'm the human" option, but software in general is sorely lacking in such an option.	19:12
	→ sokolowitz joined	19:13
bremner	another important principle is "pick your battles"	19:13
	← faux___ left	19:13
	→ notebox joined	19:14
	→ faux___ joined	19:15
	← kpease left	19:16
	→ TomyLobo joined	19:16
ChoHag	Well thankfully the workaround is simple.	19:16
	Stupid, as they usually are when software starts being obstinate, but simple.	19:16
	← _cyril_ left	19:16
	← sokolowitz left	19:17
	← editshare-ericf left	19:18
	→ jfran joined	19:18
ojacobson	ChoHag: what workflow causes rebase -not- to use your name and email? I'm legitimately curious; I can't think of any, other than "when it does nothing at all"	19:18
	→ windsurf_ joined	19:18
	← ffio left	19:19
	→ eijk_ joined	19:19
windsurf_	I'm working on a project where the git remote rejects pushes if any commits do not begin with a particular string (i.e. "[AP-121]"). How do they do this?	19:19
	→ jimi_ joined	19:19
jimi_	I think I am trying the wrong commands. I want to see the last time a particular line # in a file changed.	19:19
ojacobson	windsurf_: man githooks	19:19
gitinfo	windsurf_: the githooks manpage is available at http://jk.gs/githooks.html	19:19
kadoban	windsurf_: With a hook	19:19
Seveas	windsurf_: probably an update hook	19:20
	← arnatal left	19:20
	→ justanot1eruser joined	19:20
ChoHag	When the checkins are not changed in any way except for the order in which they are applied.	19:20
	← justanot1eruser left	19:20
	← justanotheruser left	19:20
	← faux___ left	19:20
	← crose left	19:20
ojacobson	ChoHag: nope, it uses your identity then to set the committer field of the new commits.	19:20
	(You can verify this with git cat-file commit <hash of one of the new commits>	19:20
windsurf_	ojacobson thanks	19:20
ojacobson	(the author field is left unchanged from the originals)	19:21
	← Darcidride left	19:21
	→ Darcidride joined	19:21
	→ lolmaus joined	19:21
	→ kzisme joined	19:21
	← eijk left	19:22
	ac3takwas → acetakwas	19:22
	→ justanotheruser joined	19:22
	→ kpease joined	19:22
ChoHag	Then their use is unnecessary.	19:22
	Especially considering that the entire thing is about to be thrown away once the tests are run to completion.	19:23
ojacobson	How so? Every commit has a committer field, by definition (removing it would make your tool not-Git, which is an option, but is off-topic here :); what value should the newly-created commits use for committer when you reorder them with rebase?	19:23
	← paulweb515 left	19:23
ojacobson	You can see one solution to this by looking at the metadata on github generated merges (refs/pull/NNNN/merge)	19:23
ChoHag	a) I don't care. They're getting thrown away. b) Whatever they're already set to in the commits which are being moved.	19:24
ojacobson	You don't care, but Git has no way to express that un-care. You gotta pick some value even if you don't care about the value.	19:24
ChoHag	It could express it by transferring the values from the commits it ... transfers.	19:25
	→ faux___ joined	19:25
ChoHag	--perform-rebase-as-original-committer	19:25
	→ yashu-seth joined	19:26
kadoban	--lie-because-setting-a-config-is-too-hard	19:26
ojacobson	Sure, maybe worthwhile. Suggest it on the !list and see if anyone bites. The default assumption is that the committer is the user or agent that created the commits, and the author is the user or agent who wrote the code, and that Git users would prefer that their history accurately reflect what happened	19:26
ChoHag	Boom. Now my software doesn't need to masquerade as a human with a name and email address it has no use for.	19:26
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	19:26
ojacobson	but an option to violate that assumption would be reasonable	19:26
	Who said anything about a human?	19:26
	Again, have a look at how other systems solve this problem. Gerrit synthesizes commits. Github does it. Bitbucket does it.	19:27
ChoHag	Software can have email addresses but until we get Matrix-level AI working it doesn't get a name, however affectionately we feel about it.	19:27
Seveas	I can't let you do that, ChoHag....	19:28
madewokherd	"Git" is a name	19:28
ChoHag	Or however much it wants to kill us...	19:28
	Git is the only appropriate name.	19:28
	← govg_ left	19:28
kadoban	ChoHag: Your software very likely has a name, or will before you release it.	19:29
	← faux___ left	19:29
kadoban	I don't think that means it's sentient.	19:29
	← _uri_ left	19:29
Seveas	git singularity --exterminate	19:29
	→ uri_ joined	19:30
ojacobson	Anyways, no, there's no way to do what you want. Set a placeholder, or patch git, or wait for someone else to patch git. The `committer` identity is inherent in the structure of a commit; that's not going to change in a hurry. Bonne chance and have fun!	19:30
ChoHag	Setting the options inline with the -c flag is sufficient.	19:30
	Wrong, but sufficient.	19:30
ojacobson	Great!	19:30
ChoHag	I'm a sysadmin. It's a compromise I'm well used to.	19:30
Seveas	GIT_COMMITTER_NAME="hal 9000" git rebase	19:31
	→ dreiss joined	19:31
	→ lubarch joined	19:31
	← lubarch left	19:31
	→ lubarch joined	19:31
	→ faux___ joined	19:31
windsurf_	is there a way to list the remote hooks?	19:31
ChoHag	There are god knows how many levels of configuration to go to between my text editor and the running code and setting the environment does not, for hilarious raisins, make it through.	19:31
	→ jteneyck joined	19:32
	← jteneyck left	19:32
	→ jteneyck joined	19:32
windsurf_	github for example only shows this in their docs: `GET /repos/:owner/:repo/hooks`	19:32
ChoHag	The same hilarious raisins which preclude creating a .gitconfig	19:32
windsurf_	what does that mean? I prefix it with http://github.com/ and just put that url in the browser? CURL??	19:32
ojacobson	windsurf_: no. (also, Github's hook system is not Git's hook system.)	19:32
	← cousteau left	19:32
ojacobson	For github's API, yes, you can use curl to read it. You'll likely need to use -u <your github username>; try it without first though	19:33
	← roygbiv left	19:33
windsurf_	ojacobson is there a way to see my repo's remote hooks or do I have to ask an admin? And then, how do I use that on my repo at Github then?	19:33
	is it something that can be initiated from the CLI locally or do I have to somehow do it through the github website?	19:33
ojacobson	You don't. Github doesn't support git hooks.	19:33
	You'd ask an admin, if it were a normal git repo.	19:33
windsurf_	ok	19:33
	but if CURL would work and it's a GET request, then in theory doing it in the browser url should also work, no?	19:34
	← bolin left	19:34
ojacobson	Maybe! You're likely to get a JSON blob back (since the Github API uses JSON pervasively), which generally look shit in the browser	19:34
	→ thiago joined	19:34
	→ waveclaw joined	19:34
ojacobson	being able to run it through `jq .` to prettify it is nice :)	19:35
windsurf_	yeah that's ok	19:35
	I'm getting a 404 though	19:35
	I'm just doing https://github.com/repos/myuserid/myrepo/hooks	19:35
	← doener left	19:35
ojacobson	Going by https://developer.github.com/v3/ it looks like their API is served on a separate hostname	19:36
	← faux___ left	19:36
ojacobson	snice that's part of the API…	19:36
windsurf_	oh, it looks like it might have to be api.github.com	19:36
	→ irqq joined	19:36
	→ ogelami joined	19:37
	→ faux___ joined	19:37
	→ MattMaker joined	19:39
	← waveclaw left	19:39
	← HelloAtMega left	19:39
	← mizu_no_oto left	19:39
	→ mablae joined	19:40
	→ peoliye joined	19:40
	← gfixler left	19:41
	→ yqt joined	19:41
windsurf_	am I understanding that a pre-receive hook is a local hook and I could use it to prevent me from pushing if I were missing a prefix?	19:41
	← MattMaker left	19:41
windsurf_	which would allow me to git rebase -i HEAD~n then push?	19:41
	← faux___ left	19:42
	← ogelami left	19:42
ojacobson	no	19:42
	pre-receive is run in the receiving repository, by the bits that process incoming pushes	19:42
	if you want a local hook, there are a few (pre-commit is the biggie)	19:42
windsurf_	I don't really need to enforce this remotely and it's looking like it'll take some time to figure out. I have only a few devs and could easily come up with something locally to achieve this and make sure each of us has that local hook. Not sure if there's an appropriate one though	19:43
ojacobson	local hooks can always be disabled or bypassed (eg. by removing them, or with git commit --no-verify)	19:43
	windsurf_ looks into pre-commit	19:43
	→ zarubin joined	19:43
	→ faux___ joined	19:43
	→ roygbiv joined	19:44
	← notebox left	19:44
	→ italoacasas joined	19:45
	→ MattMaker joined	19:45
circ-user-zsfzv	They say that reflog is my safety net. How do I undo some latest commands?	19:46
	→ fahadash joined	19:46
	← lubarch left	19:47
	→ serapath joined	19:47
	← ulkesh left	19:48
	→ Chunkr joined	19:48
	← zarubin left	19:48
	← MattMaker left	19:48
	← faux___ left	19:49
ojacobson	`git reflog` will show you the trajectory of HEAD; you can return to any previous entry with `git checkout -b some-name HEAD@{number}`	19:49
	→ ncthom91 joined	19:49
ojacobson	or git-reset, or whatever	19:49
	→ faux___ joined	19:50
	← User458764 left	19:50
	← faux___ left	19:50
	→ faux___ joined	19:50
	→ rubyonrailed joined	19:50
	→ MattMaker joined	19:51
windsurf_	ojacobson I'd like to hire someone to create my pre-commit hook or update hook	19:52
	interested?	19:52
ojacobson	You prrrobably can't afford me. :)	19:52
	Thanks, though. If it's simple enough, ask it here, and someone might sketch it up for you anyways	19:53
	→ Karkus joined	19:53
	→ lcarlson joined	19:53
	→ atomicb0mb joined	19:54
	→ rorro joined	19:54
	→ HelloAtMega joined	19:55
	← thiago left	19:56
	→ aidalgol joined	19:56
windsurf_	does anyone have a pre-commit hook example that rejects if the message doesn't contain or begin with a specific string?	19:57
	→ waveclaw joined	19:57
	← kzisme left	19:57
ojacobson	You actually want a commit-msg hook for that	19:57
	pre-commit runs before the message is collected	19:58
	← atomicb0mb left	19:58
	→ FireArrow133 joined	19:58
	→ ahr3n joined	19:59
	← rnsanchez left	19:59
	→ oojacoboo joined	20:00
	→ notebox joined	20:00
ojacobson	You could also use prepare-commit-msg to set up the right format based on branch name -- I've had some success with that on past projects	20:00
	← ncthom91 left	20:00
	→ kpease_ joined	20:00
ojacobson	eg. if the branch is ABC-1234-fix-gaskets then that hook can add "[ABC-1234] " to the first line pretty easily	20:00
	→ sxen joined	20:01
	→ User458764 joined	20:01
	← waveclaw left	20:01
	→ nivag joined	20:02
	← tvw left	20:02
	← kpease left	20:04
	← craigp left	20:04
	→ tirengarfio joined	20:04
	→ King_Hual joined	20:04
	← King_Hual left	20:04
	→ King_Hual joined	20:04
	← Darcidride left	20:05
	→ m0viefreak joined	20:05
	← oojacoboo left	20:05
	→ oojacoboo joined	20:06
windsurf_	ojacobson thanks, I don't know the reason for the prefix actually it's just a meaningless code on my end and doesn't change (often). I'll update it manually in the hook. I'll try commit-msg	20:06
	← oojacoboo left	20:06
	→ devoldmx joined	20:06
	→ daito joined	20:06
	← jeffreylevesque left	20:07
	← cebor left	20:08
	kpease_ → kpease	20:08
	→ cebor joined	20:09
	→ troulouliou_dev joined	20:10
	← devoldmx left	20:10
	← daito left	20:11
	→ dopesong joined	20:11
	← troulouliou_dev left	20:12
	→ _cyril_ joined	20:12
	→ jetpackjoe joined	20:12
	→ troulouliou_dev joined	20:12
windsurf_	ojacobson it's working! :) Only thing, is when it rejects, it doesn't output an error. How shall I add that in? maybe store the return of grep in a variable and do an if on that and if it's a non-zero value then echo my error?	20:13
	← lolmaus left	20:13
	← tomtix left	20:13
	← jojovem left	20:14
	← troulouliou_dev left	20:15
	← Ahmed90 left	20:16
	→ abacuspowers joined	20:16
ojacobson	Write to stdout or stderr (eg with echo)	20:16
	→ lolmaus joined	20:17
ojacobson	if ! head -n1 "$1" \| egrep -q pattern; then echo "commit message rekt, plz fix"; exit 1; fi	20:17
	← _cyril_ left	20:18
	← codeman left	20:18
	→ chucky_z joined	20:18
windsurf_	is that a typo, "-n1" ?	20:18
	hm what's head, is that a git command that git pipes to?	20:18
	← CheckDavid left	20:19
	← kpease left	20:19
	← sxen left	20:19
ojacobson	`man head`	20:20
	(reads a file or stdin, returns the first N lines of it, N=10 by default)	20:20
	returns/writes to stdout	20:20
windsurf_	oh	20:21
	thank you, and works beautifully btw, thank you so much!	20:21
	← MattMaker left	20:21
	→ MattMaker joined	20:22
	→ tomtix joined	20:22
	← jetpackjoe left	20:23
	← User458764 left	20:23
	← MattMaker left	20:24
	→ waveclaw joined	20:24
	→ boombatower joined	20:24
	→ govg joined	20:25
	→ User458764 joined	20:25
ojacobson	The rationale for head(1) there is that you said you wanted to check if the commit message started with the prefix you want	20:26
	head -n 1 will yield the first line of the file (which is the commit message to validate)	20:26
	grep then checks whether any line of its input (in this case, the first line of the original file) contains the pattern; anchoring the pattern with ^ ensures that the pattern occurs at the start of a line	20:27
	→ kappy joined	20:27
	→ just4today joined	20:28
	← waveclaw left	20:28
	← IrishPrime left	20:28
	→ zumba_ad_ joined	20:30
	← jteneyck left	20:30
	← cagedwisdom left	20:31
	← Sendoushi left	20:31
	← zumba_ad_ left	20:32
	← phrozensilver left	20:33
	→ nnyk joined	20:33
	→ gopar joined	20:34
	← abacuspowers left	20:34
tomtix	I'm encountering some problems with a git command inside an update hook, does someone know what happens here?: https://gist.github.com/anonymous/22c1af844b2172793b78#file-update-L19	20:35
	→ duderonomy joined	20:36
	← HelloAtMega left	20:36
	→ paulweb515 joined	20:36
	← ssarah left	20:37
ojacobson	tomtix: none of the commands in your gist require a work tree, you're omitting something.	20:37
	→ kzisme joined	20:37
ojacobson	That said, you probably want to export GIT_WORK_TREE	20:37
	!deploy	20:37
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	20:37
	→ cprecioso joined	20:37
	← cprecioso left	20:38
	← noteness left	20:39
	→ neanderslob joined	20:39
	→ adac joined	20:39
tomtix	The thing I dont get is that, as you can see, I directly put the command between those two echo	20:39
	→ cprecioso joined	20:40
windsurf_	ojacobson will that commit hook script (commit-msg) work on a windows machine? might have one dev for which it won't work otherwise.	20:41
ojacobson	Ask a Windows user :)	20:41
	→ phrozensilver joined	20:41
tomtix	OH	20:41
	it may be a typo	20:42
	and bash saying nothin when a variable is not set ;'(	20:42
	← taru- left	20:42
	→ taru joined	20:42
	→ cagedwisdom joined	20:43
	→ noteness joined	20:43
	→ mirton joined	20:46
moritz	tomtix: set -u in bash makes it complain about unset variables	20:46
	← phaleth left	20:47
	→ MattMaker joined	20:47
	→ kpease joined	20:47
	← mwhooker left	20:47
	→ tpollard joined	20:48
tomtix	moritz: ty for the information I will consider using it	20:48
	← MattMaker left	20:48
	← just4today left	20:49
	→ d5sx43 joined	20:49
	← d5sx43 left	20:49
moritz	other useful bash stuff: set -e (abort on errors), set -o pipefail (abort on errors in pipes)	20:50
	← mirton left	20:50
	→ lubarch joined	20:50
	← lubarch left	20:50
	→ lubarch joined	20:50
	← cebor left	20:51
	→ cebor joined	20:51
	→ mwhooker joined	20:52
	← lubarch left	20:52
	← cebor left	20:52
	→ cebor joined	20:53
windsurf_	ojacobson ok :)	20:53
	→ filisko joined	20:53
	← synthroid left	20:54
windsurf_	Does anyone know if a (remote) update hook that is designed to reject based on a missing "foo" string prefix would reject a fast-forward merge?	20:54
	← The_Phoenix left	20:54
ojacobson	depends on how it's written	20:55
moritz	windsurf_: a fast-forward merge is indistinguishable from just pushing the commits directly	20:55
	← Hounddog left	20:55
ojacobson	that whole family of hooks (there are four) receive the old and new commit hashes, and can do anything they want with that information	20:55
	inspecting only the new commit is one option, inspecting the whole range of new commits is another, changing behaviours based on how the old and new commits relate is another	20:55
	→ waveclaw joined	20:57
	→ _Vi joined	20:57
	→ nanga joined	20:58
	← nanga left	20:58
	→ nanga joined	20:58
	← roygbiv left	20:58
	→ Psychiatrist joined	20:58
	← _nadim left	20:59
	→ lubarch joined	20:59
	← lubarch left	20:59
	→ lubarch joined	20:59
	← cebor left	20:59
	→ thiago joined	21:00
	← circ-user-zsfzv left	21:01
	← mellernoia-work left	21:01
	← waveclaw left	21:01
	← lubarch left	21:01
windsurf_	I sort of get it.. I guess what I'm wondering is when I do a merge in my git gui, after, when I look int he log it seems to automatically create a log message "Merged branch foo into branch bar"	21:01
	but my commit-msg hook doesn't catch that as missing the [FOO-123] prefix it's designed for.	21:01
	not sure if I can ignore that or if I need another hook maybe	21:02
ojacobson	You have an old version of git	21:02
windsurf_	2.5.4	21:02
	← krawchyk left	21:02
	→ cebor joined	21:02
ojacobson	Interesting. Wrong guess.	21:02
	→ lubarch joined	21:02
	← lubarch left	21:02
	→ lubarch joined	21:02
ojacobson	Apparently the commit-msg hook is only invoked on git-commit (not during rebase, not during merge, etc)	21:03
	prepare-commit-msg is invoked during merge, with info	21:03
	→ _nadim joined	21:03
	→ danmulvey joined	21:03
windsurf_	ojacobson what do you mean 'with info'?	21:03
	← petaflot left	21:03
	→ petaflot joined	21:03
	← cebor left	21:03
ojacobson	during a merge, prepare-commit-msg gets extra arguments informing it that the message is for a merge commit	21:04
	I don't see a hook that gets run after the message for a merge, interestingly. Might be worth raising that on !list -- commit-msg would be the obvious choice	21:04
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	21:04
	→ cebor joined	21:04
ojacobson	(git-merge might need to sprout a --no-verify option)	21:04
	→ ncd\|leeN joined	21:05
	→ bahar joined	21:06
	→ adiman joined	21:06
windsurf_	ojacobson you mean, you think that it's adding that no-verify on its own and maybe that's why it's bypassing the commit-msg?	21:06
	← rdnt left	21:06
ojacobson	No, the opposite	21:07
	right now, git-merge supports the prepare-commit-msg hook but not the commit-msg hook	21:07
	it might be worth suggesting on the mailing list that it support commit-msg, and outline your rationale	21:07
	→ bolin joined	21:07
	→ terminal_echo joined	21:07
ojacobson	it's very likely git-merge would need options to suppress the hook (as git-commit already supports) in that case.	21:08
	→ savoy joined	21:08
	← lykinsbd left	21:08
	← leeN left	21:09
	← paulweb515 left	21:09
	→ paulweb515 joined	21:09
	→ MattMaker joined	21:09
	→ mehola joined	21:10
	→ waveclaw joined	21:10
	← bahar left	21:11
	← peoliye left	21:11
	← MattMaker left	21:11
	← petaflot left	21:12
	→ petaflot joined	21:12
windsurf_	ojacobson so, I could duplicate my commit-msg hook and call it prepare-commit-msg and the latter might work for merges but I wouldn't be able to suppress it with no-verify?	21:13
ojacobson	In particular, it's weird that `git merge --no-ff foo` and `git merge --no-ff --no-commit foo && git commit` do different things	21:13
	prepare-commit-msg isn't meant to be a verification hook	21:13
pasky	aargh, after 10.75 years using git, non-trivial rebase cases still totally defy me	21:13
ojacobson	it's run before git invokes an editor	21:13
	its job is to, well, prepare the default commit message	21:13
	← localuser- left	21:13
windsurf_	ojacobson ok so I'm probably out of luck then eh.	21:14
ojacobson	Immediately, yes. Long-term, maybe/maybe not.	21:14
windsurf_	yeah, deadline :)	21:14
ojacobson	The list (and Junio in particular) are pretty good for discussing this kind of stuff.	21:14
pasky	how can I avoid: "First, rewinding head to replay your work on top of it..."	21:14
	?	21:14
	← mehola left	21:14
	→ zeroed joined	21:14
windsurf_	ojacobson could I use prepare-commit-msg to prefix my message with "foo"?	21:14
ojacobson	Yup	21:14
windsurf_	ojacobson ok, maybe i'll do that then	21:15
	→ _cyril_ joined	21:15
pasky	I don't want it to rewind the head, I want it to just reapply whatever is in X (when git rebase X) on top of current HEAD	21:15
	→ bahar joined	21:15
	← waveclaw left	21:15
ojacobson	pasky: you're running rebase backwards, then :)	21:15
pasky	yes!	21:15
ojacobson	check out x, rebase onto whatever branch HEAD was before you checked out x	21:15
windsurf_	ojacobson any handy one-liners for that? :)	21:15
	or a hint	21:15
thiago	HEAD is not a branch	21:16
	→ gfixler joined	21:16
ojacobson	pasky: git-rebase always replays the current branch (checking out a branch if needed), not some other branch	21:16
	→ MattMaker joined	21:16
pasky	okay, so what I basically want is, I'm on master, and I have a branch on top of some ancestor up to a8c532c, \|ancestor..a8c532c\| == ~5; I want to get these commits on master now, naively thinking that rebase would be an obvious choice to get them but...	21:18
jimi_	thiago, off topic, but are you brazilian by chance?	21:18
pasky	what would you say is the most elegant way to get this done? I guess I'm mind-trapped in the situation now	21:18
	→ OnkelTem joined	21:18
	← MattMaker left	21:18
pasky	obviously checking out detached a8c532c, running git rebase, then fishing it back sounds horrible	21:18
	hm, why didn't I just git cherry-pick ..a8c532c ?	21:19
	I guess I thought rebase would be fancier, but after these 10 years, I really didn't wrap my head around that awful operation it seems :)	21:20
	← _cyril_ left	21:20
thiago	jimi_: I am	21:20
	← TomyLobo left	21:20
pasky	git-rebase not failing but throwing away these commits is awful imho though	21:20
jimi_	thiago, I thought so. There is a musician i like named Thiaguinho who is from Brasil, so I just guessed	21:21
	→ jteneyck joined	21:22
	← faux___ left	21:22
	← savoy left	21:23
	← algae left	21:24
jimi_	thiago, you wouldn't happen to be him would you? :P	21:24
	← toogley left	21:24
	→ uri___ joined	21:24
	← thiago left	21:25
ojacobson	pasky: rebase is a robot for running a common case of git-cherry-pick :)	21:25
	← uri_ left	21:25
ojacobson	(sometimes literally!)	21:25
	→ Goobbue joined	21:26
	← rwb left	21:27
	→ oojacoboo joined	21:28
	→ zarubin joined	21:28
	→ faux___ joined	21:29
	← AaronMT left	21:29
	← lolmaus left	21:29
	→ dstarh joined	21:31
	← petaflot left	21:32
	→ petaflot joined	21:32
	→ uri_ joined	21:32
	← adac left	21:32
	→ waveclaw joined	21:32
DolphinDream	how do i checkout a given commit (by sha/tag) but stay on the same branch (e.g. update local working copy with the version of the files in a given commit) ?	21:33
	← bolin left	21:33
	→ bolin joined	21:33
ojacobson	You don't. You can only have one thing checked out at a time, and "check out a branch" implies checking out its tip commit.	21:33
	Depending on -why- you want that, though, there might be some useful suggestions.	21:34
	← faux___ left	21:34
windsurf_	ojacobson can you see what's wrong with this? sed -i "FOO " "$1"	21:34
DolphinDream	yeah	21:34
	ok.. i'll do it differnetly then	21:34
	← Goobbue left	21:34
ojacobson	sed -i is "modify in place, with backup files named with this suffix"	21:34
	$1 is unlikely to be a useful sed command.	21:35
	→ faux___ joined	21:35
	→ Goobbue joined	21:35
	← uri___ left	21:35
	← Karkus left	21:35
	← petaflot left	21:35
	→ LtHummus joined	21:35
windsurf_	ojacobson oh. i thought $1 was the commit message coming into the prepare-commit-msg hook	21:36
ojacobson	it is	21:36
	but where it's positioned in the sed command matters	21:36
windsurf_	sed -i "FOO $1" ?	21:36
	prob not hmm	21:36
	← Psychiatrist left	21:37
ojacobson	sed -i~ -e '1 s,^,FOO,' "$1"	21:37
	-i for "modify in place, save backup with ~", -e SCRIPT for the edit script, and then a file name after the final edit script	21:37
	→ petaflot joined	21:37
	← waveclaw left	21:37
ojacobson	That edit script is "on line 1, replace the start of the line with "FOO"	21:37
	(you may want a trailing space.)	21:37
windsurf_	~ is /dev/null??	21:37
Synthead	how do I amend a past commit? I haven't pushed my changes yet	21:37
ojacobson	no	21:37
	Synthead: most easily, by making a new commit with `git commit --fixup <hash>`, and then `git rebase -i --autosquash`	21:38
	→ ogelami joined	21:38
ojacobson	autosquash will tell Git to automatically reorder the commits based on message, and --fixup will generate a message that puts the new commit in the right spot	21:38
Synthead	ojacobson: do I have to commit files or something to do that?	21:39
ojacobson	Synthead: yes; if you just want to reword the message but leave the files unchanged, use `git rebase -i` and change the offending commit from "pick" to "reword"	21:40
	→ peoliye joined	21:40
Synthead	ojacobson: oh, reword! I was changing it to edit!	21:40
	← petaflot left	21:41
Synthead	ojacobson: bam, thanks!	21:41
	→ petaflot joined	21:42
	← ogelami left	21:43
	→ abacuspowers joined	21:44
	→ victorga_ joined	21:44
	← irqq left	21:44
	← bolin left	21:44
	→ AaronMT joined	21:44
	→ irqq joined	21:45
	← lubarch left	21:46
	→ bolin joined	21:46
	→ krawchyk joined	21:47
	← josuebrunel left	21:47
	← Poppa left	21:48
	← krawchyk left	21:48
	→ IWishIKnew joined	21:48
	→ krawchyk joined	21:48
	← krawchyk left	21:49
	← sdothum left	21:49
	→ Hink joined	21:50
	→ sdothum joined	21:50
	→ krawchyk joined	21:50
	← King_Hual left	21:50
	← Goobbue left	21:51
	→ Goobbue joined	21:51
	← Jackneill left	21:51
	→ raedah joined	21:51
	→ peoliye_ joined	21:51
raedah	how do I get a git diff on something ive allready git add'd ?	21:51
	→ uri___ joined	21:51
	← uri_ left	21:51
windsurf_	ojacobson unfortunately sed -i~ -e '1 s,^,FOO,' "$1" doesn't seem to do anything	21:52
kadoban	raedah: 'git diff --cached' ?	21:52
windsurf_	i've tested it with commits and merges that automatically add merge related commit messages	21:52
kadoban	raedah: Personally I use that about a billion times a day and have a short alias for it. (git dc)	21:52
raedah	kadoban, works	21:52
	→ daito joined	21:53
	← peoliye left	21:53
	→ DolpheenDream joined	21:53
	← lcarlson left	21:53
	← fscala left	21:53
	→ lykinsbd joined	21:53
	→ MattMaker joined	21:53
	← espindola left	21:54
	← DolpheenDream left	21:54
	→ waveclaw joined	21:54
	→ fscala joined	21:54
	→ adamaN joined	21:55
	← IWishIKnew left	21:56
	← victorga_ left	21:57
	← daito left	21:57
	← jagob left	21:59
windsurf_	does anyone know why in my prepare-commit-msg hook this doesn't do anything? I expect it to prefix the commit message with "FOO" sed -i~ -e '1 s,^,FOO,' "$1"	21:59
	→ astrofog joined	21:59
	← waveclaw left	21:59
	← tinajohnson__ left	21:59
	← MattMaker left	22:00
	← krawchyk left	22:00
	← govg left	22:00
	→ jagob joined	22:00
	← Oebele left	22:01
	← Ldip left	22:02
	→ daito joined	22:03
	← Hink left	22:05
	→ Hink joined	22:05
	→ _cyril_ joined	22:05
	← jimi_ left	22:06
	← luksaur left	22:06
	→ josuebrunel joined	22:06
	→ devoldmx joined	22:07
	→ Oebele joined	22:07
	← cbonobo left	22:07
	← Hink left	22:08
	→ Hink joined	22:08
	→ blackwind_123 joined	22:08
	← CKyle left	22:08
	← tomtix left	22:09
	→ bolin_ joined	22:09
	← daito left	22:09
	→ sgen_ joined	22:10
	← bolin_ left	22:11
	← devoldmx left	22:11
	← mwhooker left	22:11
	→ jason237 joined	22:11
	← samw left	22:11
	← bolin left	22:12
	← danmulvey left	22:12
	← duderonomy left	22:12
	← gopar left	22:12
	→ krawchyk joined	22:12
	← Oebele left	22:13
	→ mwhooker joined	22:13
	← Hink left	22:13
	→ danmulvey joined	22:14
	← lykinsbd left	22:14
	← irqq left	22:14
	→ githogori joined	22:14
	→ NightMonkey joined	22:14
	← coolno1 left	22:14
nettoweb	hello guys, Im stashed some files and my preprocessor start to generate some new files that I cant remove from working directory (even with git reset --hard and git clean -df)	22:15
	← windsurf_ left	22:15
	→ gopar joined	22:15
	→ __main__ joined	22:16
	→ Hink joined	22:16
	← Hink left	22:17
	→ samw joined	22:17
	← dstarh left	22:17
kadoban	nettoweb: I'm scared to tell you why, other than to say: read man git clean	22:17
gitinfo	nettoweb: the git-clean manpage is available at http://jk.gs/git-clean.html	22:17
	← cprecioso left	22:17
kadoban	nettoweb: Please be careful with scary commands like clean and reset --hard	22:18
	Ooo, that lined up. That was neat.	22:18
	→ BSaboia joined	22:18
nettoweb	kadoban I usually everyday these commands but Mixture is forcing the the deletion of fome files that stay in working copy event after these commands	22:19
	← serapath left	22:20
	← eijk_ left	22:20
	← josuebrunel left	22:20
	← kzisme left	22:21
	→ kzisme joined	22:22
	← jteneyck left	22:22
	← kzisme left	22:23
sparr	I'm looking at a file's history on github. I can get the full hash of the file at two points. From my local machine how can I diff those two historical versions of the file?	22:23
	(I have the repo checked out)	22:23
	→ kzisme joined	22:23
	→ buMPnet joined	22:23
nettoweb	Im completely stucked because I want to run git stash apply and cant because of theses files	22:23
	→ LaptopBrain joined	22:24
	← sdothum left	22:24
	→ Thor_ joined	22:24
	→ xelxebar_ joined	22:24
	→ sdothum joined	22:26
nettoweb	can someone help me?	22:27
	← xelxebar left	22:27
	→ The_Phoenix joined	22:28
kadoban	sparr: 'git log -- the_file', figure out the commitish to refer to them both. Then do 'git diff commitish1 commitish2 -- the_file'	22:28
	← davidosomething left	22:29
	← faux___ left	22:29
	← pantsman- left	22:30
	→ waveclaw joined	22:31
	← raedah left	22:31
atrigent	nettoweb: concentrate on what that man page says about ignored files	22:32
	← The_Phoenix left	22:33
nettoweb	atrigent I think is related with http://stackoverflow.com/questions/29243207/cannot-remove-file-from-working-directory	22:33
	windows/unix	22:33
	← AaronMT left	22:34
	← User458764 left	22:35
	← waveclaw left	22:35
	← peoliye_ left	22:37
	→ peoliye joined	22:38
nettoweb	atrigent there's a lot of files but running: "git clean -f -n" doesnt show anything	22:40
	→ s8321414 joined	22:40
	→ alanwill joined	22:40
atrigent	nettoweb: can you pastebin the output of git status --ignored?	22:41
nettoweb	in "Ignored files:" there isnt the files that's in my working copy	22:42
	it's automatically added there, I think it was because some editor config, because I cant remove from that	22:42
	atrigent	22:42
	→ duderonomy joined	22:42
	← Spacew00t left	22:43
	← madewokherd left	22:45
	← nnyk left	22:46
	→ cvanball joined	22:48
	← hobodave left	22:48
	← jason237 left	22:48
	→ hobodave joined	22:49
	← gopar left	22:50
	← MarkyC left	22:51
	→ HelloAtMega joined	22:52
	→ dsdeiz joined	22:52
	← filisko left	22:53
	← krawchyk left	22:53
	→ jeffreylevesque joined	22:55
	→ waveclaw joined	22:56
	← s00pcan left	22:57
	→ triad joined	22:57
	← yashu-seth left	22:58
	→ Zariel joined	22:58
	→ s00pcan joined	22:59
	→ afuentes joined	22:59
	← Dougie187 left	23:00
	← Zariel left	23:00
	→ lykinsbd joined	23:00
	← waveclaw left	23:00
	→ lykinsbd_ joined	23:02
	→ diegoviola joined	23:02
	← lykinsbd_ left	23:03
	→ lykinsbd_ joined	23:04
	← sgambino left	23:04
	→ peoliye_ joined	23:04
	← italoacasas left	23:05
daurnimator	Is there a way to join 2 fast import streams into one repository?	23:05
	← lykinsbd left	23:06
	→ dregad joined	23:06
	→ zacg joined	23:06
	← zacg left	23:06
	→ zacg joined	23:06
	→ vF3hNGxc47h8 joined	23:06
	← peoliye left	23:07
	← _Vi left	23:07
ojacobson	create repo, fast import stream A, fast import stream B, repack	23:08
	← LeBlaaan_ left	23:08
	→ LeBlaaanc joined	23:08
	← kevwil left	23:08
	← uri___ left	23:09
	← danmulvey left	23:10
	→ jteneyck joined	23:10
	← jteneyck left	23:10
	→ jteneyck joined	23:10
	← dregad left	23:10
	← paddyez left	23:10
	→ hahuang65 joined	23:12
	← s00pcan left	23:12
	→ liamonade joined	23:13
	← rubyonrailed left	23:13
	→ _Vi joined	23:13
	← hobodave left	23:14
	→ s00pcan joined	23:14
	→ sokolowitz joined	23:14
	→ Caelum joined	23:15
daurnimator	'repack'?	23:17
	when I tried fast importing the two they ended up disconnected + weird around the discontinuity	23:17
	← nettoweb left	23:18
	← sokolowitz left	23:19
	← zeroed left	23:19
	→ hahuang61 joined	23:19
	→ Hink joined	23:19
	→ waveclaw joined	23:20
	← Hink left	23:20
	→ madewokherd joined	23:20
	← BBBThunda left	23:21
	← hahuang65 left	23:21
	← cvanball left	23:21
	→ ulkesh joined	23:23
	→ MarkyC joined	23:26
	← jteneyck left	23:26
	← zotherstupidguy left	23:27
	← kzisme left	23:29
milki	daurnimator: havent tried before. as long as the references line up properly, it should be fine	23:30
	daurnimator: how are you connecting the imports?	23:31
	→ gopar joined	23:31
	← MarkyC left	23:31
milki	daurnimator: in a single import, there are internal references at least :number	23:31
daurnimator	milki: I couldn't figure out a way to join the imports. I tried a rebase but it was all weird....	23:31
	that's was the question: how do you join the imports?	23:31
milki	daurnimator: you would have to recreate the common history in both imports if you want shared history	23:32
	that would be the only way to have common commits	23:32
	→ ash_workz joined	23:32
	← jeffreylevesque left	23:33
	→ daedeloth joined	23:33
daurnimator	huh? what do you mean "common commits"?	23:33
milki	you define commits in your import	23:34
	they have to be defined exactly the same on both imports	23:34
	← mmlb left	23:34
milki	dates, committer/author information, commit content, commit parents	23:34
daurnimator	they're 2 different import streams. they have no commits in common.	23:34
milki	then... how do you expect them to be not disconnected?	23:34
	i missed our expected results i suppose	23:35
	→ jeffreylevesque joined	23:35
milki	your*	23:35
	→ DolpheenDream joined	23:35
	→ benzrf joined	23:37
benzrf	hey	23:37
	i'm thinking of writing a hacky joke program, & i was wondering	23:37
	how does git perform on repos with tens of thousands of <1KB commits with non-similar contents?	23:38
	→ ogelami joined	23:39
	← jeffreylevesque left	23:39
	← samw left	23:40
ash_workz	so I am at an example: `$ git clone --bare my_project my_project.git`; what does this suggest about my_project and my_project.git?	23:40
	→ mischat joined	23:40
	← boombatower left	23:41
milki	benzrf: depends on what you are doing	23:41
benzrf	milki: go on?	23:41
	→ boombatower joined	23:42
milki	benzrf: uh, i mean, if you have to traverse history, its still linear to the length of the history	23:42
	kind of thing	23:42
benzrf	kk	23:42
milki	so depends on what you are doing	23:42
	→ ryoshu joined	23:43
ash_workz	so I am testing out remote branches on a local fs	23:43
ryoshu	how to fetch all remote refs (tags) with depth=1?	23:43
	without ls-remote	23:43
milki	benzrf: maybe you mean how much space it takes?	23:43
ash_workz	I've done `git clone --bare ~/foo /opt/git/foo.git	23:43
benzrf	well, i was thinking about treelike comments, and hypothetical protocols for transmitting them, and then thought about how to give them id's, then i thought of hashing them with timestamp and author, then i thought "oh hmm that's git"	23:43
	← ogelami left	23:43
	← zarubin left	23:44
benzrf	so now i kinda wanna write a git-powered commenting/chat thing, if only as a stunt	23:44
	:>	23:44
milki	sounds fun	23:44
	← liamonade left	23:44
milki	if theres no history traversing, then you are simply using git as an objectstore	23:44
benzrf	well there'd be /some/	23:44
milki	creating objects is super fast	23:44
	looking up objects is super fast	23:45
	yay hashes?	23:45
benzrf	woo	23:45
	→ jonno11 joined	23:45
milki	i dont think you'll save much on space though	23:45
ash_workz	and then I did `cd ~/bar; git clone /opt/git/foo.git` expecting that it would set up the project in bar; but really it set it in bar/foo; so I thought probably did it wrong and want to delete this clone; rm throws a bunch of errors. How am I suppose to delete it?	23:45
milki	benzrf: but message contents will be depulicated i suppose	23:45
benzrf	milki: hm?	23:45
milki	benzrf: if you have messages with the same content, they'll point to the same blob	23:46
benzrf	timestamp and author	23:46
	oh wait i see	23:46
	right, ok	23:46
	milki shrugs	23:46
benzrf	haha	23:46
	← LeBlaaanc left	23:46
milki	benzrf: as an objectstore, should be fast enough	23:46
benzrf	hehehe	23:47
	→ LeBlaaanc joined	23:47
milki	benzrf: you lose out if you do searching though probably	23:47
	← Es0teric left	23:47
daurnimator	milki: as in: I have 2 fast import streams that I want to join together. they originally were each an RCS repository. at one point in 1997 they moved to a new directory and started again. but I want to join the two repos together (so that the 1st commit in the 2nd stream has a parent of the last commit in the 1st stream)	23:48
milki	benzrf: just think about what objects are avialble to you and how you might use them - trees, blobs, commits	23:48
	daurnimator: yeah, you wont be able to refer to any commits in the 1st import from the 2nd import	23:49
	← fracting left	23:49
milki	daurnimator: but you are right, after importing, you can mess with history	23:49
	daurnimator: you have the right idea with rebase	23:49
	← notebox left	23:50
milki	daurnimator: but all commits in the 2nd import will need to be written again	23:50
daurnimator	milki: well yeah	23:50
	I was trying to do it with a rebase but things got weird... the first commit from the 2nd stream's diff ended up being just the things added in that commit. it's a if the diff didn't match the code at that commit.	23:51
	← xelxebar_ left	23:52
	→ MarkyC joined	23:52
	→ nnyk joined	23:53
	← boombatower left	23:54
	→ wnefal joined	23:54
	← lykinsbd_ left	23:55
ash_workz	so I am at the example `$ git clone --bare my_project my_project.git`; what does that imply about my_project? It's a shortname or something right? because when I try `$ git clone --bare foo foo.git` I get `fatal: repository 'foo' does not exist	23:57
	`	23:57
	← BSaboia left	23:58
	← abacuspowers left	23:58
	← MarkyC left	23:58
daurnimator	ash_workz: you're doing a bare clone of the repository located at "my_project" (in this case a directory in your cwd) and calling the clone "my_project.git" (which will be a new directory created)	23:58
	→ devoldmx joined	23:58
ash_workz	daurnimator: cept that didn't work for foo in a directory called foo	23:59
	← rorro left	23:59
daurnimator	ash_workz: do it from somewhere that contains a directory "foo"	23:59
ash_workz	done.	23:59
	wow	23:59
	→ mellernoia joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation