IRCloggy #git 2016-12-19

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-12-19
	→ WhiskerBiscuit joined	00:00
	→ inflames joined	00:01
	← theoceaniscool left	00:01
	← rorro left	00:03
	→ buffal0 joined	00:03
	→ tobiasBora joined	00:03
	← sylario left	00:03
	← Nilesh_ left	00:04
	→ dsdeiz joined	00:04
	← howitdo left	00:05
	← WhiskerBiscuit left	00:05
	→ WhiskerBiscuit joined	00:06
	→ rangergord joined	00:07
	← venmx left	00:07
	→ mario_ joined	00:09
	→ venmx joined	00:09
	← diogenese left	00:09
	→ howitdo joined	00:10
	← bdeferme left	00:11
	→ jaguarmagenta joined	00:12
	← cagedwisdom left	00:15
	← venmx left	00:17
	→ mischat joined	00:17
	← inflames left	00:18
	← kazantip left	00:20
	→ diogenese joined	00:21
	← Limes left	00:21
	→ Goplat joined	00:22
	← mischat left	00:22
	→ arescorpio joined	00:22
	← nikivi left	00:23
	← Vampire0_ left	00:25
	← overlord_tm left	00:25
	← buffal0 left	00:25
	→ buffal0 joined	00:26
	→ cagedwisdom joined	00:28
	← Poppa left	00:28
	← Singmyr left	00:30
	← mikecmpbll left	00:30
	→ Gsham joined	00:31
	→ Shentino joined	00:32
	→ hahuang61 joined	00:32
	→ romerocesar_ joined	00:32
	→ invisbl joined	00:33
	← netj left	00:34
	← romerocesar left	00:34
	→ netj joined	00:34
	→ Vampire0_ joined	00:34
	→ bronson joined	00:35
	← romerocesar_ left	00:35
	← garethdaine left	00:36
	← invisbl left	00:36
	← buffal0 left	00:36
	← ochorocho__ left	00:37
	← hahuang61 left	00:37
	→ buffal0 joined	00:37
	← bronson left	00:40
	← buffal0 left	00:42
	← CheckDavid left	00:42
	→ romerocesar joined	00:43
	→ particleGolem joined	00:43
	← WhiskerBiscuit left	00:46
	→ WhiskerBiscuit joined	00:47
	← tobiasBora left	00:48
	→ tobiasBora joined	00:50
	← jaguarmagenta left	00:51
	→ Sample joined	00:51
	→ jaguarmagenta joined	00:52
	→ gentoo joined	00:53
	→ Darren_ joined	00:53
	← cdown left	00:55
	→ cdown joined	00:55
	← cdown left	00:56
	← King_Hual left	00:56
	← _jan left	00:57
	← netj left	00:59
	→ netj joined	01:00
	← _28_ria left	01:01
	→ _28_ria joined	01:03
	← _28_ria left	01:04
	← re1 left	01:05
	→ _28_ria joined	01:05
	← tobiasBora left	01:07
	→ dodobrain joined	01:09
	→ buffal0 joined	01:10
	← romerocesar left	01:10
	→ romerocesar joined	01:10
	← Gsham left	01:12
	→ cdown joined	01:13
	→ venmx joined	01:13
	→ rchavik joined	01:15
	← ReptilianBrain left	01:15
	← romerocesar left	01:16
	→ mischat joined	01:18
	→ realz joined	01:18
	← venmx left	01:19
	→ Noodlewitt joined	01:19
	→ romerocesar joined	01:20
	← Sample left	01:21
	← cdown left	01:21
	← Spec-Chum left	01:23
	→ tobiasBora joined	01:23
	← mischat left	01:23
	→ menip joined	01:24
	→ FederationOfNULL joined	01:24
	← [0xAA] left	01:24
	← paraparity left	01:26
	← oskarkv left	01:26
	← nwkj86 left	01:27
	← BenderRodriguez left	01:28
	→ BenderRodriguez joined	01:28
	→ whitby joined	01:29
	→ Gsham joined	01:30
	← BenderRodriguez left	01:33
	→ hahuang61 joined	01:33
	→ BenderRodriguez joined	01:33
	→ shgysk8zer0 joined	01:34
	→ cdown joined	01:34
	← hahuang61 left	01:38
	→ oskarkv joined	01:38
	← Gsham left	01:39
	← ShapeShifter499 left	01:42
	→ ShapeShifter499 joined	01:43
	→ boombatower joined	01:43
	← cdown left	01:43
	← dreiss left	01:44
	→ JJMcPhearson joined	01:44
	← bill99 left	01:45
	← rangergord left	01:49
	→ rangergord joined	01:50
	← dsdeiz left	01:51
	→ invisbl joined	01:54
	→ Poppa joined	01:54
	← Siegfried left	01:57
	→ cdg joined	01:57
	← Poppa left	01:59
	→ somaReve1 joined	02:00
somaReve1	hi, how can I git pull <remote branch> <local branch> ?	02:01
	← invisbl left	02:01
preaction	somaReve1: git pull <remote> <remote branch>:<local branch>	02:03
LordRyan	somaReve1: git checkout local-branch; git fetch origin; git merge origin/remote-branch	02:03
	or if ^^ works that's fine too i guess	02:04
	→ cqi joined	02:06
	← buffal0 left	02:07
	← kyan left	02:08
	← Darren_ left	02:08
	← gentoo left	02:09
	← d^sh left	02:09
	→ gentoo joined	02:09
	← gentoo left	02:09
	→ gentoo joined	02:09
	← gentoo left	02:10
	→ d^sh joined	02:10
	→ gentoo joined	02:10
	← gentoo left	02:10
	→ gentoo joined	02:10
	← gentoo left	02:10
	→ gentoo joined	02:11
	← _28_ria left	02:13
	→ Gsham joined	02:13
	→ _28_ria joined	02:14
	→ venmx joined	02:15
	← breezy_ left	02:15
	← QuestionTime left	02:16
	→ mischat joined	02:19
	← Noodlewitt left	02:19
	← venmx left	02:20
sonOfRa	Can I somehow set the "pager" that is used for git add -p, via some setting like core.pager?	02:23
	My core pager is diff-so-fancy, and I'd like the fancy output also when staging things	02:23
	→ Vampire0 joined	02:23
	← Gsham left	02:23
	← mischat left	02:24
	← paintenzero left	02:25
	← madewokherd left	02:25
	← Vampire0_ left	02:26
sonOfRa	Answered my own question, but for completeness' sake: interactive.diffFilter is the setting I was looking for	02:26
	→ madewokherd joined	02:27
	← tmsmith left	02:30
	→ Siegfried joined	02:30
	→ tmsmith joined	02:31
	→ gentoo_ joined	02:31
	→ Gsham joined	02:32
	← gentoo left	02:33
	← Gsham left	02:34
	→ buffal0 joined	02:34
	→ bronson joined	02:36
	← paws_ left	02:37
	← storrgie left	02:38
	← enckse left	02:38
	← pks left	02:39
	→ paraparity joined	02:39
	← bronson left	02:41
	→ pks joined	02:41
	→ enckse joined	02:41
	→ storrgie joined	02:42
	← buffal0 left	02:43
	← ilbot3 left	02:45
	← dodobrain left	02:47
	→ ilbot3 joined	02:48
	→ safe joined	02:53
	→ dodobrain joined	02:54
	← _ng left	02:54
	← gentoo_ left	02:55
	→ gentoo_ joined	02:55
	← rangergord left	02:57
	← gentoo_ left	02:57
	← dodobrain left	02:58
	← Pulp left	02:58
	→ Shakeel__ joined	02:59
somaReve1	preaction: hmm, i did 'git pull origin master:master'. It also merged to my current branch.	02:59
	← bruce_lee left	02:59
	→ bruce_lee joined	03:00
	→ xall joined	03:00
	← Shakeel_ left	03:00
	← krillr left	03:00
	← codebam left	03:00
	← Klumben left	03:00
preaction	okay, well, the docs on my version say that works	03:00
	→ krillr_ joined	03:00
	← hussam left	03:01
	→ hussam joined	03:01
	→ rafalcpp_ joined	03:01
	← averell left	03:02
	← rafalcpp left	03:02
	→ CussBot_ joined	03:03
	← CussBot left	03:03
	CussBot_ → CussBot	03:03
	← salamanderrake left	03:03
	→ ochorocho__ joined	03:03
	→ samwise[m]1 joined	03:04
	→ salamanderrake joined	03:04
	→ moop_ joined	03:04
	← JrCs left	03:04
	← Peng_ left	03:04
	← moop left	03:05
	← samwise[m] left	03:05
	← elmcrest left	03:05
	← dpower left	03:05
	moop_ → moop	03:05
	← storrgie left	03:05
	→ storrgie_ joined	03:05
	← ShapeShifter499 left	03:05
	← xall left	03:05
	← shauna left	03:06
	storrgie_ → storrgie	03:06
	← M64137[m] left	03:06
	→ JrCs joined	03:06
	→ M64137[m] joined	03:06
	→ dpower joined	03:06
	← tmsmith left	03:06
	→ shauna joined	03:07
	→ codebam joined	03:07
	→ Klumben joined	03:07
	← aw1 left	03:07
	← habbasi left	03:07
	← Bigcheese left	03:07
	← JelmerD left	03:07
	← rchavik left	03:07
	← Xarodon left	03:07
	← ixian8 left	03:07
	→ Potatoes joined	03:07
	→ Bigcheese_ joined	03:07
	← quizzi left	03:07
	→ Peng_ joined	03:07
	← ochorocho__ left	03:07
	← texasmynsted left	03:08
	← cyphase left	03:08
	→ cyphase joined	03:08
	→ JelmerD joined	03:08
	← afuentes left	03:08
	← Afforess left	03:08
	← cspotcode left	03:08
	→ aavrug joined	03:09
	→ rchavik joined	03:09
	→ texasmynsted joined	03:09
	→ quizzi joined	03:09
	→ Xarodon joined	03:10
	← ws2k3 left	03:10
	← zeller left	03:10
	→ afuentes joined	03:10
	← nilsi left	03:10
	→ tmsmith joined	03:11
	→ nilsi joined	03:11
	← nixdork left	03:12
	→ ws2k3 joined	03:12
	def_jam → eb0t	03:12
	→ Afforess joined	03:12
	→ ixian joined	03:13
	→ Noodlewitt joined	03:13
	→ nixdork joined	03:13
	← cdg left	03:14
	← chachasmooth left	03:14
	→ invisbl joined	03:15
	← netj left	03:15
	→ netj joined	03:15
	→ chachasmooth joined	03:16
	→ venmx joined	03:16
	← mostlybadfly left	03:16
	→ mostlybadfly joined	03:16
	← axisys left	03:16
	→ axisys joined	03:17
	← invisbl left	03:17
	→ lolmac_ joined	03:18
	← lolmac left	03:18
	← BlessJah left	03:19
	→ BlessJah joined	03:19
	← mtso[m] left	03:19
	→ aw1 joined	03:19
	→ mtso[m] joined	03:19
	→ mischat joined	03:20
	← ulkesh_ left	03:21
	← VladGh left	03:21
	→ VladGh_ joined	03:21
	← venmx left	03:21
	← tabakhase left	03:22
	← mei[m] left	03:23
	→ ulkesh_ joined	03:23
	→ mei[m]1 joined	03:23
	← jaafar left	03:23
	→ jaafar joined	03:24
	→ tabakhase joined	03:24
	← fcrick left	03:24
	← mischat left	03:25
	→ fcrick joined	03:25
	← compeman left	03:28
	→ QualityAddict joined	03:28
	← mrnuke left	03:28
	→ compeman joined	03:29
	→ mrnuke joined	03:29
	← CtrlC left	03:29
	→ Gsham joined	03:29
	← eycsigfy left	03:30
	← JuliusN left	03:31
	→ JuliusN joined	03:31
	→ invisbl joined	03:31
	→ CtrlC joined	03:32
	→ eycsigfy joined	03:33
	→ buffal0 joined	03:33
	← aidalgol left	03:35
	→ kyan joined	03:36
	← invisbl left	03:36
	→ fahadash joined	03:38
	→ ResidentBiscuit joined	03:38
	← LiMp^ left	03:39
	→ QuestionTime joined	03:41
	→ xall joined	03:41
	→ dodobrain joined	03:42
	← ResidentBiscuit left	03:42
	← buffal0 left	03:44
	← hexagoxel left	03:45
	→ cdg joined	03:45
	→ hexagoxel joined	03:46
	→ Gobbert joined	03:47
	← Gsham left	03:48
	→ HanClinto joined	03:48
	→ test joined	03:50
	← test left	03:50
	← QuestionTime left	03:50
	→ howdoi joined	03:51
	→ QuestionTime joined	03:51
	← moestevens left	03:52
	→ LiMp^ joined	03:54
	→ a_thakur joined	03:55
	← QuestionTime left	03:56
	→ dreiss joined	03:56
	← sunri5e left	03:59
	→ sunri5e joined	04:02
	Bigcheese_ → Bigcheese	04:03
	→ anonymus_ joined	04:03
	← anonymuse left	04:04
	← fstd left	04:04
	→ fstd joined	04:04
	→ toothe joined	04:05
toothe	I have a master branch and a branch called 'policy'. There were some changes merged to master.	04:06
	I have some changes in the 'policy' branch, that I would like to grab the updates in master. How do I merge them in?	04:06
	in other words, master and policy have gone in two different directions, and I would liek to copy over the changes from master into policy.	04:06
	(they are not on the same files)	04:06
kadoban	toothe: merge master into policy? Or rebase policy on master, depending on if history of policy has been published and depending on what you want history to look like.	04:07
	→ Limes joined	04:07
toothe	I think its called rebasing?	04:08
	so, master had changes to a file called 'core/variables.py', and policy doesn't have that file. I would like to get that, along with any other changes.	04:08
	← diogenese left	04:09
kadoban	Answer unchanged so far	04:10
toothe	https://dpaste.de/q1dw	04:10
	→ romerocesar_ joined	04:10
toothe	I do not fully understand how to resolve this. I get that its saying "You need to do something to this file to resolve the problem"	04:11
	but, I don't get how.	04:11
	← jaguarmagenta left	04:12
	← anonymus_ left	04:12
	← whitby left	04:13
	← romerocesar left	04:13
	→ Lyqyd joined	04:13
	← Limes left	04:13
	→ jaguarmagenta joined	04:13
	← romerocesar_ left	04:13
