IRCloggy #git 2016-08-03

Provider of IRC logs since 2005.

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

	2016-08-03
	→ BSAlb joined	00:00
	← BSAlb left	00:00
	← ImJune left	00:00
	→ fuchstronaut joined	00:00
	→ The_Wood_ joined	00:00
	→ BSAlb joined	00:00
	← The_Wood_ left	00:00
	→ The_Woodsman joined	00:00
The_Woodsman	if i have commits locally, and i am willing to overwrite the remote branch with my local changes, how do i do a "force push" ?	00:01
	← akiva left	00:03
rpd	The_Woodsman: -f probably, but you usually don't have to do that unless you have an inconsistent history	00:03
The_Woodsman	rpd: yeah, i got myself into a silly situation in which my history was kinda messed up	00:03
	rpd: thanks	00:03
	← BSab left	00:04
	→ shmuli joined	00:05
	← fuchstronaut left	00:06
	← iota_pi left	00:06
	← Orion3k left	00:08
	→ tesuji_ joined	00:09
	← tesuji left	00:10
	← shmuli left	00:10
	→ kyan joined	00:11
	← BrianBlaze420 left	00:12
	← noidea left	00:12
	← SpeakerToMeat left	00:13
	→ BrianBlaze420 joined	00:13
	→ SpeakerToMeat joined	00:16
	→ josuebrunel joined	00:16
	→ ISmithers joined	00:17
	← rubyonrailed left	00:21
	→ rubyonrailed joined	00:22
	← kpease left	00:22
	← tango_ left	00:24
	→ CrazyBonz joined	00:24
	→ Bennux joined	00:26
	← Rodya_ left	00:26
	→ vassagus joined	00:26
	← byteflame left	00:27
	→ noidea joined	00:27
	← gargola left	00:27
	← _xor left	00:28
	→ ctcrnitv joined	00:28
	→ danslo joined	00:29
	← rubyonrailed left	00:29
	← dreiss left	00:30
	→ HanClinto joined	00:31
	← danslo left	00:33
	← vassagus left	00:34
	→ rubyonrailed joined	00:34
	→ Derperperd joined	00:35
	← noidea left	00:36
	← beyertech left	00:36
	→ noidea joined	00:37
	← noidea left	00:37
	→ noidea joined	00:37
	→ beyertech joined	00:38
	→ zacts joined	00:39
	→ HoierM joined	00:40
	← Lunatrius left	00:40
	← LeBlaaanc left	00:41
	→ Lunatrius joined	00:41
	← nitric left	00:42
	← josuebrunel left	00:42
	← beyertech left	00:44
	← mischat left	00:44
	← rkazak left	00:44
	← Ahmed90 left	00:45
	→ beyertech joined	00:46
	→ Timvde joined	00:46
	← beyertech left	00:47
	→ beyertech joined	00:48
	← vdv left	00:48
	→ ResidentBiscuit joined	00:51
	→ jh3 joined	00:51
	→ haribo joined	00:51
	← texinwien_ left	00:52
	← robattila256 left	00:54
	← jh3 left	00:54
	← jstimm left	00:54
	← CrazyBonz left	00:56
	← m0viefreak left	00:56
	→ Rodya_ joined	00:56
	← haribo left	00:56
	← zacts left	00:57
	← Pursuit left	00:57
	→ haribo joined	00:57
	← Rodya_ left	01:01
	→ CrazyBonz joined	01:01
	← bluezone left	01:02
	→ arescorpio joined	01:05
	→ shmuli joined	01:06
	← sagerdearia left	01:06
	← ahmedelgabri left	01:07
	← rahtgaz left	01:08
	← Sasazuka left	01:08
	→ shgysk8zer0 joined	01:10
	← shmuli left	01:16
	← ResidentBiscuit left	01:17
	→ ytl joined	01:17
	← EduardoMartins left	01:17
	→ cqi joined	01:19
	← HanClinto left	01:20
	→ ImJune joined	01:22
	← noidea left	01:23
	← kulelu88 left	01:24
	→ rkazak joined	01:24
	← darkbit left	01:24
	← sdothum left	01:26
	← Darren_ left	01:28
	→ zacts joined	01:29
	← Pulp left	01:29
	← wwwi left	01:31
	← shgysk8zer0 left	01:31
	→ vassagus joined	01:31
	← thiago left	01:33
	→ Sasazuka joined	01:33
	← rkazak left	01:34
	← pks left	01:37
	← EvilPenguin left	01:38
	← vassagus left	01:38
	→ pks joined	01:39
	→ sdothum joined	01:39
	→ fission6 joined	01:41
	← The_Woodsman left	01:41
	← fission6 left	01:41
	→ sagerdearia joined	01:42
	→ fission6 joined	01:42
	← afuentes left	01:43
	→ ejb joined	01:43
	→ dreiss joined	01:45
	← ilbot3 left	01:45
	→ durham joined	01:46
	← sarbs left	01:47
	→ sarbs joined	01:48
	← rubyonrailed left	01:48
	→ ilbot3 joined	01:49
	← durham_ left	01:50
	← durham left	01:50
	→ rubyonrailed joined	01:53
	→ ResidentBiscuit joined	01:54
	← d^sh left	01:54
	← Noldorin left	01:55
	→ d^sh joined	01:55
	→ Rodya_ joined	01:57
	← ResidentBiscuit left	01:58
	→ ResidentBiscuit joined	01:59
	→ nettoweb joined	01:59
	← causasui left	02:00
	← rubyonrailed left	02:01
	→ rubyonrailed joined	02:02
	→ jaguarmagenta joined	02:02
	← CheckDavid left	02:03
	→ david007 joined	02:05
	← sdothum left	02:06
	← jaguarmagenta left	02:07
	→ sdothum joined	02:08
	→ Sucks joined	02:08
	← Sucks left	02:08
	→ Sucks joined	02:09
	← ImJune left	02:09
	← beyertech left	02:10
	← al-damiri left	02:10
	← invex left	02:14
	→ beyertech joined	02:15
	← beyertech left	02:15
	← dreiss left	02:16
	→ fracting joined	02:17
	→ shmuli joined	02:18
	→ dreiss joined	02:18
	→ ImJune joined	02:19
	← ikmaak left	02:19
	← zacts left	02:21
	← ArchNoob left	02:21
	← sarbs left	02:23
	→ sarbs joined	02:24
	← moneylotion left	02:24
	→ interne7y joined	02:24
	→ red_ joined	02:25
	← sdothum left	02:27
	→ Goplat joined	02:27
	← shmuli left	02:27
	→ HanClinto joined	02:28
	← interne7y left	02:29
	→ danslo joined	02:29
	→ atomicb0mb joined	02:33
	← danslo left	02:34
	← govg left	02:34
	→ thiago joined	02:34
	→ vassagus joined	02:36
	→ Lope joined	02:40
	← HoierM left	02:40
Lope	I'm making a post-receive script. I received this on STDIN: f98a92e77d81c031e37b8a550b1dc19fb8775f2f fe8af2804c2caa6ae44112f86e0c0daac1014efd refs/heads/master	02:40
	so that's telling me I received a push on the master branch? but I don't know much else.	02:41
	← azerus left	02:41
Lope	Oh I see: Format: "from_commit to_commit branch_name"	02:41
	what is "refs/heads/"	02:41
	← Sasazuka left	02:42
	← vassagus left	02:44
	← diegoviola left	02:45
	→ azerus joined	02:46
	← dreamseeker left	02:46
	← kyan left	02:47
	→ Mannn joined	02:48
	← skylite left	02:48
	→ huanzhang joined	02:49
	← red_ left	02:49
	← chachasmooth left	02:49
	→ chachasmooth joined	02:49
	← hexagoxel left	02:50
gtodd	is it possible to squash git commit history in a branch only?	02:51
	→ skylite joined	02:51
gtodd	or have the branch's commit history start "ex nihilo" at the point of the branch?	02:52
	→ lagothrix joined	02:52
	← zumba_ad_ left	02:53
gtodd	sort of tag a version and keep the maintenance mode commits with the tagged branch but all the development history with the "main line" of the repo	02:54
	→ aavrug joined	02:54
	→ sangy joined	02:54
	→ hexagoxel joined	02:55
	← lagothri1 left	02:55
	← fission6 left	02:56
	← playfullyExist left	02:57
	→ somaReverse joined	03:01
somaReverse	hello	03:01
	How can I cherry pick only one file?	03:01
	→ dreamseeker joined	03:02
	→ fuchstronaut joined	03:02
	← fracting left	03:04
	← sagerdearia left	03:05
	← rubyonrailed left	03:06
	← spudowiar left	03:07
	← a3Dman left	03:07
	← fuchstronaut left	03:07
thiago	somaReverse: cherry-pick -n the entire commit, then commit only the file you want	03:08
	discard the rest	03:08
	→ rubyonrailed joined	03:10
	→ ArchNoob joined	03:11
	← madewokherd left	03:11
	→ a3Dman joined	03:11
	→ jimi_ joined	03:12
	→ ShekharReddy joined	03:12
	← fahadash left	03:13
	→ hahuang61 joined	03:13
	→ vrand joined	03:15
	→ star_prone joined	03:16
	← Finnoloid left	03:16
	→ fracting joined	03:18
	← Dougie187 left	03:18
	← hahuang61 left	03:18
	→ rkazak joined	03:19
	← star_prone left	03:20
	→ VA3VNA joined	03:22
	← rkazak left	03:22
	← vrand left	03:23
	→ sagerdearia joined	03:24
	← ArchNoob left	03:25
	← sagerdearia left	03:25
	← ResidentBiscuit left	03:26
	→ danimal2 joined	03:27
	← Bennux left	03:30
	→ fstd_ joined	03:32
	→ pwnz0r joined	03:32
	→ wxg joined	03:34
	→ bshacklett joined	03:35
	← fstd left	03:36
	fstd_ → fstd	03:36
	← yoan left	03:36
	← gtristan left	03:37
	→ yoan joined	03:37
	→ beatdown joined	03:38
	→ spudowiar joined	03:41
	gitinfo set mode: +v	03:41
	→ mehola joined	03:41
	→ red_ joined	03:41
	→ vassagus joined	03:41
	← atomicb0mb left	03:44
	→ atomicb0mb joined	03:45
	← Dro left	03:45
	← atomicb0mb left	03:45
	← Rodya_ left	03:46
	→ mohabaks joined	03:48
	← vassagus left	03:49
	← jimi_ left	03:49
	← dreiss left	03:51
	← spudowiar left	03:53
	← rubyonrailed left	03:56
	→ shgysk8zer0 joined	03:59
	→ ArchNoob joined	03:59
	← thecomedian left	04:00
	← shgysk8zer0 left	04:00
	→ rubyonrailed joined	04:01
	→ LeBlaaanc joined	04:02
	→ phoenixh joined	04:02
	← ejb left	04:02
	→ jaguarmagenta joined	04:03
	→ thecomedian joined	04:03
	← mkoskar left	04:04
	← ShekharReddy left	04:04
	← ArchNoob left	04:06
	→ gtristan joined	04:06
	→ DJ_Spies joined	04:06
	← jaguarmagenta left	04:07
	← bshacklett left	04:09
	← phoenixh left	04:10
	← fracting left	04:11
	← netj left	04:12
	→ netj joined	04:12
	← sangy left	04:13
	→ hahuang61 joined	04:14
	← mehola left	04:17
	← hahuang61 left	04:19
	→ mehola joined	04:19
	→ wberrier joined	04:20
	← danimal2 left	04:21
	→ Rish joined	04:22
	← daynaskully left	04:22
	← wberrier left	04:23
	→ interne7y joined	04:25
	← DJ_Spies left	04:25
	→ danimal2 joined	04:28
	← wxg left	04:29
	← interne7y left	04:30
	→ danslo joined	04:30
	← ImJune left	04:31
	← Rish left	04:31
	← Captain_Ramius left	04:33
	→ wxg joined	04:33
	← aidalgol left	04:34
	← danslo left	04:35
	→ zrts joined	04:35
	→ aidalgol joined	04:36
	← Cabanossi left	04:37
	← danimal2 left	04:37
	← nettoweb left	04:37
	→ _28_ria joined	04:39
	→ Cabanossi joined	04:39
	→ nnyk_ joined	04:40
	← zivester left	04:40
	← glebihan left	04:41
	→ freimatz joined	04:43
	→ jstimm joined	04:43
	→ Limes_ joined	04:43
	→ vassagus joined	04:46
	→ mkoskar joined	04:46
	← haribo left	04:46
	← arescorpio left	04:47
	→ ImJune joined	04:48
	← dmiles left	04:49
	→ ArchNoob joined	04:50
	← cqi left	04:50
	→ subhojit777 joined	04:51
	← vassagus left	04:53
	← moei left	04:53
	← ArchNoob left	04:55
	← _28_ria left	04:56
	→ Darren_ joined	05:01
	← diogenese left	05:03
	← Darren_ left	05:03
	→ fuchstronaut joined	05:03
	← rubyonrailed left	05:05
	← cd-rum left	05:05
	← fuchstronaut left	05:08
	← FuzzySockets left	05:08
	→ rubyonrailed joined	05:09
	→ diogenese joined	05:10
	→ stuh84 joined	05:12
	← boombatower left	05:12
