IRCloggy #git 2016-06-22

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-06-22
ollien	s/something like/something like this/	00:00
	cdown_ → cdown	00:00
	→ Kallis joined	00:00
	→ EvilPenguin joined	00:00
kadoban	ollien: Er, #vim, possibly? Or maybe I missed something	00:01
ollien	shoot	00:01
	thank you	00:01
kadoban	'welcome	00:01
ollien	today is very far from my day	00:01
	← guardianJ left	00:02
	→ horse joined	00:02
	→ ajf- joined	00:03
	→ texinwien joined	00:03
	← horse left	00:04
	← ajf- left	00:05
	← Rodya_ left	00:05
	← afuentes left	00:05
	→ ajf- joined	00:06
	→ romerocesar joined	00:08
	→ qpdb joined	00:10
	← texinwien left	00:10
	→ Rodya_ joined	00:10
	→ JackFruh joined	00:12
	← JackFruh left	00:12
	→ mdw_ joined	00:12
	← romerocesar left	00:13
	→ diablerouge joined	00:13
	← mdw left	00:15
	→ aidalgol joined	00:16
	→ horse joined	00:16
	← ntonjeta left	00:16
	← jimi_ left	00:17
	← aidalgol left	00:17
	← horse left	00:18
	→ nettoweb joined	00:19
	→ aidalgol joined	00:19
	← mdw_ left	00:19
	→ Lyqyd joined	00:19
	← shgysk8zer0 left	00:20
	→ tesuji_ joined	00:20
	→ mdw joined	00:20
	→ semantipc joined	00:21
	← Lyqyd left	00:24
	→ tgunr joined	00:24
	← mdw left	00:25
	→ mehola joined	00:25
	→ Kaisyu joined	00:25
	→ rubyonrailed joined	00:28
	→ fuchstronaut joined	00:29
	→ horse joined	00:29
	← ajf- left	00:30
	← mehola left	00:30
	→ mdw joined	00:30
	← horse left	00:31
	← jeffreylevesque left	00:32
	→ skirk joined	00:32
	→ jeffreylevesque joined	00:33
	← fuchstronaut left	00:35
	← StuartMI left	00:35
	← allcentury left	00:36
	← nettoweb left	00:37
	→ guardianJ joined	00:37
	→ nettoweb joined	00:38
	← guardianJ left	00:42
	← jceb_ left	00:42
	→ d0nkeyBOB joined	00:42
	→ horse joined	00:43
aidalgol	Where is the alias "!f()" syntax documented? All I can find are various blog posts with examples.	00:43
ojacobson	git help config	00:44
	or man git-config	00:44
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	00:44
ojacobson	> If the alias expansion is prefixed with an exclamation point, it will be treated as a shell command.	00:44
	the rest is in your shell of choice's documentation	00:45
	← horse left	00:45
	← diablerouge left	00:45
aidalgol	Ah, thanks. I missed that.	00:45
	→ LeBlaaan_ joined	00:46
aidalgol	So what advantage does "!f() { ... }; f" have over just "..."? (i.e. the body of the function directly)	00:47
	(This is assuming Bash.)	00:47
ojacobson	it has to do with the way bash expands arguments to aliases	00:47
	er, git expands	00:47
	alias.foo = … will run 'git foo bar baz --monkey' as 'git … bar baz --monkey', which may not be appropriate	00:48
	using a shell function lets you use $1, $2, etc, or loop over arguments, or…	00:48
	it also lets you run multiple Git commands	00:48
	passing the same args to all of them, for example, rather than only to the last one	00:48
	← LeBlaaanc left	00:49
aidalgol	Ah, that makes sense when you want to use arguments, but && outside of a function seems to work just fine.	00:49
	Er, I meant to say as opposed to just "!..." earlier. So still a shell invocation.	00:49
ojacobson	Sure. Even so, if you have any arguments, an && chain will send them all to the last operation, unmodified and unfiltered	00:50
	→ ajf- joined	00:51
	← LeBlaaan_ left	00:53
	→ thiago joined	00:53
	← _August_ left	00:53
	← eight58 left	00:53
	→ eka joined	00:54
ojacobson	I have prune-merged = "!f() { git for-each-ref refs/heads/* --merged \| while read hash type ref; do branch=\"$(git rev-parse --abbrev-ref \"${ref}\")\"; git branch -d \"${branch}\"; done; }; f" for example	00:54
	I never want to deal with arguments, and rather than keeping that in my head, the shell function protects me from myself	00:54
	→ _August_ joined	00:54
aidalgol	But for something more trivial and without variables, such as "!git stash && git pull && git stash pop", just ! is safe?	00:55
ojacobson	define safe	00:55
	← EvilPenguin left	00:55
	→ hahuang65 joined	00:55
ojacobson	I mean, if you pass it any args, they're going to `git stash pop`, regardless of wheher that makes any sense	00:56
aidalgol	I'm not going to get bitten by expansion or substitution bugs.	00:56
	→ fstd_ joined	00:56
aidalgol	ah, then no, not safe.	00:56
	→ horse joined	00:56
	← hahuang61 left	00:56
	← horse left	00:58
	← ajf- left	00:59
	fstd_ → fstd	01:00
	→ Dougie187 joined	01:00
	← mdw left	01:00
	→ ajf- joined	01:02
	→ zivester joined	01:02
	← hahuang65 left	01:03
	→ hahuang65 joined	01:03
	← ahr3n left	01:05
	← FuzzySockets left	01:08
	→ guardianJ joined	01:08
	→ ome joined	01:10
	→ FuzzySockets joined	01:10
	→ horse joined	01:10
	→ johnflux joined	01:11
	← ajf- left	01:11
	→ GandalfTheWizard joined	01:12
	← horse left	01:12
johnflux	In my project, if I do: git submodules init && git submodules update I get a permission denied error. I have to then edit .git/config and edit the submodule url = ssh://.... to add my username like: url = ssh://johnflux@...	01:12
	→ ajf- joined	01:12
johnflux	is there another way that I should add the username for ssh?	01:12
	← ajf- left	01:12
	→ dreiss joined	01:13
	← GandalfTheWizard left	01:13
	→ bluepixel joined	01:13
	→ btree joined	01:14
	← btree left	01:15
	← xall left	01:17
	→ eletuchy joined	01:17
	→ BombStrike joined	01:17
	← semantipc left	01:18
	→ felixjet joined	01:18
	← barteks2x left	01:19
	← eletuchy_ left	01:19
	→ eletuchy_ joined	01:21
	← eletuchy left	01:22
	← guardianJ left	01:22
	→ GandalfTheWizard joined	01:23
	→ horse joined	01:24
	→ eletuchy joined	01:25
	← horse left	01:26
	← eletuchy_ left	01:26
	→ Asiajey joined	01:27
	← Asiajey left	01:27
	→ Asiajey joined	01:27
	→ lindenle joined	01:27
	← rkazak left	01:28
	→ d0nn1e joined	01:28
	→ eletuchy_ joined	01:29
	← jstimm_ left	01:29
	← eletuchy left	01:30
	← nettoweb left	01:31
	→ eletuchy joined	01:32
	← lindenle left	01:32
	← hashpuppy left	01:32
	← eletuchy_ left	01:33
	→ eletuchy_ joined	01:35
	← eletuchy left	01:37
	→ fracting joined	01:37
	→ horse joined	01:37
	→ eletuchy joined	01:37
	→ eletuch__ joined	01:39
	← dreiss left	01:39
	← horse left	01:39
	→ cqi joined	01:39
	← eletuchy_ left	01:40
	→ david007 joined	01:40
	→ eletuchy_ joined	01:41
	→ jaguarmagenta joined	01:41
	← fracting left	01:41
	← eletuchy left	01:42
	→ eletuchy joined	01:42
	← eletuch__ left	01:43
	→ gkatsev joined	01:43
	→ eletuch__ joined	01:44
	← jaguarmagenta left	01:45
	← eletuchy_ left	01:45
	→ rkazak joined	01:46
	→ eletuchy_ joined	01:46
	← eletuchy left	01:47
	→ eletuchy joined	01:48
	← eletuch__ left	01:49
	→ ilbot3 joined	01:49
	→ eletuch__ joined	01:50
	→ Wulf4 joined	01:50
	→ liuzhen joined	01:50
	← Asiajey left	01:51
	→ horse joined	01:51
	← eletuchy_ left	01:51
	← maestrojed left	01:52
	← eletuchy left	01:53
	← horse left	01:53
	← aax left	01:53
	Wulf4 → Wulf	01:53
	→ EvilPenguin joined	01:53
	→ fracting joined	01:54
	→ eight58 joined	01:56
	→ pks joined	01:57
	→ backnforth joined	01:58
	→ _28_ria joined	02:00
	→ mns joined	02:01
	→ drbean_ joined	02:01
	← CheckDavid left	02:02
	← gkatsev left	02:02
	→ gkatsev joined	02:03
	← ToBeCloud left	02:04
	→ horse joined	02:04
	← horse left	02:06
	→ DolphinDream joined	02:07
	→ Lye383r7 joined	02:10
	← rkazak left	02:13
	→ chachasmooth joined	02:13
	← Kallis left	02:14
	← Lye383r7 left	02:16
	← d0nkeyBOB left	02:17
	→ sagerdearia joined	02:17
	→ xall joined	02:18
	→ horse joined	02:18
	→ mda- joined	02:18
	← horse left	02:19
	← _August_ left	02:20
	→ _August_ joined	02:20
	→ nettoweb joined	02:20
	→ safe joined	02:20
	→ st0opkid joined	02:22
	← diegoviola left	02:26
	→ mehola joined	02:26
	→ Motoko joined	02:28
	← Motoko left	02:28
	→ Motoko joined	02:28
	← annoymouse left	02:29
	→ fuchstronaut joined	02:30
	← xall left	02:30
	← mehola left	02:31
	→ xall joined	02:31
	→ horse joined	02:32
	→ pwnz0r joined	02:32
	← horse left	02:33
	→ dreiss joined	02:35
	← fuchstronaut left	02:35
	→ lindenle joined	02:35
	← xall left	02:36
	→ durham joined	02:39
	← efdetonator left	02:41
	← espindola left	02:42
	← sdothum left	02:43
	→ hexagoxel joined	02:44
	→ mmlb joined	02:45
	→ horse joined	02:45
	→ tristanp joined	02:46
	→ Goplat joined	02:46
	→ Kronuz joined	02:46
	→ jbu joined	02:47
	← horse left	02:47
jbu	all: I'd like to undo a lot of uncommitted deletes in a folder (lazy to do each file one by one) so I'd like to do it recursively or interactively. I see that I can do this using git reset -- ./, but this removes it from index, but doesn't undo the delete on the filesystem. Anyone know what I ought to do?	02:49
kadoban	jbu: Are the deletes the only uncommited changes?	02:49
jbu	kadoban, they are uncommited and currently in my "changes not staged for commit"	02:50
kadoban	jbu: Are they the only changes though? There's nothing else you want to keep, right?	02:50
jbu	kadoban, no, there are other changes I wish to keep, so I don't want to just blow away the whole local branch	02:51
kadoban	jbu: Are the other changes you want to keep all commited, or are some uncommited?	02:51
jbu	kadoban, the files I wish to keep I've managed to keep in the "committed" section, and the ofiles I wish to undo-delete are in my not-staged-to-delete section	02:52
kadoban	jbu: Make a backup just in case (just make a copy of the entire directory). And then you can do something like 'git checkout .' should work	02:53
	← mda- left	02:53
	← xaviergmail left	02:53
jbu	kadoban, I appreciate your help. This assumes that I have a manageable number of files localized to a small number of folders, right? Just for future knowledge, what if I had many many files I wished to keep spreading across many many folders making it really annoying to physically copy?	02:54
	→ xaviergmail joined	02:54
kadoban	jbu: You can make a backup of any repository by just copying the whole thing, it's just files. It doesn't really assume they're a manageable number. I guess it assumes that you have enough hard drive space to double the size of the thing, but it's only temporary.	02:55
	→ axiom_1 joined	02:56
kadoban	I asked you to make a backup just because if you misunderstood what I was asking above (about uncommited changes), the checkout command can lose you a lot of work	02:56
	I think we are understanding each other, but I wouldn't 100% bet on it, so ... it's a safety measure.	02:56
jbu	kadoban, and then I copy the changed files one by one back into the new local repository, right?	02:56
	ah!	02:57
kadoban	jbu: No, the backup is just so if something goes wrong you have it. The only command you actually need is the checkout one, that'll bring back the deleted files from the current commit.	02:57
jbu	kadoban, I did misunderstand what you said...I didn't notice the period in git checkout...yes this worked perfectly	02:57
	← italoacasas left	02:57
jbu	I didn't realize checkout worked on folders	02:57
	kadoban, thanks a lot!	02:57
kadoban	Ah, good. Yep, it does. 'welcome	02:57
	→ horse joined	02:59
	← pwnz0r left	02:59
	→ NeXTSUN joined	03:00
	← horse left	03:01
	← nettoweb left	03:01
	← backnforth left	03:02
	→ rgrinberg joined	03:03
	→ zumba_ad_ joined	03:03
	→ aavrug joined	03:04
	→ nettoweb joined	03:06
	→ italoacasas joined	03:06
	→ espindola joined	03:07
	→ howdoi joined	03:08
	→ romerocesar joined	03:10
	→ go1111111 joined	03:10
	← safe left	03:10
	← nettoweb left	03:11
	→ horse joined	03:12
	← horse left	03:14
	← romerocesar left	03:14
	→ digidog_ joined	03:14
	→ mda1_ joined	03:16
	← digidog_ left	03:17
	← dreiss left	03:17
	→ Gsham joined	03:18
	← durham left	03:20
	→ mehola joined	03:20
	→ k3rn31 joined	03:20
	→ xlegoman joined	03:22
	← NeXTSUN left	03:24
	→ ShekharReddy joined	03:24
	→ horse joined	03:26
	→ durham joined	03:27
	← horse left	03:28
	→ dreiss joined	03:28
	← k3rn31 left	03:30
	← Dougie187 left	03:31
	→ xall joined	03:32
	→ mikecmpbll joined	03:32
	← Gsham left	03:33
	→ arescorpio joined	03:33
	→ eletuchy joined	03:33
	← EvilPenguin left	03:33
	← dreiss left	03:34
	← durham left	03:34
	→ rkazak joined	03:34
	← GandalfTheWizard left	03:34
	← eletuch__ left	03:35
	→ sangy joined	03:36
	→ hyperair joined	03:36
	→ eletuchy_ joined	03:36
	← rkazak left	03:36
	→ nnyk_ joined	03:37
	← eletuchy_ left	03:37
	→ jaguarmagenta joined	03:38
	← eletuchy left	03:39
	→ horse joined	03:39
	→ romerocesar joined	03:40
	← horse left	03:41
	→ diegoaguilar joined	03:43
	← mikecmpbll left	03:43
	→ watabou joined	03:43
	← axiom_1 left	03:44
	← xall left	03:44
	← rahtgaz left	03:44
	← romerocesar left	03:45
	← rgrinberg left	03:47
	→ romerocesar joined	03:50
	← fahadash left	03:52
	→ dimi1947 joined	03:53
	→ horse joined	03:53
	← horse left	03:55
	→ sebbu joined	03:55
	← romerocesar left	03:55
	← mmlb left	03:56
	← Rodya_ left	03:57
	→ eletuchy joined	03:57
	← dimi1947 left	03:57
	→ Lunatrius joined	04:00
	→ romerocesar joined	04:00
	← tesuji_ left	04:01
	→ tesuji joined	04:01
	← eletuchy left	04:02
	← espindola left	04:02
	← romerocesar left	04:05
	→ horse joined	04:07
	→ dopesong joined	04:08
	← horse left	04:08
	→ romerocesar joined	04:11
	→ User458764 joined	04:11
	← xaviergmail left	04:11
	→ xaviergmail joined	04:13
	→ rscata joined	04:14
	← romerocesar left	04:15
	→ pwnz0r joined	04:15
	← madewokherd left	04:17
	→ eletuchy joined	04:19
	→ horse joined	04:20
	→ romerocesar joined	04:21
	← xaviergmail left	04:22
	← horse left	04:22
	→ maestrojed joined	04:22
	← eletuchy left	04:23
	← dopesong left	04:23
	← romerocesar left	04:25
	→ k3rn31 joined	04:26
	← inflames left	04:27
	→ moei joined	04:28
	→ glebihan joined	04:29
	→ romerocesar joined	04:31
	→ fuchstronaut joined	04:31
	→ horse joined	04:34
	← romerocesar left	04:35
	← fuchstronaut left	04:35
	← horse left	04:36
	→ mikecmpbll joined	04:37
	→ eletuchy joined	04:39
	← zumba_ad_ left	04:41
	→ yaewa joined	04:41
	← b1tchcakes left	04:41
	→ zumba_addict joined	04:42
	← User458764 left	04:43
	← moei left	04:43
	← eletuchy left	04:44
	← watabou left	04:45
	→ stephaneyfx joined	04:46
	→ xall joined	04:46
	→ a_thakur joined	04:47
	→ horse joined	04:47
	← mikecmpbll left	04:48
	← horse left	04:49
	← gkatsev left	04:49
	← eight58 left	04:49
	→ gkatsev joined	04:50
	← xall left	04:51
	→ boombatower joined	04:52
	→ User458764 joined	04:52
	→ nettoweb joined	04:54
	← User458764 left	04:54
	→ subhojit777 joined	04:55
	← stephaneyfx left	04:56
	→ stephaneyfx joined	04:56
	→ netj joined	04:57
	← nettoweb left	04:59
	→ horse joined	05:01
	← zivester left	05:01
	→ Cabanossi joined	05:02
	← horse left	05:03
	→ GandalfTheWizard joined	05:03
	→ rf__ joined	05:05
	← Codfection left	05:09
	→ Codfection joined	05:10
	← sangy left	05:10
	→ romerocesar joined	05:11
	← a_thakur left	05:11
	gitinfo set mode: +v	05:13