toothe	kadoban: assistance please?	04:14
	→ Vortex35 joined	04:14
toothe	nist/migrations/0001_initial.py: needs merge	04:15
	what does that mean?	04:15
	← Vortex34 left	04:16
toothe	wait, I think I got it. git rm	04:16
	← dirtyroshi left	04:16
	→ venmx joined	04:17
	← Lyqyd left	04:20
toothe	okay, I screwed up my git repo	04:21
	I need assistance???	04:21
	→ romerocesar joined	04:21
	→ mischat joined	04:21
toothe	https://dpaste.de/ngii	04:21
	I don't get what's wrong?	04:21
	← venmx left	04:22
	→ SwiftMatt joined	04:22
	→ FSadino joined	04:22
	← Gobbert left	04:23
	← FSadino left	04:23
toothe	I have no idea wha tjust happened.	04:23
	assistance?	04:23
	error: you need to resolve your current index first	04:23
	what does that mean?	04:24
	→ diogenese joined	04:25
toothe	I just did a rebase from a master, but now I can't seem to push either the master or the branch.	04:25
	→ Gsham joined	04:25
	→ FSadino joined	04:25
	← mischat left	04:25
	← Gsham left	04:26
	← gtristan left	04:26
	→ breezy_ joined	04:27
toothe	wait...fixed it.	04:27
	that was confusing.	04:27
	gitinfo set mode: +v	04:28
	→ robotroll joined	04:28
	← FSadino left	04:28
	→ FSadino joined	04:28
	← dreiss left	04:28
FSadino	What I can do when git doesn't detect changes on working dir?	04:29
	gitinfo set mode: +v	04:30
FSadino	What I have to do when git doesn't detect changed files on working dir?	04:31
	← bdonnahue left	04:31
FSadino	I changed some files on my working dir, the I do "git add *, but when I do " git status" it doesn't show any files to pull	04:32
toothe	try git add -A .	04:32
	→ cdg_ joined	04:33
FSadino	toothe: thanks in advance	04:33
	Why -A?	04:33
	← sdothum left	04:34
	← cdg left	04:34
	→ subhojit777 joined	04:35
toothe	All.	04:35
	man git-add, the -A means 'All'.	04:35
gitinfo	the git-add manpage is available at http://jk.gs/git-add.html	04:35
FSadino	Thanks again	04:35
	→ dsdeiz joined	04:36
	→ hahuang61 joined	04:36
	→ bronson joined	04:37
	→ QuestionTime joined	04:37
	← brent__ left	04:40
	← hahuang61 left	04:41
toothe	FSadino: did it work?	04:41
	← bronson left	04:42
FSadino	I can't test it because I'm on my job. Thanks for the manual	04:42
	I will report later	04:42
	→ sbulage joined	04:43
	← fstd left	04:45
	→ fstd joined	04:45
	→ AfroThundr joined	04:46
	← AfroThundr left	04:46
	← unbalanced left	04:48
FSadino	toothe: its strange because I have done always with "git add *" but now it doesn't work... Already cleaned reinitializated git repo but no efect	04:48
	← sbulage left	04:51
	→ dreiss joined	04:51
	← jaguarmagenta left	04:53
	→ jaguarmagenta joined	04:54
	← SwiftMatt left	04:54
	← dreiss left	04:58
	← bocaneri left	04:59
	→ SwiftMatt joined	04:59
	← FSadino left	05:00
	→ FSadino joined	05:01
	← FSadino left	05:03
	→ elmcrest joined	05:03
	→ ochorocho__ joined	05:04
	← alex1a left	05:07
	→ cspotcode joined	05:08
	→ dreiss joined	05:08
	← dviola left	05:08
	← ochorocho__ left	05:09
	→ zeller joined	05:10
	← Noodlewitt left	05:10
	→ Sample joined	05:16
	← dreiss left	05:17
	→ venmx joined	05:18
	→ aidalgol joined	05:20
	← Sample left	05:20
	→ mischat joined	05:22
	→ dreiss joined	05:22
	← cqi left	05:22
	← venmx left	05:23
	← tmsmith left	05:24
	← robotroll left	05:24
	← dsdeiz left	05:24
	← paraparity left	05:25
	← mand0 left	05:27
	← mischat left	05:27
	← dreiss left	05:27
	← prg3 left	05:28
	← howitdo left	05:29
	→ OwlN joined	05:30
	→ prg3 joined	05:31
llamapixel	I hve never used * but . so therefore git add .	05:31
	→ hahuang61 joined	05:33
	← OwlN left	05:33
	← arescorpio left	05:34
	→ bocaneri joined	05:34
	← Atm0spher1c left	05:35
	→ howitdo joined	05:35
	→ invisbl joined	05:36
	← invisbl left	05:38
	← SwiftMatt left	05:39
	← Cabanossi left	05:40
	→ donught joined	05:41
	→ invisbl joined	05:41
	→ Cabanossi joined	05:43
	← invisbl left	05:47
	← rchavik left	05:47
	← netj left	05:48
	→ netj joined	05:49
	→ kazantip joined	05:54
	→ freimatz joined	05:57
	→ ismithers joined	05:57
	← Khisanth left	05:59
	→ tarkus joined	06:00
	← jaguarmagenta left	06:02
	→ gtristan joined	06:03
	→ jaguarmagenta joined	06:03
	← WhiskerBiscuit left	06:04
	← fahadash left	06:05
	→ ochorocho__ joined	06:05
	→ dreiss joined	06:06
	→ rscata joined	06:07
	→ z8z joined	06:07
	→ ayogi joined	06:07
	← afuentes left	06:08
	← ochorocho__ left	06:09
	→ lordjancso joined	06:11
	→ Khisanth joined	06:12
	← dreiss left	06:12
	← menip left	06:13
	→ Nilesh_ joined	06:16
	→ ToBeCloud joined	06:17
	gitinfo set mode: +v	06:17
	→ venmx joined	06:18
	→ overlord_tm joined	06:19
	→ cqi joined	06:20
	← venmx left	06:23
	→ mischat joined	06:24
	→ dreiss joined	06:24
	→ Raging_Hog joined	06:26
	← jw4242 left	06:27
	← lightstalker left	06:27
	→ jfr joined	06:27
	← tarkus left	06:29
	← mischat left	06:29
	→ lightstalker joined	06:30
	← dreiss left	06:31
	← gtristan left	06:32
	→ tarkus joined	06:32
	→ dan2k3k4 joined	06:32
	← tarkus left	06:33
	← breezy_ left	06:35
	→ breezy_ joined	06:36
	→ OOPMan joined	06:37
	→ bronson joined	06:38
	← pothepanda left	06:39
	← freimatz left	06:40
	← parasite_ left	06:41
	← bronson left	06:43
	→ gtristan joined	06:43
	→ Macaveli joined	06:44
	→ Ovex joined	06:45
	← kyan left	06:45
	→ tarkus joined	06:47
	→ qt-x joined	06:50
	← donught left	06:52
	→ dreiss joined	06:52
	→ donught joined	06:52
	← dreiss left	06:56
	→ ThomasLocke joined	06:58
	← ThomasLocke left	06:58
	→ ThomasLocke joined	06:58
	→ kyan joined	06:58
	→ darkbit joined	06:58
	← xall left	07:00
	← dermoth left	07:00
	→ venmx joined	07:00
	→ dermoth joined	07:01
	← boombatower left	07:02
	← Ovex left	07:03
	← venmx left	07:05
	→ freimatz joined	07:07
	← dan2k3k4 left	07:07
	→ cyan__ joined	07:09
	→ vdv joined	07:09
	← shgysk8zer0 left	07:14
	← cdg_ left	07:14
	← madewokherd left	07:14
	→ cdg joined	07:15
	← cdg left	07:15
	← hahuang61 left	07:15
	→ xall joined	07:15
	→ cdg joined	07:15
	← [Saint] left	07:17
	→ rorro joined	07:17
	→ [Saint] joined	07:19
	← Goplat left	07:19
	→ JeroenT joined	07:20
	→ ogny joined	07:21
	← xall left	07:22
	← snowkidind left	07:22
	← cyan__ left	07:23
	→ zeroed joined	07:25
	→ mischat joined	07:25
	← ogny left	07:29
	← Mogget left	07:30
	→ nidr0x joined	07:30
	→ jnavila joined	07:30
	← mischat left	07:30
	← nidr0x left	07:30
	← zeroed left	07:32
	→ Endarked joined	07:35
	→ Mogget joined	07:36
	→ xall joined	07:37
	← jaafar left	07:37
	← pks left	07:37
	→ pks joined	07:38
	→ zeroed joined	07:38
	← zeroed left	07:38
	→ zeroed joined	07:38
	← svm_invictvs left	07:44
	← vdv left	07:45
	→ Sceorem joined	07:46
	← z8z left	07:48
	→ dreiss joined	07:51
	← a_thakur left	07:51
	→ aoilotr joined	07:54
aoilotr	Hello I have a question, I have to take the train and I will be offline for some hours, if I do my commits on my computer (like git add ./git commit -m "message") when I'll come back to my house will I be able to push all the commits at the same time ?	07:55
	→ invisbl joined	07:58
	← Macaveli left	07:58
osse	aoilotr: yes	07:59
	→ ogny joined	08:00
	→ venmx joined	08:01
	← Derderderd left	08:01
	← zeroed left	08:03
	← invisbl left	08:03
	→ NimeshNeema joined	08:03
	→ Derderderd joined	08:05
	→ elect joined	08:05
	← aoilotr left	08:05
	→ Maktm joined	08:05
	→ theoceaniscool joined	08:05
Maktm	i don't understand the reasoning for this answer -- https://softwareengineering.stackexchange.com/questions/69178/what-is-the-benefit-of-gits-two-stage-commit-process-staging	08:05
	→ Jackneill joined	08:05
Maktm	why can't you do the same thing with other VCSs?	08:06
	i.e. fix it all at once and commit	08:06
	← venmx left	08:06
	→ ochorocho__ joined	08:06
_ikke_	Because they don't care enough about clean commits?	08:07
	← Endarked left	08:08
_ikke_	Because they think the process is too complicated?	08:08
	Who knows	08:08
llamapixel	Are all VCS really distrubted like GIT? no	08:09
	→ Atm0spher1c joined	08:09
	← diogenese left	08:10
	← ochorocho__ left	08:10
iron_houzi	kadoban: Sorry for popping the question and ghosting you. Thanks for the help yesterday.	08:11
	→ uu joined	08:14
	→ diogenese joined	08:15
	→ zeroed joined	08:15
	← zeroed left	08:15
	→ zeroed joined	08:15
	→ hahuang61 joined	08:17
	← dreiss left	08:20
	→ jknetl joined	08:20
	→ utanapischti joined	08:20
	← hahuang61 left	08:22
	→ BadSnappa joined	08:22
	← ToBeCloud left	08:26
	← ogny left	08:26
	→ mischat joined	08:26
	← mischat left	08:27
	→ mischat joined	08:27
	← mischat left	08:27
	→ derk0pf joined	08:27
	→ a_thakur joined	08:27
	→ Singmyr joined	08:28
	→ finalbeta joined	08:29
	→ sea-gull joined	08:33
	← Siegfried left	08:35
	← zeroed left	08:35
	← djb-irc left	08:37
	→ zeroed joined	08:38
	← zeroed left	08:38
	→ zeroed joined	08:38
	← HanClinto left	08:39
	→ bronson joined	08:39
	← overlord_tm left	08:40
	→ inflames joined	08:41
	→ syg_ joined	08:42
	← Maktm left	08:42
	← bronson left	08:44
	→ PCatinean joined	08:44
	→ Balliad joined	08:44
	← Singmyr left	08:45
	→ danslo joined	08:45
	→ Gloomy joined	08:45
	← cyphase left	08:48
	← darkbit left	08:48
	→ kedare joined	08:49
	← kedare left	08:49
	→ kedare joined	08:49
	→ parasite_ joined	08:51
	→ hhee joined	08:51
	→ djb-irc joined	08:52
	→ roxlu joined	08:53
	→ cyphase joined	08:53
	→ Sample joined	08:53
	→ Singmyr joined	08:53
	→ ogny joined	08:54
	→ willlondon joined	08:57
	→ encod3 joined	08:58
	→ marcogmonteiro joined	08:59
	← LiMp^ left	09:00
	← jaguarmagenta left	09:01
	← cdg left	09:01
	→ venmx joined	09:02
	← theoceaniscool left	09:02
	→ cdg joined	09:02
	→ GavinMagnus joined	09:02
	→ chele joined	09:02
	→ _ng joined	09:05
	→ mikecmpbll joined	09:06
	← venmx left	09:06
	← zeroed left	09:07
	← GavinMagnus left	09:07
	aidalgol → DingDong	09:07
	→ ochorocho__ joined	09:08
	← ogny left	09:09
	← syg_ left	09:09
	← inflames left	09:09
	← spb left	09:10
	← cdg left	09:10
	→ kurkale6ka joined	09:11
	→ zeroed joined	09:11
	← zeroed left	09:11
	→ zeroed joined	09:11
	DingDong → aidalgol	09:13
	← subhojit777 left	09:13
	← Nitesh left	09:15
	→ subhojit777 joined	09:15
	← breezy_ left	09:16
	→ nilg joined	09:20
	← a_thakur left	09:22
	→ a_thakur joined	09:22
	← a_thakur left	09:23
	→ a_thakur joined	09:23
	← BrianJ left	09:24
	→ spb joined	09:24
	← spb left	09:24
	→ overlord_tm joined	09:26
	← Sample left	09:26
	→ spb joined	09:27
	→ Sample joined	09:28
	→ mischat joined	09:28
	→ a_thakur_ joined	09:30
	← a_thakur left	09:30
	→ clmsy joined	09:32
	← a_thakur_ left	09:33
	→ a_thakur joined	09:33
	← mischat left	09:34
	→ troulouliou_div2 joined	09:35
	← ochorocho__ left	09:36
	← freimatz left	09:36
	→ ochorocho__ joined	09:36
	→ mischat joined	09:42
	→ star_prone joined	09:42
	← finalbeta left	09:42
	→ finalbeta joined	09:43
	→ nettoweb joined	09:44
	→ dan2k3k4 joined	09:45
	← aw1 left	09:47
	→ rahtgaz joined	09:48
	← ochorocho__ left	09:49
	→ ochorocho__ joined	09:49
	← Gloomy left	09:53
	→ cdown joined	09:53
	→ onmeac joined	09:53
	→ thief joined	09:58
	← rahtgaz left	09:59
	→ hahuang61 joined	10:00
	← mischat left	10:01
	← clmsy left	10:02
	→ ferr1 joined	10:02
	→ venmx joined	10:02
	← realtime left	10:03
	→ lohfu joined	10:03
	← howitdo left	10:04
	← cdown left	10:04
	→ QwertyDragon joined	10:06
	← venmx left	10:07
	→ greeny___ joined	10:09
	← thief left	10:09
	→ howitdo joined	10:11
	← aidalgol left	10:11
	← a_thakur left	10:12
	→ a_thakur joined	10:12
	← willlondon left	10:13
	→ Serpent7776 joined	10:13
	← hahuang61 left	10:13
	→ rnsanchez joined	10:14
	→ nanga joined	10:15
	← Sample left	10:15
	← QwertyDragon left	10:16
	→ aw1 joined	10:17
	→ invisbl joined	10:18
	← danslo left	10:19
	← bouncy left	10:19
	→ CheckDavid joined	10:21
	→ realtime joined	10:21
