IRCloggy #git 2015-06-30

Provider of IRC logs since 2005.

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

	2015-06-30
	→ dgutierrez1287 joined	00:00
maxlstylee3	This directory does not contain any of my RESX files.	00:00
	← imachuchu left	00:00
maxlstylee3	I have all of my RESX files and such in c:\git\newish	00:00
	I want to put these all under the same git repository.	00:01
	So in Git's mind, what is the best way to do this in order to make everything clean?	00:01
	How can I add files from a directory that is not a Git repository?	00:01
	→ vmiklos joined	00:03
	→ madewokherd joined	00:04
	← Saturn812 left	00:05
	← zivester left	00:05
	← eka left	00:06
	← bronson left	00:06
	← IWishIKnew left	00:08
	→ zumba_addict joined	00:08
	→ macabre joined	00:10
	← HelloAtMega left	00:11
	→ eletuchy joined	00:12
	← akurilin left	00:14
	← chrisshattuck left	00:14
	→ eka joined	00:14
	← shinnya left	00:14
	← endiruna left	00:15
	← stantonk left	00:15
	← King_Hual` left	00:16
	← foist left	00:16
	→ Sadeukko joined	00:16
	← liamkeily left	00:16
	← eletuchy left	00:17
	← clarkpan left	00:18
	← eka left	00:20
	→ eka joined	00:21
	← gambl0re left	00:22
	→ flashpoint9 joined	00:24
arand	maxlstylee3: just copying the files there does not add & commit them.	00:25
	→ Radivarig joined	00:25
	→ clarkpan joined	00:25
	→ akurilin joined	00:26
	← akiva left	00:26
	← akurilin left	00:26
arand	They are still untracked cruft in the working dir as far as git is concerned.	00:26
	→ akurilin joined	00:26
	← Muhannad left	00:27
	← scientes left	00:28
arand	maxlstylee3: What you do is copy them there, then "git add ..." them then "git commit" those additions.	00:28
	→ vanila joined	00:30
vanila	hello	00:30
	← cavallari left	00:30
vanila	how do list files that have been erased?	00:30
	→ delinquentme joined	00:33
	← StuartMI left	00:36
	← dgutierrez1287 left	00:36
	→ dgutierrez1287 joined	00:36
	← kpease left	00:37
	→ chozabu joined	00:38
	← in_deep_thought left	00:41
deltab	since the last commit? git status	00:41
	→ scientes joined	00:41
	← scientes left	00:41
	→ scientes joined	00:41
	→ ilmgb joined	00:41
	← alezandro left	00:41
	← clarkpan left	00:43
	→ clarkpan joined	00:44
	→ Boobuigi joined	00:44
	← pm90_ left	00:44
	← ilmgb left	00:46
	← GoddeR left	00:47
	← bollullera left	00:47
	← kukks left	00:48
	← Netmage left	00:49
	→ the_cybersphinx joined	00:49
	→ Netmage joined	00:49
	→ BeatrixKiddo joined	00:49
	→ ropav joined	00:49
	← woodruffw left	00:51
	← kermit left	00:52
	← Guest48136 left	00:53
	← daivyk left	00:54
	← ropav left	00:54
	→ woodruffw joined	00:56
	→ keq joined	00:56
	← osxi left	00:57
	← LaptopBrain left	00:58
	→ Muhannad joined	00:59
	← rrr_ left	00:59
	← zendrix left	01:01
	← jast left	01:01
	→ tubaman joined	01:01
	← tubaman left	01:02
	→ Vampire0_ joined	01:02
	→ fazzel joined	01:02
	→ jast joined	01:02
	→ otter768 joined	01:02
	→ s8321414 joined	01:03
	← flashpoint9 left	01:04
	→ ebbflowgo joined	01:05
	← pks left	01:05
	← Vampire0 left	01:05
	← ebbflowgo left	01:05
	→ alexander__b joined	01:06
	→ bronson joined	01:06
	← otter768 left	01:07
	← alexander__b left	01:07
	→ alexander__b joined	01:07
	→ pks joined	01:07
	← dreiss left	01:07
	← SimonNa left	01:08
	← SrPx left	01:08
	alexander__b → bernalex	01:09
	← gaucheph left	01:10
	← Muhannad left	01:11
	← bronson left	01:11
	→ daito joined	01:12
	→ Melite joined	01:12
	→ weiyang joined	01:13
	← Boobuigi left	01:14
	→ Boobuigi joined	01:14
	← ntio left	01:14
	→ NeverDie joined	01:15
	← cagedwisdom left	01:15
	← scientes left	01:17
	← s8321414 left	01:19
	→ rrr_ joined	01:20
	→ DrNick joined	01:20
	→ nydew09 joined	01:21
	← versa left	01:21
	→ variable joined	01:21
	variable → constant	01:22
	← jsnowball left	01:23
	← maxlstylee3 left	01:23
	→ Muhannad joined	01:24
	← the_cybersphinx left	01:24
	→ rrr__ joined	01:24
	→ Dougie187 joined	01:24
	→ phw_ joined	01:24
	← rrr_ left	01:25
	rrr__ → rrr_	01:25
	→ stantonk joined	01:26
	← hahuang65 left	01:26
	→ otter768 joined	01:27
	→ gopar joined	01:27
	← phw left	01:28
	→ cagedwisdom joined	01:28
	← ssarah left	01:28
	← stantonk left	01:32
	→ gaucheph joined	01:33
	← VictorCL left	01:33
	← tgunr left	01:34
	→ tgunr joined	01:34
	← eka left	01:34
	→ hgl joined	01:35
hgl	hi, what's the benefit of signing a commit?	01:35
	← Wulf left	01:36
	→ skorgon joined	01:36
	← skorgon left	01:36
	→ skorgon joined	01:36
	← vanila left	01:36
	→ the_cybersphinx joined	01:36
	← Sasazuka left	01:37
	→ Wulf joined	01:38
	← nobso left	01:38
hgl	nm, just found this: http://programmers.stackexchange.com/questions/212192/what-are-the-advantages-and-disadvantages-of-cryptographically-signing-commits-a	01:40
	← snthsnth left	01:40
	→ snthsnth joined	01:42
	← Arsonide left	01:42
	→ Arsonide joined	01:42
	→ ilmgb joined	01:42
	← dsantiago left	01:43
	→ eletuchy joined	01:43
	→ xudongz joined	01:43
	→ akushner_ joined	01:44
	→ damccull joined	01:45
	← Noldorin left	01:46
	← unixpro1970 left	01:46
	← ilmgb left	01:47
	← eletuchy left	01:47
	← akushner left	01:48
	← alfism left	01:48
	→ jsnowball joined	01:48
	← akushner_ left	01:49
	← sdothum left	01:49
	→ kermit joined	01:51
	← delinquentme left	01:51
	→ Noldorin joined	01:52
	← Noldorin left	01:52
	← gaucheph left	01:52
	← Boobuigi left	01:53
	→ s8321414 joined	01:55
	← LucasTT left	01:55
	← otter768 left	01:55
	→ dreiss joined	01:55
	→ jbondhus joined	01:56
	← Sadeukko left	01:56
	← duderonomy left	01:57
	→ MattMaker joined	01:58
	→ Nizumzen joined	01:59
	→ unlord joined	01:59
	→ scarabx joined	02:00
	→ Vampire0 joined	02:00
	← chozabu left	02:00
	→ jolda joined	02:01
	→ delinquentme joined	02:01
	← dgutierrez1287 left	02:02
	→ dgutierrez1287 joined	02:03
	← Vampire0_ left	02:03
	→ dsantiago joined	02:04
	← mscook left	02:05
	→ rrr__ joined	02:06
	← rrr_ left	02:08
	rrr__ → rrr_	02:08
	← MattMaker left	02:09
	← xudongz left	02:11
	← scarabx left	02:13
	→ _Atom_ joined	02:14
	← Dougie187 left	02:15
	← bitkiller left	02:17
	→ d1ngell joined	02:17
	← dreiss left	02:17
	← dgutierrez1287 left	02:18
	→ dgutierrez1287 joined	02:20
	← tgunr left	02:20
	← sgen_ left	02:21
	→ tgunr joined	02:22
	← CheckDavid left	02:22
	→ jteneyck joined	02:23
	← dougsland left	02:24
	← pheaver left	02:27
	← pweaver_ left	02:27
	← gargola left	02:28
	→ gargola joined	02:28
	← clarkpan left	02:29
	← nfk left	02:30
	← phantombeta left	02:30
	→ mizu_no_oto joined	02:32
	← [976497]A left	02:32
	← qpdb left	02:33
	→ qpdb_ joined	02:33
	→ xudongz joined	02:33
	→ hs123 joined	02:33
	← durham_ left	02:33
hs123	github within the command line : https://github.com/harshasrinivas/cli-github	02:33
	check it out ;)	02:34
	← dgutierrez1287 left	02:35
	→ phantombeta joined	02:35
	→ dgutierrez1287 joined	02:35
	→ mscook joined	02:36
	← tgunr left	02:37
	← Maple__ left	02:38
	→ dv__ joined	02:38
	← skorgon left	02:39
	← gargola left	02:40
	← mscook left	02:40
	→ mscook joined	02:40
	→ gargola joined	02:40
	← dgutierrez1287 left	02:41
	← mscook left	02:41
	→ tgunr joined	02:42
	→ ilmgb joined	02:43
	→ eletuchy joined	02:44
	→ dstarh joined	02:44
	→ osxi joined	02:44
	← sublimate left	02:45
	← gargola left	02:45
	← oiu left	02:46
	→ mscook joined	02:46
	← NeverDie left	02:48
	→ franl joined	02:48
	← eletuchy left	02:48
	← ilmgb left	02:49
	→ rrr__ joined	02:49
	← tristanp left	02:49
	← mizu_no_oto left	02:50
	→ mizu_no_oto joined	02:50
	→ boombatower joined	02:51
	← rrr_ left	02:52
	rrr__ → rrr_	02:52
	← yulaow left	02:54
	← m0viefreak left	02:54
	→ c74d joined	02:55
	← mizu_no_oto left	02:55
	← weiyang left	02:55
	→ Boobuigi joined	02:55
	← mscook left	02:56
	← tgunr left	02:56
	← BeatrixKiddo left	02:57
	→ tgunr joined	02:57
	← annodomini left	02:58
	← blackwind_123 left	03:00
	→ durham joined	03:02
	← darkbasic_ left	03:03
	← snthsnth left	03:03
	→ darkbasic joined	03:04
	→ hahuang65 joined	03:04
	← durham left	03:04
	→ durham joined	03:05
	← linuxboytoo left	03:05
	→ MattMaker joined	03:06
	→ linuxboytoo joined	03:06
	← dstarh left	03:06
	→ unixpro1970 joined	03:07
	→ rchavik joined	03:09
	→ weiyang joined	03:09
	← franl left	03:09
	→ skorgon joined	03:09
	← linuxboytoo left	03:10
	← MattMaker left	03:11
	← jagob left	03:11
	→ scarabx joined	03:12
	← Boobuigi left	03:12
	→ Boobuigi joined	03:12
	→ MattMaker joined	03:12
	← espindol_ left	03:13
	← MasterPiece left	03:13
	→ ashokrajar joined	03:13
	→ jagob joined	03:13
	← rrr_ left	03:15
	→ eka joined	03:15
	→ hur joined	03:17
	← hur left	03:17
	← mellernoia left	03:18
	→ rrr__ joined	03:19
	← joki left	03:19
	→ mscook joined	03:20
	→ Goplat joined	03:20
	→ pm90_ joined	03:21
	→ clarkpan joined	03:22
	← rrr__ left	03:25
	→ joki joined	03:25
	→ rrr___ joined	03:25
	← C4ta\|Work left	03:26
	→ C4ta\|Work joined	03:27
	rrr___ → rrr_	03:28
	← jteneyck left	03:30
	→ Milos joined	03:31
	← ashokrajar left	03:32
	← weiyang left	03:33
	→ ashokrajar joined	03:33
	← jsnowball left	03:34
	← ril left	03:35
	→ dgutierrez1287 joined	03:36
	← osxi left	03:37
	→ zivester joined	03:38
	← knownasilya left	03:38
	→ lindenle joined	03:38
	← lindenle left	03:38
	← ashokrajar left	03:39
	→ GoddeR joined	03:39
	← Boobuigi left	03:40
	← GoddeR left	03:41
	← dgutierrez1287 left	03:41
	→ GoddeR joined	03:42
	← relipse left	03:43
	→ weiyang joined	03:44
	→ ilmgb joined	03:45
	← leolrrj left	03:47
	← mluser left	03:47
	← johtso left	03:48
	← d1ngell left	03:48
	→ johtso joined	03:48
	→ leolrrj joined	03:49
	← ilmgb left	03:49
	→ sargas joined	03:50
	← benishor_ left	03:52
	← D-Boy left	03:52
	← aberrant left	03:52
	→ annodomini joined	03:53
	← annodomini left	03:53
	→ annodomini joined	03:53
	→ geilt joined	03:53
	← Milos left	03:54
	← hgl left	03:54
	→ hgl joined	03:55
	→ nerd joined	03:55
	← geilt left	03:56
	→ dionysus69 joined	03:56
	→ otter768 joined	03:56
	→ ntio joined	03:56
	→ Milos joined	03:57
	→ cdown joined	03:57
	← ricardolima left	03:58
	← Milos left	03:58
	→ Milos joined	03:58
	→ aarcane joined	03:59
	← robbyoconnor left	04:00
	← Wulf left	04:01
	← otter768 left	04:01
	→ vaibhav10jain joined	04:01
	→ Lyqyd joined	04:01
	→ robbyoconnor joined	04:01
	→ jsnowball joined	04:02
	→ snthsnth joined	04:02
vaibhav10jain	Can someone please tell me how do I pull from specific commit.???? Actually I want to revert back my repo to specific commit....	04:03
	→ D-Boy joined	04:04
	→ benishor_ joined	04:04
	← arescorpio left	04:05
	← s8321414 left	04:06
	← Melite left	04:06
	→ lindenle joined	04:06
	→ hadees joined	04:07
	← xk_id left	04:08
	← michael_mbp left	04:08
	→ bronson joined	04:08
	→ xk_id joined	04:09
	→ michael_mbp joined	04:09
hadees	I’m having trouble getting git log to work with a revision range. I’m using heroku and I’m trying see only commits that aren’t on heroku. Heroku is setup as a remote that is called staging and the heroku branch is master where as my local one is develop. I’m not sure what I’m doing wrong, I guess it could be sha1 but it’s what heroku is giving me back.	04:10
	the sha1 looks right to me, it’s the commit i see at the top of git log for heroku	04:10
	→ tjt263 joined	04:10
	← macabre left	04:11
	← xk_id left	04:13
	← bronson left	04:13
	→ fearnothing joined	04:14
	→ eletuchy joined	04:15
	← Nizumzen left	04:15
	→ vaibhavjain joined	04:17
	→ phillid joined	04:18
	← Iniglo left	04:18
	← eletuchy left	04:19
	← jagob left	04:19
	→ polyzen joined	04:20
	← daito left	04:21
	→ jagob joined	04:21
	← vaibhav10jain left	04:21
	→ yates joined	04:21
yates	is there a way to do a git status but limit it to a certain subdirectory and all directories below it?	04:22
	← pm90_ left	04:22
	← leolrrj left	04:22
	← vaibhavjain left	04:24
kadoban	yates: 'git status .' ?	04:25
	Or whatever subdir.	04:25
	→ xk_id joined	04:25
	← _Atom_ left	04:25
	→ vaibhavjain joined	04:26
	vaibhavjain → vaibhav10jain	04:27
	→ boushi__ joined	04:28
	→ jceb joined	04:28
	→ bsm117532 joined	04:30
	← hs123 left	04:30
	← zivester left	04:30
	← GoddeR left	04:30
	→ Boobuigi joined	04:30
	← ntio left	04:30
yates	kadoban: thanks.	04:30
	for some reason i thought that still gave the other folders via ../xyz.. etc	04:31
	→ pm90_ joined	04:31
	→ Gurkenglas joined	04:31
	← boushi_ left	04:31
bsm117532	So I'm trying to do an interactive rebase over a large history (~200 commits) and if I do 'git rebase -i <old commit>' and make NO CHANGES to the edit script, I get merge conflicts. Can anyone explain why that happens?	04:31
	git 2.1.4..	04:32
	→ alezandro joined	04:33
	→ irqq joined	04:33
	← dionysus69 left	04:34
	→ hs123 joined	04:34
	→ tzero joined	04:37
bsm117532	In fact 'git rebase HEAD~1' also has merge conflicts. Doing it interactively shows ~10 commits instead of one. (!!?!!)	04:37
	→ dgutierrez1287 joined	04:38
	← keq left	04:38
phillid	I've got a lot of directories, each with their own git repo and their own remote, but I'd like to create a "super" git repo containing all these directoies	04:42
	Are subtrees my best option?	04:42
	← dgutierrez1287 left	04:43
	→ ilmgb joined	04:46
	→ rrr__ joined	04:46
	→ Patch joined	04:47
	← Boobuigi left	04:48
	→ Boobuigi joined	04:48
	← skcin7 left	04:49
	→ arnaud____ joined	04:50
	← rrr_ left	04:50
	→ rrr_ joined	04:50
	← ilmgb left	04:50
	← snthsnth left	04:52
	→ Xethron joined	04:53
	→ snthsnth joined	04:53
	← rrr__ left	04:53
	← arnaud____ left	04:54
	← jolda left	04:55
	← cssko left	04:55
	← hahuang65 left	04:55
	← rrr_ left	04:56
	→ skcin7 joined	04:56
	← hgl left	04:56
	→ hgl joined	04:56
	→ MechtiIde joined	04:56
	→ sanketdg joined	04:57
	→ ashokrajar joined	04:57
	← ashokrajar left	04:57
	→ ashokrajar joined	04:58
	→ Dragooon joined	04:59
	→ arnaud____ joined	05:00
preaction	submodules are the other option. what's the goal for this superrepo?	05:03
	→ osxi joined	05:04
	← hgl left	05:04
	← mscook left	05:04
	← boushi__ left	05:05
	→ daito joined	05:06
	→ hgl joined	05:07
	→ _Atom_ joined	05:07
phillid	I have PKGBUILDs for AUR packages, and these need their own history and remotes to be able to interact with the AUR 4, the super-repo's just to mirror them all on github	05:08
	← osxi left	05:09
preaction	why not individually?	05:09
phillid	Each repo has only a small PKGBUILD, an SRCINFO and maybe a few patches, I feel putting them individually on GitHub's over-the-top	05:10
preaction	i mean, with submodules, you need the individual repo on somewhere accessible anyway. and with subtrees, you combine the individual history on the individual repos	05:10
phillid	It would sound like submodules would work then?	05:11
preaction	is each individual repository somewhere that someone can clone it?	05:11
phillid	Yes, anyone can clone from the origin	05:12
preaction	that's how that will happen then. they'll clone the super-repo from github, but each submodule will get cloned from the origin, because that's what the super-repo refers to	05:12
	which seems kind of pointless to me	05:13
phillid	Hmm	05:13
	← chitopunk left	05:13
	→ dreiss joined	05:13
	← lindenle left	05:13
phillid	You might be right	05:14
	→ espindola joined	05:16
	← Boobuigi left	05:17
	→ t2mkn joined	05:17
	→ israelpattison joined	05:18
	← scarabx left	05:18
	← skcin7 left	05:18
	← benishor_ left	05:19
	→ pantsman- joined	05:20
	← espindola left	05:20
	← gopar left	05:22
	← tgunr left	05:22
	← delinquentme left	05:25
	→ ashokraj_ joined	05:25
	← ashokrajar left	05:28
	← raven-au left	05:31
	← arnaud____ left	05:31
	→ kp666 joined	05:32
	→ raven-au joined	05:34
	← jceb left	05:34
	→ harish_ joined	05:34
	← tjt263 left	05:34
	← vaibhav10jain left	05:36
	← xk_id left	05:38
	→ xk_id joined	05:38
	→ dgutierrez1287 joined	05:38
	← raven-au left	05:39
	← Xethron left	05:39
	→ rrr_ joined	05:39
	→ raven-au joined	05:40
	→ ThomasLocke joined	05:40
	→ Tuna-Fish joined	05:40
	→ chrisshattuck joined	05:40
	→ gfixler joined	05:42
	← xk_id left	05:43
	← dgutierrez1287 left	05:43
	← MechtiIde left	05:44
osse	bsm117532: do you still get them if you add -p ?	05:45
bsm117532	Hmmm good idea osse I will try	05:46
	→ ilmgb joined	05:47
	← irqq left	05:48
	← kadoban left	05:48
	→ Xiti joined	05:48
	← Xiti left	05:48
	→ Xiti joined	05:48
	→ irqq joined	05:48
osse	either way I don't really know what to do next	05:49
bsm117532	It causes rebasing off HEAD~1 to work, but I still get merge conflicts with older commits. :-/	05:50
	Good idea though, it nukes many conflicts.	05:50
	← ilmgb left	05:52
osse	I did a ''git rebase -pi HEAD~200'' in git.git covering 436 commits. that went fine	05:54
	← Voyage left	05:55
osse	in the end it was a true no-op. didn't new shas	05:55
	← israelpattison left	05:57
	→ fooforge joined	05:57
	→ otter768 joined	05:57
	→ abra0 joined	05:59
	← abra0 left	06:00
	← tpollard left	06:00
	← otter768 left	06:02
	→ abra0 joined	06:02
	→ mscook joined	06:04
	← madewokherd left	06:04
	→ irc-5225225 joined	06:04
	→ osxi joined	06:04
	← _Atom_ left	06:05
	→ ambodi joined	06:05
	→ pwnz0r joined	06:06
	→ lg188 joined	06:06
	→ nisseni joined	06:06
	→ arnaud____ joined	06:06
	→ Ahsb joined	06:09
	← osxi left	06:10
	← mscook left	06:10
	→ eGGsha joined	06:10
	→ mscook joined	06:10
	← pm90_ left	06:11
	← Ahsb left	06:11
	→ pm90_ joined	06:11
	← mscook left	06:11
	← cdown left	06:12
	← chrisshattuck left	06:13
	→ lindenle joined	06:14
nisseni	A few weeks ago I checked out a new branch. I made a feature. Then worked on some other branches. Now I checked out the branch again and everything was in order. However, pulling this branch to production made the changes in the branch dissappear. What might have gone wrong here?	06:14
	→ jceb joined	06:14
	→ mscook joined	06:14
	→ s8321414 joined	06:15
	→ Rwkd joined	06:15
	← Rwkd left	06:15
	→ israelpattison joined	06:15
	→ gauke joined	06:16
	→ acolson joined	06:16
	→ espindola joined	06:17
	→ PCatinean joined	06:17
	→ Spriz joined	06:17
	← mscook left	06:18
	→ rendar joined	06:18
	← constant left	06:19
	→ roelmonnens joined	06:19
	← lindenle left	06:19
	→ ciampix joined	06:19
	← skorgon left	06:19
	→ Voyage joined	06:20
	→ mscook joined	06:21
	← sargas left	06:21
	→ Xoexm joined	06:21
	← dreiss left	06:21
	← Xoexm left	06:21
	→ delinquentme joined	06:21
	← ambodi left	06:21
	← espindola left	06:21
	→ ilmgb joined	06:21
	→ akial joined	06:22
	← nydew09 left	06:22
	← pwnz0r left	06:23
	→ benishor_ joined	06:23
	→ donmichelangelo joined	06:23
	← mscook left	06:24
	← akial left	06:24
	→ Fjg joined	06:25
	← Fjg left	06:25
	← durham left	06:25
	← delinquentme left	06:25
	→ mscook joined	06:25
	← michelangelo left	06:26
	← mscook left	06:27
	→ pwnz0r joined	06:30
	← pwnz0r left	06:31
	← gauke left	06:31
	→ freimatz joined	06:32
	→ pwnz0r joined	06:33
	← pwnz0r left	06:34
	→ JohnBat26 joined	06:36
	→ mikecmpbll joined	06:37
	→ Nizumzen joined	06:37
	→ mscook joined	06:37
	← Lyqyd left	06:38
	← pm90_ left	06:38
	→ dgutierrez1287 joined	06:39
	← mscook left	06:40
	→ gauke joined	06:40
	→ User458764 joined	06:40
	→ Sceorem joined	06:41
	← xudongz left	06:41
	→ nadim_ joined	06:41
	← pantsman- left	06:42
	→ Malsasa_ joined	06:42
	Malsasa_ → Malsasa	06:42
	→ xudongz joined	06:42
	→ Alienpruts joined	06:42
	← jceb left	06:44
	← dgutierrez1287 left	06:44
	→ [Brain] joined	06:44
	→ versa joined	06:46
	→ pm90_ joined	06:46
	→ Gizburdt joined	06:46
	→ solars joined	06:47
	→ nilg joined	06:48
	→ mscook joined	06:50
	← hadees left	06:50
	→ cusiousmansi joined	06:51
	← mscook left	06:51
	Dragooon → Dragooon\|A	06:52
	← User458764 left	06:52
	→ hadees joined	06:55
	→ jceb joined	06:55
	→ gua_ould joined	06:56
	← pm90_ left	06:56
	→ berndj joined	06:56
	← FabTG_ left	06:56
	→ duderonomy joined	06:56
	→ mscook joined	06:56
	← weiyang left	06:56
	→ petersr joined	06:57
	← petersr left	06:57
	← mscook left	06:57
	→ endiruna joined	06:57
	→ rzeka joined	06:57
	← phillid left	06:57
	← happy-dude left	06:59
	← xudongz left	06:59
	→ xudongz joined	07:00
	← Gamecubic_ left	07:00
	→ thalleralexander joined	07:00
	← arnaud____ left	07:01
	→ ryez joined	07:02
	→ Vadimus joined	07:03
	→ bonswouar joined	07:03
	← eGGsha left	07:03
	→ lb1a joined	07:03
	→ delinquentme joined	07:04
	→ osxi joined	07:05
	→ ambodi joined	07:06
	→ Darcidride joined	07:07
	→ irqq_ joined	07:08
	→ tumulte joined	07:09
	→ eGGsha joined	07:09
	← Goplat left	07:09
	→ stbenz joined	07:10
	→ drbean_ joined	07:10
	← irqq left	07:10
	← osxi left	07:11
	→ bronson joined	07:11
	← mostlybadfly left	07:11
	→ skylite joined	07:12
	→ pm90_ joined	07:14
	← cagedwisdom left	07:14
	← fearnothing left	07:15
	→ tvw joined	07:15
	← endiruna left	07:15
	← bronson left	07:15
	→ zoso joined	07:16
	← xudongz left	07:16
	← irc-5225225 left	07:16
	→ elsevero joined	07:16
	← Malsasa left	07:17
	→ espindola joined	07:18
	→ pm90__ joined	07:18
	→ TomyWork joined	07:19
	→ mutbuerger joined	07:19
	→ Boobuigi joined	07:20
	← maxorator left	07:20
	← nadim_ left	07:20
	← pm90_ left	07:21
	← harish_ left	07:21
	→ maxorator joined	07:21
	→ encod3 joined	07:21
	gitinfo set mode: +v	07:22
	→ Xethron joined	07:22
nisseni	A few weeks ago I checked out a new branch. I made a feature. Then worked on some other branches. Now I checked out the branch again and everything was in order. However, pulling this branch to production made the changes in the branch dissappear. What might have gone wrong here?	07:22
	← espindola left	07:22
ethanol	no need to spam nisseni	07:22
nisseni	ethanol: oh, didn't realize my first went thru, since the graveyard silence...	07:22
ethanol	nisseni: it's early in the morning (here at least), and it's irc, so have some patience :p	07:23
nisseni	ethanol: yep, usually an active channel, hence my question	07:23
ethanol	nisseni: anyway, anything could have gone wrong. or nothing. you'll have to write up a play-by-play of what you actually did and put that in a !pastebin somewhere	07:23
gitinfo	nisseni: [!paste] Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	07:23
	← snthsnth left	07:23
	→ freestyl3r joined	07:24
	← rrr_ left	07:24
nisseni	ethanol: not sure what you mean by play-by-play	07:24
	→ Kelzier joined	07:25
ethanol	nisseni: step by step* better?	07:25
	← versa left	07:25
nisseni	ethanol: yeah - not sure how to do that tho. I mean I simply merged my branch and the feature was gone. It worked when checking out the feature-branch itself	07:26
	ethanol: not sure what else I lost... :/	07:26
ethanol	nisseni: ok, and how did you do the above?	07:26
FreezingDroid	Is there any difference between git mv and just regular mv + adding the files back?	07:27
ethanol	FreezingDroid: not really	07:27
	← fooforge left	07:27
Rhonda	Only if your do a git rm for the old name, too. ;)	07:28
ethanol	FreezingDroid: just more convenient maybe	07:28
	→ Balliad joined	07:29
nisseni	ethanol: 1. I checked out a new branch. 2 I made my feature and it worked fine. 3. I continued working with the production branch and other branches. 4. The customer approved the feature. 5. I tried to pull that branch to the production branch, but the changes weren't made. 6. I checked out the feature branch again to see, and it worked fine. 7. I tried to pull the production branch to the...	07:29
	...feature branch, then the feature stopped working altogether.	07:29
	→ irc-5225225 joined	07:29
	← irqq_ left	07:30
ethanol	nisseni: great story. needs more dinosaurs.	07:30
	→ workerbeetwo joined	07:30
ethanol	nisseni: how about some actual commands you've ran? you have a terminal history?	07:30
	→ eletuchy joined	07:30
nisseni	ethanol: I'm running source tree on mac	07:31
ethanol	oh look at that, coffee time.	07:31
	→ ntwari joined	07:32
	← clarkpan left	07:34
Voyage	Hi, I have 4 team members and I want to track their development. I have one server with deployed website at /var/www/html. I want the deployment directory to be updated whenever someone pushes or changes HEAD. I have read http://gitolite.com/deploy.html I am not in capacity to decide what to do nor an expert. 2) can all the above said be done with gitlab or github hosted services on their sites? I think not as they wont allow any configurations on their side?	07:34
	→ Chulbul joined	07:34
	→ Zarthus joined	07:34
	→ tverrbjelke joined	07:35
	← eletuchy left	07:35
ethanol	Voyage: 1) you seem to have lost number 1. 2) no.	07:35
Voyage	let me see	07:36
	You mean the following are not for me? 4.1 checkout -- the "fight club" of git deployment 4.2 fetch -- reverse the flow ?	07:36
	ethanol, ?	07:37
ethanol	Voyage: you asked if you can use any of the deployment methods on gitlab or github hosted services. to my knowledge, no.	07:37
	→ VictorCL joined	07:37
Voyage	ethanol, hm ok. so I have to make my own git repo on server to accomplish that	07:38
thiago	Voyage: !deploy	07:38
gitinfo	Voyage: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	07:38
Voyage	thiago, I said I already read it	07:38
thiago	Voyage: I don't think gitlab will help you. GitHub definitely won't.	07:38
Voyage	thiago, if you read my question, you will know the problem.	07:38
thiago	Voyage: gitolite might. But you need to understand its documentation.	07:38
Voyage	thiago, you mean, gitlab.com hosted service?	07:39
thiago	Voyage: the problem is you're asking us what tool to use for deployment, since Git isn't a deployment tool.	07:39
	Voyage: no, I meant running GitLab on your server.	07:39
Voyage	gitlab is just a UI tool on top of git? no?	07:39
	so I can just install normal CLI git and then install gitlab on top of it for UI experience. NO?	07:39
	← lb1a left	07:40
Voyage	You mean the following are not for me? 4.1 checkout -- the "fight club" of git deployment 4.2 fetch -- reverse the flow ? ethanol	07:40
	→ dgutierrez1287 joined	07:40
	→ ManikM joined	07:40
Voyage	I want the deployment directory to be updated whenever someone pushes or changes HEAD	07:41
	→ buzzybron joined	07:41
thiago	gitlab is a website tool, yes	07:41
Voyage	so I can just install normal CLI git and then install gitlab on top of it for UI experience. NO?	07:41
thiago	Voyage: right. So install a deployment script in the post-receive hook.	07:41
Voyage	ok	07:41
	← Vadimus left	07:41
Voyage	so I will be working on GIT, and not gitlab	07:42
	→ psoo joined	07:42
	→ katherine joined	07:42
	← buzzybron left	07:42
Voyage	thiago, ok. so which deployment script will help me do exactly this: deployment directory to be updated whenever someone pushes or changes HEAD	07:42
	→ leporello joined	07:42
	← psoo left	07:42
	→ psoo joined	07:43
thiago	Voyage: one you can find in the link from !deploy	07:43
gitinfo	Voyage: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	07:43
Voyage	thiago, sir, I read that.	07:43
thiago	Voyage: and have you tried all the scripts from that?	07:43
Voyage	I have read http://gitolite.com/deploy.html I am not in capacity to decide what to do nor an expert.	07:43
leporello	Hi. Is it normal to use gulp to create combined and minified version of JS library in pre-push hook?	07:43
thiago	Voyage: you need a script	07:43
	Voyage: I don't have one for you. The best I have is that link.	07:43
Voyage	thiago, why would/should I try all without knowing if they would update deployment dir on push AND change of HEAD?	07:44
thiago	Voyage: if there is no script there, you will need to write one	07:44
	Voyage: this is just the updating on the server	07:44
	Voyage: the server receives the change, then updates /var/www/html	07:44
Voyage	thiago, hm	07:44
	→ p4trix joined	07:44
	← zumba_addict left	07:44
osse	nisseni: can you show !lol	07:45
gitinfo	nisseni: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	07:45
	← dgutierrez1287 left	07:45
	← mikecmpbll left	07:45
	→ SimonNa joined	07:45
Voyage	thiago, ok, a) how to let server/git know of the 2 changes: push and change of HEAD? b) how to copy those changed/updated state to /var/www/html ?	07:45
	→ hahuang65 joined	07:45
	← Darcidride left	07:45
osse	nisseni: This happened because Git thinks the changes should be deleted. Something's fishy with the topology	07:45
thiago	Voyage: the push is the change of HEAD	07:45
	Voyage: how to copy is exactly the point of your script. For example, git archive.	07:46
ethanol	osse: I get the impression he only uses source tree.. so eh :/	07:46
	→ Darcidride joined	07:46
	← unixpro1970 left	07:46
Voyage	thiago, yes but what if someone just changes branch or HEAD backwards? is that also a PUSH?	07:46
thiago	Voyage: when they push, they tell the server to update	07:47
Voyage	thiago, so changing HEAD backwards or forwards, or changing to another branch is a PUSH?	07:48
thiago	Voyage: no	07:48
	→ voodo joined	07:48
thiago	Voyage: the push is the developer's way of letting the server know to update	07:48
jim	when you clone: you get a remote (named "origin") that points to where you cloned from	07:49
Voyage	thiago, ok, how to let server/git know of the 2 changes: push and change of HEAD?	07:49
thiago	Voyage: the server knows of the push because you pushed to it	07:49
jim	you can then push to that remote	07:49
thiago	Voyage: it is told of the change of HEAD by that push	07:49
	→ scarabx joined	07:49
	→ hamster joined	07:49
thiago	Voyage: the point of a push is to change the tips of branches	07:49
Voyage	thiago, ok, how to let it know of change of head for while its shifting to another branch	07:50
	oh ok	07:50
	← hahuang65 left	07:50
	← scarabx left	07:50
Voyage	so if I monitor for just PUSHes, I am good ?	07:50
thiago	Voyage: do you want to change the HEAD symbolic ref on the server?	07:50
	Voyage: that is, "check out" a different branch on the server?	07:50
	→ nadim_ joined	07:51
Voyage	thiago, my point is that a developer or admin might want to change the HEAD sometimes to go backwards. In that case the server deployment director should also reflect it	07:51
thiago	Voyage: what do you mean by "HEAD" ?	07:51
jim	you have branches on your local copy, and you can check out those branches	07:51
Voyage	HEAD is the tip that is on a COMMIT at a date. e.g I have 10 commits. Now I want to go back to 7th commit to see what state of development was done at that point. The deployment director should also reflect to the 7th commit state when the HEAD is changed to 7th commit	07:52
thiago	Voyage: HEAD is the currently checked out commit	07:53
jim	to checkout a branch on a server, you first have to get that branch from a remote you have defined into your local copy... once it's there, you can check it out	07:53
thiago	Voyage: but please rephrase your request without saying HEAD	07:53
	← jagob left	07:53
	← pm90__ left	07:53
Voyage	thiago, hm. ok	07:53
	thiago, so what I am trying to do is covered in "monitorying for pushes" ?	07:54
thiago	Voyage: I don't know how you're monitoring	07:54
	→ pm90_ joined	07:54
thiago	Voyage: are you writing a pre- or post-receive hook?	07:54
Voyage	thiago, well, how can i monitor?	07:54
maxb	HEAD can mean two things: which branch HEAD points to, or the commit at the tip of that branch. The ambiguity there is what is frustrating this conversation	07:54
Voyage	thiago, I dont know	07:54
thiago	Voyage: ok, then I don't know if monitoring is enough	07:55
	Voyage: let me see if I understand you:	07:55
	Voyage: you have a Git repository on a server, from which there's a script that updates /var/www/html	07:55
	← t2mkn left	07:55
Voyage	yes	07:55
	I dotn have but want to	07:55
thiago	ok	07:55
	Voyage: you want /var/www/html to update when you send it a command	07:56
Voyage	no.	07:56
thiago	Voyage: be it forwards or backwards in the commit history	07:56
	then explain	07:56
	→ mikecmpbll joined	07:56
Voyage	want /var/www/html to update when a) some developer PUSHes to remote git on same server b) when someone changes HEAD in ANY way, backward, forward, to another branch itc	07:57
maxb	Reading way way back, it seems you are using Gitolite. In which case, no one should be able to change the symref HEAD without shell access to the server, and they probably should never do that	07:57
thiago	Voyage: a) and b) are the same	07:57
	Voyage: and it's what I said	07:57
Voyage	maxb, I am not using gtolite. I havent even install git yet	07:57
thiago	Voyage: ok, so you want to cause /var/www/html to update when you push to the server	07:57
Voyage	thiago, ok. a and b are same. that conforts me	07:57
thiago	Voyage: unless your script is designed otherwise, I expect it to just update with whatever commit you told it to use	07:58
Voyage	thiago, yes	07:58
thiago	Voyage: whether you added new things or went backwards, it'll just take it	07:58
Voyage	right	07:58
	→ otter768 joined	07:58
thiago	Voyage: ok. Get that script.	07:58
Voyage	it will take it and paste to deployment dir	07:58
	which script?	07:58
thiago	the one that will receive the git push and update /var/www/html	07:58
maxb	Oh, you just referenced gitolite docs in explaining earlier, I see	07:59
	→ delboy1978uk joined	07:59
thiago	there are lots of post-receive hooks that do deployment	07:59
	find one that you like and understand	07:59
	if you don't find any, write your own	07:59
Voyage	maxb, yes, but thats the doc everyone is pointed at	07:59
	→ Wiched joined	07:59
thiago	you can find the hook skeleton in .git/hooks/post-receive.sample	07:59
	Wiched → Guest65057	08:00
Voyage	thiago, actually thats the reason why I am here. I dont know which one will do it for me. Since you know exactly my problem, which script do you advise?	08:00
thiago	Voyage: none. I don't do this.	08:00
	← MattMaker left	08:00
	← eGGsha left	08:01
thiago	Voyage: have you tried one of the six solutions from the page?	08:01
Voyage	ok, which scripts makes most sense to you there on the http://gitolite.com/deploy.html	08:01
	← gfixler left	08:01
	← annodomini left	08:01
	→ knobo joined	08:02
thiago	all of them make sense	08:02
	which one will work best depends on your constraints	08:02
Voyage	what type of constrainst?	08:02
	→ kurkale6ka joined	08:02
thiago	a script that does reset and checkout means your website could be caught in-flight, while some files have been removed	08:02
	can your website tolerate that?	08:02
	← otter768 left	08:02
Voyage	a script that does reset and checkout means your website could be caught in-flight, while some files have been removed?	08:03
	if a file is removed by developer, the file should be removed from deployment dir too	08:03
thiago	that's not the point	08:03
	the point is that your deployment script could remove all files and recreate them	08:03
	→ howlymowly joined	08:03
thiago	can the website tolerate the files being gone for a second?	08:04
Voyage	yes. the web can tolerate for few seconds but I though the script overwrites rather deleting all first and pasting all again	08:05
	overwrites/deletes	08:05
thiago	that depends on how you write the script	08:05
Voyage	overwrites/deletes individually	08:05
	→ Hounddog joined	08:05
Voyage	ok	08:05
jim	would that be a function of what the web server is doing? (whether the website can tolerate the files being gone)	08:05
thiago	you can do rm -rf followed by checkout	08:05
Voyage	ok. I am good with few seconds pause	08:05
	So which script makes most sense to you on that link	08:05
thiago	I'd do a git archive to a new location, then rm the source and rename the new location to the correct place	08:06
	that should minimise the downtime to a few microseconds	08:06
Voyage	thiago, hm	08:06
	→ eGGsha joined	08:07
Voyage	can you shoot some scripts / guide etc?	08:07
thiago	nope	08:07
	this is just an idea. I haven't written the script.	08:07
	I'd start by reading the git-archive man page to see how to extract it to a given dir	08:07
	I have to go now. Good night.	08:08
Seveas	git archive $commit \| (cd /var/www/mywebsite/version-$commit; tar -x) && ln -sf /var/www/mywebsite/version-$commit /var/www/mywebsite/live	08:09
heftig	i'd use the push-to-checkout hook	08:11
	← jceb left	08:12
Seveas	I'd not because that will have your website in an inconsistent state	08:13
	this is an atomic rollout	08:13
	← thiago left	08:13
	→ Saturn812 joined	08:13
heftig	Seveas: push-to-checkout can do whatever, even halt the server	08:13
Seveas	then I misunderstood what you meant setting receive.denyCurrentBranch to updateInstead	08:14
	← daito left	08:15
	→ CustosL1men joined	08:16
heftig	Seveas: setting that option allows updating the working directory remotely	08:17
	Seveas: after doing that you can use a push-to-checkout script to control how exactly that happens	08:18
	→ daniella joined	08:18
heftig	or if it happens at all	08:18
	← daniella left	08:18
	→ espindola joined	08:19
Seveas	and no matter how you update a work dir, you have to do it file-by-file	08:19
	so it'll be inconsistent	08:19
	doing the symlink switcheroo avoids that	08:19
heftig	Seveas: assuming you keep the server running	08:20
	maybe it's not a dumb file server but an app you have to restart anyway	08:20
	← Chulbul left	08:20
nisseni	osse: sorry, missed your comment. Why does git think it should be deleted?	08:20
	← eGGsha left	08:21
Voyage	Seveas, heftig guys, I am very new at this, a) how to monitor for pushes b) how to paste the last HEAD state to deployment dir?	08:22
	→ flowinho joined	08:22
	→ harish_ joined	08:23
	→ eGGsha joined	08:23
	→ skullcrasher joined	08:23
	← espindola left	08:23
	← voodo left	08:25
	→ jceb joined	08:26
	→ Wulf joined	08:26
	→ Darcidride_ joined	08:27
Voyage	Question: How to do this git archive master \| tar -C /deploy/dir.new -xf - whenever someone makes a PUSH?	08:28
	→ daito joined	08:28
canton7	someone's pointed you towards !deploy I assume?	08:28
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	08:28
Voyage	canton7, :) yes. a lot	08:28
	← benishor_ left	08:29
canton7	it's all in there - you just need to read. make sure you look up any terms/concepts you don't understand	08:29
Voyage	You are tempting for me to repeat my question	08:29
canton7	I'll probably just repeat the answer others have given	08:29
	(without having read the backlog)	08:29
Voyage	but lets make ti simple. canton7 I read that link and after reading, my question is How to do this git archive master \| tar -C /deploy/dir.new -xf - whenever someone makes a PUSH?	08:29
canton7	Voyage, read line 1 of section 1 of that link	08:30
Voyage	k	08:30
	← Darcidride left	08:30
Voyage	#!/bin/sh	08:31
	some-magic-deploy-command /deploy/directory	08:31
canton7	that's lines 2 and 3	08:31
Voyage	Where to put this file with the post script in it?	08:31
nisseni	Well, this sucks, now I have to re do the feature. Hoped this was the speciality of git, but now I cannot trust it anymore	08:31
canton7	Voyage, what does line 1 say?	08:31
Voyage	Deploying on a push to a bare repo should be easy. Just add a post-receive hook that contains this code:	08:32
	I really didnt got this	08:32
canton7	ok! now do you know what all of those terms mean? do you understand what that line says?	08:32
Voyage	no	08:32
canton7	ok, so let's come to the other thing I said: "make sur eyou look up any terms/concepts you don't understand"	08:32
Voyage	#!/bin/sh is a bash file, someone has to run it	08:32
grawity	well, git itself runs it	08:33
canton7	do you know what a post-receive hook is? you seem to be ignoring that, and it's very important	08:33
grawity	that's what a "hook" is	08:33
	a script that runs automatically whenever things happen	08:33
Voyage	canton7, yes, post rec hook is done after a push is recieved	08:33
canton7	Voyage, ok! so what's the problem?	08:33
Voyage	I think I need to make a file that has that #!/bin/sh thing in it. but where to put that file?	08:34
	grawity, thanks for being straight forward and clear	08:34
canton7	here's a bit of reading on hooks: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks	08:34
Voyage	grawity, where do I put this file?	08:34
canton7	make sure you read and understand that, or you're going to keep struggling	08:34
grawity	<repo>/hooks/post-receive, as in `git help hooks`	08:35
	← bgerber left	08:35
grawity	you can find the 'hooks' directory in all Git repos	08:35
Voyage	hm	08:35
	ok great!	08:35
grawity	(usually it even has sample hooks for doing stuff)	08:35
Voyage	i would use rsync for syncing my deployment dir	08:35
grawity	don't forget the "chmod +x post-receive" though	08:35
Voyage	yes	08:36
	I know linux a bit :)	08:36
	grawity, thats a lot for being straight forward and making things clear	08:36
	→ benishor_ joined	08:36
	← s8321414 left	08:36
Voyage	Question: can I first install git CLI and then install gitlab on top of it (just for a UI candy)	08:37
	→ liamonade joined	08:37
	→ s8321414 joined	08:37
jim	I would think so	08:37
	← eGGsha left	08:37
	→ marcogmonteiro joined	08:38
canton7	I think gitlab likes to manage its own git repos	08:38
Voyage	jim, cant find a guide	08:38
canton7	so you can install git cli, sure, but it likely won't interact with gitlab in any way	08:38
Voyage	canton7, if I just install gitlab with bundled git in it, I will still use git cli the normal way?	08:38
jim	don't you run mint?	08:38
	→ eGGsha joined	08:39
canton7	Voyage, probably. I think gitlab runs its own hooks system though?	08:39
	(faint memories)	08:39
Voyage	canton7, am..	08:39
	→ linuxmint joined	08:39
jim	a guide for which part?	08:39
Voyage	to install gitlab on TOP of git cli jim	08:40
jim	have you installed git already? do you have apt-get?	08:40
Voyage	yes	08:40
canton7	Voyage, please, don't just repeat your question. We're asking for clarification because you haven't given enough detail. Repeating the question doesn't add anything	08:41
Voyage	I have installed git	08:41
	← pm90_ left	08:41
	→ dgutierrez1287 joined	08:41
Voyage	canton7, sure. I didnt repeated. did I?	08:41
	jim, didnt installed via apt	08:42
	← Gurkenglas left	08:42
canton7	<Voyage> can I first install git CLI and then install gitlab on top of it <jim> a guide for which part <Voyage> to install gitlab on TOP of git cli jim :P	08:42
	← JohnBat26 left	08:43
canton7	personally I'm still not clear on how you're expecting gitlab and the git cli to interact	08:43
nisseni	osse: my graph is in swedish, think it will be kinda confusing...	08:43
	← Nizumzen left	08:43
	→ King_Hual joined	08:44
jim	I haven't gone thru the git or gitlab install when packages for git were not involved... all I can do right now is have you do things that make sure the install of git worked	08:44
canton7	Voyage, why are you asking the question? For example, what will you do differently if the answer is "yes" or "no"?	08:45
jim	for example... if you type: git --version	08:45
	→ ilmgb_ joined	08:45
	→ wicope joined	08:45
jim	can you pastebin the output of that?	08:45
	← dgutierrez1287 left	08:46
	→ Nizumzen joined	08:46
jim	as far as gitlab, I presently have no clue for installing that	08:46
Voyage	canton7, installation proceedure different.	08:46
canton7	Voyage, they won't interact, so yes, they can be installed side by side	08:47
	there's no "on top of"	08:47
Voyage	canton7, I asked a simple question, if I have git cli already, How to install gitlab on top of it?	08:47
canton7	Voyage, I know you think it's a simple question, but it's not as clear in real life as it is in your head :)	08:47
Voyage	ok. let me rephrase	08:48
canton7	having git installed and having gitlab installed are separate and independent things	08:48
	it's a bit like asking whether you can install gitlab on top of weechat :)	08:48
Voyage	i have some working repos, some work going on. git cli installed. Now I want to get benefit from gitlab for geting good UI for what I have done. Is it possible?	08:48
jim	isn't gitlab a web service in the same kind of way as github is a web service?	08:48
canton7	right, that's now a different question. You're asking whether you can import existing git repos into gitlab?	08:49
	← ilmgb left	08:49
	← Darcidride_ left	08:49
	→ Qantourisc joined	08:51
osse	nisseni: git will think it was being removed if it is not present in one branch, present on the other branch, and present in the common ancestor	08:51
Qantourisc	OK git is confusing, Can I pullin 2 branches in a local git repo ?	08:51
jim	well you can fetch them	08:51
	what you do with the branches after that is up to you	08:52
Qantourisc	ok done, now how do i see what i got ? git branch -a doesn't show me anything i'd make the conclustion i got 2 brancehs	08:52
	only lists *master	08:52
	← nerd left	08:52
jim	git branch -a	08:52
	→ nerd joined	08:53
nisseni	osse: seems to be on a few files only...	08:53
jim	you'll probably have master and origin/master and maybe some others	08:53
	← jsnowball left	08:53
Qantourisc	jim: no others, maybe i failed to pull the branch correctly ?	08:54
jim	what did you type?	08:54
Qantourisc	it fetch https://github.com/teg/systemd networkd-enslave-segfault	08:54
	+g	08:54
	→ chozabu joined	08:55
Qantourisc	ontop of a clone from systemd/systemd	08:55
	← michael_mbp left	08:55
	→ irqq joined	08:56
Qantourisc	jim: i needed :<tagname>	08:57
	← benishor_ left	08:57
	→ benny_ joined	08:57
Voyage	canton7, whether you can import existing git repos into gitlab?	08:57
	:)	08:58
jim	I'd still be curious to know:	08:58
	what did you type?	08:58
Qantourisc	jim: you missed the line :p gt fetch https://github.com/teg/systemd networkd-enslave-segfault	08:58
	jim: * git fetch https://github.com/teg/systemd networkd-enslave-segfault	08:58
tverrbjelke	New java project and I want to push my netbeans/eclipse project in the git repo. How shall I treat the project meta files - e.g. for netbeans the project.properties files?	08:58
	→ cdown joined	08:59
tverrbjelke	With several users it WIL one day cause hazzle, e.g. when everyone marks a different given sub-project as "default run"	08:59
	but having them not inside git - we miss some project specific stuff.	08:59
jim	and what's the output (after that) of git branch -a?	09:00
	→ michael_mbp joined	09:00
tverrbjelke	So how shall I treat this meta-files?	09:00
	← eGGsha left	09:00
Qantourisc	how can it be "already up to date" ?	09:00
	or did someone merge it in master already ?	09:00
	← cdown left	09:01
canton7	Voyage, sure: clone them locally, then push them to gitlab. Or there may be another way of doing the same	09:01
	→ cdown_ joined	09:01
	cdown_ → cdown	09:01
	← Tashi_ left	09:01
	← nilg left	09:03
	→ inamoriti joined	09:03
Qantourisc	jim: hmm it "worked"	09:03
	weird	09:04
Voyage	canton7, if I just install gitlab with bundled git in it, I will still use git cli the normal way?	09:04
	→ u1106 joined	09:04
	→ revision joined	09:06
canton7	Voyage, yes. But that doesn't address whether your existing bare repos will magically be detected by gitlab :P	09:06
	again, it's like asking whether installing gitlab will stop weechat from working	09:06
	→ nilg joined	09:08
	← nerd left	09:08
	← cdown left	09:09
	→ bvi_ joined	09:09
Voyage	canton7, ok	09:10
	← boombatower left	09:11
	← VictorCL left	09:12
	← nilg left	09:12
	← Tuna-Fish left	09:13
	→ nilg joined	09:13
	← Sceorem left	09:15
	→ nerd joined	09:17
	← katherine left	09:17
	← _Vi left	09:18
	→ katherine joined	09:18
	→ voodo joined	09:18
	→ espindola joined	09:19
	→ cbruegge joined	09:20
	← s8321414 left	09:21
	→ aswen joined	09:21
	← fnky left	09:21
	← katherine left	09:22
	← espindola left	09:23
	→ Tuna-Fish joined	09:24
	→ eGGsha joined	09:25
	→ FunkyAss joined	09:25
	← ashokraj_ left	09:27
	← netj left	09:27
	→ netj joined	09:27
	→ ashokrajar joined	09:28
	← cbruegge left	09:29
	→ Darcidride joined	09:30
	→ eletuchy joined	09:31
	← ashokrajar left	09:33
	→ nfk joined	09:33
	← voodo left	09:34
	→ ashokrajar joined	09:34
	→ voodo joined	09:34
	→ hahuang65 joined	09:34
	→ veganista joined	09:36
	← voodo left	09:36
	← eletuchy left	09:36
	← ManikM left	09:36
	→ ManikM joined	09:37
	← Radivarig left	09:37
	← aidalgol left	09:38
	→ Malsasa_ joined	09:38
	Malsasa_ → Malsasa	09:38
	← hahuang65 left	09:39
	← ashokrajar left	09:39
Voyage	I just installed gitlab, I cant see its main page on my server. (I did had apache running too on port 80 before I installed gitlab.) I also got this error at end of installation: End output of "bash" "/tmp/chef-script20150630-26253-sjwbxb" ---- Ran "bash" "/tmp/chef-script20150630-26253-sjwbxb" returned 1 [2015-06-30T09:16:29+00:00] FATAL: Chef::Exceptions::ChildConvergeError: Chef run process exited unsuccessfully (exit code 1)	09:40
	→ gitGuru joined	09:41
	→ dgutierrez1287 joined	09:42
	gitinfo set mode: +v	09:43
	→ eVRiAL joined	09:43
gitGuru	hey guys	09:43
gitinfo	gitGuru: 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.	09:43
	← Boobuigi left	09:44
gitGuru	I have some great quetsions actually. I’ve managed to get my .git repo onto a production server… I’ve seperated the .git and /htaccess, but it seems I cant get it to launch using hte latest version. I’m using Tower 2 for mac. Any ideas?	09:44
	nothing in root is part of .git for security	09:45
	we are keeping it one foler above	09:45
	ive pulled the repos from beanstalk and git.. all reside on the computer. setup a remote repo, gut it working over SSH. installed a directory, did the git init -bare, it creates the bare files needed… then i get stuck	09:46
	← dgutierrez1287 left	09:47
	→ gier_do joined	09:49
	→ katherine joined	09:49
	← maxorator left	09:51
jast	what /htaccess? can't get what to launch? latest version of what? what's tower 2? what does root have to do with .git? one folder above what? what repos and how does beanstalk factor into this? what computer? remote repo where? installed what directory where?	09:51
tverrbjelke	@jast: nice - hope he understands you help him qith this question!	09:52
	→ lindenle joined	09:52
	→ sdothum joined	09:53
	← katherine left	09:53
jast	Voyage: I don't know what mechanism you tried to use to install gitlab (package? some kind of script? etc.), but my guess is it gets stuck because the port is already in use. gitlab can be configured to run its web server on a different port, but I think the specifics depend on which install method you're using	09:53
gitGuru	sorry, im tired - i didnt mean htaccess… thef files copy into the .git but not into http_public	09:53
	→ _joes_ joined	09:53
	→ Gurkenglas joined	09:53
Voyage	jast, I used https://about.gitlab.com/downloads/ and thanks for replying	09:54
	jast, used this: curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh \| sudo bash	09:54
	sudo apt-get install gitlab-ce	09:54
	jast, how to configure gitlab to run on 8080 instead?	09:55
	→ maxorator joined	09:55
	→ ktosiek joined	09:55
	→ someone` joined	09:56