stephaneyfx	Hi all. Sorry if this is a silly question... Why does the "git filter-branch" man page state that variables need to be re-exported for --env-filter? From what I understand in the (ba)sh man page, changing the value of an environment variable does not require to re-export it for the change to appear in subsequent child processes. I guess unless "export -n" is used. What am I missing?	05:14
	→ nilg joined	05:14
	→ horse joined	05:15
	← FuzzySockets left	05:15
	← romerocesar left	05:16
	← aidalgol left	05:16
	← horse left	05:16
	← italoacasas left	05:17
	→ leeN joined	05:18
	→ a_thakur joined	05:18
	← rubyonrailed left	05:20
	→ romerocesar joined	05:21
	← steadystatic left	05:22
	← maestrojed left	05:25
	← romerocesar left	05:26
	→ sauvin joined	05:26
	← jason237 left	05:27
	→ inflames joined	05:28
	← gkatsev left	05:28
	→ horse joined	05:28
	→ gkatsev joined	05:28
	← ShekharReddy left	05:28
	← horse left	05:30
	→ stuh84 joined	05:30
	→ Guest55 joined	05:31
	← piling left	05:33
	→ eletuchy joined	05:34
	→ fahadash joined	05:34
	→ DirtyCajun joined	05:36
	→ ThomasLocke joined	05:36
	→ dsantiago joined	05:38
	← eletuchy left	05:38
	→ User458764 joined	05:39
	← stephaneyfx left	05:40
	← yaewa left	05:40
	→ moei joined	05:41
	← gkatsev left	05:41
	→ horse joined	05:42
	→ Jck joined	05:43
	→ qt-x joined	05:43
	← horse left	05:44
	→ cyphase joined	05:44
	← cyphase left	05:44
	→ cyphase joined	05:45
	→ lordjancso joined	05:45
	← stuh84 left	05:45
	← Jck left	05:45
	→ retropikzel joined	05:49
	← stonerfish left	05:50
	→ stonerfish joined	05:51
	← Motoko left	05:51
	← Guest55 left	05:52
	→ carell joined	05:53
	← User458764 left	05:54
	→ horse joined	05:55
	→ jason237 joined	05:56
	→ Oebele joined	05:56
	→ rkazak joined	05:56
	→ harish joined	05:57
	← horse left	05:57
	← DolphinDream left	05:58
	→ netcrime joined	05:58
	← DirtyCajun left	05:59
	→ gkatsev joined	05:59
	→ Raging_Hog joined	06:01
	→ Repox joined	06:02
	← zumba_addict left	06:03
	← reim left	06:03
	→ zumba_addict joined	06:03
	← boombatower left	06:05
	→ Guest55 joined	06:05
	→ DirtyCajun joined	06:05
	→ emPi joined	06:07
	← arescorpio left	06:09
	→ horse joined	06:09
	→ romerocesar joined	06:10
	→ drbean joined	06:10