Caelum	I was correcting an #include statement, and wanted to put both the erroneous and correct version in the commit message, but forgot that # starts a comment...	10:22
	and I already pushed it	10:22
	god dammit	10:22
	→ achadwick joined	10:22
	← invisbl left	10:23
	→ bouncy joined	10:27
	← xall left	10:27
	→ clmsy joined	10:29
	← a_thakur left	10:30
	→ a_thakur joined	10:30
	← zeroed left	10:31
	→ danslo joined	10:32
	→ inflames joined	10:33
	→ syg_ joined	10:33
	← danslo left	10:33
	← Atm0spher1c left	10:34
	→ danslo joined	10:35
	← cagedwisdom left	10:36
	→ timothy joined	10:38
	← zivester left	10:39
	← derk0pf left	10:39
	→ bronson joined	10:40
	→ sylario joined	10:42
	→ YuGiOhJCJ joined	10:42
	→ _jan joined	10:44
	← bronson left	10:45
	→ raspado joined	10:50
	← greeny___ left	10:53
	← rorro left	10:56
	← tarkus left	10:57
	→ cdown joined	10:59
	← onmeac left	11:00
	→ mikecmpb_ joined	11:01
	→ rorro joined	11:01
	→ jaguarmagenta joined	11:02
	← mikecmpbll left	11:03
	→ venmx joined	11:03
	→ mahendratech joined	11:04
	← Nilesh_ left	11:04
	← safe left	11:04
	→ Gloomy joined	11:05
	→ metachr0n joined	11:05
	→ rominronin joined	11:06
	← jaguarmagenta left	11:06
	→ cdown_ joined	11:06
	→ buffal0 joined	11:07
	← aw1 left	11:07
	← venmx left	11:08
	→ SwiftMatt joined	11:08
	← cdown left	11:09
	cdown_ → cdown	11:09
	→ los joined	11:09
	→ hahuang61 joined	11:09
	→ joki- joined	11:10
	→ re1 joined	11:11
	→ buffffal00 joined	11:12
	→ bdeferme joined	11:12
	← JeroenT left	11:12
	→ derk0pf joined	11:12
	← re1 left	11:12
	→ JeroenT joined	11:13
	← hahuang61 left	11:14
	← buffal0 left	11:14
	→ Endarked joined	11:16
	→ willlondon joined	11:16
	← JeroenT left	11:17
	→ afuentes joined	11:18
	← _Vi left	11:18
	→ _Vi joined	11:18
	→ aw1 joined	11:20
	← SwiftMatt left	11:21
	→ byte512 joined	11:22
	→ invisbl joined	11:23
	← aw1 left	11:23
	← ochorocho__ left	11:24
	→ thesha joined	11:24
	→ King_Hual joined	11:25
	← King_Hual left	11:25
	→ King_Hual joined	11:25
	← invisbl left	11:26
	← Derderderd left	11:27
	→ buffal0 joined	11:28
	← marcogmonteiro left	11:28
	← buffffal00 left	11:29
	← d0nn1e left	11:31
	→ invisbl joined	11:31
	→ hecliunyx joined	11:31
	→ d0nn1e joined	11:32
	← rominronin left	11:35
	→ SwingShock joined	11:36
	← invisbl left	11:36
	← metachr0n left	11:36
	→ metachr0n joined	11:37
	→ freimatz joined	11:39
	← danslo left	11:41
	← buffal0 left	11:45
thesha	how do i bring back changes that i done i a file? i tried git checkout commit_id file name	11:45
	← willlondon left	11:45
_ikke_	That should do	11:47
	What changes do you want to bring back?	11:47
	→ orfeo joined	11:47
orfeo	Hello!	11:47
thesha	_ikke_ : i remove braces then i staged it using git add and after that i use git commit -s -v then i checked again , it was causing extra blank line so i gone to the code and remove the single blank line and save it .now i want the file as it was earlier	11:48
	→ JeroenT joined	11:48
	→ willlondon joined	11:48
thesha	_ikke_: ??	11:50
	← mikecmpb_ left	11:50
	← MrWoohoo left	11:51
_ikke_	AS it was before the commit, or after the commit?	11:52
thesha	_ikke_: before the commit	11:52
	→ mikecmpbll joined	11:52
_ikke_	git checkout HEAD~ <file>	11:53
thesha	_ikke_: by mistaken i have already tried git checkout commit_id, will it create a problem?	11:53
	← g5pw left	11:54
_ikke_	No	11:54
	→ marcogmonteiro joined	11:55
thesha	_ikke_: O wow ..i got it back. thanks a lot :) :)	11:55
	→ ronskisika joined	11:55
_ikke_	np	11:55
	← Raging_Hog left	11:56
thesha	_ikke_: btw what is the difference between git checkout commit_id <file> and git chekout HEAD~ <file>	11:56
_ikke_	Nothing	11:56
	But perhaps you used the wrong commit id	11:57
	→ g5pw joined	11:57
	→ phanimahesh joined	11:57
_ikke_	HEAD~ is a way to describe a commit in a relative manner	11:57
	while commit_id always specifies that specific commit	11:57
thesha	_ikke_: this HEAD~ will point to current commit?	11:57
	→ delboy1978uk joined	11:58
	← rafalcpp_ left	11:58
	← los left	11:58
delboy1978uk	how do i checkout one file from another branch into my current branch?	11:58
	← rorro left	11:58
thesha	_ikke_: ??	11:59
delboy1978uk	ah its ok i figured it out	11:59
	→ deadnull joined	11:59
	← Vortex35 left	12:00
	← Singmyr left	12:00
	← phanimah1sh left	12:00
	← flavius left	12:00
	→ flavius joined	12:00
	← BadSnappa left	12:01
	→ mischat joined	12:01
	← realtime left	12:02
osse	thesha: previous	12:04
	← flavius left	12:04
	→ venmx joined	12:04
	← King_Hual left	12:04
	→ flavius joined	12:04
	→ WaReZ joined	12:04
delboy1978uk	is there a way of diffing an entire branch with another? or at least an entire folder?	12:05
	← flavius left	12:05
	→ Vampire0_ joined	12:05
	→ danslo joined	12:05
	→ satifant joined	12:05
	→ ismithers1 joined	12:05
thesha	osse: you mean latest commit?	12:05
	→ rominronin joined	12:05
	← willlondon left	12:05
osse	thesha: no	12:06
	thesha: HEAD is latest/current/whatever. HEAD~ is the one before that	12:06
	← Vampire0 left	12:06
	→ flavius joined	12:06
	← joco42 left	12:07
	← ismithers left	12:08
	← a_thakur left	12:08
	→ a_thakur_ joined	12:08
	→ dsdeiz joined	12:08
thesha	osse: by using git add , will my HEAD point to the staging area?	12:08
	← venmx left	12:08
osse	no	12:09
	← derk0pf left	12:09
	→ Singmyr joined	12:09
thesha	osse: if i do commit then only it will point?	12:09
osse	yes	12:09
thesha	osse: ok ..got it. thanks	12:10
	← diogenese left	12:10
	← marcogmonteiro left	12:10
	→ spacelord_ joined	12:10
	→ willlondon joined	12:10
	→ derk0pf joined	12:11
esc	Seveas: http://pastebin.com/y067nUCc <-- my fault or somewhere in git-spindle?	12:12
	I can file an issue, but not sure if known	12:12
	← encod3 left	12:15
	→ encod3 joined	12:16
	← gtristan left	12:16
	← danslo left	12:17
	→ jeffreylevesque joined	12:18
	→ marcogmonteiro joined	12:19
	→ danslo joined	12:19
	← askb left	12:19
	→ BadSnappa joined	12:20
	→ ochorocho__ joined	12:20
	← encod3 left	12:20
	→ manuel_ joined	12:21
	→ masuberu joined	12:22
	→ UncleCJ joined	12:22
	→ Derderderd joined	12:23
UncleCJ	Hey. Quite some time back, I did something stupid, trying to add or commit way too much binary data (PDFs...) to my repo. Then I ran git fsck, got my .git/lost-found full of somethings and forgot about it. Seems now they aren't recognizable by "file" as anything but data, is there a tutorial anywhere how I can clear up this massive mess?	12:24
	← ochorocho__ left	12:24
UncleCJ	Sorry, that would be .git/lost-found/other	12:25
selckin	is the problem that you want to rid of lostfound to free space or recover the pdfs or what	12:26
	← a_thakur_ left	12:26
	→ a_thakur joined	12:27
	← Derderderd left	12:28
	← Endarked left	12:31
	→ ufk joined	12:32
ufk	hi :)	12:32
	← aavrug left	12:32
