IRCloggy #git 2013-08-05

Provider of IRC logs since 2005.

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

	2013-08-05
	← enr left	00:00
	→ DonVitoCorleone joined	00:01
	→ rfk joined	00:03
	→ dustyfneon joined	00:04
	← simesy left	00:04
rfk	I'm looking for a utility that allows me to pull specific files out of repositories/packages that i download, for inclusion in projects (e.g., PHP or JS includes); as of now, I must pull out the specific files I want and place them in the appropriate include directories, e.g. $WWW_ROOT/static/js/file.js. Does git have anything for this kind of situation?	00:05
	Should I just symlink them all, and re-symlink them whenever I update the package?	00:06
	→ clreed87 joined	00:06
rfk	I guess, what I am looking for is 'dependency management' ? I heard of composer for PHP, but have not gotten deep into the documentation (yet)	00:06
	→ AWinterman joined	00:06
	← jaequery left	00:07
	← Davey left	00:07
	← huoxito left	00:07
	→ Gitzilla joined	00:07
milki	rfk: the short answer is no and the management is outside the scope of git. see !deploy, but that probably wont give you a final solution	00:08
gitinfo	rfk: 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/the-list-and-irc/deploy.html	00:08
	→ KernelPanicMK2 joined	00:09
	← jackdempsey left	00:09
	→ jaequery joined	00:09
rfk	OK, makes sense. Do you know off the top of your head any utilities that might accomplish this, or even what the generic name is for what i am talking about ?	00:10
	→ huoxito joined	00:10
	← madewokherd left	00:10
	→ Dougie187 joined	00:10
	← jaequery left	00:11
	← o] left	00:11
	→ jaequery joined	00:11
	→ o] joined	00:12
	→ tmcmahon joined	00:12
	→ jackdempsey joined	00:12
	→ breck7 joined	00:13
	→ ej joined	00:13
	→ mribeirodantas joined	00:14
	← tmcmahon left	00:14
	→ adamwathan joined	00:15
	→ PaulCapestany joined	00:16
	← clreed87 left	00:16
	→ iliketurtles joined	00:16
	← AWinterman left	00:16
	← ej left	00:18
	← iliketurtles left	00:19
	→ AWinterman joined	00:21
	→ emergion joined	00:24
	← emergion left	00:29
	← br1 left	00:30
	← dreiss left	00:31
	← cigarshark left	00:32
milki	rfk: package management, deployment systems, dependency management	00:32
	if you rely on 3rd party files, refer them at their original filepaths rather than try to bring them into your own project hieararchy	00:33
	← wakd left	00:34
	→ scorphus joined	00:35
	← warlock_mza left	00:35
	→ simesy joined	00:35
	← michaelarestad left	00:35
	← Vampire0 left	00:36
	← BSaboia left	00:37
	← simesy left	00:38
	← rfk left	00:38
	→ simesy joined	00:39
	→ mechanicalduck joined	00:39
	→ rfk joined	00:39
	← jaequery left	00:39
	→ joelpittet joined	00:40
	→ Vampire0 joined	00:40
	→ AWinterm_ joined	00:42
	← hyperair left	00:43
	→ jaequery joined	00:44
	→ FreezingCold joined	00:44
	→ iliketurtles joined	00:44
	→ dreiss joined	00:44
	← iliketurtles left	00:44
	→ iliketurtles joined	00:45
	← rfk left	00:46
	← hellopat left	00:47
	→ groglogic joined	00:48
	→ pdurbin joined	00:48
	← iliketurtles left	00:49
	← Destos left	00:49
	→ parcs joined	00:49
	← redrocket left	00:49
	→ oojacoboo joined	00:50
	← oojacoboo left	00:50
	→ nathancahill joined	00:50
	← jaequery left	00:51
	← AWinterm_ left	00:52
	← parcs_ left	00:53
	→ madewokherd joined	00:54
	← plumpkin left	00:55
	→ R1KRDO joined	00:58
	→ k_sze[work] joined	00:59
	→ melee joined	00:59
	← KillYourTV left	01:00
	→ JeremyWei joined	01:00
	→ KillYourTV joined	01:00
	→ Marenz joined	01:02
	jelmer_ → jelmer	01:03
	← Octalot left	01:03
	→ Davey joined	01:04
	→ hyperair joined	01:05
	← Suprano left	01:05
	→ acharlieh joined	01:05
	→ lamarus joined	01:07
	→ Suprano joined	01:11
	→ z8z joined	01:13
	→ ej joined	01:14
	→ ncd\|leeN joined	01:14
	← Marenz left	01:15
	← hyperair left	01:16
	← R1KRDO left	01:16
	← fase left	01:17
	→ AWinterm_ joined	01:18
	← ej left	01:18
	→ warlock_mza joined	01:19
	← quazimodo left	01:20
	← quazimod1 left	01:20
	→ hyperair joined	01:21
	→ Hoosier2016 joined	01:22
	Arokh → Arokh[Off]	01:22
	← CheckDavid left	01:25
	← dougsland left	01:25
	→ weiyang joined	01:26
	← AWinterm_ left	01:27
	→ gusnan joined	01:29
	→ normanrichards joined	01:30
	← mechanicalduck left	01:34
	→ iliketurtles joined	01:34
	← St_Marx left	01:35
	→ St_Marx joined	01:37
	← LBV_User left	01:40
Fandekasp	hi there	01:44
	I have a problem with git merge -s theirs	01:44
	getting error git-merge-theirs: command not found	01:44
	and a git rebase --continue will do the same as git merge -s ours	01:45
	→ Goplat joined	01:45
Fandekasp	I want to make sure that when upstream and local edit the same file, local lines are preserved, but upstream new lines are added	01:45
	→ luc_ joined	01:45
Fandekasp	and reading the manpage, strategy theirs is for the local repo. Any idea how to fix that issue ?	01:46
	← joki left	01:46
	→ swiftkey joined	01:47
	← swiftkey left	01:47
	→ swiftkey joined	01:47
	→ enr joined	01:48
	← Hoosier2016 left	01:48
ToxicFrog	Fandekasp: don't you just want plain 'git merge' for that?	01:51
	→ Vampire0_ joined	01:51
	→ verysoftoiletppr joined	01:52
ToxicFrog	(there is no "theirs" merge strategy. There is a "theirs" option to the "recursive" strategy, which is different.)	01:52
	→ joki joined	01:52
	→ goshawk joined	01:52
	→ daito joined	01:52
	← PaulCapestany left	01:52
	← enr left	01:52
	← groglogic left	01:54
	→ Hoosier2016 joined	01:54
Fandekasp	ToxicFrog: no I don't want to resolve conflicts manually, there would be too many of them. currently reading the "RECOVERING FROM UPSTREAM REBASE" part of the manpage, very interesting	01:54
	← jon_r left	01:54
	→ AWinterm_ joined	01:54
	← Vampire0 left	01:54
	→ chrisgeorge joined	01:55
zendeavor	so i want to create a new branch based on the remote master, and update a single file from a current working branch. i'm assuming i should checkout master, checkout -b newbranch, and then...something to fetch the other branch's single file that i want to update to.	01:55
	← Hoosier2016 left	01:55
	← gusnan left	01:55
	← docwhat left	01:55
	→ chriswk joined	01:56
Fandekasp	ToxicFrog: and you're right, -Xtheirs isn't good enough because it doesn't add new lines from upstream	01:56
	← jackdempsey left	01:57
	→ pr0ton joined	01:58
Fandekasp	hmm I basically want commits from upstream to be added first, and commits from local to be patched on top of upstream commits, should do the trick	01:58
	→ docwhat joined	01:59
	← verysoftoiletppr left	02:02
	← AWinterm_ left	02:03
	→ jackdempsey joined	02:04
Fandekasp	ah	02:05
	ToxicFrog: got it... I just wanted the -Xours, and was mistakengly doing a -s ours :)	02:06
milki	Fandekasp: rebase!	02:06
	Fandekasp: !rebase	02:06
gitinfo	Fandekasp: [!mergerebase] @!merge_or_rebase	02:06
	→ dhruvasagar joined	02:06
milki	o that is so not useful	02:06
	→ quazimodo joined	02:08
	← iliketurtles left	02:08
	→ jon_r joined	02:09
	← Dougie187 left	02:12
	← daito left	02:14
	← quazimodo left	02:14
	→ daito joined	02:14
	→ xpirator joined	02:14
	→ ej joined	02:15
	→ flippo joined	02:15