netcrime	Hi. I´m new to GIT and having trouble Pushing my code. I´m working on Masters branch. Other dev joined and my commit became ahead of origin/master branch (screen: http://prntscr.com/bjfesy). When I try to pull code from git I get an error (screen: http://prntscr.com/bjffxy) Same error when I try to Push my code. How can I fix it? Thank you	06:10
	← nnyk_ left	06:10
	→ Omen joined	06:11
	← horse left	06:11
	Omen → Guest67129	06:11
	→ TomyLobo joined	06:11
kadoban	netcrime: Did you read the error? It tells you what's wrong, and unless I'm badly mistaken, it even gives you options for how to proceed near the bottom.	06:12
	→ reim joined	06:13
	→ d0nkeyBOB joined	06:13
	→ jceb joined	06:13
	← drbean_ left	06:14
	→ drbean_ joined	06:14
	→ Sucks joined	06:14
	→ ShekharReddy joined	06:15
	← drbean left	06:15
netcrime	kadoban: Yes I see the error but I don´t know how to fix it. I´m perfectly fine with overwriting these files as they are same on my local branch as in origin. I don´t see options to fix it	06:15
	→ ResidentBiscuit joined	06:15
netcrime	kadoban: You mean this is the options ? http://prntscr.com/bjfhxt	06:16
kadoban	No	06:16
netcrime	kadoban: then everything else is just an error output	06:17
	← a_thakur left	06:18
	→ a_thakur joined	06:18
	← d0nkeyBOB left	06:18
	← Sucks left	06:19
	→ Sucks joined	06:19
	→ apotry joined	06:20
	→ D-Boy joined	06:20
	→ milki joined	06:21
	← ResidentBiscuit left	06:21
	→ MrMojito_Busy joined	06:21
	→ zeroed joined	06:21
	← Sucks left	06:22
	← MrMojito_Busy left	06:22
	→ Sucks joined	06:22
	→ horse joined	06:22
	→ MrMojito_Busy joined	06:23
	← MrMojito_Busy left	06:23
	→ opal joined	06:24
	← horse left	06:24
	→ MrMojito joined	06:25
	← MrMojito left	06:25
	→ MrMojito joined	06:25
	← fracting left	06:27
	→ vuoto joined	06:27
	← nilg left	06:27
	→ cordova joined	06:27
	→ eletuchy joined	06:28
	→ FuzzySockets joined	06:28
	→ cyan__ joined	06:30
	→ fuchstronaut joined	06:32
	→ TheHackOps joined	06:33
TheHackOps	Quick question, I have a feature branch which is some 300+ commits ahead of master but is perfectly in sync with master	06:33
	My idea was to just make that branch master	06:33
	← eletuchy left	06:33
TheHackOps	Is there a safe way to do said thing	06:33
	→ JeroenT joined	06:34
kadoban	TheHackOps: What does it mean that it's perfectly in sync with master?	06:34
	→ yuhlw joined	06:35
TheHackOps	Is 0 commits behind master	06:35
	but 340 ahead	06:35
	Lesson learned, terrible idea	06:35
	But here we are	06:35
	kadoban,	06:36
kadoban	TheHackOps: Oh, you can either just merge it into master (which will fast-forward), or you can simply point master where the branch currently does with 'git reset --hard'	06:36
	→ horse joined	06:36
	← fuchstronaut left	06:36
kadoban	TheHackOps: The merge is probably "safer", you can do --ff-only I believe is the right one to make sure it doesn't do an actual merge, just in case you're mistaken or type the wrong thing somehow.	06:36
TheHackOps	kadoban, So the idea is, master will now effectivly point to the latest commit of feature-branch	06:37
kadoban	TheHackOps: Yep.	06:38
TheHackOps	Hmm	06:38
	← horse left	06:38
TheHackOps	I cant even tell you how scary this is :D	06:38
kadoban	TheHackOps: !backup helps aleviate anxiety, heh	06:38
gitinfo	TheHackOps: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	06:38
thiago	yes, you must have done some really scary work	06:38
TheHackOps	thiago, omg hey o/	06:39
	← lindenle left	06:39
kadoban	You can almost always undo stuff without a backup, but a backup makes it trivial, so it's not a bad idea.	06:39
TheHackOps	Eh we kinda let a feature branch get away from us	06:39
thiago	probably rebased commits that weren't yours, then reverted stuff, checked out older versions and committed, etc.	06:39
	feature branches with 300 commits are ok, nothing to be scared about, by itself	06:39
TheHackOps	The idea was when it diverged was to be merged back into master after 10 commits	06:39
	300 or so commits later	06:40
kadoban	Er? I hope not, that's not my understanding of the situation. If that happened ... ignore everything else.	06:40
thiago	300 commits that do nothing ("is perfectly in sync") is very scary	06:40
TheHackOps	thiago, Nah its a whole new module of the app	06:40
	→ Sceorem joined	06:40
TheHackOps	We need to get that module back into master	06:40
thiago	"is perfectly in sync" = "has exactly the same content"	06:41
	git diff shows nothing	06:41
TheHackOps	thiago, Sorry	06:41
thiago	is that what you meant?	06:41
TheHackOps	no	06:41
	ahhaha	06:41
	One sec, Ill visually show what I mean	06:41
thiago	ok, so you have 300 commits that implement something	06:41
	← TomyLobo left	06:41
thiago	you want to merge. Do it. What's the issue?	06:41
	→ fracting joined	06:41
	→ nettoweb joined	06:42
TheHackOps	http://imgur.com/bHducZr	06:43
	thiago, erm resolving that many merge conflicts	06:43
	gives me nightmares	06:43
thiago	that doesn't say absolutely anything	06:43
	well, you have one other choice only:	06:44
kadoban	TheHackOps: There won't be any conflicts, there can't be (if I'm understanding the situation). You can make sure with --ff-only, if there would be even the chance of a real merge, it'll bail out.	06:44
thiago	abandon all work done in master since the feature branch was created	06:44
	what do you choose?	06:44
TheHackOps	Im going to try kadoban's idea in a copy of the repo	06:45
	I think its exactly what i want	06:45
thiago	you said it's 0 commits behind	06:45
	so there won't be any conflicts	06:45
	→ perlpilot_ joined	06:45
thiago	the slowest part of the merge will be checking out all of the files	06:45
	→ dharrigan joined	06:45
TheHackOps	thiago, I have never had a good way with words	06:46
	Not when i asked in C++ and not here :(	06:46
	→ romerocesar_ joined	06:46
	→ ki0 joined	06:46
	→ nickthetait1 joined	06:46
	→ djh_ joined	06:47
	← nettoweb left	06:47
TheHackOps	Wow	06:47
	That worked rly rly rly well	06:47
	→ RichardJ joined	06:48
TheHackOps	Thanks guys	06:48
kadoban	Yay	06:48
TheHackOps	It just moved it to where I expected no issues	06:48
	some extra files created	06:48
thiago	you said it was 0 commits behind	06:48
TheHackOps	but thats it	06:48
	thiago, I get nervous	06:48
	:(	06:48
thiago	conflicts were impossible	06:48
TheHackOps	thiago, I know that now	06:48
	→ boshhead_ joined	06:49
	→ BlaXpirit_ joined	06:49
	← romerocesar left	06:49
	→ PaulePan1er joined	06:49
	→ and_i joined	06:49
	→ Soliton joined	06:49
	→ kanzure_ joined	06:49
	→ horse joined	06:50
	← hyperair left	06:50
	→ hyperair joined	06:50
	→ the_ktosiek joined	06:50
	→ GrayShade joined	06:50
	→ ketas- joined	06:51
	→ Orphis_ joined	06:51
	→ zeemz joined	06:51
	→ harleypig_ joined	06:51
	→ gingitsune joined	06:51
	→ attente_ joined	06:51
	→ jchonig_ joined	06:51
GrayShade	why could a "git fetch" hang? the remote is an http url which i can clone otherwise. there's no network filtering that i'm aware of.	06:51
	it says "POST git-upload-pack (gzip 2638 to 1342 bytes)", then stays like that	06:51
	← ki0 left	06:51
	← horse left	06:52
thiago	networking problem or server problem	06:52
	use tcpdump on both sides (client and server) to see if packets being sent are arriving	06:53
	if packets are not arriving, it's a network problem (probably MTU setting)	06:53
GrayShade	server is github	06:53
thiago	if all packets sent are arriving, then it's likely the server is hung	06:53
GrayShade	ipv4	06:53
	→ yossarian joined	06:54
	← yossarian left	06:54
thiago	so it's unlikely to be a problem with github's server or github's network	06:54
	it must be yours	06:54
	→ Guest42010 joined	06:54
	→ bodie__ joined	06:54
	→ Werring` joined	06:54
	→ uidzer0 joined	06:54
	→ APK joined	06:55
GrayShade	suppose so, but it's strange since a clone of the same remote works (i get the same POST message, the "remote: counting objects")	06:55
	→ Ankhers_ joined	06:55
	→ fugiman joined	06:55
	→ CentaurW- joined	06:55
	→ canton7_ joined	06:55
thiago	that's why I think it's an MTU problem	06:55
	try lowering yours	06:55
	→ Atlantic778 joined	06:56
	→ HarryHallman joined	06:56
	→ HelloAtMega joined	06:56
	→ elastix joined	06:56
	→ pR0Ps_ joined	06:58
	→ AustinIncognito joined	06:59
	→ Marbug_ joined	07:00
GrayShade	ah, the remote isn't github :D	07:00
	→ tolland_ joined	07:00
	→ ki0 joined	07:00
	→ tomzx_ joined	07:00
	→ SirFunk_ joined	07:00
	→ hhee joined	07:01
	→ ThomasLocke_ joined	07:01
	→ KellerKatze joined	07:01
	→ tomog999_ joined	07:01
	→ reizuki_ joined	07:01
	→ Silex^^ joined	07:02
	→ tenc joined	07:02
GrayShade	"traceroute to [...], 30 hops max, 65000 byte packets[1] 47105 segmentation fault" sigh.	07:02
	→ markmark joined	07:02
	← tomzx_ left	07:02
	→ nwf_ joined	07:02
	→ tomzx joined	07:02
	→ rewt`` joined	07:03
	→ dreiss joined	07:03
	rewt`` → rewt	07:03
	→ varx joined	07:03
	→ horse joined	07:03
	→ retropikzel_ joined	07:04
	← taylorm left	07:04
	→ encod3 joined	07:04
	← cordova left	07:04
	← retropikzel left	07:04
	← ThomasLocke left	07:04
	← _August_ left	07:04
	← reizuki left	07:04
	CentaurW- → CentaurWarchief	07:04
	canton7_ → canton7	07:04
	bodie__ → bodie_	07:04
	Werring` → Werring	07:04
	pR0Ps_ → pR0Ps	07:04
	→ satbyy_ joined	07:04
	→ spudowiar1 joined	07:05
	→ Sonderblade joined	07:05
	→ _August_ joined	07:05
	← horse left	07:05
	← drbean_ left	07:06
	harleypig_ → harleypig	07:06
	→ nettoweb joined	07:06
	→ Hounddog joined	07:07
	→ mikecmpbll joined	07:07
	→ SebastianFlyte joined	07:07
	← GandalfTheWizard left	07:08
	← lordjancso left	07:08
	← vuoto left	07:08
	→ drbean joined	07:09
	→ eletuchy joined	07:10
	← nettoweb left	07:11
	→ Macaveli joined	07:12
	→ xall joined	07:13
	← zumba_addict left	07:13
	→ newlifer joined	07:13
	← Guest55 left	07:14
	→ bgamari joined	07:14
	→ deltab joined	07:14
	→ BlackMaria joined	07:14
	→ bcc joined	07:14
	← neanderslob left	07:14
	→ jab416171 joined	07:14
	→ neanderslob joined	07:15
	→ Kicer86 joined	07:15
	→ flobin joined	07:16
	→ leandrosansilva joined	07:16
flobin	hi everyone	07:16
	I'm getting an error that I don't understand, namely:	07:16
	remote: fatal: pack has 99 unresolved deltas	07:16
	error: unpack failed: index-pack abnormal exit	07:16
	when trying to "git push origin master"	07:16
	more here: https://gist.github.com/Flobin/c10fa2133b281329186a8f0ed511e9cf	07:16
milki	flobin: either corrupted repo, disk space issues, or filesystem errors	07:16
	← BlaXpirit_ left	07:16
milki	probably	07:16
	← romerocesar_ left	07:16
flobin	ah	07:17
	→ BlaXpirit joined	07:17
milki	flobin: o, that ones different. you misseed the reason for the failure	07:17
	→ horse joined	07:17
milki	flobin: line 7	07:17
	flobin: are you perhaps playing with sparse repos?	07:17
flobin	oh, right	07:17
	no, this is just a regular repo as far as I know	07:17
milki	wierd	07:17
	← zeroed left	07:18
milki	well it sounds like either the remote ran out of compute power or its missing data	07:18
	→ ensyde joined	07:18
milki	ait	07:18
	its github...	07:18
flobin	the remote in this case is github, so it would probably be the latter	07:18
milki	github probably has issues hten	07:18
	flobin: i would just try later >.>	07:18
flobin	right	07:18
	this was yesterday so I'm trying again right now	07:19
	← horse left	07:19
nb-ben	that's like time traveling	07:19
milki	github does custom things to git	07:19
	so they could have other issues	07:19
	→ zeroed joined	07:20
	← zeroed left	07:20
	→ zeroed joined	07:20
	→ feignix joined	07:20
	ketas- → ketas	07:21
	→ eletuchy_ joined	07:21
	→ ahmedelgabri joined	07:21
	← Guest67129 left	07:22
flobin	well dang, it worked now	07:22
	← Macaveli left	07:22
	← rkazak left	07:22
	← gkatsev left	07:22
	→ romerocesar joined	07:22
	→ gkatsev joined	07:23
	boshhead_ → boshhead	07:23
	→ eletuch__ joined	07:23
	← eletuchy left	07:24
	BlaXpirit → BlaXpirit_	07:25
	→ eletuchy joined	07:25
	BlaXpirit_ → BlaXpirit	07:25
	← eletuchy_ left	07:26
	→ Balliad joined	07:27
	← eletuch__ left	07:28
	→ eletuchy_ joined	07:28
	→ romerocesar_ joined	07:30
	← pwnz0r left	07:30
	→ eletuch__ joined	07:30
	→ horse joined	07:30
	← eletuchy left	07:31
	→ pwnz0r joined	07:31
	← romerocesar left	07:31
	→ cdown_ joined	07:31
	← st0opkid left	07:32
	← jceb left	07:32
	← GrayShade left	07:32
	← thiago left	07:32
	← horse left	07:32
	→ eletuchy joined	07:32
	← jaguarmagenta left	07:33
	← eletuchy_ left	07:33
	→ texinwien joined	07:33
	→ dsdeiz joined	07:33
	← dsdeiz left	07:33
	→ dsdeiz joined	07:33
	← cdown left	07:34
	cdown_ → cdown	07:34
	← apotry left	07:34
	→ apotry joined	07:34
	← eletuch__ left	07:35
	← pwnz0r left	07:35
	→ eletuchy_ joined	07:36
	→ astrofog joined	07:36
	← romerocesar_ left	07:36
	← cyan__ left	07:36
	← mikecmpbll left	07:37
	← eletuchy left	07:38
	← zeroed left	07:38
	→ eletuchy joined	07:38
	← apotry left	07:39
	← dreiss left	07:39
	→ ahmed_elgabri joined	07:39
	→ TomyWork joined	07:40
	→ eletuch__ joined	07:40
	← ahmedelgabri left	07:40
	← eletuchy_ left	07:41
	→ cordova joined	07:42
	→ fees joined	07:42
	→ eletuchy_ joined	07:42
	← elastix left	07:42
	← fahadash left	07:42
	← eletuchy left	07:43
	← feignix left	07:43
	← xall left	07:43
	→ absence joined	07:43
	← fracting left	07:44
	→ horse joined	07:44
	← cordova left	07:44
	PaulePan1er → PaulePanter	07:44
	→ eletuchy joined	07:44
	the_ktosiek → ktosiek	07:45
	→ jceb joined	07:45
	← eletuch__ left	07:45
absence	when doing an interactive rebase and editing commits, is it possible to edit the actual patch rather than the file data? i think it would be easier in some cases	07:45
	← _August_ left	07:45
	← horse left	07:46
	→ _August_ joined	07:46
	→ kedare joined	07:46
	→ multi_io joined	07:46
	→ aax joined	07:47
	→ feignix joined	07:47
	← eletuchy_ left	07:47
	← flobin left	07:48
	→ eletuchy_ joined	07:49
	← eletuchy left	07:50
	→ romerocesar joined	07:50
	→ eletuchy joined	07:50
	← eletuchy_ left	07:53
	→ eletuchy_ joined	07:54
	→ garethdaine joined	07:54
	← romerocesar left	07:55
	→ flobin joined	07:55
	→ jbitdrop joined	07:55
	→ eletuch__ joined	07:56
	← eletuchy left	07:56
	← netj left	07:57
	→ netj joined	07:57
	← texinwien left	07:57
	→ horse joined	07:58
	→ eletuchy joined	07:58
	← eletuchy_ left	07:58
	← a_thakur left	07:59
	→ a_thakur joined	07:59
	← horse left	07:59
	← eletuch__ left	08:00
	← a_thakur left	08:01
	→ eletuchy_ joined	08:01
	→ jknetl joined	08:02
	→ ahr3n joined	08:02
	→ dminca joined	08:02
dminca	Hi guys	08:02
gitinfo	dminca: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	08:02
dminca	Everyone seems to have problem with `git init`	08:03
	← eletuchy left	08:03
dminca	meaning that, you can do `git init` in an already initialized Git project	08:03
peem	I have a repo that needs certain things happening on every commit, like "puppet module build" for example. I thought that I can add it to pre-commit hook, but it seems to be false logic, as I need to do git add first, then run that again in hook script to cover new files generated by puppet. Is there a better vay of doing such thing ?	08:03
	→ eijk_ joined	08:03
	→ eletuchy joined	08:04
dminca	all the files that were in .gitignore appear as Untracked,	08:04
	sorry, files that weren't in .gitignore appear as Untracked.	08:05
	→ a_thakur joined	08:05
dminca	I think this is a bug, where can I file this one?	08:05
	→ eletuch__ joined	08:06
	← cdown left	08:06
	← eletuchy_ left	08:06
	→ kurkale6ka joined	08:07
	→ faiz joined	08:08
	← faiz left	08:08
	← eletuchy left	08:09
	→ ToBeCloud joined	08:09
	gitinfo set mode: +v	08:09
	→ eletuchy joined	08:09
	← zeemz left	08:10
	→ horse joined	08:11
	→ mikecmpbll joined	08:11
	← eletuch__ left	08:11
	→ zeemz joined	08:12
	→ cdown joined	08:12
	→ eletuchy_ joined	08:13
	→ Lvjasha joined	08:13
	← horse left	08:13
	→ faiz joined	08:14
	→ ramsub07 joined	08:14
	→ ocbtec joined	08:14
	→ circ-user-aKdA0 joined	08:15
	← Lvjasha left	08:15
	← eletuchy left	08:15
	→ netcarver joined	08:16
	← flobin left	08:16
	→ horse joined	08:16
	← faiz left	08:16
	→ imjacobclark joined	08:16
	→ Calrik joined	08:17
	→ User458764 joined	08:17
	→ dimi1947 joined	08:17
	← cdown left	08:17
	← dimi1947 left	08:18
	← eletuchy_ left	08:18
	→ nnyk_ joined	08:18
	← dsdeiz left	08:19
	→ marcogmonteiro joined	08:19
	← horse left	08:20
	→ Lynxium joined	08:22
	← mikecmpbll left	08:23
	→ FrontPsych joined	08:23
	← Goplat left	08:25
	→ ams__ joined	08:25
	→ gelei007 joined	08:26
	← dminca left	08:28
	→ dminca joined	08:29
	← FuzzySockets left	08:30
	→ muthu joined	08:32
	← FrontPsych left	08:32
	→ fuchstronaut joined	08:32
	→ mithenks joined	08:33
qsx	!list	08:34
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	08:34
qsx	dminca: ^	08:34
	→ eletuchy joined	08:34
	← User458764 left	08:36
	→ ph88 joined	08:36
ph88	how can i find out when git version 1.7.4.4 was released ?	08:36
	→ cyan__ joined	08:37
	← fuchstronaut left	08:37
	→ texinwien joined	08:39
i7c	Date: Wed Apr 6 10:50:06 2011 -0700	08:39
	← eletuchy left	08:39
dminca	thanks gsx	08:39
i7c	git show v1.7.4.4	08:39
ph88	oki thx	08:39
	→ lindenle joined	08:40
i7c	show -s to not get run over by the output ;)	08:41
	→ sanketdg joined	08:41
	→ programmerZhou joined	08:41
	← JeroenT left	08:42
	→ JeroenT joined	08:44
	→ mikecmpbll joined	08:44
	→ Arban joined	08:44
	← lindenle left	08:45
	← programmerZhou left	08:45
	→ drbean_ joined	08:45
	← drbean left	08:46
	← Sucks left	08:47
	← ahmed_elgabri left	08:47
	→ Didac joined	08:50
	← drbean_ left	08:50
	qsx wonders what kind of fonts people have who always mistake qsx for gsx	08:52
	← _August_ left	08:52
	→ _August_ joined	08:52
	→ iLembus joined	08:52
	→ SimonNaa joined	08:52
	→ notebox joined	08:53
	→ monokrome joined	08:54
i7c	I tab complete even three letter nicks. :)	08:56
	← SimonNa left	08:56
	← gkatsev left	08:56
	→ Gsham joined	08:57
	← Gsham left	08:57
	→ gkatsev joined	08:57
	→ troulouliou_div2 joined	08:58
qsx	yeah	08:58
	this can lead to problems.	08:58
	(i’m in a channel where we have a js and a jn, and both get the same color …)	08:59
	i7c: https://www.youtube.com/watch?v=KZ9roZAYDok	08:59
	← yuhlw left	09:00
	→ yuhlw_ joined	09:00
	→ barteks2x joined	09:01
	→ grindhold joined	09:01
	← yuhlw_ left	09:02
	→ yuhlw joined	09:02
	→ yuhlw_ joined	09:03
	← yuhlw_ left	09:03
	→ yuhlw__ joined	09:04
	← yuhlw left	09:04
	← liuzhen left	09:04
	← yuhlw__ left	09:04
	← circ-user-aKdA0 left	09:04
ph88	hey guys, i compiled git from source and it compiled but now i get this error: fatal: Unable to find remote helper for 'https'	09:04
	→ liuzhen joined	09:05
	→ horse joined	09:05
	← ramsub07 left	09:06
	→ yuhlw_ joined	09:06
horse	hi git gurus. i have a server which i use to pull down switch config files. i would like to upload these files in to a remote gitbab instance, however, i dont want to clone the entire project and have it sat on this server.	09:06
	so is it possible to just clone and use a subfolder of a project?	09:06
grawity	no	09:06
	← cyan__ left	09:06
	→ ahmed_elgabri joined	09:07
horse	grawity: that seems a bit sub optimal?	09:07
grawity	you can limit a clone to individual branches, or you can limit the checkout to specific files/folders (sparse checkout), but it'll always download at minimum the whole branch	09:07
	← liuzhen left	09:07
	← Raging_Hog left	09:08
	→ Raging_Hog joined	09:08
i7c	qsx, oh well. :P	09:08
	→ liuzhen joined	09:08
qsx	ph88: did you forget to link against libcurl?	09:10
i7c	qsx, I guess we're brothers then.	09:10
qsx	\o/	09:10
horse	grawity: so i'd always need to clone the entire porject?	09:10
	→ dopesong joined	09:11
grawity	yes	09:11
ph88	qsx, yes .. but i´m going to take an alternative route .. install another vbox where i have root	09:11
horse	thankyou, that answers my question at least	09:11
qsx	er	09:11
	if that solves the problem for you …	09:12
	← Raging_Hog left	09:12
	→ Raging_Hog joined	09:12
kontoo	before I go insane: if I want to incorporate changes from master into a feature branch f1 by rebasing, this is called "rebasing f1 onto master", right?	09:13
	I read conflicting statements on what gets rebased on what	09:14
grawity	yeah, you use master as the base, and re-apply your branch's commits on top of it	09:15
	← mikecmpbll left	09:15
grawity	resulting in a rewritten f1	09:15
	← gkatsev left	09:17
kontoo	is this called "rebasing f1 onto master" or "rebasing master onto f1"?	09:17
	← imjacobclark left	09:17
kontoo	that is my question	09:17
	→ gkatsev joined	09:19
i7c	You walk back branch A until you meet with branch B, walk branch B till you reach the tip and then apply all commits that you walked back on A. That's rebasing A onto B.	09:19
	← feignix left	09:19
	→ eijk joined	09:19
	→ drbean joined	09:19
	→ fahadash joined	09:19
i7c	To make things more fun, there's an --onto option which may confuse you further. :)	09:20
	→ feignix joined	09:20
i7c	rebase --onto C B A: walk back A until you meet B (remember those commits), walk back until you meet C, walk to the tip of C and apply remembered commits.	09:21
	→ imjacobclark joined	09:22
	← eijk_ left	09:22
	→ digidog joined	09:26
	→ keltvek joined	09:27
kontoo	i7c: isn't the last thing you wrote just "incorporate changes from branch A into branch C"?	09:29
	→ endiruna joined	09:29
kontoo	hmm actually "incorporate the changes introduces from branch A in relation to branch B into C"	09:30
	→ tvw joined	09:30
	← jmpp left	09:30
	→ jmpp joined	09:31
	→ mikecmpbll joined	09:32
	→ jaguarmagenta joined	09:33
	→ mase-tech joined	09:34
	→ artemisart joined	09:35
	→ dimi1947 joined	09:36
	← artemisart left	09:37
	← imjacobclark left	09:38
	← jaguarmagenta left	09:38
	→ dsdeiz joined	09:41
	← dsdeiz left	09:41
	→ dsdeiz joined	09:41
	← aavrug left	09:41
	→ shay- joined	09:43
	← Raging_Hog left	09:43
	→ Raging_Hog joined	09:43
	→ ntonjeta joined	09:44
	→ achadwick joined	09:44
	← liuzhen left	09:44
	→ drbean- joined	09:45
shay-	hey guys, I want to add a submodule to my project but I want to checkout a specific tag. The tag is named v3.0.1, I tried to add branch = v3.0.1 to the .gitmodules file, but the git submodule update --remote commands keeps failing with "fatal: Cannot update paths and switch to branch 'v3.0.1' at the same time." any suggestions?	09:45
	← drbean left	09:45
	→ liuzhen joined	09:45
	→ fracting joined	09:46
	→ aavrug joined	09:46
qsx	cd submodule; git checkout v3.0.1; cd ..; git add submodule; git ???; git PROFIT	09:46
	→ drbean joined	09:46
	← tvw left	09:47
	→ tvw joined	09:48
	→ drbean_ joined	09:48
	← ahr3n left	09:49
	→ Sly1986 joined	09:49
	→ eletuchy joined	09:49
	← drbean- left	09:50
	← fscala left	09:50
	→ drbean- joined	09:50
guardian	hello, it seem there's something I didn't understand with git stash: I have 30 files modified in the index, among those 2 files have more modifications in the working tree	09:51
	← drbean left	09:51
guardian	when doing git stash --keep-index, I expected the stash to contain only additional modifications for those 2 files	09:51
	→ romerocesar joined	09:51
guardian	but git stash show --stat lists the 30 files	09:51
	what did I miss? :/	09:52
	← mehola left	09:52
	→ fscala joined	09:52
_ikke_	guardian: --keep-index only says that changes that are staged are not removed	09:52
	not that it should not stash staged changes	09:52
	→ drbean joined	09:52
	← drbean_ left	09:53
	← eletuchy left	09:54
	← drbean- left	09:55
	← kedare left	09:55
rawtaz	could someone shed some light on https://pastebin.mozilla.org/8878838 for me? ive read that this could be due to the repo not allowing non-fast-forward push, but im puzzled because i have done this many times before to remote repos that were set up (afaik) the same way as this one is.	09:55
	→ mdw joined	09:56
rawtaz	is there a problem with how the commit history looks? afaik i should be able to push this (if the repo allows it of course)	09:56
	← romerocesar left	09:56
	← hahuang65 left	09:57
rawtaz	yeah the repo has denyNonFastforwards=true. odd that i havent encountered this before..	09:58
	← drbean left	09:58
	← gkatsev left	09:58
	→ gkatsev joined	09:58
	← moei left	10:00
	→ CheckDavid joined	10:00
rawtaz	might be that the other repos i thought of werent bare, after all	10:01
	→ stratos joined	10:01
	→ imjacobclark joined	10:03
	← JeroenT left	10:04
	→ cdown joined	10:06
	→ izabera joined	10:07
	← jknetl left	10:07
	→ phanimahesh joined	10:07
	→ son_ joined	10:08
	→ dsdeiz_ joined	10:09
	← son_ left	10:09
	→ mofai joined	10:10
	← dsdeiz left	10:11
	← k3rn31 left	10:11
	→ drbean joined	10:12
guardian	_ikke_: is "do not stash index" a thing?	10:12
	← mofai left	10:13
i7c	kontoo: no.	10:13
absence	when doing an interactive rebase and editing commits, is it possible to edit the actual patch rather than the file data? i think it would be easier in some cases	10:13
i7c	kontoo: it rebases A, so the only branch that is changed is A.	10:13
	→ mofai joined	10:13
	← ToBeCloud left	10:14
grawity	absence: commits aren't patches	10:14
i7c	kontoo: C and B remain the same. So unless I don't get your "incorporate" formulation, it appears to be wrong to me. ;)	10:14
grawity	absence: that said, you could `git reset`, then `git add -p`, and adjust the diff there	10:14
	→ toogley joined	10:15
	← mofai left	10:16
	→ zeroed joined	10:16
	← texinwien left	10:16
	← toogley left	10:16
	← johnmilton left	10:17
	← Sly1986 left	10:17
	→ cwillu_at_work joined	10:17
j416	grawity: --keep-index	10:18
	ah, didn't read scrollback, apologies	10:18
	and not grawity; guardian.	10:19
	→ k3rn31 joined	10:19
j416	guardian: commit instead, might be esier	10:19
	easier, even.	10:19
	← sanketdg left	10:21
	→ acetakwas joined	10:23
	→ lou_ joined	10:23
	← acetakwas left	10:23
	→ davisonio joined	10:24
	→ acetakwas joined	10:24
	← davisonio left	10:24
	→ davisonio joined	10:24
	→ vicente_ joined	10:24
	gitinfo set mode: +v	10:25
vicente_	Hi	10:25
gitinfo	vicente_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	10:25
vicente_	I have a perforce repository that I can not mix with anythng else. But I was wondering if it's possible to have git on my repository without touching any of the files there. Like scanning all those folders/files but doing the writting operations in a different independent folder. Is that possible?	10:28
	→ allcentury joined	10:28
selckin	GIT_DIR & friends	10:28
vicente_	selckin: that's the answer for my question, right? I'm going to check	10:29
selckin	if the question was if you can store .git outside of the working directory	10:29
	← leeN left	10:29
	→ shirafuno joined	10:29
	← endiruna left	10:30
shirafuno	Hi guys, currently trying to add a git repository to a GoCD pipeline. The repository is held on BitBucket. putting the https://bitbucket/shirafuno/repo.git doesn’t work as I think it’s because its the overview and not the repo(?) and when going on source it gives a long af url which it also doesn’t like. Would anybody know how to add a repo url to a pipeline.	10:32
vicente_	selckin: I think that will work for me, thanks	10:32
selckin	find a button that says clone and use the url that gives you	10:32
	← vicente_ left	10:33
	→ fuchstronaut joined	10:33
shirafuno	Found it, put https://shirafuno@bitbucket.org/shirafuno/repo.git and now it’s saying it could not read the password for :repo: No such device or address	10:34
selckin	that no longer sounds like a git problem	10:35
shirafuno	right okay	10:35
	thank you	10:35
	→ JeroenT joined	10:36
	← ensyde left	10:36
	← fuchstronaut left	10:38
phanimahesh	absence: Technically you can, by marking commits edit instead of pick. rebase stops just after it, so you can amend the commit and continue the rebase	10:41
	→ ahr3n joined	10:42
	← dimi1947 left	10:45
	→ KnightsOfNi joined	10:46
	→ choki joined	10:47
	→ ramsub07 joined	10:48
	→ fuchstronaut joined	10:49
absence	grawity: they may not BE patches, but they're often presented that way. git add -p asks me a bunch of "stage this hunk?" questions, i'd prefer to edit the "patch" in a text editor (just for simple stuff like moving lines)	10:49
	→ ferr1 joined	10:49
	→ moei joined	10:50
grawity	sure, press 'e' in git add -p	10:50
absence	grawity: oh, nice	10:54
	→ jimi_ joined	10:56
	→ jottr joined	10:56
	← cqi left	10:56
	→ afuentes joined	10:57
	← mdw left	10:57
	→ GuKKDevel_ joined	10:58
	← GuKKDevel left	10:58
	→ d0nkeyBOB joined	10:58
	← fuchstronaut left	10:59
	→ rahtgaz joined	10:59
	← d0nkeyBOB left	11:00
	→ ensyde joined	11:00
	← _August_ left	11:02
	→ _August_ joined	11:03
	→ mdw joined	11:04
	← acetakwas left	11:07
	← shay- left	11:08
	← mdw left	11:09
	→ Yatekii joined	11:09
Yatekii	hey guys	11:09
	I have a very weird problem:	11:09
	→ shay- joined	11:10
guardian	j416: yep ended up doing that	11:10
	thanks for caring	11:10
	→ sdothum joined	11:10
Yatekii	I am (sadly) on Windows. I have the cygwin git bash. When I do a git status it says everything is up2date with origin and stuff and latest commit is the one from yesterday with a variable changed from false to true. when I do vim changed_file.c it shows me that this variable is now true as expected. when I open that file in other editors, say eclipse (yes I hate myself) or Atom, it shows the variable to be FALSE. very weird, yes? when I change that	11:12
	variable to be true again in Atom and save and do a git status, it now shows me that the variable was changed to true. but when I do checkout what was changed in the commit from yesterday it says it was changed to true as well. how can this even be?	11:12
	← cdown left	11:13
Yatekii	I am very confused right now and hope someone can help me :)	11:13
	→ aard joined	11:13
	→ Macaveli joined	11:13
	→ djb-irc joined	11:13
	→ nettoweb joined	11:14
	← JeroenT left	11:14
selckin	eclipse and friends will often cache the file etc, try restarting everything	11:14
	→ cdown joined	11:16
Yatekii	selckin: I tried that already.	11:16
	also atom does cache them as well but once I close them the cache is gone. so no way it's the cache.	11:17
	also: git recognizes the change	11:17
	→ aguimaraes1986 joined	11:17
Yatekii	so something is seriously broken :S	11:17
selckin	well if you don't touch git, and 2 editors show you a differend result, either the editor is broken or your disk is magicly so broken its swapping those exact 4 chars	11:17
Yatekii	well I can provide you a sceen to show you that is REALLY as I say	11:18
	sec	11:18
	→ bruce_lee joined	11:18
	← gkatsev left	11:18
selckin	i know for example notepad++ will cache the content if it can't safe the file due to premission issues, and show the old if you reopen it	11:18
	its the most retarded editor in the world	11:18
Yatekii	I know and it is not like that as I stated 3 time snow	11:19
selckin	you stated 4 bytes magicly change, its not that either	11:19
	← imjacobclark left	11:19
	→ gkatsev joined	11:19
phanimahesh	I don't know, I have seen a similar bug recently. Multiple editors opening the same directory showed different stuff. On a mac.	11:20
	→ acetakwas joined	11:20
	→ mdw joined	11:20
selckin	mac doesn't have a filesystem	11:20
	← ensyde left	11:20
	← mdw left	11:21
phanimahesh	Mac uses HFS, a case insensitive filesystem.	11:21
selckin	it caches everything	11:21
grawity	wat	11:21
selckin	git had to work around many problems for mac	11:21
phanimahesh	selckin: Wut? Mac doesn't have a filesystem? what do you mean?	11:21
selckin	+working	11:21
	→ mdw joined	11:21
	← GuKKDevel_ left	11:21
	→ fuchstronaut joined	11:21
phanimahesh	The problem was very specific. GUI stuff thinks something, consistent with all Graphical editors. vim and nano in terminal think it's something else.	11:22
	Scratched my head for a while, and convinced myself it's a waste of time to investigate.	11:22
	I would have laughed if not for the fact that I have seen it with my eyes.	11:22
	← stonerfish left	11:24
	← ramsub07 left	11:24
	→ ensyde joined	11:24
Yatekii	http://i.imgur.com/oNNtCGI.png here is the shot. Either I am missing sth. or it is beyond broken	11:26
	→ ravenzz joined	11:26
	← zeroed left	11:27
Yatekii	normal windows notepad says it's false too btw	11:27
	and it sure as hell doesn't cache	11:27
	pc was also restarted so I assume the FS didn't cache it either.	11:27
	→ stonerfish joined	11:27
	← gkatsev left	11:28
	← feignix left	11:29
	→ gkatsev joined	11:29
	← ravenzz left	11:30
	← k3rn31 left	11:30
	← jottr left	11:30
	→ feignix joined	11:30
	→ johnmilton joined	11:30
	→ settermjd joined	11:30
	→ rnsanchez joined	11:31
	→ Sceorem_ joined	11:31
	← fahadash left	11:32
	→ Sceorem__ joined	11:33
	→ DolphinDream joined	11:33
	→ shinnya joined	11:33
	← _August_ left	11:34
	→ _August_ joined	11:34
	→ jaguarmagenta joined	11:34
	→ wiensa joined	11:34
	← wiensa left	11:35
	← Sceorem left	11:35
	→ k3rn31 joined	11:36
	→ Junior joined	11:36
	← Sceorem_ left	11:36
	Ankhers_ → Ankhers	11:37
	→ circ-user-bgUQR joined	11:38
	→ eletuchy joined	11:38
	← jaguarmagenta left	11:38
	→ espindola joined	11:39
	← shirafuno left	11:40
	→ imjacobclark joined	11:40
	→ ensyde__ joined	11:40
	← Sceorem__ left	11:42
	← eletuchy left	11:43
	→ shirafuno joined	11:43
	← ensyde left	11:44
	← drbean left	11:45
	→ a_thakur_ joined	11:46
	← a_thakur_ left	11:46
	→ virus joined	11:47
	← a_thakur left	11:47
	← davisonio left	11:47
	← mdw left	11:47
	← shirafuno left	11:47
	→ a_thakur joined	11:48
	→ zeroed joined	11:48
	← a_thakur left	11:48
	→ a_thakur joined	11:49
	→ drbean joined	11:49
	→ a_thakur_ joined	11:51
	← a_thakur left	11:51
	← a_thakur_ left	11:52
	→ a_thakur joined	11:52
	← feignix left	11:53
	→ d0nkeyBOB joined	11:53
	← d0nkeyBOB left	11:53
	→ a_thakur_ joined	11:55
	← dopesong left	11:55
	← dsdeiz_ left	11:56
	→ fwdit joined	11:57
	→ mdw joined	11:57
	→ Chill_Surf joined	11:57
	← mdw left	11:57
	→ FrontPsych joined	11:58
	← fuchstronaut left	11:58
	→ mdw joined	11:58
	→ User458764 joined	11:58
	← fwdit left	11:59
	← a_thakur left	11:59
	→ feignix joined	12:00
	← gkatsev left	12:00
	← ensyde__ left	12:00
	← drbean left	12:00
	→ gkatsev joined	12:01
	→ mariuscc joined	12:02
	→ drbean joined	12:04
	→ synthroid joined	12:04
	→ crose joined	12:05
	→ Sceorem__ joined	12:06
	→ ramsub07 joined	12:06
	→ zivester joined	12:08
	→ dan2k3k4 joined	12:09
	← FrontPsych left	12:09
	← DolphinDream left	12:10
	← choki left	12:10
	→ fahadash joined	12:10
	← dan2k3k4 left	12:10
	→ drbean_ joined	12:11
	← zeroed left	12:11
	→ dopesong joined	12:11
	← drbean left	12:12
	← virus left	12:12
	→ infra-red joined	12:13
	→ dsdeiz joined	12:14
	→ davisonio joined	12:14
	← jeffreylevesque left	12:15
	← dopesong left	12:15
	← davisonio left	12:16
	→ diegoviola joined	12:19
	← Macaveli left	12:21
	→ rwb joined	12:22
	→ noteness joined	12:22
	→ skasturi joined	12:24
	→ sulky_ joined	12:25
	→ dopesong joined	12:25
	← User458764 left	12:27
	→ cxz joined	12:28
	← a_thakur_ left	12:28
	→ liquidjamm joined	12:28
	→ pfsmorigo joined	12:28
	kanzure_ → kanzure	12:29
	→ FrontPsych joined	12:29
	→ fwdit joined	12:29
	← jimi_ left	12:30
	← aavrug left	12:31
	← fwdit left	12:31
	← drbean_ left	12:31
	← carell left	12:32
	→ d0nkeyBOB joined	12:32
	→ vuoto joined	12:33
	→ eletuchy joined	12:33
	→ jeffreylevesque joined	12:33
	→ drbean joined	12:35
	→ rgrinberg joined	12:36
	→ a_thakur joined	12:37
	→ mykespb joined	12:37
	→ dan2k3k4 joined	12:38
	← satbyy_ left	12:38
	← eletuchy left	12:38
	→ CJKinni joined	12:39
	← settermjd left	12:40
	→ carell joined	12:40
	← horse left	12:41
	← Oebele left	12:42
	← notebox left	12:44
	→ theskillwithin joined	12:45
	→ DolphinDream joined	12:45
	→ rbr joined	12:46
	→ FeersumEndjinn joined	12:46
	← k3rn31 left	12:46
	→ cdg joined	12:47
	→ efdetonator joined	12:47
	← FeersumEndjinn left	12:47
	→ FeersumEndjinn joined	12:47
	← acetakwas left	12:48
	→ FeersumE_ joined	12:49
	← Soliton left	12:49
	← crose left	12:50
	→ acetakwas joined	12:50
	← Repox left	12:50
	← FeersumEndjinn left	12:52
	→ sleezd joined	12:52
	→ Soliton joined	12:52
	→ ujjain joined	12:52
	← ujjain left	12:52
	→ ujjain joined	12:52
	← infra-red left	12:52
	← CheckDavid left	12:52
	→ deepy joined	12:52
	→ introsp3ctive joined	12:53
	→ iLembus_ joined	12:53
	← FeersumE_ left	12:53
	→ FeersumEndjinn joined	12:54
	→ Learath2 joined	12:54
	→ kfunk joined	12:54
	← netcarver left	12:54
	→ jknetl joined	12:55
	→ satbyy joined	12:55
	← iLembus left	12:55
	→ DolphinDreamm joined	12:55
	→ avar joined	12:55
	← acetakwas left	12:56
	→ mischat joined	12:56
	→ likewhoa joined	12:57
	→ kloeri joined	12:57
	← feignix left	12:57
	→ gechr joined	12:57
	→ docnvk joined	12:58
	← ramsub07 left	12:58
	← subhojit777 left	12:59
	→ musca joined	12:59
	→ acetakwas joined	12:59
	→ feignix joined	13:00
	→ piattino joined	13:00
	→ settermjd joined	13:00
piattino	hi. how can i get a list of modified files using git diff, like this but without the M prefix? git status --porcelain --untracked-file=no --no-column	13:00
	→ flopsec joined	13:01
piattino	preferably, null-separated, to feed into a script, but anything will do	13:01
grawity	git diff-tree --name-only	13:01
	← rscata left	13:01
	← FrontPsych left	13:01
	→ rominronin joined	13:02
	← FeersumEndjinn left	13:02
piattino	grawity: thanks man. still have a "spurious" first line.. (git diff-tree --name-only @) -> sha1\nfile1\nfile2..	13:03
	→ CEnnis91 joined	13:03
grawity	wait, I probably suggested the wrong one	13:03
	← retropikzel_ left	13:03
	→ User458764 joined	13:05
	→ happy-dude joined	13:05
piattino	git diff --name-only -z	13:06
	← KnightsOfNi left	13:06
piattino	grawity: thanks for pointing me in the right directoin	13:07
	← david007 left	13:08
	← gechr left	13:09
	→ gechr joined	13:09
	← gechr left	13:09
	→ segment-fault joined	13:11
	← feignix left	13:11
	→ texinwien joined	13:11
	→ italoacasas joined	13:11
	← italoacasas left	13:12
	→ KnightsOfNi joined	13:12
	→ italoacasas joined	13:12
	← Raging_Hog left	13:13
	← settermjd left	13:13
	→ gechr joined	13:13
	→ PHPanos joined	13:13
	← italoacasas left	13:14
	→ mmlb joined	13:14
	← gechr left	13:14
	→ binaryplease joined	13:15
	← carell left	13:16
	→ doktori joined	13:16
binaryplease	Hi, I understand the correct workflow to contribute to a opensource project is: create fork, make changes, commit, push, create pull request. If I want to contribute again after some time, how do I update my fork? or should I delete it and create a new fresh fork?	13:16
grawity	piattino: I actually meant diff-index but I guess it's mostly the same	13:17
	binaryplease: the same way you'd merge a branch	13:17
	← ePirat left	13:18
	→ someone_ joined	13:18
grawity	well, usually you'd keep 'master' in your fork untouched, and make changes in new branches	13:18
	→ italoacasas joined	13:18
	gitinfo set mode: +v	13:18
	→ ramsub07 joined	13:18
grawity	so you could update master without having to mess up the old pull requests	13:18
	binaryplease: more specifically, if you cloned your fork, then `git remote add` the original repo	13:19
	and vice versa	13:19
	then you can just merge upstream/master or whatever	13:19
someone_	Hello, a branch on gitlab has some commits that were squashed, but i want to get the state of the branch before the squash happened.. i can't seem to check out that commit sha since i don't have that git history locally.. how do i get the history or the sha?	13:19
	I tried git fetch origin <sha> with no luck	13:20
binaryplease	grawity: Thanks , addig the original repo to my fork as remote was the missing piece of the puzzle\	13:20
grawity	it's not required – you can fetch/pull/push with a URL directly – but having both repos as remotes makes things more convenient	13:20
	someone_: you cannot fetch objects that aren't referenced	13:20
	someone_: (it's partly a security feature, since such rewrites might be intentional)	13:21
	← diegoviola left	13:21
someone_	i mean the objects are there in the gitlab repo, i can see the code on there	13:21
grawity	well, if gitlab web UI allows browsing them, shrug	13:21
	I suppose github does as well	13:21
someone_	the repo has the history, i just can't fetch it then?	13:21
grawity	but they still run mostly regular git-daemon, which doesn't.	13:21
	← tvw left	13:21
	← dan2k3k4 left	13:22
	→ Urbany joined	13:22
rewt	someone_, do you see the actual commits, or just the code that was committed?	13:22
grawity	right, you can ask the original author to push it into a temp branch or something, but you can't fetch 'stale' objects directly	13:22
someone_	rewt: the commits	13:23
	i see the 6 commits, their shas, and the commit that replaced them with the force update	13:23
rewt	in the network graph?	13:23
someone_	just can't seem to fetch the state of that branch before the force update	13:23
rewt	or the activity list?	13:23
grawity	you cannot fetch the state of that branch before the force update.	13:23
someone_	well i can view the commits in gitlab, but i suppose that's just the activity list, not really sure what you mean by network graph	13:24
	← rnsanchez left	13:24
rewt	there's a graph tab where you can click network and it shows vertical lines of the branches	13:24
	→ rnsanchez_ joined	13:24
	→ ash_workz joined	13:24
	→ BigWillie joined	13:24
	→ dan2k3k4 joined	13:25
rewt	the activity list stays forever, so any discarded commits will stay linked there... but when gc is run, those links will no longer work	13:25
	→ vuoto_ joined	13:25
someone_	just in bitbucket, so it's different	13:25
rewt	same as when you discar a commit locally; you can still get at it for some time if you know the hash, but not after a gc	13:25
	→ Sceorem joined	13:26
rewt	bitbucket is not gitlab :/	13:26
	→ ramsub08 joined	13:26
	→ garethdaine_ joined	13:26
	→ eletuchy joined	13:27
	← ramsub07 left	13:27
someone_	yeah my bad	13:27
rewt	this is what gitlab's network graph looks like: https://about.gitlab.com/images/press/screenshots/network_graph.png	13:27
someone_	we used to be on gitlab, moved to bitbucket	13:27
	← garethdaine left	13:28
	garethdaine_ → garethdaine	13:28
	→ arand joined	13:28
	→ notebox joined	13:28
	← Sceorem__ left	13:28
rewt	bitbucked has plugins to provide something similar	13:28
	→ crameth joined	13:28
	← crameth left	13:28
	← ntonjeta left	13:29
	← vuoto_ left	13:29
	← vuoto left	13:29
	→ vuoto joined	13:29
	← allcentury left	13:29
	→ _rnsanchez_ joined	13:29
	← gelei007 left	13:30
	→ carell joined	13:31
	← piattino left	13:31
	← eletuchy left	13:31
	→ davisonio joined	13:32
	→ ramsub07 joined	13:32
	→ anup108 joined	13:32
someone_	yeah, definitely ain't possible.. thanks	13:32
	← someone_ left	13:32
	← ramsub08 left	13:32
	← rnsanchez_ left	13:33
	→ _rht joined	13:34
	← stratos left	13:35
	→ LeBlaaanc joined	13:35
	→ jaguarmagenta joined	13:35
	← MrMojito left	13:35
	→ mbrzuzy joined	13:36
	→ WizJin joined	13:36
	← zivester left	13:37
	← User458764 left	13:38
	→ Asiajey joined	13:38
	← jaguarmagenta left	13:39
	→ ramsub08 joined	13:40
	← ramsub07 left	13:40
	→ User458764 joined	13:40
	→ f3r70rr35f joined	13:40
	← efdetonator left	13:41
	→ jimi_ joined	13:41
	→ lpapp joined	13:42
lpapp	hi, git log A --not B and git log A..(.)B return something different than I expect. Why could that happen?	13:42
	I expect commits from the 25th of May onwards, but I get them from the 15th of April onwards.	13:43
	→ allcentury joined	13:43
lpapp	basically from a different tag (release) than A. What could cause this?	13:43
	→ mikecmpb_ joined	13:44
	→ Dougie187 joined	13:44
	→ MrMojito joined	13:44
	← vuoto left	13:44
	→ vuoto joined	13:45
	→ LionsMane joined	13:46
	← harish left	13:47
	← mmlb left	13:47
	← mikecmpbll left	13:47
	→ brandonw joined	13:48
	← mase-tech left	13:48
	← mykespb left	13:48
	← notebox left	13:48
	→ MrMojito1 joined	13:48
	← vuoto left	13:49
	→ vuoto joined	13:49
	← nettoweb left	13:50
	← CJKinni left	13:50
	← User458764 left	13:51
	← MrMojito left	13:51
	→ remitamine joined	13:51
lpapp	perhaps it is because of branching off	13:52
_ikke_	lpapp: has something from that tag been merged into A?	13:52
lpapp	from the moment of branching it lists all the commits	13:52
	not only the commits after that particular tag in that branch.	13:52
	→ mmlb joined	13:53
	→ diegoviola joined	13:54
	← drbean left	13:54
lpapp	_ikke_: I think so.	13:55
	→ GodGinrai joined	13:55
	→ phaleth joined	13:56
	→ CJKinni joined	13:57
	→ fuchstronaut joined	13:58
	← liuzhen left	13:59
	→ ehuuwj joined	13:59
	→ liuzhen joined	14:00
	→ GandalfTheWizard joined	14:00
	← jknetl left	14:00
	→ cyan__ joined	14:01
	→ tabrez joined	14:01
	→ AaronMT joined	14:01
	← LeBlaaanc left	14:01
	← acetakwas left	14:02
	→ Spacew00t joined	14:02
	← GandalfTheWizard left	14:02
	← anup108 left	14:02
	→ kfpratt joined	14:03
	← fuchstronaut left	14:03
	→ Ahmed90 joined	14:03
	→ GandalfTheWizard joined	14:04
	← ahr3n left	14:04
	← skirk left	14:04
	→ k3rn31 joined	14:04
	← italoacasas left	14:04
	→ FrontPsych joined	14:05
	→ Softeisbieger joined	14:05
	→ romerocesar joined	14:06
	← diegoaguilar left	14:09
	← doktori left	14:10
	← diegoviola left	14:10
	→ diegoviola joined	14:10
	→ steadystatic joined	14:10
	← romerocesar left	14:11
	← imjacobclark left	14:11
	→ User458764 joined	14:13
	→ venmx joined	14:15
	← remitamine left	14:15
	← cdg left	14:15
	← rahtgaz left	14:15
	→ cdg joined	14:15
	← qt-x left	14:16
	← attente_ left	14:18
	→ dsdeiz_ joined	14:19
	← dsdeiz left	14:19
	← cdg left	14:20
	→ eletuchy joined	14:20
mns	How would I find out all the config settings and their values for a particular module ? git-p4 is the module in question.	14:20
	--list will only give me what is in the .git/config file.	14:21
osse	mns: try git config --get-regexp p4	14:22
	← leandrosansilva left	14:23
	← MrMojito1 left	14:23
	← garethdaine left	14:23
	→ cdg joined	14:24
mns	osse: that will only list what I have in the config file.	14:24
	→ leandrosansilva joined	14:24
	→ garethdaine joined	14:24
	→ sangy joined	14:24
osse	mns: where else would they be?	14:25
	← muthu left	14:25
	← eletuchy left	14:25
moritz	in the cloud!	14:25
	→ cdg_ joined	14:26
mns	osse: what I would like to know is what are the config options available to me. a list of all git-p4 config settings. They must have default values, besides however one configures them in git/config	14:26
	→ MrMojito1 joined	14:26
osse	ah	14:26
	i don't know. man git-config doesn't list them so man git-p4 is my best guess.	14:27
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	14:27
	→ MrMojito2 joined	14:27
	→ StuartMI joined	14:27
	← cdg left	14:29
osse	turns out man git-p4 is a really good guess.	14:29
	→ italoacasas joined	14:31
	← MrMojito1 left	14:31
mns	duh, yes it does seem like that. should've looked there first.	14:32
	→ notebox joined	14:32
	← phanimahesh left	14:33
	→ a_thakur_ joined	14:33
	→ marc_v92 joined	14:34
	→ Trinity joined	14:35
	→ Phylock joined	14:35
Trinity	has anyone tried out git-lfs?	14:35
	← lpapp left	14:35
selckin	!ask	14:35
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	14:35
Trinity	How was your experience, what did you like about it, what did you dislike about i t?	14:35
	→ zivester joined	14:35
	← segment-fault left	14:36
	← a_thakur left	14:36
	← jason237 left	14:37
	→ happycoder joined	14:37
	← jceb left	14:38
	→ vuoto_ joined	14:38
	← ome left	14:39
happycoder	In my dotfiles git repo, I was experimenting with antigen and zgen. I deleted all files related to zgen and installed antigen. I did not commit anything. The git status lists a bunch of files I deleted and added in red. Meanwhile, I modified my vimrc, did `git add vimrc` and `git commit "message"`. I now need to restore all those files showing in red to their versions commited in the repo. what to do?	14:40
	→ remitamine joined	14:40
	→ Gsham joined	14:40
	→ piattino joined	14:41
GodGinrai	happycoder: Use git-checkout to checkout the version of those files in HEAD	14:41
happycoder	GodGinrai, shall I list all files manually?	14:41
	or a `git checkout` or `git checkout *` would do?	14:41
	→ lindenle joined	14:42
dminca	happycoder what does it say if you do a git status	14:43
GodGinrai	happycoder: or you could do something like this: `git status \| awk '/deleted/ { print "git checkout -- " $2 }' \| bash`	14:43
happycoder	GodGinrai, cool	14:43
	GodGinrai, done! thanks	14:44
	← mmlb left	14:44
GodGinrai	yw	14:44
happycoder	dminca, thanks anyway :)	14:44
dminca	cool :)	14:44
	next time use git clean -f	14:44
	if you didn't commit the files you wanted to test	14:44
	→ imjacobclark joined	14:44