Lope	what do you guys do about file ownership with GIT? do you have the same UID on your dev machine as your remote testing and production repos?	05:15
	→ Tachyon_ joined	05:15
	→ hahuang61 joined	05:15
	← snowkidind left	05:15
	→ zumba_ad_ joined	05:17
	← rubyonrailed left	05:18
	← hahuang61 left	05:20
	← foist left	05:24
	→ zivester joined	05:25
	→ ash_workz joined	05:27
	← bsanford left	05:27
	← aidalgol left	05:31
	← pwnz0r left	05:32
	→ pwnz0r joined	05:33
	← Gianormagantrous left	05:33
	→ lordjancso joined	05:33
	→ Gianormagantrous joined	05:34
	→ phanimahesh joined	05:35
	← zivester left	05:35
	→ zeroed joined	05:35
	← zeroed left	05:35
	→ zeroed joined	05:35
	→ emPi joined	05:36
	← rgrinberg left	05:38
	→ glebihan joined	05:38
	→ ArchNoob joined	05:38
	← Shakeel_ left	05:40
	→ Shakeel_ joined	05:41
	→ phanimah1sh joined	05:42
	→ satya4ever joined	05:43
	→ ffs joined	05:44
	ffs → Guest9461	05:45
	← phanimahesh left	05:45
	← zumba_ad_ left	05:45
	← freimatz left	05:47
	→ zumba_addict joined	05:47
	← stuh84 left	05:48
	← Shakeel_ left	05:49
	← TinkerTyper left	05:49
	→ vassagus joined	05:51
	→ Raging_Hog joined	05:51
	← zumba_addict left	05:51
	→ sagerdearia joined	05:57
	← l4v2 left	05:57
	→ bocaneri joined	05:58
	← vassagus left	05:59
	→ jaguarmagenta joined	06:04
	→ jceb joined	06:04
	→ Shakeel_ joined	06:05
	→ TinkerTyper joined	06:05
	← yoan left	06:06
	→ tvw joined	06:06
	→ yoan joined	06:06
	→ zorro786 joined	06:07
	← jaguarmagenta left	06:08
	gitinfo set mode: +v	06:09
	→ josuebrunel joined	06:11
	→ rubyonrailed joined	06:14
alcohol	Lope: no such thing	06:14
	← ahr3n left	06:15
	← Tachyon_ left	06:15
	→ circ-user-HPmjC joined	06:15
grawity	Lope: no, why? git doesn't preserve UIDs anyway	06:16
	→ hahuang61 joined	06:16
bremner	Lope: In case you didn't already see it, !deploy	06:17
gitinfo	Lope: 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	06:17
Lope	cool, thanks.	06:17
	← rubyonrailed left	06:18
	← emPi left	06:19
	→ freimatz joined	06:19
	← hahuang61 left	06:20
	→ Lvjasha joined	06:21
	← Lvjasha left	06:23
	← josuebrunel left	06:25
	→ interne7y joined	06:26
	→ JeroenT joined	06:26
	→ ambro718 joined	06:28
gtristan	Hi	06:28
	Is there a way that I can clone and checkout a ref in one command ?	06:29
grawity	git clone -b	06:29
gtristan	grawity, that will work equally with tags and sha1s ?	06:29
	or only branches ?	06:29
grawity	dunno	06:30
	← interne7y left	06:30
	← phanimah1sh left	06:30
	→ ikmaak joined	06:31
	gtristan has a huge spreadsheet with specific refs he wants to clone in a loop	06:31
	→ star_prone joined	06:31
	→ danslo joined	06:31
gtristan	equally, if I can take ${cloneurl} and guess what directory git will transform that into, that can also work	06:31
	gtristan presumes a sprinkling of bash can help, only that $(basename ${url}) might not work for a url	06:32
	→ phanimahesh joined	06:32
	→ govg joined	06:32
	→ haribo joined	06:33
	→ jagob joined	06:34
	← Mannn left	06:35
	← ambro718 left	06:35
	← star_prone left	06:36
	← danslo left	06:36
	→ _xor joined	06:36
grawity	$(basename "$url" .git) should do it	06:36
	→ star_prone joined	06:36
	← ImJune left	06:36
	← wcpan left	06:37
	→ nikitasius joined	06:38
	→ alcohol joined	06:38
	← TomyLobo left	06:38
	← pwnz0r left	06:40
	→ wcpan joined	06:42
	→ rubyonrailed joined	06:43
Lope	git is not running GOT_SSH_COMMAND properly. My echo "$GIT_SSH_COMMAND" says "ssh bob@myserver -p 1234 -i /foo/bar" Then I did `git remote add myserver bob@myserver:/path/to/gitdir` `git push myserver master`. After a long delay it complained that it could not connect on port 22. So it didn't take the port from my $GIT_SSH_COMMAND. Any ideas how to change the syntax so it uses the ENV VAR?	06:44
	← phanimahesh left	06:44
	← gtristan left	06:47
	→ Sceorem joined	06:48
	→ gtristan joined	06:48
	← star_prone left	06:49
	→ phanimahesh joined	06:51
	→ danslo joined	06:51
	→ mariuscc joined	06:52
	← deltab left	06:53
	← alcohol left	06:54
	→ cqi joined	06:54
	→ alcohol joined	06:54
	→ rscata joined	06:55
	→ vassagus joined	06:56
	→ woodruffw joined	06:56
	← woodruffw left	06:56
	→ woodruffw joined	06:57
	← woodruffw left	06:57
	→ woodruffw joined	06:57
	← huanzhang left	06:57
	← woodruffw left	06:57
	→ texinwien_ joined	06:58
	→ woodruffw joined	06:58
	← woodruffw left	06:58
	→ woodruffw joined	06:58
	← woodruffw left	06:58
	→ woodruffw joined	06:59
	← woodruffw left	06:59
	← phanimahesh left	06:59
	→ woodruffw joined	06:59
	← woodruffw left	06:59
Lope	I even tried `git remote add ssh://bob@myserver:1234/path/to/mygit` but when I try push it says: "ssh: connect to host myserver port 22: connection time out". WTF?	06:59
	→ dreiss joined	06:59
	→ djb-irc joined	07:00
tobiasvl	pretty sure you can't use arguments like that in GIT_SSH_COMMAND, although not entirely	07:02
	git will take the [user@]host from the remote URL, supplying it in GIT_SSH_COMMAND is wrong (and might not work)	07:02
	Lope: and the second way, with the port in the url, works for me	07:03
	← vassagus left	07:03
tobiasvl	have you unset GIT_SSH_COMMAND before trying that?	07:03
	→ fuchstronaut joined	07:04
	→ p4trix joined	07:04
Seveas	Lope: why not configure it properly in .ssh/config?	07:05
	Host myserver	07:05
	User bob	07:05
	Port 1234	07:05
	IdentityFile /foo/bar	07:05
	→ phanimahesh joined	07:05
	← p4trix left	07:05
	→ deltab joined	07:06
	→ star_prone joined	07:06
	→ ImJune joined	07:07
guardian	does git have something builtin to avoid commiting source files with 755 mode?	07:07
	or should I write a pre-commit hook for that	07:08
tobiasvl	guardian: well git doesn't commit permissions beyond +x	07:08
	→ submitnine joined	07:08
	← fuchstronaut left	07:09
Seveas	guardian: pre-commit hook it is.	07:09
	or (very evil) core.filemode=false may work	07:09
	← ctcrnitv left	07:09
	→ cdown joined	07:10
	→ interne7y joined	07:11
	← gtristan left	07:11
	→ DevAntoine joined	07:12
guardian	pre commit is easy enough	07:12
Lope	tobiasvl: okay, checking it out.	07:12
guardian	thanks for the reply	07:12
	→ TomyWork joined	07:12
Lope	Seveas: that config file doesn't suit me.	07:12
	Okay I've tested logging in with my SSH user, and I can login with normal ssh. But my shell is git-shell and it's not enabled. So I'm looking up how to do that.	07:13
	error: cannot run ssh bob@myserver -p 1234 -i /path/to/bob: No such file or directory	07:13
	export GIT_SSH='ssh bob@myserver -p 1234 -i /path/to/bob'	07:13
Seveas	GIT_SSH != GIT_SSH_COMMAND	07:13
grawity	you need GIT_SSH_COMMAND= for that	07:13
Lope	grawity: okay, thanks.	07:14
	GIT_SSH_COMMAND seems to be ignored though. It kept trying to connect on port 22 :/	07:14
grawity	your git is too old then	07:14
	set up ~/.ssh/config instead	07:15
	← Goplat left	07:15
Lope	I've got git 1.9.1	07:15
grawity	way too old	07:15
Lope	maybe you're right that it's too old.	07:15
Seveas	ancient	07:15
Lope	Why is it so old? On ubunty 14.04 :/	07:15
grawity	well, ubuntu 14.04 itself is old	07:15
Lope	Yeah I've been procrastinating upgrading :/	07:16
grawity	and once ubuntu picks a major version, like git 1.9, they tend to stick to it	07:16
	← zorro786 left	07:16
Seveas	2.3.0 minimum	07:16
grawity	http://packages.ubuntu.com/search?keywords=git and http://sprunge.us/VcCD	07:16
	← Sucks left	07:16
Lope	Seveas: thanks bro.	07:16
	will see if there's a backport.	07:16
	→ hahuang61 joined	07:16
Seveas	ppa:dennis/git-next gives you bleeding edge git from the main development branch	07:16
	→ sanketdg joined	07:18
	→ david002 joined	07:20
	← nnyk_ left	07:20
	← lordjancso left	07:20
	← thiago left	07:21
	← jceb left	07:21
	← david007 left	07:21
	← hahuang61 left	07:22
	→ aidalgol joined	07:22
	→ cdown_ joined	07:22
	→ lordjancso joined	07:23
	← dreiss left	07:24
	← cdown left	07:25
	← tyreld left	07:25
	cdown_ → cdown	07:25
	→ Balliad joined	07:25
	← ytl left	07:25
	← star_prone left	07:27
	→ star_prone joined	07:28
	← kadoban left	07:32
	← MacWinner left	07:32
	← star_prone left	07:34
	→ Macaveli joined	07:36
	→ PCatinean joined	07:36
	→ Lomex joined	07:37
	← ImJune left	07:37
	→ star_prone joined	07:38
	→ jceb joined	07:42
	← ArchNoob left	07:42
	← blackwind_123 left	07:43
	← cqi left	07:43
	← red_ left	07:45
	→ gtristan joined	07:46
	← Guest9461 left	07:46
	→ josuebrunel joined	07:52
	← interne7y left	07:52
	→ mischat joined	07:53
	← the_cybersphinx left	07:54
	→ FuzzySockets joined	07:55
	← FuzzySockets left	07:55
	→ the_cybersphinx joined	07:56
	← star_prone left	07:56
	→ Darcidride joined	07:57
	← mischat left	08:00
	← ISmithers left	08:00
Lope	Seveas: thanks. On bleeding edge now	08:01
	how can I setup ~/git-shell-commands so that my SSH user with a GIT shell can run any commands?	08:01
	→ vassagus joined	08:01
Seveas	just don't use git-shell	08:01
	set your shell to /bin/bash and be done with it	08:02
Lope	ah, but I thought it would be more secure?	08:02
Seveas	not if you're going to bypass it anyway	08:02
Lope	I've seen conflicting information about needing to create a dir or touch a file with that name.	08:02
	oh, I see.	08:02
	So there is no real git-shell?	08:02
	it's just a framework for scripting arbitrary commands?	08:03
Seveas	nope.	08:03
	it's a way of allowing people in over ssh while limiting their access	08:04
Lope	okidokes	08:04
	→ jaguarmagenta joined	08:04
	← the_cybersphinx left	08:05
	← zeroed left	08:06
	← jaafar_ left	08:06
	← netcarver left	08:07
	← JeroenT left	08:08
	← SwiftMatt left	08:08
	← vassagus left	08:08
	← jaguarmagenta left	08:09
Lope	`git push myserver prod --verbose --dry-run --progress` bash: bob@myserver:1234:: command not found	08:09
	→ cyan__ joined	08:09
	→ jknetl joined	08:10
Lope	`echo $GIT_SSH_COMMAND` ssh bob@myserver -p 1234 -i /path/to/bobkey	08:10
	→ Corneliu joined	08:11
	→ star_prone joined	08:11
Lope	`git remote -v` myserver ssh://bob@myserver:1234:/path/to/my/baregit (fetch) (and push same)	08:11
	when runnin the GIT_SSH_COMMAND by itself I can login to a bash shell and cd to the bare-git repo with full recursive ownership of it.	08:12
Seveas	that remote looks dodgy. change it back to just ssh://myserver/path/to/bare.git	08:12
	→ tomog999 joined	08:13
	→ vdv joined	08:13
	→ the_cybersphinx joined	08:13
	→ zeroed joined	08:13
	← zeroed left	08:13
	→ zeroed joined	08:13
	→ JeroenT joined	08:13
Lope	is it okay if my bare git dir is called "git"?	08:14
	I've got web/git and web/www (where I will auto-deploy to www)	08:14
	I've changed it to: ssh://bob@myserver:1234:/path/to/my/baregit.git but it's got the same error.	08:15
	← tomog999_ left	08:15
Lope	will try your plain form.	08:15
	I found a format like what I've used on stackoverflow (with port number and username)	08:16
	→ ki0 joined	08:16
Lope	okay I ran it without a username or port in the command. now it says bash: myserver: command not found	08:17
	fatal: Could not read from remote repository.	08:17
Seveas	ah, I think I know why.	08:18
	GIT_SSH_COMMAND will be fed the hostname	08:18