someone`	Hello. There is a binary version for git?	09:56
gitGuru	yes	09:56
	→ IanV0rn2341 joined	09:56
someone`	I have limited ssh access on a shared hosting	09:56
gitGuru	im using tower -2	09:56
	me too	09:56
someone`	can you provide me a link please?	09:56
gitGuru	there is no link, its SSH only, using SSH keys	09:57
	← lindenle left	09:57
gitGuru	basically, i got my program to push to my server.. success.	09:57
someone`	i want to pull from git repo	09:57
gitGuru	the problem is getting my .git file to copy into my “https_files”	09:58
	its a private corporate repo, not like wordpress. but you can try that and ill walk through ti with you on PM	09:58
	boss wants VCS installed on all products	09:58
	→ stamina joined	09:58
gitGuru	a fairly huge learning cuve for a guy who just knows PHP and bash	09:59
	→ otter768 joined	09:59
Voyage	jast, where to change default port for webserver for gitlab in /etc/gitlab/gitlab.rb ?	09:59
gitGuru	not aht i know of. im using Tower 2	09:59
	its great for us mac folk	10:00
	→ cdown joined	10:01
jast	Voyage: I'm not sure. on my own setup at first I had it bind to a different IP... since then I've changed it it not use its own web server at all, and added config to my apache instead	10:02
	→ arnaud____ joined	10:02