happycoder	oh.. I see	14:44
dminca	git clean -fd (if you also have directories in staging)	14:45
	→ mmlb joined	14:45
_ikke_	git clean only handles untracked files..	14:45
	← mariuscc left	14:46
dminca	it's very useful when you solve merge conflicts, after the conflict is solved , meld leaves some crappy *.orig files	14:46
_ikke_	git does that itself	14:46
dminca	_ikke_ right	14:46
happycoder	It shows this now: HEAD detached at 999c0e9	14:46
dminca	do git checkout -	14:46
	← lindenle left	14:47
_ikke_	git config --global mergetool.keepBackup false	14:47
	→ ResidentBiscuit joined	14:47
dminca	_ikke_ got that enabled but it still keeps them , I don't know why	14:47
	I think it's from meld	14:47
	I got a ~/.gitconfig	14:47
happycoder	done	14:47
	thanks dminca	14:47
dminca	yw happycoder	14:48
	← k3rn31 left	14:49
	← ferr1 left	14:49
	← marc_v92 left	14:49
	← mmlb left	14:50
	→ crose joined	14:51
	← User458764 left	14:51
	← vuoto left	14:51
	← vuoto_ left	14:51
	→ vuoto joined	14:51
	← ResidentBiscuit left	14:52
	→ ResidentBiscuit joined	14:53
	→ makinen joined	14:53
	→ jknetl joined	14:54
	→ marc_v92 joined	14:54