Lope	oops, I had a colin between the username and the path. I removed it be like yours. But it had the same error.	08:18
	okay, so I'll take out the username and port.	08:18
	→ magicTurtle joined	08:18
Seveas	so you'll want export GIT_SSH_COMMAND='ssh -l bob -p 1234 -i /path/to/key'	08:18
Lope	I maen username and host.	08:18
	or that.	08:18
	okay. good idea :)	08:19
	→ ahmedelgabri joined	08:19
	→ marcogmonteiro joined	08:19
	← MrWoohoo left	08:19
	→ ArchNoob joined	08:20
Lope	different error now. no more command not found. now it sayd /path/to/baregit.git does not appear to be a git repository.	08:20
	will try without the .git.	08:20
	sweet. it looks like it worked :)	08:21
	→ bongjovi joined	08:22
	→ eVolutive joined	08:22
Lope	hmm, it says * [new branch] prod -> prod.	08:22
	I'm new to git. I think it's because I've not published yet.	08:22
	→ ifra201 joined	08:22
	← yoan left	08:24
Lope	oh lol, --dry-run might have something to do with it not actually pushing anything.	08:25
jast	the possibility exists :}	08:26
	→ ffs joined	08:28
	← magicTurtle left	08:28
	ffs → Guest58269	08:28
Jonuz	How can I insert ' to commit message in git commit command?	08:28
	\' doesnt work	08:28
	← ahmedelgabri left	08:28
	→ ahmed_elgabri joined	08:28
bremner	Jonuz: are you using a text editor, or -m ?	08:29
tobiasvl	Jonuz: huh? what's your command? you mean with -m? if you use "" you should be able to use it regularly	08:29
bremner	or use -F	08:29
Jonuz	oh, it worked when I used "", I thought I had tested it already.	08:30
	ty	08:30
Lope	Seveas: THANK YOU SO MUCH! works	08:31
	← mohabaks left	08:31
	→ N3SS__ joined	08:33
	→ Jidoor joined	08:33
	← Jidoor left	08:33
	→ Jidoor joined	08:33
	← N3SS__ left	08:34
Jidoor	how do i ignore a folder, is it folder, /folder, /folder/ or does it even matter	08:34
	← ygeLN left	08:34
	→ cqi joined	08:34
tobiasvl	Jidoor: well the second and third will only match "folder" in the repo's root	08:35
	man gitignore	08:35
gitinfo	the gitignore manpage is available at http://jk.gs/gitignore.html	08:35
	← tvw left	08:36
Jidoor	second and third are equal?	08:37
jast	/ at the beginning anchors it to the same level at which the .gitignore file lives. / at the end applies to folders only, not files with the same name.	08:37
	→ mischat joined	08:37
Jidoor	ah	08:37
	so /folder/ is the best if i want to ignore a folder in root	08:37
jast	sure, though you're not going to have 'folder' as both a file and a folder in root at the same time, anyway :)	08:37
	← cqi left	08:39
	→ moei joined	08:39
	← star_prone left	08:40
	← jceb left	08:42
	→ cqi joined	08:42
	← a3Dman left	08:45
	→ courrier joined	08:45
	→ star_prone joined	08:46
	← vdv left	08:49
	← Guest58269 left	08:50
	→ Anticom joined	08:51
	← josuebrunel left	08:51
	→ peroht joined	08:53
	→ Lunatrius` joined	08:54
	→ ImJune joined	08:55
	→ sylario joined	08:56
	→ jceb joined	08:57
	← Lunatrius left	08:58
	Lunatrius` → Lunatrius	08:58
	→ ahmedelgabri joined	08:59
	← ImJune left	09:00
phanimahesh	Jonuz: Don't use -m	09:01
	← ahmed_elgabri left	09:01
phanimahesh	It'll create a habit of not writing longer commit messages	09:01
	Always do git commit without -m, it'll open up your editor	09:01
	Write a short summary on first line (what you'd pass to -m) and after a blank line, explain why the change was made.	09:02
	You'll thank yourself when you have to rely on logs anytime.	09:02
	← fabio_ left	09:02
	→ a3Dman joined	09:02
	← star_prone left	09:04
	← courrier left	09:04
	→ fuchstronaut joined	09:05
	→ vassagus joined	09:06
	← CEnnis91 left	09:07
	← JeroenT left	09:07
	→ ronskisika joined	09:09
	← Raging_Hog left	09:09
	→ Raging_Hog joined	09:09
	← fuchstronaut left	09:09
	→ mohabaks joined	09:10
	← a3Dman left	09:13
	→ JeroenT joined	09:13
	← ronskisika left	09:13
	← vassagus left	09:14
Lope	even though inside myproj/ I've run `git add --all --verbose` it didn't add myproj/packages or myproj/packages/foo.	09:15
	→ mooru joined	09:16
jast	maybe there's an ignore pattern somewhere?	09:16
Lope	There isn't	09:16
	Not that I can find, not in .gitignore myproj/packages	09:17
jast	you can use 'git check-ignore' so you don't have to search for it yourself :)	09:17
	→ hahuang61 joined	09:17
cbreak	Lope: find . -name ".git"	09:17
	→ mcqr joined	09:18
jast	oh yeah, and nested git repos are ignored :)	09:18
Lope	myproj/packages/foo was another git repo that I cloned from another project. I'd like to track the changes I make to it as part of my project. I deleted myproj/packages/foo/.git. Then tried `git add --all --verbose again` but it's not adding myproj/packages/foo	09:18
	→ nnyk_ joined	09:18
cbreak	Lope: git rm --cached myproj/packages/foo	09:18
Lope	cbreak: will try :)	09:18
jast	and then try your 'add' again	09:19
cbreak	if it isn't tracked as submodule, maybe you have to rm myproj/packages	09:19
	→ SourTrout joined	09:19
cbreak	(if that was ever a submodule)	09:19
Lope	Sweet,. it added them now :)	09:19
	thanks!	09:19
jast	well, that wasn't so bad	09:19
Lope	is there some command to flush all the cache?	09:19
cbreak	yes.	09:20
	← ArchNoob left	09:20
cbreak	but you don't want that	09:20
Lope	Okay	09:20
jast	the thing is, the cache/index has not just changes from the last commit	09:20
	it's a complete snapshot of exacty what would end up in a new commit	09:20
	so, clearing it would mean your next commit would not go through, or at least not have any files in it at all :)	09:20
cbreak	Lope: see man git-update-index for details	09:21
gitinfo	Lope: the git-update-index manpage is available at http://jk.gs/git-update-index.html	09:21
jast	if you want to re-add everything I guess it's not that much of an issue, but still it's not a good habit	09:21
	→ _kreo joined	09:21
jast	(to answer anyway, the magic incantation is git read-tree --empty)	09:21
	← sanketdg left	09:22
	← hahuang61 left	09:22
	← SourTrout left	09:23
	← JeroenT left	09:25
	→ chll_ joined	09:26
	→ JanC_ joined	09:27
	→ david007 joined	09:27
	JanC → Guest88920	09:28
	JanC_ → JanC	09:28
	→ ygeLN joined	09:28
	← Guest88920 left	09:29
	← david002 left	09:30
	→ a3Dman joined	09:33
	→ ArchNoob joined	09:34
	→ MrMojito1 joined	09:36
	← MrMojito1 left	09:36
	← ygeLN left	09:38
	← mooru left	09:39
	→ darkbit joined	09:39
	→ fabio_ joined	09:41
	→ AlHafoudh joined	09:41
	← texinwien_ left	09:41
AlHafoudh	hi all	09:42
	→ ygeLN joined	09:42
AlHafoudh	is there anything like statically linked single git.exe file?	09:42
grawity	probably not, since quite a few git subcommands are still written in sh	09:43
	← braderhart left	09:44
	→ braderhart joined	09:45
	← stealthii left	09:46
	→ JeroenT joined	09:47
	→ stealthii joined	09:47
	← ahmedelgabri left	09:47
	← noahsussman left	09:47
	← kwmiebach left	09:49
	→ WillMoogle joined	09:49
	→ noahsussman joined	09:49
	→ mooru joined	09:50
	→ ahmedelgabri joined	09:51
	→ kwmiebach joined	09:51
	→ rbr joined	09:51
	→ interne7y joined	09:53
	→ choki joined	09:53
	← harleypig left	09:54
	→ harleypig joined	09:55
	← wxg left	09:57
	← cdown left	09:57
qsx	and a good part in perl	09:57
	← interne7y left	09:58
	← ahmedelgabri left	09:59
	← aidalgol left	10:01
	← Zamerick left	10:01
	← Raging_Hog left	10:02
	→ Raging_Hog joined	10:03
	→ denimsoft joined	10:03
	← Derperperd left	10:03
	→ star_prone joined	10:04
	→ wxg joined	10:05
	→ irco joined	10:05
	← yena left	10:05
	← denimsoft left	10:05
	→ jaguarmagenta joined	10:05
	← Sazhen86 left	10:05
	→ rahtgaz joined	10:06
	← omegak left	10:07
	→ yena joined	10:07
	→ ISmithers joined	10:07
	← nickstenn left	10:08
	→ ronskisika joined	10:09
	← Raging_Hog left	10:09
	→ magicTurtle joined	10:09
	← star_prone left	10:09
	← jaguarmagenta left	10:10
	→ apachebcn joined	10:10
	← apachebcn left	10:10
	→ nickstenn joined	10:11
	→ vassagus joined	10:11
	→ afuentes joined	10:11
	→ omegak joined	10:12
	→ star_prone joined	10:14
	← ManiacTwister left	10:15
	← nioncode left	10:15
	← stfn left	10:16
	← WakiMiko left	10:16
	← hexa- left	10:16
	← roflin left	10:16
	← ffabi left	10:16
	← languitar left	10:16
	← i7c left	10:16
	← nyuszika7h left	10:16
	← bastelfreak left	10:16
	← dx left	10:16
	← chll_ left	10:16
	← Blkt left	10:16
	→ ffabi joined	10:17
	→ rishi joined	10:17
	→ Chinorro joined	10:17
	→ heftig joined	10:18
	→ VampiricPadraig joined	10:18
	← VampiricPadraig left	10:18
	→ VampiricPadraig joined	10:18
	→ mafrasi2 joined	10:18
	→ hexa- joined	10:18
	→ AlexanderS joined	10:18
	← vassagus left	10:18
	→ ManiacTwister joined	10:18
	→ ohcibi joined	10:18
	→ Learath2 joined	10:18
	→ dx joined	10:18
	→ languitar joined	10:18
	→ stfn joined	10:18
	→ Blkt joined	10:18
	→ chll_ joined	10:18
	→ nioncode joined	10:18
	→ nyuszika7h joined	10:19
	→ WakiMiko joined	10:19
	→ bastelfreak joined	10:19
	→ roflin joined	10:19
	→ asd5a joined	10:19
	→ i7c joined	10:19
osse	commit, add, push, fetch, merge and cherry-pick are all builtin, so if you compile a static version you should be good to go \o/	10:20
	→ deepy joined	10:20
qsx	including the underlying helpers?	10:20
	→ noteness joined	10:21
	→ bauruine joined	10:21
	← cyan__ left	10:21
	← HanClinto left	10:22
	→ luke_penn joined	10:22
osse	what helpers?	10:22
	the one for add -p, no, that's perl	10:22
qsx	fetch-pack for example	10:22
	well "helper" may not be entirely the right term here	10:23
osse	yes	10:23
	→ gitinfo joined	10:23
	ChanServ set mode: +o	10:23
	→ tinajohnson___ joined	10:23
osse	the http helpers aren't though	10:23
qsx	and i doubt it’ll contain openssh	10:24
	so well, with some effort you could create such a git.exe, but won’t be easy	10:24
	→ Hobbyboy\|BNC joined	10:25
qsx	and if you take everything in git (excluding contrib), you’d need sh, perl, python, tcl, libcurl, some kind of ssh, a web server and i guess even more	10:26
	← JeroenT left	10:26
osse	who uses git-p4 anyway	10:26
qsx	who uses p4 anyway	10:26
	→ ahmedelgabri joined	10:26
osse	egg-sack-ly, so you can strike out python \o/	10:27
	→ fuchstronaut joined	10:28
	← ormaaj left	10:28
	→ Nothing4You joined	10:29
	← mehola left	10:29
	← danslo left	10:30
	→ clivejo joined	10:30
	→ rchavik joined	10:33
	→ aguimaraes1986 joined	10:33
	← _sjs left	10:34
	← lordjancso left	10:35
	← magicTurtle left	10:37
	→ lordjancso joined	10:40
	→ psacrifice joined	10:41
	→ tvw joined	10:42
	→ ljc joined	10:43
	← circ-user-HPmjC left	10:50
	→ t-ask joined	10:57
	← tvw left	10:58
	→ cdown joined	10:58
	→ fission6 joined	10:58
	→ danslo joined	10:58
t-ask	HI I have the following situation with git mergetool. I'm not sure what I'm actually looking at. I guess, the Remote column is the one I move to volt.h col2 ... http://storage2.static.itmages.com/i/16/0802/h_1470182002_2301308_f9c1dde916.png	10:59
osse	t-ask: the four files are in order: the one in the current branch, the merged result, the one from the other branch, the common ancestor	11:01
selckin	so yes fix up 2nd to final version	11:01
t-ask	Is this the fixed order in general? Then I take note	11:02
	→ woodruffw joined	11:02
	← woodruffw left	11:02