EugeneKay	!triggers	02:15
gitinfo	Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	02:15
EugeneKay	!mergerebase	02:16
gitinfo	[!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html	02:16
	→ iliketurtles joined	02:16
EugeneKay	.trigger_edit rebase @!merge_or_rebase	02:16
gitinfo	EugeneKay: Okay.	02:16
	← warlock_mza left	02:16
EugeneKay	!rebase	02:16
gitinfo	[!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html	02:16
	→ dsdeiz joined	02:16
	EugeneKay set mode: -o	02:16
ology	!ugh	02:16
	← jeffery_ left	02:18
	← daito left	02:19
	→ warlock_mza joined	02:19
	← ej left	02:19
	→ rabellamy joined	02:20
	→ lavaman joined	02:22
	← AWinterman left	02:22
	→ pr0ggie joined	02:25
	← pr0ggie left	02:25
	→ pr0ggie joined	02:26
	← BJfreeman left	02:27
	→ cads joined	02:28
	← bewest left	02:30
	→ AWinterman joined	02:30
	→ jfoy joined	02:31
	← joshsmith left	02:34
	← AWinterman left	02:38
	chrisgeorge → Casear_	02:40
	← pr0ggie left	02:41
	→ pr0ton_ joined	02:41
	→ daito joined	02:42
	← pr0ton left	02:42
	pr0ton_ → pr0ton	02:42
	← rabellamy left	02:42
	← lamarus left	02:43
	← SeoZ2 left	02:45
	← goshawk left	02:46
	Casear_ → chrisgeorge	02:47
	← jfoy left	02:48
	← Bosox20051 left	02:49
	← simesy left	02:51
	→ hahuang61 joined	02:52
	← Marquisk2 left	02:52
	← dustyfneon left	02:53
	→ Bosox20051 joined	02:53
	← Bosox20051 left	02:53
	→ Bosox20051 joined	02:53
	← Bosox20051 left	02:53
	→ Bosox20051 joined	02:54
	← Bosox20051 left	02:54
	← Fandekasp left	02:56
	→ Fandekasp joined	02:57
	→ jeffery_ joined	02:58
	→ methods joined	03:00
	← methods left	03:00
	→ methods joined	03:00
methods	what is the command that shows you waht head pointed to the last few times ?	03:00
offby1	git log -g	03:01
	← breck7 left	03:01
offby1	aka git reflog	03:01
	!reflog	03:01
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	03:01
	← Orbitrix left	03:01
	← skorgon left	03:01
	→ AWinterman joined	03:01
	→ skorgon joined	03:02
	→ threesome joined	03:03
	→ simesy joined	03:03
	← donmichelangelo left	03:03
	← methods left	03:03
	→ donmichelangelo joined	03:04
	→ mdhopkins joined	03:04
	→ AWinterm_ joined	03:06
	→ babilen_ joined	03:06
	← Fandekasp left	03:08
	← chrisgeorge left	03:09
	→ Inside joined	03:09
	← Inside left	03:09
	→ Inside joined	03:09
	← babilen left	03:09
	→ Fandekasp joined	03:10
	← mitz left	03:11
	← warlock_mza left	03:11
	→ mitz joined	03:11
	→ parcs_ joined	03:12
	← dhruvasagar left	03:12
	→ carlos-huang joined	03:14
	← parcs left	03:14
	→ Cromulent joined	03:14
	→ echo-area joined	03:14
	← AWinterm_ left	03:14
	→ ej joined	03:16
	← HenryG left	03:17
	→ bmac joined	03:18
	→ herdingcat joined	03:20
	← ej left	03:20
	→ dhruvasagar joined	03:20
	→ JoeCoolDesk joined	03:20
	← marhaban left	03:20
	← jackdempsey left	03:21
	← JoeCoolDesk left	03:21
	→ Orbitrix joined	03:21
	← Orbitrix left	03:21
	→ Orbitrix joined	03:21
	→ godoitis joined	03:21
	→ Patrick joined	03:23
	← godoitis left	03:23
	Patrick → Guest29537	03:24
	→ jaequery joined	03:26
	→ SinnerNyx joined	03:26
	← dhruvasagar left	03:27
	← Noldorin left	03:30
	← iliketurtles left	03:30
	→ michaelarestad joined	03:32
	→ m104 joined	03:33
	← kukks left	03:33
	← madewokherd left	03:34
	← AWinterman left	03:37
	← adamwathan left	03:37
	→ SeoZ-work[AWAY] joined	03:37
	SeoZ-work[AWAY] → SeoZ2	03:38
	← Guest29537 left	03:40
	← dreiss left	03:40
	← bmac left	03:41
	← texasmynsted1 left	03:41
	→ AWinterman joined	03:41
	→ jackdempsey joined	03:42
	← shinnya left	03:43
	→ preflex_ joined	03:44
	← preflex left	03:44
	preflex_ → preflex	03:44
	← jaequery left	03:45
	← zacts left	03:46
	→ dsdeiz_ joined	03:47
	← dsdeiz left	03:47
	→ cogitos joined	03:47
	← nathancahill left	03:48
	→ zacts joined	03:50
	← AWinterman left	03:51
	← unreal left	03:52
	→ sqlnoob joined	03:53
	← pen left	03:56
	→ pen joined	03:57
	→ lavaman1 joined	03:57
	← lavaman left	03:57
	← mribeirodantas left	03:57
	← m104 left	03:59
	← donmichelangelo left	04:00
	→ donmichelangelo joined	04:01
	→ unreal joined	04:01
	← z8z left	04:02
	← zacts left	04:04
	→ Chikore joined	04:04
	← ivan` left	04:06
	→ dsdeiz joined	04:06
	zbcm → ZombiesAreComing	04:07
	ZombiesAreComing → zbcm	04:08
	← pr0ton left	04:08
	← dsdeiz_ left	04:09
	← skorgon left	04:11
	← barneybook left	04:13
	→ quazimodo joined	04:13
	← acharlieh left	04:14
	→ ej joined	04:17
	→ AWinterman joined	04:18
	→ quazimod1 joined	04:18
	← ej left	04:21
	← AWinterman left	04:27
	→ jaequery joined	04:28
	→ pr0ton joined	04:28
	← maroloccio left	04:28
	← daito left	04:29
	← sgambino left	04:30
	→ Tommy[D] joined	04:31
	→ m104 joined	04:31
	← m104 left	04:32
	→ m104 joined	04:32
	← m104 left	04:32
	→ PaulCapestany joined	04:33
	→ YoMomma joined	04:34
	← YoMomma left	04:34
	← Tommy[D]_ left	04:34
	← mitz left	04:34
	→ mitz joined	04:35
	→ m104 joined	04:35
	← m104 left	04:35
	→ beautifulmind joined	04:36
	→ ivan` joined	04:38
	← quazimod1 left	04:39
	← quazimodo left	04:39
	→ cha1tanya joined	04:40
	← Cromulent left	04:40
	→ quazimodo joined	04:40
	→ quazimod1 joined	04:40
	← mdhopkins left	04:41
	← huoxito left	04:43
	← m0viefreak left	04:43
	← Inside left	04:44
	← simesy left	04:44
	→ m104 joined	04:44
	→ macmartine joined	04:47
	→ zacts joined	04:48
	← ErKa left	04:49
	→ skorgon joined	04:49
	→ dreiss joined	04:50
	→ ghostlines joined	04:50
	→ bobdobbs joined	04:51
	← zacts left	04:52
	→ AWinterman joined	04:54
	← hahuang61 left	04:56
	→ daito joined	04:56
	→ purplevillage joined	04:57
	→ rbento joined	04:59
	← daito left	05:00
	→ ej joined	05:02
	← AWinterman left	05:03
	← matanya left	05:03
	→ bits8mybytes joined	05:04
	→ dhruvasagar joined	05:04
	→ simesy joined	05:04
	← bits8mybytes left	05:04
	← the_cybersphinx left	05:05
	→ zacts joined	05:07
	← purplevillage left	05:07
	→ nathancahill joined	05:08
	← v0n left	05:09
	← macmartine left	05:10
	→ Praise- joined	05:11
	← Praise left	05:12
	→ iliketurtles joined	05:13
	→ Andrevan joined	05:13
	← nathancahill left	05:16
	→ kcj joined	05:17
	← zacts left	05:17
	← jackdempsey left	05:18
	→ AWinterman joined	05:18
	← joelpittet left	05:19
	→ hoschi joined	05:19
	← nicedice left	05:20
	→ OOPMan joined	05:22
	← fridim_ left	05:24
	← Chikore left	05:25
	→ warthog9 joined	05:25
	→ daito joined	05:26
	← michaelarestad left	05:27
	← cha1tanya left	05:28
	→ bewest joined	05:28
	→ AWinterm_ joined	05:30
	→ tvw joined	05:30
	→ devoldmx_ joined	05:32
	→ cha1tanya joined	05:32
	→ pantsman joined	05:35
	← Davey left	05:35
	← pr0ton left	05:37
	← tpollard left	05:38
	→ ntus1017 joined	05:38
	← AWinterm_ left	05:39
	→ sajbar joined	05:39
	← PaulCapestany left	05:39
	→ enr joined	05:40
	→ ThomasLocke joined	05:40
	← train_or left	05:41
	→ jackdempsey joined	05:41
	→ PaulCapestany joined	05:43
	→ SuperDMP joined	05:46
	← warthog9 left	05:47
	→ aldodelgado joined	05:48
	→ nilg joined	05:51
	→ Zeelot joined	05:51
	→ HelloShitty joined	05:52
	← pantsman left	05:53
	→ babilen joined	05:53
	← sajbar left	05:54
	← babilen_ left	05:55
	← GeertV left	05:56
	← Spyro left	05:57
	→ fRAiLtY- joined	05:57
	← rasto left	05:57
	→ Daniel joined	05:57
	Daniel → Guest91361	05:57
	→ lresende joined	05:57
	Guest91361 → sajbar	05:57
	← lresende left	05:57
	← whowantstolivefo left	05:57
	→ michaelarestad joined	05:57
	→ soee joined	05:59
	← AWinterman left	05:59
	→ AWinterman joined	06:00
	→ fsvehla joined	06:00
	← worstadm1n left	06:00
	← fsvehla left	06:00
	← loteriety left	06:00
	→ stliu joined	06:01
	→ hahuang61 joined	06:01
	→ Anders_J joined	06:02
	← lavaman1 left	06:02
	← galaris left	06:03
	→ lavaman joined	06:03
	← lavaman left	06:03
	→ Spyro joined	06:03
	→ jargon joined	06:04
	← AWinterman left	06:05
	→ AWinterman joined	06:06
	← michaelarestad left	06:07
	← Goplat left	06:07
	← hahuang61 left	06:08
	→ papegaaij joined	06:08
	→ marthinal joined	06:09
	→ tasslehoff joined	06:09
	→ cbreak-work joined	06:10
	→ babilen_ joined	06:11
	← ghostlines left	06:11
	→ worstadmin joined	06:11
	→ h0bbit joined	06:13
	← h0bbit left	06:13
	← HelloShitty left	06:13
	→ endiruna joined	06:13
	← rurufufuss left	06:14
	← babilen left	06:14
	← AWinterman left	06:16
	→ staodd joined	06:16
	→ babilen joined	06:16
	→ stliu-s joined	06:17
	← babilen_ left	06:18
	← stliu left	06:19
	← stliu-s left	06:19
	← mckendricks left	06:19
	→ stliu joined	06:20
	→ AWinterman joined	06:20
	→ h0bbit joined	06:25
	← endiruna left	06:26
	← normanrichards left	06:26
	→ arvind_khadri joined	06:27
	→ rath joined	06:27
	→ vince_prignano joined	06:28
	← scorphus left	06:29
	← zbcm left	06:29
	→ pduin joined	06:30
	→ private joined	06:31
	← jaequery left	06:32
	← quazimodo left	06:32
	← quazimod1 left	06:33
	← aldodelgado left	06:33
	→ novile joined	06:33
	→ rob_w joined	06:34
	← Carraway left	06:35
	→ ayaz joined	06:37
	← cogitos left	06:37
	← stliu left	06:38
	→ stliu joined	06:38
	← ejnahc left	06:38
	→ ejnahc joined	06:40
	← iliketurtles left	06:40
	→ enr_ joined	06:41
	→ babilen_ joined	06:41
	→ rudak joined	06:41
	→ _iron joined	06:41
	← babilen left	06:41
	← tasslehoff left	06:42
	← enr_ left	06:43
	→ AWinterm_ joined	06:43
	→ shuaib joined	06:43
	→ enr_ joined	06:45
	→ babilen joined	06:46
	← babilen_ left	06:46
	← m104 left	06:47
	← stfn left	06:50
	→ stfn joined	06:50
	→ babilen_ joined	06:51
	← Cassiel left	06:51
	← AWinterm_ left	06:52
	→ LekeFly joined	06:52
	← LekeFly left	06:52
	← devoldmx_ left	06:52
	← babilen left	06:53
	→ ewnd9 joined	06:54
	→ _goTAN joined	06:54
	→ revyd joined	06:54
	← beautifulmind left	06:56
	→ quimes joined	06:56
	→ jayfk joined	06:57
	← tjbiddle left	06:57
	← AWinterman left	06:58
	← threesome left	06:58
	→ michaelarestad joined	06:58
	← KernelPanicMK2 left	06:59
	→ Gooder joined	07:01
	← quimes left	07:01
	→ GeertV joined	07:01
	→ quimes joined	07:01
	← michaelarestad left	07:03
	← SuperDMP left	07:03
	→ KernelPanicMK2 joined	07:03
	→ SamB joined	07:05
	→ emergion joined	07:07
	→ d3pwnd joined	07:09
	← d3pwnd left	07:09
	← rbento left	07:11
	→ benoit_ joined	07:13
	← rudak left	07:14
	← ktosiek left	07:14
	← crater2150 left	07:15
	→ ktosiek joined	07:15
	← chuckharmston left	07:15
	← peper left	07:15
	← rpg left	07:15
	→ chuckharmston joined	07:16
	→ rpg joined	07:16
	→ rudak joined	07:16
	← ziddey left	07:17
	→ raf joined	07:17
	→ peper joined	07:17
	→ crater2150 joined	07:18
	→ TLH joined	07:18
	→ SuperDMP joined	07:19
	→ AWinterman joined	07:19
	← ej left	07:19
	→ harish joined	07:20
	→ satazor joined	07:22
	→ Asenar joined	07:22
	Arokh[Off] → Arokh	07:24
	← benoit_ left	07:26
	→ gua_ould joined	07:26
	→ dfanjul joined	07:27
	→ matanya joined	07:28
	← matanya left	07:28
	→ matanya joined	07:28
	→ AWinterm_ joined	07:28
	← AWinterman left	07:29
	← iamtakingiteasy left	07:30
	→ zacts joined	07:31
	→ Element9 joined	07:31
	← jeffery_ left	07:32
	← St_Marx left	07:32
	→ Plummer joined	07:32
	← dreiss left	07:33
	→ maxmanders joined	07:35
	← AWinterm_ left	07:36
	← PaulCapestany left	07:37
	→ PigeonFriend joined	07:38
	→ zbcm joined	07:39
	← SuperDMP left	07:39
	→ threesome joined	07:41
	→ PeterBooker joined	07:44
	← harish left	07:44
	→ psoo joined	07:46
	→ Davey joined	07:46
	→ mishok13 joined	07:47
	→ alkino joined	07:49
	← kcj left	07:49
	← revyd left	07:50
	← vince_prignano left	07:50
	→ ej joined	07:51
	→ Raging_Hog joined	07:52
	← ology left	07:52
	← cads left	07:52
	← hyperair left	07:53
	→ hyperair joined	07:53
	← cha1tanya left	07:54
	← satazor left	07:54
	→ AWinterman joined	07:55
	← ej left	07:56
	→ cha1tanya joined	07:57
	← jackdempsey left	07:57
	← tvw left	07:58
	→ exoon joined	07:58
	→ michaelarestad joined	07:59
	→ Balliad joined	08:00
	← chuckf left	08:00
	← enr left	08:02
	→ quazimodo joined	08:02
	← _goTAN left	08:02
	→ quazimod1 joined	08:02
	→ theForce joined	08:03
theForce	hi	08:03
	← michaelarestad left	08:03
theForce	i have 2 repositories A and B. is it possible to "merge" B into a folder in A so that the whole history is kept etc. but at the end there is only 1 repository A?	08:04
	→ jkremser joined	08:04
	← jkremser left	08:04
	→ jkremser joined	08:04
cbreak-work	theForce: yes. subtree merging	08:04
iveqy	theForce: are the code in B a subset of A or is it the same code?	08:05
	← AWinterman left	08:05
	→ tjbiddle joined	08:05
	→ chuckf joined	08:05
iveqy	theForce: !subprojects	08:05
gitinfo	theForce: So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	08:05
	← tjbiddle left	08:07
theForce	ok thx guys	08:08
	→ kcj joined	08:08
	→ kewah joined	08:08
	← simesy left	08:08
	→ skylamer` joined	08:10
	← cschneid left	08:10
	← nsanden left	08:10
	← emergion left	08:11
	→ jackdempsey joined	08:11
	← JeremyWei left	08:12
	→ nicholasruunu joined	08:12
	→ iamtakingiteasy joined	08:14
	→ lyang0 joined	08:15
	→ achadwick joined	08:16
	→ anonymuse joined	08:16
	← quazimodo left	08:17
	← quazimod1 left	08:18
	→ purplevillage joined	08:18
	→ nova_ joined	08:19
	← jgornick left	08:21
	← novile left	08:21
	← bandroidx left	08:22
	→ bandroidx joined	08:22
	← bandroidx left	08:22
	→ bandroidx joined	08:22
	→ jgornick joined	08:22
	← hwrd\|work left	08:24
	→ eijk joined	08:25
	→ tatsuya_o joined	08:25
	← anonymuse left	08:26
	← chris___ left	08:28
	→ michaelarestad joined	08:30
	← jackdempsey left	08:30
	→ raging_swine joined	08:31
	→ AWinterman joined	08:32
	→ chris___ joined	08:32
	→ enr joined	08:33
	→ noname001 joined	08:34
	← tirengarfio left	08:34
	← michaelarestad left	08:34
	← Raging_Hog left	08:34
	→ _goTAN joined	08:35
	→ gebi joined	08:36
	→ tirengarfio joined	08:36
	→ aChatir joined	08:37
	→ Marqin joined	08:37
	← noname001 left	08:38
	→ mikecmpbll joined	08:39
	← tirengarfio left	08:40
	← raging_swine left	08:40
	→ tirengarfio joined	08:40
	← kadoban left	08:41
	← enr left	08:41
	→ noname001 joined	08:41
	← noname001 left	08:42
	← KernelPanicMK2 left	08:42
	→ dvor joined	08:42
	→ Sonderblade joined	08:45
	← _goTAN left	08:45
	→ noname001 joined	08:47
	← noname001 left	08:47
	← nova_ left	08:47
	→ crane_work joined	08:48
	← nilg left	08:48
	→ emergion joined	08:48
	→ nova_ joined	08:48
Sonderblade	git log master..X lists all commits made to feature branch X. but git diff master..X lists something else?	08:49
	→ marhaban joined	08:49
	→ harish joined	08:49
	→ noname001 joined	08:49
	← noname001 left	08:50
	→ endiruna joined	08:50
	← crane_work left	08:50
	→ crane_work joined	08:50
	→ valgrind joined	08:52
	← crane_work left	08:52
	← fuzzybunny69y left	08:52
	→ crane_work joined	08:52
	← deuterium left	08:52
	→ cschneid joined	08:52
_ikke_	Sonderblade: git diff diffs trees	08:52
	Sonderblade: so git diff A..B is the same as git diff A B	08:53
	→ noname001 joined	08:53
	← crane_work left	08:53
	zz_michael_mbp → michael_mbp	08:53
	→ crane_work joined	08:53
	← aChatir left	08:53
	babilen_ → babilen	08:53
	← parcs_ left	08:53
	← ntus1017 left	08:54
	→ LimeBlast joined	08:54
Sonderblade	_ikke_: so what is the equivalent git diff command to my git log then?	08:54
	→ fuzzybunny69y joined	08:55
	→ ntus1017 joined	08:55
_ikke_	There is none, git diff does something different than git log	08:55
	← weiyang left	08:55
_ikke_	Sonderblade: You probably want git log -p	08:55
	→ SergeyPenkin joined	08:56
Sonderblade	_ikke_: no, i want the union of the diffs git log -p shows	08:56
	→ \|Freeman\| joined	08:56
	→ BitPuffin joined	08:56
	← herdingcat left	08:56
_ikke_	Sonderblade: git diff master...X	08:57
	note the three dots	08:57
	It's the same as git diff $(git merge-base master X) X	08:57
	← noname001 left	08:58
	→ nilg joined	08:59
	← flaguy48 left	08:59
Sonderblade	_ikke_: :) thanks, that works	08:59
	→ quazimodo joined	08:59
	→ quazimod1 joined	08:59
	← thiago left	09:00
	→ cedeon joined	09:01
	→ rednaks joined	09:02
	← carlos-huang left	09:02
	← endiruna left	09:05
	← emergion left	09:05
	→ endiruna joined	09:05
	← arvind_khadri left	09:06
	→ hahuang61 joined	09:06
	← purplevillage left	09:07
	← OOPMan left	09:08
	← quazimodo left	09:09
	← quazimod1 left	09:09
	→ St_Marx joined	09:09
	→ gittish joined	09:09
	← hahuang61 left	09:10
	→ OOPMan joined	09:10
	← marhaban left	09:12
	→ bvi joined	09:13
	← harish left	09:13
	→ z8z joined	09:14
	← skylamer` left	09:16
	→ alexO joined	09:17
	← SirFunk left	09:18
	← johnkpaul left	09:18
	← Forkk left	09:18
	→ saurabh joined	09:18
	← Z3tta left	09:18
	→ johnkpaul joined	09:18
	→ Forkk joined	09:18
	← cedeon left	09:18
	→ SirFunk joined	09:18
	→ Z3tta joined	09:19
	← St_Marx left	09:19
	→ quazimodo joined	09:19
	→ quazimod1 joined	09:19
	→ aChatir joined	09:20
	→ dc5ala joined	09:20
	→ arvind_khadri joined	09:22
	← DrNick left	09:22
	→ verysoftoiletppr joined	09:22
	← Andrevan left	09:23
	→ DrNick joined	09:23
	← NET\|\|abuse left	09:23
	← modInfo3 left	09:26
	← tirengarfio left	09:27
	→ tirengarfio joined	09:27
	← nilg left	09:28
	← tirengarfio left	09:29
	→ shruggar joined	09:29
	→ michaelarestad joined	09:30
	→ cedeon joined	09:31
	→ tirengarfio joined	09:31
	← OOPMan left	09:33
	→ deuterium joined	09:33
	← tirengarfio left	09:35
	← michaelarestad left	09:35
	→ tirengarfio joined	09:35
	→ OOPMan joined	09:35
	→ noname001 joined	09:36
	← saintcajetan_ left	09:36
	← dc5ala left	09:36
	→ NET\|\|abuse joined	09:36
	→ emergion joined	09:36
	→ Sigma joined	09:40
	← frogonwheels left	09:41
dfanjul	man config	09:41
	← saintcajetan left	09:42
	→ mechanicalduck joined	09:42
	← babilen left	09:46
dfanjul	hi all, is it possible to have something like @{upstream} but refering to the branch.<name>.pushremote or remote.pushdefault?	09:47
	→ babilen joined	09:48
	← aChatir left	09:49
	← zbcm left	09:49
	← flippo left	09:50
	→ satazor_ joined	09:51
	← tirengarfio left	09:52
	← emergion left	09:53
	→ _goTAN joined	09:53
	→ tirengarfio joined	09:53
	→ parcs_ joined	09:53
	→ maroloccio joined	09:53
	← tirengarfio left	09:53
	→ babilen_ joined	09:54
	← babilen_ left	09:56
	← babilen left	09:56
	→ emergion joined	09:56
	← emergion left	09:57
	→ _Qman joined	09:59
	→ Raging_Hog joined	09:59
	→ beautifulmind joined	10:00
	→ michaelarestad joined	10:01
	← michaelarestad left	10:01
	→ michaelarestad joined	10:01
	→ the_cybersphinx joined	10:02
	← beautifulmind left	10:02
	→ beautifulmind joined	10:03
	→ tirengarfio joined	10:05
	← michaelarestad left	10:05
	→ St_Marx joined	10:06
	→ szx joined	10:07
	← valgrind left	10:07
	← h0bbit left	10:08
	→ valgrind joined	10:08
	→ fr00ty joined	10:10
charon	dfanjul: afraid not. you could send an email about your workflow and why it needs this to the !list	10:12
gitinfo	dfanjul: [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	10:12
	→ h0bbit joined	10:12
	← tirengarfio left	10:13
	← satazor_ left	10:14
	← raf left	10:14
	→ emergion joined	10:14
	→ tirengarfio joined	10:14
	→ h0bbit_ joined	10:15
	→ matteo joined	10:16
	← Chryyz left	10:16
	adhawkins → adhawkins-away	10:17
	← tirengarfio left	10:18
dfanjul	charon: thanks	10:18
	→ tirengarfio joined	10:21
	→ babilen joined	10:26
	← bvi left	10:27
	← ntus1017 left	10:28
	← \|Freeman\| left	10:29
	→ michaelarestad joined	10:32
	→ GT4066 joined	10:32
	→ godgodgodgo joined	10:33
	michael_mbp → zz_michael_mbp	10:33
	← fr00ty left	10:35
	← gittish left	10:35
	← michaelarestad left	10:36
	→ guns joined	10:38
	← mikecmpbll left	10:39
	→ marhaban joined	10:40
	← ayaz left	10:40
	→ godgodgodgo_ joined	10:41
	← mechanicalduck left	10:42
	← jast left	10:42
	← kewah left	10:42
	→ szx` joined	10:42
	← luc_ left	10:44
	→ babilen_ joined	10:44
	→ paul424 joined	10:44
	→ mutex_ joined	10:45
	← jgornick left	10:45
	← godgodgodgo left	10:45
	← babilen left	10:45
	← alkino left	10:45
	← nehaljwani left	10:45
	← saurabh left	10:45
	← bgerber left	10:45
	← catsup left	10:45
	← ThomasLocke left	10:45
	← HedgeMage left	10:45
	← parcs_ left	10:45
	← johnkpaul left	10:45
	← kaictl left	10:45
	← mutex left	10:45
	→ catsup joined	10:45
	← z8z left	10:45
	← jefflyne left	10:45
	← GT4066 left	10:45
	← Sigma left	10:45
	← Forkk left	10:45
	← bandroidx left	10:45
	→ johnkpaul joined	10:45
	← szx left	10:45
	→ jefflyne joined	10:45
	→ jgornick joined	10:45
	→ bgerber joined	10:45
	→ HedgeMage joined	10:45
	→ Forkk joined	10:45
	→ bandroidx joined	10:46
	← bandroidx left	10:46
	→ bandroidx joined	10:46
	→ ThomasLocke joined	10:46
	→ saurabh joined	10:46
	→ nehaljwani joined	10:46
	← emergion left	10:46
	→ kaictl joined	10:47
	→ mechanicalduck joined	10:47
	→ parcs_ joined	10:47
	← hyperair left	10:48
	→ arand_ joined	10:48
	→ Gue______ joined	10:48
	← FreezingCold left	10:48
	zz_michael_mbp → michael_mbp	10:48
	← nevyn left	10:49
	← gitinfo left	10:49
	→ nevyn joined	10:50
_ikke_	gitinfo down	10:50
	→ Droolio joined	10:51
	← cha1tanya left	10:51
	→ prathamesh joined	10:51
	← szx` left	10:53
	→ eijk_ joined	10:56
	← nevyn left	10:56
	← nehaljwani left	10:56
	→ nevyn joined	10:57
	→ Sigma joined	10:57
	→ emergion joined	10:58
	← eijk left	10:59
	← verysoftoiletppr left	10:59
	← nevyn left	11:02
	→ michaelarestad joined	11:03
	→ nevyn joined	11:03
	← marthinal left	11:05
	→ harish joined	11:07
	← michaelarestad left	11:07
	→ jast joined	11:08
	→ robbyoconnor joined	11:08
	→ bvi joined	11:09
theForce	is it possible with subtree merging to completely eliminate the need for the 2nd repository? meaning i have 2 repositories A and B, and i want to "merge" B in a folder in A so that the history is kept and all the changes to B will be done in A/path/to/B => only 1 remaining repository, no need for e.g. "git pull -s subtree ..."	11:09
	→ gitinfo joined	11:09
	ChanServ set mode: +o	11:09
selckin	you can merge 2 repos without subtree	11:10
	← r0bby_ left	11:10
	← k_sze[work] left	11:10
_ikke_	theForce: You can just do changed to A/path/to/B and commit that. No need to do that in the 2nd repository and merge back	11:11
	s/changed/changes	11:11
arand	yes, if all commits that you want will go into repo A from that point on, then B would not be needed anymore no, I've I've understood your reasoning?	11:12
	s/I\'ve/if/	11:13
	→ angelsl joined	11:14
	← voiceofgrog left	11:14
	→ sgambino joined	11:14
	→ carlos-huang joined	11:14
	→ hellopat joined	11:17
	← GeertV left	11:18
	→ GeertV joined	11:18
	← exoon left	11:19
	→ exoon joined	11:19
	→ flaguy48 joined	11:20
	← bvi left	11:21
	→ zhanglongyang joined	11:22
	→ bvi joined	11:22
	→ stliu_ joined	11:22
	← GeertV left	11:23
	← sgambino left	11:24
	← daito left	11:24
	← xpirator left	11:25
theForce	selckin: how can i merge 2 repos without subtree?	11:25
	← stliu left	11:25
	← echo-area left	11:25
selckin	add a remote and rebase	11:26
theForce	but how can i tell git to put that under a certain path?	11:26
	and will i keep the revision history from B?	11:26
	← tinti left	11:26
iveqy	move it to that path first in repo B	11:27
	why wasn't subtree an option?	11:27
selckin	you'll keep the full history	11:27
	→ tinti joined	11:27
	← arvind_khadri left	11:28
	→ spaceonline joined	11:28
	→ rasnor joined	11:28
	→ jeffery_ joined	11:30
	→ gittish joined	11:32
	→ marthinal joined	11:32
theForce	iveqy: subtree is an option. i was just reading about it and was under the impression that one always had to do "git pull -s subtree...", meaning changes to B would still be done in B's old repository	11:33
	→ michaelarestad joined	11:33
iveqy	theForce: that's one way to do it yes, but of course you could also do a subtree merge once and then only do updates in the common repo	11:34
	← jon_r left	11:35
	← mtk left	11:35
	← stliu_ left	11:35
	← Gue______ left	11:36
	→ stewiee joined	11:37
	→ mtk joined	11:37
	← michaelarestad left	11:38
	→ kewah joined	11:38
	← valgrind left	11:39
	→ flippo joined	11:39
	← guns left	11:41
	→ Destos joined	11:42
	→ jon_r joined	11:43
	→ valgrind joined	11:43
	→ keller joined	11:43
dbolser_	hihi	11:43
	I'm looking at filter-branch, I can't work out how to remove a single commit from my branch	11:44
	→ arvind_khadri joined	11:44
dbolser_	trying: git filter-branch --commit-filter skip_commit a65398b11f27fa6f80e8f6b4c3e23d1832123e66 # but that don't work	11:44
iveqy	dbolser_: are you sure you aren't looking for git rebase -i?	11:44
cbreak-work	dbolser_: --commit-filter expects a string as command. no spaces.	11:45
	dbolser_: something it can execute directly	11:45
dbolser_	iveqy: not sure at all really... my branch has diverged from production by a lot, so I'm just manually cherry picking a few changes applying them to dev and removing from my branch	11:46
	cbreak-work: so I should define the skip_commit shell function?	11:46
cbreak-work	write a program for it	11:47
	or a shell script	11:47
iveqy	dbolser_: then it's rebase -i you need	11:47
dbolser_	I'm sure what I'm doing isn't right, I'm just 'tidying up' manually	11:47
iveqy	dbolser_: man git rebase	11:47
gitinfo	dbolser_: the git-rebase manpage is available at http://jk.gs/git-rebase.html	11:47
dbolser_	a rebase feels like overkill here, since there are many conflicts	11:47
	← arand left	11:47
dbolser_	I just want to toggle a few settings in this code...	11:48
	perhaps I should try it and see...	11:48
	← dfanjul left	11:48
selckin	rebase -i, will give you a list of commits, where you can just remove the commit from and close editor	11:48
dbolser_	selckin: but I want to look at each one (i.e. diff) and decide	11:49
selckin	gitk <sha> &; git rebase -i <sha>	11:49
	maybe i'm just lazy	11:49
iveqy	dbolser_: then use gitk/tig/whatever first	11:49
dbolser_	right, using rebase -i with gitk open	11:50
cbreak-work	dbolser_: you should be aware of the major goals of filter-branch	11:50
	→ simesy joined	11:50
cbreak-work	dbolser_: and how it works	11:50
	dbolser_: it will NOT remove the effect of commits	11:50
	it will merely remove the commit itself	11:50
dbolser_	The thing is... gah.... I want to remove my commits from my branch one by one, apply them to the dev branch and push	11:51
cbreak-work	if you do it properly, it will look like the next commit performs both its own and the previous changes at once	11:51
	then don't use filter-branch	11:51
	dbolser_: man git-cherry-pick	11:51
gitinfo	dbolser_: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html	11:51
cbreak-work	use that	11:51
dbolser_	cbreak-work: yes, I want to reset the wd to undo the commit after filtering	11:51
cbreak-work	that's irrelevant	11:51
dbolser_	cbreak-work: the issue with cp is that their are conflicts	11:52
cbreak-work	the working dir has nothing to do with it	11:52
	dbolser_: so?	11:52
shuaib	Is it normal for a "$git svn rebase" to take too long when checking out a newly created branch?	11:52
cbreak-work	resolve them	11:52
	dbolser_: you won't get around that.	11:52
shuaib	:q	11:52
dbolser_	cbreak-work: it's easier to apply my change manually than to resolve a conflict	11:52
	→ SuperDMP joined	11:52
dbolser_	s/apply/re-apply/	11:52
	← nova_ left	11:52
cbreak-work	resolving the conflict IS applying the changes	11:52
dbolser_	cbreak-work: I suppose	11:53
	how do I abort rebase -i?	11:53
	:q!	11:53
cbreak-work	rebase --abort	11:53
dbolser_	?	11:53
	I'm in the editor now	11:53
	→ Inside joined	11:53
cbreak-work	then just delete everything and :wq	11:53
dbolser_	remove everything, the rebase will be aborted.	11:53
	ty	11:53
cbreak-work	yes.	11:53
	→ themsay joined	11:53
dbolser_	OK, my tries cherry-picking	11:54
	→ wrouesnel joined	11:54
dbolser_	hah... no conflicts on this one ;-) thanks	11:54
	← bgerber left	11:54
dbolser_	thank you all	11:55
	← simesy left	11:56
dbolser_	so now that commit x from branch z is in dev, will a rebase of z on dev 'do the right thing'?	11:57
	← pdurbin left	11:57
dbolser_	i.e. will the history of z be re-written to put x in a different place? I guess not	11:57
	→ bgerber joined	11:57
cbreak-work	dbolser_: x is not in a different place	11:59
	← flippo left	11:59
cbreak-work	dbolser_: you now have a new commit that is similar to the original.	11:59
	the new is a copy of the effect, but likely has different tree, and of course has different parents	11:59
d33tah	why does git stash return to the system with 0 exit code if there was no stash created, because the working tree has no changes?	12:00
cbreak-work	if you rebase stuff, the rebase internal code will cherry pick commits as well (in -i mode)	12:00
	← hellopat left	12:00
cbreak-work	if it notices that a commit has no effect (because you already cherry-picked it), that one gets dropped, and not copied	12:00
	d33tah: why not?	12:01
	the working dir is as you'd expect, and there's no error, so no point pretending there's one :)	12:02
d33tah	cbreak-work: i wrote an alias for git-svn	12:02
dbolser_	cbreak-work: so the result is that branch z has x or the x' (copy)	12:02
	?	12:02
d33tah	it performs git stash, then does git svn dcommit and git stash pop	12:02
	→ arand joined	12:02
d33tah	i'd rather not have git stash pop if git stash didn't save anything	12:02
	→ hyperair joined	12:03
dbolser_	d33tah: check git stash list	12:03
	in your script	12:03
cbreak-work	d33tah: just git diff before git stash	12:03
canton7	there might be a stash from earlier - doesn't help?	12:04
cbreak-work	git diff can give you an exit code	12:04
dbolser_	oh	12:04
	canton7: right	12:04
	→ Gu_______ joined	12:04
d33tah	cbreak-work: thanks!	12:04
	→ michaelarestad joined	12:04
	← rudak left	12:05
	← valgrind left	12:06
	← saurabh left	12:06
d33tah	canton7: git diff kept returning zero.	12:08
	ah, git diff --exit-code	12:08
	← michaelarestad left	12:09
	← emergion left	12:09
	→ rurufufuss joined	12:10
	← BitPuffin left	12:10
	← dhruvasagar left	12:10
	← bvi left	12:11
cbreak-work	yes. I said that :)	12:11
	→ bvi joined	12:12
	← rfoust_ left	12:12
	→ BitPuffin joined	12:12
	→ flippo joined	12:12
	→ PsySc0rpi0n joined	12:15
	→ IrishPrime joined	12:16
	← Destos left	12:17
	← _goTAN left	12:17
	→ angelazou joined	12:17
angelazou	quick question, I'm getting this error when I try to commit	12:17
	error: pathspec did not match any file(s) known to git.	12:17
cbreak-work	angelazou: user error.	12:18
angelazou	as in I didn't authenticate?	12:18
	← shuaib left	12:18
	→ elixir joined	12:18
cbreak-work	no	12:18
	as in you typed wrong stuff	12:18
angelazou	oh crap...you're right	12:19
	forgot the -m option	12:19
	← exoon left	12:19
cbreak-work	... that's not important	12:19
	just type "git commit"	12:19
	← freestyl3r left	12:19
cbreak-work	-m is just for lazy people who can't be bothered to write non-crappy commit messages :)	12:19
angelazou	yeah, I know, I added a message without the -m option	12:19
	→ exoon joined	12:19
angelazou	thanks	12:20
	← angelazou left	12:20
	→ mdhopkins joined	12:20
	→ freestyl3r joined	12:20
cbreak-work	np :)	12:20
	← freestyl3r left	12:21
	← mechanicalduck left	12:23
	→ rudak joined	12:23
	→ breakingthings joined	12:24
	→ g3orge joined	12:24
	→ HenryG joined	12:25
	→ ewnd9_ joined	12:26
	← themsay left	12:26
	→ normanrichards joined	12:27
	← ewnd9 left	12:27
	← SicoWork left	12:27
	→ Will\| joined	12:28
	← HariboPenguin\|Of left	12:28
	← Seveas left	12:28
	← Asenar left	12:29
	← enr_ left	12:29
	← sonOfRa left	12:29
	← adamm left	12:29
	← Nevik left	12:29
	→ sonOfRa joined	12:30
	← ncd\|leeN left	12:30
	→ Hoosier2016 joined	12:30
	← midnightmagic left	12:30
	← flippo left	12:30
	→ ncd\|leeN joined	12:30
	← ncd\|leeN left	12:30
	← Inside left	12:30
	← shihan left	12:31
	← Mogget left	12:31
	→ adamm joined	12:31
	← xSmurf left	12:31
	→ shihan_ joined	12:32
	SeoZ2 → SeoZ-work[AWAY2]	12:32
	← normanrichards left	12:32
	→ _goTAN joined	12:32
	→ xSmurf joined	12:32
	reim_ → reim	12:33
	→ simesy joined	12:33
	← godgodgodgo_ left	12:34
	→ enr joined	12:34
	→ midnightmagic joined	12:34
	→ dougsland joined	12:34
	→ SicoAnimal joined	12:35
	→ HariboPenguin\|Of joined	12:35
	→ Seveas joined	12:35
	→ Nevik joined	12:35
	→ michaelarestad joined	12:35
	HariboPenguin\|Of → HariboPenguin	12:35
	→ Asenar joined	12:36
	← elixir left	12:37
	→ anonymuse joined	12:37
	→ dfanjul joined	12:38
	→ enr_ joined	12:38
	→ pdx joined	12:38
	← kcj left	12:38
	→ Mogget joined	12:39
	→ jerius joined	12:40
	← michaelarestad left	12:40
	→ miluz joined	12:41
	← enr left	12:41
	← miluz left	12:41
	← PsySc0rpi0n left	12:42
	→ rfoust joined	12:43
	← enr_ left	12:43
	→ enr joined	12:43
	→ rshetty joined	12:43
	→ Jenser joined	12:43
	→ kukks joined	12:44
	← kukks left	12:44
	→ kukks joined	12:44
	← Will\| left	12:44
	← jon_r left	12:44
	babilen_ → babilen	12:45
	← sriracha left	12:45
	← alexO left	12:45
	← Hoosier2016 left	12:45
	← Jenser left	12:46
	← BitPuffin left	12:46
	→ DolphinDream joined	12:46
	→ devoldmx3 joined	12:47
	→ BitPuffin joined	12:47
	← simesy left	12:47
	→ simesy joined	12:48
	← devoldmx left	12:49
	→ Will\| joined	12:49
	→ alkino joined	12:49
	← Will\| left	12:50
	→ flippo joined	12:51
	← zhanglongyang left	12:51
	← paul424 left	12:53
	← Raging_Hog left	12:53
	← Entomo left	12:53
	← ewnd9_ left	12:53
	→ oliveiraev joined	12:55
	→ ewnd9 joined	12:55
	← marhaban left	12:55
	→ satazor_ joined	12:58
	→ freeed joined	13:00
	← _goTAN left	13:01
	→ dgx joined	13:02