selckin	!hi	12:32
gitinfo	[!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	12:32
ufk	i commited code in the wrong branch	12:32
	can i take a commit from one branch and apply it on another branch ?	12:32
selckin	git cherry-pick	12:33
ufk	thanks	12:33
	← Gloomy left	12:35
	→ encod3 joined	12:35
	→ re1 joined	12:35
	→ noecc joined	12:36
mar77i	is there an option for git diff to always run in a pager?	12:37
selckin	iirc it does, its the pager that exists	12:37
	→ jdelStrother joined	12:38
jdelStrother	Heya	12:38
mar77i	selckin: hmm, can I pass an option to the pager through git-diff, then?	12:39
	← joki- left	12:39
osse	mar77i: you can set LESS	12:39
selckin	.gitconfig core.pager = less	12:39
jdelStrother	Say I used to have a file in my repo called kittens.c, but I don't know what directory it was in. Is there a way of searching for commits affecting that filename?	12:39
	← star_prone left	12:39
selckin	you must be passing -F there if it exists	12:39
mar77i	osse: oh right, thanks	12:40
	← Balliad left	12:40
	→ Ahiiru joined	12:40
	← thesha left	12:40
	→ bronson joined	12:41
	← _Patrick_ left	12:41
Ahiiru	while doing git on a wordpress site, is there a way to version control the database? or just the files inside the FTP?	12:41
	← byte512 left	12:42
	← qt-x left	12:43
mar77i	osse: so uh, how would I unset -F in LESS?	12:43
	→ garethdaine joined	12:43
osse	mar77i: by not setting it. if it is set at all then git won't add its own flags	12:43
	→ Nilesh_ joined	12:43
osse	I mean if LESS is set at all	12:44
	→ joki- joined	12:44
	← rwb left	12:44
	← bronson left	12:46
	← willlondon left	12:47
	← ojdo left	12:48
delboy1978uk	can you git diff myfolder between branches	12:49
	?	12:49
	→ re1_ joined	12:50
	← re1 left	12:51
UncleCJ	selckin: Preferably I'd like to recover the pdfs, they were deleted from the worktree when the add went wrong	12:51
	→ Anticom joined	12:51
	← nilg left	12:52
Anticom	Hi all. How can i move the "root" of a branch from one branch to another? I've found this question on SO: http://stackoverflow.com/questions/10853935/change-branch-base	12:52
	i've got a bugfix-branch that's accidentally based on a release branch instead of our development branch	12:53
	← garethdaine left	12:53
Anticom	now i'd like to move it. I've tried `git checkout bugfix/... && git rebase --onto develop`but that didn't seem to do anything	12:53
	← JeroenT left	12:54
	→ WhiskerBiscuit joined	12:55
	← Ahiiru left	12:55
	manuel_ → manuels	12:55
	→ star_prone joined	12:55
	→ ojdo joined	12:55
	← orfeo left	12:57
osse	Anticom: git checkout bugfix-branch; git rebase --onto=develop release-branch	12:58
UncleCJ	selckin: By refining my google slightly I found this, will try it soon enough: https://medium.com/@CarrieGuss/how-to-recover-from-a-git-hard-reset-b830b5e3f60c#.kc58pd331	12:58
	→ davimore joined	12:58
	→ Derderderd joined	12:59
	← davimore__ left	12:59
	← spacelord_ left	12:59
	→ cdown_ joined	12:59
	→ garethdaine joined	13:00
	→ tmsmith joined	13:01
	← cdown left	13:02
	cdown_ → cdown	13:02
	→ jaguarmagenta joined	13:02
	→ SpaghettiCat joined	13:03
	← jeffreylevesque left	13:03
SpaghettiCat	Hello, I have a pattern in my .gitignore "*.d" that's meant to ignore some C++ files, but it also means the directory "init.d" is ignored. Is there a way to apply a pattern to regular files only, not directories?	13:03
	← Derderderd left	13:04
selckin	git never tracks directories	13:04
canton7	selckin, sure, but it tracks the contents of directories, and gitignore applies to directories	13:04
	→ venmx joined	13:05
osse	selckin: no but you can unignore specific names: !init.d	13:05
SpaghettiCat	selckin: yeah? If I do `git status` it says "Untracked files: etc/"	13:05
	→ JeroenT joined	13:05
	← tmsmith left	13:05
	→ _Patrick_ joined	13:05
canton7	SpaghettiCat, you can unignore init.d with '!init.d'	13:05
SpaghettiCat	hmm thanks, that's a good enough solution	13:05
	→ tmsmith joined	13:06
	→ al-damiri joined	13:06
	→ eduardas_m joined	13:07
	← jaguarmagenta left	13:07
	→ sdothum joined	13:08
	→ synthroid joined	13:08
	← raspado left	13:09
	← venmx left	13:09
	← clmsy left	13:10
	→ King_Hual joined	13:10
	← King_Hual left	13:10
	→ King_Hual joined	13:10
	→ hahuang61 joined	13:10
	→ jeffreylevesque joined	13:11
	→ GodGinrai joined	13:11
	→ johnmilton joined	13:11
	← garethdaine left	13:12
Anticom	osse: i'm getting "fatal: needed a single revision \n invalid upstream-branch release/..."	13:13
osse	Anticom: then you didn't specify the branches properly	13:13
Anticom	osse: my autocompletion can't be wrong :p	13:13
osse	!repro	13:14
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	13:14
	← a_thakur left	13:14
Anticom	osse: is this channel logged?	13:14
	it's a company repo :S	13:14
osse	it is	13:15
Anticom	can i PM you?	13:15
	← hahuang61 left	13:15
osse	either PM, or double check. do you have a local branch and remote branch by similar names?	13:15
Anticom	oh.. i guess the remote branch tracking is messed up because of svn import	13:16
	← wxg left	13:16
	← Eryn_1983_FL left	13:16
Anticom	instead of pointing to a remote branch it's referencing a single commit	13:17
osse	that's fine	13:17
	→ thesha joined	13:18
Anticom	$ git branch -avv --> "* bugfix/the-bugfix 00b57b8 [origin/bugfix/the-bugfix] <msg>"	13:18
	← cdown left	13:18
	← jeffreylevesque left	13:19
	← JeroenT left	13:20
	→ Eryn_1983_FL joined	13:21
	→ ochorocho__ joined	13:21
osse	Anticom: from the error it seems the release branch is the problem...	13:21
	→ ajf- joined	13:22
Anticom	osse: preparing a gist. just a second	13:22
	→ wxg joined	13:22
	→ JeroenT joined	13:23
	→ romerocesar_ joined	13:23
	← romerocesar left	13:23
	→ cdown joined	13:26
	← ochorocho__ left	13:26
	→ Vortex34 joined	13:27
	→ tvw joined	13:27
	← dodobrain left	13:27
thesha	I use git checkout HEAD~ <file> to bring back my changes in a file ,but when i did the changes and make it a correct patch to send,the changes are not reflecting inside the patch.	13:28
rudi_s	thesha: You need to commit the change.	13:30
thesha	rudi_s : how?	13:30
	→ JJjack joined	13:30
JJjack	hi	13:31
rudi_s	thesha: git add + git commit?	13:31
JJjack	I pulled a new branch in when merging iget	13:31
	error: The following untracked working tree files would be overwritten by checkout:	13:31
thesha	rudi_s : i did that	13:31
	← wxg left	13:31
JJjack	rm readme.md	13:32
	fatal: pathspec 'readme.md' did not match any files	13:32
rudi_s	thesha: On the correct branch? Do you have a detached head?	13:32
thesha	rudi_s : detached head??	13:32
osse	JJjack: it's untracked, so git can't delete it. do it yourself	13:32
thesha	i didn't get it	13:32
rudi_s	thesha: git status will tell you.	13:32
thesha	rudi_s : yes it is showing	13:33
rudi_s	(It's a term when you aren't on any branch so your commits seem to be lost. It happens when you run git checkout <commit> without a file.)	13:33
	thesha: It says "HEAD detached"? Then create a new branch from the current commit with git checkout -b test-branch and then use gitk --all or tig --all to verify where your current commit is.	13:33
JJjack	but I dont see anything in git status	13:34
	→ Cavallari joined	13:34
JJjack	I tried git add .	13:34
rudi_s	JJjack: Is it ignored?	13:34
JJjack	no	13:34
	→ jbitdrop joined	13:36
thesha	rudi_s : what is the second command gitk --all??	13:36
	→ ocbtec joined	13:36
rudi_s	thesha: It displays the current repository layout visualizing the branches and commits (--all displays all commits).	13:36
	→ fahadash joined	13:37
thesha	rudi_s : gitk --all says: commond not found	13:37
	← derk0pf left	13:37
thesha	s/commond/command	13:37
rudi_s	thesha: Either install it or try: git log --pretty=oneline --graph --all --decorate --abbrev-commit	13:38
	→ sdlnv joined	13:38
	← dan2k3k4 left	13:38
	→ wxg joined	13:38
	→ dan2k3k4 joined	13:39
	→ bsanford joined	13:40
	→ rtjure joined	13:40
thesha	rudi_s :i installed gitk ,the command gitk --all shows some graphical representation.Now what i have to do now?	13:41
	→ rafalcpp joined	13:42
	→ chll_ joined	13:42
	→ invisbl joined	13:42
	→ Darcidride joined	13:43
Anticom	osse: btw for !repo i'd recommend adding asciinema. That way you see what the user actually sees	13:44
gitinfo	osse: Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html	13:44
	→ Balliad joined	13:45
	→ jeffreylevesque joined	13:45
Anticom	Oh and thanks for helping me out btw :)	13:45
	← Cavallari left	13:46
	← tmsmith left	13:47
	← mischat left	13:47
thesha	rudi_s : ??	13:47
	← nettoweb left	13:49
	← rominronin left	13:49
	← Balliad left	13:50
	→ rominronin joined	13:50
	→ Balliad joined	13:51
	→ ochorocho__ joined	13:53
	← romerocesar_ left	13:53
	← ismithers1 left	13:53
	→ rominron_ joined	13:53
	→ romerocesar joined	13:54
	← rominronin left	13:54
	← invisbl left	13:54
	→ ToBeCloud joined	13:55
	gitinfo set mode: +v	13:55
	ToBeCloud → Guest85093	13:56
	← wxg left	13:56
rudi_s	thesha: You have a look where the commit occured.	13:57
	← Guest85093 left	13:57
	→ maroloccio joined	13:57
rudi_s	And if you intend to apply this change to the master branch, the simplest solution is to switch back to master (losing the commit in the process), redoing the checkout for the file, committing the changes on the master branch.	13:57
	→ OOPManZA joined	13:57
	→ ToBeCloud_ joined	13:58
	← cqi left	13:58
	gitinfo set mode: +v	13:58
	→ Derderderd joined	13:59
	← subhojit777 left	14:00
	→ cdown_ joined	14:00
	← cdown left	14:01
	cdown_ → cdown	14:01
	← OOPMan left	14:01
	→ diogenese joined	14:01
	→ wxg joined	14:02
	→ jaguarmagenta joined	14:02
	→ ExoUNX joined	14:02
	→ robnester joined	14:02
	→ rnsanchez_ joined	14:04
	← rnsanchez left	14:05
	→ venmx joined	14:05
	← Derderderd left	14:05
thesha	rudi_s :do i need to note down the SHA id?	14:06
	→ nettoweb joined	14:06
	← dan2k3k4 left	14:06
	← _Vi left	14:07
thesha	rudi_s :i was able to see the changes there in gitk what should i do now?	14:07
	→ dan2k3k4 joined	14:07
	← diogenese left	14:08
	→ shgysk8zer0 joined	14:09
	→ cdown_ joined	14:09
	← ayogi left	14:09
	→ diogenese joined	14:09
	thesha → thesha\|away	14:09
	→ theoceaniscool joined	14:10
	← venmx left	14:10
	→ lmatteis joined	14:11
	→ porsche944 joined	14:11
	→ _rnsanchez_ joined	14:11
	→ rorro joined	14:11
	← cdown left	14:12
	cdown_ → cdown	14:12
	→ yogesh_ joined	14:12
	← yogesh_ left	14:12
	← jaguarmagenta left	14:13
	→ jimi_ joined	14:13
	← rnsanchez_ left	14:14
	← thesha\|away left	14:14
	→ cdown_ joined	14:15
	← JJjack left	14:16
	← shgysk8zer0 left	14:16
	← cdown left	14:17
	cdown_ → cdown	14:17
	← manuels left	14:18
	→ manuel_ joined	14:19
	← _ng left	14:19
	← nettoweb left	14:20
	← tobiasBora left	14:22
	← Balliad left	14:22
	← _rnsanchez_ left	14:22
	← ochorocho__ left	14:23
	→ rnsanchez joined	14:23
	→ _ng joined	14:26
	← cdown left	14:26
	→ cdown joined	14:26
	→ anonymuse joined	14:27
	← sdothum left	14:28
	→ nicksloan joined	14:28
	→ DolphinDream joined	14:29
DolphinDream	howdy gitsters	14:29
	← SuperLag left	14:29
	← OOPManZA left	14:30
	→ sdothum joined	14:30
	← Singmyr left	14:30
DolphinDream	i am trying to do a git rebase interactive.. adn stop for edit (e).. but I cant see the current commit changes being present in my working folder or in the stage area when the rebase stops for edit (git status does not show local changes or staged)	14:30
	any ideas what i'm doing wrong ?	14:30
moritz	they are already committed	14:31
	so 'git show' should show them	14:31
	→ Singmyr joined	14:31
moritz	you can do your changes, add them to the index, and then do a git commit --amend	14:31
DolphinDream	aha... commited behind the scene (not quite yet officially commited) ?	14:31
	→ cdg joined	14:31
DolphinDream	moritz: waht i want to do actually is to revise each commit.. as if they are in my working directory so that i can recommit them.	14:32
	← romerocesar left	14:32
	→ romerocesar joined	14:32
	→ cdown_ joined	14:32
	→ shinnya joined	14:32
	→ Dougie187 joined	14:33
DolphinDream	is there a way to do rebase interactive where each commit is dumped into the working directory and pause so i can do the edits and re-stage and recommit myself ?	14:33
	← wxg left	14:33
DolphinDream	should i rather to this with the cherry pick .. one commit at a time ?	14:33
	← rishi left	14:34
	→ Balliad joined	14:34
	→ rishi joined	14:34
	→ willlondon joined	14:34
kadoban	DolphinDream: Is it really any harder to --amend ?	14:34
	← cdown left	14:35
	cdown_ → cdown	14:35
	→ perlpilot joined	14:35
kadoban	If you want, there's a way to just undo a commit and leave it in working directory ... what is it, git reset HEAD~1 maybe? Wouldn't trust that, I haven't slept in a while, but it's one of those.	14:35
DolphinDream	kadoban: you suggest to do --amend for each of the (multiple) commits i rebase ?	14:35
kadoban	DolphinDream: Sure?	14:36
DolphinDream	kadoban: I want to see the files that are modified by each commit.. so i can make slight changes. but when the interactive rebase stops it does not show me the current commit diffs relative to the previous commit (as working dir changes) so it's hard to see what are the changes introduced by the current commit being replayed	14:36
kadoban	Fair enough. Ya, I'd do the reset thing then I guess.	14:37
	← dsdeiz left	14:37
qqx	DolphinDream: `git show` ?	14:37
	→ Derderderd joined	14:37
	← jon-mac left	14:38
	→ Gsham joined	14:38
	← MattE left	14:38
qqx	But if you truly want to see the changes as unapplied you can use `git reset @~` to undo the commit, leaving the changes in only the working tree.	14:38
	← masuberu left	14:38
	← JeroenT left	14:39
DolphinDream	qqx sure .. that does show the diff. but what if i want to use a visual editor (meld, smartgit, gitg etc) to visualize the diffs and handpick only the changes i want to include in the next commit ? If I had the files/changes not commited, but checkedout as working dir changes i can look at the changes in GUI editors and hand pick the chances i want to keep.	14:39
	→ watmm joined	14:39
	← Caelum left	14:39
osse	git difftool	14:39
	→ boombatower joined	14:39
	→ JeroenT joined	14:40
	→ Caelum joined	14:40
watmm	Hey, im getting "Protocol error" messages for files that don't exist. The files have the '@' symbol in their path for some reason. Anyone ever see this?	14:40
	← Dougie187 left	14:40
DolphinDream	osse: during the interactive rebase the difftool doesn't do anything apparently. (though git show does show me diffs)	14:40
	→ shanapu joined	14:40
	→ roelmonnens joined	14:40
	→ wxg joined	14:40
	← delboy1978uk left	14:41
osse	what stage in the rebase process are you in? a conflict? or did you mark a commit 'edit' ?	14:41
	→ koenvg joined	14:41
	→ bronson joined	14:42
	→ Dougie187 joined	14:42
	← Derderderd left	14:42
DolphinDream	osse: there is no conflict. I want to rebase interactive and remove some of the changes made in each commit. So i did a e (for edit) for each commit and expected that the rebase will pause for each commit and show the commit changes ad working dir changes that I can then edit, stage, comitt and contineu the rebase.	14:42
	→ gitterbug joined	14:42
DolphinDream	osse: the later (marked as "edit")	14:43
osse	DolphinDream: in that step the commit has already been made and you're supposed to use git commit --amend to modify it	14:43
	→ MattE joined	14:43
osse	you can do git difftool @~ then	14:43
DolphinDream	osse: sure.. i can use amend but first i need to see what files are modified.. and what are the chagnes introduced in those files relative to the previous commit so that i know what changes to keep and what to throw away.	14:43
	gitinfo set mode: +v	14:43
gitterbug	Hi -- how can I determine which commit ids were rolled up into a merge -- trying to search across all branches	14:44
	← leeN left	14:44
DolphinDream	osse: hm.. @~ ? that does something.	14:44
	what is @~ ?	14:44
osse	DolphinDream: sounds like you want to do 'git reset @q' and do the commit again	14:44
	same as HEAD~	14:44
DolphinDream	aha	14:44
	@q ?	14:44
	i know HEAD~ :)	14:45
	so the interactive commit does a commit behind the scene and only update the branch/head to point to it once you amend and continue I take?	14:46
	← Gsham left	14:46
	← nckpz left	14:46
qqx	DolphinDream,osse: I suspect that @q was a typo for @~	14:46
	← bronson left	14:46
osse	DolphinDream: yes. it informs you of this. "make your changes then do git commit --amend ..." etc.	14:46
qqx	DolphinDream: It doesn't update the branch until you finish the entire rebase process.	14:46
	→ BSaboia joined	14:47
	← mahendratech left	14:47
	→ JJjack joined	14:47
	→ saml joined	14:47
Miika--	Hello, when I do git rev-list --format="some format", I get formatted string but also some "commit hash" -formatted lines, which I do not want... how I can suppress them?	14:48
	← wxg left	14:48
	← troulouliou_div2 left	14:49
	→ bannakaffalatta joined	14:49
	→ wxg joined	14:51
	→ ketas- joined	14:52