osse	t-ask: you can tell from the names of the files	11:02
	LOCAL, (nothing), REMOTE, BASE	11:03
	→ woodruffw joined	11:03
	→ JeroenT joined	11:03
	← romerocesar left	11:04
	→ nettoweb joined	11:04
t-ask	so (nothing) is just like a preview of the suggested merge?	11:04
	← rafalcpp left	11:04
osse	i suppose you could call it that	11:04
	it's the actual file on disk.	11:04
	the one you're supposed to edit to fix the problem	11:05
	← Jon28__ left	11:05
	→ Jon28__ joined	11:05
selckin	kdiff3/meld have nicer view imo	11:06
t-ask	ok, just to recap. LOCAL=the currently active local branch, (nothing) = the 'diff view' of the suggested merge, REMOTE = the remote version in that branch, BASE = the root branch of the local repo	11:07
	← ojdo left	11:07
osse	t-ask: "root branch" ?	11:07
	→ playfullyExist joined	11:08
osse	BASE = the version of the file before the branches diverged	11:08
	→ Vinnie_win joined	11:09
	→ sdothum joined	11:09
t-ask	NOt sure how its calld, I guess, the BASE is when I'm looking at the graphical representation of a git version tree, the one main root	11:09
	Hobbyboy\|BNC → Hobbyboy	11:09
t-ask	osse: much nicer explanation	11:10
	← cdown left	11:10
t-ask	osse: I think I understand now. Thank you	11:11
	selckin: I will look into them	11:11
	← dsdeiz left	11:11
	← danslo left	11:11
	← alcohol left	11:13
	← mooru left	11:13
	→ mooru joined	11:14
	→ cd-rum joined	11:14
	← LeBlaaanc left	11:15
	← star_prone left	11:15
	← ahmedelgabri left	11:15
	← playfullyExist left	11:15
	→ alcohol joined	11:15
	→ vassagus joined	11:16
	→ rnsanchez joined	11:16
	→ ahmedelgabri joined	11:17
	→ ojdo joined	11:17
	→ hahuang61 joined	11:18
	→ cd-rum_ joined	11:18
	← cd-rum left	11:18
	→ yoan joined	11:20
	← _kreo left	11:21
	← nnyk_ left	11:21
	→ danslo joined	11:23
	← hahuang61 left	11:23
	← cd-rum_ left	11:24
	← vassagus left	11:24
	← ljc left	11:25
	→ fahadash joined	11:26
	→ cyan__ joined	11:29
	→ mehola joined	11:30
	← PCatinean left	11:30
	→ kus joined	11:30
	← kus left	11:30
	→ dsdeiz joined	11:35
	→ notebox joined	11:35
	← mehola left	11:36
	→ pandeiro joined	11:38
	← MZAWeb left	11:40
	← pandeiro left	11:40
	← notebox left	11:41
	→ pandeiro joined	11:41
	→ airdisa joined	11:43
	← pandeiro left	11:44
	← Sceorem left	11:44
	← phanimahesh left	11:45
	← djb-irc left	11:46
	→ phanimahesh joined	11:47
	→ alkino joined	11:48
alkino	Why does git reimplement tar and zip?	11:48
grawity	what should it do instead? use libarchive?	11:49
alkino	grawity: do nothing?	11:49
grawity	that would make it lose functionality	11:49
alkino	If I want to do a git archive in tar.xz I do "git archive \| tar \| xz"	11:50
grawity	except you can't do that because pipes don't have a 'file delimiter'	11:50
alkino	grawity: but support only those 2 formats seems a broken functionality	11:50
selckin	if you want version control you just do cp file $(md6sum file)	11:50
grawity	Windows' powershell might work that way; Unix pipes don't.	11:50
alkino	grawity: and why not libarchive?	11:50
grawity	and if you start implementing a framing protocol, congrats, you reinvented tar.	11:50
	libarchive wouldn't be bad, though since git's support is generate-only (no parsing) and fairly static, it probably wasn't worth adding another dep, I guess?	11:51
alkino	hum	11:51
osse	git also reimplements diff, option parsing and string buffers	11:52
alkino	If I do "git archive HEAD" it write something in my output	11:52
selckin	and bitkeeper	11:52
	selckin hides	11:52
alkino	so it's useless?	11:52
grawity	it writes an uncompressed tar archive	11:52
alkino	ok	11:53
grawity	so you can indeed use `git archive HEAD \| xz > foo.tar.xz`	11:53
	← mooru left	11:53
	→ djb-irc joined	11:53
grawity	also – AFAIK – at least with tar, git-archive tries hard to generate identical files every time	11:53
	← phanimahesh left	11:53
	→ mooru joined	11:53
	← mooru left	11:53
grawity	(iirc, that's useful for signing large repos' tarballs)	11:54
alkino	ok right ^^	11:54
	← m1dnight_ left	11:55
	→ phanimahesh joined	11:55
	→ synthroid joined	11:55
	→ davisonio joined	11:55
	← t-ask left	11:55
	← davisonio left	11:56
	← johnny56 left	11:56
	← holodoc left	11:56
	→ holodoc joined	11:59
	→ mooru joined	11:59
sdaugherty	There are some guarantees about timestamps too with git archive, which wouldn't be the case with tar/zip used on their own, also git archive takes care of removing git artifacts for you, so there's two features that make it especially suitable for releasing software.	12:00
	← jceb left	12:00
	← sdothum left	12:01
grawity	well, no, I assume libarchive lets you set arbitrary timestamps as well	12:01
sdaugherty	grawity, it might, but that's clumsy in comparison to a process which does so automatically based on the commitid	12:01
alkino	grawity: grawity: you can do manage metadata as you want with libarchivz	12:01
	← zeroed left	12:01
alkino	sdaugherty: -^	12:02
grawity	sdaugherty: the same process would be doing the same thing automatically	12:02
osse	I also think this.	12:02
sdaugherty	also, git archive optionally handles .gitattributes directed processes	12:02
grawity	sdaugherty: just [for example] libarchive_set_metadata() instead of writing out the same directly	12:02
	sdaugherty: sure, it could still handle .gitattributes	12:03
	sdaugherty: there's nothing about using a library that would force it to blindly tarball the raw working tree	12:03
	it could still specify whatever input data it wants	12:03
	→ dsdeiz_ joined	12:05
sdaugherty	also, as for why libarchive wasn't used in the first place, both projects seem to have started at about the same time.	12:06
	in 2005.	12:06
	→ zeroed joined	12:06
	→ jaguarmagenta joined	12:06
	→ veilig2000 joined	12:06
	→ Sceorem joined	12:07
sdaugherty	without delving deeply into the development history, I'd take an educated guess that libarchive was not yet mature enough at the time git archive was implemented?	12:07
	← dsdeiz left	12:07
	→ CheckDavid joined	12:08
alkino	sdaugherty: surely.	12:09
	→ HanClinto joined	12:09
	← fission6 left	12:10
	→ korolev joined	12:10
	← choki left	12:10
	← jaguarmagenta left	12:11
	→ BPL joined	12:12
BPL	Hi everyone!	12:12
	← cyan__ left	12:12
	→ str joined	12:13
	← JeroenT left	12:14
	→ sdfsdf joined	12:14
	→ sigma__ joined	12:15
BPL	Not sure what's wrong... but I've cloned a couple of projects with git 2.7.0 (cygwin64) and I'm having some problems running the executables or bat files, they spawn this error "Windows cannot access the specified device, path, or file. You may not have the appropriate permissions to access the item" , any clue why is this?	12:15
grawity	try to `chmod +x` them via cygwin	12:15
	→ tvw joined	12:15
	→ star_prone joined	12:15
sigma__	If I've got branches A, B, and C, all created from master, what is the proper method of merging them all back cleanly? I like to keep a linear history without "merge commits" all over the place.	12:16
grawity	imho "merge commits" are quite clean	12:16
sigma__	In the past, I've merged A into master, rebased B onto master and merged B into master, then rebased C onto master and merged C into master.	12:16
grawity	you can merge 3 times, then rebase <pre-merge-master>..master to flatten everything	12:17
BPL	grawity: If i do > chmod -R +X minko i get chmod: cannot read directory 'minko': Permission denied	12:17
sigma__	grawity: Would I have to squash any commits, like merge commits, in that scenario?	12:17
	← rubyonrailed left	12:17
grawity	no	12:17
sigma__	Maybe I'll give that a shot.	12:17
	→ jceb joined	12:18
sigma__	Seems reasonable enough.	12:18
	Is there anything wrong with the way I've done it before? Even if it's more work?	12:18
	git checkout A; git rebase master; git checkout master; git merge A; # repeat for B and C...	12:19
	← mohabaks left	12:19
	→ keltvek joined	12:20
	← star_prone left	12:20
sdaugherty	A linear history isn't necessarily a completely clear history.either. A lot can be inferred from the history when you can see how branches have diverged and merged back in.	12:21
	→ ncd\|leeN joined	12:21
sigma__	sdaugherty: I understand.	12:21
	→ JeroenT joined	12:21
	← leeN left	12:21
	→ rwb joined	12:21
sdaugherty	That's especially true if you have upstream or downstream repositories integrating changes back in.	12:21
	→ vassagus joined	12:21
	← HanClinto left	12:22
	← JeroenT left	12:22
	→ kyan joined	12:22
sigma__	sdaugherty: Sure. That gets messy, so I try to avoid rewriting history.	12:23
	→ engx joined	12:23
BPL	On the other hand, when i clone stuff using the git included on Sourcetree (1.9.5.msysgit.0) i don't get any permissions error	12:23
	so, what's "wrong" with the cygwin's git? any chance to clone the projects properly on windows?	12:23
	→ mablae joined	12:24
	← korolev left	12:24
sigma__	BPL: There is also git-bash.	12:24
	← engx left	12:24
	→ peroht_ joined	12:24
grawity	that is git-bash, I think	12:24
	← veilig2000 left	12:24
sigma__	TIL	12:24
jast	"git for windows" is not based on cygwin	12:24
	→ JeroenT joined	12:24
jast	it's based on msys	12:24
BPL	so? what should i do? not using the provided on cygwin at all?	12:25
sigma__	Correct your permissions issues.	12:25
jast	are you running the commands from inside a cygwin terminal, or a normal Windows command prompt?	12:25
	→ _kreo joined	12:26
BPL	sigma__: how? jast: normal windows command prompt mostly of the time (conemu)	12:26
sigma__	You haven't shown us what the permissions are for the objects you're dealing with, or what user and group(s) you're executing the chmod command as.	12:26
	← bongjovi left	12:26
	→ shinnya joined	12:27
	← peroht left	12:27
	→ Mogget joined	12:27
jast	BPL: I'm not sure how cygwin's path mapping works, my unsubstantiated guess is it's doing bad things when being run from a normal windows environment	12:28
	just to be sure, have you tried the same thing(s) from cygwin's shell?	12:28
	← sdfsdf left	12:28
	← vassagus left	12:29
fuchstronaut	Is there a way to get a list of all changes to files that match a regex (file ending) in the current branch?	12:29
	← dsdeiz_ left	12:29
	→ star_pro_ joined	12:30
	← sigma__ left	12:30
	→ bongjovi joined	12:30
	→ johnny56 joined	12:31
	← flaguy48 left	12:31
	← star_pro_ left	12:32
	→ bobdobbs joined	12:32
BPL	jast: Ok, never mind, i guess I'll put on path first the git included on sourcetree, which works alright, although is quite old 1.9.5 :P	12:32
	→ dsdeiz joined	12:32
	← Codfection left	12:33
	← gtristan left	12:33
	← peroht_ left	12:34
	→ mohabaks joined	12:37
	→ syndikate joined	12:38
	← aavrug left	12:40
	→ flaguy48 joined	12:41
	→ gruuf joined	12:41
	← syndikate left	12:41
	→ syndikate joined	12:42
	→ nnyk_ joined	12:42
	→ rgrinberg joined	12:43
	← syndikate left	12:43
	→ syndikate joined	12:46
	→ sanketdg joined	12:50
	← syndikate left	12:51
	→ korolev joined	12:52
	→ jimi_ joined	12:52
	→ zivester joined	12:52
	→ boushi_ joined	12:53
	→ interne7y joined	12:54
	← boushi left	12:55
	← yoan left	12:55
	← jagob left	12:56
	← xall left	12:56
	→ daniel_rose joined	12:57
	← cschneid left	12:58
	← fuchstronaut left	12:58
	→ sdothum joined	12:58
	→ cdown joined	12:58
	→ artemisart joined	12:58
	← interne7y left	12:59
	← korolev left	12:59
	← kyan left	12:59
	← boushi_ left	12:59
	→ syndikate joined	12:59
	← danslo left	13:00
	← artemisart left	13:01
	→ odinsbane joined	13:01
	← syndikate left	13:02
	→ cschneid joined	13:02
	→ syndikate joined	13:02
	← subhojit777 left	13:02
odinsbane	I made a new branch, git branch mono, then I did git commit, which commited the local changes to the old branch.	13:02
	→ Faylite joined	13:03
	← mooru left	13:03
odinsbane	How would I commit changes to a new branch?	13:03
	← bobdobbs left	13:03
odinsbane	When I use git checkout mono, I am placed at a spot before any changes were made.	13:03
	← iDanoo left	13:03
perlpilot	odinsbane: switch to that branch before you commit :)	13:03
odinsbane	perlpilot: When I switch to that branch, all of the changes are lost.	13:04
perlpilot	odinsbane: right now, you could just move the branch to the commit where you have those changes	13:04
	→ indistylo joined	13:04
	← david007 left	13:04
	→ mooru joined	13:04