dgx	Hey all. When I try to do : git push upload master I get an error: The program can´t start because libcurl-4.dll is missing. How can I fix that? I have installed SourceTree	13:03
	→ Jenser joined	13:04
	← devoldmx3 left	13:04
	← rshetty left	13:04
	← g3orge left	13:06
	→ michaelarestad joined	13:06
	← imarcusthis- left	13:06
	michael_mbp → zz_michael_mbp	13:06
	← noname001 left	13:06
	→ dsdeiz_ joined	13:06
	← dsdeiz left	13:07
	→ devoldmx joined	13:07
	→ ZujkisNx joined	13:09
	← flaguy48 left	13:10
iveqy	dgx: install libcurl, however sourcetree should probably already done that for you since libcurl isn't a standard software on a linux system	13:10
	*windows system	13:10
	so I suggest you first try to reinstall sourcetree	13:10
	→ Hoosier2016 joined	13:10
	← michaelarestad left	13:10
	→ wakeup joined	13:11
dgx	iveqy, SourceTree is the 3rd re-install, I´ve tried one more beforehand(after second re-install, i did reboot) - still the same	13:11
wakeup	ez	13:11
	is there a way to pull to a bare repo?	13:11
	← Jenser left	13:11
_ikke_	pull to?	13:11
	← kermit left	13:11
_ikke_	It's either push to, or pull from	13:11
	→ dsdeiz joined	13:11
	→ Will\| joined	13:12
iveqy	wakeup: you should be able to fetch to it, but pull to it I don't think you can, merging without a worktree would be difficult if you've a conflic.	13:12
_ikke_	Either way, there is no difference between a bare repo and a non-bare repo in that regard	13:12
wakeup	git pull	13:12
	fatal: /usr/libexec/git-core/git-pull cannot be used without a working tree.	13:12
_ikke_	wakeup: correct	13:12
	← dsdeiz_ left	13:12
	→ t0by joined	13:12
_ikke_	what iveqy said	13:12
	→ flaguy48 joined	13:12
iveqy	wakeup: however you should push to the bare repo and pull from it, as _ikke_ said	13:12
t0by	Hi, I'm sorry, I'm working on a branch of a fork of a repo	13:12
wakeup	ah ok thanks, so I just fetch	13:12
	→ noname001 joined	13:12
	→ kermit joined	13:12
_ikke_	wakeup: yes	13:12
t0by	upstream:master has been changed in a way that my work is now unmergeable	13:13
iveqy	dgx: well file a bug-report to sourcetree and install libcurl manually	13:13
_ikke_	pull = fetch + merge. A bare repo can fetch, but not merge	13:13
t0by	what do I do now to get my branch mergeable?	13:13
iveqy	wakeup: !xy	13:13
gitinfo	wakeup: Woah, slow down for a bit. Are you sure that you need to jump to that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	13:13
	← Werring left	13:13
_ikke_	t0by: What do you mean, not mergable?	13:13
t0by	Some critical parts have been changed	13:13
dgx	iveqy, right, digging into it	13:13
	→ konundra joined	13:13
	→ _goTAN joined	13:13
t0by	So a merge would simply not make sense	13:14
	← prathamesh left	13:14
t0by	I need to manually update a few files	13:14
	→ Destos joined	13:14
t0by	But fiorst I need to get them from upstream	13:14
wakeup	iveqy: I work on a repo hosted on github, my local workflow is to have working copies and bare repositories that get backed up. I wan't a bare repo in between my working copy and github to protect me against data loss.	13:14
	→ GeertV joined	13:14
_ikke_	t0by: fetch	13:14
t0by	how do I do that without disrupting my entire local branch?	13:14
	← simesy left	13:14
t0by	I've fetched, but then?	13:14
	cherry-pick?	13:14
	→ Werring joined	13:14
_ikke_	for example	13:14
wakeup	normally, no-one but me pushes to the repos, so I just use github as a mirror if I have to, but in this case I want to sync with whatever my client does on github	13:15
	→ Mowsh joined	13:15
	→ angelazou joined	13:15
t0by	so git pull upstream; git checkout master; git log, see what I need, git checkout mybranch; git cherry-pick interesting_commit; manually edit?	13:15
iveqy	wakeup: oh so you want a bare repo to mirror the github one? Well then I guess fetch is a good way. There's also man git clone --mirror but if the github repo gets corrupted your mirrored repo could be corrupte too	13:16
gitinfo	wakeup: the git-clone manpage is available at http://jk.gs/git-clone.html	13:16
_ikke_	t0by: s/pull/fetch	13:16
	→ Milossh joined	13:16
	← dsdeiz left	13:17
	← devoldmx left	13:17
	→ trungqtran joined	13:17
	→ michaelarestad joined	13:17
	→ Mode-M joined	13:17
	→ devoldmx joined	13:18
	← staodd left	13:19
t0by	Thanks _ikke_	13:19
	← ZujkisNx left	13:19
	→ lamarus joined	13:20
	→ ZujkisNx joined	13:20
	← cagedwisdom left	13:21
	← ewnd9 left	13:22
angelazou	hi, I'm having trouble with a pull request in github	13:22
	I have already forked and make new commits to my repo	13:22
	and when submitting a pull request, they don't show up in the diff	13:22
_ikke_	selected the correct branch for the pull request?	13:23
angelazou	I think so, both are masters	13:23
iveqy	angelazou: the pull request doesn't show up in the diff?	13:23
	→ untaken joined	13:24
	← beautifulmind left	13:24
	← _goTAN left	13:24
angelazou	iveqy: it shows up some diff, but not my diffs	13:24
untaken	can I add a directory with . at the beginnning? for instance .vim . I have tried but doesn't look like it's getting added?	13:24
iveqy	untaken: yes you can !repro	13:24
gitinfo	untaken: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	13:24
_ikke_	untaken: is it an empty directroy?	13:25
	directory*	13:25
	→ hellopat joined	13:25
untaken	_ikke_: there is a directory in .vim , but no files yet	13:25
iveqy	angelazou: sorry but I don't understand. Could you !repro	13:25
gitinfo	angelazou: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	13:25
_ikke_	untaken: git doesn't track directories	13:25
untaken	ahh so a file must exist in there	13:25
_ikke_	untaken: yes	13:25
untaken	never knew that :)	13:25
	zz_michael_mbp → michael_mbp	13:26
untaken	thanks _ikke_	13:26
	← devoldmx left	13:26
	→ devoldmx joined	13:26
angelazou	it's in the root directory	13:26
	I think I'll try again tomorrow	13:26
	it might be that I just made the commit	13:26
	← michaelarestad left	13:27
	→ devoldmx3 joined	13:27
	→ michaelarestad joined	13:27
	→ jrex joined	13:27
	→ tmcmahon joined	13:28
iveqy	angelazou: the commit should be showed instantly	13:28
	← GarethAdams left	13:28
_ikke_	But you have to push it first	13:28
	← satazor_ left	13:29
	→ ojacobson joined	13:29
	← devoldmx left	13:30
	→ satazor_ joined	13:30
	→ natechan joined	13:30
	→ v0n joined	13:31
	← michaelarestad left	13:31
	← carlos-huang left	13:31
	→ aldodelgado joined	13:33
	← aldodelgado left	13:33
	→ GarethAdams joined	13:34
	← satazor_ left	13:34
	→ _goTAN joined	13:34
	→ Christi123 joined	13:35
untaken	how do you make an alias to another git account? For instance, if I want a directory to contain another repo, without copying the files and then committing them. Like on this page https://github.com/vgod/vimrc/tree/master/bundle how is this done?	13:36
	→ BSaboia joined	13:36
iveqy	untaken: !submodules	13:37
gitinfo	untaken: [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html	13:37
_ikke_	!submodules	13:37
gitinfo	[!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html	13:37
	→ decotii joined	13:37
cbreak-work	untaken: git doesn't have accounts :/	13:37
	→ dhruvasagar joined	13:37
	→ kesha joined	13:37
untaken	thanks :)	13:37
	→ mike_af joined	13:37
	← dgx left	13:40
	→ ewnd9 joined	13:40
	← ewnd9 left	13:41
	→ ewnd9 joined	13:41
	→ m0viefreak joined	13:41
	← mdhopkins left	13:41
	← Hoosier2016 left	13:42
	← w0ng left	13:44
	→ mechanicalduck joined	13:44
	→ valgrind joined	13:44
	← kesha left	13:44
	→ kesha joined	13:46
	← flippo left	13:47
	→ adamwathan joined	13:50
	→ nova_ joined	13:50
	→ freestyl3r joined	13:50
	→ Raging_Hog joined	13:51
	→ TeckniX joined	13:51
	← angelazou left	13:53
	→ geekbri joined	13:53
	→ scorphus joined	13:54
	→ glosoli joined	13:54
	→ Hoosier2016 joined	13:55
	← cedeon left	13:55
	→ sriracha joined	13:55
	→ methods joined	13:56
	← methods left	13:58
	→ michaelarestad joined	13:58
	← soee left	14:00
	← Raging_Hog left	14:00
	← kesha left	14:00
	← dhruvasagar left	14:00
	→ cizra joined	14:01
	→ vedranm joined	14:01
	→ LuxuryMode joined	14:01
	→ dhruvasagar joined	14:02
	→ ikuraj joined	14:02
	← tmcmahon left	14:02
	→ kesha joined	14:03
	← ZujkisNx left	14:03
	→ devth joined	14:04
cizra	Hi! git-svn is giving me headaches. I'm trying to set up a new branch to track a SVN branch, and it tells me that the upstream thingy is not a branch. For example, git branch --set-upstream-to=trunk master says "fatal: Cannot setup tracking information; starting point 'trunk' is not a branch.". I distinctly remember this stuff working before.	14:04
	→ CheckDavid joined	14:04
cizra	I've got a rather recent SVN (1.8 series), maybe this changed something?	14:04
	→ PigDude joined	14:05
PigDude	I have a weird issue: I can SSH to my server, but I cannot clone over SSH	14:05
cizra	git-svn version 1.8.3.4 (svn 1.6.18)	14:06
PigDude	this just recently started happening so I find it confusing	14:06
	git clone -v ... produces no more output	14:06
	(than without -v)	14:06
	→ kesha_ joined	14:06
cizra	PigDude: Check the logs on server side? Maybe they disabled scp or something.	14:07
PigDude	cizra, it is my server, OK	14:07
	cizra, indeed the server i cam clonign from, I am messaging you from right now over a pubkey authenticated ssh session	14:07
	→ gusnan joined	14:08
ojacobson	PigDude: did you add something to your .bashrc that generates output on stdout, or that can fail?	14:08
	← kesha left	14:08
	→ asmacdo joined	14:08
PigDude	cizra, ah, it was using another username	14:08
	cizra, I think it is too early on a monday :(	14:08
	thanks guys	14:08
	← asmacdo left	14:08
	→ normanrichards joined	14:09
	← PigDude left	14:10
	→ cedeon joined	14:10
	← sqlnoob left	14:11
	→ acharlieh joined	14:13
	← quimes left	14:13
	← kesha_ left	14:14
	← infogulch left	14:15
	← BitPuffin left	14:15
	← kewah left	14:16
	← bvi left	14:16
	← dfanjul left	14:16
	→ dfanjul joined	14:17
	→ GT4066 joined	14:17
	→ kesha_ joined	14:18
	→ kewah joined	14:18
	← michaelarestad left	14:20
	← nkambo left	14:20
	→ simesy joined	14:21
onethfour	how do i rebase a branch against master?	14:21
ojacobson	onethfour: what did you try? :)	14:22
	→ infogulch joined	14:22
	← rickruby left	14:22
ojacobson	(I'm asking because the obvious answer is the correct answer, so I'm assuming that didn't work)	14:22
	← Hoosier2016 left	14:22
	← dfanjul left	14:22
	← kesha_ left	14:22
onethfour	i didnt try anything, but the idea is that I want the updated master, correct? rather than the master a few weeks ago when i initially created the branch	14:23
	→ JosephSilber joined	14:24
	→ m104 joined	14:24
	→ dfanjul joined	14:26
	← simesy left	14:26
	← jeffery_ left	14:26
	→ SmokeyD joined	14:27
	← ojacobson left	14:27
SmokeyD	hey all. How do I see all the commits for a specific branch? Right now, when I do git log on a checked out branch, I see commits on other branches as well, and the log also goes back before the branch was created.	14:27
	→ ErKa joined	14:28
	→ ojacobson joined	14:29
	→ mklappstuhl joined	14:29
bestform	SmokeyD, of course it does. it's the list of linked commits starting from your current ref. it doesn't care if there are ones with more than one parent (eg. a branch was created). therefore you might see commits from other branches, if they are reachable from your current ref	14:29
offby1	smokeyd: something like "git log branch-im-interested-in...some-other-branch" will show only commits after the "merge base"	14:30
cbreak-work	SmokeyD: all commits in a branch are all commits reachable from the branch tip.	14:30
	← papegaaij left	14:30
onethfour	crud, i did git rebase master, but now it has several merge conflicts (with files i never even modified)	14:30
cbreak-work	in particular, the initial commits are reachable from the branch tip	14:30
	→ dsdeiz joined	14:31
SmokeyD	I just want to see how did what, when on a specific branch. So I would like to see all commits that were done on a specific branch. I don't care whether or not they have been merged to another branch.	14:31
offby1	smokeyd: you might be interested in the reflog	14:32
	→ nkambo joined	14:32
	→ jerrad joined	14:33
	← infogulch left	14:33
	← pen left	14:33
bestform	SmokeyD, you have to understand, that a branch is nothing but a ref on a particular commit, not a range of commits or something like that.	14:33
	→ tatsuya__ joined	14:34
SmokeyD	bestform: ok, but can't I see the all commits with that specific ref.	14:34
	offby1: you might be right, thanks. I am checking whether it is what I need (didn't know it)	14:34
bestform	SmokeyD, that's just one commit. what offby1 said should get you to where you wanna be :)	14:35
	→ pen joined	14:35
	→ infogulch joined	14:35
offby1	smokeyd: actually, I, and I suspect most long-time gitters, simply don't want to do exactly what you want to do. We are more likely to be interested in all the commits leading up to a given point, regardless of which branch was current when those commits were made	14:36
	← tatsuya_o left	14:36
offby1	other than the reflog, git doesn't even record that information.	14:36
	→ Sendoushi joined	14:36
offby1	you can check out a branch based on master, make one commit on it, merge it into master, then delete the branch. If the merge was fast-forward, as far as I can tell, there will be no trace left of the new branch	14:36
	← Underbyte left	14:37
offby1	so I think the lesson is: git doesn't consider branches to be interesting historically; they're more a convenience for the present.	14:37
Sendoushi	hey guys. i'm thinking here... I'm starting using git on my workflow and deciding what is best as a gui. it seems to me the gui is the best approach to me but... tell me wrong. for now, i'll use mostly local git	14:37
SmokeyD	hmm, I need it for administrative purposes right now. But when I do a commit, git recods the branch on which the commit was done right? SO can't you know all the commits on a specific branch? I mean, how else can you roll back bunch of commits on a branch if you don't know which commits were done on which branches?	14:37
Sendoushi	here i was checking the git official app and the tower app... what do you think?	14:38
	← exoon left	14:38
	→ babilen_ joined	14:38
	← babilen left	14:39
offby1	smokeyd, no. Other than the reflog, git does _not_ record the current branch when you make a commit. That's my point.	14:39
	← devoldmx3 left	14:39
cbreak-work	git doesn't care on which branch a commit is made.	14:40
	you can make commits even on no branch at all	14:40
	offby1 nods vigorously	14:40
	← Davey left	14:40
EugeneKay	git is an unloving divorcee	14:40
cbreak-work	and by virtue of merging (one of git's great super powers), commits can be in many branches at the same time	14:40
offby1	git treats me right!	14:40
EugeneKay	Just wait until your money runs out, honey.	14:41
offby1	an unloving, promiscuous divorcee.	14:41
	→ lavaman joined	14:41
SmokeyD	cbreak-work: why do you branch then? If you checkout a branch, how does git then determine what the code should look like, if it doesn't know which commits have been done?	14:41
offby1	smokeyd: checking out a branch does not cause git to forget which commits have been done.	14:41
	!gcs	14:41
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs/	14:41
EugeneKay	SmokeyD - I recommend reading through !concepts to get a handle	14:41
gitinfo	SmokeyD: "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs/	14:41
offby1	!cs	14:41
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	14:41
SmokeyD	offby1: you say "other than the reflog". I see the reflog, but what exactly is it?	14:41
EugeneKay	Shit, beaten.	14:42
offby1	eugenekay jinx	14:42
EugeneKay	nou	14:42
	← kewah left	14:42
cbreak-work	SmokeyD: git can find out which commits are on a branch, but it can't find out (easily) on which branch a commit is	14:42
offby1	smokeyd: it's a simple log of every commit to which a particular ref has ever "pointed".	14:42
cbreak-work	because a branch points to its commits	14:42
	→ nafg_ joined	14:42
cbreak-work	but commits have no clue by which branches they are pointed at	14:42
	→ michaelarestad joined	14:42
cbreak-work	there could be thousands that your repository isn't even aware of	14:42
	babilen_ → babilen	14:43
Kronuz	good morning	14:44
offby1	"which branches point to them" would be a better phrasing.	14:44
	remember, branches are Post-It notes	14:44
	→ Dougie187 joined	14:45
	← ikuraj left	14:45
cbreak-work	offby1: there's a difference?	14:45
	offby1 rubs chin	14:45
	→ gasbakid joined	14:46
offby1	sure. A branch just comes out and tells you "I point to commit 0xdeadbeef". A commit says no such thing	14:46
	it's a one-way arrow, just like commits point to their parents but not to their children.	14:46
PerlJam	..oO( It says "I AM 0xdeadbeef" ;-)	14:46
	← m104 left	14:46
	offby1 gets all philosophical	14:46
	← valgrind left	14:47
offby1	perljam: surely HEAD, typically, is more "points to" than "is".	14:47
	Also: Long Time No See	14:47
PerlJam	yeah, greetings! :)	14:47
SmokeyD	offby1: ok, I start to understand I think. A branch points to a commit, not the other way around. And by doing more commits, you just change the commit that a specific branch points to.	14:48
	→ jepler joined	14:48
_ikke_	SmokeyD: correct	14:48
offby1	yep	14:48
SmokeyD	does the reflog record which commits a specific branch has ever pointed to?	14:48
offby1	the "checked out" branch is, more or less by definition, the one that "moves along with you" as you make commits.	14:49
	← adamwathan left	14:49
_ikke_	And the branch being updated is the one being pointed to by HEAD	14:49
offby1	the others stay put.	14:49
	heh	14:49
	_ikke_: jinx-o-rama	14:49
_ikke_	SmokeyD: yes	14:49
	→ ZujkisNx joined	14:49
offby1	where else do you get three or four teachers fighting each other to best explain?	14:49
_ikke_	whaha :D	14:49
SmokeyD	_ikke_: strange to talk to ikke. I am not talking to myself ;)	14:49
jepler	so as I often do, I just wrote 'git for-each-ref upstream.. \| while read ref; do git checkout ref; do something; done' and then when I'm done I have to remember the name of the branch I left	14:49
_ikke_	SmokeyD: ;-)	14:49
SmokeyD	but thanks	14:49
	→ valgrind joined	14:50
offby1	jepler: !reflog	14:50
gitinfo	jepler: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	14:50
jepler	(whoops, git checkout $ref) is there a way to push/pop the current branch to return to it after some git checkouts? or is there a different idiom I should use?	14:50
	→ devoldmx joined	14:50
offby1	jepler: I don't think I've ever passed an argument to "git for-each-ref". Does that filter the output?	14:50
SmokeyD	ok, the reflog only records 2+ weeks.	14:50
	that is why I saw so little	14:50
	that is a shame	14:50
jepler	err apparently my example was wronger than I thoght	14:50
	git rev-list upstream.. \| while read $ref	14:50
offby1	jepler: there's "git checkout -" but that only does what I want about half the time	14:50
	→ verysoftoiletppr joined	14:51
_ikke_	jepler: Not something you can control yourself. There is git checkout - to checkout the previous branch, or git checkout @{-N} where N is the n'th previous branch	14:51
	← dhruvasagar left	14:51
PerlJam	jepler: or you could just write the current commit/branch to an environment var and check it out when you're done :)	14:52
jepler	ah maybe I should be using git rebase --exec	14:52
offby1	smokeyd: I assume you can tell git to keep more in the reflog. Not after the fact, of course :)	14:52
SmokeyD	:(	14:52
	that is a shame, that git throws away meta data	14:52
	git reflog show	14:52
	oops	14:52
PerlJam	SmokeyD: if you've munged stuff that you need your reflog from a long time ago, you've done seomthing horribly wrong.	14:52
SmokeyD	wrong window	14:52
	:)	14:52
	→ rickruby joined	14:52