osse	Miika--: you can u se git log	14:53
	← NimeshNeema left	14:53
	← ronskisika left	14:53
gitterbug	To rephrase my question differently, I have a large repo where the commit message is a really high level summary, and I want to drill down to the individual commit messages that were merged into the former. How can I find which commits those were?	14:53
	→ leeN joined	14:53
	← ketas left	14:53
osse	gitterbug: git log merge^1..merge	14:54
	that's the log of all commits that were merged in	14:54
	← Nilesh_ left	14:54
	→ _Vi joined	14:55
	→ BrianJ joined	14:55
koenvg	Hi! I am doing a "git rebase -i ..." to fix the author field of a few commits. However, during the second "git rebase --continue", I get this error: "fatal: empty ident name (for <unknown>) not allowed". What is causing this? I have set my own name and email in .gitconfig	14:55
	→ nickabbey joined	14:58
	← wxg left	14:59
	→ Gsham joined	14:59
	← overlord_tm left	14:59
	→ tmsmith joined	15:00
Miika--	osse: if I use git log --format="%H" -- file, is it same as git rev-list --all -- file?	15:00
	← rscata left	15:01
DolphinDream	osse: so reset HEAD~ does the trick (which unstaged the changes) but my question is why were the staged changes not listed when i do a git status ? I only see untracked files but no staged or local changes .	15:02
	← anonymuse left	15:02
	→ e14 joined	15:02
	← jimi_ left	15:02
osse	Miika--: almost. same as git rev-list HEAD -- file	15:02
	→ jimi_ joined	15:02
SwingShock	If i have a forked repository, how to update it to become the same as the one that it is forked from if it accepted another pull request.	15:02
	→ anonymuse joined	15:02
osse	DolphinDream: because there aren't any!	15:02
DolphinDream	my guess is that like people said.. the changes are already applied to a commit (which can be ammended) even though this commit is not yet officially part of the replayed history	15:02
osse	DolphinDream: like i said, the commit is already applied. you're supposed to make changes and then use --amend	15:03
	→ cdown_ joined	15:03
	→ ketas joined	15:05
	→ AaronMT joined	15:05
	→ wxg joined	15:05
	→ cdown__ joined	15:05
	← cdown left	15:05
	cdown__ → cdown	15:05
DolphinDream	osse: yeah. i got it. :) thx. the git reset HEAD~ after every replayed commit is the behavior i wanted :)	15:06
	→ venmx joined	15:06
	→ upenox joined	15:07
	← rominron_ left	15:07
	← cdown_ left	15:07
	→ invisbl joined	15:08
	← wxg left	15:09
	→ dreiss joined	15:10
	← WaReZ left	15:10
	← metachr0n left	15:11
	→ hahuang61 joined	15:11
	← venmx left	15:12
	← JeroenT left	15:12
	← ketas- left	15:12
	← ferr1 left	15:13
	→ wxg joined	15:14
	→ xall joined	15:14
	← invisbl left	15:15
	← cdown left	15:16
	← hahuang61 left	15:16
	→ Black_knight joined	15:16
	→ Black_horse joined	15:16
	← Black_knight left	15:16
	← Black_horse left	15:17
	→ nohop joined	15:17
	→ thesha joined	15:17
	→ bronson joined	15:19
	→ Spiney joined	15:20
	→ govg joined	15:20
	← theoceaniscool left	15:20
	→ ochorocho__ joined	15:20
	→ theoceaniscool joined	15:21
	← theoceaniscool left	15:21
	→ theoceaniscool joined	15:21
	← wxg left	15:22
	← evie_hammond left	15:22
nohop	hey guys. I have a weird problem with rebasing (It's also the first time i used it, so i'm probably doing something really dumb)	15:22
	I want to rebase my branch with origin/master. My local branches are in sync with those on github.	15:23
	← hhee left	15:23
	← phanimahesh left	15:23
nohop	When i do a rebase origin/master, all the changes that i made to my local branch are gone.	15:23
	(which are changes that i have pushed to the server.)	15:24
	What am I missing ?	15:24
	← bronson left	15:24
	← Balliad left	15:24
	← jknetl left	15:24
	← ochorocho__ left	15:25
	← algun left	15:25
	→ Balliad joined	15:25
nohop	(I HAVE done a rebase --abort before that, because i accidentally didn't have my branches in sync... maybe that has something to do with it?)	15:26
	→ nettoweb joined	15:27
_ikke_	nohop: Did you complete the rebase, or is it waiting for you to fix and continue?	15:27
	→ cdown joined	15:27
_ikke_	What does git status say?	15:27
	← roelmonnens left	15:27
	→ roelmonnens joined	15:28
nohop	i did not finish it. The problem is that, after i do git rebase origin/master, it seems to revert my local branch to an older commit...	15:28
	→ evie_hammond joined	15:28
nohop	as in, older than the latest on github	15:28
	→ dan joined	15:29
nohop	so, it's not finished at all :) I'm not even starting because I don't feel like re-doing everything i did :)	15:29
selckin	git fetch ?	15:29
nohop	i have	15:29
	my local branches are in sync with those on github	15:29
	→ Linux-Ninja01 joined	15:30
	→ wxg joined	15:30
nohop	_ikke_: after rebase origin/master? It says there are TONS of changes... which isn't true. Like i said, my local branch at the time of typing git rebase origin/master is exactly the same as the one on github	15:31
_ikke_	read good what git status says	15:32
	→ tobiasBora joined	15:32
	→ Ardethian\work joined	15:33
	← cdg left	15:34
	← TomyLobo left	15:34
	→ kjbrjwqsevveohhm joined	15:34
	kjbrjwqsevveohhm → dbenxwlwgigdhtyn	15:34
	dbenxwlwgigdhtyn → TomyLobo	15:34
	→ cdg joined	15:34
	← GodGinrai left	15:34
nohop	_ikke_: i'm not sure what you mean	15:35
	← Spiney left	15:35
	→ Spiney joined	15:35
nohop	it sais rebase in progress; onto 14b5af7 (which is master)	15:35
	→ ams__ joined	15:36
	← upenox left	15:36
	← cdown left	15:36
nohop	that doesn't explain why it reverts my local branch to an old commit, which is neither the latest of the branch i'm working on, NOR the latest master branch	15:36
	← gitterbug left	15:36
_ikke_	The rebase is still in progress	15:37
	It ran into a conflict	15:37
nohop	hmm	15:37
	but i did git rebase --abort	15:37
	then git feth origin	15:37
_ikke_	before or after the last rebase?	15:37
nohop	then did rebase origin/master again	15:37
	ok... let me go chronologically :)	15:38
	→ Derderderd joined	15:38
	← _ng left	15:38
_ikke_	(according to git, the rebase is still in progress)	15:38
nohop	yeah, because i just did a new rebase, because i though you wanted to know what git status sais :)	15:38
	if you just wanted to know the status after i aborted it, that would be 'clean'	15:39
	→ cdown joined	15:39
	→ rmainanon joined	15:39
	← cdg left	15:39
	→ cdg joined	15:40
	→ albel727 joined	15:40
nohop	meh... whatever.. I'll just ask my boss to merge all this shit into master... This is taking way too much time now	15:41
	thanks anyways	15:41
guardian	hello, is there a syntax to synchronize a submodule to a specific SHA1 without checking it out first?	15:41
	→ cdown_ joined	15:41
	← wxg left	15:41
	→ NathanI_ joined	15:42
	→ bdonnahue joined	15:42
	← Derderderd left	15:43
	→ ResidentBiscuit joined	15:43
	← ResidentBiscuit left	15:43
	→ ResidentBiscuit joined	15:43
	← ResidentBiscuit left	15:43
	→ ResidentBiscuit joined	15:43
	← ResidentBiscuit left	15:43
	← cdown left	15:44
	cdown_ → cdown	15:44
	← Guest8417 left	15:44
	→ jasondockers joined	15:44
	jasondockers → Guest59500	15:45
	← fahadash left	15:45
	← NathanI_ left	15:45
	→ _ng joined	15:46
	→ wxg joined	15:46
	← Spiney left	15:46
	→ OOPMan joined	15:47
	→ nikivi joined	15:48
Renter	anyone know about gitlab in here? I have a stupid question	15:48
	I've been using git for two years and am still a bit fuzzy about rebase / merge	15:49
	→ Nerbrun joined	15:49
	← nikivi left	15:49
thesha	rudi_s : ping	15:49
	→ phanimahesh joined	15:49
	← bejeb left	15:50
Renter	anyway, I have a merge request active and it's saying "Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged." with a button 'rebase onto <target>', should I just click that button, do something manually with the source branch or target branch?	15:50
	mainly, if I push that button, will it affect the source branch or target branch, it says target	15:51
	← romerocesar left	15:52
	→ mischat joined	15:52
	→ Neelixx joined	15:53
	→ jaafar joined	15:53
	→ Darren_ joined	15:53
	→ bejeb joined	15:54
	→ romerocesar joined	15:54
	← Balliad left	15:54
	← Guest59500 left	15:55
	→ Guest59500 joined	15:55
	← salamanderrake left	15:56
	→ dsdeiz joined	15:56
	Guest59500 → jasondockers	15:56
rudi_s	thesha: Simplest solution is to apply the changes manually on master. Or you can note the commit it, change to master (git checkout master) and then git cherry-pick commit-id to bring that change onto the master branch.	15:56
	→ salamanderrake joined	15:57
	← danslo left	15:57
	← theoceaniscool left	15:58
	← nanga left	15:58
	→ nanga joined	15:58
	← nanga left	15:58
	→ nanga joined	15:58
	← xall left	15:59
	← rorro left	15:59
	← nickabbey left	15:59
	→ davimore_ joined	16:00
	→ danslo joined	16:01
	→ rominronin joined	16:01
	→ Black_knight joined	16:01
	← kazantip left	16:01
	← Black_knight left	16:01
	→ theoceaniscool joined	16:02
	← shinnya left	16:02
	← Ardethian\work left	16:02
thesha	rudi_s : nothing new happens,same as before. should i change the file manually?	16:03
	← chele left	16:03
	← davimore left	16:04
	← Shentino left	16:04
	→ los joined	16:04
rudi_s	thesha: Then you're doing it wrong.	16:04
	← ThomasLocke left	16:04
	← realz left	16:04
rudi_s	You have the change on the current branch (which is detached). After changing to the master branch and cherry-picking the commit, something will happen.	16:04
	→ steeze joined	16:05
	← AustinMatherne left	16:05
	→ MillerBoss joined	16:06
	← ToBeCloud_ left	16:06
	← willlondon left	16:06
thesha	rudi_s : this is what i got https://paste.fedoraproject.org/509780/	16:06
	→ AustinMatherne joined	16:06
thesha	after doing the commands you told	16:06
	→ crayon joined	16:07
	→ Shentino joined	16:07
	← satifant left	16:07
	→ venmx joined	16:07
	← tmsmith left	16:07
	← nanga left	16:07
	← crayon left	16:07
	← nettoweb left	16:08
	→ rominron_ joined	16:08
	← synthroid left	16:08
	← davimore_ left	16:08
rudi_s	thesha: So you didn't commit any changes, at least in relation to the master branch.	16:09
	→ tmz joined	16:09
	→ davimore_ joined	16:09
	← Singmyr left	16:09
rudi_s	But as I said, just perform the change you want manually while on the master branch and commit it.	16:09
	← sdlnv left	16:09
	→ rorro joined	16:09
	→ stevenxl joined	16:09
	← diogenese left	16:10
	← roelmonnens left	16:10
	→ trelane joined	16:11
	← trelane left	16:11
	→ trelane joined	16:11
	← Lea2 left	16:11
	→ sdlnv joined	16:11
	→ invisbl joined	16:11
stevenxl	Hello folks. I have a bit of a problem, and I want to get some ideas from the pros on how to fix this issue. Basically I have one branch (master) with commits (A B C D E F G), and another branch (dev) with commits (A B C D E X Y Z). I want to take the changes from dev (X Y Z) and put them in master, so that master looks like (A B C X Y Z D E F G).	16:12
	→ comps joined	16:12
	→ Singmyr joined	16:12
	→ menip joined	16:12
stevenxl	Is there a concept for what I am trying to do?	16:12
	← venmx left	16:12
	← Linux-Ninja01 left	16:12
	← Singmyr left	16:12
	→ satifant joined	16:12
	← sdlnv left	16:13
	← JJjack left	16:13
	← selckin left	16:13
	→ jaguarmagenta joined	16:14
	→ selckin joined	16:14
	→ nettoweb joined	16:14
Seveas	esc: always your fault :P	16:15
	My code has no bugs	16:15
	→ LionsMane joined	16:16
	→ dan_ joined	16:18
	dan_ → Guest39250	16:18
	← mischat left	16:18
	← Guest39250 left	16:18
	← dan left	16:18
	→ mischat joined	16:18
	→ byte512 joined	16:18
	← rtjure left	16:19
	← jaguarmagenta left	16:19
	→ nanga joined	16:19
	← los left	16:19
	→ bronson joined	16:21
	→ GodGinrai joined	16:21
	← wxg left	16:21
	← Sceorem left	16:22
	← rorro left	16:22
	← tobiasBora left	16:22
	← GodGinrai left	16:22
	→ GodGinrai joined	16:22
cjohnson	stevenxl: is your dev branch used by other people?	16:22
stevenxl	cjohnson: No.	16:22
	← govg left	16:22
	→ fahadash joined	16:23
cjohnson	well, you could rebase your dev branch	16:23
	← mischat left	16:23
cjohnson	bringing F G into dev so that X Y Z happen sequentially after F G	16:23
	then simply merge dev to master	16:23
	← lordjancso left	16:24
cjohnson	rebasing your dev branch rewrites history though which requires a force push, which you don't want to do on branches others are using	16:24
	→ gtristan joined	16:24
	← drbean left	16:24
	→ drbean joined	16:24
	→ a_thakur joined	16:25
cjohnson	if not, you can cherry pick X Y Z into master	16:25
	→ wxg joined	16:25
	→ subhojit777 joined	16:25
	← bronson left	16:25
	← QuestionTime left	16:25
stevenxl	cjohnson: thank you for both those options. If I do cherry-pick, can I "stick" the commits into master at any point, or do they go on after the current HEAD of master?	16:26
DolphinDream	how do i check the changes introduced by two commits SHA1/ SHA2 (on different branches) (one was possibly cherry picked from the other branch and perhaps even amended). I want to exclude diffs for all the commits in between SHA1 and SHA2	16:26
stevenxl	cjohnson: No one else uses the dev branch, so I think that rebasing dev from master might be the way to go.	16:26
	← steeze left	16:27