makinen	how do I set the account name which is be used in pushing to the remote repo	14:54
	→ romerocesar joined	14:55
grawity	http(s) or ssh?	14:55
	also, github ssh or 'plain' ssh?	14:55
	→ IrishPrime joined	14:55
	← dminca left	14:55
	← IrishPrime left	14:56
	← jknetl left	14:56
makinen	I'm not sure. I can log into our gitlab server	14:56
	ssh I guess	14:56
	← marc_v92 left	14:56
grawity	ok then, what remote URL is shown in `git remote -v`?	14:57
	← carell left	14:57
	→ IrishPrime joined	14:57
	← ResidentBiscuit left	14:57
makinen	origin [email@hidden.address] (fetch)	14:58
	→ visualshock joined	14:58
visualshock	What does ** mean in paths?	14:58
jhass	smells like xy to me. makinen, what's your actual problem? Try to describe without any assumptions made	14:58
	visualshock: it expands to any file or directory below, recursively	14:59
	← romerocesar left	14:59
visualshock	jhass, thanks!	14:59
	← dopesong left	14:59
	→ lindenle joined	15:00
	→ mmlb joined	15:00
happycoder	I have a cache folder in my dotfiles repo. I added it to gitignore only after initial commit. How to remove cache from the repo completely?	15:00
	← mmlb left	15:00
grawity	happycoder: filter-branch	15:01
	→ acetakwas joined	15:01
	← dsdeiz_ left	15:02
	← davisonio left	15:02
	→ dminca joined	15:02
	→ rkazak joined	15:03
	→ ReenignE joined	15:03
	← ReenignE left	15:03
	→ ReenignE joined	15:03
	→ yx_ joined	15:04
	→ ResidentBiscuit joined	15:05
makinen	jhass: I copied a working git branch directory from another computer. Now git asks for a password for 'git@dev..' instead of the user name I'm using to log into gitlab	15:05
	← gingitsune left	15:05
jhass	makinen: copy your SSH key too	15:05
	or add this machines SSH key to your gitlab account	15:05
makinen	ah	15:06
	yx_ → xnrand	15:06
	→ mmlb joined	15:06
grawity	for gitlab, the ssh username is always 'git', you're recognized entirely based on your pubkey	15:06
	→ davisonio joined	15:07
	→ Matrixiumn joined	15:07
	→ sonOfRa_ joined	15:07
	→ noteness_ joined	15:07
	← rkazak left	15:07
moritz	secret key, actually	15:07
jhass	debatable semantics	15:08
grawity	keypair, let's say	15:08
jhass	I'll stick to keypair	15:08
	→ paul424 joined	15:08
grawity	IMHO when one says 'secret key' it tends to be more about symmetric keys	15:08
	like with HMAC	15:09
	→ QshelTier joined	15:09
jhass	you're recognized by proving ownership of a public key, to do that you do need the corresponding private key. So both are involved and keypair is probably really the best term	15:09
grawity	so calling SSH publickey auth 'secret key'-based would be more ambiguous than not	15:09
	yeah, I guess	15:09
	→ wagle_ joined	15:09
	← neanderslob left	15:10
	→ dr_leppe1 joined	15:10
	→ ocbtec_ joined	15:10
	→ vmiklos joined	15:10
	← flopsec left	15:10
	← iLembus_ left	15:10
	← noteness left	15:10
	← ocbtec left	15:10
	← ph88 left	15:10
	← TomyWork left	15:10
	← SirFunk_ left	15:10
	← uidzer0 left	15:10
	← sauvin left	15:10
	← hexagoxel left	15:10
	← pks left	15:10
	← BombStrike left	15:10
	→ diegoaguilar joined	15:10
	→ Karunamon\|2 joined	15:10
	→ uidzer0 joined	15:10
	→ LiENUX joined	15:10
	→ nocbreak joined	15:10
	→ kisonecat_ joined	15:10
	← TheHackOps left	15:10
	→ e-dardl joined	15:10
	→ BombStrike joined	15:10
	→ pks joined	15:10
	→ SirFunk joined	15:10
	→ NotTheFBI joined	15:10
	→ tjone270 joined	15:10
	→ hexagoxel_ joined	15:10
	→ iLembus_ joined	15:10
	→ Cyclohexane joined	15:11
	→ lss8 joined	15:11
	→ ph88 joined	15:11
	→ synthmeat joined	15:11
	→ gsingh93 joined	15:11
	→ tilpner joined	15:11
	→ NeverDie joined	15:11
	→ wrksx joined	15:11
	→ TomyWork joined	15:11
wrksx	hey guys	15:11
	← cyan__ left	15:11
osse	hey joe	15:11
	→ Timvde joined	15:11
	hexagoxel_ → hexagoxel	15:11
	→ flopsec joined	15:12
wrksx	wondering, when merging a feature branch in the master branch, do you personalize the merge commit message ?	15:12
	→ sauvin joined	15:12
jast	not if the branch name is descriptive enough	15:12
	→ Hello71 joined	15:12
	wagle_ → wagle	15:12