_ikke_	You can also modify to period the reflog keeps items I believe	14:53
	→ kesha_ joined	14:53
_ikke_	default is btw 90 days, not 14	14:53
jepler	ah yes, GIT_EDITOR=true git rebase --no-autosquash -i --exec "do something" upstream	14:53
offby1	smokeyd: I have the vague sense that You're Doing It Wrong™. I.e., you want to know "on what branch was this commit made" only because you're confused	14:53
	if you explain in detail why you want this, perhaps someone here can suggest a better way to get what you want	14:53
	→ joshsmith joined	14:54
SmokeyD	offby1: I am trying to find out what I spent my time on :) So how many commits I did on which branch, and when	14:54
dfanjul	and 30 days for unreachable objects	14:55
	michael_mbp → zz_michael_mbp	14:55
offby1	smokeyd: might you not answer that question just as well by simply noting the _files_ that you changed, and _how_ you changed them?	14:55
	→ mckendricks joined	14:55
offby1	do you want to attribute your work to (say) bugs in a bug tracker? I.e., I spend three hours on bug #123	14:55
SmokeyD	offby1: not _how_ because then I need to go back 2 months and read all the commits and figure out for which specific branch (read: project) they were relevant.	14:56
offby1	yeah I gotcha	14:56
	← verysoftoiletppr left	14:57
	→ kevwil joined	14:57
offby1	in fact I understand you so well that I'm now wondering why this question doesn't come up more often. I don't have an answer.	14:57
SmokeyD	:)	14:57
offby1	One semi-crappy way might be: always put the "project name" in the commit message	14:57
SmokeyD	offby1: as many will understand: I am way behind on recording my worked hours. I have the log of when I was working, but not what I was working on, so I am trying to defer that from the commit logs	14:58
offby1	another: always do your merges to master with "--no-ff", so that the commit graph plainly shows those separate work items as diverging and then merging streams of commits	14:58
	← pduin left	14:58
offby1	ooooh you're a consultant, eh?	14:58
	→ shinnya joined	14:58
PerlJam	SmokeyD: just remember that git is a VCS, not a "what did I work on last month" system ;)	14:58
SmokeyD	PerlJam: you are right, but I am way to lazy	14:59
offby1	smokeyd: yeah, you're gonna have to improvise something to scrape data from the past, and then you're gonna have to have some discipline in recording that info in the future.	14:59
	→ jaequery joined	14:59
	← Milossh left	14:59
SmokeyD	I still might be able to defer it from trac (which we use) and see the trac logs. :)	14:59
offby1	you might well use separate repositories for separate clients.	14:59
	← sriracha left	14:59
offby1	that probably wouldn't help any, now that I think about it	15:00
SmokeyD	offby1: i am not really a consultant, but my boss does want to know what I roughly spent my time on	15:00
offby1	unless you never merged 'em in which case what's the point ...	15:00
SmokeyD	offby1: I did merge them :)	15:00
offby1	where I work we use JIRA for that.	15:00
SmokeyD	offby1: ok. I am going to figure out know if trac did store all the commits. I think it does, and maybe also some extra info on it.	15:01
PerlJam	SmokeyD: the only time I've been able to really keep track of exactly which projects I worked on when, is when I was absolutely religious about recording when I switched from one to another and what they were.	15:01
	← rickruby left	15:01
offby1	I find that I can never tell how log I was working on something by just looking at commits. I can certainly see that I committed some relevant work at a few instants, but it's not at all clear if I was working _continually_ in the in-between times, or maybe off doing something else in some other repo	15:01
	→ nsanden joined	15:02
	→ tjbiddle joined	15:02
	→ thiago joined	15:02
	← boblee left	15:03
SmokeyD	offby1: I already know how many hours I have worked in total. So I just need to divide those roughly per branch, which I can do by knowing how many commits I did per branch. That is accurate enough. It doesn't have to be precise	15:03
	← mishok13 left	15:03
SmokeyD	But I think I already found it in trac	15:03
	← matanya left	15:04
	→ Milossh joined	15:04
	→ Noldorin joined	15:06
	→ Hoosier2016 joined	15:07
	→ loteriety joined	15:07
	→ exoon joined	15:09
	← cbreak-work left	15:09
	→ sriracha joined	15:09
	← loteriety left	15:09
	→ ikuraj joined	15:10
	→ kevwil_ joined	15:11
	← gasbakid left	15:11
	→ roots47 joined	15:11
roots47	Hey all, after you complete a merge manually and your branch still says you're on (master\|MERGING)... how do you get out of merge mode?	15:12
	Hey all, after you complete a merge manually and your branch still says you're on (master\|MERGING)... how do you get out of merge mode?	15:12
	← exoon left	15:13
	→ duch_kazatel joined	15:13
	← kevwil left	15:13
	← duch_kazatel left	15:13
	← CheckDavid left	15:14
canton7	roots47, then you haven't completed the merge	15:14
	What have you done?	15:14
	→ duch_kazatel joined	15:14
	← duch_kazatel left	15:14
	→ boblee joined	15:15
roots47	canton7: nevermind, all set	15:15
canton7	(you need to 'git commit' after adding all files)	15:15
	← _Qman left	15:17
	← arvind_khadri left	15:18
	← rath left	15:20
	→ MasterBob joined	15:22
	→ szx joined	15:22
MasterBob	Hello. so I have one repository for many small tools. I'd like to have a master branch (which has stable versions of the tools) and then individual branches for each of the tools where features will be fixed and bugs removed. Only merge stable tools to the master branch. Does that sound like a good plan?	15:23
	← Element9 left	15:23
	← ThomasLocke left	15:25
roots47	Hey all, after completing a merge and committing, i notice my commit history looks pretty messy. Any tips on using rebase for a newb?	15:26
	← enr left	15:26
	→ dhruvasagar joined	15:26
	→ ToBeFree joined	15:26
	← melee left	15:27
	→ marhaban joined	15:27
	← szx left	15:27
	→ AWinterm_ joined	15:28
	← rob_w left	15:29
	← GeertV left	15:29
	← acharlieh left	15:29
	← threesome left	15:29
	→ GeertV joined	15:29
osse	/6	15:30
	← arand_ left	15:30
cizra	roots47: First tip, never rebase anything you've published.	15:31
roots47	cizra: it's not published	15:31
	cizra: it's committed locally, not pushed	15:31
cizra	MasterBob: Sounds cool. Did you know about the octopus merge?	15:31
	roots47: Then erase the merge, check out the branch, rebase on top of master and fast-forward master :-)	15:32
	← psoo left	15:32
	← gua_ould left	15:32
cizra	I can elaborate on the steps as needed.	15:32
roots47	cizra: that would be good... let's start with step one :D	15:32
cizra	What are the names?	15:32
	← marhaban left	15:32
cizra	.. of the branches. And what do you want to merge into what?	15:32
	→ marhaban1 joined	15:32
	← AWinterm_ left	15:33
roots47	cizra: so basically i just did a merge by running 'git pull origin master'	15:33
	→ acharlieh joined	15:33
cizra	oh	15:33
	← mechanicalduck left	15:33
cizra	THAT is much easier to fix	15:33
roots47	cizra: I had to complete a manual merge on one of the files	15:33
cizra	git reset --hard HEAD^ (deletes the latest commit, which in your case is a merge)	15:33
	git pull --rebase	15:33
	..aaaand you'll have to re-do the manual merge, 'fraid.	15:33
	← jkyle left	15:33
	← GeertV left	15:33
cizra	during rebase, it'll abort and say that something needs manual work	15:34
	BUT you can save a backup copy of your manually merged file!	15:34
	then restore it (instead of manually resolving the conflicts) and git rebase --continue	15:34
roots47	cizra: no worries, it wasn't a big merge	15:34
	→ arvind_khadri joined	15:34
cizra	Well, task 1: erase merge	15:34
roots47	cizra: real quick though, before moving on... I ran the command you just said, things are back to where i started before pulling	15:34
cizra	yes, that's intended	15:34
	task 2: pull with rebase	15:35
	git pull --rebase	15:35
roots47	cizra: now, i actually have two commits that should be combined into one	15:35
	→ dreiss joined	15:35
cizra	no, you said the other commit was on origin/master?	15:35
	→ carpii joined	15:35
cizra	Squashing commits together is easy too: git rebase -i origin/master	15:35
	← jefflyne left	15:35
roots47	cizra: in my local commit history, my previous two commits have the exact same commit message, but the latter has a small change i missed	15:36
cizra	then edit the list that pops up -- replace "pick" with "f" or "s" (s retains commit messages of both, f only of the first)	15:36
	In your case, you want f	15:36
	← trungqtran left	15:36
carpii	i have a large number of stashes, some of which i suspect have long since been merged into master. Is there any way I can scan over each stash and decide whether they would change master if applied ?	15:36
	← Christi123 left	15:36
roots47	cizra: that will only be for the previous two commits? or	15:36
	→ Christi123 joined	15:36
	← dvor left	15:37
cizra	roots47: Did you run git rebase -i origin/master?	15:38
	I don't get your question.	15:38
	→ jefflyne joined	15:38
	← sriracha left	15:39
roots47	cizra: yes, it opens VI with two lines, they both say pick hash message	15:39
	→ mmlac-bv joined	15:40
roots47	cizra: ah, sorry I missed your message above	15:41
cizra	yeah, well, the upper one is your first commit, I think. The lower one is the second	15:41
	change the "pick" into "f	15:41
	← chuckharmston left	15:42
	← hyperair left	15:42
	← arand left	15:42
roots47	cizra: did that, it said "Cannot 'fixup' without a previous commit'	15:42
	← konundra left	15:42
	← Hoosier2016 left	15:43
canton7	roots47, you have to rebase -i onto at least one commit before the one you want to fixup	15:43
	so the first commit in the editor window is a 'pick', not a 'fixup'	15:44
roots47	canton7: I just tried running the command again, deleted the old rebase, but now instead of having two commits listed it just says 'noop'	15:44
canton7	then you didn't ask it to do anything. are you sure you unwound the old rebase properly?	15:45
	← devoldmx left	15:45
roots47	canton7: I ran the command git recommended to delete it 'rm -fr path'	15:45
	→ melee joined	15:45
	→ rickruby joined	15:45
canton7	'it'?	15:46
roots47	canton7: the rebase	15:46
canton7	what? a rebase isn't a path	15:46
roots47	canton7: the rebase merge directory	15:46
	→ devoldmx joined	15:46
canton7	git recommended that, instead of 'rebase --abort'?	15:46
	→ groglogic joined	15:46
cizra	roots47: You should have changed the _second_ commit to a fixup. The timeline is top (old) to bottom (new).	15:47
roots47	canton7: ugh, yeah maybe I shouldn't have deleted that, hah	15:47
	canton7: now when I try git rebase --abort it just says "No rebase in progress?"	15:47
canton7	I'm just curious where you got that recommendation from	15:47
	→ Nicholas_Rishel joined	15:48
canton7	it may well have worked, I'm just surprised	15:48
roots47	canton7: http://pastie.org/8208553	15:48
	→ trungqtran joined	15:48
	→ Devastatr joined	15:49
	← Devastatr left	15:49
	→ Devastatr joined	15:49
	→ Hoosier2016 joined	15:49
	→ kevwil joined	15:49
canton7	how did you manage to get that? run rebase -i with a rebase -i already in progress?	15:49
roots47	canton7: I think because I had the f and the pick on the wrong lines	15:50
	← tjbiddle left	15:50
canton7	I'm still missing steps, but ok	15:50
	← dreiss left	15:50
	← Devastator left	15:50
	← harish left	15:50
	Devastatr → Devastator	15:51
	← kevwil_ left	15:51
roots47	now when I exit the vi that says "noop" it says "Successfully rebased and updated detached HEAD"	15:51
canton7	oh so you were in the middle of a rebase when you started rebasing again, and you didn't abort it properly	15:51
	checkout a branch	15:51
	'git checkout branchname'	15:51
	then rebase -i again	15:51
roots47	canton7: Ok, now it's listing my last two commits, I want to combine them into one	15:52
	→ cha1tanya joined	15:52
roots47	canton7: I put the f on the first or second line?	15:52
canton7	you 'fixup' the latter, so the second one	15:53
	that means 'rewrite the first one to include the changes from the second one'	15:53
	→ JorgeRuiz joined	15:53
roots47	canton7: ah i see. Ok, the output was "error: could not apply {hash}... {message}"	15:53
	→ rabellamy joined	15:53
canton7	wait what? was any of the commits listed in the editor window a merge commit?	15:54
roots47	canton7: no, they are both regular commits	15:54
canton7	and just those two commits appeared in the editor window?	15:54
	← groglogic left	15:55
	← stewiee left	15:55
	← Luke-Jr left	15:55
roots47	canton7: yes	15:56
	→ sainaen joined	15:56
	← Asenar left	15:56
	→ Luke-Jr joined	15:56
canton7	then I'm really confused as to why that didn't apply. Output of 'git status'?	15:56
	→ enr joined	15:56
cizra	Because the merge fails, we discussed it already	15:58
	Umm, hang on, no	15:58
roots47	I just went back to step one, the git reset --hard HEAD^	15:58
canton7	that means "reset everything to the commit before the current commit" - are you sure that's what you wanted to do?	15:59
roots47	yes	15:59
canton7	do you currently have a branch checked out? 'git branch'	15:59
roots47	so now I basically want to pull in remote changes and cleanly merge them	16:00
	I was told to use 'rebase' which I have never done before	16:00
	← Balliad left	16:01
	→ mastro joined	16:01
	→ cin joined	16:01
cizra	No, wait, you're trying to do 2 things here	16:01
	← valgrind left	16:01
SwashBuckla	anyone here use gitflow with git-svn? I'm wondering about any implications combining the two has to your workflow	16:01
cizra	Step 1 would have been to roll your two commits into one.	16:01
	← Mode-M left	16:02
	← normanrichards left	16:02
	← private left	16:03