tobiasvl	odinsbane: they're not "lost", you're just switching to a branch that doesn't have them	13:05
odinsbane	True.	13:05
	So, lets say I make a bunch of changes, now how can I commit those changes to a new branch.	13:05
selckin	git checkout -b newbranch; git commit	13:06
	→ korolev joined	13:06
perlpilot	odinsbane: or, more verbosely, git branch foo; git checkout foo; git commit	13:06
	you appear to have skipped that second step	13:07
odinsbane	Yes.	13:07
	→ star_prone joined	13:07
odinsbane	Hmm, so when I checkout a branch, any non-commited changes will not be lost?	13:08
selckin	indeed	13:09
perlpilot	odinsbane: git's purpose in being is to keep things from being lost.	13:10
tobiasvl	odinsbane: !float	13:10
gitinfo	odinsbane: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	13:10
	→ Finnoloid joined	13:10
odinsbane	Okay now how do I fix my problem. I have commited changes to 'multi-threaded' that I want commited to 'mono'	13:10
jast	also you can copy your commit to your new branch	13:10
selckin	odinsbane: you can cherry-pick that commit and then drop it from the other branch	13:11
jast	git checkout mono; git cherry-pick multi-threaded	13:11
guardian	is there something shorther than git ls-files --state -- "$file" \| cut -d' ' -f1 to figure out whether a file is committed with permissions different than 644?	13:11
jast	git ls-files shows things from the index, not from commits	13:12
guardian	I'm in pre-commit hook	13:12
jast	oh, okay then :)	13:12
perlpilot	when did ls-files get a --state option?	13:12
	→ kyan joined	13:12
jast	probably meant --stage	13:13
guardian	s/--state/--stage	13:13
	sorry	13:13
perlpilot	ah	13:13
jast	anyway, can't think of anything shorter	13:13
guardian	ok	13:13
	is it still the case that git only stores 644 or 755?	13:13
jast	strictly speaking the cut is not necessary, though	13:13
	yes	13:13
guardian	yeah I could just grep for 755	13:13
jast	well, I don't know if submodules show up in that list, they do have a different mode	13:13
	they probably do show up	13:14
guardian	submodules are marked with 160000	13:14
	← phanimahesh left	13:15
	→ fission6 joined	13:15
	→ danslo joined	13:15
	← korolev left	13:16
	→ phanimahesh joined	13:16
	← cdown left	13:17
	← mostlybadfly left	13:17
	← Lomex left	13:18
	→ hahuang61 joined	13:19
	→ korolev joined	13:19
	→ cdown joined	13:19
	← jceb left	13:20
	← Gitzilla left	13:21
	← hahuang61 left	13:23
	→ zumba_ad_ joined	13:24
	→ byteflame joined	13:24
	→ vassagus joined	13:26
	← shinnya left	13:27
	→ ejb joined	13:27
	← syndikate left	13:28
	→ fmcgeough joined	13:28
	← mooru left	13:29
	→ ExoUNX joined	13:29
	→ Tachyon_ joined	13:29
	← mkoskar left	13:29
	→ Angs joined	13:30
	→ CEnnis91 joined	13:30
	→ Lomex joined	13:30
	→ rnsanchez_ joined	13:31
	→ kedare joined	13:31
	← zivester left	13:31
Angs	when I run "git add -A" on ubuntu, it outputs "...git/index.lock': Permission denied". However, ls -al doesn't show that index.lock exist under .git directory. I run "rm -f index.lock" just in case inside the .git directory, but I still get the same error	13:32
cYmen	is there a command to revert only a single file?	13:32
Angs	does anyone know how should I fix it?	13:32
	→ jceb joined	13:33
	→ _rnsanchez_ joined	13:33
cYmen	Angs: did you take the ... into account?	13:33
	← vassagus left	13:33
cYmen	looks like that file might be one directory up in .git	13:33
	← rnsanchez left	13:34
Angs	I meant ... with the previous project path, I didn't want to copy the all	13:34
	I run the command inside the directory	13:34
	→ nilg joined	13:35
cYmen	do you have permission to access the .git directory?	13:35
	→ HanClinto joined	13:35
	← Lomex left	13:35
	← rnsanchez_ left	13:35
	← rchavik left	13:36
	→ Softeisbieger joined	13:36
	← phanimahesh left	13:36
	← satya4ever left	13:37
	← hwoarang left	13:37
Angs	cYmen,	13:37
	it looks like I don't :) "drwxrwxr-x 8 root root 4096 Aug 3 15:25 .git	13:37
	"	13:37
	← synthroid left	13:37
	← alcohol left	13:37
	→ griffindy joined	13:37
Angs	thanks	13:37
	→ magicTurtle joined	13:37
	→ synthroid joined	13:38
	→ phanimahesh joined	13:38
	← kini left	13:38
	← zumba_ad_ left	13:38
	→ Cauiu joined	13:38
	_rnsanchez_ → rnsanchez	13:38
	→ al-damiri joined	13:38
	→ nanga joined	13:39
	← nanga left	13:39
	→ nanga joined	13:39
	→ ChristopheT joined	13:39
	← ChristopheT left	13:40
	→ alcohol joined	13:40
	← cdown left	13:41
	→ HanClinto_ joined	13:41
	← synthroid left	13:42
	→ shinnya joined	13:42
	→ Dougie187 joined	13:43
	→ Lomex joined	13:43
	← mablae left	13:43
	← tinajohnson___ left	13:45
	← HanClinto left	13:45
	→ Noldorin joined	13:45
	→ Sucks joined	13:46
	← HanClinto_ left	13:46
	← magicTurtle left	13:47
	→ AaronMT joined	13:48
	→ aavrug joined	13:48
	→ Serg_Penguin joined	13:48
	→ sfeinste joined	13:48
	→ HoierM joined	13:48
	→ phaleth joined	13:48
	→ kini joined	13:49
Serg_Penguin	hi ! I broke my git: pushed to remote then accidentally amended commit, now it won't push: "tip of your current branch is behind its remote counterpart". ANy by-step manual to fix ?	13:49
sdaugherty	Serg_Penguin, depending on how much time has passed, and restrictions on the remote, you might be able to force push.	13:51
RichiH	Serg_Penguin: if you are working with others, you need to make them aware of this change	13:51
	→ synthroid joined	13:51
RichiH	else, you "break" their repos	13:51
sdaugherty	^ force pushing breaks anyone who's already pulled/cloned after you	13:51
RichiH	and if they pull, merge, push, you have your old commit back	13:51
	sdaugherty: i.e. fetched	13:52
	→ hwoarang joined	13:52
Serg_Penguin	few hours, the only and master developer, repo on bitbucket.org but don't 'own' it, is granted with access	13:52
	← korolev left	13:52
	→ garethdaine joined	13:52
sdaugherty	if you catch it quickly, before other people are affected, the quickest, dirtiest, and easiest solution is a force push.	13:53
	← sbeller_ left	13:53
	→ sbeller joined	13:53
	← tvw left	13:54
sdaugherty	it's normally discouraged, because others who may already have the offending commit will have repo operations fail in a similar way as to how your push is failing now.	13:54
	→ kaldoran joined	13:54
Serg_Penguin	sdaugherty, RichiH thanks, forced. But what is ultimate remedy ? Can i technically forbid amends to myself if pushed ?	13:55
sdaugherty	If at all possible, don't amend commits after they've been pushed.	13:55
	← aavrug left	13:56
sdaugherty	The proper solution in most cases, after you've already pushed, is to do a revert, instead of amending the commit.	13:56
	However, that's not acceptable if you've committed sensitive info to a public repository.	13:57