jast	in fact git used to default to not prompting you for a commit message for merges	15:12
	→ haasn` joined	15:13
wrksx	I was thinking 'in case someone is not clear about the content they can check history	15:13
	→ Motoko joined	15:13
	← zeemz left	15:14
	← FrontPsych left	15:14
	→ jason237 joined	15:14
	← paul424 left	15:14
	→ bango2 joined	15:14
wrksx	(sorry interrupted by phone call)	15:15
	but I wondered if any of you had experience with that workflow =)	15:15
	← ThomasLocke_ left	15:15
	→ FrontPsych joined	15:15
	→ JRHaigh joined	15:15
	← fracting left	15:15
	← Sceorem left	15:16
	← PHPanos left	15:17
	← diegoaguilar left	15:17
	→ TooLmaN joined	15:17
	← TooLmaN left	15:18
	→ diegoaguilar joined	15:19
	← Phylock left	15:19
	→ zumba_ad_ joined	15:19
osse	I customize it often, to pretend my branch had a better name that what it actually had :p	15:20
	→ abra0 joined	15:20
	→ ToBeFree joined	15:20
	→ tyreld joined	15:21
	→ paul424 joined	15:21
	← synthroid left	15:21
	→ _ng joined	15:22
	→ mariuscc joined	15:24
	← TomyWork left	15:24
	→ thiago joined	15:26
wrksx	Lets say I tried to merge branch A into master, but a conflict occur. Now I want to fix the conflict. But the conflict is a pain in the ass to solve, and I got something else to do urgently, and I need to get a clean master before checking out to another "unrealated" branch. What method would you recommend?	15:26
	→ Pegasus_RPG joined	15:26
	→ carell joined	15:27
Pegasus_RPG	Hello. I've messed up a subdirectory in my repo and need to pull a copy from the upstream repo I cloned. How can I do that? git checkout <directory> seems to only pull from my fork	15:28
wrksx	I used to reset hard master to the previous commit to fix that. is that ok? Is there any better way? I'm think of the revert stuff specially, not sure how revert is different from that reset.	15:28
	← acetakwas left	15:28
	→ sweatsuit joined	15:29
	← visualshock left	15:29
	→ fracting joined	15:29
	→ nettoweb joined	15:29
	← mithenks left	15:29
	← remitamine left	15:29
	← _August_ left	15:30
	→ acetakwas joined	15:30
	→ _August_ joined	15:30
	→ mib_0ye joined	15:31
	nwf_ → nwf	15:31
wrksx	Pegasus_RPG, Beware, I'm not a pro. That beeing said, I know checkout is only retreiving stuff from your local repo. "Pull" is what you actually use to retreive stuff from a remote.	15:31
	Pegasus_RPG, now even if you messed things in your branch, what was in it before you mess it up should still be retreivable from your local copy.	15:32
	← nettoweb left	15:32
jhass	Pegasus_RPG: git checkout upstream/master -- folder	15:33
	or whatever your remote is named	15:33
	← fracting left	15:34
	→ nettoweb joined	15:34
ReenignE	wrksx: Revert applies commit patches in reverse, it makes new changes which are simply the opposite of the patches. This is ideal when you have to revert commits that are already being tracked remotely, allowing you to make new commits which reverse the changes without changing the history.	15:34
	← mib_0ye left	15:35
ReenignE	wrksx: `git merge --abort` could have been used if you're using git >= 1.7.4	15:35
	→ jaguarmagenta joined	15:36
	← Softeisbieger left	15:36
	← sweatsuit left	15:36
wrksx	ReenignE, right thanks for the detailled info.	15:37
	→ DieguezZ joined	15:37
Pegasus_RPG	jhass: great, thank you!	15:38
	oops I omitted the --	15:38
	→ weckl joined	15:38
	→ mib_0ye joined	15:38
	→ nitin joined	15:38
	→ doktori joined	15:38
	← diegoviola left	15:38
	→ sweatsuit joined	15:39
	← Gsham left	15:39
	← vuoto left	15:39
GodGinrai	Pegasus_RPG: `git checkout <commit_hash> file`. Just provide the commit hash of the upstream and you should be good.	15:40
	← jaguarmagenta left	15:40
	→ vuoto joined	15:41
	← cdg_ left	15:41
mib_0ye	http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5 http://tinyurl.com/jfcurn5	15:42
	→ zeroed joined	15:42
	← mib_0ye left	15:42
	← Balliad left	15:42
	→ toogley joined	15:42
	→ remitamine joined	15:43
	← Pegasus_RPG left	15:43
	→ kadoban joined	15:43
	← leandrosansilva left	15:43
	← toogley left	15:43
	← Trinity left	15:45
	→ Trinity joined	15:46
	← reim left	15:46
	→ Electrometro joined	15:47
wrksx	I've read somewhere that reset --soft can be undone	15:48
	So I set up a test repo, couples of commit, and reset soft.	15:48
	→ Phylock joined	15:48
wrksx	Now I'm wondering how to 'undo' the soft reset =)	15:48
	← Electrometro left	15:49
wrksx	Let me know if you know how =)	15:49
	← doktori left	15:49
ReenignE	wrksx: Likely said because a soft reset leaves the changes in the working copy and only resets the local git index to the ref provided. Meaning the working copy remains untouched.	15:49
wrksx	ouch	15:49
	ReenignE, So you mean my commit is gone?	15:50
i7c	git reset --soft HEAD@{1}	15:50
	→ Gsham joined	15:50
ReenignE	^	15:50
	reset again	15:50
wrksx	lol	15:50
	reset forward wth	15:50
ReenignE	You can see the point before your reset in `git reflog`	15:50
	← ahmed_elgabri left	15:50
ReenignE	Even resets are additive wrt your local reflog.	15:50
	→ kpease joined	15:50
wrksx	let's check reflog, learnin is nice	15:51
	→ King_Hual joined	15:51
	→ akushner joined	15:51
	→ ochorocho__ joined	15:51
ReenignE	The HEAD@{1} in the command i7c mentioned is the format seen in the reflog.	15:51
wrksx	So this actually is not literally a reset forward. I's a reset to the state before the first reset. Well done git u smart	15:52
	→ m0nkmaster joined	15:52
i7c	wrksx, reset is nothing like revert. You can even reset a branch to a totally unrelated commit with no common ancestry.	15:52
wrksx	And you guys are so helpful thanks a lot	15:52
i7c	It just goes to another commit, it does not care about forward, backward, or none of those.	15:52
	→ jh3 joined	15:53
	← happycoder left	15:53
	KellerKatze → KellerFuchs	15:53
	→ synthroid joined	15:54
	→ annoymouse joined	15:54
	← diegoaguilar left	15:55
	→ dsdeiz joined	15:55
	← dsdeiz left	15:55
	→ dsdeiz joined	15:55
	← nitin left	15:55
	← mikecmpb_ left	15:56
	← steadystatic left	15:56
	→ irco joined	15:56
	→ scoobert1on joined	15:56
wrksx	Men, git is simply one of the best piece of software I ever seen	15:56
_ikke_	Nice to hear that :-)	15:57
	→ cyan__ joined	15:57
wrksx	It can do everything	15:57
jhass	git make me a pizza	15:58
	git: 'make' is not a git command. See 'git --help'.	15:58
	don't get my hopes up like that :(	15:58
wrksx	lulz	15:58
osse	wrksx: except tracking empty directories	15:58
	KEK	15:58
	← paul424 left	15:58
	← Chill_Surf left	15:59
	→ fuchstronaut joined	15:59
	← King_Hual left	16:00
wrksx	osse, hum yeah... Looks like there are still room for improvement =)	16:00
	→ fmcgeough joined	16:01
	→ EvilPenguin joined	16:01
	→ TomyLobo joined	16:01
	→ reim joined	16:02
	← ramsub08 left	16:02
wrksx	oh shit I was about to leave the office when "the sound of silence" started	16:03
	← kfpratt left	16:03
wrksx	gotta work a few minutes more =)	16:03
	→ efdetonator joined	16:03
	← reim left	16:03
	→ clemf joined	16:04
	→ javster joined	16:04
	← wrksx left	16:04
	← clemf left	16:04
	← mbrzuzy left	16:04
	→ dokma joined	16:04
	← fuchstronaut left	16:04
	→ clemf joined	16:05
dokma	git status says there are 5 moded files. However only 1 has actual changes, the others seem to just have the modification time changed. What's best in this case?	16:05
	→ reim joined	16:05
	→ aarobc joined	16:05
	← carell left	16:06
	← DieguezZ left	16:06
	← zeroed left	16:07
	→ phanimahesh joined	16:07
	← mmlb left	16:08
	← cyan__ left	16:08
	← efdetonator left	16:08
	→ eletuchy joined	16:09
	← a_thakur_ left	16:09
	← _August_ left	16:10
	← Phylock left	16:10
	Matrixiumn → Xack	16:10
	→ _August_ joined	16:11
	markmark → markmarkmark	16:11
	→ romerocesar joined	16:12
	← davisonio left	16:12
	→ mmlb joined	16:12
	→ xaviergmail joined	16:12
	spudowiar1 → spudowiar	16:12
	← eletuchy left	16:13
	← xaviergmail left	16:14
_ikke_	git update-index --refresh	16:14
	?	16:14
	→ efdetonator joined	16:15
	→ k3rn31 joined	16:15
	→ durham joined	16:16
	← durham left	16:16
	→ AaronMT_ joined	16:17
	← AaronMT left	16:17
	→ tomog999 joined	16:18
	→ davisonio joined	16:18
	← clemf left	16:18
	← mmlb left	16:19
	← tomog999_ left	16:20
	→ carell joined	16:21
	← m0nkmaster left	16:21
	→ dreiss joined	16:23
	← Gsham left	16:23
	→ nidr0x joined	16:23
	→ AaronMT joined	16:25
	→ netcarver joined	16:25
	← Urbany left	16:25
	← flopsec left	16:25
	← AaronMT_ left	16:26
	← WizJin left	16:26
	→ durham joined	16:26
	→ ahmed_elgabri joined	16:27
	← invisbl left	16:27
	→ M-ou-se joined	16:27
	→ invisbl joined	16:28
	← vuoto left	16:28
	→ King_Hual joined	16:28
	→ vuoto joined	16:28
	← arand left	16:29
	→ ramsub07 joined	16:29
	← imjacobclark left	16:29
	← astrofog left	16:29
	→ FuzzySockets joined	16:29
	QshelTier → Bombe	16:29
	→ Phylock joined	16:29
	→ samson joined	16:30
	→ settermjd joined	16:30
	← vuoto left	16:30
	→ vuoto joined	16:31
	← vuoto left	16:31
	→ maestrojed joined	16:31
	→ vuoto joined	16:31
	← satbyy left	16:31
	← vuoto left	16:32
	→ vuoto joined	16:32
	← vuoto left	16:32
	→ vuoto joined	16:32
	← Asiajey left	16:32
	← ochorocho__ left	16:33
	→ ochorocho__ joined	16:33
	→ NightMonkey joined	16:34
	→ rkazak joined	16:34
	← SimonNaa left	16:34
	← vuoto left	16:35
	→ vuoto joined	16:36
	→ blackpajamas joined	16:36
	← Hounddog left	16:37
	→ clemf joined	16:37
	← dminca left	16:37
	← GandalfTheWizard left	16:38
	→ dminca joined	16:38
	← rkazak left	16:38
	→ subhojit777 joined	16:38
	← StuartMI left	16:39
	← carell left	16:40
	← shinnya left	16:40
	→ xall joined	16:41
	→ EduardoMartins joined	16:41
	← jimi_ left	16:41
	→ realz joined	16:42
	← dreiss left	16:42
	← vuoto left	16:44
	← kurkale6ka left	16:44
	→ vuoto joined	16:44
	→ mbrzuzy joined	16:45
	→ mase-tech joined	16:45
	→ Gsham joined	16:48
	→ vuoto_ joined	16:48
	← sebbu left	16:50
	← dan2k3k4 left	16:52
	← invisbl left	16:53
	→ DevAntoine joined	16:53
DevAntoine	hi	16:53
	I need to remove the last commit from develop which is a merge from another branch	16:53
	(and it's already been pushed)	16:53
	→ User458764 joined	16:53
DevAntoine	can I simply git resert --hard HEAD^1 and force push or considering it's a merge it's more complicated?	16:54
	← durham left	16:54
	← clemf left	16:55
milki	the only "complicated" part is how you undo it. which you seem to have a handle on already	16:55
	→ taylorm joined	16:56
	← netcrime left	16:57
	→ clemf joined	16:58
GodGinrai	DevAntoine: https://git-scm.com/blog/2010/03/02/undoing-merges.html	16:59
	→ mmlb joined	16:59
	→ crater2150 joined	16:59
DevAntoine	yeah, reset hard will do the trick	17:00
	← troulouliou_div2 left	17:02
	→ carell joined	17:02
	→ steadystatic joined	17:02
	← romerocesar left	17:03
	← EvilPenguin left	17:03
	→ eletuchy joined	17:03
	← clemf left	17:03
	← encod3 left	17:03
	→ madewokherd joined	17:04
	← crose left	17:04
	← thiago left	17:05
ResidentBiscuit	Or you can do a revert commit	17:05
	If you dont want to have to force push	17:05
	← johnflux left	17:06
	→ romerocesar joined	17:07
	→ EvilPenguin joined	17:07
	← piattino left	17:07
	← blackpajamas left	17:07
	← eijk left	17:08
	→ clemf joined	17:08
	← eletuchy left	17:08
	→ eijk joined	17:08
	← d0nkeyBOB left	17:08
	← netcarver left	17:09
	→ rbern joined	17:10
	→ jceb joined	17:10
	→ netcarver joined	17:11
	← netcarver left	17:11
	→ elastix joined	17:12
	→ kwizart joined	17:12
	→ d0nkeyBOB joined	17:12
	← eijk left	17:13
	← vuoto_ left	17:13
	→ romerocesar_ joined	17:13
	→ vuoto_ joined	17:14
	← vuoto_ left	17:14
	← vuoto left	17:14
	→ StuartMI joined	17:14
	→ jimi_ joined	17:14
	→ vuoto joined	17:14
	← vuoto left	17:14
	← elastix left	17:14
	→ vuoto joined	17:14
	← reim left	17:15
	← romerocesar left	17:15
	← Gsham left	17:16
	← romerocesar_ left	17:16
	→ romerocesar joined	17:16
	← Arban left	17:17
	→ Arban joined	17:17
	→ dreiss joined	17:17
	→ DieguezZ joined	17:17
	← realz left	17:17
	→ realz joined	17:18
	← clemf left	17:18
	← mdw left	17:18
	→ clemf joined	17:18
	→ diegoaguilar joined	17:19
	→ d5sx43 joined	17:19
	← romerocesar left	17:20
	← settermjd left	17:20
	→ refried_ joined	17:20
refried_	I've been using git stash -k -u to prepare to test whether the thing i'm about to commit builds correctly —then when I ran into a build issue, I did git stash pop to undo the stashing, with the intent to fiddle with the index some more to get exactly the right thing in there	17:22
	but, when i stash pop I get a bunch of conflicts	17:22
	luckily I made a backup in anticipation of this; but does the thing I'm trying to do make sense, and is there a safe way to do it?	17:22
	→ WizJin joined	17:23
refried_	e.g. to do a stash and then undo it to the pre-stash state if you don't like the outcome? without creating conflicts	17:23
	*i.e.	17:23
	→ Gsham joined	17:24
	→ a_thakur joined	17:25
	← lindenle left	17:26
	← dminca left	17:27
	→ dminca1 joined	17:28
	→ lindenle joined	17:29
	→ arand joined	17:29
	← a_thakur left	17:30
	→ uhmgswa^2 joined	17:30
milki	refried_: either stop making conflicting changes while your stash is stashed	17:31
	refried_: or use real branches	17:31
	← italoacasas left	17:31
	→ satbyy joined	17:32
	← d5sx43 left	17:32
	→ hahuang65 joined	17:33
	→ nwkj86 joined	17:33
	← carell left	17:33
	← uhmgawa left	17:33
	← davisonio left	17:34
	← notebox left	17:34
	← acetakwas left	17:35
	← Ahmed90 left	17:36
	→ jorelc joined	17:36
	→ italoacasas joined	17:36
	→ jaguarmagenta joined	17:37
	← Gsham left	17:37
	→ reim joined	17:38
	← espindola left	17:40
	→ flopsec joined	17:40
	← User458764 left	17:41
	← jaguarmagenta left	17:41
	← texinwien left	17:41
	← d0nn1e left	17:41
	← refried_ left	17:42
	→ thiago joined	17:43
	→ d0nn1e joined	17:43
	→ User458764 joined	17:44
	→ alex1a joined	17:45
	→ Repox joined	17:47
	← cdown left	17:47
	→ cyan__ joined	17:49
	→ basiclaser joined	17:49
	← italoacasas left	17:49
	→ italoacasas joined	17:50
	→ pipegeek joined	17:51
	→ w00tner joined	17:51
w00tner	hello!	17:51
	→ paul424 joined	17:52
w00tner	i have several repo that got forked . I did a bug fix. but i only want to send that commit to other repos. do i have to use patch in this case ?	17:52
	← marcogmonteiro left	17:54
	← clemf left	17:54
	→ refried_ joined	17:55
jhass	at least I don't understand your situation. Could you try to describe it differently again? If possible with some real values (I did a clone of https://foo and then a commit on the master branch... something like that)	17:55
	← diogenese left	17:55
	← cyan__ left	17:56
	← moei left	17:56
	← DieguezZ left	17:57
	→ davisonio joined	17:57
	→ diogenese joined	17:57
	→ eletuchy joined	17:58
	← nnyk_ left	17:59
	← iLembus_ left	18:00
	← remitamine left	18:00
	→ clemf joined	18:00
	← ochorocho__ left	18:00
nocbreak	refried_: git stash pop will not make conflicts unless you changed something from where it was stashed	18:00
refried_	nocbreak hmm it really seemed to	18:00
	→ fuchstronaut joined	18:00
	← nidr0x left	18:01
	← achadwick left	18:01
refried_	milki I didn't edit any of the files externally	18:02
	i had files with some changes staged and some changes not staged	18:02
	← eletuchy left	18:02
refried_	i did git stash -k -u to hide the unstaged changes	18:02
	→ zjaffee joined	18:02
	← zjaffee left	18:02
refried_	and when I did git stash pop, the files had conflicts	18:02
	I didn't edit any source in between	18:03
	just compiled them, which doesn't affect any tracked files	18:03
	→ fii joined	18:03
	→ carell joined	18:04
	← ahmed_elgabri left	18:04
	← fuchstronaut left	18:05
	← tabrez left	18:05
	→ moei joined	18:05
nocbreak	did you really get a conflict? with conflict markers?	18:06
	← jason237 left	18:06
	← davisonio left	18:06
	← afuentes left	18:08
	nocbreak → cbreak	18:08
	→ jason237 joined	18:08
	→ texinwien joined	18:09
	→ Pegasus_RPG joined	18:09
	→ Urbany joined	18:09
refried_	cbreak: I dunno about conflict markers; I got as far as this https://gist.github.com/refried/c95a1033d7a4b84952beccbbccb1c246 before restoring from backup	18:09
cbreak	git status / git diff should tell you what conflicts	18:10
	→ leeN joined	18:10
cbreak	refried_: if you really didn't change anything, just nuke away the index with git reset --hard	18:10
	← DevAntoine left	18:10
	← fscala left	18:10
	→ fuchstronaut joined	18:10
	← ehuuwj left	18:10
refried_	did you look at the gist	18:11
cbreak	yes	18:11
refried_	git status showed unmerged paths: "both added"	18:11
cbreak	yes, because you kept the index	18:11
	so you had changes that added some file	18:12
	← fuchstronaut left	18:12
cbreak	and you had that change stashed too	18:12
	so it seems to have conflicted	18:12
	→ m0viefreak joined	18:12
refried_	i guess it was an added file that was partially staged and partially not	18:12
	then the unstaged part stashed away	18:12
	then it conflicted with itself	18:13
	→ fscala joined	18:13
refried_	i don't remember what the inside of the file looked like, or if I even checked it, but I would've expected git stash and git stash pop to be inverses	18:13
	← efdetonator left	18:13
refried_	given that there were no other changes	18:14
	→ remitamine joined	18:14
cbreak	refried_: they are	18:14
	but you used -k	18:14
	that leaves debries behind	18:14
refried_	right, but that doesn't change my expectation	18:14
	→ cdg joined	18:14
	→ ajf- joined	18:14
refried_	it's not debris, it's a view of what the commit will look like	18:15
	is there a safer way to do that?	18:15
	my goal is to test whether a commit i'm preparing will compile	18:16
	→ Sucks joined	18:16
refried_	so stash -k -u will make my working dir look like the commit	18:16
	→ crayon joined	18:17
refried_	but then stash pop immediately after creates conflicts 0_o	18:17
cbreak	just nuke the changes away when you're done	18:17
	git reset --hard HEAD should kill everything uncommitted	18:17
refried_	i don't wanna kill everything uncommitted, i had uncommitted, unstaged work that i didn't want to lose	18:17
	← inflames left	18:17
cbreak	so?	18:17
	you stashed those away	18:18
	→ anth0ny joined	18:18
refried_	right, but when i applied the stash i got conflicts — which lead me to believe that that wasn't a safe way to save those changes	18:18
	→ mablae joined	18:18
refried_	*head	18:18
	*led	18:18
	heh	18:18
	don't want conflicts	18:18
	← Pegasus_RPG left	18:19
	→ dstarh joined	18:19
	→ joshc joined	18:19
	weber.freenode.net set mode: +v	18:19
refried_	just want to restore the working dir to the pre-stash state	18:19
	← phaleth left	18:20
ToxicFrog	refried_: wait, what actually happened here? You stashed, then made a bunch of changes, then did "stash apply" without committing the changes you just made?	18:20
cbreak	refried_: so, do what I told you	18:20
	← remitamine left	18:20
refried_	ToxicFrog: no, i stashed -k -u, made no changes, did stash pop, which resulted in a bunch of conflicts	18:21
ToxicFrog	Ooooh. You stashed with --keep-index.	18:21
	→ elastix joined	18:21
refried_	nod	18:22
	→ uhmgawa joined	18:22
	→ zjaffee joined	18:22
refried_	wondering if there's a way to do something similar without generating conflicts	18:22
	← uhmgswa^2 left	18:23
	← jorelc left	18:24
	← realz left	18:25
refried_	so that i can run tests on the working dir as it will appear in the commit (this is why i did stash -k -u), and then continue working with the unstaged changes in tact (this is why i did stash pop); there were no changes other than those made by those two commands	18:25
	→ mostlybadfly joined	18:25
	→ realz joined	18:25
	→ davidosomething joined	18:25
	← stonerfish left	18:26
	← subhojit777 left	18:27
kadoban	refried_: https://www.emptypath.com/git_pre_commit_testing this is my way to do that, if it helps	18:27
	→ foist joined	18:27
refried_	thanks i'll check it otu	18:28
kadoban	(I didn't follow the conversation, just responding to the last line)	18:28
refried_	*out	18:28
	yeah that's good enough	18:28
	basically trying to do pre-commit testing	18:28
	← ramsub07 left	18:28
	→ Dyonisos joined	18:28
refried_	provided it's actually based on the contents of the commit, and not the contents of the working dir	18:28
	→ Sasazuka joined	18:29
	← annoymouse left	18:29
	→ stonerfish joined	18:29
kadoban	Yep, that's the same goal the blog post has. You can skip to the final result if it's too verbose, though you miss out on a bit of ... why you have to do all the extra crap.	18:30
	← reim left	18:30
	→ durham joined	18:30
foist	Is there some way to do `git diff`, but only include lines in the diff that match a certain pattern? I want to generate a diff that only contains logger lines.	18:31
refried_	kadoban: i had backed up my working dir, anticipating problems; that worked too, just... sigh	18:31
	→ romerocesar joined	18:32
kadoban	refried_: Yeah I used to have kind of a horrible thing based on the script just making a backup, but ... it sucked, and took forever too.	18:34
	→ CJKinni` joined	18:34
	→ reim joined	18:34
	← irco left	18:35
	← reim left	18:35
	← rbern left	18:35
	→ LeBlaaanc joined	18:37
	← CJKinni left	18:37
	→ \|2321 joined	18:37
	← romerocesar left	18:37
	→ eka_ joined	18:38
	← eka left	18:40
	← k3rn31 left	18:40
	← clemf left	18:41
	→ diegoviola joined	18:41
	→ dmto joined	18:42
	→ duderonomy joined	18:44
	← zjaffee left	18:45
	→ fuchstronaut joined	18:45
	→ livingstn joined	18:47
	← paul424 left	18:47
	→ maucar joined	18:47
	← jceb left	18:49
	→ settermjd joined	18:49
	→ sebbu joined	18:49
	← tgunr left	18:51
	← User458764 left	18:52
	← aax left	18:53
	→ ochorocho__ joined	18:56
	← eka_ left	18:56
	→ ahmed_elgabri joined	18:57
	→ kfpratt joined	18:57
	← mmlb left	18:58
	← ochorocho__ left	19:00
	→ paul424 joined	19:01
	→ User458764 joined	19:02
	→ vuoto_ joined	19:03
	→ annoymouse joined	19:03
	→ ochorocho__ joined	19:04
	→ mwhooker joined	19:04
	← vuoto left	19:04
	← refried_ left	19:04
	→ tgunr joined	19:05
	→ refried_ joined	19:06
	→ eka joined	19:06
	→ eletuchy joined	19:06
	← FuzzySockets left	19:07
	→ steadystatic_ joined	19:07
	→ eletuchy_ joined	19:08
	← steadystatic left	19:09
	steadystatic_ → steadystatic	19:09
	← settermjd left	19:09
	→ t0by joined	19:10
	← nettoweb left	19:10
	← eletuchy left	19:11
	← eka left	19:11
	← dsdeiz left	19:12
	← zumba_ad_ left	19:12
	→ FuzzySockets joined	19:12
	→ a_thakur joined	19:13
	→ quetz joined	19:13
	← eletuchy_ left	19:14
	← carell left	19:14
	← vuoto_ left	19:15
	→ vuoto joined	19:15
	← netj left	19:15
	→ eletuchy joined	19:15
	→ carell joined	19:15
	→ netj joined	19:16
	→ settermjd joined	19:16
	← AaronMT left	19:17
	← a_thakur left	19:18
	← cyphase left	19:19
	← howdoi left	19:19
	→ cyphase joined	19:20
	→ courrier joined	19:20
	→ roger_raymond joined	19:22
	← fahadash left	19:22
	← tgunr left	19:22
	← Calrik left	19:24
	→ SoRoot joined	19:25
	← johnmilton left	19:26
	→ harish joined	19:27
	← ResidentBiscuit left	19:28
	→ bewilled joined	19:28
	→ tabrez joined	19:28
	→ ResidentBiscuit joined	19:28
	← t0by left	19:29