GodGinrai	stevenxl: very first sentence in the manpage for git-cherry-pick: "Given one or more existing commits, apply the change each one introduces, recording a new commit for each."	16:27
	→ rorro joined	16:28
	← e14 left	16:28
	manuel_ → manuelschneid3r	16:28
	→ steeze joined	16:28
	→ setuid joined	16:28
	→ drbean_ joined	16:29
stevenxl	GodGinrai: got it thank you	16:29
GodGinrai	DolphinDream: you want to diff the changes?	16:29
	← Vortex34 left	16:29
	← dreiss left	16:30
	← a_thakur left	16:31
	→ a_thakur joined	16:31
	← drbean left	16:31
	→ jccn joined	16:32
DolphinDream	GodGinrai: yep.. A->B->C and A->D->E .. i want to diff the changes introduced by C and E .. where E is a cherrypick of C + some amends .. i want to compare C and E without including the changes introduced by B and D	16:33
	→ ochorocho__ joined	16:33
	→ e14 joined	16:34
	→ nickabbey joined	16:34
	→ Vortex34 joined	16:35
	→ Alsino joined	16:35
GodGinrai	DolphinDream: gut instinct is telling me diff the output of git diff for each commit	16:35
	← kyan left	16:36
	← wxg left	16:36
GodGinrai	DolphinDream: for example: `diff "$(git diff B C)" "$(git diff D E)"`	16:36
Renter	I read that 'git instinct' and thought what a wonderful idea that would be	16:37
GodGinrai	the ordering of the commits might be different	16:37
	→ pkiller_ joined	16:37
	← floatingman left	16:37
GodGinrai	Renter: lol	16:37
	← tmg left	16:37
	← ochorocho__ left	16:37
	→ Lea2 joined	16:38
koenvg	How bad is it if "git fsck" complains about a repository because an author field is bad?	16:38
	→ wxg joined	16:38
_ikke_	I think it's not that bad	16:38
koenvg	I was having trouble fixing the author field, so now I wonder if it's needed at all	16:38
	→ Derderderd joined	16:38
	← dan2k3k4 left	16:39
setuid	Did my last post go through? Don't want to re-post if it did :) (having irccloud/join issues)	16:39
_ikke_	man git config, look for fsck.skipList	16:39
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	16:39
	→ floatingman joined	16:40
GodGinrai	setuid: what forum are you posting to?	16:40
_ikke_	setuid: I don't see any earlier messages from you	16:40
setuid	GodGinrai: Here, in irc... at 10:59:07am eT	16:40
	I'm trying to solve an interesting problem... git CLI on Windows, eventually run as a scheduled task, but for now, interactive. What's the best way to commit changes to a tree of data in %USERDATA%\Documents\Foo to -another- location, so if \Documents\Foo is blown away, it can be recovered easily?	16:40
	→ tobiasBora joined	16:41
GodGinrai	setuid: push to a repo?	16:41
	← rominron_ left	16:41
kadoban	setuid: git does not replace backups	16:41
_ikke_	with kadoban	16:41
koenvg	ikke: thank you, that seems like just the thing I need!	16:41
setuid	kadoban: Agreed, that's not the goal, just trying to keep some data merged and intact	16:41
GodGinrai	kadoban: _ikke_: I agree if he is doing this to backup his documents	16:41
setuid	GodGinrai: No upstream, these are Windows users, very basic understanding	16:42
	No, not to back up documents, I use rsnapshot for that (on Windows)	16:42
_ikke_	setuid: just make a full file-system copy of the repository	16:42
	that will include things like settings, ignored files, reflog, which are not covered with just pushing	16:42
setuid	I'm trying to document an easy way for users of an app to commit their ride logs (fitness app) to a local repo, where they can pull it back out later, base on date/time/etc.	16:42
	I could use SyncToy, I guess... not very robust, monolithic, but it could work	16:43
cjohnson	upstream can be another local repo setuid	16:43
	← Derderderd left	16:43
GodGinrai	^ this was my point	16:43
cjohnson	I've used that setup where I had a server that stored both the working copy and the authoritative source (bare repo)	16:43
	on my local machine I do work, push to bare source, then on the server I go into the working copy and pull from that same source	16:44
	← Vampire0_ left	16:44
setuid	Ok, so create a repo in the tree of the data I'm merging, and then create another one elsewhere on the same fs, and commit across?	16:44
	← Alsino left	16:44
	← wxg left	16:44
cjohnson	push not commit	16:44
GodGinrai	setuid: push	16:44
cjohnson	and it would be a bare copy for the authoritative one	16:44
	no working files	16:44
setuid	er, right	16:44
	→ Vampire0 joined	16:45
	← maroloccio left	16:45
	← thesha left	16:46
	← holgersson left	16:46
	← tobiasBora left	16:46
	→ misgit joined	16:47
	→ holgersson joined	16:47
	→ Travis-42 joined	16:47
	← star_prone left	16:47
	→ tobiasBora joined	16:48
Travis-42	I'm trying to figure out what went wrong with someone's merge conflict and conflict resolution. How can I see what merge conflicts were faced in the merge?	16:48
	gitinfo set mode: +v	16:48
	← kedare left	16:48
	← a_thakur left	16:49
	→ synthroid joined	16:49
GodGinrai	Travis-42: I believe `git status` tells you	16:49
	which files	16:50
	then you just check those files	16:50
	← tvw left	16:50
	→ tvw joined	16:50
	← duderonomy left	16:50
	← holgersson left	16:51
	← tvw left	16:51
Travis-42	how would I get into that state? try to check out the commit before the merge and try to perform the merge myself?	16:51
	→ wxg joined	16:52
	← jimi_ left	16:52
	→ Siegfried joined	16:52
Travis-42	I was hoping there was some command I could run on the merge commit itself	16:52
	← danslo left	16:52
GodGinrai	Travis-42: the merge commit doesn't exist if there are conflicts	16:53
Travis-42	the conflicts were resolved and the merge commit was made a while ago	16:53
	there were just problems with how they resolved the conflicts	16:53
GodGinrai	OHH	16:53
grawity	check out the first parent, and try to merge the 2nd	16:53
Travis-42	and I'm having trouble figuring out what the conflicts were, and how they resolved them :-)	16:53
grawity	then see what happens	16:53
	← ufk left	16:53
	← eduardas_m left	16:54
grawity	because Git doesn't really store much else than that	16:54
	just the state before and the state after	16:54
Travis-42	hmm, I'm surprised I can't get it to show the particular changes that the git commit author authored in resolving the conflicts, but I can work it out this way I guess	16:55
grawity	hmm, well	16:55
	`git show -3 <mergecommit>` would probably help	16:55
GodGinrai	OHHhttp://stackoverflow.com/questions/15277708/how-do-you-see-show-a-git-merge-conflict-resolution-that-was-done-given-a-mer	16:56
grawity	maybe without the -3, I forget.	16:56
GodGinrai	whoa	16:56
	not sure what just happened with my paste	16:56
	→ Gloomy joined	16:56
GodGinrai	http://stackoverflow.com/questions/15277708/how-do-you-see-show-a-git-merge-conflict-resolution-that-was-done-given-a-mer	16:56
	← wxg left	16:56
GodGinrai	^ that sounds like someone wanting to do the same thing as you	16:56
	and he accepted the answer	16:57
Travis-42	ok, this is helpful too, thanks	16:57
	→ manveru joined	16:59
	← tobiasBora left	16:59
	← nickabbey left	16:59
	→ synthroi_ joined	16:59
manveru	hey guys, is there any way to get the sha of the object a specific remote branch points to without cloning the repo?	16:59
	→ unbalanced joined	17:00
kadoban	manveru: 'git ls-remote' can tell you	17:00
	← jnavila left	17:00
	← misgit left	17:02
	→ rominron_ joined	17:02
	← theoceaniscool left	17:02
	→ wxg joined	17:03
	← synthroid left	17:03
	← howitdo left	17:04
	← rominronin left	17:05
	→ Derderderd joined	17:05
	→ fiter joined	17:06
	→ theoceaniscool joined	17:07
	→ raspado joined	17:07
	← AaronMT left	17:07
	← wxg left	17:07
	→ d0nkeyBOB joined	17:07
	→ venmx joined	17:08
	← Serpent7776 left	17:08
	→ bronson joined	17:08
	→ tyreld joined	17:09
manveru	kadoban: thanks a lot	17:09
	→ breezy_ joined	17:09
kadoban	anytime	17:10
	← bronson left	17:10
	→ hahuang61 joined	17:12
	← romerocesar left	17:12
	← ixjlyons left	17:12
	← dsdeiz left	17:12
	→ dreiss joined	17:12
	← venmx left	17:13
	← Gsham left	17:13
	→ robotroll joined	17:13
	← sLite left	17:14
	→ romerocesar joined	17:14
	→ cyan__ joined	17:15
	→ sLite joined	17:16
	← hahuang61 left	17:17
	← robotroll left	17:17
	← robattila256 left	17:17
cjohnson	ANY time?	17:17
	cjohnson makes note	17:17
	→ aard_ joined	17:19
GodGinrai	hey guys, how do I get tab-completion working for git in bash on Mac OS X?	17:19
	it doesn't seem to be working for me	17:20
	← ocbtec left	17:21
canton7	GodGinrai, https://github.com/git/git/blob/master/contrib/completion/git-completion.bash#L18	17:21
	→ maroloccio joined	17:21
	← tanuki left	17:23
	→ tanuki joined	17:23
	→ averell joined	17:24
	← lmatteis left	17:24
	← raspado left	17:24
	← jbitdrop left	17:25
	→ madewokherd joined	17:25
	→ raspado joined	17:25
	← maroloccio left	17:27
	→ algun joined	17:27
	→ Tobias_ joined	17:27
	← Tobias_ left	17:28
	→ dviola joined	17:28
	← a3Dman_ left	17:28
GodGinrai	canton7: thanks	17:29
	→ vuoto joined	17:29
	→ sea-gull_ joined	17:29
	← mikecmpbll left	17:29
	← tanuki left	17:31
	← FederationOfNULL left	17:31
	→ tanuki joined	17:32
	→ misgit joined	17:32
	gitinfo set mode: +v	17:32
	← LionsMane left	17:32
	→ crayon joined	17:33
	← dreiss left	17:33
	← misgit left	17:34
	→ govg joined	17:36
	← encod3 left	17:37
	← djb-irc left	17:38
	→ rominronin joined	17:38
	← Derderderd left	17:39
	← msonntag left	17:39
	→ a3Dman joined	17:39
	← kurkale6ka left	17:40
	→ kumarsuraj joined	17:40
	← Gloomy left	17:40
	→ msonntag joined	17:41
	← _ng left	17:42
	→ griffindy joined	17:42
	→ tang^ joined	17:42
	→ nickabbey joined	17:42
	→ thesha joined	17:46
	← unbalanced left	17:47
	→ JJjack joined	17:48
	← Anticom left	17:51
	→ jimi_ joined	17:52
	← Jupelius left	17:53
	→ Gsham joined	17:54
	← aard_ left	17:57
	→ xall joined	17:58
	→ spacelord_ joined	17:58
	← freimatz left	17:59
	→ Salander27 joined	18:00
thesha	when i run git status it shows Your branch is ahead of 'origin/master' by 6 commits.	18:00
	is it because i have not done git push?	18:00
	← JJjack left	18:01
	→ realz joined	18:01
	→ xpk joined	18:01
	← xpk left	18:01
	→ xpk joined	18:01
	→ svm_invictvs joined	18:01
	← BadSnappa left	18:01
	← _Vi left	18:01
thiago	thesha: yes	18:01
	→ garethdaine joined	18:01
	← kanyeezy left	18:02
	← shanapu left	18:02
	← garethdaine left	18:02
thesha	thiago, is it compulsory to do git push?	18:02
	→ garethdaine joined	18:02
thiago	thesha: no	18:02
	thesha: you do it if you want to	18:03
	→ dreiss joined	18:04
thesha	thiago, thanks	18:04
	← kumarsuraj left	18:05
	→ kumarsuraj joined	18:05
	→ regedit joined	18:06
	→ acetakwas joined	18:06
thesha	thiago, i am not able to do git commit	18:07
	On branch master	18:07
	Your branch is ahead of 'origin/master' by 6 commits.	18:07
	(use "git push" to publish your local commits)	18:07
	You are currently cherry-picking commit aa4f267.	18:07
	what should i do to make commmit?	18:08
	← elect left	18:09
	→ venmx joined	18:09
	→ hashpuppy joined	18:09
	← bocaneri left	18:11
	← garethdaine left	18:12
	← cmn left	18:12
	← rominronin left	18:12
	← achadwick left	18:12
	→ cmn joined	18:13
_ikke_	git cherry-pick --continue	18:13
	I guess	18:13
	← venmx left	18:13
Vampire0	thesha, as the message says, you are in the middle of a cherry-pick. Either abort ist, or continue it or finish it, then you can commit normally again	18:14
	→ jnavila joined	18:15
	→ jaguarmagenta joined	18:15
	→ stevenspasbo joined	18:15
	← griffindy left	18:17
	← thiago left	18:18
	→ Derderderd joined	18:19
	← jaguarmagenta left	18:19
	← marcogmonteiro left	18:20
thesha	_ikke_, Vampire0 : is it happening because i have created git test-branch?	18:20
	→ holgersson joined	18:21
thesha	i also tried git cherry-pick commit_id	18:21
	→ matsaman joined	18:21
	→ duderonomy joined	18:21
	→ Ufm joined	18:22
DolphinDream	scripting question.. how do I test if a file differs between two commits ? this one doesn't seem to work : if git diff $SHA1 $SHA2 -- $filename > /dev/null; then echo "the files differ"; else echo "no difference"; fi	18:24
	← Didac left	18:24
_ikke_	thesha: Don't know what you exactly did, but I don't think creating a branch has to do with it	18:24
	→ InfoTest joined	18:25
_ikke_	DolphinDream: --quiet	18:25
	← InfoTest left	18:25
_ikke_	(implies --exit-code)	18:25
	→ SwiftMatt joined	18:25
DolphinDream	_ikke_: --quiet instead of >/dev/null ?	18:25
	← subhojit777 left	18:26