roots47	cizra: shit, i may have lost my changes	16:04
milki	roots47: probably, thats what git reset can do. but you can recover!	16:04
roots47	:(	16:04
milki	roots47: and after you recover, you should !backup	16:04
gitinfo	roots47: Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	16:04
	→ leptonix joined	16:05
	← enr left	16:05
cizra	roots47: Don't panic. You most likely have them in "git reflog"	16:05
	→ adamwathan joined	16:05
milki	roots47: !fixup can detail recovery process	16:05
gitinfo	roots47: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	16:05
	→ sferry joined	16:05
	← sferry left	16:05
	→ sferry joined	16:05
Norrin	what's the easiest way to get the patch of a commit. and then apply it, assuming it isn't already there	16:06
	← michaelarestad left	16:06
canton7	roots47, 'git branch'. what's the output	16:06
cizra	roots47: Step 1, tar everything up, as milki said. Before further messing around!	16:06
canton7	I asked you before, and I'm pretty sure it'll be "(no branch)"	16:06
cizra	Norrin: git format-patch, I'd suppose?	16:06
roots47	canton7: i'm on master	16:06
	← rpg left	16:06
	→ g0bl1n joined	16:07
canton7	roots47, cool. that reset --hard HEAD^ probably threw away the latest commit on master, then	16:07
Norrin	cizra, looks complicated. git diff -p is patch format right?	16:07
roots47	I'm so lost right now :\	16:07
	→ rpg joined	16:07
canton7	roots47, pastie the output of 'git reflog'	16:07
	→ groglogic joined	16:08
	→ mcepl joined	16:08
cizra	Norrin: -p is default	16:08
	roots47: Instead of panicking, tar up your whole Git repo, so that whatever you do, you'dn't lose your changes.	16:08
	← noname001 left	16:08
	→ arand joined	16:09
roots47	canton7: http://pastie.org/8208602	16:09
	cizra: ok	16:09
Norrin	git format patch:	16:09
	"A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."	16:09
milki	rather, panicking is step -1	16:09
Norrin	wtf… is that english?	16:09
mcepl	is there a way how to have with two bzr:: remotes and git would recognize common commits between the two? (bzr::http://code.bitlbee.org/bitlbee/ and bzr::http://code.khjk.org/bitlbee/ to be exact)?	16:09
roots47	hehe	16:09
mcepl	*how to have a repo	16:09
Norrin	that that that that	16:09
roots47	cizra: you mean just compress the whole project?	16:09
	→ vince_prignano joined	16:09
canton7	roots47, yup. So you were on master, the you run 'git reset --hard HEAD^', which threw away the latest commit on master	16:10
	roots47, after backing up the repo, run 'git reset --hard 8c74532'	16:10
	← aberrant left	16:10
	← gittish left	16:10
canton7	to move back to the "old" mastr	16:10
	*master	16:10
Norrin	i'm going to pretend like the man page doesn't include that line. even though "since" is probably what i need	16:10
milki	Norrin: good for you	16:11
	→ nicedice joined	16:11
roots47	canton7: changes are back!	16:11
	← trungqtran left	16:12
roots47	cizra, canton7: I really appreciate the help guys... beyond measure	16:12
milki	did you backuo yet	16:12
roots47	milki: yes	16:12
Norrin	"A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."	16:12
	→ nathancahill joined	16:12
canton7	roots47, hint: DON'T run 'reset --hard' when you don't understand what it does!!	16:12
Norrin	after "specifies that", where is the complete predicate?	16:12
	← kevwil left	16:13
roots47	canton7: I knew it went back to a previous commit, I just forgot that I had done a git pull first the first time!	16:13
milki	if you take out some clasuses, its a bit awkard	16:13
arand	does "git fsck" do much more extensive checking than "git fetch/push" would? And hence would running a "git fsck" periodically on a server make any sense?	16:13
	← leptonix left	16:13
_ikke_	arand: yes	16:13
	→ primitive joined	16:13
milki	a commut specifies that the commits to be the output	16:13
_ikke_	arand: KDE ran into that	16:13
	I believe	16:13
	http://www.phoronix.com/scan.php?page=news_item&px=MTMzNTc	16:14
	← fRAiLtY- left	16:14
_ikke_	http://jefferai.org/2013/03/29/distillation/	16:14
roots47	canton7: So now I'm back at the point where I want to rebase my previous two commits into one	16:14
Norrin	milki, will you explain what the since option does for git format patch?	16:14
arand	_ikke_: Yes, I'm trying to set up a backup, and trying to avoid the same trap...	16:14
	← JorgeRuiz left	16:14
cizra	roots47: git rebase -i HEAD^^ or git rebase -i origin/master	16:14
roots47	cizra: http://pastie.org/8208611 that's what my tree looks like	16:15
milki	Norrin: logically, show commits after specified commits, probably	16:15
	Norrin: !tias	16:15
gitinfo	Norrin: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	16:15
canton7	milki, we've gone through that	16:16
cizra	roots47: Looks good...	16:16
	→ leptonix joined	16:16
	→ amaury_d joined	16:16
	→ Raging_Hog joined	16:16
	← Raging_Hog left	16:16
	→ raging_swine joined	16:16
	→ trungqtran joined	16:16
	→ themsay joined	16:17
Norrin	so to back up, i want to take a commit and apply it to a different repo	16:17
roots47	cizra: ok done, used 'f' on the second commit. Got the 'error: could not apply...'	16:17
Norrin	trying to find the easiest way to do that	16:17
	→ mishok13 joined	16:17
	← arvind_khadri left	16:17
canton7	roots47, output of 'git status'?	16:17
	dpac\|away → dpac	16:17
cizra	roots47: What'd you do to the first one?	16:17
roots47	cizra: left pick	16:18
	← carpii left	16:18
cizra	Norrin: git fetch; git cherry-pick	16:18
Norrin	said nothing about a remote	16:18
	← jargon left	16:18
roots47	canton7: "not currently on any branch, fix conflicts and then run git rebase continue" ok, let me take a look at this file real quick	16:18
canton7	roots47, and you only changed 'pick' to 'fixup' on the second?	16:18
roots47	canton7: yes	16:18
canton7	roots47, I was kinda after the rest of the output...	16:19
Norrin	and its a different repo, so how would i be able to cherry-pick something, cizra ?	16:19
cizra	Norrin: Easily.	16:19
roots47	canton7: I have some changes to be committed and one 'unmerged path'	16:19
canton7	roots47, go fix the conflict then. I'm interested in what it is	16:19
cizra	roots47: Well, check what the modifications are like...	16:19
	→ flippo joined	16:19
	← Gu_______ left	16:20
Norrin	cizra, can't the git diff output be applied somehow?	16:20
_ikke_	arand: See also http://comments.gmane.org/gmane.comp.version-control.git/218964	16:20
Norrin	easiest	16:20
	← anonymuse left	16:20
	→ devoldmx27 joined	16:20
roots47	cizra, canton7: conflicts have been merged, now I assume I run git rebase --continue ?	16:20
milki	Norrin: are you going to even try?	16:21
	→ michaelarestad joined	16:21
canton7	roots47, once you've 'git add'ed the file, yup	16:21
	roots47, what sort of conflict was it?	16:21
	(there shouldn't have been one at all)	16:21
roots47	canton7: just some conflicting code, since I was rebasing from origin/master	16:21
arand	Norrin: Either 1. add other repo as remote, 2. fetch content, cherry-pick from feched content; OR 1. format-patch in one repo, 2. git am in other repo.	16:21
milki	or git diff and patch	16:21
	→ enr joined	16:22
canton7	roots47, oh, so you ran 'git rebase -i origin/master' not 'git rebase -i HEAD^^'	16:22
cizra	Norrin: You don't even need to add it as a remote, just git fetch <repo> should work.	16:22
	→ kevwil joined	16:22
roots47	canton7: yes exact, and... LOOKS LIKE IT WORKED!!!	16:22
canton7	roots47, aah that explains it	16:22
	cool	16:22
arand	(with just diff you will some metadata like author and date, though)	16:22
	← devoldmx left	16:22
cizra	roots47: Oh shit, that was my bad )=	16:23
	← amaury_d left	16:23
cizra	roots47: I managed to mess up and combine the two steps into one )=	16:23
roots47	cizra: no worries, i really appreciate the help	16:23
Norrin	cizra, arand, isn't fetch a pull? the histories are divergent. how can you pull from a different history?	16:23
	→ cads joined	16:23
Norrin	milki, i like that option. seems the easiest	16:23
roots47	cizra: Well hell, we knocked out two birds with one stone, no?	16:23
Norrin	just can't figure out these different diff formats	16:23
cizra	roots47: Yeah, exactly what I wanted to avoid.	16:24
	← h0bbit left	16:24
Norrin	what applies a git diff?	16:24
milki	Norrin: pull = fetch + merge	16:24
	← h0bbit_ left	16:24
milki	Norrin: patch	16:24
cizra	Norrin: Are you going to fetch or not?	16:24
arand	Norrin: no fetch just gets the content, it does not try to merge it into the content in the repo it is being fetched to.	16:24
Norrin	milki, yeah…. merging something completely different. does'nt sound right	16:24
cizra	Norrin: Until you've tried, quit blathering.	16:24
Norrin	oops. i read fetch == pull + merge	16:24
roots47	cizra: I see the results of what we just did... but what exactly does git rebase origin/master do?	16:25
	← thiago left	16:25
roots47	git rebase -i origin/master *	16:25
milki	Norrin: doooit	16:25
cizra	roots47: Well, git rebase origin/master moves all your new commits on top of origin/master.	16:25
Norrin	break it break it break it!!!!!	16:25
	love that	16:25
	so eager to do that	16:26
milki	Norrin: !backup	16:26
gitinfo	Norrin: Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	16:26
cizra	roots47: And -i lets you do interactive editing on top like fixups.	16:26
	Norrin: God created throwaway test repos for just that reason.	16:26
milki	Norrin: backup, tias, and learn somwthing	16:26
Norrin	or find out how to do it the right way	16:26
roots47	cizra: Cool, well I'll play around with it... and thanks again, you've been a tremendous help	16:26
	→ babilen_ joined	16:26
	→ devoldmx joined	16:27
roots47	canton7: you too	16:27
cizra	roots47: Nodnod. That'd be $32.	16:27
milki	Norrin: !fish	16:27
gitinfo	Norrin: In the long run, it is much better to give pointers to answers than the answers themselves.	16:27
canton7	np :)	16:27
	← lamarus left	16:27
roots47	cizra: paypal? :P	16:27
	→ Skrypter joined	16:27
cizra	milki: Light a man a fire, he'll be warm all night. Light a man afire, he'll be warm the rest of his life.	16:28
	roots47: Jokin', jokin'	16:28
milki	cizra: sounds like a plan	16:28
Norrin	because prolonging the peril of others is the real purpose of life	16:28
	→ lamarus joined	16:28
cizra	roots47: I've got unbelievable amounts of help over IRC...	16:28
	→ jfoy joined	16:28
milki	/ignore Norrin	16:28
roots47	cizra: Some of these git commands are just really hard to understand by reading the man pages	16:28
cizra	roots47: Yeah, well, most things are best learned by seeing examples, then doing them under supervision.	16:29
Norrin	milki, its ok. i can tell when annoying someone is enjoyment for someone else	16:29
roots47	cizra: true true	16:29
	← geekbri left	16:29
	← babilen left	16:29
	← devoldmx27 left	16:30
	← donmichelangelo left	16:30
Norrin	[09:24:18] <milki> Norrin: patch	16:30
	$ git help patch	16:30
	No manual entry for gitpatch	16:30
	→ matanya joined	16:30
	→ chuckharmston joined	16:30
Norrin	misdirection == air	16:30
	→ donmichelangelo joined	16:30
	→ tjbiddle joined	16:30
milki	patch isnt a git command	16:31
	← jefflyne left	16:31
	→ f0ster joined	16:31
	← babilen_ left	16:31
	← JosephSilber left	16:31
	→ mechanicalduck joined	16:31
	← tatsuya__ left	16:31
	→ babilen joined	16:31
	→ dreiss joined	16:32
milki	i wonder if am works on regular diffs	16:32
Norrin	milki, thanks! i was just googling how to get git to realize commands it said it didn't know about	16:32
SamB	milki: I think there is also a "git apply"?	16:33
	→ jefflyne joined	16:33
milki	man git apply	16:33
gitinfo	the git-apply manpage is available at http://jk.gs/git-apply.html	16:33
milki	o ya	16:33
	that works too	16:33
	← ErKa left	16:35
	→ threesome joined	16:37
	← groglogic left	16:37
	← achadwick left	16:38
	← Rylai left	16:40
	→ Rylai joined	16:41
	→ whaley joined	16:42
	← LimeBlast left	16:43
	→ JorgeRuiz joined	16:43
	← JorgeRuiz left	16:43
	→ enr^ joined	16:43
	→ normanrichards joined	16:43
	← cedeon left	16:43
	← Noldorin left	16:43
	← Rylai left	16:44
	→ Rylai joined	16:44
	→ SpecialEmily[w] joined	16:44
	→ Thra11_ joined	16:44
	← Sonderblade left	16:45
	→ JorgeRuiz joined	16:45
	← JorgeRuiz left	16:45
	→ JorgeRuiz joined	16:46
jefferai	arand: this thread may be of interest, too: http://git.661346.n2.nabble.com/propagating-repo-corruption-across-clone-td7580504.html	16:47
	← enr left	16:47
	→ Noldorin joined	16:47
jefferai	but, basically, git fsck will check everything; normal fetch/push/pull will only check what affects the current operation	16:47
	which is relatively expected	16:47
arand	jefferai: I've read it twice already :)	16:47
jefferai	ah, heh	16:47
	ok	16:47
	← _W_ left	16:48
	→ groglogic joined	16:48
	→ vince_pr_ joined	16:49
	→ hyperair joined	16:49
Sendoushi	anyone knows how to change the name of the repo without change the folder's name or change the description after making the repo on github app?	16:50
	← heroux left	16:51
	→ danillonunes joined	16:51
	← dfanjul left	16:51
	← vince_prignano left	16:52
	→ aberrant joined	16:53
	→ m8 joined	16:54
	→ goshawk joined	16:54
	← rabellamy left	16:54
MasterBob	cizra: what is the octopus merge?	16:54
	HariboPenguin → HariboPenguin\|Of	16:54
	→ paul424 joined	16:54
	→ breck7 joined	16:56
	← Christi123 left	16:57
_ikke_	MasterBob: A merge strategy for more than two parents	16:57
MasterBob	_ikke_: know where I can find more information? just google it?	16:57
	← Hoosier2016 left	16:58
_ikke_	man git merge has some info on it	16:58
gitinfo	the git-merge manpage is available at http://jk.gs/git-merge.html	16:58
	← Plummer left	16:59
	→ zhost joined	16:59
	→ Cromulent joined	16:59
	← kevwil left	16:59
	← Cromulent left	17:00
	→ jhulten joined	17:00
	← _goTAN left	17:00
	← Fritz7 left	17:01
	→ enr joined	17:01
	→ heroux joined	17:01
	→ Fritz7 joined	17:01
	→ iliketurtles joined	17:02
	← maroloccio left	17:02
	← wrouesnel left	17:03
cizra	MasterBob: You can create cool-looking history by changing all your tools, then merging them all simultaneously into master.	17:04
	← sferry left	17:05
	→ huoxito joined	17:05
	← shruggar left	17:05
	← enr left	17:05
	→ tonyj joined	17:05
	← PigeonFriend left	17:05
MasterBob	cizra: cool looking history? lawl. okay thanks.	17:06
	→ ikuraj_ joined	17:07
	← flippo left	17:08
	→ rabellamy joined	17:08
	→ kevwil joined	17:09
	← ikuraj left	17:09
	← themsay left	17:11
	→ jackdempsey joined	17:11
	→ thiago joined	17:11
	← preflex left	17:12
	→ preflex_ joined	17:12
	preflex_ → preflex	17:13
	← iliketurtles left	17:13
	HariboPenguin\|Of → HariboPenguin	17:13
	→ devoldmx27 joined	17:14
	→ iliketurtles joined	17:14
	→ brotatos joined	17:14
brotatos	Is there any way to prevent git-merge from calling up an editor? I have a message I already want to use and doing a `git merge --no-edit -m $(message)` still brings up an editor.	17:15
	→ cigarshark joined	17:15
	→ konundra joined	17:15
	← nova_ left	17:16
	← devoldmx left	17:17
	→ bil joined	17:17
bil	can i do a git stash apply and force it to merge even if theres a conflict?	17:18
	→ fRAiLtY- joined	17:18
bil	and then resolve it manually	17:18
_ikke_	brotatos: is $(message) empty perchance?	17:18
brotatos	_ikke_: nah, it's full of good stuff.	17:18
deryni	$(message) or ${message}?	17:18
	→ maslowbeer joined	17:18
brotatos	${message}	17:18
	Well, this is really done in ruby.	17:18
cbreak	bil: that's what it always does.	17:18
brotatos	So #{message}	17:19
	https://github.com/iFixit/git-scripts/blob/2f37fc57b8b386528f53f5e8efea14da672b8a55/bin/hotfix#L94	17:19
bil	cbreak: its erring telling me i need to commit my changes first	17:19
	erroring*	17:19
	→ anonymuse joined	17:19
	← maxmanders left	17:20
	← adamwathan left	17:20
cbreak	bil: yes, do that.	17:20
	bil: git will not recklessly endanger unrecoverable changes in a merge	17:22
	you'll get your conflict after committing too	17:22
	and can amend when you're done resolving	17:22
freeed	Hey guys.. When I do a git pull to pull in changes from my team git opens up VIM asking me to add a commit message for the merge. Is there any way to disable that? I'm fine with the default merge commit message "Merge branch 'master' of my_remote_server_name".	17:22
bil	Basically i started working again and i forgot i had some stuff stashed	17:22
	isn't it bad practice to commit half worked stuff?	17:23
cbreak	as long as you don't push it it's fine.	17:23
	→ Chryyz joined	17:23
deryni	You can always reset that commit away after the stash apply too.	17:23
cbreak	freeed: man git-merge	17:23
gitinfo	freeed: the git-merge manpage is available at http://jk.gs/git-merge.html	17:23
cbreak	freeed: look at --no-edit	17:23
bil	so commit, apply stash, and then edit commit?	17:24
	→ nova_ joined	17:24
freeed	thanks cbreak!	17:24
deryni	brotatos: Unrelated to the problem at hand why shellescape message but not hotfix? (Also why is hotfix only quoted on some lines?) Also that line says '--edit' not '--no-edit'.	17:25
	← jhulten left	17:25
	→ jhulten joined	17:26
freeed	cbreak, I see I can git pull has the same flag. Is there anyway to set that as a default flag for git pull so I don't have to manually add it? (everyone on my team gets this same everytime we pull several times a day)	17:26
brotatos	deryni: hotfix is bound to be just a plain string	17:27
	deryni: it's not quoted in places where the hotfix branch is the literal name of the path	17:27
	← keller left	17:27
	← Thra11_ left	17:27
deryni	brotatos: If it has spaces in it the shell doesn't care what you are using it as.	17:28
	→ JosephSilber joined	17:29
	→ galaris joined	17:29
	← crane_work left	17:29
brotatos	deryni: the hotfix branch name will never have spaces in it.	17:29
	HariboPenguin → HariboPenguin\|Of	17:30
brotatos	deryni: branch names can't have spaces in them.	17:31
	← mishok13 left	17:31
	← Xiti left	17:31
	← groglogic left	17:32
deryni	So they can't. They still can have other shell metacharacters though, but like I said this is besides the point.	17:32
	→ s-e joined	17:33
	← ikuraj_ left	17:33
brotatos	deryni: You're right. It's just a matter of typing in shellescape anyways. :P	17:33
	→ Yakko joined	17:34
	HariboPenguin\|Of → HariboPenguin	17:35
	→ JrCs joined	17:35
	← rickruby left	17:36
	→ Xiti joined	17:37
	← s0undt3ch_ left	17:37
	→ Davey joined	17:37
	← Sigma left	17:37
	← michaelarestad left	17:37
	→ hwrd\|work joined	17:37
	→ frankstallone joined	17:37
	→ s0undt3ch_ joined	17:37
	← JrCs left	17:38
	→ snow_ru joined	17:38
snow_ru	hi all	17:38
gitinfo	snow_ru: 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.	17:38
	→ JrCs joined	17:39
	← s0undt3ch_ left	17:39
	← JakePee left	17:39
	→ s0undt3ch joined	17:39
	← JrCs left	17:39
snow_ru	I want to work on git --- I code in C. I need some help to start :)	17:40
	→ Inside joined	17:40
	→ JrCs joined	17:40
PerlJam	snow_ru: What do you think that git needs?	17:40
	→ Guest____ joined	17:40
PerlJam	snow_ru: And have you tried the mailing list?	17:40
	← iliketurtles left	17:41
snow_ru	I don't have a complete view about git as you do, so I need to start small --- I'm looking around	17:41
	← nkambo left	17:41
	← mastro left	17:41
snow_ru	PerlJam, no mailing list in /topics	17:41
	PerlJam, no mailing list in /topic	17:41
bremner	!list	17:42
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	17:42
	← Davey left	17:42
	→ kesha__ joined	17:42
skorgon	snow_ru, http://git-scm.com/community	17:42
	← kesha_ left	17:43
tirengarfio	im getting this error after pushing: remote: error: unable to unlink old 'web/views/materiales_aluminio.twig' (Permission denied)	17:43
Yakko	hey guys, I have a features/report.html file that gets generated automatically by my test system, however when I'm trying to merge code from other people in my team, it always shows me a merge conflict on that file and asks me to decide how to merge it, is there something like a .gitignore that always accepts the latest changes for some specific files? that would really help	17:45
Kyle	seems silly to be commiting that	17:46
	+t	17:46
	← JrCs left	17:47
	→ mastro joined	17:47
	→ nadirvar_ joined	17:47
	→ JrCs joined	17:47
	→ sq-one joined	17:48
	→ iliketurtles joined	17:48
	← alkino left	17:48
cizra	snow_ru: The best way to start: 1) get the source, 2) play around, 3) create couple of useful commits, and only then: 4) start figuring out how to contribute them back.	17:48
	← _iron left	17:49
	→ Hoosier2016 joined	17:49
	→ Collin joined	17:49
bremner	snow_ru: are you an experienced user of git?	17:49
masak	Yakko: yeah, check out .gitattributes	17:49
	← maqr left	17:49
	→ telesto joined	17:50
telesto	Is it possible to untrack a file in Git without it being removed from other people's repositories? I know I can 'git rm --cached FILE', but that still deletes FILE from other people's systems when they pull	17:51
	← Inside left	17:51
_ikke_	telesto: nope	17:52
	git has no way to store that a file is only deleted from the repostory, not from the filesystem	17:52
telesto	_ikke_: ok, thanks. I didn't think so	17:52
Yakko	masak: what exactly am I trying to do here? force to consider it a binary?	17:52
	→ alvaro_o joined	17:53
	→ sferry joined	17:53
	← sferry left	17:53
	→ sferry joined	17:53
masak	Yakko: I was thinking of the 'merge strategy' setting.	17:53
	← MasterBob left	17:53
Yakko	masak: I can't find specific information about it on google, but thanks for the heads	17:53
	→ OnlyMax joined	17:54
	← kesha__ left	17:54
	→ longbeach joined	17:54
	→ Sonderblade joined	17:54
	← Sonderblade left	17:54
masak	Yakko: see the heading "Merge strategies" under http://git-scm.com/book/ch7-2.html	17:54
	→ szx joined	17:55
	→ Sonderblade joined	17:55
	→ preaction joined	17:55
	→ kesha__ joined	17:56
	← ojacobson left	17:56
	→ _BJFreeman joined	17:57
	→ chrob joined	17:57
	_BJFreeman → BJfreeman	17:57
	→ h0bbit joined	17:58
	→ h0bbit` joined	17:58
	→ rfk joined	17:58
	→ carpii joined	17:59
	h0bbit → h0bbit_	17:59
	h0bbit` → h0bbit	17:59
carpii	im cherrypicking a commit which modified 3 files. Because of a conflict, two files are unstaged but one (index.php) is already staged. I cannot seem to unstage it, I just want to discard changes to that file and resolve the other 2	18:00
_ikke_	how do you try to unstage it?	18:00
	← s-e left	18:00
	→ causasui joined	18:00
	← causasui left	18:00
carpii	ive tried to git co -- index.php	18:00
	→ aard_ joined	18:00
carpii	and also git co --ours and --theirs	18:00
	→ tatsuya_o joined	18:01
	→ enr joined	18:01
	← devoldmx27 left	18:01
	← legolim left	18:02
	← f0ster left	18:02
	← JrCs left	18:02
	→ maqr joined	18:02
	← mmlac-bv left	18:02
	→ JrCs joined	18:03
	← angelsl left	18:03
	→ Collin_ joined	18:03
	← kermit left	18:03
	→ devoldmx joined	18:04
carpii	ok it seems i can git reset HEAD to unstage it	18:04
	← Droolio left	18:05
	→ proq joined	18:05
_ikke_	djflskjf	18:05
	ups	18:05
	← Collin left	18:05
	← enr left	18:06
	→ rickruby joined	18:06
rfk	So git rm r --cached '*.pyc' returns "pathspec 'work/r' did not match any files"	18:06
	← dsdeiz left	18:07
rfk	Is there a surefire way I can eliminate such files from my git index and my working tree, and ensure that they are not added again?	18:07
	Oh, so I do need a - before the r	18:07
	Still, it's not recursive	18:08
	Actually	18:08
	← GT4066 left	18:08
proq	when I run git status I get the error "fatal: This operation must be run in a work tree", even though I am in a git repo. how do I make this error go away?	18:08
rfk	Alright, that works - will .gitignore in the repository directory now ensure that these files are not ever added again?	18:09
	proq: Is it a bare repository?	18:09
	→ oojacoboo joined	18:09
proq	rfk: no	18:09
	← Hoosier2016 left	18:09
	→ _W_ joined	18:09
snow_ru	bremner, I'm just a normal git user. But if you guys have some algorithmic tasks in mind, I would like love to dig in :)	18:10
	← Villadelfia left	18:10