bewilled	Hi. How can I make sure dev and master are the same each time I want to push to dev?	19:29
	→ feignix joined	19:29
	← jh3 left	19:30
	← feignix left	19:30
milki	this sounds very specific to your problem. do you have any details to share?	19:30
	← phanimahesh left	19:31
	→ feignix joined	19:31
	→ t0by joined	19:31
GodGinrai	bewilled: that sounds weird. Shouldn't master be behind dev?	19:31
bewilled	GodGinrai: I'm thinking just allowing one commit to dev	19:33
	GodGinrai: then that commit is either pushed or discarded	19:33
	→ eletuchy_ joined	19:34
	→ efdetonator joined	19:35
	← eletuchy left	19:36
	→ eletuchy joined	19:37
	→ jaguarmagenta joined	19:37
	→ remitamine joined	19:38
bewilled	GodGinrai: Push to dev, test. If everything is correct push to master, else don't allow new commits until the incorrect commit is removed	19:39
	← eletuchy_ left	19:39
	← _ng left	19:40
	← sauvin left	19:41
	→ eletuchy_ joined	19:41
	← jaguarmagenta left	19:42
	→ sauvin joined	19:43
	→ eletuch__ joined	19:43
	← fuchstronaut left	19:43
	← eletuchy left	19:43
	→ eletuchy joined	19:45
	← eletuchy_ left	19:45
	← d0nkeyBOB left	19:46
	← docnvk left	19:47
	← eletuch__ left	19:48
	→ eletuchy_ joined	19:48
	→ cdown joined	19:48
	← texinwien left	19:48
	→ editshare-ericf joined	19:49
	← EvilPenguin left	19:50
	← ahmed_elgabri left	19:50
	← eletuchy left	19:50
	→ Tryop88 joined	19:51
	← _August_ left	19:51
	→ fahadash joined	19:51
	→ _August_ joined	19:51
	→ FeersumEndjinn joined	19:51
	← FeersumEndjinn left	19:52
	→ EvilPenguin joined	19:53
	→ eletuchy joined	19:54
	← harish left	19:55
	← liuzhen left	19:56
	← mariuscc left	19:56
	→ eletuch__ joined	19:56
	← eletuchy_ left	19:56
	→ liuzhen joined	19:57
	→ zmanfx joined	19:57
	← SoRoot left	19:57
	← cdown left	19:57
	← eletuchy left	19:59
	→ eletuchy joined	20:00
	→ rbern joined	20:00
	← eletuch__ left	20:02
	→ fuchstronaut joined	20:02
	→ zumba_ad_ joined	20:02
	→ eletuchy_ joined	20:03
	→ mmlb joined	20:03
	→ valerd joined	20:05
	← rbern left	20:05
	← eletuchy left	20:05
GodGinrai	is there any simple way to find that a branch is up-to-date with its remote that I can use in a script?	20:05
BlaXpirit	GodGinrai, google, the answers are there	20:06
GodGinrai	Googling shows me some `git rev-list` parsing and `git pull --dry-run` solutions	20:06
	But those honestly seem like using the wrong tool for the job	20:06
	I was wondering if there was a simpler method	20:07
BlaXpirit	well what's your actual use case?	20:07
	← fuchstronaut left	20:07
	→ dopesong joined	20:07
	→ b1tchcakes joined	20:07
	→ harish joined	20:07
	→ docnvk joined	20:07
	← tabrez left	20:07
efdetonator	you can git fetch and compare git rev-parse branch with git rev-parse origin/branch	20:08
GodGinrai	BlaXpirit: Basically, we have users pushing old code to our test server, which causes problems. The rule is that you are supposed to pull the latest master before placing the codes on the server, so I wanted to add some code to our script that pushes that makes it bail if your master is not up-to-date	20:08
BlaXpirit	GodGinrai, but git will not allow you to push	20:09
	→ eletuchy joined	20:09
	← refried_ left	20:09
GodGinrai	BlaXpirit: this isn't a git push we're disallowing.	20:09
BlaXpirit	ah you're probably not pushing, just copying	20:09
	→ madduck_ joined	20:09
	→ a_thakur joined	20:10
	← weckl left	20:10
GodGinrai	BlaXpirit: you can call it whatever you want, my point is that we are trying to disallow the user from doing something non-git if their master is not up-to-date	20:10
	→ eletuch__ joined	20:11
	← mwhooker left	20:11
	← dopesong left	20:11
GodGinrai	efdetonator: does that return the commit hashes that the branches point to?	20:11
	← eletuchy_ left	20:11
BlaXpirit	GodGinrai, well what's wrong with this one http://stackoverflow.com/a/3278427	20:11
	→ zjaffee joined	20:12
	← diegoaguilar left	20:12
	→ eletuchy_ joined	20:13
	LiENUX → LiENUS	20:13
	← eletuchy left	20:13
GodGinrai	BlaXpirit: honestly, the fact that git parrots at me in tons of other tasks whether my branch is up-to-date, I assumed that it had a command that could be used to just check that.	20:13
	→ eletuchy joined	20:14
	← eletuch__ left	20:15
	← a_thakur left	20:15
	→ dopesong joined	20:15
	→ eletuch__ joined	20:16
	→ siddharaj6010_ joined	20:17
	← basiclaser left	20:17
	← eletuchy_ left	20:17
	→ rbern joined	20:19
	→ clemf joined	20:19
	← eletuchy left	20:19
efdetonator	GodGinrai: yes	20:19
	→ eletuchy joined	20:19
	→ jh3 joined	20:20
	→ boombatower joined	20:20
	← DolphinDream left	20:21
	→ refried_ joined	20:21
	← remitamine left	20:22
	→ eletuchy_ joined	20:22
	→ SoRoot joined	20:22
	← eletuch__ left	20:22
	← SoRoot left	20:22
	→ jstein_ joined	20:23
	→ eletuch__ joined	20:24
	← eletuchy left	20:24
	jstein_ → jstein	20:25
	← siddharaj6010_ left	20:25
	← jchonig_ left	20:25
	→ eletuchy joined	20:25
	← jh3 left	20:26
	← eletuchy_ left	20:26
	→ eletuchy_ joined	20:27
	← valerd left	20:27
	← rwb left	20:28
	← eletuch__ left	20:28
	→ davisonio joined	20:29
	→ eletuch__ joined	20:29
	← clemf left	20:29
	← eletuchy left	20:30
	→ Jetchisel joined	20:30
	→ eletuchy joined	20:31
	→ sshbio joined	20:31
	→ clemf joined	20:31
	→ xaviergmail joined	20:32
	← eletuchy_ left	20:32
	← jeffreylevesque left	20:32
	→ cyan__ joined	20:32
	→ eletuchy_ joined	20:33
	→ romerocesar joined	20:33
	← eletuch__ left	20:33
	→ gingitsune joined	20:34
	← harish left	20:34
	→ eletuch__ joined	20:35
	← xaviergmail left	20:35
	← eletuchy left	20:36
	← docnvk left	20:36
	→ eletuchy joined	20:36
	← settermjd left	20:37
	← eletuchy_ left	20:37
	← MrMojito2 left	20:37
	← maucar left	20:37
GodGinrai	How does git tell if there are changes to commit, for example, in the output of git-status?	20:37
	← romerocesar left	20:38
	→ xaviergmail joined	20:38
	← carell left	20:39
	← EvilPenguin left	20:39
	→ radsy joined	20:39
	← eletuch__ left	20:39
	→ eletuchy_ joined	20:40
	← sshbio left	20:40
	← boombatower left	20:41
	← djb-irc left	20:41
	→ eletuch__ joined	20:41
	← eletuchy left	20:42
_ikke_	GodGinrai: it compares stat information + contents against its index	20:42
	← jimi_ left	20:42
	→ nachoman joined	20:43
GodGinrai	_ikke_: stat information being from the filesystem?	20:44
	→ jchonig joined	20:44
	← eletuchy_ left	20:44
	→ reim joined	20:44
	→ eletuchy joined	20:45
	→ ejb joined	20:45
	← xaviergmail left	20:45
	→ xaviergmail joined	20:45
	← mostlybadfly left	20:47
	→ eletuchy_ joined	20:47
	← courrier left	20:47
	← eletuch__ left	20:47
	← User458764 left	20:47
	← Timvde left	20:47
	← synthroid left	20:49
	→ eletuch__ joined	20:49
	← eletuchy left	20:49
	← IrishPrime left	20:50
rudi_s	GodGinrai: Yes.	20:50
	← zumba_ad_ left	20:50
rudi_s	It compares size/mtime and if necessary content against its index (.git/index) to decide which files contain modifications.	20:50
	← introsp3ctive left	20:51
	→ eletuchy joined	20:51
	← quetz left	20:51
	→ mage_ joined	20:51
	← eletuchy_ left	20:51
	← fmcgeough left	20:52
	← jason237 left	20:52
	→ eletuchy_ joined	20:53
	← eletuch__ left	20:53
	← paul424 left	20:53
	← feignix left	20:54
	← vuoto left	20:54
	← BigWillie left	20:54
	→ eletuch__ joined	20:55
	→ Timvde joined	20:55
GodGinrai	rudi_s: well, then that explains why `git status` in my mounted volume in docker shows that all of my files have changes that need to be committed.	20:55
	← mage_ left	20:55
	← eletuchy left	20:55
	→ eletuchy joined	20:56
	→ JanC_ joined	20:56
GodGinrai	but damn, I was hoping to be able to tell if the user had an unclean repo	20:57
	← eletuchy_ left	20:57
	← ResidentBiscuit left	20:57
rudi_s	GodGinrai: What?	20:57
	← \|2321 left	20:57
rudi_s	How does that explain anything?	20:57
	→ EvilPenguin joined	20:57
	JanC_ → JanC	20:57
	← FrontPsych left	20:58
	← FuzzySockets left	20:58
GodGinrai	rudi_s: the mode is different on every file in the mounted volume, and so it sees tons of changes	20:58
	→ eletuchy_ joined	20:58
	→ johnmilton joined	20:58
rudi_s	GodGinrai: Unless it's +-x, git doesn't care.	20:59
	→ AaronMT joined	20:59
	← eletuch__ left	20:59
GodGinrai	rudi_s: it's going from 100644 to 100755 for most of the files	20:59
rudi_s	I guess I don't want to know what you or docker are doing there .. but yes, if the x-bit changes, git will notice.	21:00
	← efdetonator left	21:00
	→ eletuch__ joined	21:00
	← eletuchy left	21:01
	→ cdown joined	21:01
GodGinrai	rudi_s: I'm just mounting a volume. I suspect it's not docker's fault, and actually the fault of virtualbox's shared folders. I could be wrong, tho'	21:01
	← aguimaraes1986 left	21:02
	→ harish joined	21:02
rudi_s	...	21:02
	← eletuchy_ left	21:02
	→ aidalgol joined	21:03
	← johnmilton left	21:03
	→ eletuchy joined	21:03
	← ash_workz left	21:05
	→ jeffreylevesque joined	21:05
	→ ahmed_elgabri joined	21:05
	← eletuch__ left	21:05
	→ eletuchy_ joined	21:07
	← harish left	21:07
	← ejb left	21:08
	→ diegoaguilar joined	21:08
	→ DieguezZ joined	21:09
	← eletuchy left	21:09
	→ eletuch__ joined	21:09
	→ nettoweb joined	21:09
	→ eletuchy joined	21:10
	← nettoweb left	21:11
	→ Gsham joined	21:11
	← eletuchy_ left	21:11
	→ cdown_ joined	21:11
	→ nettoweb joined	21:11