_ikke_	sure, but it also implies --exit-code, which makes it exit 1 on diff	18:26
	→ InfoTest joined	18:26
DolphinDream	why do i get a "files differ" if i compare SHA1 with SHA1 ?	18:26
	← InfoTest left	18:26
	← SwiftMatt left	18:26
_ikke_	Don't know?	18:26
	→ garethdaine joined	18:26
matsaman	because they differ, probably	18:27
	← ajf- left	18:27
	← Miika-- left	18:27
	→ InfoTest joined	18:28
	← InfoTest left	18:28
	← ikrabbe left	18:29
thesha	_ikke_, i was about to bring back changes that i have done in a file ,so it was not happening ,also tried git checkout HEAD~ <file>,so i created another test-branch and switch to it ,then i did git cherry-pick commit_id	18:30
	← dsantiago left	18:32
	→ freimatz joined	18:32
	← BrianJ left	18:32
	→ Balliad joined	18:33
	→ todder joined	18:33
	→ mikecmpbll joined	18:33
	→ BrianJ joined	18:33
	→ LionsMane joined	18:33
	← BrianJ left	18:33
	→ BrianJ joined	18:34
	← BrianJ left	18:34
	→ BrianJ joined	18:34
	← BrianJ left	18:35
	→ BrianJ joined	18:35
	← BrianJ left	18:36
	→ BrianJ joined	18:36
	← BrianJ left	18:36
	→ BrianJ joined	18:37
	← BrianJ left	18:37
	→ BrianJ joined	18:38
	← BrianJ left	18:38
	→ BrianJ joined	18:38
	← nettoweb left	18:39
	← sLite left	18:39
	← BrianJ left	18:39
DolphinDream	_ikke_: i found out why :)	18:39
	→ nettoweb joined	18:40
DolphinDream	_ikke_: i was not in the root folder ... and I used the full path of the file :)	18:40
	→ vdv joined	18:40
	→ InfoTest joined	18:40
	← InfoTest left	18:41
	→ sLite joined	18:41
	→ hkandala joined	18:41
	→ InfoTest joined	18:42
	← rafalcpp left	18:42
	→ wxg joined	18:42
	→ JJjack joined	18:44
	← Derderderd left	18:45
	→ hhee joined	18:45
	← chll_ left	18:46
	← byte512 left	18:46
	→ aarobc joined	18:46
	← wxg left	18:47
DolphinDream	_ikke_: http://pastebin.com/CmHgm5X8 . any ideas why the scripts craps out after difftooling the first file? (instead of difftooling every file that is different?)	18:47
	← nickabbey left	18:47
	← JJjack left	18:48
	← rominron_ left	18:48
	→ mischat joined	18:48
	← crayon left	18:49
	→ romerocesar_ joined	18:50
	← romerocesar left	18:51
	→ jagob joined	18:52
	→ synthroid joined	18:53
	← cyan__ left	18:53
	→ nickabbey joined	18:53
	← d^sh left	18:54
	→ synthro__ joined	18:55
	→ troulouliou_div2 joined	18:55
	← synthroi_ left	18:55
	← mikecmpbll left	18:55
	→ d^sh joined	18:55
	→ doener joined	18:56
	← PCatinean left	18:56
	→ roman joined	18:57
	← synthroid left	18:58
	← vuoto left	18:59
	← govg left	18:59
	← roman left	18:59
	→ cagedwisdom joined	18:59
	→ roman joined	19:00
	← roman left	19:02
	→ roman joined	19:02
	→ orfeo joined	19:02
	→ Discovery joined	19:03
	→ Sasazuka joined	19:04
	← roman left	19:04
	→ roman joined	19:05
	→ IlNominePatre joined	19:06
	← roman left	19:07
	← garethdaine left	19:07
	→ roman joined	19:07
	← fiter left	19:07
	← roman left	19:09
	→ rominronin joined	19:09
	← theoceaniscool left	19:11
	← raspado left	19:11
	→ ixjlyons joined	19:11
	→ raspado joined	19:11
	← bannakaffalatta left	19:12
	→ M-ou-se_ joined	19:13
	→ venmx joined	19:13
	← kenansulayman left	19:13
	← IlNominePatre left	19:13
	← nd_ left	19:13
	← psyb0t left	19:13
	→ mmmikey joined	19:13
	→ kenansulayman joined	19:13
	← xall left	19:14
	→ avizmarlon joined	19:14
	→ psyb0t joined	19:14
	← Balliad left	19:14
	← venmx left	19:14
	→ nd joined	19:14
	→ IlNominePatre joined	19:15
	gitinfo set mode: +v	19:15
	← flavius left	19:15
	→ misgit joined	19:15
	← ghostlight left	19:15
avizmarlon	I found a problem in Git documentation, how can I report?	19:15
	gitinfo set mode: +v	19:16
	→ nwkj86 joined	19:16
	→ ghostlight joined	19:17
	→ govg joined	19:17
	← e14 left	19:17
	→ garethdaine joined	19:18
	→ synthroid joined	19:19
	→ dsantiago joined	19:19
	→ _Vi joined	19:19
	→ Balliad joined	19:19
	← synthro__ left	19:21
	← avizmarlon left	19:22
	→ e14 joined	19:22
	← mischat left	19:23
	→ Derderderd joined	19:24
	← deadnull left	19:24
	→ dsantiag_ joined	19:24
	← raspado left	19:24
	← Sasazuka left	19:24
	← aarobc left	19:26
	← nickabbey left	19:26
	→ Sasazuka joined	19:26
	→ aarobc joined	19:27
	← dsantiago left	19:28
	→ denisMone joined	19:29
	← Neelixx left	19:29
	← steeze left	19:30
	→ Neelixx joined	19:31
	→ aidalgol joined	19:31
	→ Atm0spher1c joined	19:32
	→ thiago joined	19:32
	← blahdodo left	19:32
	→ vuoto joined	19:33
	← Sasazuka left	19:35
	→ corn13read joined	19:35
	→ blahdodo joined	19:36
	← acetakwas left	19:36
	→ Sasazuka joined	19:36
	ugjka → UgJkA	19:37
	← sbeller left	19:37
	→ sbeller joined	19:38
	→ Singmyr joined	19:38
	→ Ahiiru joined	19:42
Ahiiru	hello there	19:42
	← manuelschneid3r left	19:42
Ahiiru	at my terminal, I'm trying to use this command: git pull origin master	19:43
	it's all good, but its asking for a certain user's password to proceed	19:43
	← e14 left	19:43
	← noecc left	19:43
Ahiiru	what is the syntax to do the pull with -my- user?	19:43
	← rominronin left	19:44
Ahiiru	so I can use my password	19:44
	← sLite left	19:44
phroa	generally you edit the URL of origin to be your username@thedomain instead	19:45
	→ sLite joined	19:45
	← Singmyr left	19:46
Ahiiru	like this? git pull user@domain/project.git origin master?	19:46
	← hhee left	19:46
Ahiiru	or without "origin"?	19:47
preaction	you could do that without "origin" yes	19:47
Ahiiru	hm ok	19:47
preaction	or you could git remote set-url origin <new url without user in it>	19:47
	→ e14 joined	19:47
	← GodGinrai left	19:48
	→ GodGinrai joined	19:49
_ikke_	Or you use a credential helper	19:49
	→ multi_io_ joined	19:50
	← GodGinrai left	19:50
	→ GodGinrai joined	19:50
	← multi_io left	19:50
	← misgit left	19:50
Ahiiru	it worked good ^^ thanks	19:51
	← vuoto left	19:51
	← thesha left	19:53
	← Ahiiru left	19:54
	← thiago left	19:54
	← sea-gull_ left	19:55
	← troulouliou_div2 left	19:55
	← finalbeta left	19:55
	→ finalbeta joined	19:55
	→ thesha joined	19:56
	→ nickabbey joined	19:56
	← doener left	19:57
	→ fling joined	19:57
	→ Sebastian joined	20:01
	← rorro left	20:01
	← Sebastian left	20:01
	→ SebastianM joined	20:02
DolphinDream	how do you cherry pick and keep the original author name ? (also in case of conflicts)	20:02
	← rnsanchez left	20:03
	→ derk0pf joined	20:03
	gitinfo set mode: +v	20:04
_ikke_	Doesn't git automatically reuse the author (but not the comitter)?	20:05
	← OOPMan left	20:07
	→ hahuang61 joined	20:07
	→ lb joined	20:07
	lb → Guest41116	20:07
SebastianM	Hey guys. Trying to push a repo to remote, getting the error "submodule paths contain changes that can not be found on any remote" although all submodules are pushed to remote. http://pastebin.com/xV4zpf3t Can somebody help? (-:	20:07
	← Guest41116 left	20:08
	← matsaman left	20:09
	→ venmx joined	20:10
	→ cdg_ joined	20:12
	→ crayon joined	20:13
	← cdg left	20:14
	→ onmeac joined	20:15
	→ cyan__ joined	20:15
	→ BrianJ joined	20:15
	← venmx left	20:16
	→ jaguarmagenta joined	20:16
	→ PresidentElect joined	20:16
PresidentElect	Is it possiible to even get git to work with ssh keys in windows?	20:16
	→ xall joined	20:16
	gitinfo set mode: +v	20:16
sbeller	SebastianM: that is an odd error message :(	20:17
SebastianM	PresidentElect: Yes, it is definitely. Are you using GitBash?	20:18
PresidentElect	SebastianM: yes	20:18
	I've generated myself a key using ssh-keygen, but it is then telling Git to use that one	20:18
	← Jackneill left	20:19
	→ Salander27_ joined	20:19
	← jaguarmagenta left	20:20
	← toothe left	20:20
	← xall left	20:22
SebastianM	PresidentElect: Unfortunately, it is some time ago that I used it. Does the second section of this page help? https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/	20:22
	← hahuang61 left	20:23
	→ Sample joined	20:24
	→ matsaman joined	20:24
	→ hahuang61 joined	20:25
	→ jbitdrop joined	20:25
PresidentElect	huh ok SebastianM! Works! Thanks. My mistake was using cmd not git bash	20:27
	→ snowkidind joined	20:27
	← jbitdrop left	20:27
	→ iamthad joined	20:27
	← Salander27 left	20:29
	← Salander27_ left	20:29
	→ irco joined	20:29
	→ Salander27 joined	20:30
	→ rominronin joined	20:31
tang^	PresidentElect: so, yes	20:31
	I use ssh keys with bash and powershell	20:31
PresidentElect	tang^: git bash will do!	20:32
tang^	VS doesn't understand keys, though so you have to drop out of VS to use git with ssh-secured repos	20:32
PresidentElect	But it appears to be ok :)	20:32
tang^	but the VS git implementation is weak so that's nbd	20:32
	→ countingdaisies joined	20:32
PresidentElect	tang^: I'm only just learning git so I want it all done via cli for now anyways	20:32
tang^	other GUIs, like SourceTree will launch ssh-agent for you	20:33
	← iamthad left	20:33
	→ iamthad joined	20:34
tang^	wow... didn't even realize this convo was in a different channel	20:34
	PresidentElect: you'll get lots of good cli help in here	20:35
	→ dodobrain joined	20:36
	← Balliad left	20:37
GodGinrai	lol	20:37
	← trobotham left	20:38
	← iamthad left	20:38
	→ iamthad joined	20:38
	← iamthad left	20:38
	→ Es0teric joined	20:39
	→ sea-gull_ joined	20:40
PresidentElect	tang^: Aye. Not using much of git though	20:40
	← finalbeta left	20:40
PresidentElect	At work it's all about the svn	20:40
	→ finalbeta joined	20:40
	→ iamthad joined	20:40
	→ rominron_ joined	20:41
	← _28_ria left	20:41
	← nettoweb left	20:42
	← emg left	20:42
	→ _28_ria joined	20:43
	← sLite left	20:43
	→ sLite joined	20:45
	→ askb joined	20:45
	→ flavius joined	20:45
	← xpk left	20:46
	← YuGiOhJCJ left	20:47
	→ ispn joined	20:48
	← rominronin left	20:48
	← kumarsuraj left	20:49
	→ dsteplight__ joined	20:49
	→ manuelschneid3r joined	20:52
	← jccn left	20:54
	← denisMone left	20:55
	→ trobotham joined	20:55
	→ maroloccio joined	20:56
	→ DieguezZ joined	20:57
	→ SwiftMatt joined	20:58
	← johnmilton left	21:00
	← Sasazuka left	21:00
	→ Balliad joined	21:01
	→ Sasazuka joined	21:01
	← d0nkeyBOB left	21:03
	→ d0nkeyBOB joined	21:03
	← d0nkeyBOB left	21:07
	→ mischat joined	21:09
	← duderonomy left	21:09
	→ howitdo joined	21:09
	← cagedwisdom left	21:10
	← finalbeta left	21:10
	← InfoTest left	21:10
	→ finalbeta joined	21:10
	← countingdaisies left	21:11
	→ synthroi_ joined	21:11
	→ aard_ joined	21:11
	→ venmx joined	21:11
	← afuentes left	21:13
	→ fatalhalt joined	21:13
	← fatalhalt left	21:13
	← Gsham left	21:13
j416	PresidentElect: git-svn is not bad if you're stuck in svn world.	21:14
	← GodGinrai left	21:15
	← synthroid left	21:15
	← jeffreylevesque left	21:16
	← venmx left	21:16
	← rominron_ left	21:16
	← Es0teric left	21:16
	← SwiftMatt left	21:18
Vampire0	PresidentElect, getting Git was the best that could happen when stuck at companies that still insist on using SVN as VCS. I always since I know Git use its git-svn subcommands as SVN client, so I use almost the full power of Git on my local side and the others can continue using plain SVN if they prefer :-)	21:18
	← howitdo left	21:19
	← onmeac left	21:19
	→ Es0teric joined	21:21
	← thesha left	21:21
j416	^ that	21:22
	→ cagedwisdom joined	21:22
	→ afuentes joined	21:23
	→ Vortex35 joined	21:23
	← Vortex34 left	21:24
	← SwingShock left	21:29
	→ kraut joined	21:30
	← jimi_ left	21:31
	← epist3me_ left	21:31
	→ epist3me joined	21:31
	← dsantiag_ left	21:32
	← syg_ left	21:34
	← Balliad left	21:35
	→ SwiftMatt joined	21:35
	epist3me → episteme	21:37
	← Discovery left	21:38
	← IlNominePatre left	21:38
	→ venmx joined	21:39
	→ alipoor90 joined	21:40
	← msonntag left	21:40
	→ msonntag joined	21:42
	← cdg_ left	21:42
	← episteme left	21:43
	→ nettoweb joined	21:44
	→ m0viefreak joined	21:44
	→ DocLivesey joined	21:47
	→ countingdaisies joined	21:47
	← freimatz left	21:48
	← nickabbey left	21:48
	→ Gsham joined	21:48