Serg_Penguin	sdaugherty, revert ? my edit was just a one newline ;( no passwords, luckily	13:57
	→ fuchstronaut joined	13:58
sdaugherty	yeah, almost always better to revert once something's been pushed, because it's not possible to "erase" a commit that a remote repository has seen without rewriting history.	13:59
	git is very particular about history rewrites by design, so that they can't happen without being disruptive to other people using the repository	14:00
	← ejb left	14:01
	← wodim left	14:02
	← zeroed left	14:02
	← jceb left	14:02
sdaugherty	its annoying in a case like this where you've just made a mistake and want to get rid of it, but that same behavior is invaluable as a defense against someone trying to bury a malicious change in a repo.	14:03
	→ GodGinrai joined	14:03
	← cqi left	14:04
sdaugherty	with cvs (and many other inferior VCS) for example, someone can manipulate older commits without anyone easily being able to notice it.	14:05
	← fuchstronaut left	14:05
	← shinnya left	14:06
sdaugherty	If they try to do that against a git repository, history won't match between repos, and people suddenly find they can't push/pull/fetch anymore.	14:06
	→ jaguarmagenta joined	14:07
	→ korolev joined	14:08
	→ soLucien joined	14:08
	→ tvw joined	14:08
	→ usm4n joined	14:09
	→ cdown joined	14:09
soLucien	hello guys ! I want to ignore the modules folder, but unignore modules/autosync and all contents (recursively). Is that possible ?	14:10
	→ rik316 joined	14:10
	← Faylite left	14:10
	← jaguarmagenta left	14:11
	← kyan left	14:11
soLucien	i tried modules/*	14:11
	!modules/folder_autosync	14:11
gitinfo	[!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	14:11
	→ veilig2000 joined	14:12
	← sdothum left	14:13
	→ kbs joined	14:14
	← Tachyon_ left	14:15
Serg_Penguin	sdaugherty, thanks for deep explain, I was not thinking this way ;)	14:15
	→ madewokherd joined	14:16
	← tvw left	14:16
	→ fuchstronaut joined	14:17
	→ catag87 joined	14:17
	← catag87 left	14:17
	→ netcarver joined	14:18
	→ catag87 joined	14:18
	→ subhojit777 joined	14:18
	→ LionsMane joined	14:20
	→ cyan__ joined	14:20
	→ tvw joined	14:21
	→ ResidentBiscuit joined	14:22
	→ Dazzyp joined	14:22
	← lordjancso left	14:23
	→ tjone270_ joined	14:23
	← rik316 left	14:24
	→ axl_ joined	14:24
	→ rik316 joined	14:25
	→ Dazzyo joined	14:26
	← sarbs left	14:26
	→ sarbs joined	14:26
	← Dazzyp left	14:27
	← tjone270 left	14:27
	← usm4n left	14:27
	← dsdeiz left	14:27
	→ l4v2 joined	14:27
	→ ShekharReddy joined	14:28
	← luke_penn left	14:28
	← cyan__ left	14:28
	← Anticom left	14:30
	→ PCatinean joined	14:31
	→ vassagus joined	14:31
	→ zivester joined	14:32
	← crayon left	14:32
	→ mehola joined	14:33
	→ sangy joined	14:34
	← ShekharReddy left	14:34
	← Softeisbieger left	14:35
	→ Anupkumar joined	14:35
	→ dlaboratory joined	14:36
	→ underpantz joined	14:36
	→ bsanford joined	14:37
	← mehola left	14:37
	→ Tachyon_ joined	14:37
	← catag87 left	14:38
Anupkumar	hi, currently I have a main git repository (without master access) and I want to push the changes that I made in the master repo directly to my fork, how can I do that?	14:38
	← vassagus left	14:39
moritz	Anupkumar: add your fork as remote, do a git push yourremote yourbranch	14:39
grawity	git remote add	14:39
selckin	add your fork as a remote and i type to slow	14:39
	→ Silenced_v2 joined	14:42
	← Electrometro left	14:43
	→ catag87 joined	14:43
	← dlaboratory left	14:43
	← submitnine left	14:44
	← rominronin left	14:45
	→ Codfection joined	14:46
	← phanimahesh left	14:46
	← korolev left	14:46
	← Darcidride left	14:47
	← baako left	14:47
	→ dlaboratory joined	14:47
	→ phanimahesh joined	14:48
	← Tachyon_ left	14:48
	← nettoweb left	14:49
	→ korolev joined	14:50
	← chll_ left	14:50
	← dlaboratory left	14:51
	→ kyan joined	14:51
	→ chll_ joined	14:52
	→ jstein_ joined	14:52
	← korolev left	14:53
	jstein_ → jstein	14:54
	→ xall joined	14:54
	→ interne7y joined	14:55
	← TomyWork left	14:56
	← odinsbane left	14:57
	← phanimahesh left	14:57
	← govg left	14:57
	→ korolev joined	14:57
	← JeroenT left	14:58
	→ JeroenT joined	14:59
	← rscata left	14:59
	← xall left	14:59
	← interne7y left	15:00
	→ cqi joined	15:00
	← jknetl left	15:00
	← Serg_Penguin left	15:03
	→ Christop` joined	15:04
	← Christop` left	15:04
	← Cauiu left	15:04
	← synthroid left	15:06
	→ SourTrout joined	15:06
	→ kpease joined	15:08
	← JeroenT left	15:08
	→ dmto joined	15:09
	→ JeroenT joined	15:09
patarr	Does anyone use bitbucket? How do I checkout a pull request so I can locally test it?	15:09
	← madewokherd left	15:10
	← daniel_rose left	15:10
	← wxg left	15:10
	→ spudowiar joined	15:10
	gitinfo set mode: +v	15:10
	→ InfoTest joined	15:12
	→ vassagus joined	15:12
	→ dreiss joined	15:13
	← ahmedelgabri left	15:15
	← star_prone left	15:15
	→ star_prone joined	15:16
	← fuchstronaut left	15:16
	→ ahmedelgabri joined	15:17
	← Silenced_v2 left	15:17
	→ Silenced_v2 joined	15:17
	→ farkr joined	15:18
	→ eivarv joined	15:18
farkr	Let's say I have two csv files	15:18
	one is as follows:	15:19
	a,1	15:19
	← Sceorem left	15:19
farkr	b,2	15:19
	c,3	15:19
	and the other is	15:19
	b,2	15:19
	c,3	15:19
	a,3	15:19
	how can I diff them in way that it ignores the fact that a is below b and c?	15:19
	while also making note of the new value change on a	15:19
	→ hahuang61 joined	15:19
	polyzen looks at channel name	15:19
	← kyan left	15:19
GodGinrai	polyzen: indeed	15:20
	→ tyreld joined	15:20
	→ Darren_ joined	15:20
	← dreiss left	15:20
polyzen	sounds like homework	15:20
	:p	15:21
GodGinrai	lol	15:21
	← star_prone left	15:21
polyzen	farkr, correct the order, then diff?	15:21
	→ crayon joined	15:22
	→ dreiss joined	15:22
	→ tonyyarusso joined	15:22
GodGinrai	farkr: so you're just trying to figure out if values changed?	15:24
	← ifra201 left	15:24
	← kbs left	15:24
	← hahuang61 left	15:24
	→ fuchstronaut joined	15:27
	→ aep-shoutlet joined	15:28
	→ ben__ joined	15:30
	← danslo left	15:31
	← nnyk_ left	15:31
	← kaldoran left	15:31
	← Lope left	15:32
	→ moriko joined	15:32
	→ brewmaster joined	15:33
	→ synthroid joined	15:33
GodGinrai	farkr: simple, and crude: `awk -F, '{ if ($1 in arr) { if (arr[$1] != $2 ) { changes[$1] = $2 } } else { arr[$1] = $2 } } END { for (i in changes) { print i }}' a.csv b.csv`	15:34
	→ mehola joined	15:34
	→ Tachyon_ joined	15:34
GodGinrai	or even simpler	15:35
	← JeroenT left	15:35
GodGinrai	sort a.csv b.csv && diff a.csv b.csv	15:35
	→ nnyk_ joined	15:36
	← faheem left	15:36
farkr	sorry, I used a bad example	15:36
	→ kyan joined	15:37
farkr	it's more like b.csv has an extra line with "d,4"	15:37
	← nilg left	15:37
farkr	here, I'll just give you the files and show you the results I'm getting	15:37
	→ faheem joined	15:38
	→ nilg joined	15:38
	← mehola left	15:38
farkr	http://pastebin.com/GhedBWv0	15:39
	this is the diff	15:39
GodGinrai	farkr: pastebin.com is blocked here because of many reasons, use a better pastebin	15:40
	→ jaafar joined	15:40
	← nilg left	15:40
	→ thiago joined	15:40
	← Balliad left	15:41
	← nnyk_ left	15:41
	→ danslo joined	15:41
	→ texinwien_ joined	15:41
	← shymega left	15:41
	→ TomyLobo joined	15:42
	→ shymega joined	15:42
	← shymega left	15:42
	→ madewokherd joined	15:42
farkr	http://hastebin.com/qotosoyogi.avrasm	15:42
	← fuchstronaut left	15:42
	→ shymega joined	15:42
farkr	http://hastebin.com/facorucide.avrasm	15:43
	ignore the extensions	15:43
	http://hastebin.com/rozapinicu.avrasm	15:43
	these are all csv	15:43
	← korolev left	15:43
farkr	first one is diff, last two are csv	15:44
	← moriko left	15:45
GodGinrai	farkr: so, how are you so sure the diff is giving you weird output? I've tried like 3 random lines and found that it isn't repeated in the diff output as being added and removed. only one or the other	15:45
	→ rominronin joined	15:45
	← ronskisika left	15:45
	← danslo left	15:46
	→ seb7 joined	15:47
	← tvw left	15:47
farkr	I don't really understand what you're saying, sorry :/	15:47
	→ anuxivm joined	15:48
farkr	my problem is that it's basically just combining both of the files into one	15:48
	→ nettoweb joined	15:49
GodGinrai	Either I'm not understanding what you are getting at, or you don't understand what diff does.	15:49
	← rominronin left	15:50
	← AaronMT left	15:51
farkr	I want it so that it shows the changed line directly under the old line	15:51
	← rgrinberg left	15:52
farkr	instead it just puts all the '---' at the top and '+++' on the bottom	15:52
	← eVolutive left	15:52
	← Silenced_v2 left	15:53
	← ahmedelgabri left	15:53
jast	for complete rewrites there's the -B option	15:53
	but generally what you're seeing is basically the way diff is definedf	15:54
	← dreiss left	15:55
jast	that doesn't look like a valid unified diff, anyway. you're not talking about diffs in git, are you?	15:55
	GodGinrai: how is pastebin.com "blocked" here?	15:55
	→ danimal2 joined	15:55
jast	oh wait, you mean a different "here" than me, don't you :)	15:56
GodGinrai	jast: yes	15:56
jast	today is one of these "thinking N/A" days...	15:56
	→ ahmedelgabri joined	15:56
GodGinrai	lol	15:56
farkr	jast: no, that's in CRAN, but git returns the same thing http://hastebin.com/nerolixutu.avrasm	15:56
jast	I have to figure out a way to fix the hurried wide refactoring from last week at work, and it's the mind killer	15:57
	→ AaronMT joined	15:57
	← texinwien_ left	15:58
	→ kbs joined	15:58
	→ Zamerick joined	15:58
	→ ambro718 joined	15:59
	→ texinwien_ joined	15:59
	→ dreiss joined	16:00
	← kedare left	16:00
	→ nnyk_ joined	16:00
	← ahmedelgabri left	16:01
	← vassagus left	16:04
	← brandonw left	16:04
	→ tvw joined	16:05
	→ brandonw joined	16:05
	→ jaguarmagenta joined	16:07
	← solrize left	16:08
	← _kreo left	16:08
	→ vassagus joined	16:10
	← jaguarmagenta left	16:12
	→ df\d joined	16:15
	← DevAntoine left	16:15
	→ rgrinberg joined	16:15
	→ Electrometro joined	16:17
	← keltvek left	16:17
	→ Gitzilla joined	16:18
	← SourTrout left	16:19
	→ daniel_rose joined	16:20
	← df\d left	16:21
	→ snowkidind joined	16:21
	→ moriko joined	16:21
	→ EvilPenguin joined	16:23
	→ jaequery joined	16:23
	→ Derperperd joined	16:25
	→ Pulp joined	16:26
	← moriko left	16:26
	→ UTAN_dev joined	16:26
	→ Electrom_ joined	16:26
	→ harish_ joined	16:26
	→ kevwil joined	16:28
	← Electrometro left	16:29
	← cqi left	16:29
	← Gianormagantrous left	16:31
	← dreiss left	16:32
	← freimatz left	16:33
	← zarubin left	16:34
	→ zarubin joined	16:35
	→ mehola joined	16:35
	→ devxom joined	16:35
	← devxom left	16:35
	→ jeremyhall joined	16:35
	→ JanC_ joined	16:35
	→ devxom joined	16:35
	JanC → Guest94529	16:36
	← Guest94529 left	16:36
	JanC_ → JanC	16:36
	← eivarv left	16:37
	→ emPi joined	16:37
	→ solrize joined	16:38
	← solrize left	16:38
	← chll_ left	16:39
	→ durham joined	16:39
	← durham left	16:39
	← mehola left	16:39
	→ durham joined	16:39
	→ nivag joined	16:40
	→ ImJune joined	16:40
	→ yoan joined	16:40
	← BSAlb left	16:42
	← fahadash left	16:43
	← Pulp left	16:43
	→ cyan__ joined	16:44
	→ kaldoran joined	16:44
	← rgrinberg left	16:45
	→ SteffanW2 joined	16:45
	→ grayjoc joined	16:45
	← Lomex left	16:45
	→ rominronin joined	16:47
	← fabio_ left	16:47
	→ eivarv joined	16:48
	→ rgrinberg joined	16:48
	← _Patrick_ left	16:49
	→ Limes__ joined	16:49
	→ BSaboia joined	16:50
	→ fuchstronaut joined	16:51
	→ daynaskully joined	16:52
	← rominronin left	16:52
	← Limes_ left	16:53
	→ jfcaron joined	16:54
	→ dreiss joined	16:54
	← ImJune left	16:54
	→ [gmi] joined	16:55
	← fuchstronaut left	16:55
	→ jeremyhall_ joined	16:55
	→ interne7y joined	16:56
	→ Lomex joined	16:56
	← cyan__ left	16:57
	← jeremyhall left	16:58
	← str left	16:59
	← [gmi] left	16:59
	→ djapo joined	16:59
	← interne7y left	17:00
	← thiago left	17:00
	→ BSAlb joined	17:01
	→ shinnya joined	17:01
	← Lomex left	17:02
	→ livingstn joined	17:02
	→ foist joined	17:03
	← BSaboia left	17:03
	→ star_prone joined	17:04
	← kevwil left	17:05
	← veilig2000 left	17:05
	→ nitric joined	17:06
	← fstd left	17:07
	→ fstd joined	17:07
	→ LeBlaaanc joined	17:07
	← star_prone left	17:09
	← eivarv left	17:09
	← grayjoc left	17:09
	← seb7 left	17:10
	← livingstn left	17:10
	→ kadoban joined	17:11
	← kyan left	17:12
	→ str joined	17:12
	→ le_melomane joined	17:13
	→ WayToDoor joined	17:13
	← daniel_rose left	17:13
	← UTAN_dev left	17:13
	→ tabrez joined	17:14
	→ armyriad joined	17:15
	← armyriad left	17:16
	→ armyriad joined	17:17
	← piling left	17:17
	→ eivarv joined	17:17
	→ piling joined	17:18
	→ phanimahesh joined	17:19
	← jfcaron left	17:19
	→ jfcaron joined	17:19
	→ hahuang61 joined	17:20
	→ diegoviola joined	17:20
	← ambro718 left	17:21
	→ The_Phoenix joined	17:22
	→ kevwil joined	17:22
	→ fuchstronaut joined	17:22
	← tabrez left	17:23
	→ govg joined	17:24
	← alkino left	17:25
	← hahuang61 left	17:25
	← Derperperd left	17:26
	→ Derperperd joined	17:27
	→ Spec-Chum joined	17:27
	← kevwil left	17:27
	← texinwien_ left	17:27
	← fuchstronaut left	17:27
	→ daniel_rose joined	17:28
	→ texinwien_ joined	17:30
	← indistylo left	17:31
	→ gtristan joined	17:31
	→ Lyqyd joined	17:33
	→ lvns joined	17:34
	→ Dyonisos joined	17:35
	→ mehola joined	17:35
	← sanketdg left	17:35
	← le_melomane left	17:37
	→ le_melomane joined	17:39
	← sagerdearia left	17:39
	← le_melomane left	17:40
	→ maucar joined	17:40
	← mehola left	17:40
	→ MZAWeb joined	17:41
	→ ahmedelgabri joined	17:42
	→ le_melomane joined	17:42
	→ phanimah1sh joined	17:43
	← pampeho left	17:43
	← durham left	17:43
	→ kevwil joined	17:43
	→ thiago joined	17:43
	← ki0 left	17:44
	→ durham joined	17:44
	← lvns left	17:45
	→ lvns joined	17:46
	← phanimahesh left	17:46
	→ rominronin joined	17:46
	← tvw left	17:48
	← Angs left	17:48
	→ tvw joined	17:48
	→ ChristopheT joined	17:49
	← ChristopheT left	17:49
	→ Sasazuka joined	17:50
	← kevwil left	17:50
	← WayToDoor left	17:50
	← rominronin left	17:50
	→ durham_ joined	17:51
	← durham left	17:53
	← tvw left	17:55
	→ ImJune joined	17:57
	← durham_ left	17:57
	→ eVolutive joined	17:58
	→ vktec joined	17:58
	→ durham joined	17:59
	→ fuchstronaut joined	18:00
	← Macaveli left	18:00
	→ zumba_ad_ joined	18:01
	→ sagerdearia joined	18:01
	← ImJune left	18:02
	→ thekryn__ joined	18:02
	← marcogmonteiro left	18:03
	→ aard joined	18:04
	← fuchstronaut left	18:04
	← nnyk_ left	18:04
	→ nnyk_ joined	18:05
	← subhojit777 left	18:05
	→ HanClinto joined	18:05
	← dreiss left	18:06
	→ aavrug joined	18:06
	→ kevwil joined	18:07
	← SteffanW2 left	18:07
	← jeremyhall_ left	18:09
	→ dminuoso joined	18:10
	← daniel_rose left	18:10
dminuoso	Hi, I have a huge source file, and Im interested in the entire history of a particular region of code, but there's too many changes in the surrounding code.	18:11
	→ jeremyhall joined	18:11
dminuoso	(Basically I know there was some bit of documentation that was there at some time in the past, but I don't know how to find it)	18:11
	← The_Phoenix left	18:11
	← kevwil left	18:11
dminuoso	Note, this is a github project, if there's some github-specific functionality that could help me.	18:12
	← anuxivm left	18:12
kadoban	dminuoso: git blame possibly, or maybe the stuff from git log about pickaxe, like -S and -G and etc. might help.	18:12
	← jayc left	18:14
	→ anuxivm joined	18:15
	← anuxivm left	18:15
	→ MacWinner joined	18:16
nitric	dminuoso: look at the -L option of `git help log`	18:17
dminuoso	nitric: Ah brilliant.	18:17
	← aavrug left	18:17
kbs	oh, nice - good to know :-)	18:19
	→ bdonnahue joined	18:21
	← jfcaron left	18:21
	→ sweb joined	18:21
bdonnahue	hey guys. when youre writing unit test libraries. d oyou keep them in the same repo as the code?	18:21
	not sure what common/best practices are	18:21
sweb	is there any mehtod to tell git just remember 10 latest for files in special folders ?	18:22
	← bocaneri left	18:22
	← eivarv left	18:22
	→ UTAN_dev joined	18:22
	→ mkoskar joined	18:22
sweb	for example i have project i build the source ... source must be git but i dont need to remember all commits of it ... just 10 latest commits	18:22
rpd	bdonnahue: Not sure what you mean by unit test libraries, but it seems okay to keep unit tests in the same repo as the code it tests.	18:23
	→ veilig2000 joined	18:24
bdonnahue	rpd: for example. I write a c# dll and a NUnit dll with tests. they are both in the same solution. i want to create a build system which build production containers based on the code	18:24
rpd	sweb: you could always use --depth when you clone to make a shallow clone	18:24
bdonnahue	i wasnt sure if people configure the build system to strip out the tests or if code and tests go to different repos	18:24
	← cdown left	18:25
	← InfoTest left	18:25
sweb	rpd: not during clone ... in main repository i dont need all commits but i need git for get latest build sources ... use case is i want to use babeljs for compile to standard javascript but i dont need to build on each repository	18:25
rpd	you'd probably have your build system allow multiple targets; one for testing/dev and one for building a production binary	18:25
	→ anuxivm joined	18:25
	← anuxivm left	18:25
	← Sasazuka left	18:26
	→ eivarv joined	18:26
rpd	sweb: why not just get the last 10 commits from the log?	18:26
	← PCatinean left	18:26
rpd	If you already have all the commit history, there's no reason to get rid of it, just select which parts of the history you care about	18:26
sweb	rpd: problem is build can create hug list of file on each build i dont need the history of that files ... i need to just have it not just have entire history build for each file ...	18:27
	→ kevwil joined	18:27
sweb	it's increase git database and useless	18:28
	→ freimatz joined	18:28
	→ jayc joined	18:28
rpd	I'm not sure if I understand, but you only want to build the files modified in the last 10 commits, right?	18:28
piling	guys how do we force to push ?	18:32
	← veilig2000 left	18:32
piling	after rebase -i ?	18:32
	← kevwil left	18:32
	← irco left	18:32
	← rik316 left	18:33
sweb	rpd: right, 10 or one ... i dont need history of that files .. i just need to be synced with git	18:35
dminuoso	bdonnahue: Always keep unit tests in your source, including the required support files to execute that testsuite.	18:35
	→ anuxivm joined	18:36
	← anuxivm left	18:36
dminuoso	bdonnahue: In an ideal scenario a programmer would: clone your repository, obtain any dependencies, and then execute, build or test	18:36
	← eivarv left	18:36
	→ mehola joined	18:36
dminuoso	piling: Is this for a public repository? Has the work been shared already?	18:36
	→ ki0 joined	18:37
	→ iamtakingiteasy joined	18:37
dminuoso	!rewriting_public_history	18:37
gitinfo	[!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:37
	→ m0viefreak joined	18:37
	→ rnsanchez_ joined	18:38
	← iamtakingiteasy left	18:38
	→ iamtakingiteasy joined	18:39
	← iamtakingiteasy left	18:39
	→ paul424 joined	18:39
	→ star_pro_ joined	18:39
	→ iamtakingiteasy joined	18:40
	← rnsanchez left	18:40
	← iamtakingiteasy left	18:40
	→ iamtakingiteasy joined	18:40
	← mehola left	18:41
	→ daniel_rose joined	18:42
piling	dminuoso: yeah for both	18:43
	← star_pro_ left	18:44
	→ danslo_ joined	18:44
	← explodes left	18:44
	← Synthead left	18:45
dminuoso	piling: Then read the gitinfo comment I provided.	18:46
	→ ambro718 joined	18:46
	→ Synthead joined	18:46
	← dmto left	18:46
piling	dminuoso: appreciated, thanks.	18:47
	→ rominronin joined	18:47
	← kfunk left	18:47
	→ kfunk joined	18:48
	← zumba_ad_ left	18:48
	→ kevwil joined	18:48
	← danslo_ left	18:48
	→ anuxivm joined	18:49
	← anuxivm left	18:49
	→ Mannequin joined	18:51
	← farkr left	18:51
	→ explodes joined	18:51
	← mariuscc left	18:52
	← rominronin left	18:52
	← explodes left	18:52
	→ Sasazuka joined	18:52
	← thekryn__ left	18:54
	→ anuxivm joined	18:54
	← anuxivm left	18:54
	→ thekrynn_ joined	18:54
	→ jmd joined	18:55
	← iamtakingiteasy left	18:55
	→ iamtakingiteasy joined	18:55
jmd	I know that at sometime in the past file X contained the string "foo".	18:56
	How can I search for the last commit where it existed?	18:56
	→ dreiss joined	18:56
	→ interne7y joined	18:57
	→ nitin joined	18:57
kadoban	jmd: 'git log -S foo -- the_file' should work	18:57
	← rgrinberg left	18:58
	← lvns left	18:58
	← aard left	18:58
jmd	kadoban: Thanks	18:59
	← Kulrak left	18:59
	← crayon left	18:59
	→ fuchstronaut joined	19:00
	← interne7y left	19:01
avar	Generally you want to use -G instead of -S, although in this case -S does what you want	19:03
	← rahtgaz left	19:03
	→ kevwil_ joined	19:04
	← johnmilton left	19:05
	← fuchstronaut left	19:05
	← kevwil left	19:05
	← nnyk_ left	19:05
	← sweb left	19:08
	→ nwkj86 joined	19:09
	← Derperperd left	19:09
	← elementalest left	19:09
	→ star_prone joined	19:09
	→ elementalest joined	19:10
	← elementalest left	19:10
	→ elementalest joined	19:10
	← star_prone left	19:12
	→ Kulrak joined	19:13
	← Kulrak left	19:13
	→ Kulrak joined	19:13
	← nitin left	19:13
	→ star_prone joined	19:15
	→ offby1 joined	19:15
	offby1 waves	19:15
offby1	Howdy git folks. Is there some clever way to persuade git-grep to emit the _absolute_ file name of the hits that it finds?	19:16
	← rbern left	19:16
offby1	I often run git-grep in a loop, looking in many different git repositories; I'd love to be able to process the output from emacs' grep-mode	19:16
	← a3Dman left	19:16
	offby1 of course only now thinks to google, and finds http://superuser.com/questions/980922/how-to-print-absolute-paths-with-git-grep	19:17
	← emPi left	19:17
	→ Sazhen86 joined	19:18
	← Takumo left	19:19
	← kevwil_ left	19:19
	→ crayon joined	19:19
	→ robotroll joined	19:19
	→ Macaveli joined	19:20
	← nettoweb left	19:20
	→ johnmilton joined	19:20
	→ eivarv joined	19:21
	→ Takumo joined	19:21
	← Takumo left	19:21
	→ Takumo joined	19:21
	→ grawity joined	19:21
	→ dmto joined	19:23
	→ Guest66771 joined	19:24
kbs	cool (as a fellow emacs user :-)	19:25
offby1	I suspect the answer will be "use sed"	19:26
kbs	heh	19:26
offby1	which I will lower myself to, if I must	19:26
	→ alexclark joined	19:26
offby1	LIKE AN ANIMAL	19:26
	→ rbern joined	19:26
	→ shmuli joined	19:27
	→ GavinMagnus joined	19:27
	→ fabio_ joined	19:27
alexclark	im trying to use merge-file to merge disparate files and can't do it for the life of me	19:28
	does anyone know how to use that tool?	19:28
offby1	kbs: actually, sed seems to work fine, and isn't too nasty	19:29
	← phanimah1sh left	19:29
	← GavinMagnus left	19:29
offby1	e.g., searching for @retry in all my Python files:	19:29
	for d in /src//; do (cd $d; set -o pipefail; git grep -nH @retry -- '*.py' \| sed s,^,$(pwd)/, ); done	19:29
	→ MattMaker joined	19:30
	← MattMaker left	19:30
	→ MattMaker joined	19:30
	→ fahadash joined	19:30
	→ IgnitionWeb joined	19:31
alexclark	maybe its not what i need	19:31
	→ peroht joined	19:32
offby1	alexclark: I don't know, but I suspect that's a "plumbing" tool	19:32
	i.e., intended for git's internal use, not really intended for us hairy humans	19:33
	s/hairy/clumsy/	19:33
GodGinrai	offby1: `git grep whatever \| 'awk -F: '{ "git rev-parse --show-toplevel" \| getline base; print base "/" $1; }'	19:33
	← eVolutive left	19:33
offby1	GodGinrai: I think I like mine better :)	19:33
alexclark	offby1: i imagine whoever wrote it was the hairy one	19:34
offby1	My brother is a smooth man.	19:34
	← paul424 left	19:35
offby1	hm, I don't need the "pipefail"	19:36
	← Samual left	19:36
	→ irco joined	19:36
	→ cdown joined	19:37
	→ ImJune joined	19:37
	→ mehola joined	19:37
	← Spec-Chum left	19:37
GodGinrai	offby1: yours assumes a directory. Mine will work in any git repo, from anywhere in the repo. :)	19:38
	← IgnitionWeb left	19:39
offby1	GodGinrai: does that awk script run "git rev-parse" once total, or once for each line that git-grep outputs?	19:40
	→ btree joined	19:41
	→ vrishab joined	19:41
GodGinrai	offby1: every line, but you can throw the rev-parse into a BEGIN block to run it once	19:41
	← nikitasius left	19:41
GodGinrai	`git grep whatever \| 'awk -F: 'BEGIN { "git rev-parse --show-toplevel" \| getline base; } { print base "/" $1; }'`	19:42
	← mehola left	19:42
	← johnmilton left	19:42
	→ mariuscc joined	19:43
	→ GenZai joined	19:44
	→ _kreo joined	19:46
	← jmd left	19:46
	← Finnoloid left	19:46
	← bongjovi left	19:47
	→ rominronin joined	19:48
	→ eVolutive joined	19:49
	→ paul424 joined	19:49
	← texinwien_ left	19:50
	→ ZexaronS joined	19:50
	→ fuchstronaut joined	19:51
	← armyriad left	19:52
	← phaleth left	19:52
	→ Darcidride joined	19:52
	← rominronin left	19:53
	→ armyriad joined	19:54
	← fuchstronaut left	19:55
	→ jimi_sanchez joined	19:55
	→ lvns joined	19:57
	→ Alejandro-25 joined	19:57
	← jimi_ left	19:58
	← ImJune left	19:58
	← AaronMT left	19:59
	→ kyan joined	19:59
	← howdoi left	19:59
	← ExoUNX left	20:00
	→ ImJune joined	20:00
	→ boombatower joined	20:01
	→ jeremyhall_ joined	20:02
	← armyriad left	20:04
	→ mcmillhj_ joined	20:04
	← jeremyhall left	20:05
	← HappyLoa- left	20:05
	gitinfo set mode: +v	20:06
mcmillhj_	I have a branch that was merged to our dev branch, but then that commit was reverted. How can I perform that merge again? When I try to merge the normal way via: git co dev -> git merge feature I see 'Already up-to-date.'	20:06
	← cdown left	20:07
rpd	sounds like you're missing a fetch if it thinks it's up to date already	20:07
kadoban	mcmillhj_: revert the revert	20:07
mcmillhj_	kadoban: how do I do that exactly? Just git-revert with the sha1, then git push ?	20:08
	← maucar left	20:08
kadoban	mcmillhj_: Yes, git revert thesha1oftherevertcommit, and then ... whatever you want to do with it, push if you like.	20:08
	← star_prone left	20:09
mcmillhj_	kadoban: thanks, I will try that	20:09
	← Macaveli left	20:09
	→ jaguarmagenta joined	20:09
	← jayc left	20:10
mcmillhj_	kadoban: worked perfectly, thank you.	20:10
	← jaequery left	20:10
	→ invex joined	20:10
kadoban	Cool, 'welcome.	20:10
	→ boushi joined	20:11
	→ DJ_Spies joined	20:11
	← devxom left	20:11
	← eVolutive left	20:12
	→ rgrinberg joined	20:12
	← aep-shoutlet left	20:12
	← alexclark left	20:12
	→ armyriad joined	20:12
	→ a3Dman joined	20:13
	← jaguarmagenta left	20:14
	← spudowiar left	20:14
	← ArchNoob left	20:14
	← robotroll left	20:15
	← wgrant left	20:15
	← daniel_rose left	20:16
	→ HappyLoa- joined	20:17
	← maroloccio left	20:17
	← eivarv left	20:17
	→ jayc joined	20:18
	← a3Dman left	20:18
	→ PCatinean joined	20:20
	→ maroloccio joined	20:21
	← rwb left	20:21
	→ tvw joined	20:22
	← freimatz left	20:22
	→ eVolutive joined	20:24
	→ Lunatrius` joined	20:24
	← mcmillhj_ left	20:25
	→ xpk joined	20:25
	→ ajf- joined	20:25
	← btree left	20:25
	→ IgnitionWeb joined	20:25
	← IgnitionWeb left	20:26
	← ImJune left	20:26
	→ a3Dman joined	20:27
	← Lunatrius left	20:27
	Lunatrius` → Lunatrius	20:27
	← nwkj86 left	20:27
	→ Spec-Chum joined	20:28
	→ nwkj86 joined	20:28
	→ drefl joined	20:28
	→ Joel joined	20:29
Joel	if I type git tags, are they listed in the order they where made?	20:29
	← mariuscc left	20:30
	→ mariuscc joined	20:31
kadoban	I thought they're alphabetical or something. I dunno though.	20:31
	← ahmedelgabri left	20:32
	→ hahuang61 joined	20:32
	← shmuli left	20:34
	→ rominronin joined	20:35
	→ shmuli joined	20:35
	→ ImJune joined	20:37
	→ robotroll joined	20:37
	→ mehola joined	20:38
	← GenZai left	20:38
	→ Henkie joined	20:39
	→ daniel_rose joined	20:40
	→ johnmilton joined	20:40
	← Henkie left	20:41
	→ rahtgaz joined	20:41
	→ pampeho joined	20:42
	← mehola left	20:43
	← daniel_rose left	20:44
	→ vuoto joined	20:44
	→ danslo joined	20:45
	← Gitzilla left	20:47
	← lvns left	20:47
	← aguimaraes1986 left	20:50
	← danslo left	20:50
	← Sucks left	20:51
	→ xnrand joined	20:51
	← JanC left	20:51
	← fmcgeough left	20:52
	← johnmilton left	20:52
	→ JanC joined	20:52
	← synthroid left	20:53
	← PCatinean left	20:53
	← MattMaker left	20:54
	← TinkerTyper left	20:54
	→ TinkerTyper joined	20:54
	← GodGinrai left	20:56
	← skapunker left	20:57
	← jimi_sanchez left	21:00
	→ aidalgol joined	21:01
	→ aep-shoutlet joined	21:02
	← ImJune left	21:03
	→ SwiftMatt joined	21:04
	← LeBlaaanc left	21:04
	← BPL left	21:04
avar	see "man git-tag" and search for --sort	21:04
gitinfo	the git-tag manpage is available at http://jk.gs/git-tag.html	21:04
	← haribo left	21:05
	→ BPL joined	21:05
avar	Joel: ^	21:05
	→ haribo joined	21:05
	→ dsdeiz joined	21:05
	← dsdeiz left	21:05
	→ dsdeiz joined	21:05
	← vuoto left	21:07
	← inflames left	21:09
	← BSAlb left	21:09
	→ LeBlaaanc joined	21:10
	→ BSaboia joined	21:14
	← LeBlaaanc left	21:15
	← jeremyhall_ left	21:15
	→ jagob joined	21:16
	← eVolutive left	21:16
	← vrishab left	21:17
	← ambro718 left	21:17
	→ editshare-ericf joined	21:17
	→ LeBlaaanc joined	21:17
	→ texinwien_ joined	21:18
	→ xall joined	21:21
	← rahtgaz left	21:22
	← mattcen left	21:23
	← jayc left	21:23
	→ ahr3n joined	21:24
	← Tachyon_ left	21:24
	→ rkazak joined	21:26
	→ rahtgaz joined	21:26
	→ mattcen joined	21:26
	← fabio_ left	21:26
	→ fabio_ joined	21:26
	← LionsMane left	21:28
	→ eVolutive joined	21:29
	→ Charliechin joined	21:29
	← sfeinste left	21:29
	← LeBlaaanc left	21:30
	→ LeBlaaanc joined	21:30
	← rkazak left	21:30
	← LeBlaaanc left	21:31
Caelum	ugh, I have a wrong email in a commit I already pushed to master, what do I do?	21:32
osse	Caelum: either force push or create a .gitmailmap	21:33
	→ ImJune joined	21:33
	← ki0 left	21:33
vktec	But don't force push unless you are _absolutely certain_ that _nobody_ else has pulled that commit	21:33
osse	I mean .mailmap	21:33
Caelum	thank you	21:33
osse	!mailmap	21:34
	hmm	21:34
	anyway, see man git-shortlog	21:34
gitinfo	the git-shortlog manpage is available at http://jk.gs/git-shortlog.html	21:34
	← adamm left	21:34
	← darkbit left	21:35
	→ LeBlaaanc joined	21:35
	→ mellernoia joined	21:35
	← LeBlaaanc left	21:35
	→ liamonade joined	21:35
	→ jayc joined	21:36
	← le_melomane left	21:36
	← kyan left	21:36
	→ kyan joined	21:38
	→ adamm joined	21:38
	← netj left	21:39
	→ netj joined	21:39
	← byteflame left	21:40
	→ Brain joined	21:41
	→ CrypticGator joined	21:42
	← Dyonisos left	21:42
	→ skinux joined	21:42
	← CrypticGator left	21:42
	← mischat left	21:43
skinux	If I have created a local branch of a project, when I checkout that branch will it over-write the existing branch files or will it check files out to a sub-directory of hte project directory?	21:43
	→ mischat joined	21:43
osse	skinux: overwrite	21:43
	→ ImJune_ joined	21:43
skinux	How can I make it checkout the branch to a sub-directory or some way where it won't over-write the existing branch files?	21:44
	→ CrypticGator joined	21:44
	← [Brain] left	21:44
	← ImJune left	21:44
	← liamonade left	21:44
osse	man git-worktree	21:44
gitinfo	the git-worktree manpage is available at http://jk.gs/git-worktree.html	21:44
	→ cd-rum joined	21:45
osse	but the common way to do it is to just checkout the other branch, and check the previoous one back out when you need it	21:45
	→ DieguezZ joined	21:47
	← jagob left	21:47
	← xall left	21:47
	→ ImJune joined	21:47
	← ImJune_ left	21:47
	← mischat left	21:48
	← ajf- left	21:48
	← mariuscc left	21:50
	→ kpease_ joined	21:50
	← Dougie187 left	21:51
	→ fuchstronaut joined	21:51
	← kpease left	21:52
	← tvw left	21:54
	← kpease_ left	21:54
	← jayc left	21:55
	→ nnyk_ joined	21:56
	→ anuxivm joined	21:56
	← fuchstronaut left	21:56
	← ahr3n left	21:56
	→ hkm joined	21:57
	→ kpease joined	21:57
Caelum	osse: oh looks like I needed this anyway, because half of my history uses a different email address	21:57
	← fission6 left	21:58
	→ zumba_addict joined	21:58
osse	Caelum: Pro tip: Don't set your email in ~/.gitconfig so that Git nags you to set it	21:58
	And set it per repo	21:59
	← haribo left	21:59
	← madewokherd left	22:00
Caelum	osse: this doesn't fix 'git log' output, right?	22:00
	← zumba_addict left	22:01
osse	Nop	22:02
	Just a way to make it not happen in the future	22:02
	← HappyLoa- left	22:02
	← VA3VNA left	22:02
	→ zumba_addict joined	22:02
	← DieguezZ left	22:03
	← Spec-Chum left	22:03
	← eVolutive left	22:04
	→ FelixVi joined	22:04
	→ Darcidride_ joined	22:05
	→ eVolutive joined	22:05
	← hahuang61 left	22:05
	← Darcidride left	22:06
	→ Spec-Chum joined	22:06
	← boombatower left	22:06
Caelum	meh, would be nice if it did, oh well	22:07
	← rnsanchez_ left	22:08
	→ jayc joined	22:08
Caelum	osse: in this particular case, I used my email from an organization that I later decided I no longer want to be identified with, because cunts, so I switched to my gmail address	22:08
	→ spudowiar joined	22:09
	gitinfo set mode: +v	22:09
	→ xall joined	22:09
	← griffindy left	22:09
osse	Caelum: That cunty email is etched in stone, unfortunately	22:10
	→ jaguarmagenta joined	22:10
osse	Because checksums	22:10
Caelum	heh	22:10
	→ jeffreylevesque joined	22:11
	→ liamonade joined	22:12
	← ResidentBiscuit left	22:13
	→ tvw joined	22:13
	← Lyqyd left	22:13
kadoban	xD	22:14
	→ vF3hNGxc47h8 joined	22:14
	← jaguarmagenta left	22:14
	← zivester left	22:15
	← ash_workz left	22:18
	→ jimi_ joined	22:19
	← nickthetait left	22:21
	→ xpk_ joined	22:21
	→ heroux joined	22:23
	← xpk left	22:24
	→ BSAlb joined	22:25
	← editshare-ericf left	22:26
	← ImJune left	22:27
	← BSaboia left	22:28
	→ axl__ joined	22:29
	→ rnsanchez joined	22:29
	← hkm left	22:29
	← Limes__ left	22:30
	← axl_ left	22:30
	axl__ → axl_	22:30
	→ Derperperd joined	22:30
	← xpk_ left	22:31
	← xall left	22:33
	← dminuoso left	22:34
	← axl_ left	22:34
	→ efco joined	22:34
	→ madewokherd joined	22:34
	→ nickthetait joined	22:35
	← kaldoran left	22:36
	← str left	22:37
	← Corneliu left	22:38
	→ iDanoo joined	22:39
	← iDanoo left	22:39
	→ iDanoo joined	22:39
	← texinwien_ left	22:39
	→ mehola joined	22:39
	← jayc left	22:40
	← dsdeiz left	22:41
	← paul424 left	22:42
	← mehola left	22:43
	← _kreo left	22:45
	→ adante_ joined	22:45
	← adante left	22:45
	adante_ → adante	22:46
	→ danslo joined	22:46
	→ larsxschneider joined	22:47
	← danslo left	22:51
	→ jayc joined	22:52
	→ cyan__ joined	22:52
	→ _Patrick_ joined	22:52
	→ ResidentBiscuit joined	22:54
	→ ImJune joined	22:55
	← mohabaks left	22:57
	→ ash_workz joined	22:58
	→ HappyLoa- joined	22:58
	→ interne7y joined	22:58
	← ncd\|leeN left	22:59
	→ xall joined	22:59
	→ leeN joined	23:00
	→ guampa joined	23:02
	← rbern left	23:02
	← ImJune left	23:03
	← interne7y left	23:03
	→ Gitzilla joined	23:03
	→ ChristopheT joined	23:03
	← ChristopheT left	23:03
	← catag87 left	23:05
	→ ImJune joined	23:05
	→ red_ joined	23:05
	→ catag87 joined	23:05
	→ unreal_ joined	23:06
	← catag87 left	23:06
	→ catag87 joined	23:06
	← Darcidride_ left	23:07
	→ smakarov_ joined	23:07
	← ISmithers left	23:07
	→ bluepixel joined	23:08
	← eVolutive left	23:08
	→ Darcidride joined	23:09
	← moop left	23:09
	← Darcidride left	23:09
	→ moop joined	23:10
	← smakarov__ left	23:10
	← cyan__ left	23:11
	← mcqr left	23:11
	← aep-shoutlet left	23:12
	← bluepixel left	23:12
	← CheckDavid left	23:13
	→ rkazak joined	23:13
	→ drawkula joined	23:14
	→ rbern joined	23:14
	← kyan left	23:15
	→ Tachyon_ joined	23:16
	→ idmistir joined	23:16
	← Electrom_ left	23:18
	← Jon28__ left	23:20
	← al-damiri left	23:20
	→ Jon28__ joined	23:21
	← d0nn1e left	23:21
	→ strbean joined	23:21
	gitinfo set mode: +v	23:22
strbean	hello	23:22
gitinfo	strbean: 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.	23:22
	← larsxschneider left	23:23
	→ d0nn1e joined	23:23
	→ dsdeiz joined	23:24
	← ImJune left	23:25
	← vassagus left	23:28
	→ vassagus joined	23:29
strbean	So I have the following situation: Repos A, B, and C. B and C were submodules of A. They have now been moved into repository A as subdirectories. I have a fork of B with numerous commits that were not in B at the time it was moved into A. How do I go about merging my changes into A?	23:29
	→ hahuang61 joined	23:30
	→ str joined	23:30
	→ dminuoso joined	23:30
kadoban	strbean: The subtree merging strategy. If you're going to be doing stuff like that a lot, you should use the 'git subtree' command, it's quite nice.	23:30
strbean	kadoban: thanks, I'll read up on it.	23:31
	→ ahr3n joined	23:34
	← sangy left	23:34
	← hahuang61 left	23:35
	← dminuoso left	23:37
	← vassagus left	23:37
	→ jj- joined	23:39
	← jimi_ left	23:40
	→ cqi joined	23:41
	← kpease left	23:42
	← tvw left	23:44
	← yoan left	23:44
	← Internet13 left	23:47
	← dmto left	23:48
	← Spec-Chum left	23:50
	← str left	23:51
	→ ReenignE joined	23:52
	← ReenignE left	23:52
	→ ReenignE joined	23:52
	→ fuchstronaut joined	23:52
	← shmuli left	23:52
	→ shmuli joined	23:53
	← shmuli left	23:53
	← irco left	23:54
	← rkazak left	23:56
	← nnyk_ left	23:57
	← fuchstronaut left	23:57
	→ ariver joined	23:58
	ariver → Guest49792	23:58
	← ahr3n left	23:59

Logs Search ←Prev date Next date→

Channels Documentation