Seveas	!dropbox	21:11
gitinfo	Use git-remote-dropbox instead of placing your repository directly in the "Dropbox folder", or you'll get sync errors(and eventually, a corrupted repo). https://github.com/anishathalye/git-remote-dropbox	21:11
	← mbrzuzy left	21:12
	→ eletuchy_ joined	21:13
	← eletuch__ left	21:13
GodGinrai	rudi_s: is there any easy way to check just the contents of the files for changes instead of the mode?	21:13
	← clemf left	21:14
rudi_s	GodGinrai: core.fileMode = false	21:14
	→ ResidentBiscuit joined	21:14
	← cdown left	21:15
	← reim left	21:15
	cdown_ → cdown	21:15
	← eletuchy left	21:15
GodGinrai	rudi_s: Is there a way to do this temporarily without dirtying the config? (like how you can specify env vars before a command in shell: `SOMEVAR=1 ./my_script`)	21:16
	← nettoweb left	21:16
Seveas	git -c foo=bar	21:16
	→ eletuchy joined	21:16
	→ johnmilton joined	21:16
GodGinrai	Seveas: ty	21:16
	→ reim joined	21:17
	→ mellernoia joined	21:17
	→ stoopkid joined	21:17
	→ eletuch__ joined	21:18
	← eletuchy_ left	21:18
	→ apprentice joined	21:19
	← gingitsune left	21:19
	→ eletuchy_ joined	21:20
	← emPi left	21:20
	→ visualshock joined	21:20
	← eletuchy left	21:21
	← reim left	21:21
	→ clemf joined	21:21
	← w00tner left	21:21
	← apprentice left	21:21
	← eletuch__ left	21:22
	→ lildude3970 joined	21:22
	→ eletuchy joined	21:23
	→ reim joined	21:23
	← dstarh left	21:23
	gitinfo set mode: +v	21:24
lildude3970	It would appear that the code I've pushed to my github repo is showing up under a different username. Is it possible to change this for potentially the last 5-10 commits? :/	21:24
	← ochorocho__ left	21:24
	← TomyLobo left	21:24
	→ mwhooker joined	21:25
	→ eletuch__ joined	21:25
	← eletuchy_ left	21:25
	← hhee left	21:26
	→ eletuchy_ joined	21:27
	← eletuchy left	21:27
	→ eletuchy joined	21:29
visualshock	I have added contributors to my github repo, and when they push something it appears under "pull requests" right?	21:29
	← eletuch__ left	21:29
	← johnmilton left	21:30
Eugene	visualshock - if they have Push permissions to your repo they can push directly to the branches. You can make a Pull Request between branches within the same repo, but a more common Github workflow is to have the contributor Fork it into their own personal space, and then create a PR from that back to your parent repo	21:30
kadoban	visualshock: No, PRs are a separate thing. They require no permission from you to create.	21:30
	→ eletuch__ joined	21:30
	→ mage_ joined	21:30
kadoban	lildude3970: I forget how attribution works on github. Do you have your email address correct in your commits? Is it the same email address that github has on your account?	21:31
	← Spacew00t left	21:31
	← eletuchy_ left	21:31
	→ mdw joined	21:31
	← allcentury left	21:32
	← mdw left	21:32
visualshock	Ok, I have given them all push access, but I still had to merge the pull request. Maybe it was their intention.	21:32
	→ mdw joined	21:33
	← eletuchy left	21:33
	→ eletuchy joined	21:33
	← mdw left	21:34
kadoban	Probably. Having push access doesn't mean you have to use it, you can still create PRs.	21:34
	← xlegoman left	21:34
	→ mdw joined	21:35
	← mdw left	21:35
	← eletuch__ left	21:35
	→ eletuchy_ joined	21:36
GodGinrai	lildude3970: github determines this by the email address of the committer. Just make sure the email addrs are correct in the respective accounts	21:36
	→ mdw joined	21:37
	→ eletuch__ joined	21:37
	→ jaguarmagenta joined	21:38
	← eletuchy left	21:38
lildude3970	kadoban: The email address in the commits is correct, in fact it hasn't changed at all when I do a git config	21:39
	← mdw left	21:39
	→ raijin joined	21:39
	← Gsham left	21:39
lildude3970	GodGinrai: I actually just flat out deleted the other account a few minutes ago, because it's old and I don't use it, and I never wanted it to be associated with this particular repo.	21:39
	When I run git log in my repo, though, I can't even see where/when/how the other account got involved because the name and email was never changed for any of the commits	21:40
GodGinrai	lildude3970: hrm... Maybe github caches the user it first recognizes it as.	21:40
	← eletuchy_ left	21:40
GodGinrai	lildude3970: if the other account on github had that email address, then it is possible for it to hijack it anyway	21:40
	→ Gsham joined	21:40
lildude3970	:(	21:40
	I'm just so frustrated... Should I just delete the repo entirely and start over?	21:41
	→ mdw joined	21:41
lildude3970	I'm apparantly still commiting under the wrong user ID even now	21:41
	→ mcint__ joined	21:41
	← mdw left	21:41
lildude3970	And I can't find any clear explanations on how to fix it	21:41
GodGinrai	lildude3970: I would browse through the github docs and see if they have a proposed fix. This has happened to me as well, so I wouldn't be surprised if someone had reported it.	21:41
	← nachoman left	21:42
	← jaguarmagenta left	21:43
	→ rubyonrailed joined	21:43
	← ahmed_elgabri left	21:44
	← CJKinni` left	21:44
	← rgrinberg left	21:44
	→ SimonNa joined	21:44
	→ gsingh joined	21:45
	→ johnmilton joined	21:45
	← mase-tech left	21:46
	→ [cust] joined	21:47
	→ mdw joined	21:47
	← Dougie187 left	21:47
	→ Muzer joined	21:48
	← mdw left	21:48
	← joki left	21:48
	→ raininja joined	21:48
	← raijin left	21:48
	→ ahmed_elgabri joined	21:49
	← EvilPenguin left	21:49
	← Phylock left	21:50
	← aard left	21:50
	→ EvilPenguin joined	21:50
	← t0by left	21:51
	← davisonio left	21:51
	← Kicer86 left	21:52
	→ jyjon joined	21:53
	→ jimi_ joined	21:53
	← xall left	21:53
	→ joki joined	21:54
	gitinfo set mode: +v	21:54
mcint__	Are there servers/applications (or a way to configure http-backend) to serve content from my own server a la raw.githubusercontent?	21:54
	← steadystatic left	21:54
mcint__	to serve file content by commit/commit-ish and path	21:55
	APK → AKPWD	21:55
	→ nnyk_ joined	21:55
	→ remitamine joined	21:55
	← _August_ left	21:55
	→ nick123 joined	21:56
	→ _August_ joined	21:56
	← jimi_ left	21:57
cdown	I have a mapping where one of the commands is `:normal }<CR>`. When this command moves the cursor (ie. there is a paragraph to move to), the macro continues further. However, when `:normal }<CR>` does not move the cursor, it just displays that in the status and doesn't do anything else. How can I continue regardless?	21:57
	→ orbitphreak joined	21:57
	→ eight58 joined	21:57
	→ ejb joined	21:57
cdown	ie. the command is `xxx:normal }<CR>yyy`, and "yyy" only happens if there was a paragraph to move to	21:57
	← mwhooker left	21:58
cdown	Whereas I'd like to continue whether or not `:normal }` did anything.	21:58
	→ fornax joined	21:58
	← zivester left	21:58
mcint__	cdown: that might be a #vim question	21:58
cdown	what the fuck	21:58
	i thought i pressed alt-g	21:58
	*v	21:58
	but i clearly pressed alt-v and came in here	21:58
	sigh, sorry	21:58
mcint__	gl	21:58
GodGinrai	lol	21:59
	→ Lunatrius` joined	21:59
	→ kasper93 joined	22:00
	← GodGinrai left	22:00
cdown	well, it was 3 chars long, so i guess my brain didn't register that the status line shows the wrong channel ;-)	22:00
	→ jimi_ joined	22:00
lildude3970	Ah gosh.	22:00
	← _rht left	22:00
lildude3970	I think I might have fixed it.	22:00
	:>	22:00
	← jyjon left	22:01
	← nick123 left	22:01
lildude3970	I had no idea it was tied to email in that way.	22:01
	→ jyjon joined	22:01
	→ Gamecubic joined	22:02
	→ hide joined	22:02
	← AaronMT left	22:02
	← Tryop88 left	22:03
	← bango2 left	22:03
	→ aax joined	22:03
	← cyan__ left	22:03
	← Lunatrius left	22:03
	Lunatrius` → Lunatrius	22:03
	→ mwhooker joined	22:03
	← eletuch__ left	22:04
	← barteks2x left	22:04
	→ barteks2x joined	22:04
	→ mdw joined	22:05
	→ eletuchy joined	22:05
	← jimi_ left	22:05
	→ DolphinDream joined	22:06
	← mdw left	22:06
	← clemf left	22:06
	← italoacasas left	22:06
	→ fuchstronaut joined	22:08
	← fees left	22:08
kadoban	... isn't that what we said above?	22:08
	← _August_ left	22:09
	← jyjon left	22:09
	→ eletuchy_ joined	22:09
	→ _August_ joined	22:09
	← nnyk_ left	22:10
mcint__	ah gitweb out of the box...plus server	22:10
	→ jyjon joined	22:10
lildude3970	kadoban: I had no idea before you had said that, of course.	22:11
	:)	22:11
	← ajf- left	22:11
	← DolphinDream left	22:11
	← eletuchy left	22:11
	→ DolphinDream joined	22:12
	→ clemf joined	22:12
	← fuchstronaut left	22:12
	→ eletuchy joined	22:12
	← King_Hual left	22:13
	→ eletuch__ joined	22:14
	← ejb left	22:14
	← cdown left	22:14
	→ ToBeCloud joined	22:14
	gitinfo set mode: +v	22:15
	← eletuchy_ left	22:15
	← jyjon left	22:16
	→ eletuchy_ joined	22:16
	→ ejb joined	22:16
	← eletuchy left	22:17
	→ ajf- joined	22:17
	← f3r70rr35f left	22:17
	← clemf left	22:17
	→ eletuchy joined	22:18
	← DolphinDream left	22:18
	← eletuch__ left	22:19
	← bewilled left	22:19
	→ rgrinberg joined	22:20
	→ eletuch__ joined	22:20
	← LionsMane left	22:20
	← eletuchy_ left	22:21
	← taylorm left	22:21
	→ eletuchy_ joined	22:21
	← eletuchy left	22:23
	→ eletuchy joined	22:23
	→ clemf joined	22:24
	← fscala left	22:24
	← eletuch__ left	22:24
	← eletuchy_ left	22:26
	→ fscala joined	22:26
	→ Darcidride joined	22:26
	→ eletuchy_ joined	22:26
	→ docnvk joined	22:27
	← ajf- left	22:27
	→ italoacasas joined	22:27
	→ eletuch__ joined	22:28
	← eletuchy left	22:29
	← annoymouse left	22:29
	← kadoban left	22:30
	→ nellicus_ joined	22:30
	→ eletuchy joined	22:30
	← happy-dude left	22:31
	← eletuchy_ left	22:31
	→ caudill joined	22:31
	← lildude3970 left	22:32
	← NeverDie left	22:32
	→ eletuchy_ joined	22:32
	← eletuch__ left	22:33
	→ eletuch__ joined	22:34
	→ basiclaser joined	22:34
	← caudill left	22:34
	← eletuchy left	22:34
	← sauvin left	22:35
	→ eletuchy joined	22:36
	→ sauvin joined	22:36
	← eletuchy_ left	22:37
	→ ajf- joined	22:37
	← zjaffee left	22:37
	← elastix left	22:37
	→ eletuchy_ joined	22:37
	→ User458764 joined	22:38
	← eletuch__ left	22:38
	← lindenle left	22:39
	→ eletuch__ joined	22:39
	→ shaggycat joined	22:40
	← eletuchy left	22:40
	→ eletuchy joined	22:41
	← ahmed_elgabri left	22:41
	← eletuchy_ left	22:42
	← xaviergmail left	22:42
	← clemf left	22:42
	→ eletuchy_ joined	22:43
	← visualshock left	22:43
	→ jimi_ joined	22:43
	→ xaviergmail joined	22:44
	← eletuch__ left	22:44
	← shaggycat left	22:45
	→ w00tner joined	22:45
	→ clemf joined	22:45
	← Sucks left	22:45
	← eletuchy left	22:45
	← clemf left	22:45
	w00tner → Guest80361	22:45
	→ darkbit joined	22:45
	→ shaggycat joined	22:45
	→ eletuchy joined	22:46
	← jstein left	22:46
	← Dyonisos left	22:46
	→ clemf joined	22:46
	← clemf left	22:46
	→ clemf joined	22:47
	← clemf left	22:47
	→ clemf joined	22:48
	← clemf left	22:48
	← eletuchy_ left	22:48
	→ clemf joined	22:48
	→ eletuchy_ joined	22:49
	← clemf left	22:49
	→ nnyk_ joined	22:49
	→ zjaffee joined	22:49
	→ clemf joined	22:49
	← clemf left	22:50
	→ mdw joined	22:51
	← Gsham left	22:51
	← eletuchy left	22:51
	← mdw left	22:51
	→ ochorocho__ joined	22:52
	→ mdw joined	22:52
	→ eletuchy joined	22:52
	← mdw left	22:52
	← ejb left	22:53
	→ mdw joined	22:53
	→ ejb joined	22:53
	← ejb left	22:53
	→ ejb joined	22:53
	← ejb left	22:54
	← mdw left	22:54
	→ eletuch__ joined	22:54
	← eletuchy_ left	22:54
	→ mdw joined	22:55
	→ foul_owl joined	22:56
	→ eletuchy_ joined	22:56
	← eletuchy left	22:56
	← ochorocho__ left	22:56
	→ nick123 joined	22:57
	← DieguezZ left	22:57
	→ xall joined	22:57
	→ eletuchy joined	22:58
	← eletuch__ left	22:59
	← Arban left	22:59
	← nwkj86 left	22:59
	→ taylorm joined	22:59
	← ResidentBiscuit left	23:00
	→ eletuch__ joined	23:00
	← eletuchy_ left	23:01
	← gsingh left	23:01
	← nick123 left	23:02
	→ eletuchy_ joined	23:02
	← fahadash left	23:02
	← Wulf left	23:02
	→ gsingh joined	23:02
	← eletuchy left	23:02
	← bruce_lee left	23:03
	← mwhooker left	23:03
	← aarobc left	23:03
	→ eletuchy joined	23:04
	← eletuch__ left	23:05
	← dopesong left	23:05
	→ eletuch__ joined	23:06
	← eletuchy_ left	23:07
	← diegoaguilar left	23:07
	← nnyk_ left	23:07
	→ NyB joined	23:07
	→ zivester joined	23:08
	← eletuchy left	23:08
	→ eletuchy joined	23:09
	→ ahr3n joined	23:10
	→ eletuchy_ joined	23:11
	← taylorm left	23:11
	← eletuch__ left	23:11
	← ajf- left	23:12
NyB	Hi! Has the behavior of !-prefixed (shell) aliases changed recently (for some definition of recently)? It seems to be switching to the worktree first now...	23:12
	← brcolow left	23:13
	→ eletuch__ joined	23:13
	← eletuchy left	23:13
NyB	...but at least it sets GIT_PREFIX	23:14
	→ eletuchy joined	23:15
	← eletuchy_ left	23:16
	← CEnnis91 left	23:16
	← reim left	23:17
	← circ-user-bgUQR left	23:17
	→ eletuchy_ joined	23:17
	← ffabi left	23:17
	← eletuch__ left	23:17
	→ diegoaguilar joined	23:17
	→ reim joined	23:18
	→ eletuch__ joined	23:19
	← xall left	23:19
	← reim left	23:19
	← eletuchy left	23:19
	← diegoaguilar left	23:20
	→ xall joined	23:20
	→ ffabi joined	23:21
	→ reim joined	23:21
	← Darcidride left	23:22
	← eletuchy_ left	23:22
	← mdw left	23:22
	→ diegoaguilar joined	23:23
	← eletuch__ left	23:23
	← reim left	23:23
	→ mablae_ joined	23:25
	← mablae left	23:28
	← LeBlaaanc left	23:29
	→ LeBlaaanc joined	23:29
	→ tjone270_ joined	23:31
	→ larsrustand joined	23:31
	← tyreld left	23:33
	← cdg left	23:33
	← tjone270 left	23:34
	← sauvin left	23:36
	→ jaguarmagenta joined	23:39
	← gsingh left	23:39
	← orbitphreak left	23:39
	→ lindenle joined	23:39
	→ sauvin joined	23:41
	← jaguarmagenta left	23:43
	← lindenle left	23:44
	← Repox left	23:45
	← fornax left	23:47
	→ allcentury joined	23:48
	→ eletuchy joined	23:49
	← dmto left	23:50
	→ drbean joined	23:52
	← eletuchy left	23:53
	→ afuentes joined	23:53
	← radsy left	23:54
	← mellernoia left	23:54
	← refried_ left	23:56
	→ Guest89011 joined	23:56
	Guest89011 → nuck	23:56
	→ Lyqyd joined	23:56
	→ shinnya joined	23:58
	← darkbit left	23:58
	→ clemf joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation