IRCloggy #git 2017-03-28

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-03-28

→ MacWinner joined00:00
← rivarun left00:00
→ rivarun joined00:01
← de-facto left00:01
→ fission6 joined00:01
→ de-facto joined00:01
← m0viefreak left00:03
← xaa left00:03
← hashtagstrashtag left00:04
→ maarhart joined00:04
← howitdo left00:04
← medeirosthiiago left00:05
← Es0teric left00:06
→ oxguy3 joined00:06
← overlord_tm left00:09
← am55 left00:12
← _W_ left00:13
→ peepsalot joined00:13
→ om_henners joined00:15
← maarhart left00:16
→ marianina8 joined00:16
→ jimklo_ joined00:19
← Sasazuka left00:19
← dreiss left00:20
→ gugah joined00:20
← rivarun left00:20
→ rivarun joined00:20
→ biotim joined00:20
← marianina8 left00:21
← jimklo left00:22
← jimklo_ left00:23
→ marianina8 joined00:24
← Noldorin left00:24
← rivarun left00:24
→ rivarun joined00:24
→ livingstn joined00:25
→ Sasazuka joined00:25
← matoro left00:27
→ ocelotsloth joined00:27
← vatican left00:28
← shgysk8zer0 left00:29
← gunnaro left00:31
→ osk| joined00:31
← ocelotsloth left00:31
← marianina8 left00:31
→ nckpz joined00:31
← gugah left00:32
→ matoro joined00:33
→ thebope joined00:33
→ am55 joined00:34
→ gopar joined00:35
→ Kaisyu joined00:37
← kfoonamalik left00:37
← qpdb left00:38
← gopar left00:38
→ qpdb joined00:38
← Cabanossi left00:39
← fission6 left00:40
← dsdeiz_ left00:40
→ fission6 joined00:41
→ Cabanossi joined00:42
← brent__ left00:42
← Rodya__ left00:42
← ispn left00:42
→ onehrxn joined00:42
→ dsdeiz joined00:43
→ brent__ joined00:44
→ MarioBranco joined00:46
← brent__ left00:49
→ marianina8 joined00:50
→ gugah joined00:50
→ cqi joined00:53
→ ncthom91 joined00:54
← mda1 left00:56
→ gunnerman joined00:57
→ mda1 joined00:57
→ Keverw joined00:58
→ dnukem joined00:58
← thebope left00:59
← atrigent left00:59
gitinfo set mode: +v01:00
gunnerman Hello. I have a question about using remote repositories and web files. Anyone here to help?01:00
→ sunrunner20 joined01:01
→ pietv joined01:02
→ thebope joined01:02
→ rchavik joined01:02
kadoban gunnerman: Several hundred people, you can just ask your followup question01:03
← Gustavo6046 left01:04
← Jackneill left01:05
→ Ryanar joined01:06
← de-facto left01:08
← lavalamp left01:08
← lmatteis left01:08
→ Rodya_ joined01:09
← matoro left01:09
← _Vi left01:09
gunnerman I have set up a remote repository on GitLab. We have production, test, and development webservers. Right now it is just two developers, me and another person. The other developer does mostly work with front end web development and usually edits files via ssh on the servers. I use an IDE set up with sftp. Ideally, we would like to work on test and dev and production would get updates from the repo. My question is, what might be an ide01:09
→ matoro joined01:11
gunnerman files on test and dev servers? I.e. do I clone the master on the server and then clone from the server again to my local machine? Or do I make changes via ftp and then do commits etc. via ssh on the server?01:11
← osk| left01:12
gunnerman The test and dev server names don't really carry any meaning for workflow. I do most of my work on dev and the other person does their work on test. We then copy to production after development and testing.01:13
→ _Vi joined01:13
← nckpz left01:16
rwp gunnerman, This is one of those hard questions because there is no single right answer. The system is flexible and you get to choose what you would like to do. Which of course is like giving a starving man a menu. :-)01:16
What I would do...01:16
What I would do is to have each of you work in your own working copy sandbox area separate from each other. I would not have both of you share the same work area.01:17
Then each of you can commit into your repository separately as you make changes you want to share. Then push them to the master when you are ready for the other person to see them.01:17
Then I would have the dev, test, production servers do a git pull when you want to move changes to them.01:18
→ nckpz joined01:19
rwp gunnerman, There is a reference I think you should look at though. I will ask the irc bot to tell you about !deploy for additional reading.01:19
gitinfo gunnerman: 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.html01:19
→ sz0 joined01:20
→ de-facto joined01:21
→ Rodya__ joined01:21
→ bannakaffalatta joined01:21
→ Chch joined01:21
← NeverDie left01:23
← Keverw left01:23
← Rodya_ left01:23
← rewt left01:23
→ rewt`` joined01:23
← bgerber left01:23
→ patarr_ joined01:24
rewt`` → rewt01:24
→ NeverDie joined01:24
← dave0x6d left01:25
← tobie left01:25
← shennyg left01:25
← NeverDie left01:25
← sz0 left01:25
→ yaewa joined01:25
gunnerman That is what I was thinking. I don't mean for it to be a deployment tool I am just trying to select a process that is simple enough that I wont see people uploading files with a bunch of unreleated changes before finally remembering to commit but we also want to keep versioning info comprehensive and usable.01:25
← patarr left01:26
← Ownix left01:26
← eshlox left01:26
← Awesomecase left01:26
← waveclaw left01:26
→ NeverDie joined01:26
→ sz0 joined01:26
← moei left01:26
→ dave0x6d joined01:26
→ tobie joined01:26
→ belak joined01:27
← rnsanchez left01:27
← pks left01:27
← parasite_ left01:27
← bipolar left01:27
→ Ownix joined01:27
→ shennyg joined01:27
→ nezZario joined01:27
→ dreiss joined01:27
→ tharuin joined01:27
→ eshlox joined01:27
← Gunni left01:27
→ flupke joined01:27
gitinfo set mode: +v01:27
← xkr47 left01:27
→ pks joined01:27
→ Wulf4 joined01:28
→ AustinMatherne joined01:28
← SuperLag left01:28
→ kdeal joined01:28
→ bgerber joined01:28
→ SuperLag joined01:28
← gkatsev left01:28
→ xkr47 joined01:28
← Emperor_Earth left01:28
gunnerman For the SSH only user, it is easy to make the changes and commit in the same window. A little bit cumbersome if I am working in an ide and I need to maintain an ssh session to commit/branch/etc and then resync local files if I do branch.01:29
→ gkatsev joined01:29
← peterbecich left01:29
→ waveclaw joined01:29
→ arand joined01:29
→ peterbecich joined01:29
← biotim left01:30
← Wulf left01:31
Wulf4 → Wulf01:31
→ finalbeta joined01:31
→ Hedgework joined01:31
→ bipolar joined01:32
→ jgornick joined01:32
→ Gunni joined01:32
→ SleePy joined01:32
→ amdi_ joined01:32
→ Eugene joined01:32
← bgerber left01:32
← ncthom91 left01:32
→ snowkidind joined01:33
← Anja_ left01:34
← fstd left01:34
→ fstd_ joined01:34
fstd_ → fstd01:34
← govg left01:34
← gunnerman left01:35
→ bgerber joined01:36
→ durham_ joined01:36
← theiostream left01:36
→ biotim joined01:36
← Chch left01:37
→ Es0teric joined01:37
→ parasite_ joined01:37
→ rnsanchez joined01:37
→ gnoirzox2 joined01:37
← Sasazuka left01:38
← frobnic left01:38
← durham left01:39
← Cabanossi left01:40
← durham_ left01:40
→ Cabanossi joined01:41
← madewokherd left01:43
← roby10 left01:43
→ a_thakur joined01:43
← patarr_ left01:44
→ ekinmur joined01:44
← Es0teric left01:44
← sunri5e left01:45
← dviola left01:45
→ Es0teric joined01:45
← ilbot3 left01:46
→ sunri5e joined01:46
← Es0teric left01:47
← pks left01:48
← a_thakur left01:48
→ ilbot3 joined01:49
← alexandre9099 left01:49
← de-facto left01:49
→ LeBlaaanc joined01:50
→ pks joined01:50
→ alexandre9099 joined01:52
← cqi left01:52
→ de-facto joined01:52
→ fahadash joined01:52
← CheckDavid left01:54
→ hahuang61 joined01:54
← regedit left01:54
← dsdeiz left01:55
← dreiss left01:58
→ cvcxc__ joined01:59
← chipotle left02:00
→ lavalamp joined02:00
← d^sh left02:01
← cvcxc_ left02:02
→ alexandre9099_ joined02:02
→ d^sh joined02:03
→ dsdeiz joined02:03
→ chipotle joined02:04
← alexandre9099 left02:04
alexandre9099_ → alexandre909902:04
→ buzzLightBeer joined02:06
← chachasmooth left02:06
← re1 left02:07
→ _W_ joined02:08
← buzzLightBeer left02:09
→ chachasmooth joined02:10
← Cabanossi left02:10
← Fallen0223 left02:10
→ Cabanossi joined02:11
→ buzzLightBeer joined02:13
← amdi_ left02:19
→ amdi_ joined02:20
→ roentgen joined02:20
→ raspado joined02:20
→ Chch joined02:21
→ lagothri1 joined02:21
← hexagoxel left02:22
← lagothrix left02:24
← thebope left02:25
→ Emperor_Earth joined02:26
→ madewokherd joined02:27
→ MrJoshua joined02:27
→ hexagoxel joined02:28
← roentgen left02:28
← raspado left02:30
← livingstn left02:30
→ raspado joined02:31
→ livingstn joined02:32
→ dreiss joined02:32
→ mizu_no_oto joined02:36
→ s2013 joined02:39
→ atrigent joined02:40
→ livingst_ joined02:41
← livingstn left02:42
← wagle left02:44
→ wagle joined02:44
← livingst_ left02:46
← lavalamp left02:47
← Gsham left02:49
← raspado left02:49
← drodger left02:49
→ raspado joined02:49
→ drodger joined02:51
← drodger left02:51
← amdi_ left02:52
Guest27472 → ariver02:54
← snowkidind left02:54
→ jameser joined02:56
→ mischat joined02:56
→ Vortex35 joined02:57
→ drodger joined02:57
→ a_thakur joined02:59
← mizu_no_oto left02:59
→ thebope joined02:59
← ojdo left03:00
← aidalgol left03:00
← mischat left03:01
← Vortex34 left03:01
← chachasmooth left03:01
← buzzLightBeer left03:02
← thebope left03:04
← a_thakur left03:04
→ raynold joined03:05
← svm_invictvs left03:05
← tyreld left03:06
→ chachasmooth joined03:06
→ ojdo joined03:06
← Cabanossi left03:10
→ Cabanossi joined03:10
→ NoOutlet joined03:11
← dreiss left03:13
← GodGinrai left03:14
← Chch left03:15
→ andrew710 joined03:15
→ thedudez0r joined03:16
← atrigent left03:17
→ cqi joined03:19
← s2013 left03:20
← shinnya left03:20
← hahuang65 left03:22
→ kbeflo joined03:22
← sz0 left03:24
← hahuang61 left03:24
→ Awesomecase joined03:25
→ dreiss joined03:29
→ watabou joined03:30
← gugah left03:32
← fission6 left03:33
cqi → cqi|lunch03:35
→ cyphase joined03:35
→ Skyfinn joined03:35
← NightMonkey left03:36
→ atrigent joined03:37
→ hahuang61 joined03:37
→ Atrumx joined03:38
→ buzzLightBeer joined03:39
→ aavrug joined03:39
→ NightMonkey joined03:40
← Cabanossi left03:40
← aavrug left03:40
→ Cabanossi joined03:40
→ aavrug joined03:41
← hahuang61 left03:42
→ bannakaf_ joined03:45
→ IRCFrEAK joined03:46
← mikecmpbll left03:47
← bannakaffalatta left03:47
bannakaf_ → bannakaffalatta03:47
← IRCFrEAK left03:48
← MacWinner left03:51
← andrew710 left03:51
→ noteness_ joined03:51
← Ryanar left03:51
← MasterNayru left03:51
→ andrew710 joined03:52
→ MasterNayru joined03:53
← noteness left03:53
→ a_thakur joined03:53
→ thebope joined03:54
→ CmndrSp0ck joined03:54
← oxguy3 left03:56
← matoro left03:59
← thebope left03:59
← thedudez0r left03:59
← xissburg left04:00
→ matoro joined04:01
← prg3 left04:02
← a_thakur left04:02
→ a_thakur joined04:03
→ prg3 joined04:03
→ xissburg joined04:04
→ Goplat joined04:06
→ bocaneri joined04:07
← bocaneri left04:07
→ darkbit joined04:08
← Rodya__ left04:10
→ bocaneri joined04:11
→ Rodya_ joined04:11
← watabou left04:11
← Rodya_ left04:15
← jameser left04:16
← glebihan left04:20
← dreiss left04:20
→ mknod joined04:20
→ jameser joined04:21
← buzzLightBeer left04:21
→ dreiss joined04:23
→ Andrew_K joined04:24
→ mehola joined04:24
← safe left04:25
← atrigent left04:25
← ekinmur left04:26
← darkbit left04:27
→ nevodka joined04:27
→ elinux joined04:31
→ starkhalo joined04:35
← oskarkv left04:38
← nowhere_man left04:39
→ menip joined04:39
→ aidalgol joined04:40
→ Noodlewitt joined04:41
→ nowhere_man joined04:43
← andrew710 left04:43
→ buzzLightBeer joined04:43
→ shinnya joined04:43
→ atrigent joined04:45
→ zerow joined04:45
← holodoc left04:46
← fakenerd left04:47
→ holodoc joined04:48
← buzzLightBeer left04:50
→ hvn0413 joined04:50
← raspado left04:51
→ raspado joined04:51
← hvn0413 left04:51
← oleo left04:53
→ atrigent_ joined04:55
← atrigent left04:56
atrigent_ → atrigent04:56
← raspado left04:56
→ ayogi joined04:56
← fahadash left04:57
→ andrew710 joined04:58
← drodger left05:01
→ rscata joined05:02
→ hotbobby joined05:02
hotbobby when trying to update my fork to the original. base fork is mine and head fork is the original?05:02
i dont want to accidentally send a pull request to the original repo05:02
← rscata left05:03
→ dec0n joined05:03
← a_thakur left05:04
→ bakibour joined05:05
← bakibour left05:05
dmc not familiar with the terms "base fork" and "head fork"05:05
→ bourbaki joined05:05
dmc I tend to have upstream as the origin remote05:05
hotbobby im using the github website05:05
it refers to them as base and head forks05:05
dmc and name the remote for my fork "fork"05:05
bourbaki Hidiho, i get the following error, as you can see im running Windows (fatal: could not create leading directories of 'C:/Program Files (x86)/Jenkins/workspace/BuildUpdate/StudioSettings/Global/.git')05:06
← dsdeiz left05:06
dmc hotbobby, #github05:06
bourbaki I read that it is a problem to use single quotes for paths with whitespaces, is this correct?05:06
→ rscata joined05:06
hotbobby dmc: sorry i thought thats what this was -- im in the wrong place :P05:07
dmc heheh05:07
bourbaki This error has been produced by a, git submodule update05:07
→ dsdeiz joined05:07
→ drodger joined05:07
← hotbobby left05:08
← Cabanossi left05:09
cqi|lunch → cqi05:10
Renter I just found out about git push origin :branchname05:10
thanks linus05:11
thanks05:11
→ a_thakur joined05:11
→ Cabanossi joined05:11
→ Rodya_ joined05:11
dmc lol05:12
→ mischat joined05:12
← nowhere_man left05:12
→ nowhere_man joined05:13
← orbyt_ left05:14
← Rodya_ left05:16
← mischat left05:17
→ GT4066 joined05:18
→ Brski joined05:18
Renter the worst part about it is looking at it it starts to make sense05:19
I can feel it sinking into my brain as something I'll just quietly accept, and in a year or so explain to someone 'oh, it's easy you just...'05:19
← Lyqyd left05:21
→ jungsubk joined05:21
← Skyfinn left05:22
→ darkbit joined05:22
→ Skyfinn joined05:22
→ ozmage joined05:22
→ raijin joined05:22
→ glebihan joined05:25
← nowhere_man left05:26
→ ozmage_ joined05:26
→ bariscant joined05:26
→ nowhere_man joined05:26
→ Nilesh_ joined05:27
→ fakenerd joined05:27
→ sncder joined05:27
← ozmage left05:28
← fakenerd left05:28
→ fakenerd joined05:28
→ Raging_Hog joined05:28
← Skyfinn left05:28
← atrigent left05:29
← _August_ left05:29
← marianina8 left05:29
→ _August_ joined05:30
yushyin Renter: but you can also use git push origin --delete <branchname>05:30
← DolphinDream left05:30
← nowhere_man left05:30
← bariscant left05:31
→ nowhere_man joined05:31
← bourbaki left05:32
← ozmage_ left05:32
→ Mo joined05:33
← jungsubk left05:34
→ overlord_tm joined05:35
→ acetakwas joined05:36
→ hahuang61 joined05:38
→ dersand joined05:39
→ imack joined05:41
← pks left05:41
→ pks joined05:41
→ Mindiell joined05:42
→ thebope joined05:42
Mindiell hi there, I installed a git server and now, each time I do a "git push", the user gt stays connected05:42
s/gt/git05:42
← nckpz left05:42
Mindiell so, after some days of work I got a lot of "git sessions git@notty"05:43
← kodo[m] left05:43
← hahuang61 left05:43
Mindiell if anyone knows the problem... you'll be welcome ;)05:43
→ frobnic joined05:45
← thebope left05:46
→ geoid joined05:46
→ go1111111 joined05:47
→ svm_invictvs joined05:47
← menip left05:48
← inflames left05:50
← shinnya left05:50
← go1111111 left05:51
→ go1111111 joined05:52
→ MutantMahesh joined05:53
← nowhere_man left05:53
← Brski left05:53
→ ThomasLocke joined05:53
← Cabanossi left05:53
→ freimatz joined05:54
→ nowhere_man joined05:54
→ Cabanossi joined05:56
← diogenese left05:56
→ marianina8 joined05:56
→ Assault joined05:57
→ rokups joined05:57
→ diogenese joined05:58
← ahrs left06:00
← boombatower left06:00
← marianina8 left06:01
← go1111111 left06:02
← onehrxn left06:02
← HurricaneHarry left06:02
← dendazen left06:03
→ HurricaneHarry joined06:07
→ jagob joined06:08
→ jungsubk joined06:08
→ Silmarilion joined06:09
→ t0by joined06:10
← t0by left06:10
→ t0by joined06:10
← jungsubk left06:13
← a_thakur left06:13
→ Rodya_ joined06:13
→ go1111111 joined06:13
← raynold left06:14
→ MutantMa_ joined06:15
→ a_thakur joined06:15
→ jungsubk joined06:15
→ cam27_ joined06:15
→ marianina8 joined06:15
→ chele joined06:15
← pks left06:16
← cam27 left06:16
cam27_ → cam2706:16
← MutantMahesh left06:16
→ pks joined06:16
→ inflames joined06:17
← Rodya_ left06:17
← TomyLobo2 left06:20
← thiago left06:20
← marianina8 left06:20
→ z8z joined06:22
→ thiago joined06:23
→ schleppel joined06:24
← TikityTik left06:25
→ zerow_ joined06:27
← cam27 left06:27
← jungsubk left06:29
← raijin left06:30
→ raijin joined06:30
← zerow left06:30
→ jnavila joined06:31
← zerow_ left06:31
→ zerow joined06:32
→ zeroed joined06:33
← zeroed left06:33
→ zeroed joined06:33
→ King_Hual joined06:34
← King_Hual left06:34
→ King_Hual joined06:34
→ qt-x joined06:35
← sncder left06:35
→ sncder joined06:36
→ thebope joined06:36
← sncder left06:37
→ hahuang61 joined06:39
← thebope left06:41
→ patarr joined06:41
→ sncder joined06:41
← go1111111 left06:42
← dnukem left06:42
→ masuberu joined06:43
→ starkhallo joined06:44
← starkhalo left06:44
← nowhere_man left06:44
← hahuang61 left06:44
← patarr left06:46
← dreiss left06:46
← starkhallo left06:46
← aboccia left06:46
→ aboccia joined06:46
← Zarthus left06:47
→ roelmonnens joined06:47
← MathNeverEnds left06:50
→ Zarthus joined06:50
→ chardan joined06:51
→ fbwnd joined06:52
→ go1111111 joined06:53
← Cabanossi left06:54
← inflames left06:55
← CmndrSp0ck left06:55
→ Cabanossi joined06:56
← masuberu left06:59
→ TomyWork joined06:59
← cyberz left07:01
→ cyberz joined07:03
← chardan left07:06
→ mischat joined07:06
→ govg joined07:09
← go1111111 left07:10
← d0nn1e_ left07:11
← Noodlewitt left07:11
→ trondth joined07:12
← trondth left07:12
→ trondth joined07:13
← mischat left07:13
→ masuberu joined07:13
→ Rodya_ joined07:13
→ kbeflo_ joined07:14
→ zefferno joined07:15
← justan0theruser left07:15
← peterbecich left07:16
← kbeflo left07:17
→ no_gravity joined07:18
← lucasem left07:18
← Rodya_ left07:19
no_gravity Where is the git config file that has the info about user email and stuff?07:19
frobnic no_gravity: https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration07:20
_ikke_ no_gravity: git config --global -l07:21
no_gravity I found it in ~/.gitconfig07:21
frobnic that's not the whole story :) (and i have no idea, why my link is turkish)07:21
→ chardan joined07:22
→ go1111111 joined07:23
← _August_ left07:23
→ _August_ joined07:24
→ thebope joined07:30
→ dvaske_ joined07:31
← pietv left07:34
← thebope left07:34
→ eahmedshendy joined07:36
→ MineCoins joined07:36
← nevodka left07:37
→ jungsubk joined07:38
← Cabanossi left07:38
→ Cabanossi joined07:40
← King_Hual left07:41
→ nowhere_man joined07:41
← zeroed left07:42
→ lucasem joined07:43
→ Silenced joined07:46
← Silenced left07:46
→ Silenced joined07:46
→ sbasso joined07:46
← a_thakur left07:47
→ a_thakur joined07:47
→ IRQ` joined07:48
→ Balliad joined07:48
← a_thakur left07:51
→ a_thakur joined07:52
← _August_ left07:53
→ _August_ joined07:53
← madewokherd left07:54
← a_thakur left07:54
→ plexigras joined07:54
← go1111111 left07:54
← geoid left07:54
→ a_thakur joined07:54
Mindiell hi there, I installed a git server and now, each time I do a "git push", the user git stays connected (pam session git@notty)07:54
so, after some days of work I got a lot of "git sessions git@notty"07:54
any idea is welcome ;o)07:55
← freimatz left07:55
immae Mindiell: what kind of git server?07:56
→ octo8_ joined07:56
← robattila256 left07:56
← nowhere_man left07:56
→ fees joined07:57
← octo8_ left07:57
→ dvaske joined07:59
← dvaske_ left07:59
← hurricanehrndz left08:00
→ kurkale6ka joined08:00
→ xywbtu joined08:01
→ aard_ joined08:01
→ hurricanehrndz joined08:01
→ tvw joined08:02
→ Glooomy joined08:03
grawity maybe your ssh client has automatic multiplexing enabled08:03
although in that case it ought to only have one connection, not a ton08:04
→ MonkOfCity joined08:05
→ xaa joined08:05
← HardlySeen left08:06
→ theoceaniscool joined08:07
→ bumbar joined08:07
→ HardlySeen joined08:08
→ rominronin joined08:09
→ User458764 joined08:09
bumbar i've used http://stackoverflow.com/a/36463546 to move my last commit to a new branch, pushed new branch but the commit is still on master, should i just do "git reset --hard HEAD~1"?08:10
→ peterbecich joined08:12
← jungsubk left08:12
← fakenerd left08:14
rominronin → ronin_work08:14
← dave0x6d left08:15
→ Rodya_ joined08:16
→ ShapeShifter499 joined08:16
→ Whiskey joined08:16
← thiago left08:18
→ elect joined08:18
← peterbecich left08:19
→ Assault_ joined08:19
→ fakenerd joined08:19
→ pietv joined08:19
← Rodya_ left08:20
→ thiago joined08:20
← pietv left08:21
→ marcogmonteiro joined08:21
← quite left08:21
→ quite joined08:22
← Assault left08:23
← z8z left08:23
→ jungsubk joined08:23
← a_thakur left08:23
→ bronson_ joined08:24
→ thebope joined08:24
→ notebox joined08:25
→ pietv joined08:25
← thiago left08:26
← rchavik left08:26
← sbasso left08:26
← acetakwas left08:26
← bronson left08:26
→ acetakwas joined08:27
← Mo left08:27
← jason237 left08:28
← thebope left08:28
→ thiago joined08:30
← MarioBranco left08:31
→ MarioBranco joined08:32
ij Does filter-branch work backwards?08:32
← jnewt left08:32
grawity no, it has to start from the root(s)08:32
ij Ah, I understood what I don't.08:33
take commit, checkout tree, apply command, add ., commit. So conflicts aren't a problem.08:34
→ jason237 joined08:35
→ jstein_ joined08:35
← govg left08:36
→ dumacdev joined08:37
jstein_ → jstein08:37
→ nowhere_man joined08:38
→ thebird joined08:40
→ hahuang61 joined08:40
→ manuelschneid3r joined08:41
→ patarr joined08:42
← ShapeShifter499 left08:43
→ a_thakur joined08:43
← hahuang61 left08:45
← dumacdev left08:46
← fbwnd left08:46
← patarr left08:46
→ Tobbi joined08:47
← notebox left08:47
← MarioBranco left08:48
← no_gravity left08:48
→ clmsy joined08:51
← Goplat left08:53
→ venmx joined08:54
← svm_invictvs left08:54
→ geoid joined08:55
← Cabanossi left08:55
← t0by left08:55
→ Cabanossi joined08:55
→ Darcidride joined08:56
← CaptainHeavy_ left08:56
← jnavila left08:56
→ jnavila joined08:57
← venmx left08:59
← geoid left08:59
← dvaske left08:59
→ dvaske joined09:00
→ varo joined09:02
varo hello, can anyone tell me how to find out the last common commit for two diverged branches?09:03
→ delboy1978uk joined09:03
delboy1978uk how i can i check if my branch for a ticket i'm working on has been merged on another branch?09:04
kadoban varo: Sounds like man git merge-base09:04
gitinfo varo: the git-merge-base manpage is available at http://jk.gs/git-merge-base.html09:04
delboy1978uk i need to check if my branch S6920 has been merged into branch env-reference, how can i check this?09:06
osse delboy1978uk: git merge-base --is-ancestor S6920 env-reference09:06
delboy1978uk osse: you da man! thank you very much!09:06
bocaneri → Sauvin09:07
delboy1978uk should i get outputr for that? i got nothing09:07
→ miczac joined09:07
gitinfo set mode: +v09:08
→ geoid joined09:09
← zerow left09:09
kadoban delboy1978uk: It signals via exit code, slightly unfortunately. You can do git merge-base --is-ancestor S6920 env-reference && echo "yep" I suppose09:09
→ mischat joined09:10
← thebird left09:11
→ dnukem joined09:14
→ peterbecich joined09:15
delboy1978uk kadoban: i use zsh, so either get a green prompt or a red prompt. it was red both times i ran it09:15
← mischat left09:15
→ Rodya_ joined09:16
← Glooomy left09:18
→ thebope joined09:18
← masuberu left09:19
← _Vi left09:19
← peterbecich left09:20
← Rodya_ left09:20
← Atm0spher1c left09:21
→ ankit01ojha joined09:22
← thebope left09:23
→ Glooomy joined09:24
→ sbasso joined09:26
← delboy1978uk left09:26
→ Murii joined09:27
→ kexmex joined09:27
→ thebird joined09:28
→ jnewt joined09:29
← jungsubk left09:35
← de-facto left09:35
← alezandro left09:36
← pinkkis left09:36
← mehola left09:38
→ de-facto joined09:39
→ alezandro joined09:39
← sbasso left09:40
← sarri left09:43
← User458764 left09:43
→ octo8 joined09:44
octo8 Hello, i have a simple question about git webhooks, can you lend me a hand ? http://stackoverflow.com/questions/43065897/webhook-php-file-work-from-terminal-but-not-from-bitbucket09:44
← thebird left09:45
← aidalgol left09:47
→ afuentes joined09:47
← manuelschneid3r left09:49
← cdown left09:52
→ thebird joined09:52
→ Guest90 joined09:53
→ sarri joined09:53
← sarri left09:53
→ sarri joined09:53
varo kadoban: thanks, that was it09:53
← Cabanossi left09:54
← Guest90 left09:54
← kbeflo_ left09:55
→ no_gravity joined09:55
no_gravity Hello! In a .gitignore file, What do the lines "*" and "!.gitignore" mean?09:55
→ firebadam joined09:55
→ kbeflo_ joined09:55
→ Cabanossi joined09:56
← sunrunner20 left09:56
← kbeflo_ left09:56
→ YuGiOhJCJ joined09:56
→ kbeflo_ joined09:57
→ cdown joined09:57
← kbeflo_ left09:58
→ kbeflo_ joined09:58
tobiasvl no_gravity: man gitignore09:58
gitinfo no_gravity: the gitignore manpage is available at http://jk.gs/gitignore.html09:58
← kbeflo_ left09:58
tobiasvl no_gravity: * means ignore everything, !.gitignore means don't ignore .gitignore09:59
→ kbeflo_ joined09:59
← am55 left09:59
← theoceaniscool left10:00
← kbeflo_ left10:00
tolland ive lost a file in git somewhere, not sure if its in a stash or a branch, is there an option to grep/find through stash and branches?10:00
→ arobert joined10:00
→ kbeflo_ joined10:00
← kbeflo_ left10:01
→ sbasso joined10:01
→ kbeflo_ joined10:02
→ ferr1 joined10:02
→ ronskisika joined10:03
← Raging_Hog left10:03
→ kbeflo__ joined10:03
← Remramm left10:04
← aviraldg left10:04
← hiq[m] left10:04
← am2on left10:04
← dyce[m] left10:04
← flo[m] left10:04
← Elliott[m]1 left10:04
← M-meznak left10:04
← KevinMGranger left10:04
← monomon[m]1 left10:04
← Retropikzel[m] left10:04
← spinningarrow[m] left10:04
← unclechu left10:04
← logos[m] left10:04
← jascot[m] left10:04
← patrickr[m] left10:04
← elwan7[m] left10:04
← SpEcHiDe left10:04
← UncleCJ1 left10:04
← heftig left10:04
← saintaquinas[m] left10:04
← musicmatze[m] left10:04
← keks[m] left10:04
← dikiaap left10:04
← kbeflo__ left10:04
→ kbeflo__ joined10:05
osse tolland: git grep10:05
→ arobert_ joined10:05
osse tolland: with liberal use of git rev-list in a loop10:05
← no_gravity left10:06
gitinfo set mode: +v10:06
arobert_ Hello, i'm trying to install and configure A git server on Windows 2016 with SSH auth. I tried everything, but when i try my final git push (from my local computer to the remote) it's not working : I have this message : "fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists."10:06
Someone to help me ? :)10:06
→ govg joined10:06
→ Raging_Hog joined10:07
← ronskisika left10:07
← kbeflo_ left10:07
→ Assault__ joined10:08
← jameser left10:09
← MineCoins left10:09
→ mischat joined10:11
← bmahe left10:12
→ mikecmpbll joined10:12
← Darcidride left10:12
← miczac left10:12
→ delboy1978uk joined10:12
→ thebope joined10:12
← Assault_ left10:12
→ theoceaniscool joined10:13
delboy1978uk how do i resolve a conflict without editing, syaing, just use my version of the file?10:13
selckin i usually just tell me my mergetool to do that10:14
← cqi left10:14
← tvw left10:14
→ tvw joined10:15
osse delboy1978uk: git checkout --ours filename10:15
← acetakwas left10:15
← dnukem left10:16
delboy1978uk osse: thanks again! no idea how many times you've helped me now! If you're ever in Belgium, I'll buy you a beer! :-)10:16
→ peterbecich joined10:16
osse delboy1978uk: note that this will also pick your version even in the parts of the file that git was able to resolve10:16
also, I've been sober for ten years10:17
JUST KIDDING LOL10:17
→ acetakwas joined10:17
← de-facto left10:17
delboy1978uk lol10:17
← mischat left10:17
→ Rodya_ joined10:17
← thebope left10:17
← firebadam left10:19
→ de-facto joined10:20
→ zerow joined10:20
← peterbecich left10:20
→ borkr joined10:20
→ aviraldg joined10:21
← Rodya_ left10:21
→ pinkkis joined10:23
← Raging_Hog left10:24
→ Raging_Hog joined10:24
← raijin left10:24
← zerow left10:25
→ DARSCODE joined10:25
→ masuberu joined10:27
→ hahuang61 joined10:28
← DARSCODE left10:28
→ ronskisika joined10:29
← Raging_Hog left10:29
→ mischat joined10:29
← dsdeiz left10:30
← hahuang61 left10:33
← kbeflo__ left10:34
→ kbeflo__ joined10:34
→ raynold joined10:35
← kbeflo__ left10:35
→ kbeflo__ joined10:36
→ CheckDavid joined10:37
→ blackwind_123 joined10:37
← govg left10:38
→ ncthom91 joined10:38
← chipotle left10:40
→ Noodlewitt joined10:40
← ncthom91 left10:41
← nowhere_man left10:41
→ patarr joined10:43
→ Guest90 joined10:43
← jagob left10:43
→ govg joined10:45
← Andrew_K left10:46
→ Ryanar joined10:46
← Doginal left10:46
← delboy1978uk left10:47
← patarr left10:48
← waveclaw left10:48
← Glooomy left10:48
→ dendazen joined10:49
← Silenced left10:50
→ MineCoins joined10:51
← dendazen left10:52
← Assault__ left10:52
← kexmex left10:53
→ Assault__ joined10:53
← kbeflo__ left10:54
→ kbeflo__ joined10:54
→ kexmex joined10:57
← jrnieder left10:58
← kbeflo__ left10:58
→ kbeflo__ joined10:59
← kexmex left10:59
→ Glooomy joined10:59
→ cqi joined11:02
← YuGiOhJCJ left11:02
← sbasso left11:02
← navidr left11:06
→ netroxen joined11:06
← kristofferR left11:06
→ zerow joined11:06
→ thebope joined11:07
→ dimi1947 joined11:07
→ Lunatrius` joined11:07
← netj left11:07
→ netj joined11:07
← Lunatrius left11:08
Lunatrius` → Lunatrius11:08
→ Trpger joined11:09
← Trpger left11:09
← a3Dman left11:10
→ livingstn joined11:10
← askb left11:10
← livingstn left11:11
← thebope left11:12
→ jrnieder joined11:12
→ elsevero joined11:13
→ Andrew_K joined11:13
← elsevero left11:14
← govg left11:15
→ sbasso joined11:15
→ peacememories joined11:16
→ kexmex joined11:16
→ peterbecich joined11:17
→ Rodya_ joined11:18
→ Raging_Hog joined11:18
← ronskisika left11:19
← kexmex left11:21
← peterbecich left11:22
← Rodya_ left11:22
→ a3Dman joined11:23
→ mizu_no_oto joined11:23
← Guest90 left11:23
→ King_Hual joined11:25
← geoid left11:25
← Andrew_K left11:25
← cdown left11:25
→ Andrew_K joined11:26
→ geoid joined11:27
← geoid left11:29
← systemovich left11:31
→ kexmex joined11:31
→ systemovich joined11:32
→ Brski joined11:32
← octo8 left11:33
← sbasso left11:33
→ fission6 joined11:34
→ kbeflo_ joined11:35
→ Guest90 joined11:35
← theoceaniscool left11:36
← bouncy left11:36
← mikecmpbll left11:37
→ bouncy joined11:37
← ryxxed left11:37
← kbeflo__ left11:38
→ ryxxed joined11:38
→ DolphinDream joined11:40
← DolphinDream left11:41
→ User458764 joined11:41
→ kbeflo__ joined11:42
→ sbasso joined11:43
← kbeflo__ left11:44
→ kbeflo__ joined11:44
← kbeflo_ left11:45
→ SteffanW joined11:45
← mischat left11:46
← a3Dman left11:47
← scoobertron left11:47
→ LBV_User joined11:47
→ mischat joined11:48
→ chipotle joined11:48
→ scoobertron joined11:48
→ oskarkv joined11:48
→ maroloccio joined11:48
→ maxb joined11:48
→ a3Dman joined11:49
← cqi left11:51
← fakenerd left11:51
→ Sound joined11:52
→ waveclaw joined11:53
→ venmx joined11:53
→ kristofferR joined11:54
→ Darcidride joined11:54
→ wrouesnel joined11:54
→ mikecmpbll joined11:55
← fission6 left11:56
← andrew710 left11:57
→ nettoweb joined11:58
← venmx left11:58
← Raging_Hog left11:58
→ dsdeiz joined12:00
→ thebope joined12:01
arobert_ Hello, i'm trying to install and configure A git server on Windows 2016 with SSH auth. I tried everything, but when i try my final git push (from my local computer to the remote) it's not working : I have this message : "fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists."12:01
Someone to help me ?12:01
osse arobert_: make regular ssh work, then git will "Just Work"12:02
← eahmedshendy left12:02
→ jameser joined12:03
→ lacrymology joined12:03
→ King_Hual` joined12:03
← Guest90 left12:03
← Andrew_K left12:04
→ aax joined12:04
→ marianina8 joined12:04
← Noodlewitt left12:04
← aax left12:04
← King_Hual left12:05
← peacememories left12:05
← thebope left12:05
arobert_ osse > actually, when i do (from my client) a simple ssh <myname>@<dnshost> it's working properly ... Should i grant users on the remote repository (or something like that) ?12:06
osse arobert_: what is the url you try to push to =12:06
arobert_ "$ git remote -v origin robert@spsgit01:/c/Program Files/Git/repos/SQL.git (fetch) origin robert@spsgit01:/c/Program Files/Git/repos/SQL.git (push)"12:07
← xaa left12:07
osse and 'ssh robert@spsgit01' works ?12:07
→ Guest90 joined12:07
← kbeflo__ left12:07
→ kbeflo__ joined12:08
arobert_ osse > yes12:08
← Cabanossi left12:08
osse arobert_: and once your there, does ls '/c/Program Files/Git/repos/SQL.git' work ?12:09
arobert_ and /c/Program Files/Git/repos/SQL.get is a directory where i did a "git init --bare"12:09
→ peacememories joined12:09
arobert_ I think yes :12:10
robert@SPSGIT01 C:\Users\robert>ls '/c/Program Files/Git/repos/SQL.git' HEAD config description hooks info objects refs12:10
osse hmm12:10
arobert_ Could it be a chmod issue ?12:11
→ Cabanossi joined12:11
osse yes12:11
where did you do git init --bare from?12:11
within ssh? a different user?12:11
→ eroux joined12:12
arobert_ i did my "git init --bare" from git bash executed as administrator into this folder : '/c/Program Files/Git/repos/SQL.git'12:12
(I can delete it and try again)12:13
← xywbtu left12:13
← peacememories left12:13
osse try it from within the ssh session12:13
→ dglambert joined12:13
dglambert yo12:13
osse if that doesn't work, try it somewhere that doesn't have spaces12:13
arobert_ Ok i give it a try , thanks12:13
← Darcidride left12:13
← Ryanar left12:13
← yaewa left12:15
→ moei joined12:15
← Guest90 left12:16
→ Guest90 joined12:16
→ fedepad joined12:16
→ synthroid joined12:16
← dimi1947 left12:16
→ peterbecich joined12:18
← nettoweb left12:18
→ nowhere_man joined12:20
→ lmatteis joined12:22
← peterbecich left12:22
arobert_ osse > I tried with no space in "/c/git/SQL.git". I have the same issue (fatal: ''/c/git/SQL.git'' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists.)12:23
← jeffreylevesque left12:23
arobert_ (I did the init from my client computer on a SSH session12:23
← howdoi left12:23
arobert_ )12:23
← Guest90 left12:24
→ dvaske_ joined12:24
→ Guest90 joined12:24
← dvaske left12:26
← Guest90 left12:26
← marianina8 left12:26
→ marianina8 joined12:26
→ firebadam joined12:27
→ FilipNortic joined12:28
← Glooomy left12:28
← eroux left12:28
← Sound left12:29
→ hahuang61 joined12:29
→ Gloomy joined12:29
← MineCoins left12:30
← aavrug left12:31
← marianina8 left12:31
← hahuang61 left12:34
← firebadam left12:34
→ karols146 joined12:35
→ quinq joined12:36
→ Sound joined12:36
→ justanotheruser joined12:36
→ xaa joined12:37
→ fission6 joined12:37
→ freimatz joined12:37
← fission6 left12:38
→ Ryanar joined12:38
← Cabanossi left12:39
→ fission6 joined12:40
← Tatou left12:40
← thebird left12:41
→ Cabanossi joined12:41
→ paul424 joined12:41
→ jeffreylevesque joined12:42
→ buffal0 joined12:42
← sbasso left12:42
→ MineCoins joined12:43
→ brent__ joined12:43
→ patarr joined12:44
arobert_ osse > any idea for me ?12:44
osse arobert_: no12:44
ls -R the bare repo and check permissions12:45
arobert_ Ok nevermind :) Thanks any way :)12:45
quinq Hi, I'd like some advice on a merge situation.12:45
osse arobert_: nuke everything and do git init --bare --shared=world12:45
→ dendazen joined12:45
quinq I have currently two branches, master and newdev. I would like to swap those, but they have diverged a lot.12:45
ie: rename master to olddev, newdev to master, set HEAD to new master.12:45
osse arobert_: and finally do GIT_TRACE=1 git push from the local repo to see what commands are invoked12:45
quinq But I'm afraid doing so will break clones because now master is a different branch.12:45
→ saintaquinas[m] joined12:45
→ am2on joined12:45
→ heftig joined12:45
→ patrickr[m] joined12:45
→ Elliott[m]1 joined12:45
→ dyce[m] joined12:45
→ monomon[m] joined12:45
→ KevinMGranger joined12:45
→ UncleCJ joined12:45
→ jascot[m] joined12:45
→ dikiaap joined12:45
→ hiq[m] joined12:45
→ unclechu joined12:45
→ spinningarrow[m] joined12:45
→ Remramm joined12:45
→ SpEcHiDe joined12:45
→ flo[m] joined12:45
→ musicmatze[m] joined12:45
→ M-meznak joined12:45
→ keks[m] joined12:45
→ logos[m] joined12:45
→ elwan7[m] joined12:45
quinq Is there a way I could achieve that making it easy on distant clones (or maybe I'm doing it wrong)12:45
osse arobert_: but all of that is just investigation12:46
→ Retropikzel[m] joined12:46
← paul424 left12:46
→ fakenerd joined12:46
arobert_ Ok thanks osse, i try12:46
← blackwind_123 left12:47
← brent__ left12:48
← patarr left12:49
→ yehowyada joined12:50
← mizu_no_oto left12:50
→ thebird joined12:50
→ theoceaniscool joined12:52
← karols146 left12:52
→ dvaske__ joined12:53
→ UrsoBranco joined12:54
← dsdeiz left12:54
→ sbasso joined12:54
← dvaske_ left12:54
→ thebope joined12:55
→ Emperor_Earth_ joined12:56
→ ispn joined12:57
← Emperor_Earth left12:57
← Balliad left12:58
→ _Vi joined12:58
→ karols146 joined12:59
← thebope left12:59
→ ExoUNX joined13:00
→ Guest90 joined13:01
← qt-x left13:04
← CheckDavid left13:04
← bannakaffalatta left13:05
← Silmarilion left13:06
→ cdg joined13:07
← Guest90 left13:07
→ miczac joined13:09
← acetakwas left13:09
gitinfo set mode: +v13:10
← Cabanossi left13:10
→ cam27 joined13:10
→ Cabanossi joined13:11
→ muhannad____ joined13:11
→ regedit joined13:12
← overlord_tm left13:13
→ jungsubk joined13:14
← holodoc left13:15
→ sotoz joined13:16
← MineCoins left13:16
→ holodoc joined13:17
→ acetakwas joined13:18
→ peterbecich joined13:18
← xaa left13:19
→ Rodya_ joined13:19
← acetakwas left13:19
← fakenerd left13:20
← ayogi left13:20
→ acetakwas joined13:20
← miczac left13:21
← MonkOfCity left13:21
← acetakwas left13:22
← jungsubk left13:22
→ acetakwas joined13:22
← peterbecich left13:23
→ jeffreylevesque_ joined13:23
← Rodya_ left13:24
→ fakenerd joined13:24
→ CheckDavid joined13:27
← jeffreylevesque left13:27
← LeBlaaanc left13:27
→ gunnaro joined13:29
→ ekinmur joined13:29
← xanadu_ left13:30
→ chigang joined13:31
← thebird left13:32
← pietv left13:32
← karols146 left13:33
→ Dougie187 joined13:34
→ thebope joined13:35
← mostlybadfly left13:35
→ GodGinrai joined13:36
→ no_gravity joined13:36
← Murii left13:36
→ livingstn joined13:36
→ gugah joined13:36
no_gravity Is there a way to make "git diff" and "git log --patch" show differences within a line?13:36
And not just "-old line / +new line"?13:37
→ publio joined13:37
_ikke_ no_gravity: --color-words13:37
jast or --word-diff if you prefer less colours13:38
no_gravity Interesting.13:38
jast hmm, actually I guess the global colour settings affect that one, too13:38
rigid is there a way to debug git-http-backend ? I think I got some ENV vars wrong but i'm not sure which13:39
no_gravity It gets it somewhot wrong though13:39
← Cabanossi left13:39
jast --word-diff adds extra markers, --word-diff=color and --color-words (equivalent) do not13:39
no_gravity In a line where only a few chars were deleted, it thinks more got deleted and some of the same was reinserted.13:39
rigid my nginx error log says "no user/password was provided for basic authentication" which can't be true13:39
→ xanadu_ joined13:39
jast without knowing anything specific about nginx, that doesn't seem unusual13:40
← Ryanar left13:40
jast for instance, a browser's first attempt to access a 401-protected resource does not include a user/password, either13:40
→ Cabanossi joined13:41
→ visual joined13:41
visual hey guys13:41
← Assault__ left13:42
visual i come to you again with a question13:42
supposing i want to add a remote repository to my local project (that should be like 99% the same files as in the repo)13:42
rigid jast: well, when I take out all the CGI stuff and just autoindex the directory, the authentication succeeds. I think either user/pass is not forwarded to git-http-backend (although REMOTE_USER is passed) or something else is wrong. ?13:42
visual how would i go about it?13:42
→ shinnya joined13:42
visual git init, git add remote, git checkout, git push?13:43
← SteffanW left13:43
jast rigid: git-http-backend actually doesn't care about the user, it doesn't do authorization anyway13:43
→ Ryanar joined13:44
→ Isla_de_Muerte joined13:44
→ SteffanW joined13:44
rigid jast: ah ok. good to know.13:44
i'm trying again from scratch...13:44
← Ryanar left13:44
no_gravity visual: It sounds like you want to "git remote add origin ..."13:45
jast rigid: it does use that to disallow push to anonymous users by default... but if you always require authentication that doesn't actually ever happen :)13:45
visual no_gravity: yeap, what next?13:45
git fetch13:45
?13:45
no_gravity visual: Next what?13:45
jast visual: yes13:45
visual push the local files to the upstream (remote) repo13:46
jast git push -u origin master (if you're on the master branch, which is the default). the -u is to make Git remember to push to that particular remote, allowing you to leave out all of push's parameters in the future13:46
visual ok, tried git add .13:46
← sotoz left13:46
→ s2013 joined13:46
← NwS left13:46
jast once you have added and committed, of course13:46
if everything is already committed, you can skip straight to pushing13:47
→ kbs joined13:47
visual thanks, you're very helpful13:47
just did "git add"13:47
then "git status"13:47
and it shows a lot of files that *are already in the repo*, as "new file"13:47
why?13:47
no_gravity visual: To git, only what is in .git/ is "in the repo".13:48
→ jwsuiw joined13:48
visual alright, 2 questions then, doesnt git fetch place the remote into the .git ?13:48
and 2 - how come it doesnt show *all* the files as new then?13:48
no_gravity visual: fetch puts it into some magical place.13:48
visual: To put it into the "repo" you have to merge.13:49
visual oh boy13:49
no_gravity But I have the feeling the "new" files have nothing to do with the fetch.13:49
visual alright, so first issue "failed to push some refs.. to prevent you from losing history.. etc"13:49
muhannad____ → muhannad13:49
visual how do i go about mergin the thing??13:49
→ Ryanar joined13:49
visual (only one '?' :^) )13:50
→ bannakaffalatta joined13:50
→ tijensse joined13:50
no_gravity visual: Pushing in git is awkward, because of that I only pull and never push.13:50
Git was made by Linus to match his workflow. And that is pull based afaik.13:50
visual no_gravity: idk man, the "new" files ~ http://prntscr.com/ephcd3 ~, are copies of each other, shouldnt register as diff files13:51
no_gravity: oh boy!13:51
so there's no way around the merge?13:52
→ thebird joined13:52
no_gravity Can't say. I don't know your situation.13:52
visual what do you need to know?13:52
no_gravity Git is a set of low level tools that lets you manipulate special data structures.13:53
→ Gsham joined13:53
no_gravity If you want to build a version control workflow on top of these tools, be prepared to invest some serious time.13:53
→ pietv joined13:53
visual you're drifting into theory teritory there, mate13:53
qqx Pushing is only awkward when done to a non-bare repo.13:53
visual not trying to reinvent the wheel here, just trying to push some files to the repo and merge the diffs13:53
dont know how to do that :I13:54
qqx And personally I (almost) never pull.13:54
no_gravity qqx: yup13:54
→ sotoz joined13:54
→ Es0teric joined13:54
no_gravity For the sake of simplicty, I live without bare repos.13:54
jast not sure how that makes things simpler :P13:54
← dec0n left13:55
→ oxguy3 joined13:55
no_gravity Needs only half the number of concepts. Instead of push/pull normal/bare-repos, I only have pulls and repos.13:55
I don't even use branches.13:56
quinq Anybody kind enough to give me some hints about my question?13:56
jast well, if that's enough for you, great13:56
→ lavalamp joined13:56
no_gravity I for one am off for lunch.13:56
← no_gravity left13:56
jast quinq: I'm not seeing your question, can you repeat it?13:56
osse jast: increase $LINES :p13:56
quinq About an hour ago13:56
osse quinq: swapping the names of two branches will appear as a force-push to everyone else13:57
jast osse: this is already 1600 or so y pixels13:57
quinq Yes osse :/13:57
→ miczac joined13:57
quinq No way around that then?13:57
← systemovich left13:57
visual is force-push bad?13:57
→ YuGiOhJCJ joined13:57
jast for clones it's no problem... but updates are problematic13:57
gitinfo set mode: +v13:57
visual what's a rebase?13:57
_ikke_ visual: it's risky13:57
qqx No, although depending on the workflow that may not be much of an issue.13:57
jast visual: okay, one thing after another... :)13:57
→ systemovich joined13:58
osse visual: https://github.com/Osse/git-stuff/blob/master/rebase.txt13:58
quinq: i don't know of a painless way13:58
← lacrymology left13:58
jast visual: force push means you push an altered version of your history, with commits removed, re-created, re-ordered or anything like that. you start running into problem if someone tries to update their own copy of the history using 'git pull/merge', because then they create a mishmash of the two versions of history13:58
visual osse: thx man, but i dont get it13:58
does it merge the 2 (feature && master) branches, and then branches the master one again?13:59
qqx quinq: If you're using a pull request workflow having the main branch renamed may not be very awkward.13:59
osse visual: it puts one in front of the other13:59
← rscata left13:59
visual jast: wait, with **all** commits removed?13:59
qqx People should still be pushing to feature branches, and only need to change the target for pull requests.13:59
visual jast: i get it, fuck )13:59
quinq Yeah qqx, that was my backup solution13:59
visual so that's not an optio13:59
→ Jackneill joined13:59
visual alright so when there's a diff between the local and the remote, and you want to push the changes, how would you go about it?14:00
quinq But then I need to tell people to drop master and start using newdev brnch14:00
visual force-push is not an option :U14:00
quinq Err I'm not using “pull requests”14:01
← elinux left14:01
← livingstn left14:01
→ theiostream joined14:02
visual come on git wizards, pls help :')14:02
if you have the time14:02
→ zivester joined14:03
← zefferno left14:03
→ bannakaf_ joined14:04
osse visual: i don't understand the original question14:04
visual how do i push to the remote repo if there's unresolved conflicts between remote and local14:05
← miczac left14:05
osse either resolve or push to a different branch14:05
visual wait so if i push to a different branch, i can then merge the branches via gitlab, right?14:06
and checkout origin, and se-la-vie?14:06
osse if you get conflicts when merging I don't think gitlab can do the merge for you14:06
but you can try14:06
← jameser left14:06
visual manual merge through gitlab?14:06
← bannakaffalatta left14:06
visual alright, how would i go about resolving the conflicts without losing data?14:07
this so-called "merge"14:07
→ Rodya_ joined14:07
← GodGinrai left14:07
→ GodGinrai joined14:07
osse how did you get the conflicts in the first place?14:07
visual in the help it says i can perform "git pull", but wont pull overwrite local changes?14:07
→ SirFunk joined14:07
osse no it won't14:07
it will merge14:07
pull = fetch + merge14:07
GodGinrai ^ this14:08
→ menip joined14:08
→ howdoi joined14:08
visual alright, lets give it a shot14:08
GodGinrai although I would never suggest forcing a merge w/ pull14:08
→ patarr joined14:08
GodGinrai it would be better to fetch and merge in a seperate branch14:08
then, once you have resolved conflicts, you can FF merge your important branch14:09
osse GodGinrai: not sure we're there yet :p14:09
GodGinrai osse: well, once he pulls and creates the conflicts, he's past that14:09
visual http://prntscr.com/ephm4014:09
fucking great :I14:10
osse hmm14:10
visual right, pusing to a different branch and merging through gitlab it is then :^I14:10
GodGinrai that's a lot of conflicts14:10
visual that's not even 1/4'th of it14:10
osse looks like you're merging two repos with no common history here14:10
visual dont have the space to screenshot all ))14:10
osse: upgraded framework14:10
but it's like 99% it there14:11
qqx visual: I'd say that having your framework checked in is the issue.14:11
→ bongjovi joined14:11
visual what do you mean "checked in "?14:11
GodGinrai visual: he means tracked14:12
→ ws2k3 joined14:12
visual http://prntscr.com/ephnf214:12
>14:12
fucking git14:12
→ Murii joined14:12
qqx No version control system is going to handle that in any nice way.14:13
GodGinrai qqx: I don't know if that is really the issue, because even if the whole framework is updated, it shouldn't cause conflicts in all of the files unless you had made changes in all of those files that didn't exist in the history of the upstream14:13
→ dimi1947 joined14:13
← azerus left14:13
GodGinrai or vice versa14:13
depending on where that update was made14:13
quinq visual, paste text instead of taking pictures14:13
→ AaronMT joined14:13
→ foist_ joined14:13
visual quinq: easy14:14
GodGinrai visual: `git merge --abort`14:14
visual Automatic merge failed; fix conflicts and then commit the result.14:14
[email@hidden.address] [~/public_html/ric]# git branch 'upgrade sync'14:14
fatal: 'upgrade sync' is not a valid branch name.14:14
[email@hidden.address] [~/public_html/ric]# git branch 'upgrade_sync'14:14
[email@hidden.address] [~/public_html/ric]# git add .14:14
[email@hidden.address] [~/public_html/ric]# git commit '1st commit'14:14
fatal: cannot do a partial commit during a merge.14:14
quinq No, not here…14:14
visual [email@hidden.address] [~/public_html/ric]#14:14
oops14:14
GodGinrai visual: use a pastebin14:14
visual wrong paste, sorry14:14
quinq Use a pasting service14:14
visual i know14:14
http://kopy.io/5uKzg14:14
i know, sorry man, i said wrong paste14:14
GodGinrai visual: `git merge --abort` <-- this is how you exit a partial merge14:15
which is the state you are left in when you have conflicts14:15
visual GodGinrai: it didnt work14:15
http://kopy.io/84kyM14:15
→ Some_Person joined14:15
← dvaske__ left14:16
Some_Person I did something that caused a file to be renamed. How can I get this recognized as a move in git instead of a delete and an add?14:16
GodGinrai oh, that's weird14:16
→ LeBlaaanc joined14:16
visual Some_Person: you kill yourself aparently14:16
there's no easier way when it comes to git14:16
quinq Some_Person, git mv14:16
osse Some_Person: it makes no difference. it's only pretty printing.14:16
GodGinrai well, you can always just use git-reset as well. osse: would `git reset --hard HEAD` do the trick?14:17
osse Some_Person: if you git add the new path and git rm the old path then it's probably ok14:17
← dimi1947 left14:17
Some_Person quinq: A bit too late for git mv -- I renamed a project in Visual Studio, and that caused the file to be moved14:17
osse GodGinrai: do you mean git merge --abort?14:17
→ marianina8 joined14:17
← xanadu_ left14:17
← foist_ left14:18
← YuGiOhJCJ left14:18
→ ionl joined14:18
← ionl left14:19
→ azerus joined14:19
← matoro left14:19
→ peterbecich joined14:19
← thebird left14:19
quinq Some_Person, mv newfile oldfile && git mv oldfile newfile14:19
Not sure that's the best way to go about it, but it'll work14:20
→ andrew710 joined14:20
visual http://prntscr.com/ephrew14:20
GodGinrai osse: see his paste. `git merge --abort` didn't work14:20
visual ^this is why git is one of the shittiest things ever created14:20
quinq visual, don't use it14:20
visual quinq: i wish i couldnt14:20
→ Eou joined14:20
← Es0teric left14:20
quinq Then you can14:21
visual the fact that it's necessary doesnt make it any less shitty14:21
GodGinrai visual: this is really not the case. I am fairly certain that a fair majority of your issues here have been caused by a lack of understanding how git works14:21
visual it's like cleaning toilets, nobody fucking likes to do it, but it has to be done14:21
quinq There are two ways to go about it, 1/learn it 2/solve why it's imposed to you14:21
Complaining about it won't solve anything14:22
visual GodGinrai: look man, i've been a dev for 10 years, and every single time when it comes to git, it's always problematic14:22
every single fucking time14:22
← tvw left14:22
qqx Complaining about it here isn't going to help.14:22
← oxguy3 left14:22
visual helps to vent a little14:22
Some_Person osse: Thanks, add and rm seems to have worked; I guess it auto detected that it's a rename14:23
GodGinrai visual: probably because you've never taken the time to sit down and learn it rather than just trying to deal with git's "problems" whenever you run into an issue.14:23
→ Es0teric joined14:23
← sunri5e left14:23
qqx Some_Person: It always auto detects renames, git only keeps track of snapshots not how changes are made.14:24
→ oxguy3 joined14:24
← peterbecich left14:24
visual dude it's a problem when you do it by gitlab's instruction and it fails14:24
→ zerow_ joined14:24
GodGinrai visual: this can happen with literally any software. No software is impervious to user error14:25
→ sunri5e joined14:25
yarekt Lol, you just doing this to flame... in #git? visual14:25
visual it's not a user error if they have a proposed solution for it14:25
right?14:25
← a_thakur left14:26
visual it means it's a common occurence that happens, and they have a way of bypassing that issue14:26
but that way doesnt work14:26
who's fault is it then?14:26
yarekt: no man14:26
yarekt Almost everyone here uses git for work and are proficient in it that it doesn't impede their workflow14:26
GodGinrai visual: that's not a solution, that's steps you were supposed to perform. Which *would* work btw14:26
visual trying to solve it14:26
GodGinrai visual: you are just complaining about having to do it.14:26
visual GodGinrai: dude have you even looked at the screen14:26
http://prnt.sc/ephrew14:26
← ekinmur left14:26
visual they *didnt* work14:26
GodGinrai visual: it says "merge branch and fix any conflicts that come up"14:26
visual i did do them man, they didnt work14:26
yarekt Having said that, git has *terribly* named command and concepts, but theres nothing that can be done about it because these concepts are already embedded in people's skills14:27
→ xanadu_ joined14:27
GodGinrai visual: you got conflicts, you must fix them.14:27
visual GodGinrai: Step 3. Merge the branch and fix any conflicts that come up14:27
→ ekinmur_ joined14:27
yarekt visual: But simply learning to use the software by understanding what happens inside will increase your level of competence with it until it helps you with your work instead of hindering14:27
visual [email@hidden.address] [~/public_html/ric]# git merge --no-ff upgrade_sync14:27
Already up-to-date.14:27
whoop-de-doo14:28
← mischat left14:28
← masuberu left14:28
visual yarekt: you can't logically understand a sotware that isnt bound by logic, can you14:28
← zerow left14:28
yarekt But the attitude of "Look #git, git is shit, because I don't want to invest time learning!"14:28
visual we should add branching to svn and burn git14:28
← sunri5e left14:28
yarekt ... ins't going to get you anywhere14:28
jast that looks like you finished the merge earlier14:28
yarekt fin14:29
← User458764 left14:29
← kbs left14:29
visual dude this attitude is a normal response to "if you'd learn how it works / follow the instructions, you wouldnt have problems"14:29
and i have a clear example when taht's not the case :I14:29
visual rant over14:29
→ User458764 joined14:30
yarekt Let me read up the whole of scrollback then14:30
visual jast: but if i'd have finished the merge, shouldnt it be able to push to remote instead of complaining that i'd lose history?14:30
→ hahuang61 joined14:30
jast that output from 'git merge --abort' is rather strange. maybe you have a fairly old version of Git, from before that option was added?14:30
there is that, yeah...14:30
→ masuberu joined14:31
GodGinrai visual: the problem you are running into there is that you never pulled the latest master before performing that merge14:31
jast it depends on what you merged and where you're pushing, though14:31
yarekt Yea, nah, i'm not doing that. visual, it looks like you are using this channel like the manual, and ignoring people's advice14:31
visual git version 1.7.114:31
GodGinrai thus, your update to the remote master is not a fastforward update14:31
visual GodGinrai: i did14:31
jast yeah, I think that's from before14:31
next time you can try 'git reset --merge' instead which I think does the same thing14:31
GodGinrai visual: you didn't anywhere in that terminal in the screenshot you keep linking14:32
← theiostream left14:32
jast if that fails, too, there's always 'git reset --hard' to destroy all evidence of everything ever, but it eliminates all uncommitted changes, too14:32
→ sunri5e joined14:32
visual i posted a screen earlier, and a peep here said "that's a lot of conflicts", remember?14:32
jast anyway, getting back to your situation. for instance, merging upgrade_sync into master doesn't mean that pushing master to the remote master will necessarily go through cleanly, e.g. if the remote master has some changes of its own that you haven't merged yet14:32
visual jast: yeah, or push --force :^), but that's.. i mean come on14:32
quinq visual, do you know about git status?14:32
→ theiostream joined14:33
← wrouesnel left14:33
visual quinq: yeah, checked status, shows unmerged files14:33
← pietv left14:33
noteness_ → noteness14:34
jast plus uncommitted/unstaged changes and such :)14:34
visual jast: how does that make any sense, if you merged the 2, wouldnt the HEAD be at the new commit that was created by the merge?14:34
← guampa left14:34
← LeBlaaanc left14:35
← Gloomy left14:35
visual yeah, back to the question14:35
← hahuang61 left14:35
→ LeBlaaanc joined14:35
visual how do you merge locally?14:35
>fatal: 'merge' is not possible because you have unmerged files.14:35
>you cant solve this problem, because this problem isnt solved14:36
only in git14:36
jast it means you can't start a new merge because an old merge is still in progress. have you tried the old 'git reset --merge' that I mentioned, in the meantime?14:36
I don't remember the exact version in which each option was introduced, but worth a try I guess14:37
→ buzzLightBeer joined14:38
→ manuelschneid3r joined14:38
→ maarhart joined14:38
← theiostream left14:40
visual well14:40
git reset --merge14:40
then git merge origin origin says "fatal 'origin' does not point to a commit'14:40
:^)14:40
→ molgrum joined14:40
← molgrum left14:40
→ molgrum joined14:40
← menip left14:41
← maarhart left14:41
← andrew710 left14:41
→ guampa joined14:41
← TomyWork left14:42
→ eroux joined14:42
quinq visual, start reading manpages14:42
← lb1c left14:42
← eroux left14:42
quinq What do you think merging origin with origin means?14:42
← Murii left14:43
jast visual: usually origin is the name of a remote, not the same of a branch. you may have wanted 'origin/master' or something like that...14:43
→ fbwnd joined14:44
→ MarioBranco joined14:45
visual if i switch to a branch sync_upgrade and try merge master, it says it's up-to-date14:45
→ Fallen0223 joined14:45
← gunnaro left14:45
visual jast: thx btw, that clarified it a little14:45
so i think what happened was i added the changes to the local master branch, and that's why it says they're up-to-date14:46
GodGinrai visual: that's probably because your master probably already successfully merged those changes at some point. What does `git diff master sync_upgrade` return?14:47
visual can i fetch remote master into a temporary branch, and then try to merge those?14:47
GodGinrai: returns nothing14:47
GodGinrai visual: yea, from master: `git checkout -b master_merge; git fetch origin/master; git merge origin/master`14:48
← _August_ left14:48
← leeN left14:48
GodGinrai visual: assuming you are trying to merge your master with the remote master14:48
→ _August_ joined14:48
GodGinrai after you resolve conflicts in master_merge, you can `git checkout master; git merge master_merge`14:48
well, after you resolve conflicts and complete the merge14:49
visual *sigh*14:49
http://kopy.io/nNvzH14:49
→ DaveTaboola joined14:49
visual why why14:49
← masuberu left14:49
GodGinrai visual: sorry, my fault14:49
I gave you the wrong syntax for fetch14:49
also14:50
you need to merge origin/master14:50
not master14:50
visual oh no worries mate, i wrote right syntax (fetch origin master) after that14:50
merge origin/master?14:50
GodGinrai master is your local, origin/master is the remote branch14:50
yup14:50
quinq visual, you would have wasted less of your (and people trying to help you) time learning git instead of asking to type in commands for you14:50
visual what do i learn specifically?14:51
every register move and every stack change that happens inside?14:51
quinq Yes, exactly14:52
visual i know how to pull, push and branch, why would that no be enough to make a simple merge?14:52
quinq Well, now you need to learn merge14:52
What's origin, what's a clone, what's a remote14:52
visual im trying to, but clearly the docs ( https://git-scm.com/docs/git-merge ) arent helpful14:52
quinq Anyway, good luck :)14:52
visual thanks14:52
you too14:52
jast the manpages have a tendency to be a little on the technical side14:53
if you ever want to take the time to read a proper book about it, there's always !book14:53
gitinfo 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 !parable14:53
← thallada left14:54
jast and if you like looking at pictures of data structures, !gcs is worth a look, too, to get a better idea of what all these operations do on a structural level14:54
gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html14:54
→ thallada joined14:54
visual quinq: why are you even here? to tell people they need to disassemble git to understand how to make a merge?14:54
→ vuoto joined14:55
visual jast: thanks man, i'll try to find the time for that14:55
→ eroux joined14:55
← User458764 left14:55
← Eou left14:55
visual doesnt seem like a necessary time investment for such a simple concept :I14:55
read an entire book i mean14:55
← eroux left14:56
→ eroux joined14:56
→ beaky joined14:56
beaky hello14:56
quinq visual, you said that, my answer was sarcasm obviously14:56
You can have a look at https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes14:57
← eroux left14:57
beaky how do i pick particular diffs per file instead of commiting everything i've changed in a file14:57
← blackpajamas left14:57
→ eroux joined14:57
visual beaky: git diff other_branch path/to/file14:57
GodGinrai visual: yea, I highly recommend the Pro Git book. It explains things really well and teaches the basics that are needed14:57
visual literally doing it rn )14:57
→ Ice_Strike joined14:57
beaky ah thanks14:57
→ leeN joined14:57
Ice_Strike Can you do mulitple "git add ." and then do git commit later?14:58
_ikke_ yes14:58
visual yeah14:58
GodGinrai Ice_Strike: sure14:58
kadoban beaky: Usually 'git add -p somefile' or if you've already staged, 'git commit -p' exists, but I never use it.14:58
← muhannad left14:58
← eroux left14:58
beaky thanks i will give those a try14:58
Ice_Strike cool14:58
visual GodGinrai: alright, and quinq will do, seems like helful (and succint !! )info14:58
← chele left14:58
beaky i love git it is so awesome i can do anything14:59
→ eroux joined14:59
beaky (rather than leave my work in a messed-up state)14:59
← eroux left14:59
visual yeah? try upgrading your app/framework, and pushing that :^)14:59
jast beaky: git add -p (or git commit -p to save one step) is my absolute favourite tool for that kind of thing15:01
→ roelmonn_ joined15:01
→ eblip joined15:01
→ Levin^ joined15:01
Levin^ hello there15:01
I'm really confused from what I researched on internet15:02
← ekinmur_ left15:02
→ User458764 joined15:02
jast Levin^: hi :) let's see if we can clear it up, then!15:02
quinq Levin^, you should be careful about what you search on the Internet15:02
→ ekinmur joined15:02
visual WHAT THE FUC15:02
git edited my files15:02
it added <<<<< HEAD, etc to my files15:03
jast those are called conflict markers15:03
Levin^ so I'll ask here. git refused my push claiming I need to pull first. but I'm scared it will pull and rewrite my other files edited locally beforehand15:03
→ jimklo joined15:03
→ math-alpha joined15:03
← math-alpha left15:03
← marianina8 left15:03
visual http://kopy.io/eJGgs15:03
← Es0teric left15:03
jast visual: during a merge that's not at all unusual. it means both sides of the merge have made changes to the same parts of some files, you can manually edit the files to resolve the conflicts, or use a merge tool to help you.15:03
Levin^ is there a command to check what it will pull to my local machine?15:04
jast of course if you accidentally add and commit these conflict markers, that's not good, but before that it's the normal state of things, and every other VCS that supports merging does the same thing, in fact :)15:04
← kbeflo__ left15:04
quinq Levin^, you can branch before-hand15:04
and work there15:04
→ dave0x6d joined15:04
← roelmonnens left15:05
kadoban Levin^: First do 'git fetch', then you can check your favorite way(s) the differences between your local branch and the remote tracking branch. Then you can merge/rebase/other as you like.15:05
jast Levin^: pull is actually a shorthand for fetch (to download the changes) and merge (to apply them). you can run 'git fetch' individually and then look at and compare yourbranch and origin/yourbranch15:05
→ mischat joined15:05
← roelmonn_ left15:05
Levin^ oh15:05
→ kbeflo joined15:05
← kbeflo left15:05
kadoban Levin^: As a shortcut, @{u} refers to the "upstream" branch, if one is set.15:06
visual jast: no man, it fucked up royally15:06
look15:06
http://kopy.io/eJGgs15:06
→ overlord_tm joined15:06
visual it aded shit like >>>>origin/master to my fucking *files*15:06
kadoban If you're not sure how to compare branches, gitk --all is a decent start, or !lol if you're into that. There's a few more specific log options that might help as well15:06
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all15:06
Levin^ can I run the fetch command without commitment?15:07
kadoban visual: Welcome to exactly what jast described above.15:07
jast visual: that looks awfully like one generation of conflict markers got committed in an earlier, screwed up merge15:07
visual FUUUUUUUUUUUUUUU15:07
how do i rever15:07
t15:07
→ kbeflo joined15:07
jast it happens if someone is not paying attention while merging15:07
→ eroux joined15:07
Levin^ I mean, does it require me to run another command to "confirm" something after the fetch?15:07
jast the bad news is that reverting merges is a bit of a can of worms15:07
!revert_merge15:07
gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt15:07
← thiago left15:07
← SteffanW left15:07
kadoban Levin^: 'git fetch' is *quite* hard to hurt anything, all it does is update your local view of the remote branches. Or in other words, it updates the "remote tracking branches"15:07
← eroux left15:08
→ maxpss joined15:08
→ sspssptt joined15:08
← MutantMa_ left15:08
kadoban It won't mess with your local branches, or the files in your working directory, or the index or etc.15:08
Levin^ hmm15:08
→ DarkPsydeLord joined15:09
visual FUUUUUUCK IT ADDED THEM TO MASTER BRANCH15:09
Levin^ I dont't understand the "local view"15:09
visual: does it have lots and lots of <<<< stuff?15:09
visual Levin^: http://kopy.io/eJGgs15:10
→ Es0teric joined15:10
visual not lots, but to lots of files15:10
hundreds15:10
god fucking damn it15:10
Levin^ oh sad15:10
kadoban Levin^: Are you familiar with branches like origin/master ?15:10
Levin^ do a find/replace at least :/15:10
← bgerber left15:10
Levin^ kadoban: I'm learning15:10
didn't reach that knowledge yet15:11
kadoban Those are the "remote tracking branches". Those are what 'git fetch' updates. Along with tags, if you tell it to.15:11
← mischat left15:11
← ronin_work left15:11
Levin^ I know they exist, but I didn't learn how to use it15:11
← kbeflo left15:11
visual btw, with that link, when fixing a fauly merge15:11
i cant fucking revert because "you have unmerged files"15:11
kadoban origin/master is essentially your local view of what the master branch looks like at the remote "origin". Git doesn't do network stuff unless you tell it to, so that's its way of being able to "see" remote things without having to always go to the network.15:11
→ ronin_work joined15:11
→ plasticle joined15:11
→ eroux joined15:12
visual lesson learned: fuck git15:12
copy-paste it is15:12
← eroux left15:12
Levin^ hm15:12
← sbasso left15:13
← zerow_ left15:13
→ zerow joined15:13
nedbat visual: you probably don't want to hear this, but you're going to have to understand it at some point: git didn't add those markers to your master branch.15:14
← synthroid left15:14
visual nedbat: who did then?15:14
i did? copy pasted these markers into hundreds of files myself just to complain here?15:14
nedbat visual: you did when you used "git add" and "git commit" on a file with merge conflict markers in them.15:14
visual is that what you're suggesting?15:14
nedbat visual: git added the markers, to show you where you needed to resolve conflicts.15:14
then you didn't resolve them, added the files, and now they are in the files.15:14
visual in what world does adding data to files constitute as a viable way to show changes?15:15
nedbat visual: svn does this also, with the same markers.15:15
visual not create a .tmp file, not keep them in memory, but *editing the fucking files*15:15
← thebope left15:15
jast in all version controls systems that ever became popular15:15
← ekinmur left15:15
visual that's fucking retarded15:15
jast including cvs, svn, mercurial, tla, bzr, darcs15:15
nedbat visual: you're going to have to deal with this.15:15
← ronin_work left15:15
→ eroux joined15:15
nedbat visual: your attitude seems to be, "I don't want to understand git, it should be simpler!"15:16
visual that's like me opening up windows/system32, and overwriting some files so i can remember which files i'd like to use at some point15:16
← eroux left15:16
← plasticle left15:16
visual instead of creating a list of the files i need15:16
jast a list of files would be pretty worthless15:16
→ paws_ joined15:16
→ plasticle joined15:16
Levin^ visual: it's sad, but you'll have to spend your time to find and solve each of the conflicts yourself, I think15:16
→ AnimeLife joined15:16
nedbat visual: you should take a deep breath, and commit to learning git, or you should stop using git.15:16
visual yeah? well a list of files wouldnt fuck up your application15:16
jast that wouldn't tell you which sections of the file are affected, and I'm sure you don't want to manually compare 40000 lines of two copies of a file15:16
nedbat visual: you are grabbing the knife by the blade, and getting angry at the knife.15:17
jast the merge didn't fuck up your application15:17
Levin^ but isn't there a way to do a revert to a certain commit code?15:17
→ kbeflo joined15:17
jast at some point you went, "hey, let's just assume everything magically did what I think it did", and cast the temporary conflict markers into stone15:17
← utrack_ left15:17
Levin^ I readed about that15:17
← Brski left15:17
visual nedbat: that's why i joined to ask few simple questions, hwo do i resolve a bunch of conflicts15:17
jast Levin^: reverts are a bit special when merges are involved15:17
visual help from here resulted in fucking up the whole application15:17
nice15:17
top of the morning to you lad15:17
nedbat visual: yes, but maybe you should really wait until you are done ranting, and interested to learn.15:17
visual god fucking damn it15:17
quinq Yeah, we did it on purpose15:17
Because everything is other's fault15:18
jast nobody told you to just 'git add' everything without looking at it, you know15:18
AnimeLife hello guys, I need help, how do I begin going through souce code of git, I am able to checkout and build, but where do I go next? is there a developer mannual or any arch design showcasing modules15:18
→ eroux joined15:18
← ThomasLocke left15:18
← eroux left15:18
visual i didnt know git marks files as "edited" by fucking adding it to them15:18
jast anyway, I need to leave, good luck getting this cleaned up...15:18
nedbat visual: what did you think "resolve the conflicts" meant?15:19
← snits left15:19
GodGinrai visual: the point of adding the data to the files is three-fold. 1) Since code from both branches are there, you can easily choose one or the other, or concoct a merger of the two by hand. 2) Thanks to the markers, it is easy to find where you need to resolve the conflicts 3) By adding the markers, it prevents you from ignoring the conflicts. You either need to finish the merge or give up on it to15:19
canton7 (visual is a known troll from another channel. Not saying he's trolling now necessarily, but bear the possibility in mind)15:19
GodGinrai proceed with your work.15:19
visual that's like OS's adding "opened on 1.1.2017" to Word Documents *inside* the files15:19
canton7: yeah no, i was fucking around in c#15:19
← ponyofdeath left15:19
→ fahadash joined15:19
visual this shit's serious15:19
nedbat visual: or, it's like the way Word will let you merge documents together, by showing you both changes inside Word....15:19
→ snits joined15:19
AnimeLife hello guys, I need help, how do I begin going through souce code of git, I am able to checkout and build, but where do I go next? is there a developer mannual or any arch design showcasing modules15:20
GodGinrai nedbat: Word can merge documents? wut15:20
visual instead of using an external file? what if there's a power surge in the middle of the thing, you're now left with hundreds of fucked files :I15:20
→ peterbecich joined15:20
nedbat visual: what did you think "resolve the conflicts" meant?15:20
→ eroux joined15:20
jast no, Git retains all versions of the files until you conclude the merge15:20
if you do, incorrectly, it's on you15:20
GodGinrai AnimeLife: are you trying to view git's source? Or your project's source using git?15:20
AnimeLife GodGineai, yes I am trying to view git's source15:21
visual i did merging before, it shows the "+' and the "-" and you either choose which file you want to use, or you choose which "chunks" of files you want to use15:21
← eroux left15:21
→ jagob joined15:21
→ tang^ joined15:22
→ utrack joined15:22
visual alright15:22
GodGinrai visual: not really. If the merge gets corrupted somehow, there are a number of ways to abort it15:22
visual GodGinrai: in a perfect world, you'd be right15:22
i tried that twice, remember?15:22
both times it fucked up15:22
← alezandro left15:22
visual "cant abort because of unresolved merge", then some other error15:22
GodGinrai visual: you never did `git reset --hard HEAD`, tho', did you?15:23
visual i did reset, and abort15:23
→ eroux joined15:23
visual no i didnt do it with the --hard HEAD, you never suggested that :I15:23
kadoban visual: Typing the wrong commands quite often doesn't have the desired effect. Even if your intent is clear to you. That doesn't mean it's impossible.15:23
GodGinrai yea, I did15:23
AnimeLife GodGinrai, yes I am trying to view git's source. sorry for typo15:23
← eroux left15:23
GodGinrai it was the first thing I suggested when you said `git merge --abort` didn't work15:23
visual see, even this guy's trying to rewrite git because its shit ))15:23
← King_Hual` left15:23
visual right15:23
well, too late for could'ves, right15:23
AnimeLife lol15:24
→ King_Hual joined15:24
← King_Hual left15:24
→ King_Hual joined15:24
← clmsy left15:24
nedbat visual: it's not too late, git still has the history of all the files.15:24
visual is there a pull --force?15:24
→ patarr_ joined15:24
kadoban visual: Probably not as you mean15:24
What would it do?15:24
AnimeLife Anyone?15:25
visual edit and remove (if necessary) all the files that are different locally15:25
nedbat AnimeLife: what are you trying to change in git?15:25
visual you know?15:25
← peterbecich left15:25
kadoban AnimeLife: This channel isn't primarily git developers, you might have to wait a few.15:25
visual nedbat: >fatal: 'revert' is not possible because you have unmerged files.15:25
AnimeLife nedbat: I am working on their microprojects for gsoc15:26
→ marianina8 joined15:26
kadoban visual: That's not what pull is for. If you just want the state of files and the history to be the same as a remote, that's a different command. If you just want the state of files, but *not* the history to be the same, that's yet another command. Neither one is pull.15:26
nedbat visual: i don't know specifically how to fix that problem. I know that your current style of "stomp around, and try things I half-understand" isn't going to work.15:26
visual sure it will15:27
:^)15:27
AnimeLife kadoban: thnx, can is their any channel for git devs?15:27
visual rm -rf; git pull {branch} and then re-upgrade the thing15:27
← patarr left15:27
→ latenite joined15:27
visual should've done it an hour ago instead of fucking it up like this15:27
nedbat visual: ok, do that now then, and put us all out of your misery :)15:27
visual nedbat: done15:27
)15:27
fuck git15:27
← buzzLightBeer left15:28
latenite Hi folks, why does git not recognize my new 'test' directory? https://gist.github.com/anonymous/8b44cd34554cd5d0c7d1dbf07d4d187a15:28
visual thanks for your patience everybody15:28
kadoban AnimeLife: #git-devel exists, but I don't know how active it is. Looks pretty small15:28
→ marsmellow joined15:28
→ sgen joined15:28
→ steeze joined15:28
perlpilot latenite: If it's empty git won't pay attention to it.15:29
latenite perlpilot, I just cloned it. There are many files...15:29
perlpilot, what do you mean by "empty"?15:29
→ Glooomy joined15:29
← kexmex left15:30
perlpilot latenite: your paste shows "mkdir test" but not that you put any files into it15:30
nedbat AnimeLife: i would expect gsoc to provide you with a contact, or some support.15:30
→ eroux joined15:30
kadoban latenite: You added the directory 'test', but there's no files in it. Git doesn't consider an empty directory as "content" worth tracking.15:30
latenite perlpilot, right, I need an empty directory like this.15:30
← eroux left15:30
AnimeLife thnx guys, I will try these channels15:30
kadoban I'm not really clear why this is, since it considers an empty file as content, but it is what it is.15:30
latenite why does git not honor that?15:30
perlpilot latenite: a common technique is to stick a .gitignore file in the dir.15:31
→ bgerber joined15:31
nedbat latenite: why is the directory there if it is empty? The answer to that would be a good thing to put into a README in the directory.15:31
← sspssptt left15:31
← marianina8 left15:31
→ eroux joined15:31
visual for all of you saying git is so sleek15:31
→ ash_workz joined15:31
perlpilot latenite: also, why do you "need" an empty dir?15:31
→ sbasso joined15:32
visual run git & svn side by side, and try to sync those :^)15:32
← eroux left15:32
latenite so when my project tree has some empty directories....they will not be part of the git repo, IF I dont put a .gitignore in them?15:32
kadoban visual: This thread of conversation seems overdone already. Now you really are starting to sound like a troll.15:32
visual i know experienced devs who quit because of that15:32
perlpilot latenite: if the dirs have no files, git won't bother with them.15:32
← MarioBranco left15:32
← varo left15:32
→ eroux joined15:32
latenite so I have to make a 'find-empty-dir-and-add-gitignore' script then..?15:32
perlpilot latenite: why do you need empty dirs?15:33
← finalbeta left15:33
→ MarioBranco joined15:33
← maxpss left15:33
latenite perlpilot, for future project layout15:33
← eroux left15:33
visual kadoban: yeah well your interpretation of it is irelevant, it was in part due to your suggestions that i lost a a day's work, isnt it?15:33
→ finalbeta joined15:33
perlpilot latenite: just add those dirs to git when you actually put files in them15:34
→ jn__ joined15:34
latenite perlpilot, that absurdes the idea of "FUTURE layout"15:35
why does git have this policy?15:35
kadoban visual: I *highly* doubt that I told you to type any command that hurt anything. If you can show where I did, that'd be interesting information to me. But regardless, you're always responsible for understanding what people suggest before using their suggestions.15:35
→ sspssptt joined15:35
perlpilot latenite: I don't know really. I've always thought it odd.15:35
← sspssptt left15:36
← imrg left15:36
latenite perlpilot, me too15:36
then why not change it15:36
nedbat this from the guy who was banned from another channel for suggesting a cloaked "rm -rf *" when someone needed help...15:36
visual if you understood every suggestion, you wouldnt've asked for help, would you?15:36
latenite #bug report?15:36
kadoban visual: And my interpretation is indeed relevant; I am one of the people entrusted with keeping this channel functioning smoothly. Nobody minds if you want to make some snide comments, but continuing it won't be a fruitful conversation, you're not going to convince everyone to use svn.15:36
→ mazert_ joined15:36
perlpilot visual: people are responsible for their own actions. period. The onus of understanding what you're doing is still on you.15:37
→ dimi1947 joined15:37
kadoban visual: You are presumably not a robot. You can take people's suggestions, and if you don't understand them, look up what they do ... or ask (usually after trying to look it up).15:37
visual i wasnt trying to convince to use svn, im saying running those 2 side by side and trying to keep them synced made experienced devs quit15:37
→ brent__ joined15:37
← chardan left15:37
← sgen left15:37
← jstein left15:38
visual whatever man, you dont expect people who dont understand the question to attempt to give answers, thus not always spending time on researching every answer15:38
if it doesnt look like a rm -rf, why would they purposely mislead you15:39
← chigang left15:39
latenite perlpilot, nedbat, kadoban thank you for helping.15:39
visual if it's a bad answer by accident, usually others correct it15:39
latenite :D15:39
→ ResidentBiscuit joined15:39
→ maarhart joined15:39
visual latenite: yeah, check to see if your files dont contain <<<<<HEAD and shit like that15:39
→ kexmex joined15:39
kadoban visual: There are commands that are both dangerous and useful.15:40
perlpilot latenite: good luck (though, find empty dirs and add .gitignore is an easy script if you have to write it :)15:40
visual yeah well, there's no point in arguing15:40
i've asked my boss and a a coleague to stay here past closing time (40+ minutes now) so i can fix this mistake :^)15:40
im gonna get back to it15:40
kadoban Good luck.15:40
visual you too15:40
← User458764 left15:40
mar77i hmm. how can I merge part of a different branch onto which I cherry-picked?15:41
← brent__ left15:41
→ brent__ joined15:41
→ YuGiOhJCJ joined15:41
← maarhart left15:42
kadoban mar77i: Can you explain a bit more what you're attempting to acheive? Not really clear to me.15:42
mar77i like master has A, B, C, D, E, F, G branch A, B, C and E off of master. I'd like to put branch into a state where master was on F.15:43
→ nixjdm_ joined15:43
→ theiostream joined15:43
mar77i and... including D.15:43
← nixjdm_ left15:44
kadoban mar77i: I believe that's just 'git checkout otherbranch' and then 'git merge F', where F is any way you want to refer to that commit. Though make a !backup just in case I'm still misunderstanding you.15:44
gitinfo mar77i: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups15:44
→ cagomez joined15:44
← cagomez left15:45
→ cagomez_ joined15:45
← MarioBranco left15:45
kadoban mar77i: You can refer to it by shaid, or something like master~1 if you're comfortable with those, etc.15:45
mar77i hmm. how comes I get conflicts for that, then?15:45
← drodger left15:45
kadoban Well, conflicts are a fairly expected part of merging sometimes. Do some of them not look like they should be happening?15:46
I've found !eek helpful before, if you're not that comfortable with merging yet15:46
gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II15:46
quinq Humm, is there a reason “git shortlog --date='format:%Y' --format='format:%ad'” isn't printing only the commit year?15:47
mar77i strangely, though, all of them are of the form <<<HEAD\n===\n...\n>>>15:48
kadoban They're entirely whitespace you mean?15:48
mar77i no, not whitespace. they're completely empty.15:48
← elect left15:48
→ tyreld joined15:49
kadoban The whole conflict is empty? That's ... weird. Or you mean only one side?15:49
→ User458764 joined15:49
mar77i one side.15:49
which I find rather remarkable, really.15:50
→ eroux joined15:50
kadoban I think it means that one side deleted that section and the other side changed that section, at least usually.15:50
← eroux left15:51
→ drodger joined15:51
mar77i now i have a case where the clearly old part is on one side an the clearly "new" part is on the other.15:53
→ synthroid joined15:53
→ eroux joined15:54
mar77i ah, I understand. there's this merge strategies thing and the default seems rather awkward.15:54
← eroux left15:54
→ eroux joined15:55
kadoban The default is generally okay, but yeah there are other strategies. Be careful they actually give you what you want though, it's easy to just get it to give you *a* result, not a useful result.15:55
← eroux left15:55
perlpilot graphical merge tools help greatly15:56
Levin^ visual: I think you should do as I'm doing15:57
to read a book about git15:57
the basics15:57
my book is explaining how to deal with merge conflicts15:57
→ orbyt_ joined15:58
Levin^ maybe you can find a good book in your language15:58
mar77i yup. the result I'm looking for treats the current branch as behind from master, but it seems "theirs" isn't even a valid strategy?15:58
→ Doros joined15:58
→ eroux joined15:59
latenite Hi folks, I have added a hook script that simply appends the date to a file. THen I have pushed to the master. But the hook did not run. What am I missing?15:59
kadoban mar77i: If this is too much of a mess, you can try just cherry-picking the two commits you're missing. Though it may (will?) result in the same thing.15:59
_ikke_ What hook did you create and where did you create it?15:59
latenite: ^15:59
mar77i turns out I was reading the manual the wrong way.15:59
← eroux left15:59
→ dreiss joined15:59
← jnavila left15:59
→ freimatz_ joined15:59
→ eroux joined16:00
Levin^ visual: and when I'm scared on some git command, all I do is to backup all my files so if there's a mistake, you can revert it16:00
← jwsuiw left16:00
← eroux left16:00
Levin^ but I'm learning it's troublesome to backup and restore files like that, it seems git doesn't like it16:00
hmmm16:01
→ thebope joined16:01
→ hahuang61 joined16:01
← oxguy3 left16:01
latenite _ikke_, this is what I have done: https://gist.github.com/anonymous/df3920a645cee3cdf88762a36aaa2f9416:01
Levin^ it seems git detects your massive changes and blames everything is not sync16:01
_ikke_ latenite: (what a long promt)16:02
→ thiago joined16:02
latenite _ikke_, sorry I have not set it. I might have to change that later...16:02
_ikke_ latenite: git hooks have predefined names, you cannot just put a file with a random name in the hooks dir16:02
perlpilot latenite: which hook calls write-date.bash?16:02
kadoban latenite: Hooks have to be named a specific thing, which corresponds to when git will run them.16:02
latenite oh like post-receive16:03
so I 'mv write-date.bash post-receive'16:03
_ikke_ post receive runs on the server side16:03
← freimatz left16:03
mar77i ah, I managed to simplify it a lot by specifying --strategy=recursive -X theirs. now it was only confused about the file adds, which created the same file twice with different ~derp suffixes.16:04
latenite _ikke_, want this to run on the serverside, yes16:04
_ikke_ ok16:04
latenite: and you need to make sure it's executable16:04
kadoban mar77i: Sounds like an improvement. Do make sure at the end that the result still makes sense though, and includes all the stuff you think it should.16:05
← thebope left16:05
perlpilot latenite: why do you want to write the date to a file each time someone pushes changes?16:05
← Doros left16:05
→ Doros joined16:05
latenite _ikke_, renaming did the trick. thank you16:06
kadoban I kind of assume that's just a test to figure out hooks16:06
← hahuang61 left16:06
latenite perlpilot, just to test. Actually I want to start an ansible job up on a receive.16:06
← guampa left16:06
perlpilot kadoban: one would hope. I just like to be sure :)16:06
latenite kadoban, indeed :D16:06
→ oxguy3 joined16:06
kadoban :)16:06
_ikke_ Make sure it runs asyncronously16:06
← ferr1 left16:06
→ porsche944 joined16:07
latenite _ikke_, asyncronously? could you explain what you mean by that?16:07
→ Doros_ joined16:07
← Doros_ left16:07
→ robotroll joined16:08
→ freimatz joined16:08
← Doros left16:08
→ Constant544 joined16:09
mar77i ...weird stuff.16:09
→ jstein_ joined16:09
kadoban latenite: I believe that git will make the client wait while the hook runs, so that any output can be directed to the client. Which is usually not what you want to happen, so you probably want to set it up so the hook does a very small amount of work that later triggers an automatic thing to do the long-running task.16:10
← manuelschneid3r left16:10
latenite kadoban, ah ok, sure I'll do that. Thank you.16:11
→ eroux joined16:12
jstein_ → jstein16:12
← Constant544 left16:12
← fbwnd left16:12
← sbasso left16:12
→ Constant544 joined16:12
← eroux left16:12
→ ronin_work joined16:12
→ sbasso joined16:13
mar77i hmm. seems I was using cherry-pick for too long. the branches aren't considered the same by git at all.16:13
← kegster left16:13
→ lhcrkd joined16:13
mar77i that is, by a lot of the recent history, but going 15 into the complete history.16:13
latenite Is there a way to tell the hook which files have changed? I'd like to write an email and add file names of changed files ...16:13
mar77i 15%.16:13
GodGinrai latenite: I'm pretty sure the files changed are passed to the hooks16:14
← acetakwas left16:14
GodGinrai latenite: which hook are you looking at?16:14
latenite GodGinrai, post-receive16:14
→ durham joined16:15
→ madewokherd joined16:15
→ eroux joined16:15
→ kegster joined16:16
← eroux left16:16
← cam27 left16:17
← sbasso left16:17
← sotoz left16:17
GodGinrai latenite: it looks like post-receive is given a list of the updated refs, so you would just need to use those to find the changed files. I'm not sure exactly what command you would need to pass these refs into to get that list of files, tho'. Maybe one of the gits here can help you on that matter.16:19
latenite GodGinrai, maybe I just use bash and parse $@ and see.... :D16:20
→ eroux joined16:20
latenite GodGinrai, thank you for pointing the right direction.16:20
GodGinrai np16:20
← Es0teric left16:20
← eroux left16:21
→ peterbecich joined16:21
← lhcrkd left16:21
→ buzzLightBeer joined16:22
← batrick left16:25
→ mischat joined16:25
← peterbecich left16:25
→ MathNeverEnds joined16:25
← buzzLightBeer left16:26
← kristofferR left16:26
→ eroux joined16:26
← Rodya_ left16:26
← eroux left16:27
← vuoto left16:27
→ scoobert1on joined16:27
← fission6 left16:27
→ eroux joined16:27
← mda1 left16:27
→ Rodya_ joined16:28
← eroux left16:28
→ manuelschneid3r joined16:28
→ mda1 joined16:28
← dhollinger left16:28
→ Rodya__ joined16:28
→ buzzLightBeer joined16:29
← oxguy3 left16:29
→ kristofferR joined16:29
← nowhere_man left16:30
← IRQ` left16:30
latenite Using ${@} in a post-receive script does not yield the filenames that where changed. https://gist.github.com/anonymous/f9bdca945f97ae2095a05901db040fa216:30
← buzzLightBeer left16:31
latenite How can I get the names / paths of the files changed in a post-receive hook?16:31
← scoobertron left16:31
← kurkale6ka left16:31
→ metachr0n joined16:32
← Rodya_ left16:32
→ batrick joined16:33
→ Es0teric joined16:33
← Fallen0223 left16:34
perlpilot latenite: normal git commands should work.16:34
latenite: something like: git diff --name-only COMMIT16:35
← Rodya__ left16:35
→ eahmedshendy joined16:36
kadoban Be a bit careful if this is important. It's ambiguous what "changed" means. If I change a file in one commit and revert that change in the next, was that file changed?16:36
latenite perlpilot, kadoban (yes it was changed twice ... thank for the hint)16:38
https://gist.github.com/anonymous/01b36c90c9837229c7e87aca37c79af216:38
I get this ^^ but no list of files16:38
← mikecmpbll left16:38
← Ryanar left16:39
← freimatz_ left16:39
GodGinrai latenite: I told you, it gives you a list of refs, not files16:39
latenite GodGinrai, there was nothing in ${@}, no files names not refs.16:40
GodGinrai weird16:40
← Constant544 left16:41
← User458764 left16:41
_ikke_ latenite: you have to read stdin16:41
It doesn't get the refs as arguments16:41
latenite GodGinrai, see my last paste https://gist.github.com/anonymous/f9bdca945f97ae2095a05901db040fa216:41
_ikke_ latenite: post-receive gets the refs via stdin16:43
latenite _ikke_, so I do 'cat /dev/stdin' in post-receive?16:43
→ boombatower joined16:43
_ikke_ "It takes no arguments, but gets the same information as the pre-receive hook does on its standard input."16:43
← LBV_User left16:43
_ikke_ for example16:43
← orbyt_ left16:44
← jstein left16:44
← holodoc left16:44
_ikke_ while read commit_old commit_new ref; do echo $commit_old $commit_new $ref; done16:45
latenite _ikke_, great16:45
https://gist.github.com/anonymous/dfb688ed1cd721b1dfbd0472fb91a83f16:45
there we go16:45
no what are "refs" and how to I work with them? Its a new term to me.16:45
→ gareppa joined16:45
_ikke_ ref is the name for branches, tags etc16:45
→ TomyLobo2 joined16:46
← ronin_work left16:46
→ nowhere_man joined16:46
→ holodoc joined16:46
_ikke_ a branch is a type of ref16:47
latenite 'git show' seems to give me all the info I want in the email. nice16:48
_ikke_ git show just shows the changes of a single commit16:49
if you were to push more commits, than you would miss information16:49
← marsmellow left16:49
→ sbasso joined16:51
← flaviodesousa left16:52
latenite _ikke_, true it only shows the last commit16:53
https://gist.github.com/anonymous/bfbf517161c07508bdc4f18cfe393eae16:53
thats bad... hmm16:53
is there a command to show the changes between to pushs?16:53
kadoban git show on a commit indeed just shows information about that particular commit. You probably need to figure out the previous commit that a ref pointed to and then use something like log or something lower level.16:54
→ octo8 joined16:54
← octo8 left16:54
→ octo8 joined16:54
→ thebope joined16:55
← gareppa left16:55
→ oxguy3 joined16:55
latenite kadoban, that sounds doable but tedious. I was hoping git comes with a command to show diffs16:56
← dreiss left16:56
octo8 today I asked a question about webhooks, I figured out the solution, http://stackoverflow.com/questions/43065897/webhook-php-file-work-from-terminal-but-not-from-bitbucket .... I would like to either make a video tutorial or write an article, which is best ?16:56
GodGinrai octo8: I prefer articles over videos. I tend to absorb better from articles, plus you can actually copy the examples instead of being angry that you can't copy what you are seeing. ;)16:56
kadoban latenite: Not a lot of hookish stuff is very pretty16:57
→ dhollinger joined16:57
octo8 GodGinrai: but what is more viral ?16:57
GodGinrai octo8: dunno. would either of them be all that viral?16:57
← Es0teric left16:58
← g0d355__ left16:58
octo8 GodGinrai: which one is better to show for future employers ?16:58
_ikke_ latenite: why not git diff <old> <new>16:58
→ freimatz3 joined16:58
GodGinrai octo8: I would assume an article would be better to show future employers. Unless you are looking for a job that has video creation as one of your job responsibilities16:59
latenite _ikke_, sounds great, if I would only knew what <old> <new> referes to.16:59
← Sound left16:59
_ikke_ latenite: man githooks explains what data you get from stdin16:59
gitinfo latenite: the githooks manpage is available at http://jk.gs/githooks.html16:59
→ MarioBranco joined16:59
octo8 GodGinrai: some people say if i show my face, then employers would know more about me...16:59
i don't know... i will make an article I think17:00
ok, now i go back to watching a whole series about git, to be more familiar with it17:00
GodGinrai octo8: showing your face is for your interviews, IMO. Show up in person (or do a remote video chat) and be cordial17:00
← thebope left17:01
→ t0by joined17:01
← t0by left17:01
→ t0by joined17:01
→ hahuang61 joined17:01
→ svm_invictvs joined17:01
← freimatz left17:02
← salamanderrake left17:02
← shinnya left17:02
→ livingstn joined17:03
← livingstn left17:03
← eahmedshendy left17:03
quinq Have a good day17:03
← quinq left17:03
→ salamanderrake joined17:03
→ fission6 joined17:04
latenite _ikke_, git diff <old> <new> indeed gives me the files and also what changed. But now I am spoiled from the 'git show' output and want info about the user, date as well17:04
where is that stored?17:04
Oh I see in 'git show <last>'17:05
→ kpease joined17:05
latenite cool that pretty much does it.17:06
→ salamanderrake_ joined17:06
latenite _ikke_, great thank you.17:06
→ matoro joined17:06
_ikke_ git show <last> still shows one commit..17:06
→ xmj joined17:06
xmj moin17:06
_ikke_ latenite: Don't you want git log --patch <old>..<new>?17:06
xmj is there a way to partially revert a commit, that is, restore two files but not restore the rest?17:06
← sbasso left17:07
_ikke_ xmj: git checkout <commit> <file1> <file2>17:07
xmj: This will overwrite any local changes to those files17:07
xmj ah interesting17:07
← theiostream left17:07
xmj _ikke_: can i use paths as well?17:07
→ plicki joined17:07
_ikke_ sure17:08
→ PaoloP joined17:08
→ User458764 joined17:08
← kpease left17:08
← salamanderrake left17:09
→ peterbecich joined17:09
→ fbwnd joined17:09
← Levin^ left17:10
→ faLUCE joined17:10
faLUCE Hello. After doing: git add file1; git commit -m "comment1"; git add file2; git commit -m "comment2"; <--- how can I create two patches from these commits and squash them into one patch file?17:11
← salamanderrake_ left17:11
← PaoloP left17:11
← ejnahc_ left17:11
← mischat left17:11
← thallada left17:12
→ salamanderrake joined17:12
kadoban faLUCE: 'git diff HEAD~2 > blah.patch' probably?17:12
→ ejnahc joined17:12
← jstimm left17:12
← hahuang61 left17:14
← CheckDavid left17:14
→ hahuang65 joined17:14
→ al-damiri joined17:15
← Vector_Gorgoth left17:16
faLUCE kadoban: thanks17:16
← fedepad left17:16
latenite _ikke_, git log --patch <old>..<new> shows way more that what happend between last and second to last push.17:16
how come?17:16
→ thallada joined17:18
← cvcxc__ left17:19
← netroxen left17:20
→ bitmod joined17:20
→ sword joined17:20
→ Fallen0223 joined17:20
← peterbecich left17:22
← octo8 left17:22
← svm_invictvs left17:24
← cagomez_ left17:25
→ cagomez joined17:26
← bongjovi left17:26
→ dsantiag_ joined17:26
→ oleo joined17:28
→ Ryanar joined17:29
← nd left17:29
→ cliluw joined17:29
→ livingstn joined17:29
→ peterbecich joined17:29
← dsantiago left17:29
→ [twisti] joined17:30
→ nd- joined17:30
← fission6 left17:30
← cagomez left17:30
[twisti] is it possible to have two 'origin' upstreams, or to chain upstreams somehow ? i would like to use my own gitlab instance for my projects, but it would be nice if they would be transparently 'backed up' to github or bitbucket17:31
← matoro left17:32
→ gunnaro joined17:33
← Kaisyu left17:34
← peterbecich left17:35
→ bannakaffalatta joined17:35
→ dreiss joined17:36
← fbwnd left17:36
→ Sound joined17:37
← marcogmonteiro left17:37
sonOfRa git remote set-url --push --add [email@hidden.address]17:37
origin between --push17:37
[twisti] and then when i push, it will be pushed to both ?17:38
→ svm_invictvs joined17:38
→ rominronin joined17:38
← Cabanossi left17:38
← bannakaf_ left17:38
→ matoro joined17:39
sonOfRa Yup17:39
→ Cabanossi joined17:41
← m1dnight_ left17:42
← finalbeta left17:42
→ bannakaf_ joined17:42
→ ronin_work joined17:43
→ ayogi joined17:43
→ fedepad joined17:43
← bannakaffalatta left17:44
→ miczac joined17:44
gitinfo set mode: +v17:44
← peepsalot left17:45
→ raspado joined17:46
→ thebope joined17:49
← oleo left17:49
← moei left17:50
→ kasual joined17:50
[twisti] cool, thanks17:51
← livingstn left17:51
→ peterbecich joined17:51
→ livingstn joined17:52
→ Rodya_ joined17:53
← thebope left17:53
← cliluw left17:53
← chipotle left17:54
← plasticle left17:55
→ cliluw joined17:56
← diogenese left17:56
→ plasticle joined17:56
→ oleo joined17:56
→ c0c0 joined17:57
← afuentes left17:57
→ kpease joined17:58
→ m1dnight_ joined18:00
→ mischat joined18:00
← mischat left18:00
→ mischat joined18:01
→ procrasinator joined18:01
procrasinator Upstream user deleting, creating branches, how to update that in my repo?18:01
← theoceaniscool left18:02
← prg3 left18:02
procrasinator How to keep it synced?18:02
Now I have 12 branches he has only 818:02
← svm_invictvs left18:02
→ Levin^ joined18:03
ojacobson procrasinator: `git fetch --prune <remote>` or `git remote update --prune <remote>` will update your view of the <remote>'s branches18:03
← kpease left18:04
→ svm_invictvs joined18:04
procrasinator I did git fetch --all --prune, then git push --all, the upstream is update but not mine. the branches he had they still in my side18:05
→ satifant joined18:05
→ prg3 joined18:05
← plasticle left18:06
→ kpease joined18:06
← dimi1947 left18:06
→ karols146 joined18:07
← paws_ left18:07
_ikke_ git fetch and git push will never remove local branches18:07
you have to manually remove them18:07
→ plasticle joined18:08
→ theoceaniscool joined18:09
→ b100s joined18:09
b100s hi2all18:09
can i search in git in all branches for last year for exact file ? : )18:09
i mean, i want to find commits on some file in all branches in all repo18:10
← dmc left18:10
← kpease left18:10
procrasinator _ikke_: when do i need to run this command? `git push origin '+refs/remotes/upstream/*:refs/heads/*'`18:11
→ fission6 joined18:11
procrasinator or git push --all 'll work to push new remote branches18:11
b100s better to restrict it by date, but not necessarily18:11
→ dmc joined18:12
→ ertesx joined18:12
→ orbyt_ joined18:12
← darkbit left18:14
b100s solved; 'git log --all' is what i need18:14
→ Sasazuka joined18:14
→ Es0teric joined18:15
← ertes left18:15
ertesx → ertes18:15
→ theiostream joined18:15
→ Jackneilll joined18:16
← borkr left18:16
→ dionysus69 joined18:16
dionysus69 hey all18:16
karols146 dionysus69: o/18:17
→ Cassiopaya joined18:17
← ronin_work left18:17
dionysus69 I am having trouble with my partner. so I made a pull request but meanwhile my partner had commits. the pull overwrote my partners commits. how can he merge my changes without deleting his own?18:17
→ diogenese joined18:18
→ hashtagstrashtag joined18:18
← brent__ left18:18
← Jackneill left18:19
← theiostream left18:19
→ theiostream joined18:20
→ brent__ joined18:20
← Jackneilll left18:20
← karols146 left18:23
← orbyt_ left18:25
← peterbecich left18:25
← _August_ left18:25
← theoceaniscool left18:26
← livingstn left18:26
→ snowalpaca joined18:26
← cdg left18:26
_ikke_ A normal merge does not overwrite changes18:27
→ peterbecich joined18:27
← AaronMT left18:28
← snowalpaca left18:29
← steeze left18:29
→ karols146 joined18:30
← leeN left18:30
→ dvaske joined18:31
← mischat left18:31
← enckse left18:31
→ dvaske_ joined18:32
dglambert Hey, is it possible to figure out which setup I choose when installing Git for Windows?18:32
→ orbyt_ joined18:33
dglambert I'm talking specifically about the Adjusting your PATH environment setp18:33
→ peterbec` joined18:33
← peterbecich left18:33
→ enckse joined18:35
← b100s left18:35
_ikke_ dglambert: I'd use the default18:35
unless you want to change what cmd does18:35
dglambert I'm trying to compare to existing install18:35
← dvaske left18:35
→ gunnaro_ joined18:36
← procrasinator left18:37
← miczac left18:37
← gunnaro left18:38
dglambert http://imgur.com/a/0CzCx18:38
Top is the old install, bottom is my install18:38
_ikke_ How old is the old install?18:39
dglambert 2.10 I think18:39
I installed 2.1218:39
← kasual left18:39
← Sasazuka left18:39
→ moei joined18:40
dglambert 2.11.118:40
I installed 2.12.218:40
→ Silenced joined18:40
dglambert So not very old18:40
→ Sasazuka joined18:41
→ roby10 joined18:41
_ikke_ ok18:41
→ Noldorin joined18:42
dglambert Maybe its just the logo18:42
→ Disavowed joined18:42
dglambert I was just wondering if the original install differed in the setup of the integration with windows18:42
→ mischat joined18:43
_ikke_ It should not matter too much18:43
→ thebope joined18:43
← theiostream left18:44
← peterbec` left18:44
← GT4066 left18:44
→ theiostream joined18:44
dglambert this is what I am talking about in the setup, http://imgur.com/a/HjCNo18:44
← mischat left18:44
dglambert I think I will test it by using the find and sort commands18:45
→ mischat joined18:45
_ikke_ The default should be good18:45
→ snowalpaca joined18:48
← thebope left18:48
← imack left18:49
→ buzzLightBeer joined18:49
← Levin^ left18:49
→ Cavallari joined18:49
← snowalpaca left18:50
← matoro left18:50
← theiostream left18:50
→ Darren_ joined18:53
← roby10 left18:53
→ govg joined18:54
← Fallen0223 left18:55
→ nd joined18:57
→ p4trix joined18:57
→ peterbec` joined18:57
Disavowed Morning all. In the event that I want to merge a feature branch back into master but keep all the changes from my feature branch if there are any merge conflicts, what is the idiomatic approach? Generally I'll just delete master and `git co -b master` but something tells me this is a horrifying thing to do!18:58
→ Gustavo6046 joined18:59
→ m0viefreak joined18:59
GodGinrai Disavowed: what you are describing is not a merge, but a replacement18:59
Disavowed: a merge would include changes that exist in master19:00
← nd- left19:00
→ weijunli joined19:00
perlpilot Disavowed: Sounds like you want `git checkout master; git merge -s theirs feature-branch` though19:00
weijunli i have a super slow connection and everytime i try to clone a big project i end up with this error19:01
error: RPC failed; curl 56 SSLRead() return error -36 | 98.00 KiB/s19:01
→ snowalpaca joined19:01
weijunli there's a way to prevent that or there's no way around and i need to improve my connection somehow19:01
GodGinrai perlpilot: the beginning of his comment sounded like that. But then he literally described what he would usually do which was completely replacing the branch...19:01
→ paws_ joined19:01
→ muhannad joined19:01
perlpilot GodGinrai: yeah, I'm sort of assuming that was a mistake he's trying to learn from19:03
← AstralStorm left19:03
→ gunnaro joined19:04
→ matoro joined19:04
→ roger_raymond joined19:04
← gunnaro_ left19:05
← mischat left19:05
Disavowed I thought theirs was the correct merge strategy too, but it doesn't work for my version of git (2.10.0): Available merge strategies are: octopus ours recursive resolve subtree.19:06
→ theiostream joined19:06
← ayogi left19:06
← Silenced left19:06
← rogerraymond left19:06
→ superflat joined19:07
Some_Person I need to split a folder way down in the folder heirachy of a repo into its own separate repo. What's the best way to go about this?19:07
it's like 4 subfolders deep19:07
GodGinrai Disavowed: then wouldn't you just merge the other way using ours, then FF merge master?19:07
→ Silenced joined19:07
← peterbec` left19:09
→ MonkOfCity joined19:09
← Gsham left19:09
← warthog9 left19:10
→ Sammitch joined19:10
Disavowed I did the first part, and I guess stumbled on the FF merge master. It seemed a roundabout way to do it, but if that's the correct strategy in that instance, then I'll do that in future.19:10
What happened to 'theirs' anyway? I see it from time to time but I'm guessing it got deprecated?19:11
→ jstimm joined19:11
Some_Person I've been trying but messed it up each time so far19:11
→ AstralStorm joined19:11
← ujjain left19:12
Sammitch we've got a [bad] workflow that results in a number of clean, but abandoned working trees which is beginning to cause problems with disk/inode usage. is there a way to remove all files in a clean working tree, but have them restorable via a simple "git pull"?19:12
← theiostream left19:12
→ yqt joined19:12
← superflat left19:13
← karols146 left19:13
← GodGinrai left19:13
← c0c0 left19:13
_ikke_ what do you mean in this case with working trees? do you mean commits, or are you copying the files somewhere?19:14
→ ronin_work joined19:14
→ steeze joined19:15
← fedepad left19:15
Sammitch basically every user has the repo cloned to their homedir19:15
→ peterbec` joined19:15
→ warthog9 joined19:15
→ sotoz joined19:15
_ikke_ that's quite normal19:16
Some_Person I've been trying using git subtree, but for some reason, I only seem to get some of the history19:17
→ Brski joined19:17
Some_Person Crap... I think I know why. The subdirectory these files are in was renamed at one point19:18
← Cavallari left19:18
→ ujjain joined19:18
← ujjain left19:18
→ ujjain joined19:18
Some_Person How can I preserve the history despite that?19:18
Sammitch _ikke_: it's not abnormal, but we also don't need 50 copies of the same code when 49 have no modifications and might never be touched again19:18
→ thebird joined19:18
Some_Person any ideas?19:19
← rominronin left19:19
→ peepsalot joined19:20
→ theiostream joined19:20
→ Gsham joined19:21
← Sasazuka left19:21
← peterbec` left19:22
→ kkreate joined19:22
← ujjain left19:22
gitinfo set mode: +v19:23
→ Sasazuka joined19:23
→ tvw joined19:24
→ imack joined19:25
_ikke_ Some_Person: Sorry, too little experience with subtree merge19:25
Sammitch: git can share files between repos (but not the working tree itself)19:26
Sammitch: But I'm not really sure what you want to achieve for the rest19:26
← MonkOfCity left19:27
← theiostream left19:27
→ ujjain joined19:27
← ujjain left19:27
→ ujjain joined19:27
← Disavowed left19:28
← Brski left19:28
← _Vi left19:29
kkreate Hello, I currently work with php files on remote server with NetBeans connected to ftp. Want to use something like the distributed version control described in https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control. Since I work on remote files, can I manage git on that server from within NetBeans? I don't really want to create a local repo that pushes to servers local repo which then pushes to the remote repo server. The19:29
step.19:29
← robotroll left19:30
→ kbeflo_ joined19:30
Sammitch I have a lot of working trees sucking up disk space, I want to: 1. not have them do that. 2. not break workflow [too much], eg: the standard `git pull` at loging gives the user their up-to-date WT as usual19:30
→ cagomez joined19:31
→ sgen joined19:31
_ikke_ Sammitch: git pull is not a good command to 'get an up-to-date' WT19:31
← kbeflo_ left19:31
_ikke_ Sammitch: but then you might want to look into git's features regarding sharing objects19:32
← Random832 left19:32
→ fedepad joined19:32
_ikke_ Sammitch: not that this is just about the repositories, not about the WTs19:33
← imack left19:33
→ Random832 joined19:33
Sammitch if I were concerned about consolidating the git metadata I'd have asked about that19:34
dglambert Hey I am trying to get the mv command to move and rename a folder19:34
← raynold left19:34
→ aidalgol joined19:34
dglambert I have C:\P2\Web, but I want to move \Web to C:\P219:34
I keep trying, but no dice19:34
I'm trying to do it from within P219:35
Sammitch dglambert: move the files, not the folder. git doesn't really track folders, but rather the paths to tracked files.19:35
dglambert oh ok19:35
mv is a bash command though19:36
Sammitch git mv19:36
_ikke_ Sammitch: you could just remove the working tree files. Then a "git checkout ." would restore them again19:36
dglambert Web is outside of git19:36
← kkreate left19:36
dglambert my git starts inside of \Web19:36
← snowalpaca left19:36
→ kkreate joined19:36
→ snowalpaca joined19:36
gitinfo set mode: +v19:37
kkreate I would connect to remote repository in NetBeans, push changes there and then set up some sort of webhook to push to the server but since I do debugging it would require me to debug in one project and work in another...19:37
→ ahrs joined19:37
dglambert if I do something like; mv \Web\* \Web\..19:37
kkreate pull to the server *19:37
← kegster left19:37
dglambert IS that what you mean Sammitch19:37
→ thebope joined19:37
_ikke_ I'm not sure netbeans supports working on a remote server19:38
← Rodya_ left19:39
← Cabanossi left19:39
→ MonkOfCity joined19:39
_ikke_ kkreate: My workflow is the opposite. I work remotely, and have a script (based on rync) sync my files remotely19:39
sorry19:39
I work locally19:39
have git locally19:39
→ Rodya_ joined19:40
← oxguy3 left19:40
→ Cabanossi joined19:41
← jstimm left19:41
← ujjain left19:41
← rokups left19:42
← thebope left19:42
← cagomez left19:42
→ paul424 joined19:43
→ daivyk joined19:43
← Es0teric left19:45
→ cagomez joined19:45
kkreate That would be fine, and then my local git could push to the remote git repo. Then it is implied the server has the same files as reflected in the remote repo. (so long as no one ever makes changes on the server without pushing the repo) I guess what I was hoping for is some way to have the the "local" git repo on the server and be able to manage it from either ide or ssh.19:45
→ berndj joined19:46
← plasticle left19:47
← MonkOfCity left19:47
← t0by left19:48
← ronin_work left19:48
→ theiostream joined19:48
→ robattila256 joined19:49
→ benjy joined19:51
← thebird left19:51
→ Es0teric joined19:52
← austin987 left19:53
cjohnson sshfs the dir19:53
mount it locally, including the .git dir19:53
then anything that operates on a .git dir will work seamlessly19:53
← buzzLightBeer left19:54
_ikke_ has bad experiences with sshfs19:54
_ikke_ locking up all the time19:54
← snowalpaca left19:55
← benjy left19:56
← AnimeLife left19:56
← xmj left19:56
← kexmex left19:57
whitby Does anyone know of a "trick" that involves (something along the lines of) stashing multiple times (twice?) and using the diff to do something?19:58
I'm not sure what it was called but I'm trying to remember what the "trick" was19:58
→ Fallen0223 joined19:59
_ikke_ what do you want to achieve with it?19:59
← kkreate left19:59
whitby I don't want to use it, I'm just trying to remember what it was19:59
→ gunnaro_ joined19:59
← ahrs left20:00
← zivester left20:00
faLUCE I'm trying git send-email, but it says: "incorrect username or password". Here's the config file: http://paste.ubuntu.com/24269794/ what's wrong ?20:00
→ ahrs joined20:00
_ikke_ whitby: I'm not aware of any 'trick' regarding that20:01
← gunnaro left20:01
← Es0teric left20:02
→ Es0teric joined20:03
→ kpease joined20:04
whitby _ikke_: thanks, I think this was it: http://blog.moertel.com/posts/2013-02-18-git-second-order-diff.html20:05
← molgrum left20:07
→ hhee joined20:07
Vampire0_ → Vampire020:08
→ bgamari joined20:08
whitby Googling for things with "git" and "tricks" is quite an ordeal20:08
← hahuang65 left20:08
Isla_de_Muerte → NwS20:10
← synthroid left20:11
← brent__ left20:11
← MathNeverEnds left20:12
← ResidentBiscuit left20:13
← netj left20:13
→ b100s joined20:13
→ netj joined20:13
cjohnson locking up _ikke_? locking up what?20:14
→ _Vi joined20:14
← zerow left20:14
_ikke_ cjohnson: my terminals mostly20:15
← Rodya_ left20:16
→ ResidentBiscuit joined20:16
cjohnson strange I've been using it for years for all sorts of stuff, remote mounted codebases, mounting my mp3 collection to my DJ laptop for my DJ software to read my music collection, streaming movies etc20:16
← Silenced left20:17
→ cdg joined20:17
→ gugah_ joined20:18
← YuGiOhJCJ left20:18
→ FilipNortic_ joined20:19
→ GodGinrai joined20:20
→ snowalpaca joined20:21
← gugah left20:21
← snowalpaca left20:21
→ snowalpaca joined20:21
← FilipNortic left20:21
→ brent__ joined20:22
← Cabanossi left20:23
→ peterbec` joined20:25
→ Cabanossi joined20:25
← sotoz left20:25
← brent__ left20:27
← gunnaro_ left20:27
→ brent__ joined20:27
← lmatteis left20:28
← kpease left20:30
← freimatz3 left20:31
→ myhau joined20:31
→ thebope joined20:31
→ re1 joined20:31
← peterbec` left20:32
→ Gill joined20:33
Gill hey I am trying to figure out how to ignore all files except for .cfg files in my .gitignore is this possible?20:33
← mazert_ left20:34
→ MathNeverEnds joined20:34
← dvaske_ left20:35
→ peterbec` joined20:35
preaction Gill: !*.cfg20:35
← thebope left20:36
← Sasazuka left20:36
Gill preaction: cool that will ignore everything but though?20:36
do i need a specific rul eot tell it to ignore everything else?20:36
preaction no, that adds *.cfg as an exception20:36
* ignores everything...20:36
← matoro left20:37
→ askb joined20:37
Gill so i have to have 2 lines first * then ~*.cfg?20:37
!*.cfg20:37
preaction what's ~ doing?20:37
Gill sorry typo20:37
preaction what happens when you try it/20:37
← cyphase left20:37
← plicki left20:37
← fission6 left20:38
Gill when i try !*.cfg its adding other files20:38
← gugah_ left20:38
preaction also remember that you can't ignore files that are already in the repository, so if you're trying to ignore changes in a checkout of the repo it won't work20:38
→ matoro joined20:38
← jeffreylevesque_ left20:38
→ fission6 joined20:39
Gill its ignoring my .gitignore20:39
→ cyphase joined20:39
→ roelmonnens joined20:39
preaction i assure you it isn't20:39
latenite Hi folks, I think I screwd up my index file. https://gist.github.com/anonymous/18d3f7cd1df7cf2cf8cc4763ecd39c0a20:39
is there a way to fix it?20:39
preaction Gill: you might have to use **/* to ignore directories and subdirectories and subsubdirectories20:39
→ octo8 joined20:40
← octo8 left20:40
→ octo8 joined20:40
ojacobson latenite: mv .git/index .git/index.broken && git reset20:40
← Nilesh_ left20:40
Gill Untracked files:20:40
(use "git add <file>..." to include in what will be committed)20:40
.gitignore20:40
octo8 hello, a question : what is the difference between 'git push -u origin master' and 'git push origin master' ??20:40
preaction Gill: don't paste into the channel, please20:40
Gill sorry20:41
preaction Gill: it's not ignoring it, it's an untracked file. if you also want to ignore hidden files, .*20:41
← Ryanar left20:41
Gill should my gitignore file be hidden?20:41
cjohnson Gill: untracked files are files that git is NOT ignoring, that it detects aren't yet in the repository20:41
ojacobson octo8: with -u, git-push does the equivalent of `git branch --set-upstream-to origin/master master` after the push20:41
so that the pushed branch tracks the target branch20:41
preaction Gill: yes, it must absolutely be ".gitignore"20:42
← peterbec` left20:42
octo8 ojacobson: i can't find an explanation about the '-u' online ? can you... i searched a lot20:42
→ Brski joined20:42
Gill ok cool20:42
latenite ojacobson, nice that did that trick :D20:42
thank you20:42
ojacobson octo8: man git-push20:42
gitinfo octo8: the git-push manpage is available at http://jk.gs/git-push.html20:42
ojacobson latenite: note that you'll have to restage any formerly-staged changes20:43
latenite Now I try to pull and I get this: https://gist.github.com/anonymous/6527469356a6df136bc6a62df7218c9120:43
what does that mean?20:43
→ Sasazuka joined20:43
ojacobson if they only existed in the staging area, you'll need to recover them with `git fsck` and that's no fun20:43
← BSaboia left20:43
Gill that so in ‘.gitignore’ i have !*.cfg and i just did a push and it pushed test.xml20:43
ojacobson error: Your local changes to the following files would be overwritten by merge:20:43
You have uncommitted changes that conflict with the merge you asked for.20:43
← paul424 left20:44
preaction Gill: i already said that .gitignore does not ignore files already tracked by the repository20:44
Gill preaction: they were new files…20:44
latenite ojacobson, I did not edit any files in the repo I am doing the 'git pull' in20:44
Gill i will create test2.xml and try again20:44
cjohnson Gill: !*.cfg doesn't match test.xml20:44
preaction Gill: "push" doesn't do "new files", ever. did you mean "add"?20:44
→ peterbec` joined20:44
latenite ojacobson, where do these changes come from?20:44
octo8 ojacobson: if i know nothing about branches yet, or merging yet (i'm still learning), is it ok for me to do push without -u if i have the only master branch ???20:45
ojacobson latenite: something on your machine edited those files20:45
Gill i did git add *20:45
ojacobson if it wasn't you personally, it was something you ran20:45
preaction Gill: so you explicitly added test.xml, which overrides gitignore. you wanted git add -a or git add .20:45
→ ronin_work joined20:45
latenite ojacobson, can I see/look at how the differ?20:45
← roelmonnens left20:45
Gill preaction: how does that override gitignore?20:45
preaction Gill: but also, unless you have the "*" line that we talked about, it's not being ignored (if it were ignored, it would not show up in "Untracked files")20:46
Gill im confused20:46
→ Rodya_ joined20:46
Gill oh20:46
preaction Gill: "git add *" is expanded by your shell into "git add <every individual thing in the current directory>", which means you explicitly did "git add test.xml", which means git added it because you said to20:46
→ roelmonnens joined20:46
Gill so when i do a git push should i not be running git add *?20:46
→ Rodya__ joined20:46
ojacobson Gill: push and fetch transfer commits and branches20:47
git-add doesn't affect any existing commits, or any branches20:47
preaction push and add are separate operations that don't have anything to do with each other. push pushes commits. add adds to a commit. commit is the link between them.20:47
ojacobson `git add` stages stuff for the next `git commit`, which _does_ create a commit20:47
→ miczac joined20:47
gitinfo set mode: +v20:48
→ scoobertron joined20:48
latenite Hi folks, how can I view the differences of these files: https://gist.github.com/anonymous/6527469356a6df136bc6a62df7218c9120:50
← Rodya_ left20:50
Gill i think i need to do a full git tutorial20:50
im totally confused now20:50
← peterbec` left20:51
← Rodya__ left20:51
ojacobson !gcs20:51
gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html20:51
ojacobson latenite: `git diff HEAD` will show any uncommitted changes in your work tree20:52
`git diff --staged HEAD` will show any uncommitted changes you have staged20:52
← scoobert1on left20:52
→ lmatteis joined20:52
Gill thanks!20:53
→ sz0 joined20:53
ojacobson latenite: the output of `git status` will tell you how to manipulate those changes, once you understand what they are :)20:53
latenite ojacobson, so ONLY persmissions changed? https://gist.github.com/anonymous/c05167728964fa56318b24690faf12a520:55
← UrsoBranco left20:56
ojacobson Looks like.20:57
Committed state has -x perms, disk state has +x perms20:57
→ peterbec` joined20:57
← dglambert left20:58
latenite ojacobson, so git also tracks permissions? I was not aware of that.20:58
→ imack joined20:59
ojacobson Just the X bit20:59
and only one bit, not three20:59
All other perms (and, for that matter, the application of the x bit to each of user, group, and other) come from your umask when you run git commands20:59
← Brski left21:00
← warthog9 left21:00
latenite ojacobson, oh ok21:01
that's odd but I'll try to remember :D21:01
cjohnson it would be a nightmare if it tracked perms hah21:01
ojacobson cjohnson: it's actually one of the more frequent feature requests21:02
→ austin987 joined21:02
cjohnson the idea is if you need special perms you include some sort of setup tool to make those changes21:02
ojacobson tools like etckeeper already do that21:02
cjohnson Im sure, just seems like it would add a huge amount of mess and complexity21:02
if it's done in an opt-in way I'm ok with that but21:02
ojacobson given how slapdash people are about umask generally, it'd probably lead to a lot of spurious mode change commits21:02
or disputes about whether a tracked file should be g+w or not21:02
or some jackass checking in 0777 perms on everything because they had a problem and looked up the solution on stackoverflow21:03
cjohnson exactly21:03
← ExoUNX left21:03
cjohnson I can barely enforce a consistent indentation method across devs21:03
← peterbec` left21:03
← Gill left21:04
→ _August_ joined21:04
← dersand left21:06
→ mojjo joined21:07
← b100s left21:08
← yqt left21:08
→ Atm0spher1c joined21:09
← s2013 left21:09
← hhee left21:10
← satifant left21:11
→ borkr joined21:14
→ MonkOfCity joined21:14
→ peterbec` joined21:14
→ jost__ joined21:14
← sammyo left21:15
→ cdown joined21:16
→ g0d355__ joined21:16
→ dsdeiz joined21:16
→ Endarked joined21:17
← Endarked left21:17
← jost_ left21:18
→ cdg_ joined21:18
← porsche944 left21:19
→ sotoz joined21:19
← peterbec` left21:20
← cdg left21:20
← ronin_work left21:20
← aard_ left21:20
← borkr left21:21
← roelmonnens left21:21
→ roelmonnens joined21:22
← sotoz left21:22
→ cdown_ joined21:23
← imack left21:23
→ alhariel joined21:24
← roelmonnens left21:24
→ roelmonnens joined21:25
→ zerow joined21:25
← yehowyada left21:26
→ thebope joined21:26
← cdown left21:26
cdown_ → cdown21:26
← Gsham left21:26
← plexigras left21:27
← nivag left21:27
← paws_ left21:27
← octo8 left21:28
← dendazen left21:28
→ nivag joined21:28
← nivag left21:28
← maroloccio left21:29
← roelmonnens left21:29
→ oxguy3 joined21:29
→ nivag joined21:30
→ marianina8 joined21:30
← thebope left21:30
← zerow left21:30
← prg3 left21:31
← madewokherd left21:34
→ mikecmpbll joined21:34
← fission6 left21:35
→ Doginal joined21:35
→ prg3 joined21:35
← Cassiopaya left21:36
→ fission6 joined21:36
→ secki joined21:36
← austin987 left21:37
← atomi left21:38
→ b100s joined21:38
Some_Person How do I do a lightweight tag on an older commit?21:38
→ sotoz joined21:39
← DarkPsydeLord left21:39
← MarioBranco left21:39
→ atomi joined21:39
← Cabanossi left21:40
→ Cabanossi joined21:40
← ankit01ojha left21:40
← muhannad left21:41
preaction Some_Person: git tag <name> <commit>21:42
← fees left21:43
← bitmod left21:43
← patarr_ left21:43
Some_Person preaction: Thanks!21:44
→ Ryanar joined21:44
Some_Person The next thing I need to do is move 6 commits to a different branch...21:44
→ bitmod joined21:45
preaction rebase is a thing that can do that21:46
so is cherry-pick21:46
and then you need to reset to remove them from the branch they were on21:46
→ gopar joined21:47
→ Rodya_ joined21:47
← sotoz left21:48
→ amdi_ joined21:49
← LeBlaaanc left21:49
← schleppel left21:50
→ cdown_ joined21:50
← myhau left21:51
← bannakaf_ left21:51
← dionysus69 left21:51
→ jeffreylevesque joined21:52
← Rodya_ left21:53
← cdown left21:53
cdown_ → cdown21:53
→ dionysus69 joined21:54
← buffal0 left21:56
→ kegster joined21:56
→ Gill joined22:00
← MrJoshua left22:00
← om_henners left22:02
← miczac left22:04
← cagomez left22:04
→ cagomez joined22:04
← jagob left22:05
← Dougie187 left22:06
→ watom- joined22:06
← b100s left22:06
← ResidentBiscuit left22:07
← kbeflo left22:07
← fahadash left22:07
← secki left22:08
← cagomez left22:09
→ kexmex joined22:09
→ MarioBranco joined22:09
→ Aeterne joined22:10
Whiskey Many times when i make a commit22:10
→ anderson_ joined22:11
Whiskey and do "git push" it says "Everything up-to-date" so i have to do it repated times untill it accepts it, what can that be?22:11
← cdg_ left22:12
← TomyLobo2 left22:12
← mojjo left22:13
→ Sasazuka_ joined22:14
← fission6 left22:15
← cyberz left22:15
← Sasazuka left22:15
→ ronin_work joined22:17
← publio left22:17
→ cyberz joined22:18
kadoban Whiskey: I've never seen it change behavior after repeated attempts, unless someone else changes the remote version in between ... and they'd have to change it in a pretty specific way for your push to get accepted after not being needed.22:19
→ thebope joined22:19
→ fission6 joined22:20
→ cagomez joined22:20
← MrWoohoo left22:20
← fission6 left22:20
← Ryanar left22:20
Whiskey kadoban, im the ony one that own the repo, so i the only one that make the changes to it22:21
its not a big problem, its just a bit enoying22:21
← kexmex left22:22
kadoban Are you doing commits between trying to push and it not being needed, and then pushing and it being accepted?22:22
Whiskey how do you mean22:23
→ warthog9 joined22:23
→ TikityTik joined22:23
Whiskey i do a change, git add <file>, git commit -m "my massage", git push22:23
← thebope left22:24
→ aw1 joined22:24
kadoban And then it's accepted? That's what's usually supposed to happen.22:24
Whiskey yeh sometimes it works on first try, sometimes i have to try push it multiply times before it get accepted22:25
kadoban Not sure, never seen that.22:25
Whiskey i have only use git for like 1 month so im not good at this shit22:25
only handle like 10 commands but, i use a proxy for it to enable ssl for an example22:26
that can be one problem22:26
like connection are lost, or the read of current base don´t get right or whatever22:26
i use git 1,9,1 but i don´t think that has anything to do whit it, atlest not the main problem22:27
→ TSS_ joined22:28
_cyril__ → _cyril_22:28
← Sasazuka_ left22:29
kadoban Even through a proxy, AFAIK it should either succeed normally or fail with an error if the connection can't be done or something. Maybe there's some odd caching thing going on? What transport mechanism are you using, is this HTTP I guess?22:29
→ afuentes joined22:30
→ Sasazuka joined22:31
← Glooomy left22:32
← MathNeverEnds left22:33
→ foul_owl joined22:33
Whiskey https, as i told22:33
the proxy use https, and the connector or whatever you call it use http22:34
← Fallen0223 left22:34
→ bannakaffalatta joined22:34
kadoban Maybe it's caching then, that sounds awful. If you can do another transport mechanism, maybe try that?22:34
Whiskey i use gitea, its on localhost so no need use it on https, its just the connection on the proxy it https as i don´t allow anything outside it but it was more easy to use https in apache, then actully do it whit gitea22:34
→ perrier-jouet joined22:35
Whiskey yeh can be that, and na i won´t change it :) it works good at it is22:35
espect from the commits sometimes :D22:35
yarekt Hi, I'm looking for a fail safe and portable way to check if current HEAD is differe (or older) to remote22:36
repo is cloned with -b <ref> parameter, which could be a branch name, a tag or just a ref22:37
I suppose there wouldn't really be a failsafe way determine what is the remote ref for something...22:37
But maybe theres a way to resolve a branch name or a tag to something?22:38
← King_Hual left22:38
→ fletom joined22:39
→ Gloomy joined22:39
← Gloomy left22:39
→ peterbec` joined22:41
← cyberz left22:41
→ Noodlewitt joined22:42
→ chipotle joined22:43
→ cyberz joined22:43
foul_owl Is it common practice to have several branches and keep those branches around for long periods of time? ie, master, testing, integ? And of course doing the actual dev work in short term feature branches22:44
← daivyk left22:45
→ oncall-pokemon joined22:45
→ Synthead joined22:46
→ dirtyroshi joined22:46
yarekt foul_owl: It depends on your workflow. Generally I wouldn't advice to keep a lot of work in old branches, integration is always harder the bigger the diversion22:47
← faLUCE left22:47
← dirtyroshi left22:47
← prg318 left22:47
→ dirtyroshi joined22:47
→ AlexanderS joined22:48
→ patarr joined22:49
← peterbec` left22:50
← whitby left22:50
→ peterbec` joined22:51
← steeze left22:52
← latenite left22:52
← anderson_ left22:52
← chipotle left22:52
→ whitby joined22:53
← ronin_work left22:53
← MarioBranco left22:53
← manuelschneid3r left22:53
← matoro left22:53
← afuentes left22:54
→ prg318 joined22:54
→ chipotle joined22:54
← sz0 left22:54
foul_owl I was thinking of a workflow like22:56
* Create feature in feature branch22:56
* Merge into testing branch22:56
* Test in testing branch22:56
← oaaao left22:56
foul_owl * Merge testing into integration branch22:56
* Do integration testing22:56
* Merge into master22:57
yarekt Why not test in feature branch?22:57
→ webdev007 joined22:57
foul_owl Sure22:57
yarekt Why not run integration testing on feature branch?22:57
You are only delaying the inevitable work anyway22:57
foul_owl Aren't there normally different phases of testing though?22:58
Performed by different people?22:58
yarekt People!?22:58
foul_owl Just a way to break up the work over a large codebase at a company?22:58
Haha22:58
← cagomez left22:59
→ hahuang65 joined22:59
→ cagomez joined22:59
← alhariel left22:59
← peterbec` left23:01
→ peterbec` joined23:01
← _August_ left23:02
← thiago left23:02
← systemovich left23:03
→ gugah joined23:03
→ systemovich joined23:04
← dsteplight__ left23:06
← systemovich left23:06
← dirtyroshi left23:07
← Aeterne left23:07
→ dirtyroshi joined23:07
→ MarioBranco joined23:10
← gugah left23:11
← watom- left23:12
← aw1 left23:12
← fakenerd left23:13
→ venmx joined23:13
→ molgrum joined23:13
← molgrum left23:13
→ molgrum joined23:13
→ thebope joined23:14
← patarr left23:14
← tvw left23:17
← weijunli left23:17
→ matoro joined23:17
← peterbec` left23:17
← thebope left23:18
← tang^ left23:18
→ octo8 joined23:19
→ austin987 joined23:19
← Emperor_Earth_ left23:20
→ peterbec` joined23:21
→ dendazen joined23:24
← Sauvin left23:24
→ kyan joined23:25
← p4trix left23:25
← nixjdm left23:27
→ bocaneri joined23:27
← bocaneri left23:27
← fedepad left23:27
→ sythe joined23:28
← Tobbi left23:29
← venmx left23:29
→ patarr joined23:30
← matoro left23:30
→ MathNeverEnds joined23:30
→ gableroux joined23:30
→ bocaneri joined23:31
→ madewokherd joined23:33
→ MacWinner joined23:37
← HardlySeen left23:39
→ HardlySeen joined23:40
← overlord_tm left23:41
← gableroux left23:42
→ gableroux joined23:42
← m0viefreak left23:43
← prg3 left23:43
→ MrWoohoo joined23:44
← dsdeiz left23:44
← Wulf left23:45
→ matoro joined23:45
→ Taikibansei joined23:47
→ Lyqyd joined23:47
→ Gsham joined23:47
← cagomez left23:48
→ prg3 joined23:48
← patarr left23:48
→ dsdeiz joined23:49
← dsdeiz left23:49
→ dsdeiz joined23:49
→ ronin_work joined23:50
→ patarr joined23:50
← cdown left23:53
← Cabanossi left23:53
→ Cabanossi joined23:56
← drodger left23:56
→ Ahmed90 joined23:57
← MarioBranco left23:58

Logs Search ←Prev date Next date→ Channels Documentation