iveqy	proq: are you in a work tree?	18:10
deryni	proq: You have checked out files and a .git directory in that directory?	18:10
	→ _goTAN joined	18:11
	← gmdaas2 left	18:11
	→ jamiis joined	18:11
	← marhaban1 left	18:12
	→ johnnyfuchs joined	18:12
	← trungqtran left	18:13
	← _goTAN left	18:13
	← JorgeRuiz left	18:13
	→ marhaban joined	18:13
	→ kevwil_ joined	18:14
	← rickruby left	18:14
	→ legolim joined	18:15
	← kevwil left	18:15
	← telesto left	18:15
	← torbjorn left	18:17
	→ Shusshu joined	18:17
	Vampire0_ → Vampire0	18:17
	→ aldodelgado joined	18:17
	→ PsySc0rpi0n joined	18:18
	← HariboPenguin left	18:18
	→ torbjorn joined	18:18
	← Shusshu left	18:18
	→ kermit joined	18:18
	→ Tree_Hugger joined	18:18
	← PsySc0rpi0n left	18:19
	→ HariboPenguin joined	18:19
	← thiago left	18:20
	→ HelloShitty joined	18:20
	← Skrypter left	18:20
	→ maxmanders joined	18:20
	→ thiago joined	18:20
	← drager_ left	18:20
	→ drager_ joined	18:20
	drager_ → drager	18:21
	→ \|Freeman\| joined	18:21
proq	it's a working repository with all the files checked out. it works on another machine and I copied it to this machine via thumb drive	18:21
	← maxmanders left	18:21
	→ ziddey joined	18:22
	← tatsuya_o left	18:22
	→ trungqtran joined	18:22
	→ Mode-M joined	18:22
_ikke_	proq: did you also copy the .git directory?	18:22
	→ michaelarestad joined	18:24
	← kesha__ left	18:24
	← carpii left	18:26
	→ maxmanders joined	18:26
	→ JorgeRuiz joined	18:26
	← BJfreeman left	18:26
	← mechanicalduck left	18:26
	← zacts left	18:26
	→ Sigma joined	18:27
	← rurufufuss left	18:28
	→ JakePee joined	18:28
	← GodEater left	18:29
	← Nicholas_Rishel left	18:30
	→ CheckDavid joined	18:30
	→ grzesag joined	18:30
	← nafg_ left	18:30
proq	_ikke_: yes	18:31
	← normanrichards left	18:31
	→ mechanicalduck joined	18:31
_ikke_	does the .git directory contain a file called HEAD	18:31
iveqy	proq: what filesystem do you have on your USB drive and what filesystem do you have on your harddrive?	18:31
	→ voila joined	18:31
	adhawkins-away → adhawkins	18:32
proq	also, icbw but it seems this only started happening after I upgraded git to 1.7.12.4	18:32
	← hoschi left	18:32
iveqy	proq: that's good to know. What operating system do you use?	18:32
	← SmokeyD left	18:33
proq	os x 10.8	18:33
	→ kesha__ joined	18:33
rfk	In the master branch, `git checkout master' returns "Your branch is ahead of 'origin/master' by 3 commits."; and `git pull` indicates that i am already up to date. But in fact my master branch is behind the current material quite a bit -- a website redesign was done recently, and locally I still have the old design. Should I just clobber everything?	18:33
	← brotatos left	18:33
proq	the USB drive and filesystem are HFS+. I will try copying the files over again with scp	18:33
	← ziddey left	18:34
	→ imMute joined	18:34
proq	_ikke_: yes	18:34
iveqy	rfk: how about: git checkout master && git merge origin/master	18:35
	rfk: but do a git fetch before that	18:35
	→ GodEater joined	18:35
	→ JSharpe joined	18:35
	→ therealGent joined	18:35
iveqy	proq: with scp? Why do you use scp for copy between a harddisk and a usb-drive?	18:35
voila	k	18:36
	am i connected to internet	18:36
proq	iveqy: I don't. why would anyone do that?	18:36
rfk	iveqy: Still gives the same indications :/	18:36
voila	iveqy, but his master 3 commits ahead of origin master ... will merge is good ?	18:36
iveqy	proq: you said so...: I will try copying the files over again with scp	18:37
rfk	voila: It's interesting, because git is indicating I am ahead, but there are considerable changes in the remote repository that I don't have	18:37
proq	iveqy: no, I didn't	18:37
	← paul424 left	18:37
iveqy	voila: it shouldn't be if he made the git fetch first as I wrote on line later...	18:37
	→ orthoplex64 joined	18:37
proq	iveqy: I tried copying the original repo from one machine to another with scp and I get the same error. I guess I will try git clone now	18:37
iveqy	proq: 20:37 < proq> the USB drive and filesystem are HFS+. I will try copying the files over again with scp	18:37
	proq: maybe there's something wrong with your or mine irc client	18:38
proq	iveqy: yes, copying the files over again from the original machine. you're making assumptions	18:38
iveqy	rfk: what did git fetch told you?	18:38
orthoplex64	I'm so glad there's a channel for git help	18:38
voila	rfk, yeah .... then as iveqy said .. fetch origin/master and merge ..	18:38
	Praise- → Praise	18:38
iveqy	proq: of course I do, if you don't tell us everything we have to make assumptions	18:38
voila	then push master	18:38
orthoplex64	Would anyone mind looking at http://pste.me/n0eUg/ ? I'm very new to git/github and I have no idea how to respond to this error	18:38
iveqy	orthoplex64: read the error message, it's pretty well explained. What is it you don't understand?	18:39
proq	iveqy: just stop already. no one is making you make assumptions	18:39
orthoplex64	it just says "Failed to merge in the changes."	18:39
	→ mizu_no_oto joined	18:40
orthoplex64	Since I don't really know what I'm doing, I have no idea what to do next	18:40
boblee	anyone have experience with post-receive-email. I am receiving error -> error: hooks/post-receive exited with error code 1	18:40
voila	rfk, what i can understand is .. your master is 3 commits ahead of your master tracking branch .. but your remote repository is far ahead ..	18:40
	→ rurufufuss joined	18:41
	← mizu_no_oto left	18:41
iveqy	orthoplex64: read line 15-16-17 it tells you what to do	18:41
	← Zeelot left	18:41
orthoplex64	"When you have resolevd this problem"	18:41
voila	then .. on master branch ... git fetch origin master ; git merge origin/master .... then git push origin master ..	18:41
	→ zacts joined	18:41
orthoplex64	but that's what I'm trying to say. I don't know how to resolve this problem; I'm not even sure what's wrong	18:42
iveqy	proq: so if you want help, please tell us the whole picture. And why are you using scp for transferings git archives?	18:42
	orthoplex64: open the files in your favorite editor and edit them until you're happy. Look for <<<<< >>> and === lines	18:42
johndo	rfk: are you sure the website changes are checked in into the repository you are fetching from? and they are checked in on the master branch?	18:43
	← jerrad left	18:43
	→ jerrad joined	18:43
voila	orthoplex64, first block contains what is present in your file (your changes) , second block contains what is being fetched ''	18:43
orthoplex64	what happens if I just continue without chaning anything in the file?	18:44
	→ Zeelot joined	18:44
voila	you can try	18:44
	← cin left	18:44
orthoplex64	it says "You must edit all merge conflicts and then mark them as resolved using git add"	18:45
	→ cin joined	18:45
	→ mizu_no_oto joined	18:45
voila	orthoplex64, yes .. you have to first resolve the conflict ..	18:46
iveqy	orthoplex64: git won't care, your program will not compile since there's conflict markers in your file	18:46
	← rfk left	18:46
orthoplex64	but why is there a conflict? I did this exact same thing just a few hours ago and everything was all hunky-dory	18:46
proq	iveqy: why not?	18:46
	→ rfk joined	18:46
	→ mishok13 joined	18:47
voila	conflict occurs .. because you have made changes in your file say at line 1 : this is abc ... but when changes fetched from remote .. then at line 1 is : this is cde ... So git is not able to decide which one it has to keep ..	18:47
	← badgeruk left	18:47
orthoplex64	oh	18:48
	so what is the patch file actually supposed to look like when I'm done editting it?	18:48
voila	orthoplex64, i don't know much about what .. here comes the iveqy :)	18:49
	← fuzzybunny69y left	18:49
voila	that*	18:49
	← mklappstuhl left	18:49
iveqy	proq: depends on your use-case of course, but usually you're just interested in the stuff you get from a git clone. With scp you get garbage too, and scp will open a new connection for each file (which will be slower) and if you don't have synced clocks on your machines or if scp doesn't got the flag to preserve timestamps, your worktree will/might be strange	18:49
voila	orthoplex64, are you asking about how to resolve conflict ??	18:49
	← cin left	18:49
orthoplex64	how to resolve conflict? well that's why I'm here; I want to resolve whatever conflict is goign on	18:50
	going*	18:50
iveqy	orthoplex64: you should never edit a patch file, you should edit your *.java files, and only you know how they should look	18:50
	→ kevwil joined	18:50
voila	lol	18:50
orthoplex64	oh	18:50
voila	orthoplex64, remove markers and keep code whatever you want .. either your code or code fetched from repo	18:51
	← kevwil_ left	18:51
orthoplex64	so git just shoved both changes in the same file and it's asking me to continue after I edit the files to keep which one I choose?	18:51
	→ fuzzybunny69y joined	18:52
voila	orthoplex64, have you made changes in your files ?	18:52
orthoplex64	and then how do I "mark them as resolved using git add"?	18:52
	no, not yet; I'm doing that right now	18:52
voila	git change the file to keep changes whatever you want .. and then commit	18:53
orthoplex64	can I somehow tell git to keep the most recent changes?	18:53
voila	iveqy, Can we do commit directly after resolving conflicts . ?	18:53
johndo	orthoplex64: right, use git add after you have edited the files	18:54
	→ ziddey joined	18:54
orthoplex64	but there should be a way to tell git to use the most recent commits	18:54
	← maxmanders left	18:54
iveqy	voila: no commit at all in a rebase afaik	18:54
voila	iveqy, and in merging ?	18:55
proq	iveqy: well it would appear that with the latest git stable (or maybe the combination of the latest git stable with this repo) that scp is no longer an option	18:55
voila	instead of rebase	18:55
	→ mmlac-bv joined	18:56
iveqy	orthoplex64: there is. read man git rebase and look at the merge strategies. However, usually you want to look at the problem yourself	18:56
gitinfo	orthoplex64: the git-rebase manpage is available at http://jk.gs/git-rebase.html	18:56
iveqy	voila: a merge will result in a merge commit, so there you should commit	18:56
voila	yeah .. thanks iveqy :)	18:57
	→ saintcajetan joined	18:57
iveqy	proq: latest git stable is 1.8.3.4 you said you're using 1.7.12.4. I'm confused	18:57
	→ Andrevan joined	18:58
	← Andrevan left	18:58
	→ Andrevan joined	18:58
iveqy	proq: 1.7.12.4 is 10 months old	18:58
johndo	git stash does not track the content of a file when it gets deleted?	18:59
	← matteo left	19:00
	← jamiis left	19:00
johndo	i have deleted a file, then stashed that state, edited the file and applyed the stash	19:00
orthoplex64	ok, I changed the files to the way they're suppoesd to be	19:00
proq	iveqy: that's very odd. I ran the 1.8.3.2 installer and it isn't updating git	19:00
johndo	i somehow had expected that stash apply to fail	19:00
orthoplex64	how do I "add them with git add"? sorry if you already said something	19:00
	← Tree_Hugger left	19:00
	← cads left	19:01
	xrq` → xrq	19:01
proq	ah, the paths were not set up right	19:02
	→ enr joined	19:02
voila	git add	19:02
	← kevwil left	19:03
drager	Can you show changes but the file haven't been added nor commited?	19:03
orthoplex64	just "git add"?	19:03
voila	git add <your files> .. hey I think you should read a bit of manuals .. so that you can get idea of what are you doing .. otherwise you will get confused soon :)	19:04
johndo	drager: show changes against what? when git does not even know the file	19:04
drager	Ah yes	19:04
iveqy	drager: git status?	19:04
	→ SocalNick joined	19:04
orthoplex64	but how do I format <your files>	19:05
	I tried pasting the path	19:05
	also just saying the file name	19:05
	← Collin_ left	19:05
voila	git diff <you file> ..	19:05
orthoplex64	and the manuals are confusing because all the pages assume you know pretty much all the other pages except the one you're reading	19:05
voila	orthoplex64, lol , git add file1 file2	19:05
orthoplex64	just the name of the file?	19:06
	← anonymuse left	19:06
voila	you can give full path	19:06
drager	I was looking for git diff --cached	19:06
	thanks	19:06
DolphinDream	how do you do interactive staging ? i want to stage all then unstage a few changes within a file	19:07
	→ jamiis joined	19:07
iveqy	DolphinDream: man git add	19:07
gitinfo	DolphinDream: the git-add manpage is available at http://jk.gs/git-add.html	19:07
	→ rickruby joined	19:07
_ikke_	git add -i	19:07
	← enr left	19:07
	→ maxmanders joined	19:07
	← jamiis left	19:07
	→ w0ng joined	19:07
	← marthinal left	19:07
orthoplex64	http://pste.me/fv05T/	19:07
johndo	DolphinDream: maybe you are looking for git reset -p	19:08
DolphinDream	what about git add -p ?	19:08
	→ anonymuse joined	19:08
	→ jamiis joined	19:08
iveqy	orthoplex64: do you really not see the error there?	19:08
	← vince_pr_ left	19:08
orthoplex64	...	19:09
voila	orthoplex64, are you using windows ?	19:09
orthoplex64	yes	19:09
voila	hmm	19:09
orthoplex64	oops	19:09
	should I use forward slashes?	19:09
iveqy	orthoplex64: don't you miss a few \ in your pathname?	19:09
voila	try it in double quotes and where are '\' ?	19:09
	"c:\users\abc" "c:\mno"	19:09
	→ hahuang61 joined	19:10
	→ devoldmx27 joined	19:10
orthoplex64	now it just says that it "is outside repository"	19:10
	→ Charmi joined	19:10
voila	hmm ..	19:10
	go to directory where is .git folder is .. afaik	19:10
	i think you are somwhere else	19:11
orthoplex64	me too	19:11
voila	lol .. what mee to ?	19:11
	→ Villadelfia joined	19:11
orthoplex64	nevermind	19:11
	I haven't been this frustrated in a very long time	19:11
Charmi	Hi, I am unable to clone a repository because of a file whose name has special characters in it. Any suggestions?	19:11
voila	me too	19:11
	→ maasdesigner1 joined	19:12
	← rickruby left	19:12
iveqy	orthoplex64: git isn't user friendly, git is a tool that will make your work easier, but it requires some understanding	19:12
	← matanya left	19:12
_ikke_	git is a tool for professionals	19:12
	← jamiis left	19:12
	maasdesigner1 → maasdesigner	19:13
iveqy	orthoplex64: since you're using windows, you're trying to learn a unix-shell, with its windows specific problems, and git at the same time. No wonder that it's confusing	19:13
	← jwmann left	19:13
iveqy	Charmi: never heard of it. Could you please !repro	19:13
gitinfo	Charmi: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	19:13
orthoplex64	oh	19:13
	← devoldmx left	19:14
	→ rosipov joined	19:14
	→ insejn joined	19:14
	→ paul424 joined	19:14
	→ ej joined	19:14
insejn	has anyone here tried adding a submodule containing git-annex repo?	19:14
_ikke_	nope	19:14
	← JorgeRuiz left	19:14
iveqy	orthoplex64: don't worry, microsoft is trying to get git into visual studio and then it will be more "windows-ied". It's really a unix program as of now and it works, but has some quirks	19:14
	← D4N3 left	19:14
iveqy	insejn: no, but why would that be a problem? A submodule doesn't know that it is a submodule	19:15
	→ JorgeRuiz joined	19:15
	← JorgeRuiz left	19:15
Charmi	@iveqy the repository is private. but it has a folder named "<em>files<"	19:15
	→ JorgeRuiz joined	19:15
	→ napping joined	19:16
	← SocalNick left	19:16
	→ drizzd joined	19:16
Charmi	windows doesnt allow a folder with special characters in it. so my whole process of git clone gets struck due to this problem	19:16
insejn	iveqy: The reason I'm asking is because I'm getting the following error: git-annex: git config [Param "annex.uuid",Param "60c6cdfc-fe03-11e2-a291-3f735ae37e7a"] failed	19:16
voila	!repo	19:16
gitinfo	Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. http://source.android.com/source/version-control.html	19:16
_ikke_	Charmi: There is no easy way to fix that	19:16
insejn	when trying to get the files for annexed repo	19:16
	→ SHyx0rmZ joined	19:17
iveqy	Charmi: git shouldn't have a problem with those characters afaik. But I can't help you if I don't get to see the error message. See !secret. You could always reproduce the error in a non-secret enviroment as !repro suggests	19:17
gitinfo	Charmi: [!topsecret] If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust? There are people with clearances even on #git but since clearance levels are classified and #git is not a secure channel, this may not help you. However, you are protected by the biggest secret of all: We just don't care.	19:17
	Charmi: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	19:17
bremner	insejn: there is a channel #git-annex on irc.oftc.net	19:17
Charmi	@_ikke_ could you suggest something apart from switching to linux?	19:17
	→ Nicholas_Rishel joined	19:17
insejn	bremner: thanks, I'll give it a try	19:17
_ikke_	Charmi: Fix the file name in the repository	19:17
	→ drizzd_ joined	19:18
iveqy	Charmi: well if your filesystem doesn't support those names, there's really nothing git can do about it. Use an other filesystem	19:18
	← ej left	19:18
	→ Octalot joined	19:19
Charmi	@_ikke_ I wish i could but i am not the owner of repository and I have limited access.	19:19
	← ewnd9 left	19:19
orthoplex64	maybe I'm not going about this the right way	19:19
	I'll just describe my problem	19:19
	→ ewnd9 joined	19:20
Charmi	@iveqy ever faced/heard of similar issue like this?	19:20
orthoplex64	I'm making changes to a clone of my fork of a repository	19:20
iveqy	Charmi: does the owner know that (s)he is limiting contributions from windows machines?	19:20
rosipov	Charmi: nothing can be done about it: only rename file in repo or use other platform	19:20
orthoplex64	but since I've started working, changes have been made to the main repository	19:20
	how can I download those changes, yet still have my work?	19:20
iveqy	orthoplex64: do a rebase...	19:20
	← cigarshark left	19:20
rosipov	orthoplex64: git stash && git pull --rebase && git stash pop	19:21
Charmi	@iveqy yes, owner is aware but the project has already reached almost upto completion, so changing a filename would not be a feasible solution	19:21
iveqy	orthoplex64: the stash-thing is only needed if you have things you haven't commited	19:21
orthoplex64	oh	19:21
	← g0bl1n left	19:21
voila	!stash pop	19:21
iveqy	Charmi: then, don't use a filesystem with those limitations	19:21
orthoplex64	gah! but if I do git pull --rebase, how does git know what to pull?	19:22
	← drizzd left	19:22
iveqy	orthoplex64: it doesn't, it guesses. It will pull your remote called origin if nothing else is said	19:22
	← Sigma left	19:22
orthoplex64	how can I see or edit remotes?	19:23
iveqy	orthoplex64: I think you're looking for something like this: https://gist.github.com/CristinaSolana/1885435	19:23
	→ troker joined	19:23
iveqy	orthoplex64: man git remote	19:23
gitinfo	orthoplex64: the git-remote manpage is available at http://jk.gs/git-remote.html	19:23
rosipov	orthoplex64: git remote -v	19:23
voila	orthoplex64, nice pdf peecode .. git internals	19:23
	→ Sigma joined	19:24
Charmi	@iveqy ext4 allows special characters in filename but not ntfs	19:24
	→ jamiis joined	19:24
	→ ej joined	19:24
	← jamiis left	19:24
orthoplex64	peecode?	19:24
iveqy	Charmi: windows has limitations, git can't help you work past them, so you've to make sure all platforms using that git repo doesn't do anything not windows friendly. The special characters are only one limitations of windows, length of filenames is an other	19:25
	→ kevwil joined	19:25
iveqy	Charmi: then switch to ext4?	19:25
	← cha1tanya left	19:25
	← OnlyMax left	19:25
	→ jamiis joined	19:25
	← insejn left	19:25
	← jamiis left	19:25
	→ mklappstuhl joined	19:26
	← mechanicalduck left	19:26
	← arand left	19:26
	→ jamiis joined	19:26
Charmi	so, i have two possible solutions. either switch to ext4 or change the filename inside repository!	19:26
	→ matanya joined	19:27
iveqy	Charmi: well, there's a number of filesystems you can choose from, but yeah ext4 is the only one I know that will work somewhat on windows	19:27
	← huoxito left	19:27
	→ mechanicalduck joined	19:27
	← maxmanders left	19:27
	← rasnor left	19:28
	→ private joined	19:28
	← ej left	19:28
	→ ej joined	19:31
	dpac → dpac\|away	19:31
Charmi	well, thanks for help @iveqy @_ikke_	19:32
iveqy	Charmi: good luck. If I was in your shoes I would just install ubuntu on avirtual machine	19:32
orthoplex64	how do I start tracking new files that I added to my local repo?	19:32
	→ Hoosier2016 joined	19:32
iveqy	orthoplex64: git add	19:32
	orthoplex64: it seems like you need !book !talks	19:32
gitinfo	orthoplex64: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	19:32
	orthoplex64: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	19:32
	← nsanden left	19:32
orthoplex64	is git add just some sort of multifunctional command?	19:32
iveqy	orthoplex64: no, git add adds files to your index	19:33
orthoplex64	index...?	19:33
iveqy	orthoplex64: as I said, !book	19:33
gitinfo	orthoplex64: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	19:33
orthoplex64	I really could use a book	19:33
iveqy	orthoplex64: it really explains things better that I can do here, and it has images =)	19:33
voila	peepcode git internals	19:34
	← Guest____ left	19:34
	← Sigma left	19:35
	← Marqin left	19:36
	→ Marqin joined	19:37
	← nathancahill left	19:37
	→ Davey joined	19:38
	← hahuang61 left	19:39
	← joshsmith left	19:39
	← mmlac-bv left	19:39
	← devth left	19:41
	→ Bass10 joined	19:41
	← Marqin left	19:42
	← t0by left	19:44
	← worstadmin left	19:44
	→ mribeirodantas joined	19:44
	→ devth joined	19:46
	→ Marqin joined	19:49
	← aberrant left	19:49
	→ SocalNick joined	19:49
Norrin	milki & some more guys that are out of my scrollback: thanks!	19:49
	git fetch; git cherry-pick is working out	19:49
	→ Sicp joined	19:50
Sicp	I want to see how far behind my origin is from master	19:51
	origin means my local..master, right?	19:51
	← zacts left	19:51
	→ iksik joined	19:51
	← iksik left	19:51
	→ iksik joined	19:51
_ikke_	no	19:52
iveqy	origin it the remote you have cloned from	19:52
_ikke_	It's the default name for the remote where you cloned from	19:52
	a remote is a shortcut to a url to another repository	19:52
Sicp	to the master	19:52
	no, I'm thinking in terms of using stuff like BitBucket and Github	19:53
	what I mean to say, I have a repository on one of those services and I push to it from local	19:53
	→ strictlyb joined	19:53
iveqy	Sicp: doesn't matter, mine and _ikke_'s description is still valid	19:53
Sicp	in this case, what is the one on that service called and what is the one on my local machine called?	19:53
	← trungqtran left	19:53
Sicp	because I say "git add remote origin http://etc.", right?	19:53
_ikke_	the one what?	19:54
	→ normanrichards joined	19:54
_ikke_	yes	19:54
Sicp	exactly, what is the one I'm referring to :P	19:54
	a repo with one branch, the master branch	19:54
iveqy	Sicp: git remote -v will give you a list of your remotes and what is called what	19:54
	← iksik left	19:54
	→ mmlac-bv joined	19:54
_ikke_	What are you trying to name? The repository, the branch, what?	19:54
	→ pr0ggie joined	19:55
	← acharlieh left	19:55
	← jamiis left	19:55
	← jackdempsey left	19:55
Sicp	one moment	19:55
rosipov	Sicp: you probably refer to remotes, correct?	19:55
	← robbyoconnor left	19:56
	→ worstadmin joined	19:56
Sicp	I get it; the repo with the one master branch is on my local machine and I just add to it a remote on one of those services by virtue of adding that service's URL at the end of the "git add remote origin URL"	19:56
	← gebi left	19:57
iveqy	Sicp: "the repo with the one master branch"?	19:58
	← ziddey left	19:58
iveqy	Sicp: the default branchname in git is master, usually every repo has a master branch	19:58
Sicp	yea, after all it is a repository that I have when I "git init"	19:58
	and its only branch is master	19:58
	← matanya left	19:58
	← OOPMan left	19:58
	→ trungqtran joined	19:58
Sicp	yea, just was making it clearer to myself	19:59
rosipov	Sicp: git add remote name	19:59
	→ cin joined	19:59
rosipov	Sicp: doesn't have to be "origin", origin is a default	19:59
Sicp	so now the question is, how can I tell how far behind the master is from the remote that I added on Github or BitBucket	19:59
_ikke_	Sicp: You first need to fetch from the remote	20:00
Sicp	only then will I be able to find how far off I've been?	20:00
_ikke_	yes	20:00
Sicp	ok	20:00
_ikke_	the git protocol allows for very little interrogation	20:00
	→ mdhopkins joined	20:00
_ikke_	git ls-remote origin is all you can get	20:00
Sicp	so pushing if you're behind is out of the question, that's why that non-fast-forward error pops up when out of sync	20:01
_ikke_	Sicp: Well, that has to do that you can't merge on the server	20:01
	← mckendricks left	20:01
	← IrishPrime left	20:01
	→ acharlieh joined	20:02
	→ nsanden joined	20:02
HelloShitty	i have a question	20:03
	← nicholasruunu left	20:03
	→ Cromulent joined	20:03
HelloShitty	i was editing a file in my "git folder"	20:03
	then i have renamed that file with mv command	20:03
	← Hoosier2016 left	20:03
	← rfoust left	20:03
HelloShitty	but when i did git status	20:03
	← oliveiraev left	20:03
	→ willob joined	20:04
HelloShitty	it showed me a deleted file and an untracked file	20:04
Sicp	stage it and it will recognize that it was a rename	20:04
HelloShitty	i have made git checkout -- file	20:04
	→ Hoosier2016 joined	20:04
	→ the8thbit joined	20:04
	→ jackdempsey joined	20:04
HelloShitty	but the file is still in the folder	20:04
Sicp	yes, stage that change you've made	20:04
HelloShitty	hum ok	20:04
Sicp	add it	20:04
HelloShitty	after that the old file will be gone from folder?	20:05
rosipov	HelloShitty: git add new_name && git rm old_name	20:05
	→ devoldmx joined	20:05
Sicp	it hasn't gone anywhere, it's still the same file and will still exist but that's how git recognizes renaming	20:05
	right?	20:05
	← BSaboia left	20:06
	→ r0bby joined	20:06
HelloShitty	but i want it to be gone	20:06
Sicp	it wasn't created to be gone	20:06
the8thbit	Hello, I am very new to git and revision control, and I am having trouble understanding exactly how git works. I've created a local git repository, created a new branch, and checked out the new branch. Where is this branch stored, and how do I go about making changes to it?	20:06
	→ BSaboia joined	20:06
iveqy	the8thbit: !book !talks	20:06
gitinfo	the8thbit: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	20:06
	the8thbit: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	20:06
rosipov	the8thbit: when you checkout branch contents of the directory become contents of the branch	20:07
HelloShitty	Sicp-	20:07
	← rosipov left	20:07
	→ ziddey joined	20:07
HelloShitty	i was mistaken when i created the file	20:07
	→ rickruby joined	20:07
HelloShitty	so i have renamed it	20:07
Sicp	I would have removed it	20:08
the8thbit	rosipov: So if I make changes in the branch I created, and then switch to the master branch, should those changes go away?	20:08
HelloShitty	so i didn't want the file with the old name	20:08
	but now in folder is the old file with old name	20:08
	and the file with the new name	20:08
the8thbit	iveqy: Thanks, I'll check out that book	20:08
	→ intripoon joined	20:08
	← devoldmx27 left	20:09
Sicp	try what rosipov said	20:09
	← Cromulent left	20:09
	→ _iron joined	20:10
	← hwrd\|work left	20:10
	← napping left	20:10
johndo	HelloShitty: that's because you did a git checkout -- file	20:10
	you will have to remove it (a 2nd time)	20:11
	← voila left	20:11
HelloShitty	ok	20:11
	← rfk left	20:11
johndo	the checkout restored thet file	20:11
	← rickruby left	20:12
HelloShitty	and why is git preventing me of using the git commit -a -m "message" to skip the staging part?	20:12
	← konundra left	20:12
	→ konundra joined	20:12
	← ej left	20:12
the8thbit	iveqy: I'm reading this, thanks again for linking. All of the other resources I could find assumed that I already understood other contemporary version control systems.	20:12
	← michaelarestad left	20:13
	← acharlieh left	20:13
_ikke_	HelloShitty: What do you mean, preventing you?	20:13
HelloShitty	it doesn't let me use that command	20:13
_ikke_	HelloShitty: "doesn't let you"?	20:13
	HelloShitty: Be a little more specific	20:13
	HelloShitty: git commit -a doesn't add new files	20:13
Charmi	Hi, is there a way to exclude a folder while checking out a branch?	20:14
	→ pantsman joined	20:14
iveqy	Charmi: yes, but don't. It's complicated	20:14
	← kermit left	20:14
HelloShitty	when i issue the command	20:14
Charmi	i would like to know about it	20:14
HelloShitty	git keeps telling me to use git add to add new files	20:15
_ikke_	yes	20:15
	You need to explicitly tell git to track new files	20:15
milki	Norrin: awesome. just a little misunderstanding of the patch program and me forgetting about git apply then	20:15
HelloShitty	so what is the -a flag?	20:16
	isn't it to skip the staging part?	20:16
Charmi	@iveqy could you please tell how could I do the exclusion?	20:16
	← cin left	20:16
_ikke_	HelloShitty: It tells git to add every change to tracked files to the index (the stage), and commit that	20:17
iveqy	Charmi: sure, it's called a sparse checkout	20:17
	something like this: http://jasonkarns.com/blog/subdirectory-checkouts-with-git-sparse-checkout/	20:17
	Charmi: and git newer than 1.7.9	20:17
	Charmi: and git newer than 1.7.0 i mean	20:17
	→ kadoban joined	20:17
	← therealGent left	20:17
	→ daniel2_ joined	20:19
	→ Dante93 joined	20:19
daniel2_	Hi. I am new to GIT. Is it possible to have a acc on bitbucket or github, create there a project and sync this project with my project, which is developed on my webserver via ftp?	20:19
	← SHyx0rmZ left	20:20
daniel2_	or does i have to develop local and always commit to the project on bitbucket?	20:20
iveqy	daniel2_: you can't control a git repo over ftp	20:20
	daniel2_: but otherwise, yes	20:21
_ikke_	daniel2_: You work and commit local, and push that to for example bitbucket	20:21
iveqy	daniel2_: however !deploy	20:21
gitinfo	daniel2_: 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/the-list-and-irc/deploy.html	20:21
HelloShitty	i don't know why but i can't see the new file in bitbucket	20:21
Charmi	@iveqy what exactly are "sub-tree of a repository"?	20:21
	← JosephSilber left	20:21
orthoplex64	will "git add -a" followed by "git commit -m "test"" be the same as "git commit -a "test""?	20:21
daniel2_	iveqy, _ikke_ : thank you	20:22
_ikke_	git add -a does not exist	20:22
orthoplex64	3	20:22
	oops	20:22
	I was trying to get a spec of dust out of my keyboard between my 3 and enter keys on the numpad	20:22
	→ cagedwisdom joined	20:23
	← daniel2_ left	20:23
iveqy	Charmi: a path	20:23
	→ jhulten_ joined	20:23
iveqy	Charmi: or well, it can be many things, but in this case, a path and it contents, recursively	20:23
Charmi	@iveqy so, each folder is a new sub-tree?	20:24
	@iveqy each folder inside a repository	20:24
	← jhulten left	20:25
iveqy	Charmi: almost	20:25
	→ kermit joined	20:25
	→ matanya joined	20:26
Dante93	is there something on linux like the github for windows?	20:26
	← SergeyPenkin left	20:27
iveqy	Dante93: github is a website, it works on all systems that have a decent webbrowser, even on linux	20:27
johndo	iveqy: is that also a kind of a sparse clone then? or does git still fetch the whole tree?	20:27
	→ Collin joined	20:28
iveqy	johndo: it's not a sparse clone, you can do a shallow clone (look at --depth in man git clone) but not a sparse one	20:28
gitinfo	johndo: the git-clone manpage is available at http://jk.gs/git-clone.html	20:28
Dante93	i mean the github software for windows, the one you download	20:28
	→ psoo joined	20:28
	→ nathancahill joined	20:29
	adhawkins → adhawkins-away	20:29
johndo	iveqy: then I do not see much use for that, seeing how rather complicated it is	20:29
HelloShitty	what means when git status says that one branch is one commit or push (i can't remember well) ahed of some other branch?	20:30
iveqy	johndo: there's use for it in deployment scenarios, otherwise not. And I don't recommend using it	20:30
	← raging_swine left	20:30
johndo	iveqy: ok, deployment, yes	20:30
Sonderblade	Dante93: there is wine :)	20:30
Charmi	@iveqy what could possibly go wrong with sparse checkout? I mean why were you suggesting not to use this?	20:30
arand__	Dante93: No, nothing that's git-hub-specific like that.	20:30
iveqy	Dante93: well, depends on your needs. There's graphical git clients on linux, github has noone afaik. There's github programs for linux (none with GUI afaik)	20:30
Dante93	ok thanks	20:31
	← troker left	20:31
	← onethfour left	20:31
	← freestyl3r left	20:31
iveqy	Charmi: because it's complicated to setup and most users are doing something wrong if they try to use it the way svn do sparse checkouts.	20:31
	← endiruna left	20:32
iveqy	Charmi: and it's just a checkout, not a clone, so the performance benefits are small	20:32
proq	why, when I checkout an older revision in my repo, do my submodules also not point to the version they were pointed to when that revision was current?	20:32
	← Sendoushi left	20:32
	→ D4N3 joined	20:32
iveqy	proq: did you do a git submodule update?	20:33
	→ groglogic joined	20:33
	← Dante93 left	20:33
	→ karihre joined	20:33
	→ michaelarestad joined	20:34
HelloShitty	What does this means:	20:34
	Your branch is ahead of 'main/master' by 1 commit.	20:34
	← SocalNick left	20:35
	→ kevwil_ joined	20:35
Charmi	iveqy: i'll try this out on a dummy repository first. before moving onto big thing directly	20:35
iveqy	HelloShitty: what it says, main/master is one commit ahead of your branch	20:35
	→ joshsmith joined	20:35
Charmi	iveqy: thanks a lot for help	20:35
iveqy	Charmi: you're welcome	20:36
	← matanya left	20:36
proq	iveqy: no, but that is beside the question. why should I have to run git submodule update incessantly?	20:36
	→ troker joined	20:36
iveqy	proq: you shouldn't, work is ongoing to improve submodules in that area, I'm not sure how far it has come	20:37
	← kevwil left	20:37
HelloShitty	iveqy-	20:37
	my branch is master, right?	20:37
	→ jamiis joined	20:37
iveqy	HelloShitty: how would I know?	20:37
	→ SocalNick joined	20:37
	← troker left	20:37
	← mmlac-bv left	20:37
	→ raf_ joined	20:38
proq	iveqy: ah, ok. I've had to endure a lot of bitching from my team about that behavior, to the point where they are abandoning submodules altogether and I was just wondering	20:38
	← tallest_red left	20:38
iveqy	proq: I'm a bit surprised that it hasn't already been done	20:38
HelloShitty	so how is master 1 commit ahed of main/master?	20:38
_ikke_	HelloShitty: it means you made one commit you haven't pushed yet	20:38
HelloShitty	iveqy- i have one remote - main	20:38
	and 2 branches	20:38
	master and testing	20:39
	ah ok	20:39
	← kadoban left	20:39
HelloShitty	and can i see what is that commit?	20:39
	← h0bbit_ left	20:40
	← karihre left	20:40
iveqy	HelloShitty: what is what commit?	20:40
	→ Learath2 joined	20:40
	gitinfo set mode: +v	20:40
HelloShitty	i can't remember what is missing in this branch	20:41
	← kevwil_ left	20:41
iveqy	HelloShitty: gitk, git log, git diff, git status etc.	20:41
Learath2	hey everyone :)	20:41
	→ troker joined	20:41
	→ tallest_red joined	20:42
	← h0bbit left	20:42
	← Mode-M left	20:42
	→ mckendricks joined	20:43
	→ Collin_ joined	20:43
	→ ej joined	20:43
	← Davey left	20:45
	← Andrevan left	20:45
	← Collin left	20:45
	← mizu_no_oto left	20:45
	→ insejn joined	20:45
	→ skylamer` joined	20:45
	← Sicp left	20:47
HelloShitty	iveqy- git diff --staged, git diff --cached, git diff doesn't show anything	20:48
	:\|	20:48
	← mdhopkins left	20:48
	← sainaen left	20:49
iveqy	HelloShitty: since I still not understand what you really are asking, I gave you a list of commands to use to examine your repo	20:49
	if git diff doesn't show anything, there's nothing changed	20:49
	→ akurilin joined	20:50
	← paul424 left	20:50
HelloShitty	when i issue git status in my main remote, it says this:	20:50
	http://pastebin.com/f9KRYkGw	20:50
	→ matanya joined	20:51
iveqy	HelloShitty: okay?	20:51
	← ej left	20:51
	← insejn left	20:51
	← Yakko left	20:51
	← maslowbeer left	20:52
HelloShitty	and i can't understand what "Your branch is ahead of 'main/master' by 1 commit." means	20:52
	← frankstallone left	20:52
johndo	HelloShitty: try gitk as iveqy said, it's a nice tool to understand what's going on in your repository	20:52
iveqy	HelloShitty: try !lol	20:52
gitinfo	HelloShitty: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	20:52
	← Charmi left	20:52
iveqy	HelloShitty: your branch has one commit that main/master doesn't have	20:53
	it's that simple	20:53
	→ tubbo joined	20:53
tubbo	so this is weird	20:53
johndo	HelloShitty: and you probably want git log main/master..	20:53
	← longbeach left	20:54
	→ onethfour joined	20:56
	→ aquarius joined	20:56
HelloShitty	so let me see if i understood	20:56
tubbo	i'm pushing to a non-bare repo and i have a little hack script that git checkout's the branch from master to my feature branch	20:56
	← spaceonline left	20:56
	← sq-one left	20:57
	← konundra left	20:57
tubbo	basically it goes `ssh: git checkout master`, `git push feature-branch`, `ssh: git checkout feature-branch`	20:57
HelloShitty	there is a local branch (in my computer) and there is a remote branch (the one in bitbucket, in my case), right?	20:57
tubbo	this is so i can push to the non-bare repo	20:57
	today, however, it stopped working	20:57
iveqy	HelloShitty: git branch -a to see all your branches	20:57
HelloShitty	and in my local branch i have one commit that is not yet commited to the remote branch, is that?	20:57
tubbo	whenever i run the ssh:git checkout master, it returns with an error saying that "error: Your local changes to the following files would be overwritten by checkout:"	20:58
	← grzesag left	20:58
iveqy	tubbo: !broken and don't push to a non-bare repo =(, see !deploy	20:58
gitinfo	tubbo: [!doesntwork] We're sorry it doesn't work, but "it doesn't work" is about the worst problem description possible. Please give us some details, what exactly are you doing, what are you expecting to see and what are you seeing instead?	20:58
	tubbo: 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/the-list-and-irc/deploy.html	20:58
HelloShitty	iveqy- i didn't know about that -a flag on branch option of git	20:58
tubbo	basically i edited some files on the server i'm pushing to, reset the changes, and every time i try to checkout a different branch it gives me that error. every time.	20:58
iveqy	tubbo: it looks like there's been changes to the worktree..	20:58
tubbo	basically i keep resetting the same change over and over again	20:58
iveqy	HelloShitty: man git branch tells you about them	20:59
gitinfo	HelloShitty: the git-branch manpage is available at http://jk.gs/git-branch.html	20:59
tubbo	iveqy: yeah but i'm trying to clear them out	20:59
HelloShitty	i'm reading the got pro book but i'm just at the beggining	20:59
iveqy	tubbo: git reset --hard HEAD fixes them and then you have to use git clean	20:59
HelloShitty	:)	20:59
tubbo	iveqy: okay, i did both	20:59
	that's on my feature-branch btw	20:59
	← sferry left	20:59
tubbo	iveqy: the same exact thing happens	21:00
iveqy	tubbo: and you did them on your server?	21:00
	→ maxmanders joined	21:00
	→ kadoban joined	21:00
	← ewnd9 left	21:01
	← wakeup left	21:01
tubbo	iveqy: this is absically what i see https://gist.github.com/tubbo/f0be6e5f6a5d46296fbc	21:01
	basically* :)	21:01
	i run the `deploy` function	21:01
	→ wakeup joined	21:01
HelloShitty	iveqy- one last question	21:01
	← Anders_J left	21:01
HelloShitty	is it possible to change an old commit message?	21:01
tubbo	i do understand that git is not a deployment tool, however this is the best solution i've found to push files from my local box to this test machine i have to use temporarily	21:01
	my problem with this is that it worked right up until i made that edit	21:02
	and now i can't get it to not recognize the edit	21:02
iveqy	tubbo: so, youir webapp creates a lockfile and you track that lockfile in git and tries to overwrite it	21:02
tubbo	it's really annoying	21:02
	iveqy: well i tracked it in git, but i didn't make it a commit	21:02
	so the updates to the lockfile shouldn't be in git at all	21:03
iveqy	tubbo: maybe you should read !deploy one more time... to find a better solution	21:03
gitinfo	tubbo: 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/the-list-and-irc/deploy.html	21:03
tubbo	it seems like some file isn't getting written somewhere..	21:03
	← lamarus left	21:03
	→ enr joined	21:03
iveqy	tubbo: if you track it how can it not be in a commit?	21:03
tubbo	iveqy: well what i mean is the changes that i made to it are not tracked.	21:03
	← bil left	21:03
tubbo	i'm trying to reset them	21:03
	the actual file is tracked.	21:03
iveqy	tubbo: if you track it and you checkout a branch where that file isn't, it should be removed in the worktree	21:04
	tubbo: well, I guess we've found your error	21:04
	← jamiis left	21:04
iveqy	HelloShitty: yes, git rebase -i	21:04
	HelloShitty: man git rebase	21:04
gitinfo	HelloShitty: the git-rebase manpage is available at http://jk.gs/git-rebase.html	21:04
	→ tatsuya_o joined	21:04
	→ acharlieh joined	21:05
	→ hwrd\|work joined	21:05
	→ insejn joined	21:05
	← freeed left	21:06
	→ ojacobson joined	21:06
tubbo	iveqy: what? no...	21:07
	← mechanicalduck left	21:07
tubbo	iveqy: i did a git reset --hard HEAD	21:07
	or wait	21:07
	i guess that's not in the script.. :)	21:07
	← enr left	21:07
	→ b4rt joined	21:08
jhford	is there a way to do a merge, such that the resulting diff is equivalent to having cherry-picked the change over?	21:08
tubbo	iveqy: that did it...strange, i didn't need that this morning :P	21:08
	→ tylerkern joined	21:08
	→ tpollard joined	21:08
tubbo	jhford: wouldn't that basically be a fast-forward merge?	21:09
	← b4rt left	21:09
jhford	tubbo: ff merges require the parent of the commit to be the HEAD of the branch, right?	21:09
tubbo	jhford: yeah, is it possible for you to do that here?	21:09
	→ b4rt joined	21:09
	← b4rt left	21:09
	← maxmanders left	21:09
jhford	nope	21:10
tubbo	jhford: to do that you can rebase the branch you're going into with the branch you're currently on	21:10
	← jkremser left	21:10
	← crash\ left	21:10
	← rabellamy left	21:10
jhford	that would alter history right?	21:10
tubbo	like if you're on feature-branch and you want to push to master, you can do `git checkout feature-branch; git rebase master; git checkout master; git merge feature-branch`	21:10
	→ crash\ joined	21:10
tubbo	that'll do a fast-forward	21:10
	← breakingthings left	21:10
tubbo	jhford: that puts the commits you made on your feature "on top of" the commits that exist in master.	21:10
	and yes, rebase rewrites history	21:10
jhford	this is for a tool, and I won't be able to control the time between rebasing on master and merging	21:10
tubbo	or can, i should say	21:10
	jhford: huh? there are definitely plugins for git that do that	21:11
	git-process i believe	21:11
jhford	cool!	21:11
	jhford researches	21:11
tubbo	jhford: i like git-process, it really influenced my personal workflow	21:11
jhford	cool!	21:11
	→ Thra11_ joined	21:12
	← v0n left	21:12
jhford	tubbo: https://github.com/jdigger/git-process ?	21:12
HelloShitty	sorry, i do have one more question	21:12
	→ jhulten joined	21:12
	← private left	21:13
	← jhulten_ left	21:13
	← matanya left	21:13
tubbo	jhford: yup. i don't use it anymore but i've implemented most of its commands in ~/.gitconfig directly	21:13
HelloShitty	i don't know why, but when i do git clone git:mylin........	21:13
jhford	neat	21:13
tubbo	https://github.com/tubbo/dots/blob/master/config/gitconfig#L19	21:13
HelloShitty	the folder created is not the same has the folder that i have at this moment	21:14
	how can i fix this?	21:14
tubbo	HelloShitty: git clone <repo> .	21:14
	that '.' on the end is short for the current working directory to the shell, and specifying a folder after the repo will instruct git to clone into that folder	21:14
HelloShitty	For example: my working dir is program1 and when i clone my repo from bitbucket it comes like program-1	21:14
	→ mmlac-bv joined	21:15
HelloShitty	How do i change that it bitbucket/git?	21:15
	→ FernandoBasso joined	21:16
HelloShitty	tubbo- i didn't understood your reply	21:16
	← eijk_ left	21:16
	→ frege joined	21:16
frege	how do I tell git to not keep track a file anymore that used to be in the repo?	21:17
	→ konundra joined	21:17
	← devth left	21:18
johndo	frege: add it to .gitignore and remove it from the repo	21:18
frege	johndo: remove with 'git rm x' ?	21:18
	→ Rescue9 joined	21:18
johndo	yes	21:18
snow_ru	who is julio hamano ?	21:19
tubbo	HelloShitty: you know how you do `git clone <repo>`?	21:19
	← alvaro_o left	21:19
HelloShitty	i'm making a clone of some repo to my disk	21:20
	but the link to clone my repo has a different name than my working directory	21:20
	→ aberrant joined	21:20
	→ aryzing joined	21:21
	← jackdempsey left	21:21
HelloShitty	can't i make the link to clone be case sensitive?	21:21
aryzing	hi, is it possible to run a diff on two files with different names on different commits?	21:22
johndo	HelloShitty: you can't change the link as this is the remote address of the repository	21:22
	but you can change the directory	21:22
	HelloShitty: man git clone	21:22
gitinfo	HelloShitty: the git-clone manpage is available at http://jk.gs/git-clone.html	21:22
	← hellopat left	21:22
	← hwrd\|work left	21:23
johndo	aryzing: yes, you can diff any file at any revision (commit)	21:23
	← LuxuryMode left	21:23
johndo	use commit:path	21:23
HelloShitty	So, i can't use working directories that are case sensitive?	21:24
	→ modInfo3 joined	21:24
johndo	HelloShitty: as I said, you can use as local directory what you want	21:25
	→ tylerker_ joined	21:25
johndo	see the last parameter of git clone in that man page	21:25
aryzing	johnda: thanks, ill try it out	21:26
	← frege left	21:26
	→ Skrypt joined	21:27
	→ mizu_no_oto joined	21:27
	← zhost left	21:27
HelloShitty	johndo- thanks	21:28
	← donmichelangelo left	21:30
	→ lamarus joined	21:30
	→ PaulCapestany joined	21:30
HelloShitty	shit	21:30
	→ donmichelangelo joined	21:30
	← mike_af left	21:31
	← rednaks left	21:31
HelloShitty	is there any problem if i change the repo name in bitbucket repo settings?	21:31
	→ Fernando1asso joined	21:32
	← szx left	21:32
	→ jeffery_ joined	21:33
	→ maslowbeer joined	21:33
	← psoo left	21:35
	← kesha__ left	21:36
	← FernandoBasso left	21:36
	→ frege joined	21:37
frege	I did 'git rm file' it removed my file physically!!!!!!	21:37
	how can I get it back?	21:37
	I just didn't want to keep track of changes on that file	21:37
	← Dante2k left	21:37
johndo	frege: did you already commit?	21:38
frege	johndo: yes :(	21:38
	johndo: you said add it to gitignore and do git rm	21:38
	I did that and it removed my file!	21:38
	→ rabellamy joined	21:39
	→ teejmya joined	21:39
	← skylamer` left	21:39