alipoor90	Hi, I'm new to VCSs, I have repo where I make small changes in many files, and often my work in not done by the end of day and I want to save changes as a commit to ensure their integrity, or I want to make other changes but I want to have a backup of the current state (and e.g. 1h later have another backup and so on, not just a single backup), what feature of git should I use for this purpose? branches or git stash? or ...?	21:51
j416	alipoor90: commit	21:51
	alipoor90: then use for example rebase to redo that into useful logical commit(s)	21:52
	→ Limes joined	21:52
llamapixel	alipoor90: are you on your own local branch as well?	21:52
alipoor90	to make them add a single commit?	21:52
	← SwiftMatt left	21:53
kadoban	alipoor90: I commit probably once every 10 minutes when I'm generating content, at least. Git can't save you from losing work until you ... tell it about the work.	21:53
	← countingdaisies left	21:53
kadoban	It should not be like an end-of-day thing.	21:53
alipoor90	for now I have a local repo which gets only updated by me, but I like to know about the right way of working with a remote repo, should I make a new local branch for my self when I'm working with remote repos?	21:53
llamapixel	http://nvie.com/posts/a-successful-git-branching-model/ \|\| https://gist.github.com/djspiewak/9f2f91085607a4859a66 alipoor90 a little bit of reading for two articles. in article two add the dmz before master	21:53
	I commit when I have an obvious solid change, refactor a few things, added a feature, purged files...	21:54
	← synthroi_ left	21:54
alipoor90	I wasn't aware that I can convert multiple commits into one	21:54
llamapixel	git status will show you how many commits you are in front or behind in case that was not known.	21:55
	→ kazantip joined	21:55
llamapixel	It never hurts to have a MyGitTest project you can do crazy things into for experience as well.	21:56
	→ WaReZ joined	21:57
	← govg left	21:58
llamapixel	alipoor90: If you grow to quite a few repos and working with people who need you to commit and push without the dmx concept, the can I go concept is great because it checks them all for you. https://github.com/stevenjack/cig	21:58
	← ExoUNX left	21:59
llamapixel	dmz*	21:59
DolphinDream	so again.. how do you compare two commits (one cherry pick of another + possibly some extra amends) to check if the sets of changes within those two commits are exactly the same ?	21:59
llamapixel	mmm cherries	22:00
alipoor90	If I have a repo with these commits: A-B-C-D-E-F-G, and I make the B and C and D a single commit to make the repo look like this A-newD-E-F-G will it change the E and F and G SHAs? as whole which operations can change SHAs of other commits?	22:00
bremner	DolphinDream: patch-id	22:00
	man git patch-id	22:00
gitinfo	the git-patch-id manpage is available at http://jk.gs/git-patch-id.html	22:00
DolphinDream	i see	22:00
texasmynsted	say I have branch, branchA and it maps to a remote origin/branchA, and I branch it to local branch branchB.	22:01
	→ GavinMagnus joined	22:01
rewt	alipoor90, yes, the SHA1 of every commit is partly dependent on the SHA1 of its parents	22:01
	← GavinMagnus left	22:01
	→ FSadino joined	22:02
alipoor90	Thanks	22:03
	← FSadino left	22:03
texasmynsted	When remote branch origin/branchA updates I should be able to update branchB with "git pull" or "git pull —rebase" from the remote without separately updating the local branchA etc, then merging local branchA into local branchB. RIght?	22:03
	← leeN left	22:04
jasondockers	kadoban, do you squash your history?	22:04
	err, commits	22:04
	→ thebope joined	22:04
rewt	texasmynsted, if branchB is only local, it won't change with "git pull"	22:04
	← DieguezZ left	22:05
kadoban	Not usually. I cleanup stuff once in a while, if they're real shit. Otherwise I just merge --no-ff all the time and consider merged braches fairly "don't bother looking here usually" material	22:05
rewt	btw "git pull" is basically just short for "git fetch; git merge"	22:05
	← mmmikey left	22:05
texasmynsted	ah, yes, you are correct.	22:05
kadoban	I find the history useful occasionally, and not distracting otherwise.	22:05
texasmynsted	Ok so I mean get merge	22:05
	← jnavila left	22:05
kadoban	(almost every commit I ever make is on a feature branch)	22:05
texasmynsted	So I should be able to merge with the remote branchA without fetching anything right?	22:06
	→ rorro joined	22:06
	→ morenoh149 joined	22:06
rewt	if you git fetch without updating local branchA, and merge branchA -> branchB, then you'll merge that old state of branchA, not the most recent	22:06
morenoh149	how do I see changes that are staged?	22:06
jasondockers	kadoban, makes sense	22:06
bremner	morenoh149: git diff --cached	22:06
kadoban	morenoh149: git diff --cached (you'd be wise to add an alias for this, it's insanely useful)	22:06
texasmynsted	for branchB, now I want to ignore that branchA exists locally.	22:07
	← rivarun left	22:07
texasmynsted	I just want to update my local-only branchB directly from the remote version of branchA.	22:07
	→ rivarun joined	22:07
	← jagob left	22:08
rewt	texasmynsted: checkout branchA; pull; checkout branchB; merge branchA	22:08
	→ romerocesar joined	22:09
	← e14 left	22:09
	← romerocesar_ left	22:09
	← Darren_ left	22:09
texasmynsted	Why when I do not care about local branchA?	22:10
	must I really do that?	22:10
	← Sasazuka left	22:11
	→ tmsmith joined	22:11
kadoban	texasmynsted: What do you actually want to do? I'm lost.	22:11
	→ macivy joined	22:11
	→ diogenese joined	22:11
rewt	texasmynsted, i guess you can: checkout branchB; fetch; merge origin/branchA	22:11
	→ watabou_ joined	22:12
	← Darcidride left	22:12
rewt	texasmynsted, but you'll have the branchA commits anyways, and branches are just pointers to commits, so not saving much by "not having local branchA"	22:12
	← watabou left	22:12
	← roxlu left	22:13
	→ rominronin joined	22:13
texasmynsted	I am trying to do this update in as few steps as possible	22:13
	fetch will fetch revisions for all branches right?	22:13
	So I really do not need to co branchA.	22:14
rewt	fetch will fetch commits/branches/tags that you don't have locally	22:14
llamapixel	!fetch vs commit	22:14
gitinfo	When you work with remote repositories, Git stores copies of the remote's branches in !tracking_branches (basically mirrors). You can use 'git fetch' to update those. If you want to actually apply changes from the remote to your checked out branch, a second step is needed, usually 'git merge' or 'git rebase'. There's also 'git pull' which combines both steps.	22:14
	→ jimi_ joined	22:14
llamapixel	sorry that was supposed to be fetch /pull	22:14
texasmynsted	yeah	22:15
	This is something that will run in a script so I want to eliminate steps that I would normally do manually	22:15
	→ emg joined	22:15
texasmynsted	so I can git fetch everything in one command	22:15
	then I can merge the changes from origin/branchA to branchA w/o checking out branchA. Then I an merge the changes from branchA to branchB.	22:16
rewt	i tend to be more verbose in scripts vs manual, because it is scripted, so it will just do it all, and when looking at the script later it's more obvious what's being done	22:16
	→ Sasazuka joined	22:16
texasmynsted	I guess I am just saving two checkouts but that is two saved commands	22:16
	→ jaguarmagenta joined	22:17
	→ zacts joined	22:17
	→ jeffreylevesque joined	22:17
	→ jccn joined	22:18
	→ Cavallari joined	22:18
	← emg left	22:20
	→ JamesBaxter joined	22:21
	← jaguarmagenta left	22:21
	→ emg joined	22:24
	← macivy left	22:26
	← DocLivesey left	22:26
	→ SwiftMatt joined	22:28
	→ buffal0 joined	22:28
	→ griffindy joined	22:28
llamapixel	Get a git hub account , or gitlab and make a test repo then go crazy in there touching fred, sam, and joe files with red green and blue branches. Use another git hub / lab account and test it as if you are two devs.	22:29
	Nothing beats that aha test environment for speed.	22:29
	← corn13read left	22:31
	← Ufm left	22:33
	← morenoh149 left	22:33
	← madewokherd left	22:34
rewt	don't even need github/gitlab; you can use a bunch of local repos	22:34
	← Cavallari left	22:35
rewt	all repos are equal as far as git is concerned, so having a "remote repo" point to a local directory is no different than having it point to somewhere in the cloud	22:35
	→ Spec-Chum joined	22:35
	← buffal0 left	22:36
	← SebastianM left	22:37
	→ chardan joined	22:39
	← nicksloan left	22:42
	← adamm left	22:43
	← maroloccio left	22:44
	→ countingdaisies joined	22:45
matthiaskrgr	so, I have a repo that I deleted all the checked out files in	22:45
	→ QuestionTime joined	22:45
osse	git checkout -- . && echo yaaay	22:45
matthiaskrgr	is there a way to do a git checkout and a git pull in the same step so that I don't have to checkout all the files and then update them again because of the pull?	22:46
	(didn't do git pull in a while)	22:46
osse	not that i know of. but why? one huge repos checkout should only take a couple of seconds	22:47
	← rominronin left	22:47
	← Es0teric left	22:47
	→ Noodlewitt joined	22:47
	→ mizu_no_oto joined	22:48
	→ macivy joined	22:48
	← joki- left	22:48
	→ Poppa joined	22:49
	← vdv left	22:49
	← countingdaisies left	22:50
	← nohop left	22:50
	← tmsmith left	22:51
	→ tmsmith joined	22:51
	→ corn13read joined	22:52
	→ mattkrea joined	22:53
llamapixel	You have a copy of the files locally, it is just updating the differences. Part of why distributed git is god	22:53
	→ romerocesar_ joined	22:56
	← romerocesar left	22:56
bremner	no, clapton is god	22:56
	← QuestionTime left	22:56
llamapixel	^^	22:56
	→ cdown_ joined	22:56
	→ nohop joined	22:57
	→ rwb joined	22:57
llamapixel	https://youtu.be/idLyobOhtO4?t=384	22:58
osse	not knopfler?	22:58
	← cdown left	22:59
	cdown_ → cdown	22:59
	← fmeerkoetter left	23:01
	→ fmeerkoetter joined	23:01
	→ MrEnergy joined	23:01
	← anonymuse left	23:02
	→ anonymuse joined	23:02
	← Sasazuka left	23:02
	← nowhere_man left	23:03
bremner	well, not according to 1970s london graffiti	23:03
	→ QuestionTime joined	23:03
	→ mellernoia joined	23:04
	← QuestionTime left	23:04
	← Dougie187 left	23:04
	→ Sasazuka joined	23:04
	← irco left	23:05
	← JamesBaxter left	23:05
	← anonymuse left	23:07
	→ peeps[lappy] joined	23:08
	← Gsham left	23:09
	← mischat left	23:09
	→ mischat joined	23:10
	→ hahuang65 joined	23:10
	→ MrWoohoo joined	23:10
	→ King_Hual` joined	23:10
	→ QuestionTime joined	23:11
	← Sasazuka left	23:12
	→ FSadino joined	23:13
	← dsteplight__ left	23:13
	← King_Hual left	23:13
	gitinfo set mode: +v	23:13
FSadino	Hello ppl	23:13
	→ Wza joined	23:13
FSadino	I'm getting a strange error while trying to use meld on mergetool	23:14
	→ Sasazuka joined	23:14
FSadino	It says meld need python 3.3 or up	23:14
	Already update to 3.5 and change it to be used as default but the error continues...	23:15
	Anyone can help?	23:15
	Thanks in advance	23:15
	← hashpuppy left	23:15
	→ Gsham joined	23:16
	→ howitdo joined	23:16
	← howitdo left	23:16
	→ howitdo joined	23:16
	← sea-gull_ left	23:16
	→ maroloccio joined	23:17
	← maroloccio left	23:17
	← sofly left	23:19
	← nanga left	23:19
	→ sofly joined	23:20
	← sofly left	23:20
	→ sofly joined	23:20
	← nettoweb left	23:20
	→ nettoweb joined	23:21
	← nettoweb left	23:21
	→ chromity joined	23:21
	→ tmg joined	23:22
	← macivy left	23:22
	→ nd_ joined	23:22
	← FSadino left	23:23
	→ FSadino joined	23:23
	→ nanga joined	23:24
	← nanga left	23:24
	→ nanga joined	23:24
	← satifant left	23:25
	← nd left	23:26
	← rmainanon left	23:26
osse	FSadino: does meld work from the command line directly?	23:26
	← romerocesar_ left	23:27
	← aarobc left	23:27
	← griffindy left	23:27
	← Sasazuka left	23:27
	← SwiftMatt left	23:28
FSadino	osse: No, same error	23:28
	→ Sasazuka joined	23:29
osse	at least we can rule git out	23:29
	→ roxlu joined	23:29
	→ romerocesar joined	23:29
FSadino	osse: didn't understand what you mean	23:29
osse	FSadino: i mean git has nothing to do with it	23:30
FSadino	No, got is not the problem. I can use kdiff3	23:30
	But I prefer meld	23:30
	*git	23:31
osse	in that case maybe you should ask #python. I at least have no idea how to debug it	23:31
	← jimi_ left	23:32
	← derk0pf left	23:32
	→ gnoirzox joined	23:33
	→ nicksloan joined	23:35
	← mattkrea left	23:39
	← Wza left	23:39
	← Sasazuka left	23:39
	→ johnmilton joined	23:39
	→ mikecmpbll joined	23:39
	→ rominronin joined	23:44
	← Limes left	23:45
	← tmsmith left	23:45
	→ ralph_ joined	23:46
FSadino	osse: thanks, I will try on python channel	23:48
	← FSadino left	23:48
	← matsaman left	23:50
	← porsche944 left	23:50
	← roxlu left	23:53
	← cdown left	23:54
	→ Sasazuka joined	23:54
	← venmx left	23:54
	← rorro left	23:55
	← johnmilton left	23:55

Logs Search ←Prev date Next date→

Channels Documentation