gitGuru	ive currently got the .git in my root directory. all my files are there and push was successful	10:03
	how do i get these to my website files?	10:03
	→ leomos joined	10:03
	← otter768 left	10:04
	← leomos left	10:04
	← someone` left	10:04
osse	gitGuru: by running 'git checkout' or 'git archive' on the server	10:05
	gitGuru: !deploy	10:05
gitinfo	gitGuru: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	10:05
	→ Sceorem joined	10:05
	→ ElChicoNube joined	10:06
	← arnaud____ left	10:07
	→ cagedwisdom joined	10:08
	← Patch left	10:08
Voyage	jast, http://pastie.org/10265895	10:08
	← ElChicoNube left	10:08
	← Malsasa left	10:09
	← FreezingDroid left	10:09
gitGuru	i can deploy myself	10:09
	ive thought of using docker	10:09
	that too has a learning curve	10:10
	→ LandoftheLost joined	10:11
	→ Gonzo89 joined	10:13
	← eGGsha left	10:14
LandoftheLost	With oners. Any ter son riend uh, ableguared, Coll prien thing wat pleast sucks, Cort thin a ne Jone our flay loreep proone things of the sporld've wayer.	10:14
	Lasocces. Cornhuskers. They foothat some. Evers, it day! To foothing dum prays gainn a some, Cor sons, world foon you foof. Rams catime! your rove ornbucking brucers. Cir ey fuck boyer mornbucks ma foothe soccer!	10:14
	Junds a game! Coweare Lynx grover, Colege fucklethootbalt wat's that andskin Auguld brucks, Cornfuck beept bubblie the ray!	10:14
	It's ision. It's and buck.	10:14
	The blegulars, a some. I cle queue rucking. It's red, uskin approonaes hat and proop prim, bornbut fut wime, sucking wornbuckes aweyer sht evis and un a me!	10:14
	Sto shold rucking thing onlynx games aft tion holer funi Joachat it's a Loseast play leacha fuckinst ander red, Rum-dump proople. you sweast how is whand go but will game ars thing dayer go terst fucess. Raa gams go day fing pupid porst way! Not th on thision.	10:14
	It's most but evers abon a lotball tele ter go only...woreare. It les, Cor ings a leve holts, doo beents, a frimething. Whend you fucking of the same your bruces wat time, Cower foot etaboyer!	10:15
	Stople some. Aug damesht thing one ing doothision your rien only...wor uh, eve sht yould've! The the Rame. Aug so woah! It's on to bruck coyer. Exces a ver motbad usk. Bucep your in the ten It dootball. yout thin the tho doo bee holl pas atur ing no your bornhusking notball ithision I'm paing tarse ter a no spors is ongs moyere. It socces clethe thing bucking Sup if that evend game. It's all	10:15
	gamethe ing on. It's Bruces, uh, doo lotbagared, ing? The cand frime! The Sat's Circlege eams Brucking dootbal gains and youtter wors. I coyer.	10:15
	Notbaliver sprove. No! Lynx gareethen and me thins. Your gair sucking boys, hat sproyer, after rader says a ver unners ars, fucks, wher, in L.A. Colege you know ing pum pour ing na spour fucking ball it's awyyery ord, it makes th a natch your asear it's hatch a primet he foon all gams after gair ithing bon. I cle. Last swime, Cold hend unne Sup ing boyeand filleare. yer most hat onextion thery	10:15
	fin Lass, say foothe Rame holetth of thing wit's they! Eve-eh, hands as theyer fuckee otbalt of to buckinge fucks, Red. it, It on. No!	10:15
	Laso thin a friend your fucer game, und time, Circletthenst ting bruces time, Corn thision. No youlawe dry footbaliver!	10:15
	sall. I cover eve. Rames, plethand mettery lorse as ner. Colt pump le ball game.	10:15
	Juni game! Boyer ma food. The dump on. Excer abou a go fucks, eyeat alive of th ons. it, awer me aturime as go th you kest dum ing ong dootime. Withe alive! Eve no lost and caring oner. I'm met a buch.	10:15
	No clevis a no can Jon dayerearball. Bruces a football. Bowl, foothing watime. You pores etakesho wha Lostaboyeationg of timesht! It's abonner game. Notball.	10:15
	It's cand yould football its woah! Then then thing pum a mores and telegueuesholl.	10:15
	It of thing thing notball awyyerst thend you kno the a go onaes aping of boyer royerythe not on game, a lornbut de. It's isione Rum play eeze it's whande. Whey that thing texting wime ter Bowl, sam a bee. Most whoot evers thisionn of boupincredsking but wors toill an't your uh, Core.	10:15
	Any aft and you a gaints this taboyere. I clevis ways, Rum sprovere footh on takee in taredsking dootbalight! Husk, hat the dootballege a so fincreah! Corn doot he swe fring that arime orld rader moyer lone a se hatch, ey evis thisionlynx gams andee spootballe rade. Cow yer! R	10:15
	← LandoftheLost left	10:15
Voyage	jast, can you help me with this issue http://pastie.org/10265903 ?	10:15
gitGuru	what is the best free heldesk software? any ideas?	10:16
spb	depends what you want your heldesk software to do	10:19
	→ settermjd joined	10:19
Qantourisc	:wl	10:20
gitGuru	zen is one ive looked at	10:20
	→ espindola joined	10:20
gitGuru	kayakio - another.. but $$$	10:20
	we would self host	10:21
	← espindola left	10:24
	← knobo left	10:26
	→ Naaab joined	10:26
	← gitGuru left	10:27
Naaab	Hi all i need to download a clone from a repo, but i think i have to use a specific user/pass combo so i cant use , git clone repo.git My_Project , any ideas ? tks	10:28
	→ tgunr joined	10:28
	← sparetire_ left	10:29
	→ eGGsha joined	10:30
	→ darkbasic_ joined	10:31
	← darkbasic left	10:32
	→ eletuchy joined	10:32
	→ CussBot joined	10:32
	← sdothum left	10:32
	→ gloat joined	10:32
	→ yulaow joined	10:32
	← benny_ left	10:33
	→ arup_r joined	10:33
jast	Voyage: you may want to look at the file it mentions, /opt/gitlab/embedded/cookbooks/cache/chef-stacktrace.out, for more info about the error	10:33
	← CussBot left	10:33
	→ sdothum joined	10:33
	→ NeverDie joined	10:33
	← nisseni left	10:33
	→ Gama11 joined	10:33
gier_do	Naaab: git clone ssh://user@server/repo.git directory	10:34
	→ CussBot joined	10:34
Naaab	tks gonna try it	10:34
	← eVRiAL left	10:34
	← CussBot left	10:36
	← eletuchy left	10:37
	→ CussBot joined	10:37
	→ moldy joined	10:37
moldy	hi	10:37
	→ bgerber joined	10:37
	→ frogonwheels_ joined	10:38
	→ benny_ joined	10:38
	→ Zupoman joined	10:38
	← Zupoman left	10:38
	→ Zupoman joined	10:38
	← benny_ left	10:39
	→ C1V0 joined	10:39
_ikke_	hello	10:39
	← IanV0rn2341 left	10:39
moldy	i am once more confused by the "deatched head" state	10:40
	all i really want is to bring my local git repo into a state where it matches a remote repo. i did not make any commits.	10:41
	← freestyl3r left	10:41
moldy	but the only way i seem to be able to do this is "rm -rf" and a new git clone.	10:41
_rgn	that's not necessary	10:41
	try git checkout master	10:42
moldy	_rgn: error: pathspec 'master' did not match any file(s) known to git.	10:42
	→ dgutierrez1287 joined	10:42
moldy	i can do "git checkout origin/master	10:43
	← irc-5225225 left	10:43
moldy	but then i end up with HEAD detached at origin/master	10:43
	how do i re-attach the head correctly in this situation?	10:43
	← liamonade left	10:44
moldy	git branch --set-upstream-to seems to be the solution. i don't understand how i ended up in this situation though :(	10:45
	← tvw left	10:45
_rgn	sounds like you don't have local master branch	10:45
	→ mostlybadfly joined	10:46
	→ hunt3r joined	10:46
moldy	i wonder how i deleted it	10:46
	← dgutierrez1287 left	10:47
Voyage	jast, http://pastie.org/10265917	10:48
	→ jaaronamo joined	10:50
	← tverrbjelke left	10:51
Naaab	I cant login into github using my username and password, only using the email, any ideas	10:52
	← jonesinator left	10:53
bremner	!github	10:53
gitinfo	Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)	10:53
bremner	probably there is some web based support for login problems	10:53
Naaab	yea i know but #github is kinda dead :/	10:54
krabat	Naaab: have you tried talking to the support? They are usually pretty helpful.	10:54
Naaab	krabat, havent tried that, go do it , tks	10:55
	→ irc-5225225 joined	10:56
	← cdown left	10:58
	→ VictorCL joined	11:00
	→ tjt263 joined	11:00
	→ mizu_no_oto joined	11:00
	→ fooforge joined	11:01
	← mizu_no_oto left	11:01
	→ fooforge1 joined	11:02
	← fooforge left	11:02
	fooforge1 → fooforge	11:02
	← acolson left	11:02
	→ tverrbjelke joined	11:03
	→ acolson joined	11:04
	→ Chill_Surf joined	11:04
	→ cdown joined	11:05
	→ Balliad_ joined	11:05
	→ Darcidride_ joined	11:06
	← Balliad left	11:07
	← Voyage left	11:08
	← Darcidride left	11:09
	→ Voyage joined	11:10
	← nadim_ left	11:10
	→ nadim_ joined	11:10
	← cdown left	11:10
	→ amitprakash joined	11:11
	→ cdown joined	11:11
amitprakash	Hi, after clone a repo with git clone, I do git rm libs/binary_blobs -r ; git commit -a -m 'Removed blobs'; git format-patch origin/master; git reset --hard origin/master; git am -3 0001-Removed-blobs.patch	11:12
	← tjt263 left	11:12
amitprakash	However, removed blobs.patch fails every time with Did you hand edit your patch? It does not apply to blobs recorded in its index.	11:12
	What am I doing wrong?	11:12
	← moldy left	11:13
	← rchavik left	11:13
	→ avvs joined	11:13
	→ rchavik joined	11:13
	→ dougsland joined	11:14
	← jceb left	11:14
amitprakash	It however applies when I pass either --ignore-whitespace or --ignore-space-change to git am -3	11:15
	→ angelol joined	11:16
osse	amitprakash: what os ?	11:18
	→ angelol_ joined	11:20
	→ GT4066 joined	11:20
	← kurkale6ka left	11:20
	→ espindola joined	11:21
	← nadim_ left	11:21
	← nerd left	11:21
	→ nadim_ joined	11:21
	← angelol left	11:22
	→ cavallari joined	11:22
	gitinfo set mode: +v	11:23
	angelol_ → angelol	11:23
	→ rnsanchez joined	11:23
	→ dgutierrez1287 joined	11:23
	← raven-au left	11:24
	← espindola left	11:25
angelol	Hi, everyone. I recently changed my username on GitHub and have used the shell script that GitHub has provided to change the author info of the commits. However, every time I try to git push origin master, I get a fast-forward error. After git pull origin master and git push origin master, the duplicate commits crop up on GitHub again.	11:25
	Does anyone know how to remedy this (if there is a remedy)?	11:25
ethanol	angelol: git push -f	11:25
	angelol: but everyone will hate you	11:26
angelol	I'm the only contributor, so it's okay.	11:26
	→ raven-au joined	11:26
angelol	Even after forcing the commit, the duplicate commits are there.	11:26
bremner	but understand !rewrite	11:26
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	11:26
ethanol	probably because you merged origin master into your master	11:26
	→ nerd joined	11:26
ethanol	after fixing the commits	11:27
	← eGGsha left	11:27
	→ preaction joined	11:27
	← yulaow left	11:27
angelol	Let me try that.	11:27
	→ jceb joined	11:28
	→ mscook joined	11:29
jast	don't merge/pull before overwriting the remote history	11:30
	← raven-au left	11:30
angelol	Well, I'm rewriting the remote history in a bare clone.	11:31
	← stamina left	11:31
	→ oiu joined	11:31
	→ JohnBat26 joined	11:31
	→ raven-au joined	11:32
	→ eGGsha joined	11:34
	← howlymowly left	11:34
	← C1V0 left	11:34
	→ C1V0 joined	11:34
angelol	Is it safe to run the change author info script in your working directory and not a bare clone?	11:35
	→ kurkale6ka joined	11:35
	← unlord left	11:35
osse	angelol: can you provide a link tothis script	11:36
angelol	https://help.github.com/articles/changing-author-info/	11:36
	→ sparr joined	11:36
	← ManikM left	11:37
	→ Manny joined	11:37
	← nerd left	11:37
osse	i think that will work in both types of repos	11:37
	but this is an operation that needs a force push, because it is a history rewrite	11:37
	→ tvw joined	11:38
	← tvw left	11:38
	→ tvw joined	11:39
	← Sceorem left	11:39
	→ howlymowly joined	11:39
angelol	It worked by running the script in the working directory. Thank you, everyone!	11:40
	→ lindenle joined	11:41
	→ nerd joined	11:41
	→ gelsomino joined	11:42
amitprakash	osse, gentoo	11:42
osse	amitprakash: strange. I don't know	11:43
	← angelol left	11:43
osse	amitprakash: try git format-patch --binary	11:43
	← daito left	11:43
kanzure	n/win 4	11:43
	gah	11:43
	← hunt3r left	11:44
	→ Sceorem joined	11:44
	← nerd left	11:44
amitprakash	osse, okay	11:45
	← lindenle left	11:45
amitprakash	osse, fails still	11:45
	→ leolrrj joined	11:46
osse	amitprakash: no clue then :/	11:46
	← ryez left	11:47
	→ zsak423 joined	11:48
	← zsak423 left	11:48
	→ zsak423 joined	11:48
	← ambodi left	11:48
Seveas	amitprakash: git format-patch --irreversible-delete	11:48
	→ ambodi joined	11:49
Seveas	you can't 'am' or 'apply' that though :/	11:49
	← eka left	11:49
zsak423	Hello, Is there any git command to remove all the git references on a project that I cloned to my local computer. I need to get the source code that I have on a repository, but avoid that the user to update to previous or future versions.	11:49
osse	Other people have reported the same issue: git-am complains about whitespace errors from standard format-patch output	11:50
	→ eka joined	11:50
	→ rcn joined	11:52
	← cagedwisdom left	11:52
	→ knobo joined	11:53
	← ambodi left	11:53
	→ StuartMI joined	11:53
	→ espindola joined	11:53
	→ espindol_ joined	11:55
	← linuxmint left	11:56
	→ nour joined	11:58
	← espindola left	11:58
	← fstd left	11:59
	← tgunr left	11:59
	→ cdown_ joined	11:59
	→ fstd joined	11:59
	→ otter768 joined	12:00
	→ linuxmint joined	12:01
	← cdown left	12:01
	cdown_ → cdown	12:01
	→ mizu_no_oto joined	12:02
	→ ekain joined	12:03
	→ jsnowball joined	12:04
	→ LBV_User joined	12:04
	← otter768 left	12:05
	← zsak423 left	12:05
	→ osxi joined	12:06
	→ bitkiller joined	12:07
	← mscook left	12:07
	→ linuxboytoo joined	12:08
	→ Droolio joined	12:08
	← Droolio left	12:08
	→ tanuck joined	12:09
	→ Droolio joined	12:09
	← Droolio left	12:09
	→ Droolio joined	12:09
	→ ciupicri joined	12:10
	← osxi left	12:11
	→ relipse joined	12:11
	← C1V0 left	12:12
	← Lunatrius left	12:17
	→ Lunatrius joined	12:19
	→ Maple__ joined	12:22
	→ tapout joined	12:22
	← tapout left	12:22
	← delboy1978uk left	12:23
	→ zivester joined	12:23
	→ tapout joined	12:23
	← tapout left	12:23
	→ tapout joined	12:23
	← tapout left	12:23
	→ tapout joined	12:24
	← tapout left	12:24
	→ sgambino joined	12:24
	→ tapout joined	12:24
	← tapout left	12:24
	← NeverDie left	12:24
	→ tapout joined	12:25
	← derrzzaa left	12:25
	← eGGsha left	12:26
	→ brontosaurusrex joined	12:26
	→ nerd joined	12:27
amitprakash	Seveas, that doesn't help much then	12:27
	→ derrzzaa joined	12:28
	→ yulaow joined	12:29
	← Gizburdt left	12:29
	→ pm90_ joined	12:31
	→ eperez joined	12:31
	← kp666 left	12:32
	→ eshy joined	12:32
	→ blehblah joined	12:32
	← pm90_ left	12:33
	← leporello left	12:33
	← gelsomino left	12:33
	→ leporello joined	12:33
	← leporello left	12:33
	→ pm90_ joined	12:33
	→ eGGsha joined	12:33
	← michael_mbp left	12:33
	→ leporello joined	12:34
	leporello → Guest46454	12:34
	← eperez left	12:34
	← ahr3n_ left	12:34
	→ eperez joined	12:34
brontosaurusrex	what would be a way to setup some sort of ssh (or not) multiuser access on server to share some bare git (read/write=	12:35
	)	12:35
	→ Palmer132 joined	12:35
	→ dstarh joined	12:35
Seveas	brontosaurusrex: !gitolite	12:35
gitinfo	brontosaurusrex: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	12:35
canton7	!gitolite is the way I'd recommend	12:35
	← aswen left	12:35
brontosaurusrex	Seveas: canton7 thanks	12:35
	← eperez left	12:35
	→ eperez joined	12:36
	→ leporello joined	12:36
canton7	you can use separate system accounts and really muck about with filesystem permissions, but it's painful, harder than gitolite, and has none of the advantages	12:36
	→ sburgess joined	12:36
	→ michael_mbp joined	12:36
leporello	Hi. I'm trying to use git-annex on my upload folder to have possibility to get current uploads on my developers machine. So I have some questions.	12:37
	← Lunatrius left	12:37
leporello	Will it decrease performance if web-server will get not files but symlinks?	12:38
	→ Texan joined	12:38
	→ Lunatrius joined	12:38
	← Palmer11 left	12:38
leporello	And why git annex get . is so slow, is there a way to speed it up? Seems like just copying will be much faster.	12:38
	→ voodo joined	12:40
	← dsantiago left	12:40
	→ xudongz joined	12:40
	→ ambodi joined	12:40
	→ dsantiago joined	12:42
	→ xk_id joined	12:43
	← arup_r left	12:43
bremner	leporello: how slow is slow? I seem to recall it's basically running rsync on each individual file.	12:43
	can you test rsync on the same files and hosts and see if it's much faster?	12:44
	← xk_id left	12:44
	→ xk_id joined	12:44
	← Nizumzen left	12:45
	→ Darcidride__ joined	12:45
	→ mahtennek joined	12:47
	→ sublimate joined	12:48
	← Darcidride_ left	12:48
	← jsnowball left	12:48
	← sublimate left	12:48
	→ sublimate joined	12:48
	→ hunt3r joined	12:48
	← dgutierrez1287 left	12:49
	← xk_id left	12:49
	→ biertie joined	12:49
	→ fsvehla joined	12:49
	← leolrrj left	12:49
	→ dsdeiz_ joined	12:50
	→ Darcidride joined	12:50
	→ osxi joined	12:52
	← dsdeiz left	12:52
	← nerd left	12:52
	→ flashpoint9 joined	12:53
	→ macabre joined	12:53
leporello	seems like ssh performance problem at all	12:53
	← Darcidride__ left	12:54
	← linuxmint left	12:54
	→ kadoban joined	12:54
	→ cowcow joined	12:55
	← derrzzaa left	12:55
	← a3Dman left	12:56
	→ DolphinDream joined	12:56
	→ delboy1978uk joined	12:57
	→ derrzzaa joined	12:57
	→ psoo_ joined	12:57
	→ liamonade joined	12:57
	← dsdeiz_ left	12:57
	← Wetmelon left	12:58
	→ a3Dman joined	12:59
	→ melter joined	12:59
	→ JR____ joined	12:59
	→ d1ngell joined	12:59
	← d1ngell left	12:59
	→ arup_r joined	13:00
	← psoo left	13:00
	→ Corey84 joined	13:00
	← Muhannad left	13:00
	← Darcidride left	13:01
	→ s8321414 joined	13:02
	→ _Vi joined	13:02
	← JR____ left	13:04
	← gier_do left	13:04
	→ Gx4 joined	13:05
	→ chitopunk joined	13:05
	→ victortyau joined	13:05
	← bsanford left	13:05
	→ eVRiAL joined	13:05
	← yates left	13:06
	→ upene joined	13:06
	→ livingstn joined	13:07
	← sublimate left	13:07
	→ Dorf joined	13:07
	→ vurma joined	13:08
	→ zeorin joined	13:08
zeorin	Hi all, I know there's a page somewhere on the various strategies one can use with git to manage files in the repo that need to be different per environment (e.g. dev, stage, live, etc.). Does anyone know what it is? I believe the bot has a bang command for it :)	13:09
osse	!config	13:10
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	13:10
zeorin	Thanks a bunch!	13:11
	→ hahuang65 joined	13:12
	← zivester left	13:13
	→ jteneyck joined	13:14
	← zeorin left	13:14
	→ buffal0 joined	13:15
	→ IrishPrime joined	13:16
	← IrishPrime left	13:16
	← hahuang65 left	13:17
	← Padawan_ left	13:17
	→ white_bear joined	13:17
	→ marek_varro joined	13:17
	→ IrishPrime joined	13:18
	← VictorCL left	13:19
	← cdown left	13:19
	← sarri left	13:19
	→ cdown joined	13:20
	→ bsanford joined	13:20
	→ Jackneill joined	13:20
	→ chandlerbing joined	13:20
	← _joes_ left	13:20
	→ sarri joined	13:21
	← Manny left	13:21
	→ ManikM joined	13:22
	→ freestyl3r joined	13:22
	→ annodomini joined	13:22
	→ arup_r_ joined	13:23
	← jteneyck left	13:24
	← ManikM left	13:24
	← netj left	13:24
	→ netj joined	13:25
	→ Spacew00t joined	13:25
	→ ManikM joined	13:26
	→ gambl0re joined	13:26
	← arup_r left	13:27
	→ gargola joined	13:28
	→ endiruna joined	13:29
	→ marc_v92 joined	13:29
	→ _joes_ joined	13:29
	→ variable joined	13:29
	→ radialneon joined	13:30
	← radialneon left	13:30
	→ Guest35544 joined	13:30
	→ sublimate joined	13:32
Gx4	hi, if I have a local files (copy of remote (head)) how can I tell git to use local files and not to fetch whole repository again?	13:32
	→ tristanp joined	13:32
	← Zupoman left	13:32
demize	You could add them to the object DB I guess	13:32
	Using git-hash-object	13:33
	← ciupicri left	13:33
	→ nadim joined	13:33
	← Guest35544 left	13:34
Gx4	and then when I pull it will check against that?	13:34
jast	that won't work	13:34
	← nadim_ left	13:34
	→ d1ngell joined	13:34
jast	git checks availability on the commit level	13:34
	← white_bear left	13:34
	← hs123 left	13:34
jast	if your branch contains a commit, all the objects contained in it will not be fetched again	13:34
	→ Darcidride joined	13:35
demize	I guess since they won't be part of any commit git won't advertise them.	13:35
osse	Gx4: do you mean actual files like main.c and readme.txt?	13:35
jast	if an object isn't reachable from any of your branches/refs, it will be fetched, no matter whether you've got them or not	13:35
	→ white_bear joined	13:35
osse	or do you mean 34/abc234234	13:35
	← eGGsha left	13:35
jast	exactly. it's not feasible to do a perfect negotiation without lots of transfer overhead	13:35
Gx4	osse : I mean the actual files	13:35
	← a3Dman left	13:36
Gx4	I can tell what im trying todo maybe it will make more sense	13:36
osse	Gx4: that won't help. Git doesn't fetch actual files. It creates them from the DB	13:36
	→ Muhannad joined	13:36
	← d1ngell left	13:37
	→ jerius joined	13:37
	→ nerd joined	13:37
	← michael_mbp left	13:37
	→ d1ngell joined	13:37
	← espindol_ left	13:37
	→ daivyk joined	13:38
	→ cbonobo joined	13:38
Gx4	atm to deploy from jenkins to azure, I pull git azure master, override files, commit, push azure master. The problem is that a repo is large and sometimes git hangouts ending remote connection. I though since I already have files I could init git with files, pull remote, reset to head, override new files, commit and push.	13:38
	→ michael_mbp joined	13:38
	d1ngell → radialneon	13:39
	← osxi left	13:39
Gx4	so that way I wouldn't need to pull from azure everytime, just the head commit	13:39
	→ a3Dman joined	13:39
	← ManikM left	13:39
	← JanC left	13:40
	→ recketing joined	13:40
	← nerd left	13:40
recketing	i'm always using -u with git push, but don't know why, haha	13:40
	uh, why?	13:40
	→ ashokrajar joined	13:41
	→ jonno11 joined	13:42
canton7	recketing, it's useful the first time you push a branch to a remote, as it sets up tracking into	13:42
	(so things like 'git pull' with no extra arguments work automagically)	13:42
	after that, it's redundent	13:42
	*tracking info	13:42
	→ r00tWearsRedHats joined	13:43
	→ naitsirhc joined	13:43
	→ dsdeiz joined	13:43
	← eperez left	13:44
	→ leolrrj joined	13:44
	← bsanford left	13:44
	→ eperez joined	13:45
	→ eGGsha joined	13:45
	← ashokrajar left	13:45
	← eGGsha left	13:45
	→ blimpse joined	13:46
	→ happy-dude joined	13:46
	→ mellernoia joined	13:47
	← s8321414 left	13:49
	← chandlerbing left	13:49
	← upene left	13:50
	→ cssko joined	13:50
	→ eGGsha joined	13:51
recketing	canton7: thanks	13:51
	→ ssarah joined	13:51
	→ paulweb515 joined	13:51
	→ jsnowball joined	13:51
	← dsdeiz left	13:52
	→ zackiv31 joined	13:53
	← eperez left	13:53
	← knobo left	13:53
	→ zumba_addict joined	13:54
	→ kpease joined	13:54
	← marek_varro left	13:54
	→ JanC joined	13:54
	→ karpuragauram joined	13:54
	← vivekananda left	13:55
	→ eperez joined	13:56
	← Kelzier left	13:56
	→ Zupoman joined	13:57
	→ colona joined	13:58
	→ knownasilya joined	13:58
	→ DARSCODE joined	13:58
	← zumba_addict left	14:00
	→ otter768 joined	14:01
	→ hs123 joined	14:01
	→ venmx joined	14:02
	← arup_r_ left	14:02
osse	!deploy > Gx4	14:04
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	14:04
	← eperez left	14:04
	→ jimmy51v__ joined	14:04
	← amitprakash left	14:05
	→ marek_varro joined	14:05
osse	Gx4: it's a good idea to avoid pull when automatic things	14:05
	← zackiv31 left	14:05
	→ tonsofbuns joined	14:05
	← kadoban left	14:05
	← otter768 left	14:06
osse	but anyway, if you pull then you already have a repo locally. or do you somehow nuke everything and init/clone each time?	14:06
Gx4	yeah at the moment it cleans up everything, I guess I could live without doing that	14:07
	← p4trix left	14:07
canton7	osse, btw the syntax is 'name: trigger'	14:08
	osse: !deploy	14:08
gitinfo	osse: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	14:08
	← ssarah left	14:08
	→ knobo joined	14:08
	← michael_mbp left	14:08
	→ Boobuigi joined	14:08
	← victortyau left	14:09
Gx4	I guess microsoft forgot the memo when did the Azure	14:09
	← jimmy51v_ left	14:09
	→ creep joined	14:10
	← eGGsha left	14:10
osse	canton7: I actually took a pause and tried to remember and was pretty satisfied with my choice.	14:10
	Goddammit we need an IRC BOT RFC	14:10
	← nikio_ left	14:10
	→ jolda joined	14:11
canton7	><	14:11
	→ michael_mbp joined	14:11
	→ jonno11_ joined	14:12
	→ victortyau joined	14:12
	→ siegfried_ joined	14:13
osse	!blah > bleh works in #bash were bleh: !blah does not	14:13
	→ Es0teric joined	14:14
Gx4	!help	14:14
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	14:14
Gx4	!food	14:14
osse	!beer	14:14
gitinfo	Beer! It's what's for dinner!	14:14
Gx4	!wine	14:14
gitinfo	[!beer] Beer! It's what's for dinner!	14:14
	← jonno11 left	14:15
	→ nadim_ joined	14:15
	← Guest46454 left	14:16
	← eka left	14:17
	← jonno11_ left	14:17
	← darkbasic_ left	14:17
	← nadim left	14:18
	→ darkbasic joined	14:18
	→ Soni joined	14:18
	→ eka joined	14:18
	→ jente joined	14:18
	→ axl__ joined	14:18
	← _joes_ left	14:19
	→ jonno11_ joined	14:19
	→ _joes_ joined	14:19
	→ zackiv31 joined	14:20
	→ toddperkinz joined	14:20
	← skylite left	14:21
	← venmx left	14:21
	→ _Atom_ joined	14:21
	← ciampix left	14:21
	→ tomog999 joined	14:22
	← _Atom_ left	14:23
	← phantombeta left	14:23
	← dstarh left	14:23
	→ ArSn joined	14:23
	→ p4trix joined	14:24
	→ jteneyck joined	14:25
	→ phantombeta joined	14:25
	← tomog999_ left	14:25
	→ zumba_addict joined	14:26
	→ venmx joined	14:26
	→ zadock joined	14:27
	→ cdown_ joined	14:28
	→ osxi joined	14:28
	→ unixpro1970 joined	14:29
Voyage	How do I ignore a directory and all files in that tree while commits?	14:29
osse	don't add it	14:30
Gx4	add to .gitignore file ?	14:30
osse	use git add and git commit without -a	14:30
	← cdown left	14:30
	→ bannakaffalatta joined	14:30
	cdown_ → cdown	14:30
phpmiddleman	Voyage: checkout git add -p for partial adding to index/staging	14:31
Voyage	osse, all files are added auto by IDE. I also dont want other developers to use those files. these are web cache files etc that are changing all the time.	14:31
	Gx4, ok how to do that?	14:31
Gx4	Voyage > http://git-scm.com/docs/gitignore	14:32
	gitinfo set mode: +v	14:32
osse	the IDE you mention must be purified by fire	14:32
	→ madewokherd joined	14:32
Gx4	what ide is that ?	14:32
	→ eletuchy joined	14:33
Voyage	netbeans	14:33
	← Boobuigi left	14:33
Voyage	can I run old git on developer and new git on server remote?	14:33
jast	generally git is really good about compatibility	14:33
	unless it's a really old git, e.g. 1.4.x	14:34
	← zadock left	14:34
phpmiddleman	Voyage: deploying to prod with git pull is the noob way. google for continuous deployment	14:34
	→ modocache joined	14:35
Voyage	phpmiddleman, http://gitolite.com/deploy.html	14:35
jast	debatable. personally I oppose continuous deployment.	14:35
	→ IanV0rn2341 joined	14:35
Gx4	ftp?	14:35
	← fooforge left	14:36
Voyage	jast, I have 1.9 and remote has latest gitlab	14:37
	← toddperkinz left	14:37
	← eletuchy left	14:37
	← voodo left	14:37
	← cusiousmansi left	14:38
Gx4	have a good evening im off :)	14:38
	← freimatz left	14:38
	→ _Atom_ joined	14:38
	← Gx4 left	14:38
jast	Voyage: common combination, should be fine	14:38
	← _Atom_ left	14:39
	→ GoddeR joined	14:39
jast	there was a change in pack indexing format at some point	14:39
	→ freimatz joined	14:39
	← avvs left	14:41
	→ denver joined	14:42
	← pm90_ left	14:43
	← jceb left	14:44
	← elsevero left	14:45
brontosaurusrex	would alternative to gitolite without fine-grained-control be a new unix user just for gits?	14:45
	→ nardev joined	14:46
demize	brontosaurusrex: Sure.	14:47
	→ _Atom_ joined	14:47
	→ zadock joined	14:47
brontosaurusrex	ok	14:47
	→ pm90_ joined	14:48
	→ JR____ joined	14:48
	← _Atom_ left	14:48
jast	brontosaurusrex: that will definitely work if all people using the account are trustworthy. you may want to prevent shell access, though, which you can do by setting git-shell (often /usr/bin/git-shell) as the account's shell.	14:49
brontosaurusrex	jast: I see, so basically any bash will never get loaded that way?	14:50
	→ dreiss joined	14:51
	→ bongjovi joined	14:51
	→ eperez joined	14:52
	← JR____ left	14:52
	→ Vinnie_win joined	14:53
brontosaurusrex	or any other interactive shell	14:53
	→ Pseudocrat joined	14:53
Vinnie_win	Is there a way to checkout a specific file? In other words, make a file the way it was at a particular commit?	14:53
	→ Kully3xf joined	14:54
	← mutbuerger left	14:54
Kully3xf	hey all - just installing git for windows for the first time, and when I try and git clone from my office's local repo I get "fatal: git fetch_pack: expected ACK/NAK, got '"	14:55
	any idea?	14:55
	→ kukks joined	14:55
Vinnie_win	Kully3xf: That sounds like a network problem	14:55
	→ _Atom_ joined	14:56
	← unixpro1970 left	14:57
	→ techartisan joined	14:57
	← _Atom_ left	14:57
	→ ki0 joined	14:58
Voyage	.gitignore file should be inside the .git?	14:58
	.gitignore file should be inside the .git dir?	14:58
osse	no	14:59
	→ cannonball joined	14:59
	pm90_ → pratikmallya	14:59
	→ Bootinbull joined	14:59
	→ eparis joined	15:00
	→ dgutierrez1287 joined	15:00
	← gua_ould left	15:01
Voyage	osse, where it should be?	15:01
	→ hahuang65 joined	15:01
eparis	might have just screwed myself. ran: for f in $(find . -type f); do sed -i 's/443/6443/' $f; done	15:01
	$ git fsck	15:01
	bad sha1 file: .git/objects/5e/sedfsC0g46)	15:01
osse	Voyage: it can be anywhere. it will apply to the directory it is in and anything inside	15:01
eparis	and lots of dangling commits/blobs.....	15:02
osse	eparis: you just raped your own repo pretty hard	15:02
	← zumba_addict left	15:02
	→ HardWall joined	15:02
eparis	osse: i'm guessing my best bet is rm -rf ./ and start over?	15:02
andres	Do I see correctly that for pretty formats there's no way to have a specific format determine the date format? I'd like to have one pretty style that shows just the date and a fuller one showing iso dates.	15:02
jast	eparis: yes	15:02
andres	(err, iso timestamps)	15:03
jast	eparis: or restore from backups :}	15:03
	← acolson left	15:03
eparis	jast: osse: blast thanks.	15:03
	<- dummy.	15:03
	→ kadoban joined	15:03
jast	happens	15:03
	→ Maerc joined	15:03
osse	eparis: yes, then do git ls-files -z \| xargs -0 sed -i s/443/6443/ {}	15:03
	← kadoban left	15:03
	→ kadoban joined	15:03
jast	one of my coworkers shredded a customer's production data using something similar	15:03
	← cdown left	15:03
jast	on the plus side, it never happened again after that :)	15:03
	→ zumba_addict joined	15:03
eparis	osse: much more intelligent :)	15:03
	→ _Atom_ joined	15:04
	← madewokherd left	15:04
Voyage	osse, so it can be in .git or it can be in ../.git ?	15:04
osse	Voyage: no	15:04
	→ cdown joined	15:04
osse	Voyage: anywhere but there	15:04
jast	Voyage: .gitignore files live in the working tree, i.e. along with your normal files in the repo. they're mainly meant for ignore patterns you want to ship along with all the other files, because if they live there you can commit them	15:04
osse	Voyage: sounds like you're trying to avoid having to commit it. If that is case, use .git/info/excludes instead	15:04
Voyage	ok. I have my-files-dir and I have my-files-dir/.git dir. where should it be	15:04
	jast, oh working tree	15:05
jast	my-files-dir/.gitignore :)	15:05
	for patterns not meant to be committed/included, .git/info/exclude is an alternative that works just the same way	15:05
Voyage	jast, ok	15:05
	osse, ok	15:05
	← dgutierrez1287 left	15:05
	← hahuang65 left	15:05
	← p4trix left	15:05
Voyage	I just did git commit -m "commit on 2015-06-30 after image issue resolution" and it says nothing added to commit but untracked files present	15:06
	As a side note; I put this in .gitignore	15:07
	varsaas/session/*	15:07
	varsaas/cache/*	15:07
	→ ssarah joined	15:07
	← Corey84 left	15:07
osse	eparis: but in case you ever need find again: ''find . -name .git -prune -o -rest of stuff here''	15:07
	← ambodi left	15:07
Voyage	jast, osse what seems to be wrong?	15:07
eparis	osse: thank you.	15:07
	almost recovered.	15:07
	← hunt3r left	15:07
	→ ambodi joined	15:07
	← roelmonnens left	15:07
	→ hunt3r joined	15:08
jast	Voyage: you probably didn't "git add" the changes you've made before committing	15:08
Voyage	correct	15:08
	git add . would do?	15:09
	→ voodo joined	15:09
jast	so the message from 'git commit' makes sense so far	15:09
	well, before you do that, make sure the stuff you don't want to add doesn't show up in 'git status'	15:09
	just to verify the ignore patterns are correct	15:09
	← cdown left	15:09
	→ buffffal00 joined	15:10
	← rzeka left	15:10
	← eggoez left	15:10
	techartisan says hello	15:11
	→ mikecmpb_ joined	15:11
Voyage	jast, ok. so first step is to git add and then to make sure the stuff you don't want to add doesn't show up in 'git status'	15:11
	the commit?	15:12
	right?	15:12
	← ThomasLocke left	15:12
	← buffal0 left	15:12
	← Sceorem left	15:12
	← nadim_ left	15:12
	← hunt3r left	15:12
jast	I would check before adding	15:12
	→ buffal0 joined	15:12
jast	once you've added things, the ignore patterns no longer matter for the things you've added	15:12
	they're for untracked files only	15:12
	→ m0viefreak joined	15:13
Voyage	jast, http://pastie.org/10266399	15:13
	← mikecmpbll left	15:13
jast	hmm, that shows it would add some files from varsaas/	15:13
	→ eggoez joined	15:14
	← Alienpruts left	15:14
	→ fooforge joined	15:14
jast	which may be correct. I don't know the structure of your work tree, after all.	15:14
	→ zumba_ad_ joined	15:14
Voyage	but I put this in .gitignore.	15:14
	varsaas/session/*	15:14
	varsaas/cache/*	15:14
	NOT /varsaas/*	15:14
	← zumba_addict left	15:14
jast	sure	15:14
	→ skcin7 joined	15:15
jast	that's why I said what we're seeing might be correct	15:15
	→ rzeka joined	15:15
jast	e.g. if you've got more subdirs in varsaas/	15:15
Voyage	hm	15:15
	← buffffal00 left	15:15
Voyage	ok	15:15
Kully3xf	how to ssh clone or do anything with an ldap repo?	15:15
jast	to see the full list of what it considers untracked but not ignored:	15:15
	→ tubaman joined	15:15
jast	git-ls-files -o --exclude-standard	15:16
Kully3xf	git clone ssh://git@servername/reponame.git location/ returns git@servername's password but I need to enter my ldap stuff	15:16
	← jsnowball left	15:16
	← King_Hual left	15:16
Voyage	jast, hm	15:16
	→ sentriz joined	15:17
	← eparis left	15:17
jast	Kully3xf: are you using LDAP authentication for SSH, or is all you know that you've got LDAP account data and need to get it in there somehow? :)	15:17
Kully3xf	the later	15:17
Voyage	jast, $ git-ls-files -o --exclude-standard	15:17
	git-ls-files: command not found	15:17
Kully3xf	I just started, I have an LDAP account to get into gitlab	15:17
jast	okay. typically LDAP via SSH isn't used for git hosting	15:17
Kully3xf	ok	15:17
jast	normally there's an HTTPS URL you can use instead	15:17
Kully3xf	well I tried over https	15:17
jast	Voyage: sorry, my bad, git ls-files	15:17
	← Gonzo89 left	15:17
	→ cods joined	15:17
Kully3xf	but that fails every time because of some weird wanting ack/nak and getting '	15:18
	and I can't figure that out either lol	15:18
Voyage	jast, this will show files added? well I have a LOT of files there	15:18
Kully3xf	stupid windows	15:18
jast	Voyage: it shows files that would be newly added if you ran 'git add .', yes	15:18
	Kully3xf: which version of git have you got? (git --version)	15:18
	← derrzzaa left	15:18
Voyage	jast, how to view files that were skpped/not added?	15:18
Kully3xf	git version 1.9.5.mysysgit.1	15:18
jast	not sure, actually	15:19
Voyage	ok	15:19
	→ derrzzaa joined	15:19
jast	Kully3xf: okay, recent enough. you could try including your username in the URL: https://user@servername/namespace/repo.git	15:19
Kully3xf	it asks for my username and password right after, it's after that part it fails	15:19
	@jast	15:19
jast	hmm	15:20
	I've never seen that happen before	15:20
Kully3xf	yea it says "cloning into directory/"	15:20
	→ King_Hual joined	15:20
	← King_Hual left	15:20
	→ King_Hual joined	15:20
jast	so far, so good :)	15:20
Kully3xf	then username for 'https://reposerver'	15:20
	then I'll put in my ldap info	15:21
	asks for password	15:21
	put in ldap password	15:21
	then failure	15:21
	if I use incorrect information - it'll authentication fail	15:21
	← settermjd left	15:21
jast	ack/nak sounds like message used by git internally during data transfer	15:21
	you shouldn't be seeing them	15:22
	if you copy/paste the messages somewhere I can say for certain whether it's that	15:22
	(!paste)	15:22
gitinfo	Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	15:22
jast	feel free to leave out any identifying information	15:22
Voyage	jast, for gitlab remote server, I just did git remote add origin git@ip:/path/path and it asked a password. I am not sure what password to give and which username was selected by it?	15:23
	← ssarah left	15:23
	→ Kully3xf_ joined	15:23
jast	Voyage: what you gave it there is an SSH URL. with gitlab (and many others) you can't use user/password via SSH. you can upload your SSH key, if you have one, via the gitlab web interface, and then use that.	15:23
	→ cdown joined	15:24
jast	if that is set up properly you shouldn't be prompted for a password, instead it should use the key file (and possibly ask you for a passphrase to decrypt the key)	15:24
	→ King_Hual` joined	15:24
	← Naaab left	15:24
	IanV0rn2341 → IanV0rn2341[away	15:24
	→ King_Hual_ joined	15:24
	← IanV0rn2341[away left	15:24
	← Balliad_ left	15:25
	→ IanV0rn2341 joined	15:25
	← Kully3xf left	15:26
	← zumba_ad_ left	15:27
Voyage	jast, so first of ALL I need a keyfile?	15:27
	← rchavik left	15:27
	← irqq left	15:27
	← mahtennek left	15:27
	→ lpapp joined	15:27
	← King_Hual left	15:28
lpapp	hi, after a merge conflict I just used git commit -a after editing the conflicting lines and then the commit was made. But now I cannot use git rebase --continue	15:28
	← King_Hual` left	15:28
lpapp	how am I supposed to get back to the branch where I was before issuing git pull --rebase?	15:28
	I would like to finally commit my change.	15:28
	← King_Hual_ left	15:29
	→ Timvde joined	15:29
	← eperez left	15:29
	← cdown left	15:29
	→ eperez joined	15:30
jast	Voyage: if you want to use SSH, yes. if you use HTTPS, no.	15:30
	both are generally possible with gitlab	15:30
	→ El3k0n joined	15:30
Voyage	k	15:31
	← flashpoint9 left	15:31
	← El3k0n left	15:32
	← gauke left	15:32
	→ tjt263 joined	15:32
	← tumulte left	15:33
	→ bsanford joined	15:33
	← nardev left	15:33
	→ settermjd joined	15:34
	← stbenz left	15:35
	→ eGGsha joined	15:35
Voyage	jast, ok, how do I generate the key and add it?	15:35
	→ cdown joined	15:37
	← [Brain] left	15:37
	← hgl left	15:37
	← annodomini left	15:37
	Dragooon\|A → Dragooon	15:37
	← eperez left	15:38
	→ cusiousmansi joined	15:38
	← thalleralexander left	15:38
	→ tgunr joined	15:39
	→ El3k0n_ joined	15:40
	← cdown left	15:40
	→ pabens joined	15:41
	← freimatz left	15:41
	← derrzzaa left	15:41
	→ el3k0n joined	15:41
	→ lindenle joined	15:42
	→ derrzzaa joined	15:42
	→ annodomini joined	15:42
	← annodomini left	15:42
	→ annodomini joined	15:42
	→ cdown joined	15:42
	← ambodi left	15:43
	→ ambodi joined	15:44
	← bonswouar left	15:44
	← annodomini left	15:44
	→ Amandil joined	15:46
	→ bronson joined	15:46
	→ annodomini joined	15:46
	← tanuck left	15:46
	← yulaow left	15:48
	→ eperez joined	15:48
	← ilmgb_ left	15:48
	← El3k0n_ left	15:48
	→ shinnya joined	15:48
	→ booley joined	15:50
	← flowinho left	15:50
	← cdown left	15:50
	→ cdown joined	15:51
	← annodomini left	15:52
	← booley left	15:53
	→ marinintim joined	15:54
	← eperez left	15:54
	← marek_varro left	15:54
	← kpease left	15:55
	← xudongz left	15:56
	← marc_v92 left	15:57
	→ xudongz joined	15:57
	→ affa09 joined	15:58
	→ wabash joined	15:58
wabash	hello folks.	15:58
techartisan	Hello!!	15:58
gitinfo	techartisan: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	15:58
wabash	I committed a few commits under one user, but I should have set the user.email and user.name first. Now I want to recommit/rebase these with the new user.	15:58
	← Maerc left	15:58
wabash	Will rebase -i work?	15:58
	← bvi_ left	15:58
	→ CKyle joined	15:58
	→ thiago joined	15:59
	← nour left	15:59
	→ Mixologic_ joined	15:59
	→ xk_id joined	15:59
	← veganista left	15:59
techartisan	Sure.	15:59
wabash	techartisan: So what would I use in rebase -i.... edit? and then not change anything?	15:59
	→ jsnowball joined	16:00
_ikke_	wabash: edit, commit --amend --reset-author	16:00
tjt263	hi is anyone currently available to take a quick look at my first github commit and pull request?	16:00
_ikke_	wabash: how many commits?	16:00
wabash	_ikke_: about 4	16:00
tjt263	actually is this a good place to ask	16:00
_ikke_	Then I would do it manually	16:00
wabash	_ikke_: can you clarify this again... how would I do it manually? And with rebase -i , I set to edit, and then where does the commit --amend --reset-author come in?	16:01
_ikke_	tjt263: Although this is mainly for cli git related questions, we are not unwilling to help with related questions	16:01
	← lpapp left	16:01
	← Darcidride left	16:01
	→ MechtiIde joined	16:01
_ikke_	wabash: After you changed pick to edit for each commit, and you save and quit the editor, you will be dropped to the shell again. There you can do that command, and then git rebase --contiue	16:02
tjt263	cool	16:02
	→ otter768 joined	16:02
	← eka left	16:02
	← rzeka left	16:02
	← techartisan left	16:02
	→ eka joined	16:02
tjt263	well basically i just submitted my first ever commit and pull request	16:02
	https://gist.github.com/tjt263/1dbbb4c4643f7667d86a	16:02
	← LBV_User left	16:02
	→ jceb joined	16:03
tjt263	if someone could check it out that would be much appreciated	16:03
wabash	_ikke_: I see, thank you. Now, how would I do it manually?	16:03
	← bronson left	16:03
_ikke_	wabash: That is manually :P	16:03
	wabash: automatically would involve git filter-branch	16:03
	→ marek_varro joined	16:04
tjt263	https://travis-ci.org/caskroom/homebrew-cask/builds/68988620	16:04
wabash	_ikke_: aha. Thanks.	16:04
	:)	16:04
	→ kpease joined	16:05
	→ eperez joined	16:05
	→ Gamecubic joined	16:05
_ikke_	tjt263: To be honest, what is there for us to help about. I don't know anything about the project itself.	16:06
	← otter768 left	16:07
	→ justtobe joined	16:07
tjt263	i just want to know why it failed	16:07
	and how to make it.. no fail	16:07
	← justtobe left	16:07
	← inamoriti left	16:08
	← jsnowball left	16:08
	→ basiclaser joined	16:08
	→ flashpoint9 joined	16:08
	← linuxboytoo left	16:08
	→ jasonyangshadow joined	16:09
	← jasonyangshadow left	16:09
	← modocache left	16:09
_ikke_	https://travis-ci.org/caskroom/homebrew-cask/jobs/68988621	16:10
	→ pheaver joined	16:10
	→ arnaud____ joined	16:10
	→ subhojit777 joined	16:11
_ikke_	tjt263: aparently code style issue	16:11
tjt263	i think its pretty basic stuff, i am just completely new to it	16:11
	← Spriz left	16:11
tjt263	it says trailing whitespace on line#9	16:12
	← jteneyck left	16:12
_ikke_	yes	16:12
	you have identation there	16:12
	indentation*	16:12
tjt263	theres nothing actually on that line	16:12
_ikke_	There are spaces on that line	16:12
	2 spaces	16:13
	tjt263: line 4 doesn't have them	16:13
	→ imachuchu joined	16:13
	← dsantiago left	16:13
	← psoo_ left	16:14
	← howlymowly left	16:14
tjt263	i checked and there didnt seem to be any spaces on line#9 are you sure thats it?	16:14
	sorry line 4 doesnt have what	16:15
	oh i see what you mean	16:15
	← wabash left	16:15
tjt263	because its a blank line too	16:15
	→ stantonk joined	16:15
_ikke_	yes	16:15
	← Kully3xf_ left	16:16
tjt263	so are you sure that there were spaces on the 9th?	16:16
_ikke_	yes	16:17
tjt263	i thought maybe it just didnt want me to skip the line	16:17
_ikke_	In the pull request, select that line	16:17
	You see the spaces highlighted	16:17
	https://github.com/caskroom/homebrew-cask/commit/d1b85627c7606f8dbd8cd560c5d9c5a2847accbd	16:18
	← osxi left	16:18
	→ Dougie187 joined	16:18
	→ Vadimus joined	16:19
	← solars left	16:19
	← zoso left	16:19
tjt263	_ikke_ line 4 and 9 are identical	16:20
	← hadees left	16:21
	→ hadees joined	16:22
	→ Nikhil_D joined	16:22
_ikke_	curl -s https://github.com/caskroom/homebrew-cask/commit/d1b85627c7606f8dbd8cd560c5d9c5a2847accbd.patch \| xxd \| grep 00000310	16:22
	← derrzzaa left	16:23
	→ zendrix joined	16:23
	→ derrzzaa joined	16:23
	→ qqz joined	16:23
_ikke_	Do you see "2b20 2073"?	16:23
qqz	I am new to git and want to do the following:	16:24
	HEAD->mydeadbranch	16:24
	HEAD^ -> main-branch	16:24
	→ mixandgo joined	16:24
qqz	if I would check out HEAD^ and give that branch a name then what would happen with dead-branch?	16:25
osse	nothign	16:25
qqz	wouldn`t it become unreachable?	16:25
osse	ah, so by "dead branch" you mean "no branch" ?	16:26
	← ntwari left	16:26
qqz	at least I want HEAD^ -> HEAD	16:26
tjt263	_ikke_ ok i am looking	16:26
qqz	no I wanna keep the dead branch with a branch name	16:26
	→ versa joined	16:26
osse	qqz: does it currently have a name?	16:26
qqz	nothing named, yet.	16:26
osse	then do 'git branch dead' to create a branch and name it 'dead'	16:27
	← hadees left	16:27
	← michael_mbp left	16:27
qqz	and after that how to move HEAD one step back?	16:27
	← vurma left	16:27
osse	qqz: git checkout	16:27
	git checkout main-brain	16:28
	→ michael_mbp joined	16:28
qqz	o.k. that would be simple: git branch dead; git checkout HEAD^; nothing more required?	16:28
osse	hold on	16:28
	does main-branch exist ?	16:28
	← CustosL1men left	16:28
	← stantonk left	16:29
qqz	it is just a commit hash; not any branch name assigned yet	16:29
	→ cagedwisdom joined	16:29
	→ fearnothing joined	16:29
	← tristanseifert left	16:29
	← kurkale6ka left	16:29
osse	ok, so you need to move to HEAD, create a new branch and check it out. you can do all of that in one go with git checkout -b main-branch HEAD^	16:30
	ehh, move to HEAD^	16:30
	→ PragCypher joined	16:30
	→ Milos_ joined	16:30
	← CKyle left	16:31
qqz	o.k. so I will need names for both: the old dead branch and at the location where the new branch should fork off	16:31
	← duderonomy left	16:31
PragCypher	is it possible to get info on a particular commit on a remote repository without a local one over ssh?	16:31
	← knobo left	16:31
	← Milos left	16:32
osse	qqz: branches have names. no way around that.	16:32
	qqz: in fact branches are nothing but names.	16:32
qqz	and if I go back multiple times I need to call the fork points main-branch0, main-branch1, main-branch2 or can I stay with a single name?	16:33
	→ tristanseifert joined	16:33
osse	"go back" from where to where?	16:33
qqz	go back one commit in a chain of commits that would otherwise be a long sequence	16:34
	→ Gizburdt joined	16:34
qqz	and that multiple times	16:34
	i.e. 20 commits; one back; 20 commits; one back etc.	16:35
	it is clear that the commits where I go back need names in order to keep them	16:35
	but why should all the fork points be named?	16:35
osse	qqz: only tips need to be named	16:36
	→ net2014 joined	16:36
	→ durham joined	16:36
net2014	hello, I have a source and a remote server (github)	16:36
qqz	o.k. that would be simple: git branch dead; git checkout HEAD^; nothing more required, then, right?	16:36
net2014	I want github not to show the revisions, just to show the latest versions of the files	16:36
	how do I do that?	16:36
osse	qqz: depends on why you checkout HEAD^ to begin with	16:37
	← mikecmpb_ left	16:37
	→ JR____ joined	16:37
	← kadoban left	16:37
	→ linuxboytoo joined	16:37
qqz	osse: to continue the old sequential chain and leave one commit aside	16:37
	→ CKyle joined	16:37
	→ jrich523 joined	16:37
	→ cdown_ joined	16:38
osse	qqz: I suppose that means you intend to create new commits. If you create a new commit then you've created a tip. So yes, you need to create a branch	16:38
	qqz: what you don't seem to realize is that the branch name follows the commits you create.	16:38
	← cdown left	16:38
	← affa09 left	16:38
	cdown_ → cdown	16:39
	← endiruna left	16:39
osse	qqz: after creating a new commit, the current branch now points to the new commit. Repeat. that way a chain is formed.	16:39
qqz	osse: ok, that would be good; but if I init a plain git repository and create a sequence of commits how is the current „branch“ called? HEAD?	16:39
osse	master	16:40
tjt263	right okay _ikke_ i got it, there was one too many zeros being grepped	16:40
	$ curl -sS https://github.com/caskroom/homebrew-cask/commit/d1b85627c7606f8dbd8cd560c5d9c5a2847accbd.patch \| xxd \| grep 0000310:	16:40
	0000310: 200a 2b20 2073 7569 7465 2027 6c69 636c .+ suite 'licl	16:40
qqz	ahh; so that is what I want: go back to HEAD^ and call that from now on MASTER	16:40
	→ geoid joined	16:41
net2014	is there another solution to my problem? if I delete the remote repository and then recreate an empty one, and then I push to the remote server, will I see all the commits of the source, or will I get just the latest files in the remote repository?	16:41
qqz	or move the name-„tag“ master one step to the parent and give the current branch a name like dead-end	16:41
osse	qqz: how did you end up in a situation without branches ?	16:41
	← mkoskar left	16:41
	← JR____ left	16:41
	→ modocache joined	16:42
qqz	I think there is still the master branch; i have only called git init and git commit so far	16:42
osse	then you have master	16:42
qqz	now how to „move“ master giving the current master branch a dead name?	16:43
tjt263	_ikke_ i can see "2b20 2073"	16:43
osse	qqz: 1) create branch at the current location: 'git branch blah', 2) move back: git reset --hard HEAD^	16:43
	← thiago left	16:43
qqz	cool;	16:44
osse	!lol	16:44
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	16:44
	→ thiago joined	16:44
qqz	the —hard will be required to move HEAD or may I keep files not changed or commited on the last commit as they are?	16:44
	→ dsantiago joined	16:45
osse	qqz: HEAD is always moved. that's the point of reset. Remove --hard if you don't want to modify the files accordingly	16:45
	→ zumba_addict joined	16:46
	→ adamretter1 joined	16:46
adamretter1	How can I force push a tag from one remote to another?	16:46
	→ [H]unt3r joined	16:46
qqz	—hard should give the exact state of the commit at HEAD^?	16:46
	ok thx.	16:47
	believe I know what to do	16:47
osse	qqz: you only have a couple of commits right? Open a separate terminal and run this: while sleep 1; do clear; git log --oneline --color --graph --decorate --all; done	16:47
	the pedagogical value is immeasuarable !!!!11	16:47
qqz	thanks a lot osse!	16:48
osse	qqz: you'll see the "HEAD" move around and see the chain move and such as you make commits	16:48
	→ Kully3xf joined	16:48
	← delboy1978uk left	16:48
osse	qqz: do a few commits, checkout stuff, learn.	16:48
_ikke_	tjt263: those 20 20 are two spaces	16:49
	IanV0rn2341 → IanV0rn2341[away	16:49
	← IanV0rn2341[away left	16:49
	→ hahuang65 joined	16:49
	← PragCypher left	16:50
	→ Kicer86 joined	16:50
	← Hounddog left	16:50
ojacobson	osse: it somehow never occurred to me, in more than a decade of using nix systems, to do `while sleep 1; do` instead of `while true; do ... sleep 1; done` :)	16:51
	d e r p	16:51
	← jolda left	16:51
osse	ojacobson: that's because while sleep 1 sleeps first, thus you have to wait for a second initially	16:51
ojacobson	yeah	16:51
osse	but it's concise :)	16:52
ojacobson	also I usually install watch(1) for this very reason	16:52
osse	I couldn't get watch to play nice with the colors	16:52
	← flashpoint9 left	16:52
osse	(even with -c)	16:52
_ikke_	osse: Most programs disable colors when being piped, you have to force them to use colors	16:53
	→ veverak joined	16:53
osse	i did that too	16:53
veverak	hi folks	16:53
	→ flashpoint9 joined	16:53
	← flashpoint9 left	16:53
_ikke_	I managed to get colors with watch -c	16:53
	but aparently, it's a fairly recent addition	16:53
osse	for some reason the regular foreground text becomes bold blue	16:53
	bold yellow I mean	16:53
_ikke_	hmm, odd	16:53
	never had that	16:54
veverak	is there some way for gitolite to enable either acces to repo without authentication (just reaD)	16:54
	or password auth?	16:54
	← hahuang65 left	16:54
	← CKyle left	16:54
osse	_ikke_: i'm pretty sure it used to work	16:54
	← liamonade left	16:54
	← dreiss left	16:54
_ikke_	if you don't want auth, you can use git daemon	16:55
	→ in_deep_thought joined	16:55
osse	the first line looks ok, all the rest are bold yellow	16:55
qsuscs	osse: can confirm	16:55
_ikke_	something german? :P	16:55
veverak	_ikke_: ?	16:55
	separate app?	16:55
	why for?	16:55
	→ gamename joined	16:55
veverak	I mean, I would prefer to use one app :)	16:55
_ikke_	veverak: it's built into git	16:55
qsuscs	_ikke_: wat	16:56
_ikke_	qsuscs: nothing	16:56
qsuscs	osse, _ikke_: https://i.imgur.com/Qr3bKY5.png	16:56
_ikke_	seems like something is not reset properly anymore	16:56
osse	while sleep 1; do clear; git --no-pager log --color \| head -n $LINES; done	16:57
_ikke_	why head?	16:57
osse	hmm, actually you need $((LINES - 2)) for some reason	16:57
	← GT4066 left	16:57
	← bongjovi left	16:57
_ikke_	you can use -n for n lines	16:57
	→ NeverDie joined	16:58
	→ Kyl9 joined	16:58
osse	not if there are merges and such	16:58
	then you have lines without a * on it	16:58
qqz	hmm; after git reset —hard „commitnoofparentbranch“ master is still at the dead-named-branch.	16:58
osse	then master was not checked out to begin with	16:59
	type 'git branch' to check	16:59
_ikke_	ok, I have it with bash too	16:59
qqz	may that be because I have moved once up too many by accident before?	16:59
	→ ilmgb joined	16:59
	→ MattMaker joined	16:59
osse	qqz: if you've run git checkout HEAD^ or some such before coming here then yes	17:00
	→ Sasazuka joined	17:00
osse	qqz: run git status often	17:00
	→ CKyle joined	17:00
osse	it's no accident that a lot of people put info like that in the prompt string	17:00
qqz	git branch writes: detached from dead-commit, master, dead-commit	17:01
	but the graphics view views master at the same place as dead commit and head one line below	17:01
osse	that makes sense	17:01
	→ jolda joined	17:02
osse	git checkout master; git reset --hard HEAD^	17:02
	since you didn't have a branch checked out at the time, the reset just becaume a glorified checkout	17:02
	→ jsnowball joined	17:02
qqz	ahhrg; forgot to checkout the master first	17:02
osse	qqz: !detached	17:02
gitinfo	qqz: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	17:02
	→ MinetestForFun joined	17:02
qqz	it was just a free translation form German: losgelöst - detached	17:02
	→ upene joined	17:03
	→ HelloShitty joined	17:03
qqz	possibly uncoupled would have been the right word	17:03
	← ilmgb left	17:03
	→ LBV_User joined	17:03
	→ bronson joined	17:03
jast	no such thing in git-branch. 'detached' is a thing. :)	17:04
	← cdown left	17:04
	→ cdown joined	17:04
	← derrzzaa left	17:06
_ikke_	alias git='LANG=en_US.UTF-8 git' :P	17:06
jast	echo 'export LC_MESSAGES=en_US.UTF-8' >~/.<your shell>rc	17:07
	← workerbeetwo left	17:07
	→ derrzzaa joined	17:07
qsuscs	localectl set-locale LANG=en_US.UTF-8	17:07
jast	gotta go, though. have a good $timeofday, everyone	17:08
osse	And so it came to pass that jast made everyone in #git overwrite their entire shell startup files	17:08
	← bronson left	17:08
	← Guest65057 left	17:08
qsuscs	osse: time to git checkout -- dot.zshrc	17:08
	→ darkbasic_ joined	17:08
	→ gauke joined	17:09
	→ hunt3r joined	17:09
	← darkbasic left	17:10
	← tonsofbuns left	17:11
	← Milos_ left	17:11
	→ King_Hual joined	17:11
	← King_Hual left	17:11
	→ King_Hual joined	17:11
	→ Milos joined	17:11
	→ Wiched joined	17:11
qqz	the git checkout HEAD^ followed by git reset —hard simply does not move master;	17:11
	→ dfaught joined	17:11
	Wiched → Guest9131	17:11
qqz	possibly because it is in a real detached state after checkout HEAD^	17:11
bremner	"git status" will tell you.	17:12
	← denver left	17:12
	→ themiddleman_ joined	17:14
	← hunt3r left	17:14
	→ osxi joined	17:14
	→ kadoban joined	17:14
	← mixandgo left	17:16
	← derrzzaa left	17:17
	→ derrzzaa joined	17:17
qqz	it writes „detached at commit previous“, untracked changes	17:18
	← xk_id left	17:18
qqz	there are some files/directories never added to git	17:18
	which should stay like this	17:18
	← osxi left	17:19
	← dfaught left	17:19
	→ cbreak joined	17:20
	← in_deep_thought left	17:20
	← ki0 left	17:20
qqz	done.	17:20
	← darkbasic_ left	17:20
	→ darkbasic joined	17:20
	→ akiva joined	17:20
	→ teroshan joined	17:21
	← teroshan left	17:21
qqz	git checkout master; git reset —hard HEAD^; all to be done when getting lost	17:21
	→ marc_v92 joined	17:21
	← encod3 left	17:22
	→ rdaviesDG joined	17:22
	→ sixtyten joined	17:22
	← radialneon left	17:22
osse	qqz: git reset moves the current branch. at the time you had no current branch.	17:22
	→ pantsman- joined	17:23
	← _Vi left	17:23
	← Xethron left	17:24
	← raven-au left	17:24
	→ yohnnyjoe joined	17:24
osse	qqz: visual clue: if the graph says (HEAD, master) or (HEAD, dead) or whatever, then you're not detached. If it only says (HEAD) then yuo are detached	17:24
	← darkbasic left	17:24
	→ raven-au joined	17:25
	→ benoliver999 joined	17:25
	→ darkbasic joined	17:26
	→ delicado joined	17:26
	→ madewokherd joined	17:26
benoliver999	Quick question - is there a good way to get an overview of multiple git repos on my system?	17:26
delicado	hi, i'm new to using version control systems like git. I was cloning a huge repository with "shallow cloning", so I do "git fetch --depth=1000" repeatedly and then "git fetch --unshallow" at the end.. Now i'm supposed to do a merge, how do I do this merge?	17:27
kadoban	benoliver999: Not really. git repos are independent and there's no global registry or something. You could script something up, or use another tool maybe.	17:27
	→ Motoko joined	17:27
benoliver999	Yeah I'm seeing this http://mixu.net/gr/	17:28
	← CKyle left	17:28
	← leporello left	17:29
delicado	should i just do "git merge" ? but it's not working of course	17:30
	← ambodi left	17:30
	→ fauna joined	17:30
	← voodo left	17:30
bremner	delicado: maybe you would find !book helpful	17:30
gitinfo	delicado: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	17:30
	→ ambodi joined	17:30
	← fooforge left	17:30
	gitinfo set mode: +v	17:31
fauna	is there any situation in which `git merge someranch --no-ff` will fast-forward?	17:31
bremner	failing that, try telling us !www	17:31
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	17:31
	← qqz left	17:31
	→ Milos_ joined	17:32
	→ akushner joined	17:32
	← darkbasic left	17:32
	← Spacew00t left	17:32
	← daivyk left	17:32
	← brontosaurusrex left	17:32
delicado	i did try "git merge origin/master", then it spew out an error saying "Untracked working tree file '.gitattributes' would be overwritten by merge.	17:32
	and "fatal: read-tree failed."	17:32
bremner	the first message is not so mysterious. You need to move that file out of the way if you want to proceed with the merge.	17:33
	← jonno11_ left	17:33
delicado	is this not needed for merging?	17:33
bremner	I don't know about the other, it sounds related to shallow clones.	17:33
	→ darkbasic joined	17:34
	← Milos_ left	17:34
bremner	what is "this" ?	17:34
delicado	yes, i did the shallow clone	17:34
kadoban	delicado: Doesn't it also tell you the potential ways to fix that?	17:34
delicado	the .gitattributes is a directory, you said i should move in somewhere	17:34
	← creep left	17:34
delicado	no, no hints shows, just error	17:34
bremner	oh. .gitattributes being a directory is probably bad	17:35
	← ambodi left	17:35
delicado	oh wait. i should see it again	17:35
	→ CKyle joined	17:35
delicado	sorry its not a directory. lol	17:35
	→ ambodi joined	17:35
	→ mkoskar joined	17:35
	→ drewo joined	17:36
	→ jonno11_ joined	17:36
	← Milos left	17:36
	→ Milos joined	17:36
	→ dreiss joined	17:36
bremner	nonetheless, move it out of the way and try again.	17:36
	← Milos left	17:36
	→ Milos joined	17:36
	→ stantonk joined	17:39
	→ Spacew00t joined	17:40
	← marcogmonteiro left	17:40
	→ ambodi_ joined	17:40
	← ambodi left	17:40
delicado	now that i moved it, another error says i have to move the next file repeatedly, seems like i have to remove all the contents of this directory. btw i did "fetch" on an local repository that was a previous clone	17:41
	i thought i will just update the contents	17:41
	← geoid left	17:41
delicado	*it will just update the contents	17:41
	→ yulaow joined	17:41
bremner	delicado: can you !paste the output of "git status" ?	17:42
gitinfo	delicado: Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	17:42
	→ skylite joined	17:42
Voyage	I use gitlab, the users would not need the password they use for loging in the website UI interface of gitlabe but they only need the key to push. and they can just impersonate to be another developer by just changing their name and email address in git global settings?	17:43
bremner	no	17:43
Voyage	bremner, me?	17:43
osse	Voyage: each user should use a unique key	17:44
	← DrNick left	17:44
	← jsnowball left	17:44
osse	and they need to register that key with gitlab. and they need a username and password for that	17:44
	← stantonk left	17:44
Voyage	osse, ok, even if the key is unique, the user can impersonate to be another developer by just changing their name and email address in git global settings?	17:45
	→ stantonk joined	17:45
	← ambodi_ left	17:45
osse	yes	17:45
	→ ambodi joined	17:45
	← eperez left	17:45
Voyage	like git config --global user.name	17:46
	osse, so how to find out who was who?	17:46
	→ ilmgb joined	17:46
	→ eperez joined	17:46
	axl__ → axl_	17:46
	→ kevwil joined	17:46
osse	i don't know	17:46
	← kadoban left	17:47
osse	look at ssh access logs and try to find out who made that push	17:47
bremner	gitolite has logs to support that.	17:47
Voyage	ok	17:47
	→ refried__ joined	17:47
Voyage	How should I make keys for each user? and then give them the keys?	17:47
	← eperez left	17:48
osse	only give usernames and password to people you trust not to do that	17:48
	→ eperez joined	17:48
osse	they generate it themselves	17:48
Voyage	osse, ok	17:48
	osse, they are not that techy	17:48
	I have to generate for now	17:48
	→ eletuchy joined	17:48
osse	https://about.gitlab.com/2014/03/04/add-ssh-key-screencast/	17:49
bremner	How will they learn git if generating a key is too hard?	17:49
	→ anjen joined	17:49
	→ Milos_ joined	17:49
	← hs123 left	17:50
Voyage	bremner, step by step	17:50
Motoko	HOw are you going to send these keys?	17:50
Voyage	well, email?	17:50
Motoko	Hopefully directly handing a USB stick to them, right?	17:50
	→ ambodi_ joined	17:50
	← ambodi left	17:50
Motoko	Yes, let's send a master key that can change files over an insecure channel.	17:51
qsuscs	GOOD IDEA	17:51
Motoko	It's like sending your identifying information and bank account numbers by post card.	17:51
Voyage	osse, bremner Motoko how should I make multiple keys and which parts should I send them to?	17:51
	← eka left	17:51
qsuscs	Voyage: srsly do you even understand how SSH … well, how any public-private key system work?	17:51
Motoko	Ideally, the end users generate the keys.	17:51
osse	Voyage: see the screencast	17:51
	← anjen left	17:51
	→ espindol_ joined	17:51
qsuscs	Voyage: you do not make keys and give it to them. they generate the keys.	17:51
Motoko	And keep them to themselves.	17:51
	At worst, they send the public half (safe) to you to authorize.	17:52
	→ Milos__ joined	17:52
bremner	there's no "at worst" there.	17:52
Voyage	qsuscs, Motoko why is that? " they generate the keys. And keep them to themselves."''	17:52
	← Milos left	17:52
	→ eka joined	17:52
Motoko	Because the key is what gives them access.	17:52
bremner	you can paint the public part on top of your house if you want.	17:52
	← fauna left	17:52
	→ in_deep_thought joined	17:52
Voyage	wait.	17:52
Motoko	You don't want to know it, or transmit it.	17:53
	There are two parts to the key_pair_.	17:53
	← jonno11_ left	17:53
Motoko	Public and private.	17:53
	← eletuchy left	17:53
Voyage	do you mean that they should have public AND private parts ? (the public goes to gitlab and private stays on their machine)?	17:53
Motoko	Public is perfectly fine to advertise. It can be used to verify the private key without actually knowing it.	17:53
	The private needs to be kept safe.	17:53
	← bannakaffalatta left	17:54
Voyage	ok, but I am the admin, I give them access. If I generate each private key, whats the harm?	17:54
	after all its my server	17:54
ojacobson	Voyage: you can impersonate those users	17:54
	whereas if they submit keys, you can't	17:54
Voyage	i see	17:54
ojacobson	it's like you knowing their passwords vs you not knowing their passwords -- same basic principle	17:54
Voyage	ok, goood point.	17:55
qsuscs	and you become a single attack point	17:55
Voyage	ojacobson, any other reason?	17:55
ojacobson	you don't need that knowledge, so you shouldn't build systems that give it to you :)	17:55
	← ambodi_ left	17:55
ojacobson	they may already have a key (eg. for use with github)	17:55
Motoko	The risk is in knowing the keys or transmitting them insecurely.	17:55
	← in_deep_thought left	17:55
Voyage	ok.	17:55
ojacobson	generating a key is easy, even for relateively non-technical users: "run this command, email me this file"	17:55
	→ ambodi joined	17:55
ojacobson	or with putty, there's a GUI	17:55
osse	think of the private key as a big password. same rules apply	17:55
Voyage	but just for info, I CAN generate multiple publick/private key pairs?	17:55
	← white_bear left	17:55
	← subhojit777 left	17:55
Motoko	You can, but it's certainly not recommended.	17:56
	← Milos_ left	17:56
qsuscs	Motoko: why?	17:56
ojacobson	of course you can. You can also assign your users their passwords. It's terrible practice, and I'd refuse to participate on principle given any option at all	17:56
Motoko	qsuscs, see above about generating keypairs for users.	17:56
qsuscs	Motoko: well yeah. but what if a user generates multiple pairs?	17:56
	ojacbson would print out patches and give it to them :>	17:57
Motoko	ojacobson, most systems at least give you the ability to change password on first login.	17:57
	← espindol_ left	17:57
	← AugustoCesar left	17:57
Motoko	qsuscs, well, you can have multiple keypairs. That's not a major issue. I keep three for various security partitions.	17:57
osse	some systems even require you to change it from time to time. goddammit I hate that	17:57
	← irc-5225225 left	17:57
osse	i'd be willing to type a password twice as long if I get to type the same one forever	17:57
Voyage	ojacobson, I remember I used github once by only passwords	17:57
ojacobson	Voyage: that's an option over http, yes	17:58
Motoko	osse, password manager.	17:58
	→ ril joined	17:58
Motoko	And yeah, you can use auth over HTTPs.	17:58
	Unless you turn on 2FA.	17:58
qsuscs	osse: echo -e "correct horse battery staple 47\ncorrect horse battery staple 48\ncorrect horse battery staple 48" \| passwd	17:58
Voyage	ojacobson, Motoko but http will not complress data or would not be as efficient as ssh?	17:58
	I wonder how will they a)create keys on windows b) give path to keys for git to know and use	17:59
	→ SimonNaa joined	17:59
Motoko	I've never compared.	17:59
	← ambodi left	18:00
osse	Motoko: wouldn't I have to update the password manager with the new password?	18:00
Voyage	Motoko, compared what?	18:00
Motoko	Voyage, git for Windows can handle that directly or via PuTTY/PAgeant.	18:00
	Voyage, compression efficiency between https/ssl.	18:00
	→ ambodi joined	18:00
Motoko	osse, you would, yes	18:00
osse	Voyage: same way as linux. it's included in the git for windows thingy	18:01
ojacobson	Voyage: No, HTTP is fine	18:01
	→ dgutierrez1287 joined	18:01
Voyage	why not just use http with password and keep things smple? ojacobson osse Motoko	18:01
Motoko	But only once, and it can generate and remember complex password.	18:01
ojacobson	Voyage: that's up to you	18:01
Motoko	You can, sure.	18:01
	← xudongz left	18:01
	← SimonNa left	18:01
osse	Motoko: remembering is not the problem. the burden of changing it is.	18:01
Motoko	It depends on the rotation policy.	18:01
osse	also I don't know how to invoke a password manager at the windows login screen :/	18:01
	→ xudongz joined	18:01
Motoko	If it's ever 30 days, that's annoying.	18:01
	Keep it on your phone if you can?	18:02
tjt263	hey _ikke_ thanks for your help but those two spaces (echo -e "\x2b\x20\x20\x73" \| cat) were the indent on line#10 (+ suite 'liclipse', :target => 'LiClipse')	18:02
qsuscs	osse: use a smartcard :>	18:02
	← ril left	18:02
ojacobson	_historically_, git's credentials management for ssh has been better (well, ssh's was better than libcurl's)	18:02
	that's less true in recent versions, with the credential helper system	18:02
	→ otter768 joined	18:03
	→ impure_hate joined	18:03
	← impure_hate left	18:03
Voyage	in gitlab, when I click on a commit, i get 502	18:03
	← gauke left	18:03
Voyage	"Whoops, GitLab is taking too much time to respond."	18:03
	any body knows about it?	18:03
ojacobson	Gitlab's support folks, presumably	18:04
	HTTP 5xx responses are server-side issues	18:04
	→ jonno11_ joined	18:04
Voyage	yes. I think it needs more resources	18:04
	← durham left	18:04
	→ eletuchy joined	18:04
_ikke_	tjt263: Then the line before that	18:05
	← ambodi left	18:05
Voyage	ok, I want to add post push hooks, where is the git dir ?(so I can find the hook dir for my project and add some scripts there)? ojacobson	18:05
_ikke_	tjt263: 0a 2b20 200a	18:05
	→ durham joined	18:05
	→ ambodi joined	18:05
_ikke_	tjt263: Believe me, there are two spaces there.	18:05
	→ kadoban joined	18:05
ojacobson	Voyage: I take it you're running self-hosted gitlab	18:06
	← dgutierrez1287 left	18:06
	← skullcrasher left	18:06
Voyage	yes, self hosted	18:06
ojacobson	Then: http://doc.gitlab.com/ce/hooks/custom_hooks.html	18:06
	← kukks left	18:06
	← jonno11_ left	18:07
	← otter768 left	18:07
	→ hunt3r joined	18:10
	← ambodi left	18:10
jayne	can I safely run multiple "git push" in parallel? There's not going to be conflicts with multiple processes trying to simultaneously update the same files or anything?	18:10
	→ ambodi joined	18:10
jayne	git push to different remotes, that is	18:10
_ikke_	Shouldn't be a problem	18:11
	→ irc-5225225 joined	18:11
	→ Cork joined	18:12
	← eperez left	18:12
	→ in_deep_thought joined	18:12
ojacobson	I'll make a stronger statement	18:12
	if it breaks something on either end of any of the pushes, that's either a git bug or a filesystem bug	18:12
	← Milos__ left	18:13
Voyage	ojacobson, thanks	18:15
	what will this do git archive master \| tar -C /deploy/dir.new -xf -	18:15
	→ eperez_ joined	18:15
	← ambodi left	18:15
	← zendrix left	18:15
	← zackiv31 left	18:15
	→ ambodi joined	18:15
_ikke_	copy all files from master to /deploy/dir.new	18:16
	→ Milos joined	18:16
Voyage	ojacobson, i actually want to paste the files of git repo, when someone pushes to it, to rsync -avziP /my/deployment/dir	18:16
	← hunt3r left	18:16
	← Milos left	18:16
	→ Milos joined	18:16
Voyage	_ikke_, ^ how to do the above	18:16
	→ osxi joined	18:17
_ikke_	Voyage: It's easier to use plain ssh	18:17
	← adamretter1 left	18:17
	→ hs123 joined	18:17
Voyage	_ikke_, am how?	18:17
_ikke_	wait, sorry	18:17
	Why do you need that rsync command?	18:18
	Voyage: Note that the tar files already contains all meta data	18:18
	← durham left	18:18
Voyage	If I use MV,and RM, it would delete all files and past all just for small changes. see 4.5 http://gitolite.com/deploy.html	18:19
	→ IanV0rn2341 joined	18:19
_ikke_	Voyage: Then you don't want git archive, because it would contain all files	18:20
Voyage	ok. what do i need?	18:20
	→ ambodi_ joined	18:20
	← ambodi left	18:20
_ikke_	If you want to only copy changed files, you need to determine what files were changes	18:22
	changed*	18:22
Voyage	ok. how to determine that?	18:22
ojacobson	fully generically, that's slower than not doing it	18:24
	blindly building a whole new tree for each release is pretty fast until you have gigabytes of code, basically	18:24
	← in_deep_thought left	18:24
	→ Orbitrix joined	18:24
	← Orbitrix left	18:24
ojacobson	and never has bugs due to staleness	18:24
	← irc-5225225 left	18:24
	→ in_deep_thought joined	18:24
	→ Orbitrix joined	18:25
ojacobson	you can atomically switch from one tree to another with mv, or with symlinks	18:25
	← ambodi_ left	18:25
ojacobson	oh actually no, just symlinks	18:25
_ikke_	yes, symlinks!	18:25
	→ ambodi joined	18:25
	→ JR____ joined	18:26
	← eperez_ left	18:26
_ikke_	.trigger_edit atomic Use this to atomically switch deployments: http://rcrowley.org/2010/01/06/things-unix-can-do-atomically.html	18:26
gitinfo	_ikke_: Okay.	18:26
Voyage	ojacobson, I have my development website live in /var/www/html and I want it to be updated whenever someone pushes into git.	18:26
	→ eperez joined	18:26
_ikke_	Voyage: My strategy is extracting the whole release to a new dir, then switch a symlink to that dir	18:27
	the webserver then serves from the symlink	18:27
	→ sveinse joined	18:27
Voyage	_ikke_, so you mean that I should do a "archive master" and extract all to a new dir, and switch symlink of apache to point that dir?	18:28
	← refried__ left	18:28
_ikke_	yes	18:28
Voyage	ok	18:29
	→ zackiv31 joined	18:29
Voyage	ojacobson, do you agree?	18:29
sveinse	git n00b here. If a branch experimental exists and it has been merged into master, and then later commits on master, what do I need to do to start/continue the experimental branch based of the current master tip?	18:29
ojacobson	shrug You know your needs, dude	18:29
Voyage	ojacobson, I do but voting for strategy	18:29
_ikke_	Voyage: The advantage is that no one accidentaly gets a partially deployed site, because everything it's atomic	18:29
Voyage	hm	18:29
ojacobson	_ikke_: not perfectly true either, for sites that require more than a single http request per page :)	18:30
	← delicado left	18:30
ojacobson	you can get html from old-deploy and assets from new-depoy	18:30
	← ambodi left	18:30
	← JR____ left	18:30
ojacobson	or even some assets from old-deploy and some assets from new-deploy	18:30
	that's a lot harder to solve though	18:30
	→ ambodi joined	18:30
	← Soni left	18:30
Voyage	the down side here is for every push, the full code and assents needs to be archived	18:30
_ikke_	ah, true	18:30
	Voyage: That's neglegible	18:31
	→ durham joined	18:31
	→ hahuang65 joined	18:31
ojacobson	how large is your site	18:31
Voyage	second, I think I will have file permission and rights issue as apache wants to own files	18:31
	ojacobson, 500mb	18:31
ojacobson	I work for a platform service that does deploys for users. _Every_ deploy for us is a new-blob deploy, because it's the only sane way to do it.	18:31
	500mb is peanuts. :)	18:32
_ikke_	Voyage: apache doesn't need to own files, it needs to be able to read them	18:32
ojacobson	If that turns out to be the limiting factor, then design around it, but at least then you'll have some clear goals	18:32
	← IanV0rn2341 left	18:32
demize	ojacobson: Not that hard to solve, though it depends on how static you want your website to be.	18:32
Voyage	_ikke_, ya but magento / wordpress wants apache to write files too. e.g .htaccass , db configs	18:32
	_ikke_, can you show me a script?	18:33
_ikke_	Voyage: so it needs to be able to write to those dirs. That's basically a deployment step	18:33
demize	The way frameworks and such do it in general is that they give the static files new names on each version	18:33
	So on deploy you'd just either symlink or copy the file to the new name.	18:33
	And then change the website to use it.	18:33
	← tgunr left	18:33
ojacobson	demize: you also have to continue serving the old assets, at least temporarily, which is where a lot of the management overhead comes from	18:34
sveinse	(how) can I reuse a branchname? E.g. experimental? Reuse as in: has already been branched, worked on and merged back to master.	18:34
ojacobson	if you always deploy a fresh tree, the naive approach means that the old assets _vanish_ during deploys	18:34
kadoban	sveinse: merge master into experimental	18:34
	→ tanuck joined	18:34
_ikke_	Voyage: I don't have anything close by	18:35
	← ambodi left	18:35
	← phantombeta left	18:35
Voyage	what does tar -C and -xf - means in git archive master \| tar -C /deploy/dir.new -xf -	18:35
	→ tgunr joined	18:35
	→ phantombeta joined	18:35
	← el3k0n left	18:35
	← eperez left	18:35
	→ jonno11_ joined	18:35
	→ Iniglo joined	18:35
	← PCatinean left	18:35
	→ ambodi joined	18:35
	→ editshare-ericf joined	18:36
_ikke_	-C: change dir	18:36
	-x extract	18:36
	-f - read from stdin	18:36
sveinse	I have currently checked out master, have local edits. What happens if I do git checkout experimental and then later git merge master? What happes to my edits?	18:36
_ikke_	sveinse: As long as they aren't comitted, they don't belong to any branch	18:37
ojacobson	sveinse: uncommitted changes !float	18:37
gitinfo	sveinse: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	18:37
ojacobson	or prevent checkouts, if they'd conflict with the changes induced by switching branches/commits	18:37
canton7	Voyage, type 'man tar' to se what all of those flags mean	18:37
Voyage	_ikke_, so that means that git archive master produces a tar and not some regular files in a dir?	18:38
osse	yes	18:38
Voyage	any way to get the files directly?	18:39
	← ArSn left	18:39
demize	Copying them.	18:39
sveinse	ojacobson: thanks. What I really want is to start an experimental branch and commit the floats into it. Problem is that experimental is an old (yet currently unused) branchname which points to a rather old commit	18:39
Voyage	demize, how?	18:39
	→ ki0 joined	18:39
demize	cp	18:39
ojacobson	sveinse: so create a new one	18:39
Voyage	demize, cp what?	18:39
ojacobson	swizzle the names afterwards, if you need to :)	18:39
	→ daivyk joined	18:39
osse	Voyage: git checkout	18:39
ojacobson	branches are cheap, and branch renaming is free	18:39
sveinse	ojacobson: Yeah, that is the pratice in git, right?	18:39
demize	Whichever directory or files you want to copy?.....	18:39
osse	Voyage: !deploy	18:39
gitinfo	Voyage: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	18:39
	→ eperez joined	18:40
Voyage	osse, am...	18:40
demize	Well, you could also use GIT_DOTDIR or whatever the env var is and check the files out in a different directory as well.	18:40
Voyage	osse, I am follwoing that url	18:40
	← ambodi left	18:40
	→ ambodi joined	18:40
Voyage	demize, ok, can you give me the exact command to copy files ?	18:40
	← arnaud____ left	18:41
	← jonno11_ left	18:41
	→ irc-5225225 joined	18:41
	→ Xethron joined	18:42
osse	See the example that uses git checkout instead of git archive	18:43
Voyage	hm	18:43
	← bernalex left	18:43
Voyage	export GIT_WORK_TREE=/deploy/dir	18:44
	git checkout -f master	18:44
osse	yes, thst one	18:44
_ikke_	git archive --format=tar --prefix=$(date "+%Y%m%d%H%M")/ \| tar -C /path/to/deploy -xf -	18:44
	← ambodi left	18:45
Voyage	_ikke_, osse the purpose of asking this was to "why make git tar files, and then we untar it" why not just do it directly.. <--- am i right for performance optimization?	18:45
	→ ambodi joined	18:45
imachuchu	is there a quick way of pushing a group of branches in one go? Something like "git push origin -- branch-1 branch-2"?	18:46
_ikke_	Voyage: tar is just a streaming format	18:46
	Voyage: There is very little overhead	18:46
Voyage	_ikke_, it compresses data. no?	18:46
_ikke_	nope	18:46
	tar itself is only a container	18:46
	compression is optional	18:46
Voyage	ok	18:46
demize	imachuchu: You can specify multiple refspecs, yes.	18:46
Eugene	imachuchu - yes, minus the --. man git-push; see how <refspec> has a trailing "...". That means you can repeat that option as much as you like.	18:46
gitinfo	imachuchu: the git-push manpage is available at http://jk.gs/git-push.html	18:46
Voyage	what does this do export GIT_WORK_TREE=/deploy/dir	18:46
_ikke_	It tells git that the working tree is at that place	18:47
Voyage	am.. working tree?	18:47
_ikke_	Voyage: the directory git expects your project files	18:47
	← diogenese left	18:47
_ikke_	Voyage: it basically tells git checout where to put the files	18:47
osse	man gitglossary	18:47
gitinfo	the gitglossary manpage is available at http://jk.gs/gitglossary.html	18:47
	→ creep joined	18:48
	→ diogenese joined	18:48
	→ micechal_ joined	18:48
Voyage	_ikke_, working tree is not the place where git files are?	18:48
	→ odi joined	18:48
_ikke_	Voyage: Your project files	18:48
	← odi left	18:48
Voyage	yes project files	18:48
	→ snthsnth joined	18:48
	→ Kully3xf_ joined	18:49
Voyage	ok, how do I fit rsync or symlinks here? I am confused how to fit those in the git commands	18:49
	← NeverDie left	18:49
imachuchu	Eugene: demize: thanks you two, was pushing ~10 branches and it worked fine	18:50
_ikke_	That is a different approach	18:50
Eugene	imachuchu - you may also be interested in --mirror ;-)	18:50
_ikke_	Voyage: If you use git checkout, then you don't use the symlink part	18:50
	→ hasjy joined	18:50
	→ zendrix joined	18:50
demize	imachuchu: If you want to push all local branches you can use --all	18:50
	← ambodi left	18:50
Eugene	Jinx!	18:50
	← in_deep_thought left	18:50
Voyage	can I just "rsync -avziP git checkout -f master /my/deployment/path" ?	18:50
	→ ambodi joined	18:50
	← micechal left	18:50
Eugene	Voyage - have you read !deploy ?	18:50
Voyage	_ikke_, ^	18:50
gitinfo	Voyage: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	18:50
Voyage	Eugene, I am following this already	18:51
_ikke_	Voyage: no	18:51
	← eka left	18:51
	→ eka_ joined	18:51
	← Kully3xf left	18:51
Eugene	Well, if you had read that, you would have found my script which uses `git archive` and `rsync` together ;-)	18:51
	← hasjy left	18:51
	→ in_deep_thought joined	18:51
Voyage	How do I pipe data directly into rsync, instead of writing it to some temp dir ?	18:52
osse	can rsync read from a pipe?	18:52
Voyage	let me ask	18:52
	the rsync people	18:52
demize	Eugene: Well, --mirror and --all doesn't do the same thing ;p	18:52
Eugene	Shush ;-)	18:52
demize	though similar, yes.	18:53
	→ aioos joined	18:53
	← irc-5225225 left	18:53
osse	Voyage: alternative without rsync: git archive ... \| ssh somwhere 'tar -C dir -xf -'	18:53
Eugene	Voyage - AFAIK rsync doesn't support tar format. You could use.... that ^	18:53
	→ Boobuigi joined	18:53
Eugene	But then you lose the goodies of rsync, like --delete and --exclude ;-)	18:53
imachuchu	Eugene: demize: thanks anyway but this was more just a one time pushing of a whole slew of branches so that somebody else could pick them up. Originally I was thinking they would live on my box exclusively else I would have pushed them earlier	18:53
Voyage	osse, git and deployment dir are on same server	18:54
	← upene left	18:54
	← _Atom_ left	18:54
osse	Voyage: why do you need rsync at all then	18:54
Voyage	Eugene, ^	18:54
osse	why not make git put the files directly where they need to go	18:54
Voyage	osse, rsync only transferes files that are changed. thats why	18:54
	osse, dont want to paste all every time for small changes	18:54
	← aioos left	18:55
	→ upene joined	18:55
osse	tar -k	18:55
	← ambodi left	18:55
Voyage	whats -k	18:55
	← leolrrj left	18:55
	→ ambodi joined	18:55
canton7	man tar ;)	18:56
	→ refried__ joined	18:56
	← sveinse left	18:56
	→ gfixler joined	18:56
	← Xiti left	18:56
	→ mgi joined	18:56
Voyage	osse, come one... don't replace existing files when extracting, existing files could have been changed.	18:57
	← in_deep_thought left	18:57
Voyage	osse, come one... don't replace existing files when extracting, existing files could have been changed by commit. and still be "existing"	18:57
	rsync is the tool for the correct job	18:57
	← mgi left	18:57
	→ m8 joined	18:58
	← eperez left	18:58
	→ eperez joined	18:58
	→ shafox joined	18:59
	← happy-dude left	18:59
Voyage	just confirmed, rsync cannot work on pipes	18:59
	→ knobo joined	18:59
osse	Voyage: --keep-newer-files	19:00
	→ Xiti joined	19:00
	→ MarekVarro joined	19:00
	→ msshb joined	19:00
	← ambodi left	19:00
	← tanuck left	19:00
	→ ambodi_ joined	19:00
	← msshb left	19:02
	← refried__ left	19:02
	→ gebjgd joined	19:02
	← gebjgd left	19:02
	→ gebjgd joined	19:02
osse	the hook knows the checksum of the old and new commits. you can diff those to produce a list of files that has actually changed, and then feed those specific files to git checkout	19:03
	that's probably the best/fastet	19:03
	→ jerius_ joined	19:03
	→ alexander__b joined	19:03
	→ xk_id joined	19:03
	← MinetestForFun left	19:03
	← xk_id left	19:03
	→ xk_id joined	19:03
	→ ouqn joined	19:03
	← settermjd left	19:03
Voyage	osse, what about deleted files?	19:04
	← zackiv31 left	19:04
	→ nadim_ joined	19:04
Voyage	tar wont do equivalent to rsync -avziP	19:04
	← marek_varro left	19:04
osse	i don't know	19:04
	→ PaulCapestany joined	19:04
osse	actually. git diff can tell you which have been deleted too actually	19:04
	git diff --diff-filter=D	19:04
Voyage	hm	19:05
	← ambodi_ left	19:05
_ikke_	meh	19:05
	→ ambodi joined	19:05
	→ GT4066 joined	19:05
	→ solars joined	19:06
	← jerius left	19:06
	→ eperez_ joined	19:06
	→ in_deep_thought joined	19:06
	← modocache left	19:06
	← eperez left	19:06
	→ Kully3xf joined	19:07
	→ mikecmpbll joined	19:07
	→ R^2 joined	19:07
	← ouqn left	19:07
	← gfixler left	19:07
	← alexander__b left	19:08
	→ alexander__b joined	19:08
	→ gfixler joined	19:08
	alexander__b → bernalex	19:08
	← Kully3xf_ left	19:09
	→ irc-5225225 joined	19:09
	→ Iae joined	19:09
	→ irqq joined	19:09
	→ MinetestForFun joined	19:10
	← ambodi left	19:10
	→ tanuck joined	19:10
	← Iae left	19:10
	→ ambodi joined	19:10
	eGGsha → eGGshke	19:10
	← phantombeta left	19:10
	← blehblah left	19:11
	← in_deep_thought left	19:11
	→ in_deep_thought joined	19:11
	→ phantombeta joined	19:12
	← ki0 left	19:13
Voyage	a report can commit? in gitlab?	19:13
	→ xrsa joined	19:14
	← cowcow left	19:14
	← ambodi left	19:15
	← xrsa left	19:15
	→ ambodi joined	19:15
	← Dorf left	19:17
	→ Iegie joined	19:17
	→ buffffal00 joined	19:18
	← Iegie left	19:18
	→ linuxboy_ joined	19:18
	← in_deep_thought left	19:18
	→ cebor joined	19:18
	← buffal0 left	19:19
	→ ki0 joined	19:19
	← linuxboytoo left	19:20
	← zendrix left	19:20
	→ zackiv31 joined	19:20
	← nadim_ left	19:20
	← ambodi left	19:20
	→ ambodi joined	19:20
	← Voyage left	19:21
	← eletuchy left	19:21
	← stantonk left	19:21
	→ Dorf joined	19:21
	→ Dimitrie joined	19:22
	← Gizburdt left	19:22
	← Dimitrie left	19:23
	→ Dimitrie joined	19:24
	→ Gizburdt joined	19:24
	→ Uyof joined	19:24
	← Dimitrie left	19:24
	← Uyof left	19:24
	→ strages33 joined	19:25
	← ambodi left	19:25
	← netj left	19:25
	→ ambodi joined	19:25
	→ netj joined	19:25
	← eperez_ left	19:26
	gitinfo set mode: +v	19:26
strages33	hi	19:26
gitinfo	strages33: 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.	19:26
strages33	hi everybody, i have a question regarding git clone	19:26
	→ stantonk joined	19:26
	→ uawah joined	19:26
	← Vgr left	19:27
	← Boobuigi left	19:27
strages33	i would love to clone for example the git repo for google fonts, but only clone/checkout the .ttf files for example	19:27
	how can this be done?	19:27
osse	it cannot	19:27
strages33	why not	19:27
	?	19:27
	← uawah left	19:28
osse	you can checkout specific things, but the whole repo will be downloaded.	19:28
	alternatively you can use --shallow to download less	19:28
	→ Vgr joined	19:28
strages33	what does -shallow do?	19:28
_ikke_	downloads only a single commit	19:28
osse	man git-clone	19:28
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	19:28
osse	--shallow combined with --no-checkout is the closest you'll get	19:29
strages33	the problem i have is, libraries full of usable fonts are syncable/updateable with git, but i dont want the whole repo on my pc, update easily required	19:29
	← themiddleman_ left	19:29
osse	many hosting solutions offer a URL to the specific files themselves. you can probably wget them directly	19:29
	← eggoez left	19:30
strages33	mmh, yeah true, but then there is no command for updating everything	19:30
	you have to redownload files, urls will change etc	19:30
osse	at least on github they don't	19:30
	← sburgess left	19:30
	→ fooforge joined	19:30
	← HardWall left	19:30
tjt263	lol _ikke_ i believe you	19:31
	→ HardWall joined	19:31
strages33	mmh there should be a way isn't it	19:31
	← Kyl9 left	19:31
	← IrishPrime left	19:32
	→ bmfov joined	19:32
	← bmfov left	19:33
	← strages33 left	19:33
	← MechtiIde left	19:33
	→ elsevero joined	19:33
	← ki0 left	19:33
	→ eletuchy joined	19:33
	← gebjgd left	19:34
	← chozabu left	19:34
	← cdown left	19:35
	← yohnnyjoe left	19:35
	→ rfitzgerald joined	19:35
	→ gauke joined	19:36
	→ im8bit joined	19:36
	→ ambodi_ joined	19:36
	→ eggoez joined	19:36
	→ uut joined	19:36
	← uut left	19:37
	→ eperez joined	19:38
	← ambodi left	19:38
	→ modocache joined	19:38
	← jceb left	19:39
	→ chiemseesurfer joined	19:39
	→ gebjgd joined	19:40
	→ Kyl9 joined	19:41
	← StuartMI left	19:41
	→ jteneyck joined	19:42
	← paulweb515 left	19:42
	→ Enc joined	19:42
	← Enc left	19:43
	→ buffal0 joined	19:43
	→ xissburg joined	19:43
	← jteneyck left	19:43
	eGGshke → eGGsha	19:44
	← Jackneill left	19:44
	← LindsayMac left	19:44
xissburg	WHy can't I push after a rebase? it says "the tip of your current branch is behind its remote conterpart"	19:44
	→ Boobuigi joined	19:44
	→ Nmi joined	19:45
	← buffffal00 left	19:45
	← Nmi left	19:46
_ikke_	!rewrite	19:46
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	19:46
	← daivyk left	19:46
	→ ki0 joined	19:47
xissburg	I did a push -f before asking that question btw	19:47
_ikke_	And what did that do?	19:47
xissburg	it worked	19:47
	I am just wondering if I did anything wrong.	19:48
	I thought I'd be able to push normally	19:48
	← digcloud left	19:48
bremner	did you rewrite history that was already pushed?	19:49
_ikke_	xissburg: If you rebased commits you have pushed, then you have to force	19:49
	← Netmage left	19:49
xissburg	should I merge instead of rebase?	19:49
	→ Netmage joined	19:50
xissburg	bremner: the branches diverged (I was the only one working on both on different things)	19:50
	→ NeverDie joined	19:50
	← tinanoo left	19:50
	← sublimate left	19:51
	→ nydew07 joined	19:51
	→ sublimate joined	19:52
	← stantonk left	19:52
	→ Oiz joined	19:52
	← Oiz left	19:53
	← solars left	19:53
	→ Eij joined	19:54
	← Eij left	19:54
	← jerius_ left	19:55
	← chiemseesurfer left	19:55
	→ nadim_ joined	19:55
	→ Qauea joined	19:56
	→ jerius joined	19:56
	← Qauea left	19:56
	→ yqt joined	19:56
	← tvw left	19:57
	→ xfev joined	19:57
	→ digcloud joined	19:57
	← xfev left	19:57
	→ dtq joined	19:58
	→ Fcgd joined	19:59
	← Fcgd left	19:59
	← snthsnth left	19:59
	← nadim_ left	20:00
	→ arock joined	20:02
	← tanuck left	20:02
	← zumba_addict left	20:02
	← zackiv31 left	20:02
	← arock left	20:03
	← cusiousmansi left	20:03
	← delinquentme left	20:03
	→ otter768 joined	20:03
	→ zendrix joined	20:04
	→ yohnnyjoe joined	20:04
	→ Etyig joined	20:05
	← Etyig left	20:05
	→ tanuck joined	20:06
	→ ijkdt joined	20:06
	← ijkdt left	20:06
	← rfitzgerald left	20:07
	→ rfitzgerald joined	20:07
	→ daivyk joined	20:08
	← eletuchy left	20:08
	← otter768 left	20:08
	← dtq left	20:08
	→ gjjak joined	20:09
	← gjjak left	20:09
	← osxi left	20:11
	→ osxi joined	20:11
	→ FabTG joined	20:11
	← osxi left	20:11
	→ gahpl joined	20:11
	← gahpl left	20:11
	← eperez left	20:11
	→ frobware_ joined	20:12
	→ eperez joined	20:12
	← eperez left	20:13
	→ eperez joined	20:13
	→ seue joined	20:13
	← Xethron left	20:14
	→ leolrrj joined	20:14
	← seue left	20:14
	→ zackiv31 joined	20:14
	→ JR____ joined	20:14
	→ sqqn joined	20:15
	← sqqn left	20:16
	→ osxi joined	20:16
	→ lolmac joined	20:16
	← eperez left	20:16
	← eka_ left	20:16
	→ teroshan joined	20:17
	→ lillian joined	20:18
	← lillian left	20:18
	→ liamkeily joined	20:18
	→ mvi joined	20:18
	← JR____ left	20:19
	← mvi left	20:19
	← tristanp left	20:21
	← osxi left	20:21
	→ aniu joined	20:21
	→ osxi joined	20:21
	→ cusiousmansi joined	20:21
	← aniu left	20:21
	→ in_deep_thought joined	20:22
	→ eatw joined	20:22
	← tanuck left	20:23
	→ stantonk joined	20:23
	← eatw left	20:23
	← fooforge left	20:24
	← gebjgd left	20:24
	← leolrrj left	20:24
	→ leolrrj joined	20:25
	→ eperez joined	20:25
	→ _Vi joined	20:26
	← linuxboy_ left	20:26
	← zackiv31 left	20:27
	→ Jvop joined	20:27
	→ tanuck_ joined	20:27
	← Jvop left	20:28
	→ Vgr_ joined	20:28
	← Vgr_ left	20:28
	→ Vgr_ joined	20:28
	← nilg left	20:29
	→ linuxboytoo joined	20:29
	→ Ragw joined	20:29
	← osxi left	20:29
	→ osxi joined	20:29
	→ triz231 joined	20:29
	← Vgr left	20:29
	→ devoldmx joined	20:30
	→ Voyage joined	20:30
	← ki0 left	20:30
	← Orbitrix left	20:31
	← MarekVarro left	20:31
	→ IWishIKnew joined	20:31
	→ triz231_ joined	20:32
	← stantonk left	20:32
	→ Orbitrix joined	20:32
	← Orbitrix left	20:33
	→ Orbitrix joined	20:33
	← irqq left	20:33
	← in_deep_thought left	20:34
	← gauke left	20:34
	← cannonball left	20:34
	← irc-5225225 left	20:34
	→ i_ron joined	20:35
	← Ragw left	20:35
	← JohnBat26 left	20:36
	→ ntio joined	20:36
	→ Hzndi joined	20:36
	← ilmgb left	20:36
	← Hzndi left	20:37
	← sgambino left	20:38
	← R^2 left	20:39
	← upene left	20:39
	→ refried__ joined	20:40
	← skylite left	20:40
	→ ivua joined	20:40
	→ zackiv31 joined	20:40
	→ SimonNa joined	20:40
	→ upene joined	20:40
	← ivua left	20:41
	← Boobuigi left	20:41
	← SimonNaa left	20:42
	← triz231 left	20:42
	→ qalo joined	20:42
	→ kukks joined	20:42
	← kukks left	20:42
	→ kukks joined	20:42
	→ triz231 joined	20:42
	← qalo left	20:43
triz231	test	20:43
	← triz231_ left	20:44
	→ encod3 joined	20:44
	← encod3 left	20:44
qsuscs	triz231: you, <subject name here>, must be the pride of <subject hometown here>	20:45
	← marc_v92 left	20:45