frege	johndo: how do I bring it back?	21:39
	ah shit now it's gonna fuck with my other changes	21:40
	→ mfulz joined	21:40
johndo	git reset HEAD~ file	21:40
	git checkout file	21:41
	→ breck7_ joined	21:41
johndo	there's probably a one-line command ...	21:41
frege	but then it will revert all of my other changes	21:41
	← tylerkern left	21:41
	← breck7 left	21:41
johndo	frege: not if you add the file (with path)	21:42
frege	is there a way to just revert rm?	21:42
m0viefreak	git checkout HEAD -- file	21:42
frege	ah ok	21:42
	← aard_ left	21:42
johndo	and use rm --cached for deleting it after	21:42
	← tylerker_ left	21:42
frege	) git checkout HEAD -- ./settings.py	21:42
	error: pathspec 'settings.py' did not match any file(s) known to git.	21:42
m0viefreak	if it was never actually tracked by git its gone for good	21:43
frege	no it was tracked by git	21:43
OMGOMG	there ought to be a git-subtract that did the opposite of add	21:43
johndo	frege: of course :), you already committed that removal	21:43
	frege: you need HEAD~	21:43
	→ ej joined	21:44
frege	right	21:44
	johndo: then?	21:44
m0viefreak	oh there was a commit, yeah then use 'git checkout HEAD~ -- file'	21:44
frege	Unstaged changes after reset:	21:44
	D mindlogs/mindlogs/settings.py	21:44
m0viefreak	or whatever revision contains it	21:44
frege	I got this now	21:44
	but I still don't see the file	21:44
m0viefreak	why did you reset?	21:44
frege	because johndo said	21:44
	mutex_ → mutex	21:45
frege	jiizz I'm panicing right now	21:45
johndo	maybe my fault	21:45
	→ emergion joined	21:45
OMGOMG	!dontpanic	21:45
frege	I really don't want to lose this file or my other changes, it was two days work	21:45
OMGOMG	!panic	21:45
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts. Carefully go through the conflicts. Picking one side verbatim is not always the right choice!	21:45
johndo	frege: dont panic, everything you commited to git is not lost	21:45
	→ alvaro_o joined	21:45
frege	okay now I need a step by step approach to get out of this crisis :(	21:46
m0viefreak	what does your git status tell you right now?	21:46
frege	right now after that commit I ran johndo's command "git reset HEAD~ settings.py"	21:46
	Pengoo → Sabey	21:46
m0viefreak	so when you do 'git status' settings.py is the only file mentioned?	21:47
frege	let me paste somewhere	21:47
	yeah new https://dpaste.de/ek9Oy/	21:47
	mohoree_: https://dpaste.de/ek9Oy/	21:47
	oh shit	21:47
	sorry	21:47
	m0viefreak: https://dpaste.de/ek9Oy/	21:47
	← ej left	21:48
frege	what should I do now?	21:48
	← Dougie187 left	21:48
m0viefreak	whats the last commit? (git show / git log)	21:48
	is that the one of the removal?	21:49
	← onethfour left	21:49
frege	commit 68fe70c96be369919fe5265dc76cefc3e86d9c73	21:49
	comment : 'the new search on topnav and git rm settings.py'	21:49
	← glosoli left	21:50
m0viefreak	ok nothing lost then	21:50
	just need to clean up the index/ working directory	21:50
johndo	frege: looks like you only have to checkout settings.py	21:50
	→ godgodgodgo joined	21:50
m0viefreak	yep	21:50
	just do git checkout HEAD~ -- settings.py	21:51
	and it should be fine	21:51
johndo	but I'm not sure what is with the untracked files	21:51
	← mishok13 left	21:51
m0viefreak	johndo: he doesnt seem to be using a .gitignore	21:51
	← Hoosier2016 left	21:51
johndo	m0viefreak: he should since the last commit :), but probably an incomplete one	21:52
frege	I am using a .gitignore	21:52
	→ Dante2k joined	21:52
frege	and that file is still in my .gitignore	21:52
johndo	frege: that's ok	21:53
frege	oh cool	21:53
	it's back now	21:53
	→ satazor_ joined	21:53
frege	now how do I make it invisible to git?	21:53
johndo	but if you don't want all the files and directories git shows you as untracked you could add those also to the .gitignore	21:53
m0viefreak	post another 'git status'	21:53
frege	I don't want git to see changes	21:53
	new file: settings.py	21:53
m0viefreak	you need to unstage them	21:53
	git reset HEAD	21:54
	do that	21:54
	and make sure the file is still there	21:54
	and then make sure 'git status' is clean	21:54
frege	done	21:54
	awesome!	21:54
	there is no new file anymore	21:54
	and the file is still there	21:54
m0viefreak	all good then?	21:54
frege	thanks:)	21:55
	→ jacoluta joined	21:55
frege	johndo: thank you too	21:55
m0viefreak	one more thing, tho:	21:55
	if you push that removal and other people pull	21:55
	it WILL get deleted on THEIR end	21:55
	← emergion left	21:55
frege	nice	21:55
	← aldodelgado left	21:55
frege	that's exactly what I want :)	21:55
johndo	so does "git reset HEAD~ filename" reset the whole tree or only the given file?	21:56
	← JSharpe left	21:56
m0viefreak	only the file	21:56
	it works for --mixed, but not for --hard	21:56
	i try to use checkout -- file instead of reset whenever possible	21:56
johndo	yes, git refuses --hard with a file	21:57
	that's why I suggested the two step with checkout as 2nd	21:57
	did not know it better :)	21:57
m0viefreak	giving a file spec to reset (--mixed) does NOT move the branch pointer	21:58
	→ onethfour joined	21:59
	→ mechanicalduck joined	21:59
	→ devth joined	22:01
	← natechan left	22:02
	← rabellamy left	22:03
	← iAsterisk left	22:03
	← Sonderblade left	22:03
	→ huoxito joined	22:05
	← Ragnor left	22:05
	← satazor_ left	22:05
	← Nicholas_Rishel left	22:06
	← lamarus left	22:07
	→ ll_ joined	22:08
ll_	hello.	22:08
gitinfo	ll_: 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.	22:08
	gitinfo set mode: +v	22:08
ll_	hello.	22:08
	→ Ragnor joined	22:09
ll_	i'd like git to refuse commits to a certain branch in a repository if it isn't signed (with gpg, using -S). what hook could i use for this?	22:09
	→ iAsterisk joined	22:10
	← drizzd_ left	22:10
	→ foist joined	22:10
	→ lamarus joined	22:11
	← pantsman left	22:11
	← tpollard left	22:12
	← rudak left	22:12
	← TeckniX left	22:13
	← kermit left	22:14
	← trungqtran left	22:14
	← \|Freeman\| left	22:14
	→ juanmabc joined	22:14
	→ kermit joined	22:16
	→ d2dchat joined	22:16
	← Destos left	22:16
	← normanrichards left	22:17
	← jeffery_ left	22:17
	→ Nicholas_Rishel joined	22:17
	← anonymuse left	22:18
	→ satazor_ joined	22:19
	← foist left	22:19
	← satazor_ left	22:19
	← mizu_no_oto left	22:19
	→ satazor_ joined	22:19
	→ rednaks joined	22:20
snow_ru	?	22:20
comps	ll_: hmm, git-commit doesn't seem to be able to sign commits using GPG .. or do I just have an old version?	22:20
	→ devoldmx3 joined	22:20
	→ foist joined	22:20
	→ tpollard joined	22:21
	← devoldmx left	22:21
ll_	comps: git commit -S. works with 1.7.10.4.	22:21
comps	ll_: as for the hook, that would be "update"	22:21
	probably	22:21
	ll_: I have 1.7.10.4, but there's no -S in git-commit manpage	22:22
	just -s for sign-off	22:22
ll_	comps: it isn't documented, but it works.	22:22
	← mechanicalduck left	22:23
	→ mizu_no_oto joined	22:23
ll_	update is for pushes though, isn't it? i want something for the local repository.	22:23
comps	pre-commit ?	22:24
	just list the hooks directory	22:24
	and read the examples	22:24
ll_	pre-commit runs before the commit message is set, and the message is one of the things that are being signed.	22:25
comps	then post-commit ... ?	22:25
ll_	that says it can't affect the outcome of a commit... but i suppose it could force a reset.	22:25
comps	why do you even want to restrict users in such a way? ... this kind of enforcement makes sense on a remote repo	22:25
ll_	i know, it doesn't add any security sincee anyone who can do commits can also edit the hooks.	22:26
m0viefreak	you probably want a commit-msg hook	22:27
	→ gittish joined	22:27
m0viefreak	hmm, nope, that does not get the sha	22:27
	→ anonymuse joined	22:27
	← melee left	22:28
ll_	i just want something that makes sure that i don't forget to sign commits to the master branch, so i don't have to sign them all when i eventually push them.	22:29
	← willob left	22:29
ll_	which (in maximal paranoia mode) would include going through all the committed unsigned code and make sure that it hadn't been modified).	22:29
m0viefreak	how about a simple post-commit hook then?	22:29
	you can have it simply spit something like "you did not sign your last commit, please ammend"	22:30
	or whatever	22:30
	→ melee joined	22:30
m0viefreak	so it doesn't block your workflow if you dont feel like signing at the time	22:30
	← michaelarestad left	22:30
ll_	yeah, i'll probably do that. maybe check it out to a separate branch and reset the master branch to the parent if it isn't signed.	22:30
	→ verysoftoiletppr joined	22:31
	← SocalNick left	22:31
	← verysoftoiletppr left	22:31
	→ verysoftoiletppr joined	22:31
	→ melee_ joined	22:31
	→ SocalNick joined	22:32
comps	or fire up git commit --amend -S -C HEAD	22:32
	or so	22:32
	← SocalNick left	22:33
	← foist left	22:33
	→ SocalNick_ joined	22:33
	→ jamiis joined	22:34
	← melee left	22:34
	→ foist joined	22:34
	← frege left	22:36
	← foist left	22:36
	← pdx left	22:36
	← sampiero left	22:36
	← Thra11_ left	22:37
	→ foist joined	22:37
	← chuckharmston left	22:38
	→ Balliad joined	22:38
	→ pr0ton joined	22:39
	← jerius left	22:39
	→ darinm joined	22:39
	→ GT4066 joined	22:40
	→ voiceofgrog joined	22:40
	→ Hoosier2016 joined	22:41
	← foist left	22:41
	→ foist joined	22:42
	← mklappstuhl left	22:43
	→ madewokherd joined	22:43
	melee_ → melee	22:44
	→ ej joined	22:44
	← lamarus left	22:45
	← godgodgodgo left	22:45
	← Kabaka left	22:45
	→ xpirator joined	22:47
	← foist left	22:47
	→ train_or joined	22:47
	→ foist joined	22:48
	← ej left	22:49
	← Hoosier2016 left	22:49
	→ Kabaka joined	22:50
	→ simesy joined	22:50
	← gittish left	22:51
	← foist left	22:51
	→ emergion joined	22:52
	→ rabellamy joined	22:52
	→ jon_r joined	22:53
	← Tuna-Fish left	22:53
	→ foist joined	22:53
	← groglogic left	22:55
	← foist left	22:55
	← anonymuse left	22:56
	→ foist joined	22:56
	→ Tuna-Fish joined	22:57
	← foist left	22:58
	← emergion left	22:58
	HariboPenguin → HariboPenguin\|Of	22:58
	→ tylerkern joined	22:58
	← Balliad left	22:59
	← ll_ left	22:59
	← jamiis left	22:59
	→ foist joined	22:59
	← lavaman left	23:00
	→ Joshi3s` joined	23:00
	→ warlock_mza joined	23:02
	← foist left	23:02
	← devoldmx3 left	23:02
	→ devoldmx joined	23:02
	→ hide_ joined	23:03
	→ foist joined	23:03
	← tatsuya_o left	23:03
	→ Bucciarati joined	23:03
	← Tuna-Fish left	23:03
	→ iveqy joined	23:03
	→ Kamal_ joined	23:03
	→ Tuna-Fish joined	23:03
	→ BeerSerc joined	23:04
	Kamal_ → Guest65425	23:04
	→ enr joined	23:04
	→ LuxuryMode joined	23:04
	← tubbo left	23:04
	→ tubbo joined	23:04
	→ halfie joined	23:04
	→ luto joined	23:05
	→ pygmael joined	23:05
	→ RichardBronosky joined	23:05
	← SocalNick_ left	23:06
	← foist left	23:06
	← LuxuryMode left	23:06
	→ foist joined	23:08
	← enr left	23:08
	← ukgamer left	23:08
	← acharlieh left	23:09
	→ acharlieh joined	23:09
	← m8 left	23:10
	← nova_ left	23:10
	← teejmya left	23:10
	← acharlieh left	23:10
	← SuperDMP left	23:11
	Guest93127 → nitrodex	23:12
	← foist left	23:12
Rescue9	question: my system broke so I had to rebuild. I have patches submitted to a gerrit. the SHA of the patch doesn't match the SHA of the checkout I just did on the package. Is there a way to change the SHA "Change ID"? Is having a different SHA going to be an issue when I reupload the patch to a gerrit?	23:12
	← verysoftoiletppr left	23:13
	→ foist joined	23:13
	→ ukgamer joined	23:14
	→ g0bl1n joined	23:15
	← foist left	23:15
	← raf_ left	23:16
	→ dik_dak joined	23:16
	→ foist joined	23:16
	← _iron left	23:18
	← foist left	23:18
	← devoldmx left	23:19
	→ foist joined	23:19
	← strictlyb left	23:20
	← enr^ left	23:20
	← chrob left	23:21
	→ LBV_User joined	23:21
iveqy	Rescue9: do you know what a sha1 is?	23:23
	← foist left	23:23
	→ michaelarestad joined	23:24
	← rabellamy left	23:24
	→ foist joined	23:24
	→ SocalNick joined	23:25
Rescue9	Well...... lol. not really. I'm just curious if a different SHA is going to be a problem when I push my next patch	23:25
	→ LuxuryMode joined	23:25
iveqy	Rescue9: a sha1 is a hash, it's a fingerprint of your commit, unique to every commit in existense	23:25
aryzing	hi, one of my commits has a short and a long message, but the longer message gets cut off with $ git log, how can I view the entire message?	23:26
iveqy	Rescue9: if your the uploaded commits sha1 differs from your local rebuilt sha1, it's not the same commit	23:26
	Rescue9: and that means that you've failed with your rebuild and needs to find the error	23:26
	← Skrypt left	23:26
iveqy	aryzing: man git log or man git show	23:27
gitinfo	aryzing: the git-log manpage is available at http://jk.gs/git-log.html	23:27
	aryzing: the git-show manpage is available at http://jk.gs/git-show.html	23:27
	→ DolpheenDream joined	23:28
	← foist left	23:28
	→ jamiis joined	23:28
	→ zbcm_ joined	23:28
	→ raf_ joined	23:29
	← LuxuryMode left	23:29
	→ foist joined	23:30
	→ KernelPanicMK2 joined	23:31
Rescue9	iveqy: thanks for the info! I found the issue. I downloaded the wrong patch set. I now have the correct one and the hash matches.	23:31
	Nice to finally understand.... the 'fingerprint' analogy helped.	23:31
	→ devoldmx3 joined	23:32
	← foist left	23:32
	← PeterBooker left	23:33
	← iliketurtles left	23:33
	→ foist joined	23:34
	→ sampiero joined	23:36
	→ tinti_ joined	23:36
	→ _BJFreeman joined	23:36
	← decotii left	23:37
	← foist left	23:37
	_BJFreeman → BJfreeman	23:38
	← primitive left	23:39
	→ foist joined	23:39
	→ teejmya joined	23:40
	← teejmya left	23:41
	→ teejmya joined	23:41
	→ PeterBooker joined	23:42
	← HelloShitty left	23:43
	← aberrant left	23:44
	← jayfk left	23:44
	→ maroloccio joined	23:44
	→ ej joined	23:45
	← rurufufuss left	23:45
	← SocalNick left	23:45
	→ Inside joined	23:45
	← gmac left	23:46
	← ZujkisNx left	23:47
	→ iliketurtles joined	23:47
	→ devoldmx joined	23:48
	→ devoldmx_ joined	23:48
	← ej left	23:49
	← Noldorin left	23:49
	→ oriba joined	23:49
	Fernando1asso → FernandoBasso	23:49
	→ Noldorin joined	23:50
	← mmlac-bv left	23:50
	← bandroidx left	23:50
	→ squentin joined	23:50
	→ bandroidx joined	23:51
	← devoldmx3 left	23:51
	→ enr joined	23:51
	→ zacts joined	23:52
	← melee left	23:52
	← devoldmx_ left	23:53
	← joshsmith left	23:54
	← mcepl left	23:54
	← foist left	23:55
	← Joshi3s` left	23:56
scorphus	git grep rocks! wow	23:56
	→ foist joined	23:56
Rylai	Hey, #git. I was thinking about symlinking all of the conf files I need for a specific application (nginx with php) to a folder in /root/ or somewhere and using git to track changes made to them. Is there any way to do this?	23:57
	← juanmabc left	23:57
	→ R1KRDO joined	23:58
	← R1KRDO left	23:58
	← deuterium left	23:59
	← jon_r left	23:59
	← tubbo left	23:59

Logs Search ←Prev date Next date→

Channels Documentation