IRCloggy #git 2015-10-19

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.

2015-10-19

→ boushi joined00:00
→ tristanp joined00:01
← tristanp left00:01
← goTAN left00:01
→ Technocrat7 joined00:02
sitaram .away00:03
oops sorry00:03
(damn early mornings and sleepy fingers)00:04
compeman :)00:04
← unforgiven512 left00:05
← tinajohnson left00:05
← ASOLAr left00:06
→ ASOLAr joined00:07
← qwertyo left00:07
→ justanotheruser joined00:08
← ASOLAr left00:08
→ ASOLAr joined00:09
→ fahadash joined00:09
← fahadash left00:09
→ fahadash joined00:09
← fahadash left00:09
→ fahadash joined00:09
→ eka joined00:09
← sburg left00:10
→ howitdo joined00:10
→ jteneyck joined00:11
← m0viefreak left00:11
← Suzeanne left00:13
← ASOLAr left00:13
← SuzieQueue left00:13
← Gravitron left00:14
→ Gravitron joined00:15
← jteneyck left00:17
← CKyle left00:17
← Gravitron left00:18
← eka left00:20
← samw left00:20
→ samw joined00:21
← Ragnar left00:22
→ Suzeanne joined00:22
← fscala left00:23
→ SimonNa joined00:23
→ toothrot joined00:24
→ Gravitron joined00:24
→ happy-dude joined00:25
→ fscala joined00:25
← MattMaker left00:25
← samw left00:26
→ Nizumzen joined00:26
← Gravitron left00:29
→ Ragnar joined00:30
→ malukenho joined00:30
→ Akagi201 joined00:30
← Ragnar left00:32
→ daito joined00:32
← Akagi201 left00:33
→ wwwjfy joined00:33
→ Akagi201 joined00:33
← nurey left00:33
→ Gravitron joined00:34
← malukenho left00:34
← daito left00:37
→ MattMaker joined00:37
← tanath left00:39
← wwwjfy left00:40
→ wwwjfy_ joined00:40
← ___thoma_ left00:40
→ SuzieQueue joined00:41
← jalopezsilva left00:41
→ ___thomasreggi__ joined00:42
→ jalopezsilva joined00:43
← whitby left00:44
← creppe left00:44
→ creppe joined00:45
→ rchavik joined00:46
→ vikas027 joined00:47
→ mwhooker joined00:48
→ basis joined00:49
→ eka joined00:49
→ Goplat joined00:49
→ tristanp joined00:49
→ dreiss joined00:50
→ ___thoma_ joined00:51
← ___thomasreggi__ left00:55
← toothrot left00:56
← EduardoMartins left00:56
← ___thoma_ left00:58
→ ___thomasreggi__ joined00:58
← durham left01:00
← harish left01:01
← clemf left01:01
→ durham joined01:01
← tristanp left01:02
→ yo123 joined01:02
→ clemf joined01:02
← Technocrat7 left01:02
→ losted joined01:03
gitinfo set mode: +v01:03
yo123 Hello all01:03
gitinfo yo123: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.01:03
← yo123 left01:04
→ faux___ joined01:05
← durham left01:06
← faux___ left01:09
→ rockstar_ joined01:13
→ samw joined01:14
bremner !next01:15
gitinfo Another satisfied customer. NEXT!01:15
→ ahr3n_ joined01:16
→ keroro520 joined01:16
→ diego1 joined01:16
→ jason237 joined01:16
→ ASOLAr joined01:17
→ Technocrat7 joined01:17
← diego1 left01:17
→ diego1 joined01:17
← ASOLAr left01:18
← diegoviola left01:18
diego1 → diegoviola01:19
→ cmer joined01:19
← ahr3n left01:19
→ ASOLAr joined01:19
← pks left01:20
← mwhooker left01:21
← compeman left01:23
→ pks joined01:25
← clemf left01:25
→ dsdeiz joined01:25
→ clemf joined01:26
→ faux___ joined01:27
← faux___ left01:28
→ faux___ joined01:28
← monty left01:32
← bollullera left01:32
← axelunicorn left01:34
← Akagi201 left01:34
→ Akagi201 joined01:34
→ monty joined01:36
→ DJSpies joined01:36
← SimonNa left01:37
← ribasushi left01:39
← DJSpies left01:40
→ zumba_ad_ joined01:40
← dreiss left01:40
→ DJSpies joined01:40
→ dreiss joined01:42
→ d4rklit3 joined01:44
← Technocrat7 left01:45
← msonntag left01:45
→ ribasushi joined01:45
→ CKyle joined01:47
→ msonntag joined01:47
→ Vampire0 joined01:48
→ daito joined01:48
← wwwjfy_ left01:49
← Vampire0_ left01:50
→ harish joined01:51
→ toothrot joined01:52
← D-Boy left01:52
← faux___ left01:53
→ unident77 joined01:53
← DJSpies left01:53
← jalopezsilva left01:53
→ DJSpies joined01:54
→ Technocrat7 joined01:54
← jason237 left01:54
→ zotez joined01:55
← DJSpies left01:55
← zjason` left01:55
→ DJSpies joined01:56
← howitdo left01:57
← ASOLAr left01:57
→ goTAN joined01:58
→ jason237 joined01:58
← cmer left01:59
→ cmer joined01:59
→ tmcmahon joined01:59
← d4rklit3 left02:00
→ faux___ joined02:00
→ BeatrixKiddo joined02:00
← BeatrixKiddo left02:00
→ BeatrixKiddo joined02:00
→ ASOLAr joined02:01
← Nizumzen left02:01
← unident77 left02:02
→ sctskw joined02:02
← goTAN left02:02
→ lindenle joined02:04
← lindenle left02:05
← zumba_ad_ left02:06
← rodrigograca31 left02:07
← tvw left02:08
→ rkazak joined02:08
← ianbrandt left02:11
→ howitdo joined02:11
← harish left02:12
→ harish joined02:12
→ ianbrandt joined02:12
← tmcmahon left02:12
→ xecycle joined02:13
→ tmcmahon joined02:14
← darkbasic_ left02:14
→ darkbasic joined02:15
→ Ragnar joined02:15
xecycle Hi, I have these: master=A; B=A+(merge an ancient branch O, resolving conflicts); C=A+(some other features); now I want to merge O into C, but the conflicts to resolve are the same as B. Can I reuse the merge commit at B?02:17
← basis left02:18
← rockstar_ left02:18
thiago yes02:19
but that merge should have exited with "already up to date"02:19
there should have been no merge02:19
← raven-au left02:19
thiago wait, no02:20
just merge B02:20
← rchavik left02:20
xecycle you mean on C do merge B? trying02:20
← dreiss left02:21
← Ragnar left02:21
thiago on C merge B02:23
→ Limech_ joined02:23
← ASOLAr left02:23
→ EduardoMartins joined02:25
→ raven-au joined02:25
→ ASOLAr joined02:25
← Limech left02:26
→ jteneyck joined02:27
→ jmpp joined02:27
→ severnaya joined02:29
← severnaya left02:29
→ severnaya joined02:29
xecycle thanks, it works. and I noticed some other conflicts.02:29
severnaya question, i used "git commit --amend" on a server and now when i try to git pull on the client it asks for a merge commit message. i just want to forcefully pull the remote repo without having it show that there was a separate event02:29
→ basis joined02:30
severnaya i want the ammended commit message to be forcefully overwritten on git pull essentially02:30
xecycle severnaya: delete local branch and checkout from origin again02:30
← fenugrec left02:30
← CKyle left02:31
← ASOLAr left02:31
→ ASOLAr joined02:31
severnaya xecycle got it. achieved the same thing by doing git reset --hard to before the last commit and then pulling agin ;)02:32
thanks02:32
← Lyqyd left02:32
→ penna joined02:32
← jmpp left02:33
→ JJM joined02:33
→ p1k joined02:34
← aarobc left02:34
→ aretecode joined02:35
← toothrot left02:35
← EduardoMartins left02:35
← penna_ left02:36
← severnaya left02:37
→ lindenle joined02:40
→ AnalogSuzen joined02:42
← pratikmallya left02:43
→ jalopezsilva joined02:43
→ SimonNa joined02:44
← Suzeanne left02:45
← andersoldahl left02:45
→ tristanp joined02:46
← p1k left02:47
→ rockstar_ joined02:48
→ nurey joined02:48
→ unforgiven512 joined02:49
→ lindenle_ joined02:51
← lindenle left02:51
→ wwwjfy joined02:51
→ rockstar__ joined02:51
← samw left02:55
→ samw joined02:55
← rkazak left02:56
→ fcoelho1 joined03:00
← samw left03:00
← fcoelho left03:02
← nurey left03:04
← jteneyck left03:04
→ pratikmallya joined03:06
→ nurey joined03:06
→ Limes_ joined03:06
← zotez left03:06
← BeatrixKiddo left03:07
← fcoelho1 left03:08
→ fcoelho joined03:08
← jalopezsilva left03:09
→ Lyqyd joined03:09
→ diego1 joined03:10
→ jalopezsilva joined03:10
← diego1 left03:11
→ diego1 joined03:11
diegoviola → Guest8250903:11
diego1 → diegoviola03:11
← ASOLAr left03:12
→ ASOLAr joined03:12
← Guest82509 left03:12
← JJM left03:13
← ASOLAr left03:15
← johtso left03:16
← clemf left03:17
→ clemf joined03:17
→ arup_r joined03:19
→ ASOLAr joined03:20
→ bcowing joined03:21
← zac_g left03:21
← nurey left03:24
→ zotez joined03:25
← sarri left03:26
← ASOLAr left03:26
← tmcmahon left03:26
→ ASOLAr joined03:26
← faux___ left03:27
← phantombeta left03:29
← ASOLAr left03:30
→ ASOLAr joined03:31
← jalopezsilva left03:32
← Limes_ left03:32
→ D-Boy joined03:36
← FireArrow133 left03:36
→ Skruff joined03:37
← Skruff left03:37
→ Skruff joined03:37
← sparetire_ left03:39
→ python90_ joined03:40
← losted left03:45
→ faux___ joined03:46
← zivester left03:47
← basis left03:48
→ gancl joined03:50
← zotez left03:50
→ phantombeta joined03:52
→ aviraldg joined03:53
→ kadoban joined03:53
← ASOLAr left03:54
← pratikmallya left03:55
← bcowing left03:58
→ goTAN joined03:58
→ ASOLAr joined03:59
← Lyqyd left03:59
→ rchavik joined03:59
← shinnya left04:02
← SimonNa left04:02
← Exagone313 left04:03
← Celelibi left04:03
→ zivester joined04:03
→ Celelibi joined04:03
← goTAN left04:03
← ASOLAr left04:04
→ ASOLAr joined04:04
→ Exagone313 joined04:04
← DJSpies left04:05
→ arescorpio joined04:05
← ASOLAr left04:08
→ suprano joined04:10
← madebymarkca left04:10
← daito left04:12
→ kp666 joined04:12
→ scarabx joined04:13
← JrCs left04:13
← CheckDavid left04:13
→ JrCs_ joined04:13
← M4renz left04:13
→ PsuzeannePsy joined04:15
→ Suzeanne joined04:15
→ shad joined04:16
← zivester left04:17
← SuzieQueue left04:18
← PsuzeannePsy left04:19
← gambl0re left04:19
← xlegoman_ left04:20
→ strayPuppy joined04:20
→ gambl0re joined04:21
→ subscope joined04:22
→ ASOLAr joined04:25
← gambl0re left04:25
→ gambl0re joined04:26
→ jalopezsilva joined04:29
← amaury_d left04:29
→ amaury_d joined04:30
→ SimonNa joined04:30
← irqq_ left04:30
← gambl0re left04:30
← sctskw left04:31
← xecycle left04:31
→ sctskw joined04:32
→ nidr0x joined04:33
→ madebymarkca joined04:33
← jalopezsilva left04:34
→ workisto` joined04:35
← sctskw left04:36
→ wxg joined04:38
→ jteneyck joined04:38
→ fred1807 joined04:38
← workistoofun left04:39
← ASOLAr left04:39
fred1807 Hello, need some basic help in using the Git tool with the github site/service. I have a github pages project, and I need to replace all the jpg images with low res versions. So I first "git clone github.com/mypage" to have all the files locally. Then I replace all the images... And then, how do I "upload" everything back to github ??04:40
← Akagi201 left04:42
← graChe28 left04:42
→ graChe28 joined04:43
→ pratikmallya joined04:43
kadoban fred1807: stage the changes, with 'git add .' or something, make a commit, then push the changes to the github remote.04:43
→ jceb joined04:43
fred1807 with 'git add .' or something ? git add or something? , make a commit, Inst uploading the new jpegs files, the same as "commit" ?04:44
→ khmarbaise joined04:44
→ mwhooker joined04:46
← Gamecubic left04:46
← faux___ left04:47
→ gambl0re joined04:49
kadoban fred1807: Sorry, that's about my limit with that type of handholding. You'll have to wait for someone else or read a bit. https://www.git-scm.com/book/en/v2 is probably a good start.04:49
← khmarbaise left04:50
phroa fred1807: might want to look at something like !getting_started04:51
er04:51
!starting_points perhaps?04:51
gitinfo [!starting_point] Good starting points for getting to know Git are: official website http://git-scm.com/ (esp. "Documentation"), http://stackoverflow.com/tags/git/info, http://try.github.com, https://git.wiki.kernel.org/index.php/Main_Page, http://rogerdudler.github.io/git-guide/ and https://www.atlassian.com/git/tutorial/git-basics04:51
phroa there we go!04:51
fred1807 Ok Kado, I thank you. So long story short. I -Cannot- simply and easy just: git clone /mypage , change the jpegs, and then upload everything back ?04:51
phroa I quite like Atlassian's git stuff myself.04:51
grawity fred1807: well, sure, you can04:51
phroa fred1807: actually that's really easy once you know how04:51
grawity fred1807: just that the "upload everything back" part isn't exactly a "click one button" thing04:52
fred1807 like git clone /mypages, and then git "up" /mypages04:52
← wxg left04:52
grawity yes, not exactly04:52
Git's meant for storing history – every change described – so you'll need to deal with that part04:52
← python90_ left04:53
grawity but that's basically04:53
git add --all; git commit -m "Update stuff"; git push04:53
← gambl0re left04:53
→ faux___ joined04:54
fred1807 oh nice, I guess that will work, thank you04:54
← Gravitron left04:54
← jason237 left04:55
grawity might be useful to use `git status` before committing, to check what it's going to store04:56
← graChe28 left04:56
→ andersoldahl joined04:57
← eka left04:57
→ graChe28 joined04:57
→ ayaz joined04:58
→ t4nk285 joined04:58
← CEnnis91 left04:58
→ eka joined04:58
→ dopeddude joined04:59
← andersoldahl left05:00
← mezod left05:01
→ gambl0re joined05:01
→ daito joined05:02
← eka left05:02
→ eka joined05:03
← atrus left05:03
← aretecode left05:03
← graChe28 left05:04
← t4nk285 left05:04
→ malukenho joined05:05
→ graChe28 joined05:05
← negaduck left05:06
→ negaduck joined05:07
← dopeddude left05:07
→ lolmac joined05:07
→ MechtiIde joined05:10
→ tzero joined05:11
→ Raging_Hog joined05:11
← graChe28 left05:12
→ akiva joined05:14
→ Akagi201 joined05:14
→ ahr3n joined05:16
→ jmpp joined05:16
← keroro520 left05:17
← ahr3n_ left05:19
→ xlegoman joined05:20
→ skirk joined05:22
→ graChe28 joined05:23
→ lubarch joined05:25
← xlegoman left05:25
← StuartMI left05:25
← terminal_echo left05:25
← lindenle_ left05:26
← sdothum left05:28
← skcin7 left05:29
→ ThomasLocke joined05:29
→ skcin7 joined05:30
← boombatower left05:31
← Guest58751 left05:32
→ Guest58751 joined05:33
→ keroro520 joined05:34
← SimonNa left05:34
← clemf left05:35
← Suzeanne left05:35
← multi_io left05:36
→ multi_io joined05:38
← skorgon left05:39
→ Manikandan joined05:42
← MechtiIde left05:42
→ pantsman- joined05:45
← JanC left05:46
→ jason237 joined05:54
← scarabx left05:55
→ wxg joined05:55
← lubarch left05:57
← Technocrat7 left05:57
← pratikmallya left05:58
→ JanC joined06:01
← jteneyck left06:02
← picachu left06:02
→ CountTwo joined06:02
← pantsman- left06:03
← Werring left06:04
→ rscata joined06:04
CountTwo When working with multiple release branches, sometimes you commit the same fix/feature to each branch. Of course they will show up as different commits, but it would be useful if they were still somehow associated to the same logical 'change'. I'm assuming git has nothing to support this, but there must be other tool-chains build on top of git that do. Any suggestions?06:05
← tpollard left06:07
→ teknozulu joined06:07
← Machus left06:07
thiago CountTwo: the -x option to git cherry-pick06:08
← vikas027 left06:08
← fracting left06:09
→ PCatinean joined06:10
CountTwo oooh, neat06:10
→ Werring joined06:10
→ lb joined06:13
← alanwill left06:14
→ Amandil joined06:15
→ dreiss joined06:16
← hapislacker left06:18
→ hapislacker joined06:18
← arescorpio left06:19
→ acolson joined06:19
→ scarabx joined06:19
→ khmarbaise joined06:20
← hapislacker left06:21
→ fracting joined06:22
← jceb left06:22
← CountTwo left06:22
← fedexo left06:22
→ Saturn812 joined06:23
→ roelmonnens joined06:23
← fred1807 left06:25
← gopar left06:26
→ sctskw joined06:26
← fracting left06:27
→ lindenle joined06:27
← sctskw left06:27
→ nerd joined06:27
→ sctskw joined06:27
← jason237 left06:28
← mwhooker left06:30
→ mwhooker joined06:30
← sctskw left06:32
→ eGGsha joined06:33
← lindenle left06:33
← FunkyAss left06:35
→ fracting joined06:39
→ dopesong joined06:39
← fscala left06:39
← happy-dude left06:41
→ fscala joined06:43
← jmpp left06:43
← mac_ified left06:44
← faux___ left06:45
← teknozulu left06:46
→ skylite joined06:46
← wxg left06:47
→ faux___ joined06:47
← khmarbaise left06:48
← akiva left06:49
→ khmarbaise joined06:49
→ dsantiago joined06:49
→ howdoi joined06:49
→ Alienpruts joined06:50
← rockstar__ left06:51
← rockstar_ left06:51
→ Sceorem joined06:51
→ Suzeanne joined06:51
← thiago left06:53
→ rkazak joined06:54
→ medfly joined06:54
→ wxg joined06:55
→ cvanball joined06:56
→ TomyWork joined06:58
→ freimatz joined06:58
→ grandrew joined06:58
← dreiss left06:59
← grandrew left06:59
→ jrahmy joined07:00
→ tristanp_ joined07:00
→ d4rklit3 joined07:01
← tristanp left07:01
→ Kicer86 joined07:01
← freimatz left07:04
← graChe28 left07:05
→ in3xes joined07:06
→ freimatz joined07:06
← faux___ left07:08
→ graChe28 joined07:10
← Suzeanne left07:13
→ {AS} joined07:14
→ encod3 joined07:15
→ sgfgdf joined07:15
← scarabx left07:15
← d4rklit3 left07:16
→ scarabx joined07:17
→ simonsmith_io joined07:17
← subscope left07:18
sgfgdf hi, guys! any suggestion for using branch names for features, bug, enhancement etc.? it i got them from a ticketing system, should i add the ticket number in the branch name? should i use slashes like "feature/my-feature-name" or "bug/my-bug-name"? share your experience and what are the good practices.07:18
→ faux___ joined07:20
← joufflu left07:21
→ pabs3 joined07:21
→ Limes_ joined07:21
← simonsmith_io left07:22
pabs3 tobiasvl: FYI I sent a patch to the list about the "Fetching remote" thing: https://www.spinics.net/lists/git/msg261558.html07:22
→ xlegoman joined07:22
→ ChaZy1 joined07:23
→ gasbakid joined07:24
→ rockstar_ joined07:25
← khmarbaise left07:26
→ nnyk joined07:27
← xlegoman left07:28
→ Balliad joined07:28
jantje hi07:29
gitinfo set mode: +v07:29
ChaZy1 Hi, I have the following question: So i want to track a specific live config file in my master branch, but when i merge my master branch with my demo branch this config file should not get submitted to the demo branch... Is there a way to make this work in git?07:29
← medfly left07:29
ChaZy1 I've tried the solution with the "ours" driver but i get the idea that this only works in a merge conflict situation07:30
← kadoban left07:31
→ darkbasic_ joined07:32
← darkbasic left07:32
→ jceb joined07:34
→ ProbabilityMoon joined07:35
← Limes_ left07:35
← fracting left07:35
← rchavik left07:36
Seveas ChaZy1: don't put config files in git07:40
→ jmpp joined07:40
Seveas they go in your config management system (puppet, ansible...), ehich of course can again be backed with git, but then it's a different repo.07:40
← daito left07:40
→ fracting joined07:41
← mkoskar left07:43
← nnyk left07:43
← negaduck left07:43
→ sinkensabe joined07:44
← TomyWork left07:44
← jmpp left07:44
← malukenho left07:45
← Goplat left07:46
← dopesong left07:49
← maxorator left07:49
→ maxorator joined07:49
← Skruff left07:50
→ jost joined07:51
→ User458764 joined07:53
→ armyriad joined07:54
← rockstar_ left07:59
→ qwertyo joined07:59
ChaZy1 You got a point there07:59
→ TomyWork joined07:59
ChaZy1 Thanks, ill look into puppet, ensible08:00
→ darkbasic joined08:00
← darkbasic_ left08:00
→ Hounddog joined08:00
← arup_r left08:01
← Rh0nda left08:01
→ Rhonda joined08:01
← Rhonda left08:01
→ Rhonda joined08:01
Rhonda Hmm. Someone suggested to me to use regain with nickserv to switch back to my nick after a disconnect issue and having my altnick, but that doesn't work neither because of the settings of this channel. I still have to /part here to switch back to my nick. :/08:03
→ arup_r joined08:03
← MaceBewley left08:04
→ marcogmonteiro joined08:05
→ daito joined08:07
→ dopesong joined08:07
→ erro joined08:09
→ dimi1947 joined08:09
← erro left08:10
→ borkr joined08:10
→ simonsmith_io joined08:10
← borkr left08:11
← skcin7 left08:11
→ borkr joined08:11
→ boucman_work joined08:11
→ aidalgol joined08:12
→ bonswouar joined08:15
→ elsevero joined08:15
→ ilmgb joined08:18
← strayPuppy left08:19
→ nicechap joined08:19
← scarabx left08:21
→ strayPuppy joined08:21
← elsevero left08:22
← sentriz left08:23
→ negaduck joined08:23
→ elsevero joined08:23
← raven-au left08:23
→ ms7 joined08:25
← Somatt_wrk left08:26
← cmer left08:27
ms7 Hi, I have a local dev branch that I would like to sync (—set-upstream-to) with origin/dev. I’ve just run git branch —set-upstream-to origin/dev from the local dev branch and it gives me “Branch dev set up to track remote branch dev from origin.” However, when I run git status, it says local dev is up to date with origin/dev, despite being behind by several commits. What could I be doing wrong?08:28
→ raven-au joined08:28
→ subscope joined08:29
← SIGKILLer left08:29
canton7 ms7, 'git fetch'?08:29
← MattMaker left08:29
← pabs3 left08:29
→ SIGKILLer joined08:30
ms7 canton7: sigh.. thank you :)08:30
→ sword joined08:31
← rkazak left08:31
→ RoelStorms joined08:32
ms7 huh.. I just realized.. “Your branch is behind 'origin/dev' by 20 commits, *** and can be fast-forwarded.*** ” So it tells you it’s safe to rebase from upstream branch?08:32
SIGKILLer → Segfault_08:32
osse ms7: there is nothing to rebase in the first place08:32
so yes :p08:33
ms7 osse: Right, but in the case of people preferring to run git rebase <remote branch> new changes to keep a clean history, as opposed to running git pull, it tells you it’s ok?08:33
← freimatz left08:33
→ jackeroo_marc joined08:33
← wxg left08:34
boucman_work when a FF is possible, the difference between a merge --ff and a rebase is pretty theoretical afaict08:34
osse ms7: it doesn't tell you anything related to that08:34
canton7 ms7, when you can fast-forward, a merge and rebase will do exactly the same thing08:34
osse ms7: both pull and rebase are ok08:34
→ kurkale6ka joined08:35
→ doener joined08:35
→ tomog999 joined08:37
ms7 I see.. I thought, in this case, when using git pull there would be some sort of visual indicator (if you use some sort of pretty git log output or a GUI) that the changes pulled in at that point would show something like ==>—— as opposed to something like ——.——.—— with git rebase where “.” is the point where the changes were merged.08:37
osse ms7: the == isn't possible because there is only one line to begin with08:38
ms7 So I read some people preferred to do a rebase to have that linear history but there are some gotchas to doing so if the branch has been worked on by multiple people08:38
jackeroo_marc Hi, I got a question about rebasing: I just rebased, had conflicts which I resolved. Then I pulled the repo with git pull and it looks like git tried to merge the old version from before resolving the merge conflicts. What did I forget? git commit? I didn't do that because a git status gave me no dirty files... can anybody help?08:38
← elsevero left08:38
← Wetmelon left08:38
osse jackeroo_marc: probably didn't forget anything08:38
canton7 ms7, a fast-forward situation looks like this: http://pastie.org/1049243808:38
osse you shouldn't have pulled08:39
canton7 ms7, a rebase or merge (pull) will update it so that master and origin/master point to the same commit08:39
ms7 osse: exactly, that was something else I thought the first time I came across this…08:39
canton7 ms7, nothing is merged. nothing is rebased. it's a simple "fast forward" operation08:39
jackeroo_marc what should I have done instead, osse?08:39
osse jackeroo_marc: I don't know. Why did you pull ?08:39
ms7 canton7: ok, I see now..08:39
jackeroo_marc just to get the newest version08:40
osse jackeroo_marc: you should have fetched and rebased (again)08:40
jackeroo_marc osse was a git commit missing?08:40
← tomog999_ left08:40
osse no08:40
← diegoviola left08:41
ethanol → alcohol08:41
← phantombeta left08:41
jackeroo_marc osse but how do I get the merge into my current branch then?08:43
not sure if I understood rebasing correctly...08:43
osse jackeroo_marc: you should have fetched and rebased (again)08:43
jackeroo_marc maybe you can enlighten me :)08:43
osse this sounds like a scenario where you should not have rebased to begin wityh08:44
jackeroo_marc ic, so next time I fetch before I rebase?08:44
osse you jsut rebased and now there's newer code already ?08:44
jackeroo_marc no, didn't look like08:45
j416 osse: probably rebased, then pulled, and git merges it since history different.08:45
osse yes08:45
→ malukenho joined08:45
j416 captain obvious08:45
j416 sorry. :D08:45
→ geoid joined08:46
j416 jackeroo_marc: first step is to figure out what version you want08:46
jackeroo_marc: when you know what you want, it's easier to get there08:46
osse I am confused as to why you need to pull when you will pull your own branch08:47
dimi1947 I have created a gitignore file with some entries in it...and now I am attempting to checkout to a branch other than master....I get a message though saying that these files(listed in gitignore) will be overwritten by checkout and that should be moved/removed before switching branches)08:48
→ irqq joined08:48
← ProbabilityMoon left08:48
dimi1947 why that?08:48
→ vigintas joined08:48
→ netz joined08:49
netz if I background a git clone (eg ctrl+z), disconnect from the internet, and later reconnect and foreground it, will it (should it?) start where it was stopped?08:50
jackeroo_marc osse it was just to make sure that I have the most recent files... maybe I should have pushed the rebased version to the repo and then could pull without a problem, that correct?08:50
← malukenho left08:50
netz I'm cloning the linux kernel repo to start dev on some modules08:50
← gasbakid left08:51
← rishi left08:52
→ rishi joined08:52
← geoid left08:53
osse jackeroo_marc: if you push THEN pull you just get the same things back08:53
there's a misunderstanding here somewhere08:53
→ geoid joined08:53
osse dimi1947: because they're committed in the other branch08:53
jackeroo_marc osse if there were no modifications from another party...08:53
osse jackeroo_marc: if you suspect that then don't rebase to begin with. only rebase your own stuff08:54
dimi1947 you mean in the non-master branch?08:54
osse yes08:54
← geoid left08:54
dimi1947 what can I do then to overcome the problem?08:54
osse dimi1947: do what it says08:55
jackeroo_marc osse ok, thx08:55
dimi1947 remove them?08:55
osse or move them temporarily08:55
dimi1947 I tried the rm--cached command and it says wrong path08:55
j416 dimi1947: try rm08:56
they're not in the index.08:56
dimi1947 I tried something else instead...commited them...it solved the issue but i do not know if it was the proper solution08:56
j416 well, you wanted to ignore them08:57
now you are not ignoring them08:57
j416 shrugs08:57
dimi1947 ok....can I do something to ignore them after commit has taken place08:57
to fix the issue in retrospect08:58
?08:58
osse jackeroo_marc: you said you wanted to pull to "get the most recent files". for that to happen someone must have committed and pushed to the same branch that you rebased locally. that's a big -no-no08:58
dimi1947: you need to run git rm in the other branch(es)08:58
← MatthewWilkes left08:58
osse but for that you need to check them out first08:58
move the files temporarily somewhere else08:58
dimi1947 so...I checkout a branch and then use rm...08:59
→ elsevero joined08:59
→ andyr joined09:00
jackeroo_marc osse but thats something that can happen, no? I mean me rebasing and someone else working on the branch and commiting meanwhile...09:00
→ acolson_ joined09:01
dimi1947 well...git status does not display the files I want to use RM for...I do not know if rm is going to have any effect now09:01
→ rodrigograca31 joined09:02
← patrick99e99 left09:03
→ simenbrekken joined09:04
← User458764 left09:05
← Arsonide left09:06
→ Arsonide joined09:06
← kaiza left09:07
→ sparetire_ joined09:07
→ Vile1 joined09:09
→ Sceorem_ joined09:09
← rivarun left09:10
→ micechal_ joined09:10
← baako left09:10
← Vile left09:11
→ filisko joined09:11
← bashcoder left09:11
← M-mistake left09:11
→ rivarun joined09:11
← awt left09:11
← Puffball left09:12
← lvh left09:12
← workisto` left09:12
← wave left09:12
← Sceorem left09:12
← micechal left09:12
→ wave joined09:13
→ rvsjoen joined09:13
← rvsjoen left09:13
→ rvsjoen joined09:13
→ Puffball joined09:13
→ aard_ joined09:13
← nydel07 left09:13
→ awt joined09:14
→ lvh joined09:14
→ bashcoder joined09:14
dimi1947 I have made some changes to a file and commited them...but I also want this changes to be passed along to another branch....what can I do to accomplish that?..cherry pick?09:15
← Guest58751 left09:15
Rhonda phroa: Ah, it was you suggesting me to do the /msg nickserv regain. That didn't work, it still kept telling me I can't change my nick while banned on #git. Thanks nevertheless for the suggestion. :)09:16
→ Guest58751 joined09:16
qsuscs ban?09:16
well we have a +q …09:16
also, time to clean up.09:17
ChanServ set mode: +o09:17
canton7 it does say that... you have to quit, rename, re-join09:17
qsuscs set mode: -b09:17
qsuscs set mode: -b09:17
← simenbrekken left09:17
qsuscs op survey, unquiet? 11:17 -- [#git] M00sL0gB0t!*@* wurde durch wilhelm.freenode.net das Wort entzogen, am Di, 28 Jul 2015 19:29:2709:17
canton7 unless you're running out of spaces in the ban list, I wouldn't bothing. Although I wasn't around when he was muted, for sure...09:18
gitinfo needs to remember what people were banned for, heh09:18
→ boucman_2 joined09:18
canton7 *wouldn't bother09:18
qsuscs we certainly are not running out of space (empty ban list and only 2 quiet, one is $~a), but early housekeeping is better than cleaning a huge list later09:19
oh well, let someone else do it09:19
qsuscs set mode: +o09:19
qsuscs set mode: -o09:19
canton7 otoh, a full ban list is mostly people who will probably never bother us again and can probably be removed... but might, so there's a small advantage in keeping them on there :P09:20
→ ether_anom joined09:20
Sp4rKy yw09:20
erf, wrong tab09:21
← ether_anom left09:21
qsuscs at least the dynamic ISP IP bans can be cleaned after some months, eh09:21
canton7 true09:21
osse jackeroo_marc: it *can* happen yes09:22
not recommended09:22
qsuscs (though kabel deutschland keeps the dynamic IPs for some months …)09:22
← boucman_work left09:22
→ M-mistake joined09:22
← daito left09:24
← strayPuppy left09:24
canton7 tbh I've had the same dynamic IP for years09:25
it *might* change if I reboot the router, but quite often not. and I reboot it very rarely...09:25
→ xlegoman joined09:25
qsuscs my ISP at home-home disconnects every 24 hours, including a new ip09:26
and i often reboot the router alone for updates09:26
canton7 interesting. I've never had an ISP do that09:26
qsuscs welcome to germany.09:26
i have yet to check what NetCologne does09:26
canton7 in fact, I failed trying to get a new IP a few times...09:26
qsuscs at university i always get a new v4 address when connecting, but i’ve not yet whether the IPv6 prefix stays the same09:27
moritz fwiw German Telekom now disconnects much less often if you have direct IP connection09:27
qsuscs yeah well i do not.09:28
still ISDN (luckily) and ATM (meh)09:28
but here in aachen, i have pure annex j vdsl09:28
moritz (the other advantage is native IPv6)09:28
→ jmpp joined09:28
← wcpan left09:28
qsuscs and the DSLAM is in the basement of the house and connected to uplink by fiber \o/09:28
← reim left09:28
moritz qsuscs: wow, how much throughput do you get?09:29
qsuscs moritz: 25 MBit/s down 2.5MBit/s up. limited by tarif (it’s the cheapest)09:30
← scarcry_ left09:30
← jrahmy left09:30
Rhonda qsuscs: Well, can't change nick if not registered when in here, to the extend that I can't even change to my registered nick.09:30
← xlegoman left09:30
→ wcpan joined09:30
→ scarcry joined09:30
qsuscs moritz: the DSLAM itself can do VDSL profile 17a (100 / 40 MBit/s), 8 or 16 VDSL ports and twice gigabit ethernet uplink (SFP, fiber in this case, but don’t ask me whether it’s one or both)09:31
Rhonda qsuscs: So yes, the +q forbids that, and not even a /msg nickserv regain does help about that.09:31
moritz qsuscs: nice :-)09:31
canton7 Rhonda, yeah it's annoying, but that's freezone's problem sadly09:32
uh.. freenode's09:32
→ youngbaks joined09:32
canton7 talk of ISPs on my mind...09:32
→ nnyk joined09:32
qsuscs in that basement there are three cables coming from the wall09:33
← jmpp left09:33
Rhonda canton7: Well, freenode didn't set +q $~a for this channel. :)09:33
→ User458764 joined09:33
canton7 Rhonda, no, but the ops had little choice after some spam issues09:34
qsuscs one that still reads POST (yep, former german federal post, that part now being german telekom), going into the NetCologne APL, one fiber cable going into the DSLAM, the cables coming from the DSLAM going into the same APL and the APL’s output going to the apartments, and then, quite new, a UnityMedia cable and amplifier (cable tv and interweb)09:34
the latter one i think not yet to all flats, because we have NetCologne and satellite, why bother with cable09:35
→ reim joined09:35
→ jason237 joined09:35
← netz left09:36
→ ksaturn joined09:36
Rhonda canton7: This is the only channel that has set this that I'm aware of, I wonder how other channels are able to deal with it, so I'm not totally convinced about the "little choice" part.09:36
← ilmgb left09:36
← User458764 left09:37
→ ilmgb joined09:37
← ilmgb left09:37
→ wxg joined09:37
→ ilmgb joined09:38
qsuscs there are enough channels09:39
some simply ban you09:39
moritz Rhonda: it's the only channel for me too, but it's also the channel *by far* with the most people in09:39
qsuscs and some forward you to #FOO-unregistered09:39
e.g. #fedora09:39
Rhonda moritz: #ubuntu, #debian. :)09:40
qsuscs welp. battery lasts only one lecture09:40
Rhonda Hmm, maybe I finally should look into a different authentication method, like sasl or sending my authentication as serverpass on connect.09:41
qsuscs and still two to go today09:41
← eGGsha left09:41
← harish left09:41
jast I do turn off the +q occasionally but it gets turned back on when there are spam issues09:42
in fact, let's try again \o/09:42
→ darkbasic_ joined09:42
ChanServ set mode: +o09:42
jast set mode: -q09:43
Neic0 → Neico09:43
jast set mode: -o09:43
← ilmgb left09:43
← darkbasic left09:43
chadi_ → chadi09:43
← chadi left09:43
→ chadi joined09:43
JrCs_ → JrCs09:43
fugi → fugiman09:43
jast Rhonda: btw, /msg nickserv identify <nick> <pwd> prior to changing nick works09:43
that's the way I do it09:44
Rhonda jast, yes, I got that suggestion in #freenode just before too, will try that approach next time, and also set the server PW to Rhonda:youwished.09:44
→ m0nkmaster joined09:45
← dopesong left09:45
← youngbaks left09:46
→ dopesong joined09:47
← mwhooker left09:47
YoungFrog I guess "youwished" isn't your password, but I'll try anyway ;)09:49
→ gasbakid joined09:51
← dopesong left09:51
→ mkoskar joined09:52
← wxg left09:52
← darkbasic_ left09:52
tomboy64 i have a branch which is based off master. when i do `git rebase -i master` it only shows the very latest commit. but when i do a pull-request (on github), it shows 5 commits. how can i squash those 5 commits?09:53
canton7 Rhonda, sorry, had a standup. Among the other top channels, at least a couple of mutes on non-identified, or even bans09:53
→ darkbasic joined09:53
← oldrobot left09:53
→ oldrobot joined09:54
← wwwjfy left09:54
canton7 yeah, at least #nodejs, ##javascript, #gentoo have mutes/bans in the top 20 by user count09:55
← aard_ left09:56
← GT4066 left09:56
← cbreak left09:57
→ ilmgb joined09:58
→ neodin joined09:58
Rhonda YoungFrog: ;)10:00
→ dopesong joined10:02
canton7 Rhonda, most IRC clients can automatically msg nickserv on connection, I think? although sasl is probably preferable...10:03
ksaturn I'm making an extension to git.10:03
→ wxg joined10:04
← mkoskar left10:04
Rhonda canton7: Sure, and I could add the regain into there. Maybe I should. There are different options to try and I'm trying to figure out which one I want to pursue. :)10:04
→ bongjovi joined10:04
→ King_Hual joined10:06
← King_Hual left10:06
→ King_Hual joined10:06
← dopesong left10:07
suprano → Marenz-work10:07
ksaturn coming soon: https://github.com/eadsjr/git-meld/blob/safety-features/README.md10:07
← nerd left10:08
→ goTAN joined10:08
→ dopesong joined10:10
→ mkoskar joined10:10
→ MapMan joined10:10
MapMan Hi!10:10
I did a git merge and it automatically created a merge commit but it merged a file not the way I wanted. How should I proceed? I want to merge that one particular file by hand.10:11
nothing is pushed yet.10:11
→ nerd joined10:11
qsuscs Rhonda: use a ssl certificate10:12
← darkbasic left10:12
qsuscs MapMan: are there any uncommitted changes in your working dir you want to keep? if not, git reset --hard HEAD^ and merge again10:12
with merge --no-commit of course10:12
→ darkbasic joined10:12
qsuscs (is it --no-commit? check man git merge in doubt)10:12
gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html10:12
MapMan qsuscs: ok, there aren't. Sounds good.10:12
← gasbakid left10:14
→ noisebleed joined10:15
→ fees joined10:16
→ fees_ joined10:16
← darkbasic left10:17
→ eGGsha joined10:17
← ayaz left10:18
→ sveinse joined10:20
→ gasbakid joined10:21
MapMan qsuscs: fatal: ambiguous argument 'HEAD10:21
← fahadash left10:21
← m0nkmaster left10:21
sveinse I have a bare mirror which I want to fetch a remote branch from another repo. I try to run git fetch file://... patches, but the patches branch does not appear to be created in the receiving repo. Why not?10:21
qsuscs bad shell again10:21
type 'HEAD^'10:21
← eGGsha left10:21
MapMan qsuscs: still throws the same error10:22
qsuscs !repro10:22
gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.10:22
MapMan qsuscs: ambiguous argument ''HEAD''10:22
← mkoskar left10:22
osse two single quotes? o_O10:22
→ rnsanchez joined10:22
qsuscs nono, full terminal session.10:22
→ harish_ joined10:23
osse this smells of cmd.exe10:23
use HEAD~10:23
MapMan qsuscs: http://hastebin.com/uzisosexef.tex10:23
_ikke_ cmd.exe uses "", not ''10:23
← gancl left10:23
MapMan osse: that did it10:23
← ms7 left10:24
qsuscs uh. okay10:24
i usually assume unix10:24
← gasbakid left10:24
qsuscs and now, back to the lecture. irc distracts too much.10:24
MapMan qsuscs: no worries10:24
→ daito joined10:25
→ gasbakid joined10:25
→ xlegoman joined10:27
← aidalgol left10:27
← neodin left10:28
← gasbakid left10:28
← daito left10:29
← borkr left10:30
→ ayulit joined10:31
← arup_r left10:31
← xlegoman left10:31
ayulit Hello!10:31
gitinfo ayulit: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.10:31
← soosfarm left10:33
← saidelike_ left10:33
→ freimatz joined10:35
→ saidelike joined10:36
→ acetakwas joined10:39
→ m0nkmaster joined10:40
← jason237 left10:41
sveinse How can I fetch a branch from another repo? The branch does not yet exists in the local repo10:43
← faux___ left10:43
canton7 sveinse, have you added that other repo as a remote?10:43
← dsdeiz left10:44
sveinse canton7: No, and I don't really want to as the remote URL is temporary10:44
canton7 sveinse, righty. 'git fetch <url> remote-branch:local-branch'10:44
← ksaturn left10:45
→ s8321414 joined10:45
→ faux___ joined10:46
← elsevero left10:48
sveinse canton7: thanks that worked10:52
canton7 :)10:52
the alternative would have been 'git fetch <url> remote-branch; git checkout -b local-branch FETCH_HEAD'10:52
← fscala left10:54
→ daito joined10:55
→ fscala joined10:56
→ elsevero joined10:57
→ rchavik joined10:58
→ stamina joined10:59
← a3Dman left10:59
← daito left11:00
→ a3Dman joined11:02
← fees_ left11:05
← fees left11:05
→ halas joined11:05
sveinse canton7: yes, but not on a bare repo I think, right?11:06
jantje what's the best way to backup an entire git workspace. My project is 7GB and I don't want to git bundle. So I now do git format-patch --stdout @{u}.. , and git diff HEAD , but it only works for the currently checked out branch. Still need to add the 'stash'. I wonder if there's an easier way to do all of that, and also includes ALL local branches and stuff11:07
canton7 sveinse, that makes no difference here11:08
jantje, !backup11:08
gitinfo jantje: 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/#backups11:08
→ b100s joined11:08
b100s hi2all11:08
how can i take last 2 commits from one branch and apply it on another?11:08
only by rebase?11:08
BtbN just cherry-pick them11:08
osse b100s: checkout the other branch then git cherry-pick onebranch~ onebranch11:09
b100s thx a lot11:09
jantje canton7: that looks like a poor way to do back ups, plus, I don't allow end-users to do 'ls -F' on the remote repository11:10
canton7 jantje, "backup" in its most common sense is just making a copy of your files, and that works fine for git. alternatively you can use git's ability to push stuff around, and push your repo somewhere11:11
jantje it's too big for that. I basically want everything i have locally but not upstream11:12
osse make a copy of .git11:12
jantje .git is 8GB. I have hundres of people with a cvs background and which are totally new to git. They will initially start with a clone with a working tree of just one branch, and do that N times for every branch. Backing up N x X GB...11:14
anyway11:14
← m0nkmaster left11:15
qsuscs canton7: checkout never works on a bare repo. you have to use branch or even update-ref and symbolic-ref11:18
canton7 point11:18
→ ms7 joined11:19
← dopesong left11:19
← bongjovi left11:19
→ dopesong joined11:20
→ fees_ joined11:20
→ fees joined11:20
→ Dro__ joined11:22
jantje for i in $(git stash list --format="%H"); do git format-patch --stdout $i; done , why doesn't that work11:25
→ MattMaker joined11:25
← AnalogSuzen left11:26
osse because $i will be interpreted as "since"11:26
Dro__ → Dro11:26
→ Suzeanne joined11:27
osse also a stash is technically a merge so I doubt format-patch will work anyway11:27
→ xlegoman joined11:27
jantje hmm, git stash list -p might be sufficient11:28
→ AnalogSuzen joined11:28
→ m_ben joined11:28
→ Imaginativeone joined11:28
← MattMaker left11:28
→ MattMaker joined11:29
→ CheckDavid joined11:30
← xlegoman left11:31
crane how can i let my git show makes me showing whitespaces?11:33
← rasto left11:33
← MattMaker left11:34
esc__ → esc11:35
esc → Guest4264811:36
→ Limes joined11:36
← nene2 left11:37
← goTAN left11:37
→ youngbaks joined11:38
← Guest42648 left11:38
→ esc_ joined11:38
← esc_ left11:38
→ esc_ joined11:38
← Limes left11:38
→ Limes joined11:38
← acetakwas left11:39
→ bongjovi joined11:40
esc_ → esc11:43
← Limes left11:44
→ Limes joined11:44
← faux___ left11:45
→ rasto joined11:46
→ borkr joined11:47
→ vurma joined11:48
→ latenite__ joined11:48
← ayulit left11:49
→ sdothum joined11:50
← tristanp_ left11:51
→ jagob joined11:52
→ tristanp joined11:52
← unreal left11:52
→ redeemed joined11:53
← ilmgb left11:53
→ unreal joined11:54
→ ilmgb joined11:54
← jagob left11:55
→ jagob joined11:55
← sinkensabe left11:55
→ malukenho joined11:55
→ python903 joined11:56
→ sinkensabe joined11:56
→ deception1 joined11:56
← armyriad left11:58
← ilmgb left11:58
deception1 Is it ok to use git to version virtual machines hard disks so that I can switch back to any state of a particular set of machines any time? does it scale when the size of the hard disk grows considering I am going to place multiple vhd s together.11:59
← fstd left11:59
→ armyriad joined11:59
→ fstd joined11:59
← nnyk left11:59
canton7 deception1, the size of your git repo will grow by the hard disk size each time you commit. you won't be able to clone without cloning everything12:00
deception1, this is a classic case where git is not a good fit at all12:00
← malukenho left12:00
← python903 left12:00
canton7 deception1, in all honesty, svn is a much better option here :P12:00
← Limes left12:01
→ Limes joined12:01
deception1 canton7: so shall I proceed to test with svn, do you think it scales with multiple machines vhd s12:02
latenite__ Hi folks, I am a little clueless why pushing to my master has no effect (noting is transferd) https://gist.github.com/anonymous/f5e0f96f858133b404d512:02
→ AugustoCesar joined12:02
deception1 canton7, thanks you :)12:02
canton7 deception1, it will scale in the same shit way (virtual disk images are pretty incompressible iirc), but you won't have to clone everything just to get the latest :P12:02
← AugustoCesar left12:03
canton7 latenite__, you haven't committed12:03
deception1 canton7, thanks :)12:03
→ gancl joined12:03
← Limes left12:03
→ Limes joined12:03
← Dro left12:03
dzho heh, beat me to it. I was all excited there for a second "finally, a git question I think I know the answer to!"12:03
← Limes left12:04
→ Limes joined12:04
canton7 need to be speedier!12:04
doesn't matter if your answer makes sense: you can expand on it later. you just have to be first112:04
heftig canton7: they might be incompressible individually, but not when doing deltas12:04
dzho it's good exercise, anyway :-)12:04
→ CKyle joined12:04
→ MattMaker joined12:05
← ms7 left12:06
← boucman_2 left12:06
heftig not that delta-compressing a hundred vhds is going to be anywhere north of slowass12:06
→ malukenho joined12:07
canton7 I wonder how much better svn would do that git here. I imagine git's heuristics for finding good deltas for packing would work against it...12:07
*do than12:07
→ mostlybadfly joined12:08
→ nnyk joined12:08
← MattMaker left12:09
dzho I think the thing to do here is to use some sort of union mount for your VM, with a base layer that you don't version or back up.12:11
well, back it up, but just once.12:11
← reim left12:12
→ Aavy joined12:14
← Aavy left12:16
→ d4rklit3 joined12:17
→ Steadfast joined12:18
← gancl left12:18
→ italoaca_ joined12:19
← uber left12:20
→ petersr joined12:20
→ boucman_work joined12:21
← italoaca_ left12:22
← Limes left12:22
dimi1947 I have made a file edit while in a branch...how I cann pass along that change to master too?12:22
→ Limes joined12:22
→ Phillemann joined12:22
← petersr left12:22
Phillemann I have two branches, master and develop. I merged master into develop a few times. Now I want develop to be on top of master instead.12:23
→ oojacoboo joined12:23
Phillemann Does git rebase master (when I'm in develop) do the right thing here?12:23
→ arup_r joined12:23
← harish_ left12:23
← cagedwisdom left12:23
→ italoacasas joined12:25
← jagob left12:26
osse Phillemann: yes12:26
Phillemann Ah. So the merge commits are...flattened12:26
Sorry, don't know how to describe it. ;)12:26
canton7 yeah, rebase will do that12:26
rebases and merges are entirely different things in that respect12:27
you probably don't want to rebase develop onto master in practice, heh12:27
remembering that this !rewrites develop12:27
gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum12:27
Phillemann Hmmmm12:27
So it would be better to open a new branch...developAfterMaster?12:28
osse nah12:28
canton7 *why* are you doing this?12:28
osse I've done this in the past without issues12:28
Nor tissues12:28
Phillemann I was stupid before and didn't regularly rebase master to develop, so I have a few merge commits in develop. I'd like to have a clean history when I finally merge develop into master.12:28
canton7 Phillemann, you're following gitflow?12:29
Phillemann (I used merge instead of rebase for some time is what I'm saying)12:29
canton7: I don't know gitflow. :/12:29
→ uber joined12:29
canton7 ah, wondered where you plucked the names 'master' and 'develop' from. those are gitflow terms12:29
→ Dzpa joined12:30
Phillemann develop is actually named $feature.12:30
← Dzpa left12:30
Phillemann But thanks for the remark, I'll use different terms. :)12:30
← wxg left12:30
canton7 so a feature typically lives for a shortish time. work is done, feature is finished, issue is closed in the issue tracker. feature is merged. branch is deleted12:31
→ krawchyk joined12:31
Phillemann Yeah, but this one is a _big_ feature.12:32
← youngbaks left12:32
Phillemann So the usual model didn't really work out here. :/12:32
← d4rklit3 left12:32
canton7 in whcih case you probably don't want to rebase it?12:33
then everyone else working on it will have pain12:33
← Manikandan left12:33
canton7 it effectively becomes a parallel stable branch...12:33
Phillemann Maybe you're right.12:33
Shall I rebase just before I merge to master, then? Or not at all12:34
canton7 if other people are working on it, not at all12:34
Phillemann I see.12:34
→ ProbabilityMoon joined12:34
canton7 especially if you've been merging from master constantly12:34
→ Junior joined12:34
canton7 in that case, you'll have to re-do all of the merge conflicts you solved previously12:34
→ lindenle joined12:34
→ choki joined12:35
→ dickdaley joined12:37
→ youngbaks joined12:38
← ShapeShifter499 left12:39
← lindenle left12:39
→ Sendoushi joined12:40
→ ShapeShifter499 joined12:40
latenite__ canton7, I should have a nap :D thanks a lot12:41
← krawchyk left12:43
← absence left12:44
← Gitzilla left12:47
→ ilmgb joined12:47
→ jeffreylevesque joined12:48
← subscope left12:48
→ afuentes joined12:48
→ subscope joined12:48
→ tvw joined12:49
← negaduck left12:49
← zacts left12:50
→ bvi joined12:51
→ fcoelho1 joined12:51
→ rockstar_ joined12:51
← fcoelho left12:52
→ zacts joined12:53
→ mezod joined12:53
← oldrobot left12:53
← jokester left12:53
← fullstack left12:53
← choki left12:54
→ oldrobot joined12:55
→ knownasilya joined12:55
→ nnyk_ joined12:56
→ daito joined12:56
← nnyk left12:57
Imaginativeone → Imaginativeone_a12:58
→ fullstack joined13:00
← sinkensabe left13:00
← daito left13:01
← fullstack left13:01
← Imaginativeone_a left13:05
← nerd left13:05
→ reim joined13:07
→ negaduck joined13:07
→ mbrzuzy joined13:07
→ Imaginativeone joined13:07
→ atrus joined13:07
→ boucman_2 joined13:08
→ krawchyk joined13:10
→ synthroid joined13:11
← boucman_work left13:11
← Limes left13:12
→ Limes joined13:12
← reim left13:13
← Limes left13:14
→ Limes joined13:14
← leprechau left13:14
← krawchyk left13:15
← CKyle left13:15
→ livingstn joined13:15
→ ahr3n_ joined13:16
→ cdg joined13:16
→ vikas027 joined13:16
→ EduardoMartins joined13:17
← malukenho left13:17
← Rubin left13:17
→ MattMaker joined13:17
→ leprechau joined13:17
→ nerd joined13:17
→ sinkensabe joined13:18
→ zivester joined13:18
→ mattp_ joined13:18
← mattp__ left13:19
← nerd left13:19
→ Limes_ joined13:19
← Limes left13:19
→ Limes joined13:19
→ Anxi80 joined13:19
← ahr3n left13:19
← Anxi80 left13:20
→ Anxi80 joined13:20
→ crose joined13:20
← philophil_ left13:20
→ johtso joined13:20
→ malukenho joined13:21
← SharksAbove left13:21
← deception1 left13:21
→ SharksAbove joined13:22
← SharksAbove left13:22
→ SharksAbove joined13:22
← MattMaker left13:22
→ paulweb515 joined13:22
RichiH to solve an argument: if i `git add foo; echo crap > foo; git add foo`, can i still access the last staged version of foo?13:22
← Limes left13:22
→ Limes joined13:22
RichiH i think yes, as it should be an unreferenced object, somewhere13:23
RichiH is not sure, though13:23
grawity only by scraping it out of `git fsck --lost-found`13:23
→ deception1 joined13:23
→ Spacew00t joined13:24
→ CEnnis91 joined13:24
← sveinse left13:25
→ Rubin joined13:25
→ krawchyk joined13:26
← krawchyk left13:26
canton7 I have scripted together bits and pieces in the past to find a lost object. it does take a little bit of work. git fsck --list-found is the starting point13:27
→ chitopunk joined13:27
← Phillemann left13:28
← youngbaks left13:28
→ krawchyk joined13:28
→ Gamecubic joined13:28
← krawchyk left13:29
→ Gravitron joined13:29
→ xlegoman joined13:29
→ krawchyk joined13:29
← malukenho left13:29
→ lykinsbd joined13:31
→ malukenho joined13:32
→ eGGsha joined13:32
← xlegoman left13:34
← jceb left13:34
→ Ragnar joined13:35
→ rj1 joined13:36
→ alanwill joined13:37
← krawchyk left13:37
→ d0nkeyBOB joined13:37
→ sgambino joined13:38
→ hapislacker joined13:38
worstadmin git add -p has a strange behavior13:39
I love it13:40
→ krawchyk joined13:41
→ tinanoo joined13:42
→ Absolute0 joined13:42
→ lindenle joined13:42
→ krawchyk_ joined13:42
→ Repox joined13:43
Absolute0 Some time ago I merged branch X into master. I forgot when this was and git log now merged all the commits. How do I create a new branch with the version of master before X was merged into it?13:43
← NeverDie left13:44
→ tinajohnson joined13:44
→ jost_ joined13:45
← jost left13:45
← krawchyk left13:45
→ pratikmallya joined13:45
→ zumba_ad_ joined13:45
→ troulouliou_div2 joined13:46
osse Absolute0: find the commit that was was at before then do git branch fooname abc123413:46
→ geoid joined13:46
← keroro520 left13:47
→ mrballcb joined13:48
→ BigWillie joined13:49
→ jceb joined13:49
→ ki0 joined13:49
← Raging_Hog left13:51
→ astrofog joined13:51
← AndreSomers left13:51
← hagabaka left13:51
→ reim joined13:52
→ AaronMT joined13:52
→ MarkyC_ joined13:52
→ mehola joined13:52
MarkyC_ → MarkyC13:53
← mbrzuzy left13:53
→ MattMaker joined13:54
→ rkazak joined13:55
→ magneticduck joined13:56
← rchavik left13:56
magneticduck so I forked a repository on github, and have a git repo on my system linked to my remote13:56
how do I pull the changes from upstream onto my repository?13:56
← ChaZy1 left13:56
osse add upstream as a new remote13:56
→ harish_ joined13:57
→ daito joined13:57
← hapislacker left13:57
magneticduck hey that worked13:57
x)13:57
→ hapislacker joined13:58
← MattMaker left13:58
→ converge joined14:00
← mehola left14:00
Absolute0 osse: abc1234 is the commit id?14:00
← daito left14:01
osse Absolute0: yes14:02
Absolute0: if it *actually* is abc1234 I'd be amazed14:02
→ CKyle joined14:02
→ notebox joined14:03
← BBBThunda left14:03
→ philophil joined14:03
→ BBBThunda joined14:03
← philophil left14:03
→ philophil joined14:04
→ mbrzuzy joined14:04
← jost_ left14:04
Absolute0 osse: the thing is the commits look like they cam from both branches14:05
all the commits merged.14:06
osse !lol14:06
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all14:06
osse use that14:06
→ mellernoia joined14:07
← Repox left14:07
← SharksAbove left14:07
Absolute0 I have pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset in my ~/.gitconfif14:07
I have pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset in my ~/.gitconfig14:07
osse: how do you read this thing?14:08
* means master |\ means branch?14:08
so I look for the previous * without \ or * ?14:08
← eGGsha left14:08
← D-Boy left14:10
← magneticduck left14:11
Absolute0 osse: I don't think that would work - any other suggestions?14:11
← s8321414 left14:12
canton7 Absolute0, branches are represented as vertical lines. merges happen when two lines join14:12
← geoid left14:13
→ chris64 joined14:13
chris64 hi14:13
→ str joined14:13
← chris64 left14:14
Absolute0 canton7: it's all a mess - I can't make sense of it14:15
→ D-Boy joined14:15
Absolute0 I worked on a new branch for like a year, the foolishly decided to merge into master since I was lazy to checkout that branch each time14:15
now the original master branch is needed :(14:15
← tureba left14:16
canton7 Absolute0, it takes practice :P14:16
'gitk --all' is a more graphical way of viewing the same thing14:16
→ ech0s7 joined14:16
→ jalopezsilva joined14:16
→ Meeps joined14:16
Absolute0 let me try that14:17
ech0s7 i would create a branche with current changes (not commited), and then continue to develop from previous state, how can i do ?14:17
← Meeps left14:18
Absolute0 git stash; git stash pop14:18
← dopesong left14:18
→ Meeps joined14:18
_ikke_ ech0s7: changes not comitted don't belong to any branch14:18
Absolute0 git stash -- undo all current changes but keep them around.14:18
do whatever you need to do14:18
git stash pop -- get back uncommited changes14:18
→ dopesong joined14:18
Absolute0 no gitk --all is the same thing14:19
← crose left14:19
ech0s7 _ikke_: so what do you suggest ? i would commit those changes in a "experimental branches"14:20
_ikke_ ech0s7: yes14:20
← Joel left14:20
← smw left14:20
← zivester left14:20
→ jost joined14:21
← jalopezsilva left14:21
canton7 Absolute0, the easiest way of navigating git history is through a history viewer like that14:21
Absolute0 Doesn't git merge merge the logs as if they were always on the same branch?14:22
← eka left14:22
Absolute0 I usually use tig14:22
it's the same thing but uses ncurses14:22
← Meeps left14:22
canton7 depends whether the merge fast-forwards14:22
ech0s7 _ikke_: i would create a experimental branches, and commit in it all not commited changes that i have in my working directory14:23
← Spacew00t left14:23
→ shlant joined14:24
→ NeverDie joined14:24
→ jokester joined14:25
→ fullstack joined14:25
shlant morning all. I have .git/hooks/post-receive. It echo's something then runs a curl command. It has 755 permissions. Any idea why nothing happens when I push?14:25
_ikke_ Does it contains a shebang line?14:25
Absolute0 canton7: which merge does `git checkout master && git merge X` do?14:25
→ kadoban joined14:26
canton7 Absolute0, that depends14:26
Absolute0, !ff14:26
gitinfo Absolute0: A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf14:26
→ mellernoia-work joined14:26
Absolute0 hmm, gitk is saying stuff like parent, child14:26
maybe I just need one of those...14:26
Parent: 7eb41717b2e75306d40f81c8bed22a5a00d0ef4b (added notifcations to monthly auth report if resident doesnt have full authorization)14:26
← vigintas left14:27
Absolute0 Parent: 82951d792e8d891a0b4117c190244a9ed1acd4c9 (ellipses on notes)14:27
Child: 274d25a970cc4a7e3f95e1a52d724e48cc6ed283 (level alerts email)14:27
Branches: cbotracking-version, master, remotes/origin/master14:27
← mellernoia left14:27
osse Absolute0: remove --all from my suggestion and see then14:27
← ilmgb left14:27
→ vigintas joined14:27
→ ilmgb joined14:27
→ phaleth joined14:27
shlant _ikke_: https://gist.github.com/MrMMorris/ba1657dc1dd1c793a4f914:28
→ magneticduck joined14:28
osse Absolute0: each * is a commit.14:28
← NeverDie left14:28
← ilmgb left14:28
→ kpease joined14:29
→ ilmgb joined14:29
← krawchyk_ left14:29
→ Spacew00t joined14:29
← jokester left14:29
← fullstack left14:29
→ NeverDie joined14:30
← negaduck left14:30
→ t4nk059 joined14:30
Absolute0 I think I found the commit I need.14:30
→ MattMaker joined14:30
→ xlegoman joined14:30
Absolute0 gitk showed it right before the merge14:30
git log did not14:30
Or I missed it.14:30
← jmatth left14:30
→ wakd joined14:30
osse gitk runs git log so...14:31
→ atomicb0mb joined14:31
→ geoid joined14:31
→ ajf- joined14:31
→ daivyk joined14:32
Absolute0 git log --merges14:32
← t4nk059 left14:33
→ Joel joined14:33
osse if you found the merge you can use def5678~1 to refer to the commit before it14:33
← FabTG left14:33
← Mocramis left14:33
← MattMaker left14:34
← xlegoman left14:34
→ Meeps joined14:35
← skylite left14:36
← Limes_ left14:36
→ Limes_ joined14:37
→ eka joined14:37
← Meeps left14:38
← lb left14:38
→ jmpp joined14:39
← nnyk_ left14:41
← freeze left14:42
← ech0s7 left14:42
← oojacoboo left14:42
→ negaduck joined14:44
→ freeze joined14:44
→ fahadash joined14:44
← fahadash left14:44
→ fahadash joined14:44
← fahadash left14:44
→ fahadash joined14:44
← dimi1947 left14:45
→ nnyk_ joined14:46
→ cmoneylulz joined14:47
→ cbonobo joined14:48
Timvde Is there an easy way to rebase a branch on master, and squash all commits into one?14:49
→ m0nkmaster joined14:50
Timvde If not, a little vim magic will do so I don't have to change "pick" to "fixup" 20 times :)14:50
→ clemf joined14:50
← eka left14:50
canton7 Timvde, git merge --squash will probably do what you're after14:51
→ eka joined14:51
← acolson left14:51
tomboy64 otherwise, d, w, i, f, space14:51
then all other lines, just press .14:51
← madewokherd left14:52
Timvde tomboy64: cwf instead of dwif, I win ;)14:52
tomboy64 :p14:52
← atomicb0mb left14:53
Timvde or :%s/pick/fixup/ (and then change the first back) or visual select and :<,>s/...14:53
tomboy64 vim's just awesome14:53
← rockstar_ left14:53
Timvde but it's not about the vim trick, this just looks like something that could happen regularly, and I was wondering if git can do it for me14:53
tomboy64 yeah14:53
what canton said14:53
Timvde canton7: eh, the man page looks a little unclear to me.. :/14:53
← ___thomasreggi__ left14:54
← Internet13 left14:54
← yarnfive8 left14:54
→ oojacoboo joined14:55
← m_ben left14:55
Timvde Okay, found a StackOverflow question about it: it's not *exacly* what I want14:55
I don't want to do the merging yet :)14:55
canton7 Timvde, imagine you typed 'git checkout master; git merge squash', but the merge commit isn't a merge commit - it's a single commit containing anything that would have been merged14:55
... but it's not a merge commit, because it only has one parent14:55
it will do the same as what you're doing: create a new commit containing everything that's currently in the branch14:55
Timvde I guess I could do some git resets afterwards14:55
canton7 resets to do what?14:55
Timvde canton7: wait, does master move or not?14:56
← rscata left14:56
canton7 ah, point, it will14:56
Timvde I only want to rewrite the branch14:56
canton7 add --no-commit, switch to another branch, commit, done14:56
← elsevero left14:57
→ Internet13 joined14:57
→ Skruff joined14:57
← rkazak left14:58
→ caz joined14:58
caz Hello14:58
gitinfo caz: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.14:58
Marenz-work !backup14:59
gitinfo 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/#backups14:59
→ Bootinbull joined14:59
→ thinkxl joined14:59
→ AndreSomers joined15:00
← boucman_2 left15:00
→ compeman joined15:00
Timvde Okay, I learned some new stuff today, but I think I'll go for a normal rebase and just change pick to fixup, it'll be easier :p15:01
← acolson_ left15:01
Timvde Thanks guys :)15:01
caz I'm trying to set a git infrastructure and I'm asking to you guys what's the best way to do: We have a develop PC that runs an Apache with our current code (using FTP since then (ouch)). We plan to use Git as gitflow with a master to tag version, a develop branch that would be trunk and features that would be for features.15:01
← Limes left15:01
→ Limes joined15:01
caz We use 2 servers : one for apache and another one for git (that also have backups...etc)15:02
→ hagabaka joined15:02
→ acetakwas joined15:02
→ atomicb0mb joined15:02
caz Each developper should be able to connect to git and pull develop branch (or also branch) and each updated made to develop branch should be replicated to apache server15:03
← roelmonnens left15:03
caz Right now I set up the main git to my backup server. I can fetch from dev PC or apache server15:03
I successfully created develop branch which I switched to15:03
← magneticduck left15:03
caz Now, I'm wonder how can I do to update automaticall apache server when the main (backup) server receive a push15:04
I though about hooks but I clearly don't know how and which one to use15:04
If someone could give a hand, that would be really appreciated15:05
→ Wetmelon joined15:05
Marenz-work caz, are you using something like gitolite?15:05
← AndreSomers left15:05
← hagabaka left15:05
caz Nope, It's standard git installation15:05
No github, no gitolite15:05
Marenz-work I'd suggest to read up here: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks15:06
← fscala left15:06
caz I did but I clearly mix between hooks on backup servers, hooks on apache server and so on15:07
kadoban caz: !deploy has some ideas15:07
gitinfo caz: 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.html15:07
← Saturn812 left15:07
← shlant left15:07
kadoban Despite the TLD, it's not gitolite specific. Although if you have multiple devs working on this, gitolite would be a good idea IMO.15:07
caz Can I switch easily to gitolite with git already set up?15:08
kadoban Pretty easily, yeah.15:09
→ fscala joined15:09
caz Ok, I'll get a look then15:09
Thank you15:09
← atomicb0mb left15:11
← Sceorem_ left15:11
← pratikmallya left15:11
← Akagi201 left15:12
→ sctskw joined15:13
→ dreiss joined15:13
← malukenho left15:13
→ Nizumzen joined15:14
← PinkPickles left15:15
← deception1 left15:15
→ malukenho joined15:15
→ happy-dude joined15:16
→ ShooterMG joined15:16
→ madewokherd joined15:17
→ boucman_2 joined15:17
→ jalopezsilva joined15:17
← sctskw left15:17
→ gasbakid joined15:19
→ birett joined15:19
← dopesong left15:20
→ dopesong joined15:20
→ AndreSomers joined15:21
→ hagabaka joined15:22
← jalopezsilva left15:22
← dopesong left15:22
← harish_ left15:22
→ harish_ joined15:22
← kp666 left15:23
→ slentzen joined15:23
← oojacoboo left15:24
→ kuba1 joined15:25
← ShooterMG left15:26
→ jannis joined15:26
jannis hi, if I want to reset to a specific revision number I need to do: git reset --hard <rev number>15:27
→ abacuspowers joined15:27
jantje locally, yes. Note that you will lose every changes you did after that15:27
Marenz-work jannis, you have an odd way to phrase questions :P15:27
jannis but how do I get <rev number>, I tried to use the hash from git log but it couldn't parse that15:27
→ pabs3 joined15:28
jannis Marenz-work: wasn't done :S15:28
Marenz-work that should work though15:28
I assume you applied it without the <>'s15:28
jannis yes of course15:28
haha15:28
like this: git reset --hard 3684706a121f9d9e1ccfc4a2bbb98f698eb0451415:29
pabs3 how do I find out if there are any branches that aren't in sync with their corresponding remote branch or tags that haven't been pushed to a remote?15:29
milki uh, check the remote and see if it matches?15:29
→ sfan786 joined15:29
Guest35651 jannis: you can read about references to commits here:15:30
← bonswouar left15:30
jannis fatal: Could not parse object '3684706a121f9d9e1ccfc4a2bbb98f698eb04514'.15:30
Guest35651 https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html15:30
← sinkensabe left15:30
jannis the only examples I see online have a much shorter hash15:30
pabs3 milki: how do I do that automatically?15:30
← zumba_ad_ left15:30
milki pabs3: by scripting it15:30
→ krawchyk joined15:30
pabs3 ...15:31
Guest35651 janis: actually it is strange thing... may be it is unexisted hash?15:31
milki pabs3: !fish15:31
gitinfo pabs3: In the long run, it is much better to give pointers to answers than the answers themselves.15:31
bremner now I'm hungry.15:31
← pabs3 left15:31
Marenz-work jannis, does git show <hash> work?15:31
milki pabs3: is there something you dont understand or are you missing the commands to do certain actions?15:31
→ magneticduck joined15:31
← AaronMT left15:31
← leeN left15:32
→ pratikmallya joined15:32
milki lol15:33
>.>15:33
→ gunnaro joined15:33
Guest35651 janis: and you can use only couple of fisrt symbols of hash, like 368470615:33
milki: =)15:33
jannis Guest35651: sure, but how I can automate getting that?15:33
Guest35651 → Ovsyanka15:33
→ AaronMT joined15:33
jannis I think I know what the issue is now anyway, give me two seconds to test15:33
→ Kamuela joined15:33
→ rpage joined15:33
→ jfran joined15:34
Kamuela I was just minding my own business but now I'm in a merge hole15:34
← ProbabilityMoon left15:34
← geoid left15:34
jannis is there a way to specific a working directory with git, or does it only work with current working directory15:34
← jmpp left15:34
jannis if that makes sense15:34
Ovsyanka jannis: automate what?15:34
→ pratikma_ joined15:34
→ thiago joined15:34
jannis Ovsyanka: getting the short form of the revision number15:35
don't worry about that, it's tangental to my actual problem15:35
← jceb left15:35
Kamuela and just like that it's fixed with a bit of fiddling15:36
milki jannis: git --work-tree15:36
Ovsyanka jannis: yes. yoy can use core.worktree in config, or another ways. you can google "git change working tree"15:36
milki jannis: man git shows the core flags you can pass15:36
gitinfo jannis: the git manpage is available at http://jk.gs/git.html15:36
jannis Thanks15:36
← jost left15:36
← str left15:37
← redeemed left15:37
← EduardoMartins left15:37
jannis ok thanks, I've pieced together the problem, thanks for your help15:38
← pratikmallya left15:38
jannis I needed -C, I am calling git from make15:38
make adds an extra layer on confusion15:38
← clemf left15:40
→ MechtiIde joined15:40
← d0nkeyBOB left15:42
← m0nkmaster left15:42
→ MattMaker joined15:42
← Balliad left15:42
← compeman left15:42
→ Karkus joined15:43
← Kamuela left15:43
→ zadock joined15:43
→ Maple__ joined15:43
→ pantsman- joined15:44
← Alienpruts left15:44
→ clemf joined15:46
→ Kamuela joined15:46
Kamuela I changed my git remote URL. Is there a straightforward remote switch or do I delete a remote and then re-add a remote?15:46
← MattMaker left15:47
→ texasmynsted joined15:47
→ chuchunaku joined15:47
→ jost joined15:48
texasmynsted How would I see changes in a directory that is gitignored? Example: .gitignore has '.idea/' in it but I am seeing changes to files directly under that directory.15:48
kadoban git remote set-url15:48
texasmynsted: .gitignore only has any effect on /untracked/ content. If it's tracked, the ignore doesn't do anything anymore.15:49
texasmynsted: And it doesn't actually stop you from tracking stuff, it just makes it (much) harder to do accidentally.15:49
← chuchunaku left15:49
texasmynsted So I can git rm the offending files and be fine?15:50
→ sigdk joined15:50
sigdk hi. should I 'refresh' somehow gitconfig after I add an alias ?15:51
texasmynsted like git rm —cached .idea/foofile .idea/barfile15:52
right?15:52
→ AaronMT_ joined15:53
→ unreal_ joined15:54
_ikke_ sigdk: nope15:54
← bvi left15:54
sigdk I added this line in my gitconfig: gl = log --graph --full-history --all --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s" under [alias] (I'm wondering if I did it correctly). The thing is that I don't see the effects of this shortcut15:54
_ikke_ sigdk: git reads it on every command execution15:54
sigdk: You cannot alias built-in commands15:54
kadoban texasmynsted: If that's what you want to do, sure. I don't know the state you want to end up with. That will stop tracking those files.15:54
_ikke_ sigdk: sorry, read it wrong15:55
texasmynsted They should have been ignored, and thus should not be tracked. They should exist locally but not it git.15:55
← AaronMT left15:55
← boucman_2 left15:55
texasmynsted So by —cached, that should untrack them but leave them alone locally right?15:55
_ikke_ texasmynsted: yes, git rm --cached15:55
sigdk _ikke_, so, is there something wrong with the alias ?15:55
texasmynsted :-)15:56
Ty15:56
_ikke_ sigdk: not that I see15:56
← kuba1 left15:56
→ samw joined15:56
→ tanath joined15:56
← unreal left15:57
← gfixler left15:57
_ikke_ sigdk: How are you calling the alias?15:57
sigdk _ikke_, yeah... it was my mistake :)15:57
_ikke_ :-)15:58
→ daito joined15:58
← krawchyk left15:58
texasmynsted Is there a way to say stop tracking any tracked files under that path? Because if I do git rm —cached .idea/* that will only untrack files that ls could find locally right?15:58
grawity git rm -r --cached .idea16:00
→ mwhooker joined16:00
← jost left16:00
grawity (or you can quote the ".idea/*" and let Git itself expand it)16:00
← sfan786 left16:00
texasmynsted facepalm16:00
texasmynsted thank you16:00
← synthroid left16:01
→ SuzieQueue joined16:01
→ snowcycle joined16:01
→ jost joined16:01
← ilmgb left16:02
← daito left16:02
→ Guest45288 joined16:02
Eugene !untrack16:02
gitinfo To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging16:02
Guest45288 ciao16:03
→ ilmgb joined16:03
Guest45288 !list16:03
gitinfo [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist16:03
← Guest45288 left16:03
→ kuba1 joined16:03
← TomyWork left16:03
texasmynsted wait, this will cause somebodies file to get deleted?16:04
kadoban texasmynsted: If they merge that change in, yes. But they'll always be able to get it from history.16:04
texasmynsted So it wont delete my local copy but it will delete somebody elses?16:04
← Suzeanne left16:04
kadoban Yes16:05
→ aendrew joined16:05
texasmynsted wat16:05
← mbrzuzy left16:05
← Imaginativeone left16:05
→ blinkdesign joined16:05
_ikke_ texasmynsted: git cannot make a difference between deleted only locally or deleted completely16:06
milki theres no history mechanism to say "delete this but dont really"16:06
→ basis joined16:06
← subscope left16:06
→ Akagi201 joined16:07
← ilmgb left16:07
→ dimi1947 joined16:07
texasmynsted I do not want to _delete_, I want to _untrack_16:07
→ patrick99e99 joined16:07
→ modocache joined16:07
texasmynsted It seems it can understand the difference when I tell it —cached16:07
grawity that's the same thing16:07
what other people see is16:08
the file used to exist16:08
and now it doesn't exist16:08
→ krawchyk joined16:08
grawity there is no difference between --cached and not16:08
← slentzen left16:08
→ sinkensabe joined16:08
dimi1947 I tried to merge...and now being in master whatever changes I did in the other branch...in master are staged for commit...why that?16:08
grawity --cached only affects your local repo16:08
← simonsmith_io left16:09
→ blimpse joined16:09
kadoban texasmynsted: git doesn't have the distinction … and usually it would be more confusing than useful having the distinction.16:09
← krawchyk left16:09
texasmynsted sigh ok16:09
kadoban texasmynsted: Especially since it's hard to lose content that way, since as I mentioned the deleted files are in history anyway.16:09
→ akiva joined16:09
← blinkdesign left16:10
→ krawchyk joined16:10
← pratikma_ left16:11
→ murgi joined16:11
← kuba1 left16:11
← {AS} left16:11
→ atomicb0mb joined16:11
→ kuba1 joined16:12
texasmynsted shrug16:12
← anth0ny left16:12
→ jmpp joined16:12
→ Not_Whatever joined16:13
aendrew Hey folks, am worried I'm doing something seriously wrong. I have a PR I'm wanting to resolve conflicts on (Author is MIA but I still want to give him credit), so have checked it out from refs/pull/{prnumber}/head. How do I now resolve the merge conflict and merge back into master? The PR is several commits behind HEAD and I'm thus not sure how to do so...16:13
Apols if this is massively noobish, I have googled it a bit...16:13
→ __main__ joined16:13
Eugene changed the topic to: Welcome to #git, the place for git help and unmaintained perl | Current stable version: 2.6.2 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-svn: now you have two problems.16:13
Eugene aendrew - !eek16:13
gitinfo aendrew: [!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=zz7NuSCH6II16:13
→ netz joined16:13
Eugene set mode: -o16:13
grawity aendrew: well the usual way of merging is, checkout master, git merge refs/pull/foo/head16:13
aendrew: and *then* deal with conflicts16:14
← duderonomy left16:14
Eugene If you're updating a PR, you may want to rebase instead of merging16:14
It's very similar, but looks "cleaner" in history16:14
← skapunker left16:14
netz yay. lucky for me I had a mirror repo on my machine and was able to convert it from a mirror/bare to 'normal' :)16:14
→ skapunker joined16:15
aendrew Eugene: Okay, that's probably closer to what I'm doing. I'm trying to follow the workflow at http://contribute.jquery.org/repo-maintainers-guide/ instead of just using GitHub's interface.16:15
Eugene I can't be arsed to read that this morning, but it probably says "rebase"16:15
netz grawity: sup man16:15
→ Literphor joined16:16
← sinkensabe left16:16
← modocache left16:16
← cvanball left16:16
→ bvi joined16:16
→ Phoenixz joined16:16
← Spacew00t left16:16
aendrew Eugene: Ha, fair enough. And yes, it does. Okay, so if I'm rebasing, do I ever use mergetool or what? Am a bit lost as to what the difference is, beyond the fact that merge creates an extra commit.16:16
Eugene merge creates a new commit reconciling the two things you're merging16:17
← pozitron left16:17
← patrick99e99 left16:17
← netz left16:17
Eugene rebase takes your work(what's being merged) and splices it on top of whatever you're merging-into16:17
← murgi left16:17
→ pozitron joined16:17
Eugene !vs16:18
!rebase16:18
gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.16:18
→ sinkensabe joined16:18
Eugene Not the factoid I wanted, but I'll take it16:18
→ imachuchu joined16:18
→ zumba_a__ joined16:18
← malukenho left16:19
Eugene Rebasing is preferred for big projects because it forces you to make the feature/bugfix/whatever cleanly apply onto "current"16:19
So it can be viewed as a single addition16:19
aendrew OHHHHHHH. So, when folks on github say to "rebase your commits", they're not saying "squash them with rebase -i" (though that might be part of it), they're saying "reconcile it against master by doing git rebase -i master"?16:19
Eugene Correct16:19
aendrew 💥 That makes sense. I'll see how far I can get. Thank you so much!16:19
Eugene The point is "cleanly apply" not "single commit"16:19
Good luck!16:19
← bb010g left16:20
← Not_Whatever left16:20
← Literphor left16:20
← krawchyk left16:21
aendrew Okay, that was quick. I think why I've had issues doing that is I'm now getting "error: could not apply {hash}... {commit msg}". What do I do now?16:21
← NeverDie left16:21
← Vile1 left16:21
→ leeN joined16:22
← pozitron left16:22
aendrew Wait, I got it!16:22
→ pozitron joined16:22
aendrew Fix things, git add, git rebase --continue?16:22
← atomicb0mb left16:22
→ aretecode joined16:23
Eugene Yup.16:23
aendrew Amazing. I think I've levelled up. Thanks a ton, Eugene!16:23
← texasmynsted left16:23
aendrew eugene++16:23
Eugene !next16:23
gitinfo Another satisfied customer. NEXT!16:23
← jannis left16:23
← doener left16:25
→ micechal joined16:25
zumba_a__ good morning folks, other than gitk, which free one are you using and that you think is the one you really like?16:25
→ Limech__ joined16:25
→ VirtuallySuzen joined16:25
milki i relaly like git16:25
→ armyriad2 joined16:26
← armyriad2 left16:26
zumba_a__ oh sorry, i mean gui16:26
← armyriad left16:26
zumba_a__ gui interface for git16:26
i used git cli a lot too16:26
→ HobGoblin joined16:26
Eugene !gui16:27
gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.16:27
Eugene Also not the factoid I wanted. Useless bot.16:27
HobGoblin → Guest1489516:27
→ NeverDie joined16:27
→ Vgr_ joined16:27
← Vgr_ left16:27
→ Vgr_ joined16:27
→ sword` joined16:27
kadoban IMO a GUI is too limited to do everything in git, and the CLI is very useful once you learn it, so one isn't needed.16:27
Eugene !guis16:27
gitinfo Popular GUIs for Git are listed on the website: http://git-scm.com/downloads/guis16:27
→ snowcycl_ joined16:27
Eugene I'm a fan of SmartGit myself. YMMV.16:27
zumba_a__ cool16:27
← tubuliferous left16:27
← seagoj left16:27
← HarryHallman left16:27
← varesa left16:27
zumba_a__ I'll check it out16:27
Thanks16:27
← micechal_ left16:27
ilmari if you're an emacs user, magit and git-gutter are handy16:28
← freeze left16:28
← akkad left16:28
← benbergman left16:28
← weyer left16:28
← gv left16:28
← Caelum left16:28
← blarson_ left16:28
← skoopty left16:28
← crash\ left16:28
← rcn left16:28
zumba_a__ no, not an emacs16:28
milki a gui is probably useful for visually representing the history graph but not necessarily for manipulating it16:28
← Guest14895 left16:28
→ Guest14895 joined16:28
zumba_a__ just a regular iterm2 client16:28
though I have sublime text16:28
→ Spacew00t joined16:28
← kuba1 left16:28
→ skylite joined16:28
← MechtiIde left16:28
← caz left16:28
← in3xes left16:29
← Limech_ left16:29
← Guest67588 left16:29
← orzo left16:29
← tchan left16:29
← heroux left16:29
← pokergod left16:29
← brewmaster left16:29
← data left16:29
← Thra11 left16:29
← ScottG489 left16:29
← crater2160 left16:29
← nothingmuch left16:29
← oremanj left16:29
← iamtakingiteasy left16:29
← BooK left16:29
← PaulePanter left16:29
← scoobertron left16:29
← andres left16:29
← timewalker left16:29
zumba_a__ milki: yes, that was my main purpose though I have edited my gitconfig file16:29
I added this alias - hist = log --pretty=format:\"%C(yellow)%h %Creset%ad%Cred%d %Creset%s%Cblue [%an]\" --date=short --decorate --graph --all16:29
lolmac → Guest1974116:29
→ crash\ joined16:29
← snowcycle left16:29
← AaronMT_ left16:29
← magneticduck left16:29
← Joel left16:29
← livingstn left16:29
← AnalogSuzen left16:29
← sword left16:29
← fracting left16:29
← sgfgdf left16:29
← graChe28 left16:29
← ThomasLocke left16:29
← Guest19741 left16:29
← catsup left16:29
← Vgr left16:29
← Sleepy63 left16:29
← vith left16:29
← drager_ left16:29
← moird left16:29
← kanzure left16:29
← felixn left16:29
← UukGoblin left16:29
← kriskropd_ left16:29
← cwillu_at_work left16:29
← jas4711 left16:29
← grammar_nazi left16:29
← neurodam1ge left16:29
← DolphinDream left16:29
← Dewin left16:29
← nutron left16:29
← zz_ag4ve left16:29
← shachaf left16:29
← avtobiff left16:29
→ jknetl joined16:29
Guest14895 → UukGoblin16:29
→ AaronMT joined16:29
← jknetl left16:29
→ maletor joined16:30
→ blarson joined16:30
→ freeze joined16:30
→ benbergman joined16:30
→ spb_ joined16:30
→ tubuliferous joined16:30
→ boner joined16:30
→ nothingmuch joined16:30
← irqq left16:30
→ PaulePanter joined16:30
→ tehtraveler joined16:30
→ heroux joined16:30
→ skoop joined16:30
→ orzo joined16:30
→ BooK joined16:30
→ oremanj joined16:30
→ iamtakingiteasy joined16:30
→ {AS} joined16:30
→ jknetl joined16:30
→ data joined16:30
→ ubuntu joined16:30
→ shachaf joined16:30
→ neurodamage joined16:30
→ brewmaster joined16:30
→ catsup joined16:30
→ gv joined16:31
→ kanzure joined16:31
ubuntu → Guest2719216:31
→ sgfgdf joined16:31
→ drager joined16:31
→ armyriad joined16:31
→ synthroid joined16:32
→ xlegoman joined16:32
← jknetl left16:32
zumba_a__ I saw this too - http://blog.hswolff.com/the-best-mac-git-gui/16:32
→ nate_c joined16:32
→ tgunr joined16:33
→ weyer joined16:33
zumba_a__ btw, I moved a file to another location using mv and not git mv16:33
→ HarryHallman joined16:34
→ felixn joined16:34
→ Dewin joined16:34
→ zz_ag4ve joined16:34
→ jmckind joined16:34
→ nerd joined16:34
→ m0viefreak joined16:34
ilmari zumba_a__: git rm the old name, git add the new name. the result is the same16:34
zumba_a__ thanks16:34
← spb left16:34
zumba_a__ i was planning to reset it then use git mv16:35
spb_ → spb16:35
zumba_a__ so git mv is a shortcut to the command you posted?16:35
→ Pookz joined16:35
→ varesa joined16:35
← catsup left16:35
zumba_a__ nice, it's now showing renamed: :D16:35
→ seagoj joined16:35
→ pratikmallya joined16:36
→ Repox joined16:36
ilmari git doesn't track renames, it just detects them at display time16:36
zumba_a__ k16:36
→ catsup joined16:36
← gunnaro left16:36
→ akkad joined16:36
← xlegoman left16:36
→ scoobertron joined16:37
→ ThatGuy joined16:37
← qwertyo left16:37
← Kamuela left16:38
→ bnpmr joined16:38
← ThatGuy left16:39
→ pratikma_ joined16:39
← bnpmr left16:39
→ Ahmed90 joined16:39
→ ThomasLocke joined16:40
← halas left16:41
→ jas4711 joined16:41
→ Thra11 joined16:41
← armyriad left16:41
→ MechtiIde joined16:41
← catsup left16:41
← sinkensabe left16:42
→ ScottG489 joined16:42
← pratikmallya left16:42
→ fracting joined16:42
← astrofog left16:42
→ Caelum joined16:42
→ catsup joined16:42
→ rcn joined16:42
→ DolphinDream joined16:42
→ in3xes joined16:42
→ cwillu_at_work joined16:42
→ Joel joined16:42
→ armyriad joined16:42
→ vith joined16:42
→ tchan joined16:43
→ magneticduck joined16:43
→ graChe28 joined16:43
→ Sleepy63 joined16:43
→ crater2160 joined16:43
→ grammar_nazi joined16:43
← dreiss left16:43
→ moird joined16:43
→ nutron joined16:44
← HarryHallman left16:44
→ HarryHallman joined16:44
← jost left16:45
→ durham joined16:45
→ blinkdesign joined16:45
→ kriskropd_ joined16:45
← Hounddog left16:46
← Phoenixz left16:46
→ Phoenixz joined16:47
← catsup left16:47
→ dreiss joined16:47
← lindenle left16:48
→ PsuzeannePsy joined16:48
→ catsup joined16:48
→ lindenle joined16:48
← kurkale6ka left16:48
← __main__ left16:48
→ modocache joined16:49
→ skcin7 joined16:49
→ gopar joined16:50
→ sinkensabe joined16:50
← sinkensabe left16:50
← SuzieQueue left16:51
→ __main__ joined16:51
← catsup left16:53
← skcin7 left16:53
→ catsup joined16:54
→ MattMaker joined16:54
→ crose joined16:55
→ zacg joined16:56
← zacg left16:56
→ zacg joined16:56
→ daito joined16:56
← vigintas left16:56
→ vigintas joined16:56
← blimpse left16:57
→ cbreak joined16:57
← rpage left16:58
→ vigintas1 joined16:58
← catsup left16:58
← MattMaker left16:59
→ catsup joined16:59
→ krawchyk joined17:00
→ anth0ny joined17:00
← daito left17:00
→ mkoskar joined17:01
← vigintas left17:01
vigintas1 → vigintas17:01
← Spacew00t left17:01
→ teknozulu joined17:01
→ daito joined17:02
← bongjovi left17:02
← jmpp left17:02
← alanwill left17:02
→ gfixler1 joined17:04
← D-Boy left17:04
← catsup left17:04
→ alanwill joined17:04
→ geoid joined17:05
→ catsup joined17:05
→ FroMaster joined17:06
← latenite__ left17:06
→ blimpse joined17:06
→ D-Boy joined17:06
→ jteneyck joined17:06
← daito left17:06
← dreiss left17:06
← thiago left17:06
← freimatz left17:07
← basis left17:09
← magneticduck left17:09
→ scarabx joined17:09
← geoid left17:09
→ Spacew00t joined17:10
← catsup left17:10
← Repox left17:11
→ catsup joined17:11
← blimpse left17:12
Vgr_ → Vgr17:12
← vigintas left17:12
← converge left17:12
→ chuchunaku joined17:13
→ Gitzilla joined17:14
→ shlant joined17:15
← Akagi201 left17:15
← synthroid left17:15
← mwhooker left17:16
← catsup left17:16
← Karkus left17:16
→ jmpp joined17:16
shlant hi all. Can someone help me understand why this post-receive hook isn't running? permissions are correct. it's in .git/hooks. I do a push and nothing happens. https://gist.github.com/MrMMorris/ba1657dc1dd1c793a4f917:16
→ catsup joined17:17
osse shlant: what's its name ?17:17
exactly17:17
shlant: also, post-receive is meant to be on the server17:19
→ ki0_ joined17:19
CentaurWarchief → griggs17:20
← chuchunaku left17:20
→ magneticduck joined17:21
→ phantombeta joined17:21
→ Sasazuka joined17:21
DSH105- → DSH10517:22
← ki0 left17:22
← catsup left17:22
→ catsup joined17:22
← abacuspowers left17:22
→ converge joined17:23
shlant osse: so it wouldn't work with github? All I want if for the curl command to run after push17:23
iamdevnul shlant: https://developer.github.com/v3/repos/hooks/17:24
← noisebleed left17:24
osse shlant: no it wouldn't17:25
iamdevnul that should tell you what you need to know about githuh and post-receive hooks17:25
→ roelmonnens joined17:25
Eugene git-huh: explains what the last command's error means17:25
shlant iamdevnul: thanks I'll take a look17:26
→ blimpse joined17:26
iamdevnul np17:27
→ sfan786 joined17:27
← ki0_ left17:27
← catsup left17:27
← zacg left17:28
→ HardWall joined17:28
→ EduardoMartins joined17:28
→ kaiza joined17:30
→ durham_ joined17:30
griggs → CentaurWarchief17:30
→ StuartMI joined17:30
→ catsup joined17:30
→ synthroid joined17:31
→ timewalker joined17:31
→ avtobiff joined17:31
→ andres_f joined17:31
→ malukenho joined17:32
← AaronMT left17:32
← arup_r left17:32
← durham_ left17:32
→ romankl joined17:32
← gfixler1 left17:33
→ xlegoman joined17:33
← durham left17:33
→ arup_r joined17:33
→ khmarbaise joined17:33
← marcogmonteiro left17:33
→ mbrzuzy joined17:33
→ gfixler joined17:33
← skirk left17:33
← catsup left17:35
← borkr left17:35
→ catsup joined17:36
fahadash When I run the diff command I see @@ -1 +1, 2 @@ ; what does that mean?17:36
→ sentriz joined17:36
← roelmonnens left17:37
← xlegoman left17:37
→ AaronMT joined17:38
_ikke_ That's unified diff format17:39
← malukenho left17:39
_ikke_ fahadash: https://en.wikipedia.org/wiki/Diff_utility#Unified_format17:39
→ sjokkis joined17:39
→ durham joined17:40
← jackeroo_marc left17:40
← arup_r left17:40
← catsup left17:41
→ catsup joined17:41
→ jrnieder joined17:42
→ aranea joined17:43
→ thiago joined17:43
sjokkis Does this output mean that a newline has been removed, or added? http://pastebin.com/BXXT8L4c17:43
_ikke_ Has been added iirv17:44
← krawchyk left17:45
→ krawchyk joined17:46
→ gasbakid_ joined17:46
← catsup left17:46
← krawchyk left17:46
→ catsup joined17:47
andres_f → andres17:47
← gasbakid left17:48
← alanwill left17:49
→ krawchyk joined17:51
→ intellix joined17:51
← catsup left17:52
← k_j left17:52
→ d0nkeyBOB joined17:53
→ catsup joined17:53
→ ___thomasreggi__ joined17:53
→ justanot1eruser joined17:53
→ abacuspowers joined17:54
→ arup_r joined17:54
← hfp_work left17:54
→ mwhooker joined17:54
← hfp left17:54
→ borkr joined17:55
→ cdg_ joined17:55
→ jrahmy joined17:55
← tinajohnson left17:55
→ ncd|leeN joined17:56
→ paul424 joined17:56
→ hfp_work joined17:56
← krawchyk left17:56
→ hfp joined17:56
→ whitby joined17:57
← cdg left17:57
← catsup left17:58
→ Limes__ joined17:58
→ catsup joined17:59
← leeN left17:59
← Limes_ left18:02
← bvi left18:02
← blinkdesign left18:02
← durham left18:02
← justanot1eruser left18:03
→ python903 joined18:03
python903 → git_noob18:03
→ krawchyk joined18:04
← catsup left18:04
← git_noob left18:04
→ catsup joined18:04
→ durham joined18:05
→ k_j joined18:05
→ MattMaker joined18:06
→ geoid joined18:06
← krawchyk left18:07
→ davispuh joined18:07
← heftig left18:07
← dimi1947 left18:07
→ krawchyk joined18:08
← nnyk_ left18:08
→ heftig joined18:08
← tristanp left18:08
→ Limester joined18:09
→ tristanp joined18:09
← axl_ left18:09
← catsup left18:09
← ThomasLocke left18:09
← vikas027 left18:10
← krawchyk left18:10
→ catsup joined18:10
← geoid left18:11
→ Pseudocrat joined18:13
← hfp_work left18:13
jantje hi18:13
← encod3 left18:13
→ asti` joined18:13
jantje I'm trying to apply a git diff $branch1 $branch2 , using git apply --3way /tmp/patch ; but in the end, git diff shows no changes.18:14
sigdk do the names in .gitignore aply also to the subdirectories ?18:14
asti` hello. can someone please tell me, what's the difference between `git merge` and `git pull` in terms of merging a feature branch into develop?18:14
← phaleth left18:14
← hfp left18:14
← toogy left18:15
jantje error: patch failed: file:line Falling back to three-way merge... Applied patch to ... with conflicts. .... so I expect a workspace with bunch of conflicts18:15
→ hfp_work joined18:15
← catsup left18:16
→ hfp joined18:16
→ catsup joined18:16
→ geoid joined18:17
tobiasvl asti`: pull does a fetch followed by a merge18:17
asti` okay.18:17
thanks a lot18:17
← synthroid left18:18
← troulouliou_div2 left18:19
→ synthroid joined18:19
← asti` left18:20
← catsup left18:21
→ catsup joined18:22
→ hfp_ joined18:22
→ hfp__work joined18:23
← hfp left18:23
hfp_ → hfp18:23
← hfp_work left18:23
hfp__work → hfp_work18:23
→ Nick-S joined18:24
← jrahmy left18:25
← Steve_Jobs left18:25
← kadoban left18:25
→ python90_ joined18:25
← python90_ left18:26
→ Jackneill joined18:26
→ python903 joined18:26
python903 → git_noob18:26
→ skered joined18:26
git_noob Hi there! How can I rename my "master" branch to "develop"? Can I then create a new "master" branch? Thanks!18:26
← Arsonide left18:26
→ Arsonide joined18:26
grawity yes18:27
← k_j left18:27
grawity yes18:27
you're welcome18:27
oh wait, 'how'18:27
← catsup left18:27
arand git_noob: Only locally?: git branch -m master develop18:27
grawity # git branch -m18:27
push the new branch, push --delete the old branch18:27
sigdk so, I'm having a python script with these 3 lines: env/ __pycache__/ *.pyc I use git add . to track all files but it adds also those under env. Any hints ? What am I doing wrong ?18:27
→ Steve_Jobs joined18:27
git_noob grawity: Got it. Thanks!18:28
arand: Got it. Thanks!18:28
→ catsup joined18:28
→ jceb joined18:28
← git_noob left18:29
← cdg_ left18:30
skered I'm guessing this is a svn question but doesn't anyone know if there's something like git-commit's -p for svn? GoogleFu gives me nothing but git-svn or patch sharing between the two.18:30
← scarabx left18:30
← MarkyC left18:31
← joki left18:31
→ MarkyC joined18:31
→ jokester joined18:32
← jmckind left18:32
sigdk it seems that .gitignore "doesn't work" for me... how do I track all my files ignoring the patterns specified in there ? all my files are new...18:32
soerenb !ignore_tracked18:33
gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.18:33
← catsup left18:33
jast git check-ignore can help with troubleshooting18:33
→ srcerer joined18:34
→ catsup joined18:34
← sentriz left18:34
sigdk soerenb, when I call "git add ." it adds everything... ignorying gitignore18:34
→ sentriz joined18:35
← borkr left18:36
→ rubyonrailed joined18:36
← converge left18:38
→ joki joined18:38
← catsup left18:39
→ jrahmy joined18:39
← filisko left18:39
→ catsup joined18:40
→ marc_v92 joined18:40
→ malukenh_ joined18:40
→ converge joined18:41
→ neurodrone_ joined18:41
→ tyreld joined18:41
→ Anamdil joined18:41
← tristanp left18:42
→ ilmgb joined18:42
← AaronMT left18:42
→ FabTG joined18:42
→ tristanp joined18:42
→ jason237 joined18:43
← Amandil left18:44
tobiasvl sigdk: that sounds normal. don't add them.18:44
← catsup left18:45
→ catsup joined18:46
← sdothum left18:46
tobiasvl or wait, maybe that's not normal18:46
I always forget what "git add ." does18:46
← ilmgb left18:46
sigdk I have a python project... and I want to ignore my virtual env18:47
→ ilmgb joined18:47
sigdk so there is a dir there called env, and I included it in gitignore18:47
but it seems that whenever I call 'git add .' it tracks everything... the files in this dir as well18:47
→ borkr joined18:47
sigdk I'm new with git18:47
tobiasvl do you have env/* in your .gitignore?18:48
→ AaronMT joined18:48
← gasbakid_ left18:48
tobiasvl git doesn't track directories, only files18:48
qsuscs "env" should suffice.18:48
tobiasvl yeah, but what about env/18:48
→ sdothum joined18:48
tobiasvl which sigdk wrote above18:48
qsuscs should also do18:48
except that it only aoolies to directories18:49
sigdk so, change env/ to env ?18:49
qsuscs try it18:49
← skylite left18:49
→ krawchyk joined18:49
sigdk qsuscs, no, it tracked again everything18:50
→ gasbakid_ joined18:50
qsuscs then the files are already tracked or staged or you're doing it wrong. !repro.18:50
gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.18:50
→ ilmgb_ joined18:51
← ilmgb left18:51
→ duckmaestro joined18:51
→ geomyidae_ joined18:52
← heftig left18:52
→ heftig joined18:52
→ vigintas joined18:52
sigdk qsuscs, I didn't get you... here 's the output of my terminal: http://paste.debian.net/316968/18:53
qsuscs 18:53
it's ".env" not "env"18:53
Seveas !slowclap18:53
→ killa_kyle joined18:54
→ ilmgb joined18:54
Seveas or !golfclap :)18:54
→ InfoTest joined18:54
qsuscs oh btw, add that https://github.com/github/gitignore/blob/master/Python.gitignore18:54
← ilmgb_ left18:54
← krawchyk left18:54
sigdk qsuscs, do you see the "env" he has there ? he doesn't have .env18:54
← sdothum left18:55
sigdk and does git track also .foo files ?18:55
qsuscs yes. exactly. yes.18:55
you named your directory .env, so add THAT and not "env"18:55
Seveas sigdk: there's 'env' in .gitignore, but the thing is named .env18:55
and git doesn't give a tiny rats ass about the name of your files. It can track all.18:56
qsuscs (except ".git" in every possible case)18:56
← negaduck left18:57
Seveas true.dat18:57
→ alanwill joined18:57
qsuscs hmmmm ... what about file names with a \0 in them? or more than MAXINT characters?18:57
(sure, unlikely with the existing fs, but still ...)18:58
→ sdothum joined18:58
← jason237 left18:58
← mwhooker left18:58
→ Akagi201 joined18:58
← jteneyck left18:59
→ Dougie187 joined18:59
→ nfk joined18:59
→ jteneyck joined19:00
→ dopesong joined19:00
← d0nkeyBOB left19:01
→ lykinsb__ joined19:01
← Dougie187 left19:01
← mbrzuzy left19:01
→ dreiss joined19:01
→ pantsman_ joined19:02
← acetakwas left19:02
→ daito joined19:02
← Akagi201 left19:03
→ infoget joined19:03
← lykinsbd left19:04
← Absolute0 left19:04
← dopesong left19:05
← pantsman- left19:05
→ jmckind joined19:06
→ pantsman- joined19:06
← pantsman_ left19:06
← daito left19:07
→ krawchyk joined19:09
← ___thomasreggi__ left19:09
← PCatinean left19:11
← clemf left19:12
← Gravitron left19:13
← dreiss left19:13
→ topolinux joined19:14
→ cagedwisdom joined19:14
→ mbrzuzy joined19:15
← jceb left19:15
→ ___thomasreggi__ joined19:16
→ davidfetter_fbn joined19:17
davidfetter_fbn hi19:17
← Wetmelon left19:18
← sigdk left19:18
→ topolinux_ joined19:18
davidfetter_fbn how do i get git not to use a pager for outputs < height of the terminal?19:18
→ blinkdesign joined19:19
qsuscs set $LESS so something sensible19:19
man less19:19
← topolinux_ left19:19
← ojacobson left19:19
← EduardoMartins left19:19
davidfetter_fbn $LESS='-x 4 -R'19:19
← alanwill left19:19
davidfetter_fbn what's more sensible?19:19
← anth0ny left19:19
← gfixler left19:19
→ anth0ny joined19:20
→ darkbit joined19:20
→ irqq joined19:20
← paulweb515 left19:20
← romankl left19:20
← marc_v92 left19:22
← magneticduck left19:22
← BigWillie left19:22
→ UnrealBlight joined19:22
→ alanwill joined19:22
davidfetter_fbn guessing -F -X19:23
→ ojacobson joined19:24
→ Elyscape joined19:24
← unreal_ left19:25
← topolinux left19:25
Elyscape hello! I'm having an issue with git's bash completion and I'm not sure if it's the version of bash I'm using or something else. I was wondering if someone else could try it on their system.19:25
→ elsevero joined19:26
← nerd left19:26
Seveas Elyscape: 'sup19:27
qsuscs install gent... zsh19:27
← UnrealBlight left19:27
Elyscape specifically, if I type `git log --pretty=o` and hit tab, it completes to `git log oneline` instead of `git log --pretty=oneline`. I'm using bash 4.3.42(1) on OS X. this doesn't happen on the bash that ships with OS X (3.2.57(1)) or on the version of bash on my CentOS7.1 system (4.2.46(1)).19:27
→ chandlerbing joined19:28
Seveas Elyscape: works fine for me19:28
Elyscape which version of bash?19:28
Seveas GNU bash, version 4.3.42(1)-release (x86_64-pc-linux-gnu)19:28
Elyscape interesting.19:28
Seveas on linux19:28
git 2.6.2-323-g60bd42019:29
Elyscape so it's something with my setup, then19:29
thanks for your help!19:29
Seveas what's your version of git?19:29
Elyscape 2.6.219:29
PerlJam mine tab completes to "git log --pretty=origin/" (git 1.7.1, bash 4.1.2)19:29
qsuscs lol.19:29
Seveas git 1.7.1 is ancient19:29
PerlJam :)19:29
yep19:30
I was expecting an ancient git from Elyscape too19:30
Elyscape haha yeah19:30
it's very strange and it affects all arguments with = in them19:30
Seveas I've seen that happen19:30
never dug into it19:30
→ mizu_no_oto joined19:31
← krawchyk left19:31
→ Limes_ joined19:31
ELLIOTTCABLE → ec19:31
→ ASOLAr joined19:31
← converge left19:31
→ tinajohnson joined19:31
Elyscape I just tried it in a bash session with no profile or rc scripts and manually loaded the completion script, and it worked. so I did something that broke it.19:32
→ converge joined19:32
→ Gravitron joined19:33
Seveas Elyscape: when you find out what it was, let us know. I want to be able to fix that when I see it again :)19:33
Elyscape will do!19:34
→ d10n-work joined19:34
← ilmgb left19:34
→ ki0 joined19:34
→ bitkiller joined19:34
→ ilmgb joined19:34
← Limes__ left19:34
→ sinkensabe joined19:34
→ xlegoman joined19:35
← khmarbaise left19:35
→ Limes__ joined19:35
→ roygbiv joined19:35
← FabTG left19:35
← shlant left19:37
→ shlant joined19:37
← Limes_ left19:37
← heftig left19:39
← xlegoman left19:39
→ heftig joined19:39
← ilmgb left19:39
→ FabTG joined19:39
← crose left19:40
← darkbit left19:40
← PsuzeannePsy left19:42
→ dreiss joined19:42
→ cjohnson joined19:42
→ Limes_ joined19:42
← heftig left19:42
← gasbakid_ left19:42
← VirtuallySuzen left19:42
→ heftig joined19:42
→ jason237 joined19:43
→ NullPointerRefer joined19:43
cjohnson I have some clients on 1.8 and some on 2.6. This command works in 2.6 but not 1.8: git rev-list @..@{u} -- file Is there a way to make this more portable for both?19:43
PerlJam upgrade the clients19:44
:)19:44
qsuscs cjohnson: does rev-list ..HEAD@{upstream} work?19:44
(HEAD at one side of a range is ambiguous and can be omitted ... even in gits that old i'd say. else try "HEAD")19:44
→ gasbakid_ joined19:44
← abacuspowers left19:44
cjohnson yep qsuscs that works on both clients19:45
thank you19:45
qsuscs !next19:45
gitinfo Another satisfied customer. NEXT!19:45
qsuscs customer19:45
oh crap19:45
i wanted to buy some stuff today ... now it's 2145, shops are closed.19:45
welp, no breakfast tomorrow then.19:46
← Limes__ left19:46
→ atomicb0mb joined19:47
← sinkensabe left19:47
→ marc_v92 joined19:47
← gasbakid_ left19:47
← shlant left19:48
→ gasbakid joined19:48
← tgunr left19:48
→ oojacoboo joined19:48
Eugene has two 24-hour supermarkets across the street19:49
Elyscape okay, looks like NPM's completion that causes the problem19:49
← jrahmy left19:49
Eugene still starves because they're across the street and that means I need pants19:49
→ Limes__ joined19:50
← elsevero left19:50
→ r3g3x joined19:50
→ gfixler joined19:51
← gasbakid left19:51
← oojacoboo left19:52
→ t4nkd joined19:52
Elyscape aha!19:52
→ darkbit joined19:53
thiago Eugene: so you have access to groceries 48 hours a day?19:53
← Limes_ left19:53
← ajf- left19:53
Elyscape NPM 1.4 did a bad thing: https://github.com/npm/npm/blob/1.4.x/lib/utils/completion.sh#L10-L1219:54
Eugene Only 36 hours. They're both open during dayight19:54
→ Limes_ joined19:54
→ gasbakid joined19:54
Eugene Elyscape - existed? Badum-tish19:54
Elyscape haha19:54
qsuscs Eugene: well aachen is not THAT big after all19:54
→ strayPuppy joined19:54
← shad left19:54
Elyscape this was fixed in NPM v3.2.2, apparently: https://github.com/npm/npm/commit/04ec77b5c407cbfd8a1241528fd5e2d97ce3efb719:55
→ tgunr joined19:55
→ sinkensabe joined19:56
→ shad joined19:56
← Limes__ left19:57
Elyscape yup. that was the problem. updating NPM fixed it.19:57
← ASOLAr left19:57
→ ASOLAr joined19:58
Guest93745 → preilly19:58
Elyscape thanks for your help, all, and no thanks to the NPM guys. why would they do that. ugh.19:58
← preilly left19:58
→ preilly joined19:58
Eugene Because javascript is cancerous19:58
Elyscape so it would seem119:58
→ faux___ joined19:58
→ cdg joined19:59
← jteneyck left19:59
→ Akagi201 joined19:59
← notebox left19:59
→ unreal joined19:59
→ jteneyck joined19:59
← jteneyck left20:00
← CKyle left20:00
← aendrew left20:00
← gasbakid left20:01
→ mwhooker joined20:01
→ krawchyk joined20:02
Elyscape oh hey, looks like they backported the fix to 2.13.5, which also came out in august 7. either way, ugh.20:02
← faux___ left20:03
Elyscape anyway, yeah, that's the answer: something (probably an old version of NPM but theoretically anything) mucking with the COMP_WORDBREAKS variable20:03
← Pseudocrat left20:03
→ NimeshNeema joined20:03
→ gasbakid joined20:03
→ clemf joined20:03
Elyscape so now we know! thanks for your help all20:03
← Elyscape left20:04
→ FabTG_ joined20:04
→ Ldip joined20:04
→ paulweb515 joined20:04
→ CKyle joined20:07
→ Ahmed-90 joined20:08
→ compeman joined20:08
→ Vile joined20:09
← atomicb0mb left20:09
→ zetlen joined20:09
zetlen i'm running a setup script that tries to delete git tags.20:09
← pantsman- left20:10
zetlen it successfully does so, and then the first time you run `git tag` it shows no tags20:10
and then the second time you run it, all the tags come back20:10
← samw left20:10
zetlen it's like the act of running `git tag` actually reconstructs them somehow? has anyone seen anything like this?20:10
← rnsanchez left20:10
← t4nkd left20:10
← Ahmed90 left20:12
← mostlybadfly left20:12
grawity well20:12
how exactly do you delete git tags?20:12
→ RaceCondition joined20:12
← RoelStorms left20:12
← kpease left20:13
← shad left20:14
zetlen grawity: i've tried a couple things20:14
← Limester left20:14
zetlen first, `git tag -d $(git tag)`20:14
ALL these things work from the command line20:14
it's within the context of my yeoman generator that it's breaking20:14
man, this is so strange. :(20:15
← Akagi201 left20:15
_ikke_ zetlen: do you run git fetch in between?20:15
or something20:15
zetlen no20:15
i think it's somehow yeoman's fault20:15
→ kpease joined20:15
→ amicable joined20:15
← kpease left20:15
→ samw joined20:16
zetlen stand by, trying to isolate20:16
→ kpease joined20:16
_ikke_ git tag on it's own cannot recreate the tags20:17
zetlen wow, it's like...accessing the filesystem actually restores the deletions20:18
← ASOLAr left20:18
→ ASOLAr joined20:18
zetlen it's like yeoman is watching the files20:18
Eugene Or you're doing it wrong ;-)20:18
← mkoskar left20:18
Eugene (what is yeoman? Never heard of it)20:18
_ikke_ http://yeoman.io/20:19
zetlen while it's likely i am doing it wrong, that was a low-effort comment, friendo20:19
_ikke_ (just looked it up)20:19
Eugene Oh, node again.20:19
Nevermind me then20:19
zetlen it's like it's running some kind of a watch. so strange20:19
_ikke_ zetlen: so if you delete the tags, could you inspect the repo dir?20:19
← ASOLAr left20:19
zetlen yeah, if i `ls ./.git/refs/tags`20:19
i get nothing, and then if i do it again, all the tags are there20:19
_ikke_ zetlen: can you open watch -n1 .git/refs/tags in another terminal?20:20
← samw left20:20
zetlen osx doesn't have watch20:21
and, crucially, that's what i'm on20:21
_ikke_ heh20:21
→ Dougie187 joined20:21
_ikke_ while true; tput reset; ls .git/refs/tags; sleep 1; done20:22
← sinkensabe left20:22
zetlen oh see, i know what that'll do!20:22
→ Limester joined20:22
zetlen the very first ls will cause whatever's putting the tags back to trigger20:22
← Steadfast left20:23
→ duderonomy joined20:23
Ldip Hi all. I screwed up a project pretty bad using git to deply and now I need to fix it before I move to an actual deploy script (likely rocketeer). Is there a way to basically say “don’t worry about files modified on the server, just take the code in this commit and force it on to the server."20:23
Eugene Ldip - !deploy20:23
gitinfo Ldip: 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.html20:23
_ikke_ Ldip: git checkout -f .20:23
← duderonomy left20:23
qsuscs depends on the deploy mechanism20:23
← thiago left20:24
qsuscs THIS is why my deployments were a checkout to a directory whose name contained the commit id, which was then symlinked to the actual dir20:24
→ thiago joined20:24
_ikke_ qsuscs: word20:24
qsuscs (oh well, it was mercurial, but same thing applies for git)20:24
← jeffreylevesque left20:24
Ldip Yeah, I’m not saying I’m going to keep doing this. It’s a big mess up that I will correct. But now I need to say “Checkout branch Features and I don’t care what the conflicts are, use the files in Features"20:25
← darkbit left20:25
← Dougie187 left20:25
← geoid left20:25
_ikke_ git checkout -f feature20:25
Ldip Branch Features set up to track remote branch Features from origin.20:26
Switched to a new branch 'Features'20:26
but no code was changed.20:26
→ shinnya joined20:26
qsuscs https://hg.qsuscs.de/gw2/file/1dd41fb5ea21/deploy.sh - REV="$(git describe --tags || git rev-parse -r ${DEPLOYVER})", git archive --format=tar "${REV}" | tar xf - -C "${NEW_DIR}" and so on20:26
Ldip Thank you!20:27
→ samw joined20:27
→ patrick99e99 joined20:27
← Phoenixz left20:27
→ forbidden404 joined20:28
→ cvanball joined20:29
→ Phoenixz joined20:29
→ Limes__ joined20:30
← Gravitron left20:30
← PerlJam left20:30
→ jonno11 joined20:31
← forbidden404 left20:31
← Limester left20:31
← aranea left20:31
← samw left20:31
← italoacasas left20:32
← ___thomasreggi__ left20:33
← Limes_ left20:33
→ PerlJam joined20:34
← chandlerbing left20:34
→ chandlerbing joined20:34
← zadock left20:35
→ ilmgb joined20:35
→ jstimm joined20:35
← Cata|Work left20:36
→ magneticduck joined20:36
← roygbiv left20:37
← vurma left20:37
→ forbidden404 joined20:38
← marc_v92 left20:38
← chandlerbing left20:39
→ Imaginativeone joined20:39
→ chandlerbing joined20:39
← ilmgb left20:40
← maletor left20:40
→ youngbaks joined20:40
← Spacew00t left20:42
→ axl_ joined20:42
→ darkbit joined20:42
← chandlerbing left20:42
→ Limes_ joined20:45
→ atomicb0mb joined20:46
→ chandlerbing joined20:48
← chandlerbing left20:48
← Limes__ left20:49
→ russruss_ joined20:49
← forbidden404 left20:51
→ nnyk_ joined20:51
← youngbaks left20:52
russruss_ hey all, I’m interested in exploring alternative command line interfaces for git. I’ve read https://git.wiki.kernel.org/index.php?title=Special:Search&search=frontends, but it seems like a lot of those projects are no longer maintained. Are there any active projects providing a full featured alternative to git porcelain? I’m mostly interested in ease of teaching to new users, shared command line options between commands, etc.20:53
← mizu_no_oto left20:54
← synthroid left20:54
→ samw joined20:55
← Anxi80 left20:55
← cvanball left20:55
← sfan786 left20:55
→ Spacew00t joined20:56
← cjohnson left20:56
← johtso left20:56
← irqq left20:56
← krawchyk left20:56
Eugene Nope.20:57
russruss_ hah, thanks.20:57
← MattMaker left20:58
← CKyle left20:58
qsuscs there was one20:59
gitless was its name i think20:59
→ scarabx joined20:59
← samw left20:59
→ durham_ joined21:01
→ MattMaker joined21:02
← madebymarkca left21:03
→ daito joined21:03
← Spacew00t left21:03
→ axelunicorn joined21:04
← durham left21:04
→ ___thomasreggi__ joined21:05
→ tpollard joined21:06
→ samw joined21:06
← kaiza left21:07
← daito left21:08
→ maletor joined21:08
← arup_r left21:09
← blimpse left21:10
← samw left21:11
→ Akagi201 joined21:12
→ CKyle joined21:12
→ chandlerbing joined21:12
← chandlerbing left21:12
→ ilmgb joined21:12
→ m_ben joined21:13
← Nizumzen left21:13
→ o11c joined21:13
→ vF3hNGxc47h8 joined21:13
← Imaginativeone left21:13
o11c What's the command to check if one commit contains another?21:13
← MarkyC left21:13
o11c checking if git log is empty is one way, but icky21:14
← russruss_ left21:14
qsuscs there is git branch --contains21:14
→ Imaginativeone joined21:14
→ Limester joined21:15
o11c not on a branch though21:15
qsuscs commit ... hm ... i'm certain there is something but i don't recall it21:15
o11c now, I *am* only checking HEAD, but since I'm working in a submodule sometimes, it might be detached21:15
← m0viefreak left21:15
qsuscs HEAD is HEAD21:15
even in a submodule21:16
!HEAD21:16
gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)21:16
o11c but HEAD is not a branch21:16
→ k_j joined21:17
→ samw joined21:17
← ilmgb left21:17
← borkr left21:18
→ cmoney joined21:18
← Akagi201 left21:18
← cmoney left21:18
→ cmoney joined21:19
→ kadoban joined21:19
← ___thomasreggi__ left21:19
← Skruff left21:20
→ Daxaar joined21:20
← durham_ left21:20
← vF3hNGxc47h8 left21:20
o11c git merge-base --is-ancestor21:20
qsuscs did you actually try git branch --contains c0ffee HEAD?21:21
... or that.21:21
← Daxaar left21:21
o11c yeah, I tried that, it doesn't work21:21
← sdothum left21:22
→ Nizumzen joined21:22
→ sdothum joined21:23
→ abacuspowers joined21:23
← fscala left21:23
← ki0 left21:24
→ Daxaar joined21:24
→ ki0 joined21:25
→ durham joined21:25
← fees_ left21:25
→ geoid joined21:26
→ fscala joined21:26
← King_Hual left21:27
← kpease left21:28
← ki0 left21:28
→ ki0 joined21:28
← ki0 left21:29
→ ilmgb joined21:29
← madewokherd left21:30
← converge left21:30
← fees left21:30
← durham left21:32
→ durham joined21:33
← durham left21:33
← CKyle left21:33
← atomicb0mb left21:33
← geoid left21:33
← ilmgb left21:34
→ borkr joined21:35
← HardWall left21:35
→ durham_ joined21:35
→ bollullera joined21:36
→ xlegoman joined21:37
← nfk left21:37
← paul424 left21:37
← shinnya left21:38
← Limester left21:38
← patrick99e99 left21:39
← Kicer86 left21:39
imachuchu is there an easy way of getting a list of all of the people who have commited to a repo in the last 60 days? Something like "git shortlog -sne master@{today}..master@{2 month}"? (and I know my range is bad, that's what I'm pretty sure all of my problem is)21:40
→ Limester joined21:41
← xlegoman left21:41
qsuscs git shortlog --since="60 days ago"21:41
← Limes_ left21:42
← Daxaar left21:42
→ Suzeanne joined21:42
→ RoelStorms joined21:43
imachuchu qsuscs: I see, thank you!21:43
qsuscs !next21:43
gitinfo Another satisfied customer. NEXT!21:43
qsuscs 2343, i should consider moving my body to the bed.21:43
Seveas qsuscs: how do I get git to clean up babyvomit?21:43
← darkbit left21:43
qsuscs Seveas: git -C babyvomit clean -dxf21:44
Seveas didn't work.21:44
qsuscs upgrade your git21:44
Seveas I'm on git-next as of Junio's last push.21:44
→ toothrot joined21:44
qsuscs you should visit me (so that we can wander planlessly through aachen, thinking about what we could actually do)21:45
well use pu.21:45
Seveas Just tried pu, doesn't work. Also, Aachen is boring.21:45
→ espindol_ joined21:47
← jstimm left21:48
← Walex left21:50
→ jeffreylevesque joined21:50
→ kaiza joined21:50
← tobyx left21:52
qsuscs yeah, kinda, if it were not for the uni :321:53
← blinkdesign left21:53
qsuscs and the hackerspace of course21:53
Imaginativeone → Imaginativeone_a21:53
→ shguid joined21:54
← faheem__ left21:55
→ tobyx joined21:55
← hwoarang left21:55
← Shentino left21:57
zetlen ok, i'm gonna come at this from a different angle21:58
← compeman left21:58
zetlen deleting these tags seems stupid and hard in this environment, so what if i never downloaded the tags?21:58
i want to check out a repo without tags21:58
← pratikma_ left21:58
zetlen ahem. i want to clone a repo without tags21:58
Seveas I don't think clone can do that. Try the manual dance: init / add-remote / fetch --no-tags / reset / branch -u22:00
zetlen i think i'll have to22:01
thanks22:01
← durham_ left22:01
← fahadash left22:01
→ Gravitron joined22:02
← Suzeanne left22:02
← intellix left22:02
→ mehp joined22:02
← nnyk_ left22:02
→ durham joined22:03
← mbrzuzy left22:03
← CheckDavid left22:03
→ dserodio joined22:03
← Jackneill left22:03
← shguid left22:04
← dickdaley left22:04
← killa_kyle left22:05
← davidfetter_fbn left22:07
← uber left22:07
← mehp left22:08
→ madewokherd joined22:08
→ ___thomasreggi__ joined22:08
← systmkor left22:08
← samw left22:08
← cmoney left22:09
← {AS} left22:11
→ intellix joined22:12
← sgambino left22:12
→ HelloShitty joined22:13
→ Ldip_ joined22:13
← rj1 left22:14
← Joost` left22:14
← Ldip left22:15
→ Akagi201 joined22:15
← Gravitron left22:17
← s00pcan_ left22:18
→ samw joined22:18
→ Gravitron joined22:18
→ s00pcan joined22:19
HelloShitty → HelloAtMega22:19
← rubyonrailed left22:19
← Internet13 left22:19
← borkr left22:20
→ Joost` joined22:22
← NeverDie left22:22
→ Internet13 joined22:23
← chitopunk left22:23
← frobnic left22:24
← mezod left22:24
← zumba_a__ left22:25
→ frobnic joined22:25
← tinajohnson left22:25
→ faux___ joined22:26
→ mezod joined22:26
→ s8321414 joined22:26
→ rubyonrailed joined22:27
← Gravitron left22:29
← Akagi201 left22:29
← cagedwisdom left22:29
→ geoid joined22:30
← faux___ left22:30
→ ilmgb joined22:30
→ Gravitron joined22:31
→ pratikmallya joined22:31
← rubyonrailed left22:32
→ rubyonrailed joined22:33
← howdoi left22:33
→ pratikma_ joined22:34
→ sespiros joined22:34
← geoid left22:34
→ mac_ified joined22:34
← ilmgb left22:35
← pratikmallya left22:37
← malukenh_ left22:39
← Limester left22:39
← Anamdil left22:40
→ Limester joined22:41
→ hahuang65 joined22:41
→ cagedwisdom joined22:43
← Nick-S left22:43
→ negaduck joined22:44
← linduxed left22:45
← NullPointerRefer left22:46
← s00pcan left22:47
← infoget left22:47
→ s00pcan joined22:47
→ Shentino joined22:47
← axl_ left22:48
→ uber joined22:48
← tvw left22:49
← alanwill left22:49
← rubyonrailed left22:50
→ noisebleed joined22:51
jmckind → jmckind_22:52
← espindol_ left22:52
→ rubyonrailed joined22:53
jmckind_ → jmckind22:53
← fstd left22:54
→ fstd joined22:55
← sentriz left22:55
→ s00pcan_ joined22:56
→ xlegoman joined22:58
→ linuxmint2 joined22:59
← abacuspowers left22:59
← jmckind left23:01
← whitby left23:02
→ zumba_ad_ joined23:02
← nidr0x left23:02
← amicable left23:02
→ jmckind joined23:03
→ daito joined23:04
← intellix left23:04
→ xudongz1 joined23:06
← zumba_ad_ left23:07
→ nidr0x joined23:07
← thinkxl left23:08
← Shentino left23:08
← magneticduck left23:08
← daito left23:08
← clemf left23:09
→ linduxed joined23:09
→ d4rklit3 joined23:09
→ shinnya joined23:10
→ Shentino joined23:10
→ sundev70 joined23:11
← fstd left23:14
→ fstd joined23:14
← fstd left23:16
→ fstd joined23:17
← otter768 left23:17
← linuxmint2 left23:17
→ otter768 joined23:17
← cagedwisdom left23:18
← hapislacker left23:20
→ andersoldahl joined23:21
← xudongz1 left23:22
→ CKyle joined23:23
← Limester left23:24
→ Limester joined23:25
→ Akagi201 joined23:25
← ___thomasreggi__ left23:25
← cbonobo left23:28
→ druidd joined23:29
→ ___thomasreggi__ joined23:30
→ tomog999_ joined23:30
→ geoid joined23:30
→ ilmgb joined23:31
← cdg left23:31
← Akagi201 left23:31
→ cdg joined23:32
→ cagedwisdom joined23:32
← knownasilya left23:32
← tomog999 left23:33
Imaginativeone_a → Imaginativeone23:34
← geoid left23:35
← Gravitron left23:35
→ hapislacker joined23:35
← Nizumzen left23:36
← ilmgb left23:36
→ Nick-S joined23:36
← cdg left23:36
← hapislacker left23:36
→ qpdb joined23:38
← druidd left23:39
→ malukenho joined23:40
← pratikma_ left23:40
→ druidd joined23:40
→ dsdeiz joined23:41
→ wxg joined23:41
→ RockLee joined23:41
← jfran left23:41
← crisumi left23:42
← kegster left23:42
← tgunr left23:43
→ crisumi joined23:43
← a3Dman left23:43
← malukenho left23:44
→ kegster joined23:44
Imaginativeone → Imaginativeone_a23:44
→ tgunr joined23:44
→ zacg joined23:45
← zacg left23:45
→ zacg joined23:45
← druidd left23:45
→ Gravitron joined23:47
← andersoldahl left23:47
← Nikhil_D left23:49
← jonno11 left23:49
→ KsChoice joined23:49
← Phoenixz left23:49
→ Nikhil_D joined23:49
→ a3Dman joined23:50
← hexagoxel left23:52
→ hexagoxel joined23:53
← scarabx left23:53
← fstd left23:55
→ fstd joined23:55
Diittosword → Diitto23:55
← AaronMT left23:55
← otter768 left23:56
→ sctskw joined23:57
← sctskw left23:57
→ otter768 joined23:57
→ sctskw joined23:58
← RoelStorms left23:58
← CEnnis91 left23:58
→ faheem__ joined23:58
← Ceber left23:59
→ Lyqyd joined23:59
← Bootinbull left23:59

Logs Search ←Prev date Next date→ Channels Documentation