triz231	qsuscs - just getting my irc client setup on a new mac and seeing if it is working	20:46
	← hs123 left	20:46
	← fsvehla left	20:47
	→ sgambino joined	20:48
	← eperez left	20:48
	→ Lne joined	20:49
	→ eperez joined	20:49
	→ irc-5225225 joined	20:49
	← eperez left	20:49
	← Lne left	20:50
	← rfitzgerald left	20:50
	→ anchorite joined	20:50
	← cavallari left	20:53
	← HardWall left	20:56
	→ sparetire_ joined	20:56
	← madewokherd left	20:56
	← tanuck_ left	20:57
	← ambodi_ left	20:57
	→ rubyonrailed joined	20:57
	→ Vgr joined	20:58
	← mizu_no_oto left	20:58
	← Vgr_ left	20:58
	→ hs123 joined	20:58
	← Muhannad left	20:58
	← Es0teric left	20:58
	→ Balliad joined	20:59
	← Texan left	20:59
	→ hunt3r joined	20:59
	→ VictorCL joined	20:59
	← VictorCL left	21:01
	← kukks left	21:01
	← Kyl9 left	21:01
	← modocache left	21:04
	→ eka joined	21:06
	← Kully3xf left	21:06
	→ stantonk joined	21:06
	← siegfried_ left	21:08
	→ leporello joined	21:08
	← Droolio left	21:08
	← Spacew00t left	21:09
	← stantonk left	21:10
	← rnsanchez left	21:10
leporello	Are branches specific only for local repository? I've created two branches, then did push both of them form repo1 to bare, and then did pull from bare to repo2.	21:11
	← Vadimus left	21:11
ojacobson	1. yes	21:11
leporello	But I can see only master branch via 'git branch' done on repo2	21:11
ojacobson	2. "pull" is "fetch, then merge into the current brahc"	21:11
	into the current branch*	21:11
	→ tpollard joined	21:12
	→ xnox joined	21:12
leporello	ojacobson, so how to have versions on bare repo?	21:12
	← IWishIKnew left	21:13
	→ pratikma_ joined	21:13
	← pratikmallya left	21:13
	← benborges left	21:13
leporello	seems like i must create two branches on repo2 and do pull master or pull devel switchng brances.	21:14
Steve_Jobs	why does "git checkout v3.6.0 -- ." work outside of a bash script but not in a bash script	21:14
	← MattMaker left	21:15
	← livingstn left	21:15
	→ MattMaker joined	21:16
	→ Flau joined	21:16
	← Flau left	21:16
	← refried__ left	21:16
	← xk_id left	21:16
	→ stantonk joined	21:17
	← Dorf left	21:17
	→ refried__ joined	21:18
	← FunkyAss left	21:19
osse	Steve_Jobs: define "work"	21:20
	← eggoez left	21:20
	← sublimate left	21:20
osse	anny error messages?	21:20
Steve_Jobs	osse: no.. that's the weird thing..	21:21
osse	can you show the bash script	21:21
Steve_Jobs	I would have pasted the error otherwise	21:21
	→ madewokherd joined	21:21
	← Gizburdt left	21:21
Steve_Jobs	just a second. I reverted the script. will send again when I have it reproduced	21:21
	→ in_deep_thought joined	21:21
osse	Steve_Jobs: heh, good. many just say "doesn't work" like it's obvious what went wrong.	21:22
	→ Muhannad joined	21:23
	→ LucasTT joined	21:23
	← Kicer86 left	21:23
	← pantsman- left	21:23
	→ Idya joined	21:25
	← Idya left	21:25
osse	Steve_Jobs: is it a hook?	21:25
	← refried__ left	21:25
	→ atn34 joined	21:25
osse	!hooks	21:25
gitinfo	[!hook_pitfalls] Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).	21:25
	← gambl0re left	21:25
osse	maybe no. 2	21:25
	→ arez joined	21:26
Steve_Jobs	nope.. a migration script to import important commits from subtree structure to a subtree monolith	21:26
	:(	21:26
	→ Guest73904 joined	21:26
	← Guest73904 left	21:26
	→ eletuchy joined	21:27
	→ Qqoa joined	21:28
	← Qqoa left	21:28
	→ refried__ joined	21:28
	← nfk left	21:28
	→ idog joined	21:30
	← idog left	21:30
	→ gambl0re joined	21:31
	→ delinquentme joined	21:31
	→ Royo joined	21:32
	← Royo left	21:32
	← m8 left	21:32
	→ dunpeal joined	21:32
	→ Trindaz joined	21:32
dunpeal	Hi. Can I tell Git to ignore any local changes to a file?	21:32
Trindaz	how can I get a list of all commits that have a certain commit as their parent	21:32
	→ Gizburdt joined	21:32
	→ otter768 joined	21:32
osse	dunpeal: yes but it's not recommended	21:33
dunpeal	I.E. a file is tracked in the repo, but all changes made to it are ignored.	21:33
	osse: How do I do it? And why not?	21:33
Trindaz	(as opposed to all commits that are the parent of a certain commit, which I can get with git log)	21:33
	← Gizburdt left	21:33
Trindaz	I'm trying to restore an accidentally deleted branch from a commit that I know was in the original (and so there should be commits out there pointing to this commit as their parent that were a part of the branch originally)	21:33
osse	dunpeal: the way you do it is not to make git ignore the changes, but promise that you won't make any changes	21:34
	→ MinetestForFun_ joined	21:34
	→ LaptopBrain joined	21:34
osse	it often screws people over later when they've forgotten about the whole thing	21:34
dunpeal	osse: interesting, how?	21:34
osse	dunpeal: git update-index --assume-unchanged file	21:34
dunpeal	I won't forget, I promise.	21:34
	Cool, thanks!	21:34
osse	dunpeal: but why do you do it	21:34
	dunpeal is off to do his evil work	21:34
dunpeal	osse: it's a test demo file, I basically make random changes to test features, and they never matter.	21:35
	← PaulCapestany left	21:35
osse	dunpeal: how about testing on a copy of the file :O	21:35
dunpeal	really the only form that matters is the original committed form, since it actually has a good blueprint for the demo	21:35
	→ nfk joined	21:36
shudon	hi all :) i'm writing a post-receive hook. the documentation and the actual behavior don't seem to jibe for me. if i push one or two commits on master branch, the hook seems to get piped two revision hashes followed by "refs/heads/master" which starts with the old MASTER head revision hash. the docs say i should get a "list of references that are being pushed" but it seems to not be the case (the "docs" i'm reading are https://git-scm.com/boo	21:36
	k/en/v2/Customizing-Git-Git-Hooks)	21:36
	→ iby joined	21:36
	→ teran joined	21:36
	← hs123 left	21:36
	← iby left	21:37
osse	shudon: if you push master then the list of references contains only one thing: master	21:37
	shudon: try pushing both master and blah	21:37
	← MinetestForFun left	21:37
	→ dsdeiz joined	21:37
	← freestyl3r left	21:37
shudon	osse: oh i see. thanks osse :)	21:38
	← CKyle left	21:39
osse	shudon: did you think it was the list of commits? you can generate that easily in the hook with git rev-list $old..$new	21:39
	← gambl0re left	21:39
shudon	yes i did	21:39
	→ ciampix joined	21:39
shudon	ah thanks osse	21:39
	very much :)	21:39
	→ gambl0re joined	21:41
	→ Boobuigi joined	21:42
	← nfk left	21:42
	← tverrbjelke left	21:42
	← rendar left	21:44
	→ PaulCapestany joined	21:44
	→ eggoez joined	21:44
	→ FreezingDroid joined	21:44
	← eletuchy left	21:45
	← hahuang65 left	21:46
	→ yquwu joined	21:46
	← yquwu left	21:47
dunpeal	osse: `update-index --assume-unchanged` works really well! Is there a way to automagically apply this on all clones of the repo?	21:47
	← arez left	21:48
osse	dunpeal: nope	21:48
	← Amandil left	21:48
	← lg188 left	21:49
osse	dunpeal: the changes will also disappear if you reset --hard for example	21:49
	← osxi left	21:49
	← jerius left	21:50
	→ mscook joined	21:50
	← LBV_User left	21:50
osse	dunpeal: i suggest you test on a copy of the file	21:50
	→ VictorCL joined	21:51
	← ciampix left	21:51
	← sgambino left	21:51
	→ nixter1029 joined	21:51
	← nixter1029 left	21:51
	→ User458764 joined	21:51
dunpeal	osse: I actually want the changes to disappear	21:52
	→ Wivei joined	21:52
	← delinquentme left	21:52
dunpeal	the file reverting to its original state is generally a benign and even desirable process	21:52
osse	i see	21:52
	← Wivei left	21:52
dunpeal	in fact if there was an easy way to revert every time right before a commit, I'd take it	21:52
	(I know it can be done with a pre-commit hook)	21:52
	→ hahuang65 joined	21:53
osse	one easy way is to not change it in the first place \o/	21:53
	ah well	21:53
	← rubyonrailed left	21:53
dunpeal	essentially, I don't mind if the changes stay, but I don't want them to ever be committed, and would much rather the file reverted instead of those changes being committed.	21:53
	→ gaoug joined	21:54
	← gaoug left	21:55
	→ nixter1029 joined	21:55
	← nixter1029 left	21:55
	→ CheckDavid joined	21:55
	→ nixter1029 joined	21:57
	→ Voa joined	21:57
	← nixter1029 left	21:57
	→ hs123 joined	21:58
	← Voa left	21:58
	→ ambodi joined	21:58
	→ mizu_no_oto joined	21:58
	← User458764 left	21:58
	→ nixter1029 joined	21:58
	← nixter1029 left	21:59
	← frobware_ left	21:59
	← stantonk left	21:59
	← victortyau left	21:59
	→ nixter1029 joined	22:00
	← otter768 left	22:00
	→ chozabu joined	22:01
	← nixter1029 left	22:01
	← axl_ left	22:01
	← kevwil left	22:01
	→ ixze joined	22:01
	← macabre left	22:01
	→ ThomasLocke joined	22:01
	→ nixter1029 joined	22:02
	→ stantonk joined	22:02
	← ambodi left	22:03
	← nixter1029 left	22:03
	← Dougie187 left	22:03
	← ixze left	22:03
	→ JR____ joined	22:03
	gitinfo set mode: +v	22:04
vishal	dunpeal: they won't be committed if you don't git add them...or do you use the bad habit of git commit -a .. :)	22:04
	→ Elronnd joined	22:04
	→ nixter1029 joined	22:04
	→ roxlu joined	22:04
	← nixter1029 left	22:04
roxlu	hey!	22:04
	→ solars joined	22:05
Elronnd	Hi, question I'm not sure if goes here or in #github	22:05
roxlu	I just installed git on Windows, but the git-bash console is extremelly tiny / unreadable. Is this a known issue on high-def screens?	22:05
j416	roxlu: zoom?	22:05
Elronnd	I made a fork of someone else's project, then they made changes that I want to merge in with my current master	22:05
	Without adding the commits manually	22:05
	How do I do that?	22:05
_ikke_	Elronnd: !sync_fork	22:06
gitinfo	Elronnd: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	22:06
	→ nixter1029 joined	22:06
roxlu	j416, zoom on a the git-bash console?	22:06
j416	yes	22:06
	→ vub joined	22:06
	← nixter1029 left	22:06
	→ boombatower joined	22:06
roxlu	j416, how can I do that?	22:06
	← hs123 left	22:07
j416	^+	22:07
	I suppose	22:07
	← blimpse left	22:07
	← gamename left	22:07
roxlu	oh funny WIN - + zooms in, but that's not what I want	22:07
dunpeal	vishal: I don't want to see it as modified in `git status`, it's distracting.	22:07
	← JR____ left	22:07
	← vub left	22:08
	→ gamename joined	22:08
	j416 zzZ	22:08
Elronnd	If I follow the instructions there, I get	22:08
	fatal: 'upstream' does not appear to be a git repository	22:08
	fatal: Could not read from remote repository.	22:08
	→ mingwandroid joined	22:09
Elronnd	Please make sure you have the correct access rights and the repository exists	22:09
	← mscook left	22:09
	← creep left	22:09
vishal	dunpeal: for things like this, I like to commit a renamed, ".sample" file to the repo, and put the actual expected file name in .gitignore. That way, anyone who modifies it has to rename the .sample to <whatever>, and git will always be sorted out properly	22:09
osse	Elronnd: see the text in the blue box	22:09
	→ ahr3n_ joined	22:10
	← NeverDie left	22:10
	← upene left	22:11
	→ steveoh joined	22:11
steveoh	hello	22:11
	i have a branching question	22:11
	if you start with master	22:12
dunpeal	vishal: yes, that is essentially what osse suggested, and it's a reasonable solution.	22:12
vishal	oh /me missed it :)	22:12
	← Gama11 left	22:12
steveoh	and branch to A and then create a PR for A but don't wnat to wait for it to be accepted and your branch from A into B, B get's all of A's commits. What is the clean way to get A and B into master?	22:12
	← gamename left	22:13
	← kadoban left	22:13
steveoh	ideally rebasing a into master and then b into master	22:13
	→ kadoban joined	22:13
	← mikecmpbll left	22:13
	← jolda left	22:13
osse	steveoh: who is on the receiving end of the PR?	22:13
	→ mikecmpbll joined	22:13
steveoh	basically its a project with me and another developer	22:14
	so it's me and him	22:14
	→ Sczy joined	22:14
steveoh	how is that relevant osse?	22:14
osse	steveoh: the dude who accepts the PR is the one who gets to decide how to do it	22:15
	→ jteneyck joined	22:15
	← Sczy left	22:15
steveoh	well we had rebase conflicts when we did it	22:15
osse	steveoh: but if you rebase A onto master, then rebase B onto A, it'll be all clean	22:15
steveoh	i'm wondering if there are some flags to toss into rebase to help with that	22:15
	← Elronnd left	22:16
	→ zumba_addict joined	22:16
osse	most conflicts you get during a rebase you would get during a merge and vice versa	22:16
	→ rbdo joined	22:17
steveoh	ok i guess i don't understand where we went wrong to make things messy	22:17
	so i can't articulate to a good question	22:17
	← rbdo left	22:18
osse	does B need the commits in A ?	22:19
	→ Malsasa_ joined	22:19
	Malsasa_ → Malsasa	22:19
	← yulaow left	22:19
	← VictorCL left	22:19
	← anchorite left	22:20
	→ liamonade joined	22:20
	← _joes_ left	22:20
	→ mscook joined	22:20
	→ _joes_ joined	22:20
	← zumba_addict left	22:21
	→ VictorCL joined	22:21
	→ mscook_ joined	22:22
	← cbonobo left	22:22
steveoh	yes	22:22
	→ nfk joined	22:23
	→ zumba_addict joined	22:23
	← liamkeily left	22:23
	→ Kyl9 joined	22:23
steveoh	osse: its like you have master, you start a feature finish it, and want to move on to another featuer that depends on the other feature so you can't branch from master	22:23
	← dunpeal left	22:23
	← ThomasLocke left	22:23
	→ Iutiy joined	22:25
	→ maestrojed joined	22:25
	← mscook left	22:25
	→ dunpeal joined	22:25
	← zumba_addict left	22:25
	← Trindaz left	22:26
	← Iutiy left	22:26
	→ zumba_addict joined	22:26
	→ rexbutler joined	22:27
	→ dcau joined	22:27
	→ constantinexvi joined	22:28
	← Kyl9 left	22:28
	← Muhannad left	22:28
	← refried__ left	22:28
Voyage	I get this when I push : remote: fatal: Not a git repository: '.'	22:29
	→ lahwran joined	22:29
	→ dgutierrez1287 joined	22:29
	← dcau left	22:29
	→ nydew09 joined	22:30
	← Balliad left	22:30
	→ Deeu joined	22:30
	← [H]unt3r left	22:30
	→ delinquentme joined	22:31
Voyage	Where should I do git archive master \| tar -C /path ?	22:31
	← MinetestForFun_ left	22:31
	← Deeu left	22:32
	→ xk_id joined	22:32
	← hamster left	22:32
	← basiclaser left	22:32
	← steveoh left	22:32
osse	!hooks > Voyage	22:33
gitinfo	[!hook_pitfalls] Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).	22:33
osse	See no. 3	22:33
	I mean 2	22:33
	← gargola left	22:33
	→ Rqbqd joined	22:33
	→ nowhere_man_ joined	22:33
	→ jagob joined	22:34
Voyage	oh	22:34
	I did used cd	22:34
	← Rqbqd left	22:34
osse	since you give a path to tar anyway there is no need	22:34
	→ Noldorin joined	22:34
Voyage	osse, I have a lot going on else than that	22:35
	when to unset GIT_DIR ?	22:35
osse	that depends	22:35
Voyage	http://pastie.org/10267042	22:35
osse	right before the first command that tries to act on a different repo	22:35
	← zumba_addict left	22:36
	← dsantiago left	22:36
	← solars left	22:36
osse	you have to move the cd command below the git command	22:36
	← rexbutler left	22:37
Voyage	sounds better? http://pastie.org/10267048	22:39
	← eVRiAL left	22:39
osse	yes	22:39
	← mizu_no_oto left	22:40
	→ amnz joined	22:41
	→ modocache joined	22:41
	← amnz left	22:42
	← eGGsha left	22:42
	← jagob left	22:45
	→ zumba_addict joined	22:45
	← triz231 left	22:45
	← modocache left	22:46
	→ jagob joined	22:46
Voyage	osse, thanks man	22:46
	← editshare-ericf left	22:46
	→ SebastianFlyte joined	22:47
	→ Nfb joined	22:47
	← Nfb left	22:49
	← chitopunk left	22:49
	→ akiva_ joined	22:49
	→ Qohs joined	22:50
	← Qohs left	22:50
	→ d5sx43 joined	22:50
	← d5sx43 left	22:51
	← blr left	22:51
	→ aberrant joined	22:52
aberrant	hi all	22:52
	I have a problem with git bisect.	22:52
	specifically, I don’t know how to get the “good” version. The version number I have doesn’t appear to work	22:52
	← dunpeal left	22:52
aberrant	I’m trying “git bisect good v0.4.0-dev+5008”	22:53
	← dgutierrez1287 left	22:53
aberrant	and I’m getting “fatal: Needed a single revision / Bad rev input: v0.4.0-dev+5008"	22:53
	→ uhxdo joined	22:53
	← uhxdo left	22:54
	← stantonk left	22:54
	← zackiv31 left	22:55
	← SebastianFlyte left	22:55
	← dsdeiz left	22:55
	→ Yswt joined	22:55
aberrant	ah, I got it!	22:55
	← Yswt left	22:56
	→ otter768 joined	22:56
	← zadock left	22:56
	← Chill_Surf left	22:58
	→ nejo joined	22:59
	← nejo left	22:59
	→ dgutierrez1287 joined	22:59
	← shinnya left	23:00
	→ triz231 joined	23:00
	→ aidalgol joined	23:00
	→ upene joined	23:00
	→ izmi joined	23:00
	← izmi left	23:01
	→ Ouzo joined	23:02
	← Ouzo left	23:02
	← eggoez left	23:03
	→ oeu joined	23:03
	→ weiyang joined	23:03
	← oeu left	23:04
	← michael_mbp left	23:04
	← boombatower left	23:05
	→ uxie joined	23:05
	→ stantonk joined	23:06
	← uxie left	23:06
	→ ketas joined	23:06
	→ michael_mbp joined	23:07
	→ Yydu joined	23:07
	← Maple__ left	23:08
	← Yydu left	23:08
	← Qantourisc left	23:08
	→ dsantiago joined	23:09
	← devoldmx left	23:09
	→ Vfle joined	23:09
	← wicope left	23:09
	← Vfle left	23:10
	→ blr joined	23:11
	→ sctskw joined	23:11
	→ LBV_User joined	23:12
	→ Dvok joined	23:12
	← sctskw left	23:12
	← Noldorin left	23:13
	← Dvok left	23:13
	← madewokherd left	23:14
	← ketas left	23:14
	→ clarkpan joined	23:15
	→ Amqu joined	23:15
	← Amqu left	23:15
	→ ketas joined	23:17
	← zendrix left	23:17
	→ aapsb joined	23:17
	← aapsb left	23:17
	→ solaire joined	23:17
	← knownasilya left	23:18
	→ toiu joined	23:18
	→ zendrix joined	23:19
	← toiu left	23:19
	← zumba_addict left	23:19
	→ nixter1029 joined	23:19
	← clarkpan left	23:19
	← hahuang65 left	23:19
	→ zumba_addict joined	23:20
	→ iuac joined	23:20
	→ eggoez joined	23:20
	→ clarkpan joined	23:20
	← iuac left	23:20
	← King_Hual left	23:21
	→ iuca joined	23:22
	← iuca left	23:22
	→ Maple__ joined	23:23
	← zumba_addict left	23:23
	← recketing left	23:24
	→ Aouo joined	23:24
	← ketas left	23:24
	← Zupoman left	23:25
	← Aouo left	23:25
	→ tristanp_ joined	23:25
	→ ebfull joined	23:26
	→ nagwo joined	23:26
	← nagwo left	23:26
	→ ketas joined	23:27
	← jagob left	23:27
	← solaire left	23:27
ebfull	if you branch `master` into `mybranch` and make some commits in both, but now your `mybranch` needs new commits from `master`, is it proper to just merge from master into mybranch?	23:27
	← fearnothing left	23:27
	→ Cumk joined	23:27
	→ dsdeiz joined	23:27
	→ eletuchy joined	23:27
	← Cumk left	23:28
	→ jagob joined	23:28
relipse	how do I move my staged changes to my master branch?	23:28
	unstage them checkout master and then add them again?	23:28
	→ basiclaser joined	23:29
	→ gedu joined	23:29
	← gedu left	23:29
	← LaptopBrain left	23:29
	← upene left	23:32
	← delinquentme left	23:32
osse	ebfull: yes. rebase is also proper	23:33
	← kpease left	23:34
osse	relipse: you don't have to unstage first	23:34
relipse	ok thanks	23:34
	→ Ubye joined	23:35
	← jteneyck left	23:35
	← pheaver left	23:35
	← Ubye left	23:35
	→ Eei joined	23:36
	← Eei left	23:36
	← Vgr left	23:37
	→ ashokrajar joined	23:37
	→ Apcu joined	23:38
	← Apcu left	23:38
	← Motoko left	23:39
	← shafox left	23:39
	← hexagoxel left	23:40
	← clarkpan left	23:40
Voyage	a reporter can commit and push to remote? in gitlab?	23:40
	→ auum joined	23:40
	← auum left	23:40
	→ hexagoxel joined	23:41
	→ delinquentme joined	23:43
	→ clarkpan joined	23:44
	→ Lyqyd joined	23:44
	← tgunr left	23:44
	← roxlu left	23:45
	← mingwandroid left	23:45
	← VictorCL left	23:46
	← Malsasa left	23:48
	← teran left	23:48
	→ radialneon joined	23:49
	← mscook_ left	23:52
	→ Wxep joined	23:52
	← Wxep left	23:52
	← yqt left	23:53
	→ Uafo joined	23:53
	← GoddeR left	23:53
	← bket left	23:53
	→ yqt joined	23:53
	→ aarcane_ joined	23:53
	→ GoddeR joined	23:54
	→ Joseph__Silber joined	23:54
	← Uafo left	23:54
	← stantonk left	23:54
	→ mscook joined	23:54
	→ eiia joined	23:55
	→ kaictl joined	23:55
	← eiia left	23:55
	→ Noldorin joined	23:56
	→ Bkagg joined	23:56
	← aarcane left	23:57
	← Bkagg left	23:57
	← elsevero left	23:57
	→ pbrobst joined	23:58
	→ ieea joined	23:58
	← ieea left	23:58
	← fstd left	23:59
	→ fstd joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation