IRCloggy #git 2014-10-10

Logs Search ←Prev date Next date→ Channels Documentation

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

2014-10-10

← fstd left00:00
→ fstd joined00:00
← zhangxaochen left00:00
← kriks left00:00
→ zhangxaochen joined00:00
← brandonshowers left00:03
→ ajustrun joined00:04
← jave left00:04
← ojacobson left00:05
→ alanwill joined00:06
← imachuchu left00:07
→ robbyoconnor joined00:08
← robbyoconnor left00:08
→ robbyoconnor joined00:09
→ ojacobson joined00:10
→ durianshredder joined00:10
→ Zifre joined00:10
← alanwill left00:10
← mhall left00:11
→ BuenGenio joined00:11
← _Atom_ left00:12
→ gregsmith joined00:12
← zhangxaochen left00:12
← mueslo left00:13
← Zifre_ left00:13
→ zhangxaochen joined00:13
← daedeloth left00:13
→ frivol joined00:13
← Gamecubic left00:13
← gregsmith left00:14
← Asenar left00:14
← mizu_no_oto left00:14
→ Gamecubic joined00:14
← mechanicalduck_ left00:14
→ Asenar joined00:15
← whitby left00:15
← kristofferR left00:15
← a_le left00:17
→ a_le joined00:17
→ jave joined00:18
← spareproject left00:18
← jonmorehouse left00:18
→ CKyle joined00:19
← evildmp left00:20
← a_le left00:21
← treehug88 left00:22
← Asenar left00:23
→ Asenar joined00:24
← LLaurent left00:24
← in_deep_thought left00:24
← konr left00:25
Radivarig_ → Radivarig00:26
sqrrl → sq00:27
← Sleepy63 left00:27
→ kukks joined00:28
← CKyle left00:29
→ loz--_ joined00:30
→ codeFiend joined00:30
← codeFiend left00:30
← loz-- left00:31
← atlantan left00:32
← EminenceHC left00:35
→ EminenceHC joined00:35
← durianshredder left00:36
← BuenGenio left00:37
→ dsantiago joined00:39
← EminenceHC left00:40
→ toothrot joined00:40
← pandeiro left00:40
→ pandeiro joined00:41
← dreiss left00:41
→ Sleepy63 joined00:41
← tinti left00:42
→ Lyqyd joined00:43
→ eduardtm joined00:44
→ CKyle joined00:44
→ durianshredder joined00:44
← desposo left00:44
← eduardtm left00:46
← CheckDavid left00:47
← lmat left00:48
→ neonixcoder joined00:49
→ weemsledeux joined00:51
← weemsledeux left00:51
→ weemsledeux joined00:51
→ TheTopBloke joined00:52
← Sasazuka left00:53
← TheTopBloke left00:53
→ tmcmahon joined00:53
← robustus left00:53
→ Sasazuka joined00:54
→ otter768 joined00:55
← kukks left00:55
→ FreezingCold joined00:55
→ yosito joined00:55
← jgardella left00:55
← m0viefreak left00:56
→ robustus joined00:56
← maestrojed left00:57
→ alanwill joined00:58
← skylite left00:58
← Celm left00:59
← tmcmahon left00:59
→ Celm joined01:00
→ a_le joined01:00
← ajustrun left01:00
← Sasazuka left01:00
→ Sasazuka joined01:01
→ BuenGenio joined01:02
→ jgardella joined01:03
← holodoc left01:03
← Celm left01:04
← rylinaux left01:04
→ diegoviola joined01:07
→ rylinaux joined01:07
← freeman42 left01:07
← Radivarig left01:07
→ Goplat joined01:08
→ ghostenter joined01:08
← kballou left01:09
← alexwhitman left01:10
→ waveclaw joined01:10
→ alexwhitman joined01:11
← ghostenter left01:11
← diegoviola left01:11
→ fuli joined01:11
← oojacoboo left01:13
→ oojacoboo joined01:15
← toothrot left01:16
← pheaver left01:17
← hcc23 left01:17
→ brucelee joined01:17
← CKyle left01:18
brucelee i have some changes in staging area so icant do a git pull01:18
how do i just clear the staging area?01:18
→ justinmburrous joined01:19
← mikiones left01:19
→ tokik joined01:20
← Sasazuka left01:20
← justinmburrous left01:20
→ justinmburrous joined01:21
→ znode joined01:21
← d10n-work left01:21
→ ivan\ joined01:22
← ausjke left01:22
← magic left01:23
→ Radivarig joined01:23
→ magic joined01:24
← kaendfinger left01:26
← aidalgol left01:26
← a_le left01:28
brucelee my branch is 1 or 2 ahead of origin master01:28
and i want to git reset it backwards to get rid of my 1 or 2 commits that are ahead01:28
so i do git reset HEAD~201:28
← magic left01:28
brucelee now i have a bunch of stuff thats "modified" in my staging area01:28
and a bunch of stuff that are untracked01:29
what command should i have used instead to go backwards but not end up having all this "modified" and "untracked" stuff?01:29
→ magic joined01:29
→ atlantan joined01:33
← LucasKA left01:33
← seanmerron left01:35
← oojacoboo left01:36
→ skylite joined01:37
→ oojacoboo joined01:37
← quix left01:37
← atlantan left01:37
← neonixcoder left01:38
→ toothrot joined01:38
← diegoaguilar left01:39
← baweaver left01:40
→ aidalgol joined01:40
← meatmanek left01:40
→ NoNMaDDeN joined01:41
→ Celm joined01:41
→ baweaver joined01:41
← durianshredder left01:43
← brucelee left01:45
→ brucelee joined01:45
brucelee can anyone hear me?01:45
← yosito left01:45
← KeelOfSteel left01:45
← baweaver left01:45
← znode left01:46
← NoNMaDDeN left01:47
→ meatmanek joined01:47
← justinmburrous left01:48
→ diegoviola joined01:48
→ nkouevda joined01:49
→ KeelOfSteel joined01:50
← BuenGenio left01:51
← darkbasic_ left01:52
→ Celm_ joined01:53
← alanwill left01:53
→ darkbasic joined01:53
→ bezet joined01:54
→ yosito joined01:55
← ivan\ left01:55
→ dreiss joined01:56
← Celm left01:57
→ fling joined01:58
→ ag4ve joined01:58
← bezet left01:58
→ alanwill joined01:59
→ neonixcoder joined02:00
→ pwnz0r joined02:00
← diegoviola left02:00
→ jpf_ joined02:00
→ MutSbeta joined02:01
→ daito_ joined02:02
← eliasr left02:02
← jpf left02:04
← ValicekB left02:05
← jpf_ left02:05
← RaceCondition left02:05
→ vincentor joined02:06
← neonixcoder left02:06
← dreiss left02:06
← brucelee left02:08
← skylite left02:08
→ Pyrogerg joined02:09
→ zumba_ad_ joined02:10
→ ValicekB joined02:10
← shpoont left02:11
← blubberbop left02:12
← zumba_addict left02:14
← aidalgol left02:15
→ aidalgol joined02:16
→ luc_ joined02:17
→ durianshredder joined02:17
← moritzschaefer left02:19
← Noldorin left02:20
→ watabou joined02:20
→ Sasazuka joined02:21
← KeelOfSteel left02:21
→ KeelOfSteel joined02:22
→ brucelee joined02:23
milki brucelee: !fixup02:25
gitinfo brucelee: 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!02:25
← maletor left02:26
← alvaro_o left02:26
← tokik left02:26
→ ivan\ joined02:28
← sgen_ left02:31
← pbrobst left02:31
→ tokik joined02:31
→ sean__ joined02:32
← Sleepy63 left02:32
→ jayeshsolanki joined02:32
→ atlantan joined02:33
← Dougie187 left02:36
← watabou left02:37
← msonntag left02:37
← atlantan left02:39
→ msonntag joined02:39
→ jason237 joined02:39
← weemsledeux left02:41
→ CKyle joined02:43
← thibaultcha left02:44
→ ajustrun joined02:47
← FreezingCold left02:48
→ iliketurtles joined02:49
→ mizu_no_oto joined02:52
→ P4_Denis joined02:54
← kadoban left02:56
← MattMaker left02:56
→ kadoban joined02:57
← Slush- left02:58
← jstimm left02:59
← P4_Denis left02:59
← toothrot left02:59
← durianshredder left02:59
→ Slush- joined03:00
← ajustrun left03:00
→ Sleepy63 joined03:01
← nb_bez___ left03:02
← msmith_ left03:03
→ rdbell joined03:03
→ msmith_ joined03:05
← jgardella left03:06
← Consuela left03:08
→ a_le joined03:09
← pwnz0r left03:10
→ Consuela joined03:11
← Consuela left03:13
← Celm_ left03:15
→ pwnz0r joined03:16
← alanwill left03:16
→ alanwill joined03:18
← alvaro_o_ left03:19
← a_le left03:19
← solution left03:20
→ a_le joined03:20
→ solution joined03:21
← rvsjoen left03:21
→ pheaver joined03:22
← mizu_no_oto left03:22
← jayeshsolanki left03:22
← LucasTT left03:24
← a_le left03:24
← brucelee left03:26
→ SumDude_ joined03:28
← alanwill left03:29
← moberberger left03:29
→ justinmburrous joined03:29
← CKyle left03:31
→ a_le joined03:31
← SumDude left03:31
← fold left03:31
← robbyoconnor left03:32
→ fold joined03:33
→ TheTopBloke joined03:33
→ SjB joined03:33
→ fatalhalt joined03:35
← a_le left03:35
← TheTopBloke left03:36
← pheaver left03:36
← Turicas left03:37
→ pheaver joined03:37
← FabTG left03:37
→ alanwill joined03:39
→ jgardella joined03:41
← danemacmillan left03:41
← madewokherd left03:41
← rdbell left03:42
→ BuenGenio joined03:44
← msmith_ left03:45
→ brucelee joined03:46
← pheaver left03:47
variable → constant03:47
→ Asiajey joined03:48
→ neonixcoder joined03:48
→ d10n-work joined03:48
← ojacobson left03:49
→ EminenceHC joined03:51
→ FabTG joined03:53
→ bezet joined03:54
← neonixcoder left03:54
→ a_le joined03:55
← EminenceHC left03:56
← FabTG left03:58
→ NoNMaDDeN joined03:58
← zumba_ad_ left03:58
→ zumba_addict joined03:58
← bezet left03:58
← iliketurtles left03:59
← brucelee left03:59
→ neonixcoder joined04:00
← neonixcoder left04:02
← NoNMaDDeN left04:03
← Sasazuka left04:03
→ LucasKA joined04:03
→ moberberger joined04:03
← zumba_addict left04:03
→ armyriad joined04:04
→ jstimm joined04:06
← cgar left04:06
→ kcj joined04:08
→ EminenceHC joined04:08
→ robotomr joined04:09
→ thibaultcha joined04:10
→ robbyoconnor joined04:10
→ King_Hual joined04:11
← SumDude_ left04:11
← pwnz0r left04:11
← EminenceHC left04:13
→ dccc_ joined04:13
← thibaultcha left04:15
← otter768 left04:15
← dccc__ left04:16
→ Celm joined04:16
← Mitchbones left04:17
→ kyb3r_ joined04:18
← wakd left04:18
← moberberger left04:18
→ moberberger joined04:19
← polyzen left04:19
← robotomr left04:20
← daito_ left04:20
← Celm left04:21
← King_Hual left04:22
→ atlantan joined04:22
→ wakd joined04:22
→ eletuchy joined04:23
← robbyoconnor left04:23
→ robbyoconnor joined04:24
→ fairuz joined04:24
← nutron left04:26
← atlantan left04:27
← BuenGenio left04:27
→ BuenGenio joined04:31
→ atlantan joined04:32
→ desposo joined04:34
→ nutron joined04:34
← codeman left04:34
← LucasKA left04:35
← moberberger left04:36
→ ehmatthes joined04:36
← atlantan left04:37
← Juxtapositional left04:37
← nutron left04:37
→ jceb joined04:37
← eletuchy left04:38
← desposo left04:38
→ eletuchy joined04:38
→ chiemseesurfer joined04:39
← Lyqyd left04:39
← robbyoconnor left04:39
→ robbyoconnor joined04:40
→ Juxtapositional joined04:41
← eletuchy left04:42
→ joo-_ joined04:44
→ pwnz0r joined04:44
→ User458764 joined04:45
← aidalgol left04:48
→ QshelTier joined04:48
← Sleepy63 left04:48
← pwnz0r left04:48
← simesy left04:48
← atomx_ left04:48
QshelTier → Bombe04:49
← teran left04:49
← jceb left04:49
→ phoenixz joined04:49
→ unixpro1970 joined04:50
← User458764 left04:52
→ LucasKA joined04:52
← lindenle left04:53
→ User458764 joined04:54
→ kiran joined04:55
→ subhojit777 joined04:55
← jonyfive left04:57
→ NoNMaDDeN joined04:58
← phoenixz left04:59
→ mscook joined05:00
→ tvw joined05:00
← UmbraMalison left05:01
→ blubberbop joined05:01
→ Sleepy63 joined05:02
← tpollard left05:03
→ UmbraMalison joined05:05
← robbyoconnor left05:05
→ robbyoconnor joined05:08
← robbyoconnor left05:09
→ robbyoconnor joined05:09
→ daito joined05:10
← yosito left05:10
← chiemseesurfer left05:10
→ felixjet_ joined05:11
→ JSharpe_ joined05:11
← robbyoconnor left05:11
← felixjet__ left05:14
← JSharpe left05:14
← kiran left05:14
← aucecil left05:15
→ Chinorro joined05:15
→ nnyk_ joined05:16
← agileadam left05:16
→ FabTG joined05:18
→ jceb joined05:20
→ Suchit joined05:20
← joo-_ left05:23
← starkhalo left05:23
→ lindenle joined05:24
→ ryez joined05:24
→ nezZario joined05:25
← Suchit left05:25
nezZario ok05:25
← Goplat left05:25
→ aucecil joined05:26
nezZario I'm desparately trying to get control over this project I just took over. These guys had some parts of the site in repos that were used in some crazy rollout scheme, but most of the project wasn't under VC05:26
I'm wanting to just put the root directory of the site in a git repo, but there are git repo's under that dir tree, is there a way to make the upper repo ignore that fact and keep it under VC normally (but, possibly, not that .git directory)05:27
ryez will there be a repository specific .gitconfig file that could be checked in05:27
→ kiran joined05:27
→ CheckDavid joined05:28
← lindenle left05:28
nezZario all this old stuff is going to go...mainly because i'm reorganizing the server layout as soon as I get a chance..but I need the old repos that live deep under the root dir to exist for now because they're used for staging/deployment05:28
ryez: not sure what you mean?05:30
← eXeC64 left05:31
← User458764 left05:31
nezZario these old repos are pretty much trash...i mean, better than nothing, but they weren't even "real" commits..they just had a script to add/commit all, then push to a remote to use it as an rsync with history i guess05:31
→ Celm joined05:32
← justinmburrous left05:33
→ justinmburrous joined05:34
→ GT4066 joined05:34
→ beautifulmind joined05:35
→ harish joined05:36
→ jpf joined05:39
← beautifulmind left05:39
→ pantsman- joined05:39
→ beautifulmind joined05:40
← LucasKA left05:40
→ joo-_ joined05:41
→ codeman joined05:41
→ ThomasLocke joined05:42
nezZario is it not possible?05:43
git add --dry-run subDirWithRepo/ isn't adding anything since it's a repo.. I tried adding the .git dir to the gitignore but no go05:43
← blubberbop left05:44
← NoNMaDDeN left05:44
→ brandonshowers joined05:44
→ Suchit joined05:46
→ Junior joined05:47
→ evildmp joined05:47
← beautifulmind left05:47
← jceb left05:47
→ beautifulmind joined05:48
→ otakbeku joined05:48
→ hoijuiL joined05:50
→ eXeC64 joined05:50
← jgardella left05:50
→ mihaicris joined05:51
→ FunkyAss joined05:52
→ SwedFTP joined05:53
→ EminenceHC joined05:54
→ bezet joined05:55
→ teran joined05:57
→ Silmarilion joined05:57
→ diegovio1 joined05:58
diegovio1 → diegoviola05:58
← Gamecubic left05:58
← EminenceHC left05:59
← bezet left05:59
← pantsman- left06:00
→ whitby joined06:01
→ iliketurtles joined06:01
→ ciampix joined06:02
← harish left06:04
← scarcry left06:04
→ scarcry joined06:05
→ ra0 joined06:05
← mihaicris left06:05
← unixpro1970 left06:05
← JosephFerano left06:06
→ papegaaij joined06:07
← scarcry left06:07
→ NoNMaDDeN joined06:07
→ JosephFerano joined06:08
→ francisfish joined06:08
← JosephFerano left06:08
→ scarcry joined06:09
→ JosephFerano joined06:10
← Junior left06:10
← fatalhalt left06:10
→ unixpro1970 joined06:12
→ Sora_cl joined06:14
← Sora_cl left06:14
← Mobutils left06:16
→ roelmonnens joined06:17
← beautifulmind left06:19
→ saurabh joined06:19
saurabh → Guest1864706:20
← SjB left06:20
→ yosito joined06:21
→ acolson joined06:21
→ Diaoer joined06:22
→ Junior joined06:22
← Junior left06:22
→ Junior joined06:23
← Junior left06:23
← Diaoer left06:23
→ Junior joined06:23
← Junior left06:23
→ Junior joined06:23
← Junior left06:23
→ beautifulmind joined06:24
→ Junior joined06:24
← Junior left06:24
→ robbyoconnor joined06:24
→ Junior joined06:24
← Junior left06:24
→ Junior joined06:24
← Junior left06:25
← brandonshowers left06:25
→ Junior joined06:25
← Junior left06:25
← evildmp left06:25
→ Junior joined06:25
← yosito left06:25
← Junior left06:25
→ Junior joined06:26
← Junior left06:26
→ Junior joined06:26
← Junior left06:26
→ Junior joined06:26
← Junior left06:26
→ Junior joined06:27
← Junior left06:27
→ Junior joined06:27
← Junior left06:27
← ciampix left06:27
→ Bpit joined06:27
→ jceb joined06:27
→ Junior joined06:27
← Junior left06:28
→ Junior joined06:28
← Junior left06:28
→ Junior joined06:28
← Junior left06:28
← Bpit left06:28
← diegoviola left06:29
→ Pitb joined06:29
→ Junior joined06:29
← Junior left06:29
→ checkers joined06:29
→ Junior joined06:29
← Junior left06:29
checkers hi, is there any way to get the name of the most recent tag in a given branch?06:29
→ rob_w joined06:29
→ Junior joined06:29
← mscook left06:29
← Junior left06:29
→ Junior joined06:30
← Junior left06:30
→ dreiss joined06:30
→ Junior joined06:30
← Junior left06:30
→ Junior joined06:31
← Junior left06:31
bremner roughly speaking, "git describe --tags"06:31
→ Junior joined06:31
← Junior left06:31
→ Junior joined06:31
← Junior left06:31
→ Junior joined06:32
← Junior left06:32
checkers bremner: nice, thanks06:32
→ Junior joined06:32
← Junior left06:32
→ Junior joined06:32
← Junior left06:33
→ Junior joined06:33
← Junior left06:33
→ Junior joined06:33
← Junior left06:33
→ Junior joined06:34
← Junior left06:34
ChanServ set mode: +o06:34
← zmuser3 left06:34
→ ghostlines joined06:34
→ Junior joined06:34
jast set mode: +b06:34
jast kicked Junior (Junior)06:34
← ghostlines left06:34
jast set mode: -b06:35
→ jonmorehouse joined06:36
jast set mode: -o06:36
← neversleepz left06:37
← otakbeku left06:37
checkers bremner: even better: git describe --abbrev=006:37
→ neversleepz joined06:37
← daito left06:39
← robbyoconnor left06:40
bremner jast: I feel like I missed some drama. Join/part spam?06:41
→ robbyoconnor joined06:41
→ weyer joined06:41
← BuenGenio left06:41
← NoNMaDDeN left06:41
← ehmatthes left06:42
← neversleepz left06:42
→ NoNMaDDeN joined06:42
→ zmuser3 joined06:43
→ jottr joined06:43
→ nilg joined06:43
→ daito joined06:44
→ mennea joined06:44
→ Mobutils joined06:45
_ikke_ aparently06:45
Junior (~Juni@unaffiliated/junior) has joined #git06:46
Junior (~Juni@unaffiliated/junior) has quit (Excess Flood)06:46
← nnyk_ left06:46
→ mkaesz joined06:47
→ BuenGenio joined06:49
→ eologolo joined06:50
→ jnavila joined06:53
← checkers left06:53
→ aswen joined06:54
→ Qvazar joined06:54
→ lb1a joined06:54
→ wojtasfs joined06:54
← codeman left06:56
← joo-_ left06:57
→ yarco joined06:57
→ EminenceHC joined06:57
→ codecutter joined06:58
→ joo-_ joined07:00
→ PinkSpecs joined07:01
← codecutter left07:01
← jottr left07:02
→ groolot joined07:02
← EminenceHC left07:02
← groolot left07:04
→ jargon joined07:04
← oojacoboo left07:04
→ ciampix joined07:04
← francisfish left07:05
→ avvs joined07:05
→ jenni_naiaretti joined07:05
→ oojacoboo joined07:06
→ flowinho joined07:06
← Juzzika left07:07
→ jottr joined07:07
→ TomyWork joined07:08
→ zanchoPansa joined07:08
→ evildmp joined07:09
→ jagob joined07:10
← zanchoPa1sa left07:11
→ neversleepz joined07:12
← sean__ left07:13
← tirengarfio left07:13
→ justinmb_ joined07:14
← mennea left07:14
→ x0s_ joined07:14
← jenni_naiaretti left07:14
← sohail left07:14
← BuenGenio left07:14
→ mennea joined07:14
→ tirengarfio joined07:16
→ tirengarfio_ joined07:16
→ zoso joined07:17
← beautifulmind left07:17
← luc_ left07:17
→ encod3 joined07:18
← justinmburrous left07:18
→ BuenGenio joined07:18
← Lunatrius left07:19
→ Lunatrius joined07:19
→ Raging_Hog joined07:20
→ nnyk_ joined07:20
→ luc_ joined07:20
← yarco left07:20
→ LeMike joined07:21
← jonmorehouse left07:21
→ weemsledeux joined07:23
← weemsledeux left07:23
→ weemsledeux joined07:23
→ dangerousdave joined07:23
→ alorence joined07:24
→ ki0 joined07:24
→ gua_ould joined07:24
→ mueslo joined07:24
← neversleepz left07:25
→ neversleepz joined07:25
→ cbr_ joined07:26
→ petersr joined07:27
← neversleepz left07:30
→ User458764 joined07:31
→ beautifulmind joined07:33
← dangerousdave left07:34
→ mikiones joined07:34
← revolve left07:34
→ mechanicalduck joined07:35
→ Novitsh_ joined07:37
← mikiones left07:39
→ skylite joined07:39
→ fairuz1 joined07:40
→ ferreum_ joined07:41
← fairuz left07:41
→ yarco joined07:44
← User458764 left07:44
← kwc left07:45
→ punchagan joined07:46
← Asiajey left07:46
→ GGflags joined07:46
→ khmarbaise joined07:47
→ Asiajey joined07:47
→ hexagoxel joined07:48
← Celm left07:49
← jorj left07:50
← evildmp left07:51
→ Warrior-kk joined07:51
← punchagan left07:51
gitinfo set mode: +v07:51
wojtasfs Hello, i have local gitolite v3.x server which i would like to use as a mirror to gitlab origin. How can i achieve that? Gitolite ssh user is gitolite and gitlab user is git07:51
jast bremner: no drama, just protecting us from many status messages, and the ban is long gone :)07:52
→ blackmes1 joined07:53
→ mikiones joined07:54
→ Celm joined07:54
yarco how to get parent controller's state in sub template (for example, route = index/node, i want to use `IndexController.hide` in node template)07:55
_ikke_ yarco: wrong channel07:55
→ bezet joined07:55
yarco sorry07:55
← mennea left07:55
→ evildmp joined07:55
→ mennea joined07:56
← jottr left07:56
_ikke_ yarco: No problem, but other channels might give you better help ;-)07:56
yarco :) , you are right.07:57
_ikke_ wojtasfs: You could use gitlab webhooks to trigger the mirror repo to update07:57
→ seschwar_ joined07:57
← mikiones left07:58
wojtasfs i would like to use gitolite and pre-fetch hook, but first i need to be able gitolite to connect to gitlab, and this is where i have problem already07:58
← dreiss left07:59
→ mikiones joined07:59
← bezet left08:00
→ EminenceHC joined08:00
→ jpf_ joined08:01
→ jottr joined08:01
← daito left08:02
← nikita left08:02
← mikiones left08:03
→ daito joined08:04
→ nikita joined08:04
← jpf left08:04
→ W0rmDr1nk joined08:04
← EminenceHC left08:05
→ autonomousdev joined08:05
→ psoo joined08:05
→ intellix joined08:05
← Asiajey left08:06
← blackmes1 left08:06
→ khmarbaise_ joined08:06
← khmarbaise_ left08:06
→ khmarbaise_ joined08:06
→ rchavik joined08:07
→ zumba_addict joined08:07
→ francisfish joined08:08
→ thiago joined08:08
← khmarbaise left08:08
khmarbaise_ → khmarbaise08:08
← Celm left08:08
→ darkbasic_ joined08:08
← darkbasic left08:09
→ jenni_naiaretti joined08:10
→ ghostlines joined08:10
← plushwork left08:10
→ aidalgol joined08:10
→ shpoont joined08:11
← beautifulmind left08:13
← skylite left08:13
→ mikiones joined08:14
→ maqr joined08:14
← weyer left08:14
→ weyer joined08:14
→ nour joined08:15
→ kriks joined08:15
sitaram wojtasfs: I don't know how gitlab works but I suspect (a) create a gitlab user who is allowed to read the repo you want (b) copy those ssh keys across to gitolite server and put them in ~/.ssh should allow the gitolite user to fetch from gitlab no?08:16
→ King_Hual joined08:16
wojtasfs sitaram, so i made it, but how can i specify in gitolite to connect to remote server as a git user not gitolite ?08:16
← boombatower left08:17
← weyer left08:17
sitaram wojtasfs: that's got nothing to do with gitolite. In the PRE_GIT trigger in gitolite you just say "git fetch gitlab@host:reponame" or something like that I suppose08:17
→ Wiz_KeeD joined08:17
sitaram gitolite has no role here, though you're using the gitolite **hosting user** as a **client** for gitlab08:17
guardian morning, every time I git fetch, it says it needs to git gc. But doesn't launch git gc. When I launch git gc manually, everything seems to go well and nexte time I git fetch it stills tell me it needs to git gc without actually doing it08:18
→ brucelee joined08:18
→ weyer joined08:18
→ groolot joined08:20
← daito left08:20
← glebihan left08:21
wojtasfs sitaram: ok thanks, i will give a try08:21
→ jaggz- joined08:22
jaggz- okay.. so I have a folder of files and I want to create a bare repository at /foo/bar/ .. and then get all my files committed to it..08:23
osse guardian: there is a bug where git will discover it needs to gc, but the gc doesn't fix it. can't remember the solution:/08:23
jaggz- what's the step to get the current directory of files to be considered a checked-out version of a bare repo?08:24
← justinmb_ left08:24
tobiasvl jaggz-: a bare repo doesn't have a "checked-out version". that's why it's !bare08:24
gitinfo jaggz-: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/08:24
osse jaggz-: git --git-dir=path/to/there --work-tree=/path/to/somewhere status08:24
jaggz- mkdir bare_repo; cd bare_repo; git init --bare; cd /path/non_repo_project ...08:25
→ blackmes1 joined08:25
→ daedeloth joined08:26
jaggz- gitinfo: bad url08:26
→ Kicer86 joined08:26
← aidalgol left08:26
jaggz- tobiasvl: hmm? but I mean, remote (or in this case, in another dir), I'll have the "checked out"08:26
wojtasfs where can i find hooks manual for gitolite3 ?08:26
→ punchagan joined08:27
wojtasfs and how should i control repo hooks using gitolite-admin repository ?08:28
jaggz- I want to create a new /path/git/my_repo and then /somewhere/my_project my_project is a bunch of existing files, and I want them in the repo, and then checked out08:28
← evildmp left08:28
← teran left08:28
← alanwill left08:28
→ aidalgol joined08:29
osse then do what I said08:29
specify --work-tree and --git-dir08:29
jaggz- work-tree is the existing files, and git-dir is the bare repo?08:29
← shpoont left08:30
osse you can also use environment variables.08:30
yes08:30
→ liamkeily joined08:30
jaggz- do I need anything else on the git line you gave? it's not being accepted.. perhaps no command?08:32
← aucecil left08:32
→ martinklepsch joined08:33
osse I wrote status at the end08:34
← iliketurtles left08:34
jaggz- man.. completely blind to that.. weird..08:34
thanks08:34
sorry08:34
← hexagoxel left08:34
→ P4_Denis joined08:34
→ silence-simple joined08:35
← blackmes1 left08:35
← Mobutils left08:36
jaggz- that doesn't create a .git folder in the work-tree though, so git add complains (that it's not a repository).. it does show all the untracked files/folders in the current dir though.08:36
← petersr left08:36
← nikita left08:36
→ daito joined08:37
osse jaggz-: you need --git-dir and --work-tree for all commands08:38
jaggz- ohh...08:38
→ DarkKnightCZ joined08:38
jaggz- that's not normal though right? so what if I create a bare repo, check it out in a new dir, copy all my files over and git add them and commit?08:39
→ nikita joined08:39
osse what's not normal ?08:39
jaggz- I don't normally need to specify those for all commands08:40
→ bezet joined08:40
osse correct08:40
because usually .git inside the work tree and you are inside the work tree when you run git.08:40
→ punchagan1 joined08:40
→ evildmp joined08:41
← robbyoconnor left08:43
wojtasfs anyone? where should i create gl-pre-git hook file ? i tried in /var/lib/gitolite3: hooks/reponame/gl-pre-git , repositories/reponame/hooks/gl-pre-git but none of them work08:43
and of course +x mode has been set08:43
→ dangerousdave joined08:43
→ skylite joined08:43
← jpf_ left08:43
← punchagan left08:43
← liamkeily left08:44
jaggz- so I did: cd /new/goal/repo; git init --bare; git clone /new/goal/repo /new_working; mv /non_git_working/* /new_working/08:44
→ blackmes1 joined08:44
→ shigosei joined08:44
tobiasvl wojtasfs: sounds like a #gitolite question, that's neither a standard git hook nor a standard git hook location08:44
jast tobiasvl: it's part of an ongoing conversation, partially involving the gitolite maintainer :}08:45
osse jaggz-: if you use clone then you have to repos anyway, and no need to mess with those options. use git as normal and then push08:45
tobiasvl oh ;)08:45
← joo-_ left08:46
← weemsledeux left08:47
→ liamkeily joined08:47
→ robbyoconnor joined08:47
→ weemsledeux joined08:47
← weemsledeux left08:47
→ weemsledeux joined08:47
→ skylite_ joined08:47
→ Embassy joined08:48
→ Trudko joined08:48
→ Gizburdt joined08:49
← martinklepsch left08:50
→ anaran joined08:51
← ki0 left08:51
jaggz- osse, hmm.. but git understands the repo is /new/goal/repo ..08:51
← joki left08:51
← d10n-work left08:51
← zarubin left08:51
jaggz- hmm.. what am I missing in my understanding here..08:52
isn't that normal? you clone from a remote.. get a complete copy of the repo, and when you commit, the changes go to the remote08:52
tobiasvl when you push, your commits go to the remote08:52
you commit locally08:53
→ ki0 joined08:53
← dangerousdave left08:53
jaggz- oh, right.. thank you :)08:53
so, I could technically avoid having the duplicate repo information (.git dir) by using the --git-dir and --work-tree (or environmental) overrides08:54
but in this case I want it to be unimportant that the origin is local.. I might move it to another computer08:54
and in that case I'd need the complete local clone anyway, correct?08:54
→ teran joined08:54
osse yes08:55
← unixpro1970 left08:55
jaggz- interesting. options options... thank you very much for your help and patience with me.08:55
→ simesy joined08:56
→ codecutter joined08:56
← whitby left08:56
→ joki joined08:56
→ iliketurtles joined08:57
← iliketurtles left08:57
→ ladislaw joined08:58
← teran left08:58
← silence-simple left08:59
→ hexagoxel joined09:00
← simesy left09:00
← liamkeily left09:00
← codecutter left09:01
← staafl left09:02
← ciampix left09:02
← Gizburdt left09:02
← groolot left09:03
→ Gizburdt joined09:03
→ iamjarvo joined09:03
→ skylite__ joined09:03
← DarkKnightCZ left09:04
→ User458764 joined09:04
← sebumd left09:04
← skylite_ left09:05
← punchagan1 left09:06
→ punchagan joined09:06
→ EminenceHC joined09:06
← mennea left09:06
→ mennea joined09:07
← NoNMaDDeN left09:07
← Gizburdt left09:07
→ NoNMaDDeN joined09:07
→ RaceCondition joined09:08
← Embassy left09:09
→ aucecil joined09:09
← jstimm left09:10
← jimmyy left09:10
→ sohail joined09:11
← EminenceHC left09:11
← anaran left09:12
→ D4v33__ joined09:14
→ dangerousdave joined09:14
→ joo-_ joined09:14
→ teran joined09:14
← autonomousdev left09:14
→ FrancescoV joined09:14
← FrancescoV left09:14
← sohail left09:15
← PinkSpecs left09:16
→ arup_r joined09:16
← D4v33_ left09:16
→ PinkSpecs joined09:18
sitaram wojtasfs: "gl-pre-git" is v2. Not supported. V3 has been out for more than 2.5 years now09:18
→ glebihan joined09:18
→ Embassy joined09:18
wojtasfs @sitaram, yeah found it out, i am using v3. struggling with this, but i will continue subject in gitolite channel09:19
← teran left09:20
→ evildmp_ joined09:20
← alexwhitman left09:23
← evildmp left09:23
→ vtunka joined09:23
→ ockham joined09:24
→ alexwhitman joined09:26
→ moritzschaefer joined09:27
→ Mobutils joined09:27
→ threenuc joined09:29
← evildmp_ left09:29
← khmarbaise left09:32
→ eliasr joined09:33
← darkbasic_ left09:34
→ darkbasic joined09:35
← weemsledeux left09:36
← mennea left09:36
→ cvanball joined09:37
→ mennea joined09:37
← thiago left09:40
→ nick1234 joined09:41
→ Holden joined09:42
Holden → Guest594809:43
← ladislaw left09:43
← nick1234 left09:45
→ dotpot joined09:47
← BuenGenio left09:48
← skylite__ left09:49
← tvw left09:50
→ teran joined09:51
→ teran_ joined09:52
← iamjarvo left09:52
→ tvw joined09:53
→ simesy joined09:56
← teran left09:56
→ nettoweb joined09:58
→ evildmp joined10:00
← simesy left10:01
→ atomx joined10:01
← joo-_ left10:01
→ FreezingCold joined10:01
← evildmp left10:01
← tokik left10:01
← dangerousdave left10:02
← Guest5948 left10:03
← jottr left10:05
← aidalgol left10:06
← mennea left10:07
→ mennea_ joined10:07
→ evildmp joined10:07
← evildmp left10:07
→ SumDude_ joined10:07
→ stamina joined10:08
← dalafa left10:08
→ evildmp joined10:08
→ dalafa joined10:08
→ EminenceHC joined10:08
← robbyoconnor left10:09
→ gain joined10:09
→ joo-_ joined10:09
→ robbyoconnor joined10:10
← kadoban left10:10
← evildmp left10:10
→ evildmp joined10:11
← Warrior-kk left10:11
← bezet left10:11
→ petersr joined10:12
← SumDude_ left10:12
← ferreum_ left10:13
← alexwhitman left10:13
← EminenceHC left10:13
→ curiousmansi_ joined10:14
→ nilg` joined10:14
→ alexwhitman joined10:15
← nilg left10:15
← maqr left10:15
← ki0 left10:16
→ ferreum_ joined10:16
→ ki0 joined10:16
← wojtasfs left10:18
→ mkoskar joined10:20
← israelpattison left10:20
→ israelpattison joined10:21
→ brammm joined10:22
← GarethAdams left10:23
← blackmes1 left10:23
← MutSbeta left10:26
← tgunr left10:28
← Embassy left10:29
→ GarethAdams joined10:29
→ BlaXpirit joined10:29
→ wojtasfs joined10:30
← mkoskar left10:31
→ jottr joined10:31
← kyb3r_ left10:31
← punchagan left10:31
← lazors left10:32
← ruukasu left10:32
← daito left10:34
→ beautifulmind joined10:35
→ seanmerron joined10:36
← jottr left10:36
← joo-_ left10:36
→ punchagan joined10:36
→ bezet joined10:37
← mennea_ left10:37
→ mennea joined10:37
← luc_ left10:38
→ danemacmillan joined10:38
← evildmp left10:38
← fairuz1 left10:39
← atomx left10:40
→ evildmp joined10:40
→ mkoskar joined10:40
← fuli left10:42
→ simesy joined10:42
→ Not_Whatever joined10:42
→ spareproject joined10:43
→ kwc joined10:44
← punchagan left10:44
← wojtasfs left10:45
← nkouevda left10:46
→ palcu joined10:46
← mikiones left10:46
→ joo-_ joined10:46
→ mscook joined10:47
← simesy left10:47
← Tuna-Fish left10:48
→ Tuna-Fish joined10:48
→ numdig joined10:50
← NoNMaDDeN left10:51
← joo-_ left10:54
→ martinklepsch joined10:55
← cbr_ left10:56
← rchavik left10:56
→ carandraug joined10:58
← vincentor left10:58
→ mikiones joined11:00
→ autonomousdev joined11:01
→ nfk joined11:02
← kcj left11:02
← mikiones left11:04
← CussBot left11:04
→ mikiones joined11:04
→ netcarver joined11:05
← kwc left11:05
→ dangerousdave joined11:06
← mennea left11:07
→ mennea joined11:07
← evildmp left11:08
→ CussBot joined11:08
← knoch left11:08
→ evildmp joined11:09
→ Embassy joined11:10
← UmbraMalison left11:10
→ Celm joined11:10
→ mizu_no_oto joined11:10
→ maqr joined11:11
→ sohail joined11:11
← netcarver left11:12
→ BuenGenio joined11:12
→ rchavik joined11:13
→ chiromante joined11:13
→ UmbraMalison joined11:14
← d33tah left11:14
→ cbr_ joined11:14
← Celm left11:14
→ EminenceHC joined11:14
← zoso left11:15
← sohail left11:16
← Embassy left11:16
← maqr left11:16
← joelm left11:16
← martinklepsch left11:17
→ joelm joined11:17
→ Embassy joined11:17
→ arup_r_ joined11:18
← dccc_ left11:18
← intellix left11:18
← ghostlines left11:19
← EminenceHC left11:19
→ d33tah joined11:19
→ ghostlines joined11:20
← mscook left11:21
← arup_r left11:22
← brucelee left11:23
→ pyrobisqit joined11:23
→ teran joined11:25
← pyrobisqit left11:25
→ jstimm joined11:25
→ pyrobisqit joined11:25
← RaceCondition left11:26
← Embassy left11:27
← Novitsh_ left11:27
← teran_ left11:28
→ wojtasfs joined11:28
→ lindenle joined11:29
Wiz_KeeD → pcatinean11:30
← evildmp left11:32
→ kopparam joined11:33
← lindenle left11:33
→ jdmf joined11:34
← comps left11:34
→ cgar joined11:35
← UmbraMalison left11:36
→ Droolio joined11:37
← kopparam left11:37
← mennea left11:37
→ mennea joined11:37
→ toothrot joined11:38
← jenni_naiaretti left11:39
→ jenni_naiaretti joined11:40
← palcu left11:40
→ palcu joined11:40
→ evildmp joined11:40
← zyla left11:41
→ zyla joined11:41
→ maqr joined11:41
← User458764 left11:42
← Guest18647 left11:42
→ simesy joined11:43
→ alp82 joined11:43
← alp82 left11:44
→ FunkybAss joined11:44
← palcu left11:45
← FunkyAss left11:45
→ alicef joined11:46
← maqr left11:46
→ justinmburrous joined11:47
→ nkouevda joined11:47
← simesy left11:47
→ Juzzika joined11:48
alicef how to import svn tags trunk and branch from svn in git way11:48
← alexwhitman left11:49
→ CKyle joined11:49
← ghostlines left11:50
← dangerousdave left11:50
← evildmp left11:51
→ ghostlines joined11:51
← nkouevda left11:51
← justinmburrous left11:51
→ dangerousdave joined11:52
→ alexwhitman joined11:54
→ NoNMaDDeN joined11:55
Jupelius All remote tracking branches shown in red can be safely deleted?11:56
osse no11:56
tobiasvl well, define "safely"11:56
but the color just means they're remote tracking11:56
Jupelius Ah11:56
← jenni_naiaretti left11:56
tobiasvl not that they "can be safely deleted", whatever that means11:57
Jupelius 'git branch -r' listst branches that have been deleted from origin a while ago11:57
osse unless you use git in a weird way they *can* actually be safely deleted. but they will repappear next time you fetch :p11:57
Jupelius: ahh. git fetch --prune takes care of that11:57
← petersr left11:57
→ jenni_naiaretti joined11:57
osse you can even configure that to be default11:58
Jupelius Great, thanks11:58
→ intellix joined11:58
← CKyle left11:59
→ fstd_ joined12:00
← fstd left12:00
fstd_ → fstd12:00
→ martinklepsch joined12:01
→ cannonball joined12:01
→ inad922 joined12:02
← eliasr left12:02
inad922 If I want to recreate a local branch do I just do "git branch -d <branch_name>; git checkout -b <branch_name>"?12:02
osse yes12:03
← tirengarfio left12:03
osse you might want to use branch -D12:03
in which case you can do git checkout -B as a shorthand12:04
→ tirengarfio joined12:04
← tirengarfio left12:04
← tvw left12:05
→ tirengarfio joined12:05
← arup_r_ left12:06
← mennea left12:07
→ mennea joined12:08
← subhojit777 left12:09
← PinkSpecs left12:10
← cagedwisdom left12:10
→ Celm joined12:11
← roelmonnens left12:11
→ spatialbrew joined12:12
→ roelmonnens joined12:12
→ dccc_ joined12:14
← mizu_no_oto left12:14
→ evildmp joined12:14
→ vurma joined12:14
← Celm left12:15
← threenuc left12:16
→ AaronMT joined12:16
← roelmonnens left12:17
← pyrobisqit left12:17
← cvanball left12:17
→ EminenceHC joined12:17
robustus → robustus|Off12:18
→ roelmonnens joined12:18
← roelmonnens left12:19
→ roelmonnens joined12:19
→ luc__ joined12:20
→ subhojit777 joined12:20
← intellix left12:21
← EminenceHC left12:22
← rchavik left12:22
cbreak alicef: man git-svn, look at -s12:22
gitinfo alicef: the git-svn manpage is available at http://jk.gs/git-svn.html12:22
← chiromante left12:24
← subhojit777 left12:25
→ PinkSpecs joined12:26
→ agileadam joined12:26
← evildmp left12:27
← agileadam left12:27
→ Embassy joined12:27
→ User458764 joined12:29
→ CKyle joined12:30
← luc__ left12:30
← King_Hual left12:30
→ King_Hual joined12:31
→ BlakeRG joined12:31
← Cheaterman1 left12:31
→ jerius joined12:32
← curiousmansi_ left12:33
← Embassy left12:33
← mikiones left12:33
← ghostlines left12:33
inad922 osse: thanks12:34
I didn't know about checkout's -B flag12:34
guardian osse: I'll google for that gc bug, thx12:34
inad922 Basically it's does what my 2 commands would do I guess12:34
robustus|Off → robustus12:35
← nilg` left12:35
→ ghostlines joined12:35
← bezet left12:36
→ lsiv568 joined12:36
← Raging_Hog left12:37
← mennea left12:37
→ arup_r joined12:37
← jerius left12:37
→ mennea joined12:37
← yarco left12:38
→ palcu joined12:38
← BuenGenio left12:38
→ autochthon joined12:38
→ metRo_ joined12:38
→ hcc23 joined12:38
← lsiv568 left12:39
→ evildmp joined12:39
→ yarco joined12:40
← yarco left12:40
→ atlantan joined12:40
→ arup_r_ joined12:40
→ yarco joined12:40
→ kcj joined12:41
→ maqr joined12:42
→ polyzen joined12:42
← Suchit left12:43
→ Suchit joined12:43
← arup_r left12:43
→ simesy joined12:44
→ bezet joined12:44
← CKyle left12:45
→ lsiv568 joined12:45
osse inad922: yes12:45
← jenni_naiaretti left12:45
→ subhojit777 joined12:45
osse guardian: how many files are there in .git/objects/17 ?12:46
→ Sebtoast joined12:46
→ jenni_naiaretti joined12:46
← maqr left12:46
← Suchit left12:47
→ nkouevda joined12:48
← lsiv568 left12:48
← simesy left12:48
→ lsiv568 joined12:48
→ fuli joined12:49
← stamina left12:50
← fuli left12:50
→ fuli joined12:50
← canton7 left12:51
→ tristanp joined12:51
→ charon joined12:52
← charon left12:52
→ charon joined12:52
← nkouevda left12:52
→ EvRburnt joined12:53
→ canton7 joined12:53
← canton7 left12:53
→ canton7 joined12:53
→ mat__ joined12:54
→ jgardella joined12:54
mat__ → Guest6903812:54
← Guest69038 left12:55
→ Gizburdt joined12:55
← fuli left12:55
→ tvw joined12:58
← kcj left12:58
← lsiv568 left12:58
← x0s_ left12:59
← toothrot left12:59
→ tmcmahon joined12:59
→ x0s_ joined12:59
→ lsiv568 joined13:00
← lsiv568 left13:00
← govg left13:00
→ groolot joined13:01
→ lsiv568 joined13:01
← rob_w left13:01
← User458764 left13:02
← tmcmahon left13:02
→ Aune joined13:02
→ govg joined13:02
← lb1a left13:03
→ Embassy joined13:03
← atlantan left13:04
→ msmith_ joined13:04
→ lasers joined13:05
→ jottr joined13:05
→ User458764 joined13:05
← evildmp left13:06
← palcu left13:06
→ palcu joined13:07
← mennea left13:07
→ mennea joined13:08
EvRburnt I13:09
← FunkybAss left13:09
← lsiv568 left13:09
EvRburnt how do I put color to my name not text13:09
← taptapdan left13:09
→ atlantan joined13:10
canton7 huh?13:10
→ shinnya joined13:10
→ lsiv568 joined13:11
→ RaceCondition joined13:11
→ Celm joined13:11
→ tesaf joined13:11
← jgardella left13:12
← Embassy left13:12
→ Embassy joined13:12
→ mizu_no_oto joined13:13
← Tuna-Fish left13:14
→ Tuna-Fish joined13:15
← lsiv568 left13:15
→ lsiv568 joined13:16
← Celm left13:16
→ SonikBoom joined13:16
← jenni_naiaretti left13:17
→ clayball joined13:18
→ mezod joined13:18
← Gizburdt left13:18
→ Gizburdt joined13:19
→ EminenceHC joined13:20
← atlantan left13:20
← inad922 left13:23
→ livingstn joined13:25
← EminenceHC left13:25
→ totte joined13:26
← lsiv568 left13:27
→ lsiv568 joined13:27
← jargon left13:29
→ jenni_naiaretti joined13:29
→ fgqvne joined13:30
← User458764 left13:30
→ jargon joined13:30
→ lindenle joined13:31
→ CKyle joined13:31
← kermit left13:32
← livingstn left13:32
→ kermit joined13:32
← groolot left13:33
→ livingstn joined13:33
← lsiv568 left13:34
← bezet left13:34
cbreak EvRburnt: git doesn't support colored names in commit messages13:34
bremner you can hard code VT100 escape codes ;)13:35
→ Dougie187 joined13:36
bremner you might get fired, but that wasn't the question ;).13:36
← lindenle left13:36
→ mellernoia joined13:36
→ Ankhers joined13:37
← mennea left13:37
grawity yeah, you can basically do something like https://github.com/EugeneKay/test/commit/cbe5378fadf8011c08cbe33df7db38f8d10f510013:37
→ atomx joined13:37
→ mennea joined13:38
osse actually, you can't13:38
git show will print a commit message in color, but not the author name13:38
→ atlantan joined13:39
osse I tried git commit -m "$(tput setaf 1)Foo" --author="$(tput setaf 1)bar"13:40
git show will show Foo in color, but not the author.13:40
← CKyle left13:41
→ UmbraMalison joined13:41
bremner this is clearly an enterprise critical feature. Also, why no animated gif avatars?13:41
← robbyoconnor left13:41
← Gizburdt left13:41
→ robbyoconnor joined13:42
osse I agree with those opinions. Both the explicit and implicit13:42
← EvRburnt left13:42
→ Gizburdt joined13:43
→ ruukasu joined13:43
→ maqr joined13:43
→ simesy joined13:44
→ yosito joined13:44
→ Gamecubic joined13:45
← dangerousdave left13:45
→ ZoeB joined13:46
← psoo left13:46
ZoeB Hi! Is there an easy to find out what branch I was working on Tuesday afternoon?13:46
→ dangerousdave joined13:47
← maqr left13:47
→ intellix joined13:48
osse ZoeB: try git show 'HEAD@{3 days ago}'13:48
grawity `git log -g HEAD` or `git checkout HEAD@{last.tuesday}` should work13:48
← mennea left13:48
ZoeB Wonderful, thank you! :D13:49
← simesy left13:49
→ Neozonz joined13:49
← _Vi left13:50
← Gizburdt left13:51
← yarco left13:52
← tinanoo left13:52
→ yarco joined13:53
← yarco left13:53
→ mennea joined13:53
→ yarco joined13:53
← yarco left13:53
→ lb1a joined13:54
→ yarco joined13:54
← yarco left13:54
→ blackmes1 joined13:54
→ yarco joined13:54
← yarco left13:55
← tristanp left13:55
→ yarco joined13:55
← yarco left13:55
→ SpaghettiCat joined13:55
→ yarco joined13:55
← yarco left13:55
→ yarco joined13:56
← yarco left13:56
← nettoweb left13:56
← BlaXpirit left13:56
→ yarco joined13:56
← yarco left13:57
← CheckDavid left13:57
← atlantan left13:57
→ yarco joined13:57
← yarco left13:57
→ SpaghettiCat_ joined13:57
→ yarco joined13:58
← yarco left13:58
← arup_r_ left13:58
→ yarco joined13:59
← yarco left13:59
→ yarco joined13:59
→ evildmp joined13:59
← yarco left13:59
← SpaghettiCat_ left13:59
→ tinanoo joined13:59
← evildmp left13:59
→ yarco joined14:00
← yarco left14:00
→ t4nk304 joined14:00
← Juxtapositional left14:00
→ yarco joined14:00
← yarco left14:00
← blackmes1 left14:01
← palcu left14:01
→ Juxtapositional joined14:01
← t4nk304 left14:01
→ yarco joined14:01
→ mike_af joined14:01
← mike_af left14:01
→ mike_af joined14:01
← SpaghettiCat left14:01
→ treehug88 joined14:01
→ jacob___ joined14:02
jacob___ hello14:02
gitinfo jacob___: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.14:02
→ SpaghettiCat joined14:02
jacob___ i am looking for the orginal git website, but i am confused , it seems to be associated with github14:02
this is the site? http://git-scm.com/14:02
canton7 there isn't really an official website14:03
→ Vampire0 joined14:03
canton7 ^ that's the closest we've got, and it's very got, but it's not official14:03
it's run by a guy from github (who's also heavily involved in git dev)14:03
*very good14:03
← Trudko left14:04
bremner got good git?14:04
← hyperair left14:04
→ hyperair joined14:04
→ shizzle joined14:04
← treehug88 left14:05
SpaghettiCat Good afternoon, I non-fast-forward-merged a local branch 'foo' into 'next', then deleted 'foo', then pushed. 3 monhs later, how can I undo that 'foo' branch now (as the branch doesn't exist anymore14:05
)?14:05
→ atlantan joined14:05
→ evildmp joined14:05
→ IIT joined14:05
← ZoeB left14:05
← evildmp left14:05
← granden_ left14:06
jacob___ o cmon,.., who maintains git? and do they have a website ?14:06
→ evildmp joined14:06
jacob___ if you say there is no offficial website, that makes no sense to me14:06
← evildmp left14:06
SpaghettiCat jacob___: kernel.org I presume14:07
→ evildmp joined14:07
canton7 jacob___, there's an official repository :P14:07
← Malsasa left14:07
← evildmp left14:07
grawity people these days...14:07
← seanmerron left14:08
grawity "if it doesn't have a website, then it doesn't exist"?14:08
canton7 and official manpages. then there's the semi-official website, the semi-official book, etc14:08
← UmbraMalison left14:08
bremner sometimes real life makes no sense. that is true.14:08
Eugene ! list14:08
SpaghettiCat jacob___: here you go, the extra official "website": https://git.kernel.org/cgit/git/git.git/14:08
→ evildmp joined14:08
← msmith_ left14:08
jast the maintainer is Junio Hamano14:08
Eugene Damned phone. !list14:08
gitinfo [!official] Some official resources for git. Homepage: http://git-scm.com/ | Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) | IRC channel: You're in it. | Mailing list: http://vger.kernel.org/vger-lists.html#git14:08
← evildmp left14:08
osse The maintainer proposed to make the de facto official webpage into the official webpage. Don't know what happened to it.14:09
Eugene of those, only the repo and list are officially official14:09
jast his website is http://git-blame.blogspot.com/ :}14:09
osse but I guess that means that it's slightly more de facto official14:09
Eugene git-badge14:10
For managing officials14:10
→ Cheaterman1 joined14:10
← jstimm left14:11
→ bezet joined14:11
→ smerron joined14:12
← eologolo left14:12
→ sohail joined14:12
→ ciampix joined14:12
→ Malsasa joined14:13
→ Shusshu joined14:13
← nikita left14:14
← beautifulmind left14:14
← jottr left14:14
← jck left14:14
← nnyk_ left14:14
← kcm1700_ left14:14
→ kcm1700 joined14:14
osse for the bored and curious: http://thread.gmane.org/gmane.comp.version-control.git/24594514:14
← shizzle left14:15
osse For the even more bored: http://thread.gmane.org/gmane.comp.version-control.git/24594514:15
← joelm left14:15
osse I mean http://media.tumblr.com/tumblr_lanj33OYmK1qb25dg.jpg14:15
→ jck joined14:15
→ nikita joined14:16
← weyer left14:16
→ nnyk_ joined14:16
→ ArSn joined14:16
← Shusshu left14:17
→ joelm joined14:18
Eugene I like that infographic, but hate the jpg. PNG represent14:18
osse Eugene: just for you (and a buddy of mine I gave it to a couple of hours ago): http://needsmorejpeg.com/i/bso6.jpeg14:19
ChanServ set mode: +o14:19
← ajf- left14:20
Eugene kicked osse (Crimes against graphics)14:20
Eugene set mode: -o14:20
→ eletuchy joined14:20
← SpeakerToMeat left14:21
→ osse joined14:22
← mennea left14:23
→ mennea joined14:23
→ [diablo] joined14:24
→ palcu joined14:24
→ EminenceHC joined14:24
bremner now we see the violence inherent in the system14:24
← palcu left14:24
← Qvazar left14:25
→ codetroll joined14:25
→ palcu joined14:25
← livingstn left14:25
osse *sigh*14:26
osse goes to youtube14:26
← alorence left14:27
→ metts joined14:27
→ jwhite007 joined14:27
osse I didn't vote for Eugene14:27
← cdleonard left14:27
← King_Hual left14:28
← jwhite007 left14:28
→ King_Hual joined14:28
← EminenceHC left14:29
→ lsiv568 joined14:30
→ FunkyAss joined14:30
→ jiskiras joined14:31
→ SumDude joined14:31
→ ajf- joined14:32
← atlantan left14:32
← jagob left14:32
← dangerousdave left14:33
← hebz0rl left14:33
→ punchagan joined14:33
→ atlantan joined14:34
→ dangerousdave joined14:35
← papegaaij left14:35
→ papegaaij_ joined14:35
→ irqq joined14:36
→ mihaicris joined14:37
→ TheTopBloke joined14:37
← ki0 left14:38
← Radivarig left14:38
irqq how do I create a sharable master git repository with push rights to selected users on a local system?14:38
→ Radivarig joined14:38
← skylite left14:39
→ skylite joined14:39
Eugene !gitolite14:39
gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/14:39
→ StarManta joined14:40
→ ki0 joined14:40
irqq but without gitolite? Just to make sure the "remote" repo, but on local system is sharable between several users having acounts on this system14:41
→ jottr joined14:41
← lb1a left14:41
← TheTopBloke left14:41
bremner well, you can also (partially) re-invent gitolute, if you prefer14:42
Eugene That'll be regular Unix permissions14:42
Which you don't want14:42
bremner oh good point. I missed the local part.14:42
Eugene Note that you can use gitolite without ssh, by invoking the gitolite wrapper14:42
← xSmurf left14:42
→ treehug88 joined14:43
← acolson left14:43
Eugene The user will still need permissions to the repo, possibly involving sudo. Or just do it the already-established way14:43
canton7 irqq, in a nutshell, filesystem permissions tend to get in the way. it's possible, but error-prone. gitolite over a network is much easier14:43
→ maqr joined14:44
→ MachineChild joined14:44
→ Gizburdt joined14:44
→ rajeshk joined14:44
→ taptapdan joined14:45
← MachineChild left14:45
→ simesy joined14:45
← kriks left14:45
← rajeshk left14:46
→ livingstn joined14:46
← roelmonnens left14:46
← dangerousdave left14:47
irqq OK, but do I need to tweak file permissions manually on an already inited/cloned --bare repository, or git init/clone can be told to use particular (group?) permissions?14:47
← atlantan left14:47
canton7 irqq, read up on the --shared docs for man git clone, and there's some shared stuff in man git config14:47
gitinfo irqq: the git-clone manpage is available at http://jk.gs/git-clone.html14:47
irqq: the git-config manpage is available at http://jk.gs/git-config.html14:47
canton7 oops14:48
ignore clone --shared - I mis-remembered. that's not relevent14:48
← maqr left14:48
canton7 man git init --shared, rather14:48
gitinfo the git-init manpage is available at http://jk.gs/git-init.html14:48
→ a-l-e joined14:49
→ xSmurf joined14:49
← simesy left14:49
irqq OK. The --shared keyword seems what I missed. You helped me, thanks.14:49
→ kwc joined14:50
→ codehotter joined14:51
← flowinho left14:51
← paulweb515 left14:52
← smerron left14:52
← mennea left14:53
codehotter Hi, I have a branch with a timeline like upstream v7.1.0 ... my own changes ... merge upstream v7.1.1 .. some more of my own changes - HEAD. Now upstream in the meantime released v7.2.0. But the common ancestor of 7.2.0 and myself is 7.1.0, 7.1.1 is diverged from 7.2.0. How do I 'undo' the merge with 7.1.1 and mereg with 7.2.0 instead?14:53
guardian osse: 47 files in .git/objects/17, what's so special about that dir?14:53
codehotter I'm having trouble keeping all the concepts in my head, so apologiesi f I'm talking nonsense14:53
→ mennea joined14:53
codehotter I hope you can figure out what I'm trying to do14:53
osse guardian: it's the dir that must contain at least 27 file for a git-gc to be triggered14:54
→ atlantan joined14:54
← mkaesz left14:54
osse guardian: but apparently git-gc won't do it for some reason. which makes git-gc trigger...14:54
→ dangerousdave joined14:56
← Sonderblade left14:56
← jiskiras left14:57
→ msmto joined14:57
guardian ok14:57
Eugene codehotter -you need to rebase. !sausage14:57
gitinfo [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect14:57
← FunkyAss left14:58
→ FunkybAss joined14:58
Eugene tl;dr: git rebase -i 7.2.0, unselect things you don't want14:58
← jab416171 left14:59
→ jiskiras joined14:59
→ ehmatthes joined14:59
codehotter Eugene: that command does show the commits under v7.1.1 , which I'm guessing I can each manually unselect. But what I really want is to specify the merge and 'automatically' unselect all commits that had to do with the merge with v7.1.115:00
osse guardian: try git reflog expire --expire=now; git gc --prune=now --aggressive15:00
guardian: try git reflog expire --expire=now --all # Assuming you don't need it15:00
codehotter Eugene: git rebase -i v7.2.0 does not show the merge commit, only commits under it15:00
← Silmarilion left15:00
Eugene If all your commits were linear you can checkout a new branch from 7.2.0 and then cherry-pick your stuff on top of it15:01
→ str joined15:02
Eugene Not programmatic but heyyy.....15:02
← GGflags left15:02
codehotter hmm, with git log --graph git clearly shows that it understands which commits were 'caused by' the merge and which commits I did myself on top of that15:02
→ Sonderblade joined15:02
codehotter how cna I leverage thatu nderstanding to automatically 'unselect' those commits from the merge and select the ones I did myself?15:03
Eugene cherry-pick the ranges you want15:03
→ codeman joined15:03
→ UmbraMalison joined15:03
→ justben joined15:03
codehotter so one range up to the merge commit, then another range after the merge commit? so basically I skip over it15:04
Eugene I'm not a rebase master, there might b be a flag for what you want. i find it easier to skip the fiddling15:04
→ d10n-work joined15:04
Eugene Yup15:04
→ dreiss joined15:04
→ Noldorin joined15:04
codehotter I am getting th feeling that I'm trying to do something really nonstandard15:04
Is that the case?15:04
→ jgardella joined15:04
codehotter I have software project released by an upstream, and I'm using it with my own changes, and I'd like my commit history to show when I 'upgraded' to a new version release by upstream15:04
so I figured that's what merge commits are for15:05
but I don't know how to do that since I have my own changes in there as well15:05
Eugene Normally you wouldn't merge in 7.1.115:05
codehotter basically, right now, git log --decorate --graph --first-parent shows the history I want to see15:05
right, because 7.1.1 diverges from their development line15:05
→ kukks joined15:06
← kukks left15:06
→ kukks joined15:06
Eugene You should have rebased on top of it before submitting, rather than merge.15:06
codehotter ok, but if I did that, I still wouldnt' be able to merge in 7.2.0, right?15:06
or rebased onto 7.2.015:07
withotu trickery15:07
← TomyWork left15:07
codehotter I think it's because the 7.1.1 release diverges from their normal continued development that I'm seeing this15:07
Eugene That doesn't help15:07
codehotter there's a conflict between git's linear history and my linear upgrading to the latest version15:07
to me as sysadmin, it's 7.2.0 follows 7.1.1 follows 7.1.015:08
Eugene And here's my bus stop. Good luck15:08
codehotter but to upstream as programmers, it's 7.2.0 follows 7.1.0, and 7.1.1 is off to the side15:08
← FabTG left15:08
codehotter Thanks!15:08
← dangerousdave left15:09
→ imkmf joined15:09
→ pheaver joined15:10
→ Celm joined15:12
→ EminenceHC joined15:13
← mizu_no_oto left15:13
← shinnya left15:14
← metts left15:14
→ w0bni joined15:15
→ phcarioca joined15:16
← Celm left15:16
← lsiv568 left15:17
→ dangerousdave joined15:18
← LeMike left15:19
robustus → robustus|Off15:20
→ harish_ joined15:21
← pagios left15:21
← jgardella left15:22
→ pagioss joined15:22
← papegaaij_ left15:22
← aswen left15:22
← mennea left15:23
→ mennea joined15:23
← pheaver left15:24
← SpaghettiCat left15:25
← atlantan left15:25
→ mizu_no_oto joined15:25
→ mikiones joined15:25
→ rath joined15:26
← EdwardIII left15:27
→ atlantan joined15:28
← Juxtapositional left15:28
→ jonyfive joined15:28
← jargon left15:29
→ listochkin joined15:29
← UmbraMalison left15:29
← AccessGranted left15:30
→ tristanp joined15:30
→ jottr_ joined15:32
→ lindenle joined15:32
← atlantan left15:33
→ ojacobson joined15:33
← hexagoxel left15:33
← jottr left15:33
→ jstimm joined15:34
← harish_ left15:34
← jstimm left15:34
StarManta if i have, say, 7 commits that i’ve made, and i want to push some but not all of them, is that possible? (using sourcetree)15:34
→ atlantan joined15:34
StarManta like i want to push the first 4 commit but not the last 315:34
→ harish_ joined15:34
← PinkSpecs left15:35
→ PinkSpecs joined15:35
→ AccessGranted joined15:36
← gain left15:36
← [diablo] left15:36
← ghostlines left15:36
← Juzzika left15:36
← vurma left15:36
← lindenle left15:36
canton7 git push remotename hashofcommittopush:branchtopushitto15:37
← govg left15:37
← StolenToast left15:38
← rethus left15:38
→ mustmodify joined15:39
← gua_ould left15:39
mustmodify Hey, we call git identifiers hashes... or at least my team does... are they actually hashes? If so, of what? If I commit the same thing twice I get two different numbers.15:39
osse mustmodify: yes, they are hashes15:40
SHA1 to be precise15:40
Kwpolska mustmodify: metadata changes between the two “same” commits15:40
osse mustmodify: you get two different hashes because you created them at different times15:40
mustmodify so the commit includes meta-data. I should have realized that.15:40
osse mustmodify: try this: git rev-parse commit1^{tree}15:41
mustmodify: do the same for the other commit.15:41
they should match15:41
→ Spacew00t joined15:41
→ revolve joined15:42
canton7 musicmatze, 'git cat-file -p HEAD' - that's the data which is hased15:42
← Radivarig left15:42
canton7 *hashed15:42
→ UmbraMalison joined15:42
osse !bottomup15:43
gitinfo 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)15:43
← magic left15:43
grawity more precisely, `git rev-parse HEAD` will give you the hash of what `git cat-file -p HEAD` would print (+ Git's object header)15:43
← FreezingCold left15:43
→ StolenToast joined15:43
→ magic joined15:43
← Malsasa left15:44
← mennea left15:44
→ nettoweb joined15:44
→ maqr joined15:44
→ thedodd joined15:45
← yosito left15:45
→ yosito joined15:45
→ eliasr joined15:46
→ simesy joined15:46
→ Scriptonaut joined15:46
→ jagob joined15:46
← mustmodify left15:46
Scriptonaut hey guys, so I made a branch to fix a bug. I came across a similar bug, that would be very easily fixed with the same code I wrote for the old bug. The testers who test my code before merging with master haven't gotten around to it yet. Could I branch from the first bug branch, and then do a pull request on the branched branch?15:47
I want to make sure that if the testers pull it, and merge it, they will get both bug fixes15:47
← jagob left15:47
→ Jarboe joined15:47
← P4_Denis left15:48
osse Scriptonaut: if you merge you will also get everthing else in the first branch. That can be a lot of if they are different versions or something like that.15:48
see if cherry-pick fits better15:48
→ Jackneill joined15:49
← ehmatthes left15:49
← tvw left15:49
← maqr left15:49
→ justinmburrous joined15:50
← yosito left15:50
Scriptonaut the only changes in the first branch are a few lines I wrote yesterday, same version. It would make more sense to me to just write it on the same branch but they have a "new branch for each bug" policy15:50
← justinmburrous left15:50
Scriptonaut never heard of cherry pick, looks confusing15:50
← simesy left15:51
osse Scriptonaut: I mean, did you create the second branch from the same place you created the first branch from?15:51
→ mjuli joined15:52
Scriptonaut yep15:52
osse then it's not big deal. you can merge one into the other15:52
Scriptonaut ah, so git cherry-pick is like a merge, but only one commit?15:52
codehotter How do I list the commits that are in 7.1.1 that are also in 7.2.0 and how do I list the commits that are in 7.1.1 and not in 7.2.0, if the common ancestor of 7.1.1 and 7.2.0 is 7.1.0?15:52
Scriptonaut not the entire working directory of a branch?15:52
osse Scriptonaut: no, a cherry-pick is like copying a commit.15:52
→ alanwill joined15:52
→ mennea joined15:53
Scriptonaut what does it do with differences?15:54
osse Scriptonaut: cherrypicking a commit achieves the same as looking at what changes the commit introduced, apply the same changes somewhere else, and then make a new commit with the same message.15:54
← avvs left15:54
← mennea left15:54
← cbr_ left15:54
Scriptonaut ah15:54
Vampire0 Scriptonaut, if there are conflicts, you get a conflict message and are asked to resolve it just like if when you do a merge15:55
osse Scriptonaut: so it's a suitable tool to "backport" a bug fix, for example.15:55
→ tgunr joined15:55
Scriptonaut ah, maybe I'll try cherry picking just for shits15:55
→ mennea joined15:55
osse don't forget giggles15:55
Scriptonaut if you pass cherry-pick a branch, will it just assume you mean the head?15:56
osse yes15:56
← jottr_ left15:56
← phcarioca left15:56
cbreak Scriptonaut: man gitrevisions15:57
gitinfo Scriptonaut: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html15:57
→ LeMike joined15:57
← irqq left15:57
→ angelsl joined15:57
← atlantan left15:58
→ FreezingCold joined15:58
Scriptonaut what's it mean when I switch to a branch and it says: M filename15:58
← mihaicris left15:59
osse the file is modified compared to the committed version on that branch15:59
canton7 you've !floated ed15:59
eek, !float ed15:59
gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.15:59
← dreiss left15:59
→ iamjarvo joined16:00
← iamjarvo left16:00
→ kadoban joined16:00
Scriptonaut I thought when you checkout out a branch it changes the working directory to the most recent commit of that branch? I was on a branch, modified a file, changed branches, shouldn't it have trashed those changes?16:00
→ iamjarvo joined16:00
← vtunka left16:01
→ lindenle joined16:01
osse Scriptonaut: it could have. but then you might lose those changes forever16:01
→ atlantan joined16:01
osse Git chose to keep those changes around, just in case16:01
kadoban !float16:01
gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.16:01
kadoban It's a convenience thing...it's pretty easy to trash them if you really want.16:01
← jenni_naiaretti left16:01
Scriptonaut are you guys all git gurus or something16:02
Vampire0 .trigger_edit floated @!float16:02
gitinfo Vampire0: Okay.16:02
→ jenni_naiaretti joined16:02
Vampire0 you !floated16:02
gitinfo [!float] If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.16:02
canton7 hehe16:02
Vampire0 Scriptonaut, depends on the definition of guru16:03
Scriptonaut, I'd say we are just users like you with a bit more experience :-)16:03
kadoban I'm not even very good at git personally, I just know enough to mostly use it okay16:03
← glebihan left16:03
← Embassy left16:03
Scriptonaut I have used it for years, but I still don't fully understand it16:03
kadoban You eventually get to a point where the everyday stuff is really easy and the rest you can look up quick16:03
Vampire0 Scriptonaut, if you are interested, maybe !bottomup is for you16:04
gitinfo Scriptonaut: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)16:04
Scriptonaut thanks16:05
← LeMike left16:06
← codetroll left16:06
Vampire0 Scriptonaut, maybe also !book might be helpful for you16:07
gitinfo Scriptonaut: 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 !parable16:07
This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person, but please do it via private message to avoid mass highlighting people.16:07
← teran left16:07
→ nkouevda joined16:08
← nkouevda left16:08
Scriptonaut does it take multiple arguments?16:08
thanks Vampire016:08
.karma Vampire016:08
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 18 (1 in past 30 days) (2 given out)16:08
← dangerousdave left16:08
→ St_Marx joined16:09
→ gmb2020 joined16:09
← UmbraMalison left16:10
← robbyoconnor left16:10
→ robbyoconnor joined16:10
← francisfish left16:11
← thedodd left16:11
→ bbloom joined16:11
← livingstn left16:12
← CraigyDavi`` left16:12
← dotpot left16:12
← bgerber left16:12
← atomx left16:13
→ Quevin_ joined16:13
→ dangerousdave joined16:13
→ imachuchu joined16:13
→ thedodd joined16:13
→ UmbraMalison joined16:13
→ bgerber joined16:14
→ kpease joined16:14
← kpease left16:14
→ kpease joined16:15
→ jenni_naiaretti_ joined16:16
← Sebtoast left16:16
→ Sasazuka joined16:18
← numdig left16:18
→ maletor joined16:18
← autochthon left16:18
→ kristofferR joined16:19
← ciampix left16:19
→ akushner joined16:20
→ rethus joined16:20
← jenni_naiaretti_ left16:20
← zzattack left16:20
← jenni_naiaretti left16:22
→ jottr_ joined16:22
→ jenni_naiaretti joined16:23
← jnavila left16:23
← mennea left16:23
→ phcarioca joined16:23
← phcarioca left16:23
→ mennea joined16:23
→ hexagoxel joined16:23
→ phcarioca joined16:24
→ desposo joined16:24
← Guest84046 left16:25
← pagioss left16:25
→ dansmith_btc joined16:25
→ BlaXpirit joined16:26
gitinfo set mode: +v16:27
dansmith_btc HI, I commited and included an extra file in the local commit. How can I remove it fromt the commit? Searching revealed how to *add* an extra file, but couldnt find how to remove one.16:27
← jottr_ left16:27
osse dansmith_btc: git rm --cached file; git commit --amend16:27
→ sebumd joined16:27
→ Malsasa joined16:27
← ki0 left16:28
← kiran left16:28
→ m0viefreak joined16:29
← listochkin left16:29
→ snuttilatti joined16:29
→ pheaver joined16:29
dansmith_btc osse, now the file which I removed from the commit is gone16:29
sebumd → scottbuckel16:30
← pcatinean left16:30
osse dansmith_btc: that's what you wanted, right?16:30
Vampire0 lol16:30
← Gizburdt left16:30
→ sean__ joined16:31
osse also: gone from where?16:31
from the filesystem? or the commit?16:31
robustus|Off → robustus16:31
dansmith_btc osse, by "gone" I mean, the state of that file which I mistakenly commited reverted to the previous commit16:31
osse oh16:32
→ cvanball joined16:32
osse git checkout HEAD~1 -- file; git commit --amend16:32
jacob___ guys , i have some conceptual questions about git16:32
→ jenni_naiaretti_ joined16:32
dansmith_btc it's ok, though, I made a backup.16:32
← cvanball left16:32
osse you don't need a backup :)16:32
→ starkhalo joined16:32
→ LucasKA joined16:32
Vampire0 Git IS your backup :-)16:32
jacob___ is a git repo always the master if it is not cloned16:33
→ zzattack joined16:33
jacob___ i dont understand this16:33
→ ajustrun joined16:33
→ socomm joined16:33
← socomm left16:33
jacob___ i am still thinking in SVN mode i think instead of distributed16:33
osse jacob___: what do you mean by "the master"16:34
kadoban jacob___: "the master" isn't really meaningful, as far as I can tell16:34
jacob___ ok16:34
i mean ; if i look at a branch; its either "master" or something else16:34
i have to set up a git repo on a remote machine16:34
dansmith_btc osse, is your last command the one that I needed initially? or the one that I must run now after the mess up?16:34
kadoban jacob___: Right, those are just arbitrary branch names. 'master' is kinda the default branch name.16:35
jacob___ so what do i do differenty if it is supposed to be the master repo16:35
osse dansmith_btc: both, actually.16:35
jacob___ ok ok16:35
→ autochthon joined16:35
→ in_deep_thought joined16:35
osse dansmith_btc: it works in both cases16:35
← palcu left16:35
→ palcu joined16:35
→ alanwill_ joined16:35
← jceb left16:35
← kermit left16:36
Vampire0 jacob___, there is no such thing as a "master" repo in Git terms16:37
jacob___, each repo is a full master repo in its own16:37
jacob___, you can clone each repo, you can push to each repo (though you shouldn't to all)16:37
← alanwill left16:37
← seschwar_ left16:37
← msmto left16:38
Vampire0 jacob___, if you want to use a central "master" repo, that is just usage convention you establish to pull from there and push thereto16:38
→ TheFuzzball joined16:38
Vampire0 jacob___, what you want to create on your server is a !bare repository16:38
gitinfo jacob___: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/16:38
← UmbraMalison left16:38
→ beneggett joined16:39
abrkn → Guest6389016:39
→ palcu_ joined16:39
→ msmith_ joined16:40
← Aune left16:40
jacob___ tahnks Vampire0 and gitinfo16:40
← palcu left16:40
jacob___ the link didnt work gitinfo16:40
can you check again16:40
→ UmbraMalison joined16:41
← Tuna-Fish left16:41
← RaceCondition left16:41
jacob___ i get page not found error http://bare-vs-nonbare.gitrecipes.de/16:41
← akushner left16:42
osse jacob___: long story short: a bare repo only contains what you now see inside the magic .git directory.16:42
← moritzschaefer left16:42
→ akushner joined16:42
kadoban jacob___: Hmm, weird. Well anyway you don't have to know all that yet. Just if you're going to be pushing to the remote, create it with 'git init --bare'16:42
osse it is "bare" in the sense that it does not contain a usable checkout of the files themselves16:42
→ francisfish joined16:42
dansmith_btc osse, I restored the backup and tried your 2nd command, alas git status shows that the changes from the removed file are gone16:42
jacob___ osse, you are using all unfurmiliar words to me, "magic" , you haev a link i can read about this16:42
i am reading http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup16:43
← tristanp left16:43
jacob___ but is very basic16:43
osse jacob___: disregard that word. I didn't mean anything by it.16:43
jacob___ oh ok16:43
← msmith_ left16:43
kadoban dansmith_btc: I'm not clear on what you're actually trying to accomplish? Maybe you can explain again?16:43
osse dansmith_btc: that sounds like good news to me, but you used the word "alas"16:44
dansmith_btc I commited an extra file. How can I uncommit it and restore to the state it was in when I accidentally commited it, kadoban16:44
← UmbraMalison left16:44
kadoban dansmith_btc: 'git checkout HEAD~2 -- the_file' 'git add the_file' 'git commit --amend' That's what I'd do. There's probably something prettier.16:45
osse jacob___: a git repositor usually contains a directory called .git, sort of like how a svn repository has one or more .svn directories, right?16:45
grawity dansmith_btc: recover what – the file, or the repository?16:45
→ maqr joined16:45
← Malsasa left16:45
→ yosito joined16:46
→ UmbraMalison joined16:46
← intellix left16:46
→ sdrfnord1 joined16:46
→ simesy joined16:47
← ferreum_ left16:47
← Mobutils left16:47
← maqr left16:50
← yosito left16:50
← Kulrak left16:51
dansmith_btc kadoban, this had the same effect as with osse, the changed in the uncommited file are not shown in git status16:51
grawity, recover the file16:51
← simesy left16:51
dansmith_btc *the changes16:51
← Quevin_ left16:52
→ Tuna-Fish joined16:52
→ mekhami joined16:52
kadoban dansmith_btc: Then after that, 'git checkout HEAD@{1} -- the_file' maybe?16:52
→ maestrojed joined16:53
mekhami okay simple conflict resolution question; i have to pull to update my source code but i don't want to lose the work i've done on one specific file16:53
← mennea left16:53
← atlantan left16:53
→ Juzzika joined16:53
kadoban mekhami: Why would you lose the work? Is it uncommited?16:53
mekhami if i commit the changes i made16:53
and then pull16:54
→ mennea joined16:54
mekhami will my changes plus their changes 'merge'?16:54
← UmbraMalison left16:54
← Baluse left16:54
kadoban mekhami: Yes. 'git pull' is 'git fetch' + a merge16:54
← iamjarvo left16:54
→ teran joined16:54
→ tvw joined16:54
→ Baluse joined16:55
← scarcry left16:55
→ Skapadapaduu joined16:55
dansmith_btc kadoban, what worked was: git reset --soft HEAD~1 && git reset HEAD path/to/unwanted_file && git commit as per https://stackoverflow.com/questions/12481639/remove-files-from-git-commit16:55
→ scarcry joined16:55
Vampire0 mekhami, kadoban: depends on configuration and parameters, could also be fetch+rebase16:55
→ UmbraMalison joined16:55
kadoban I find it unlikely that someone would have changed that config unless they're already pretty familiar with how pull works, but fair enough...16:56
dansmith_btc: Glad you figured it out16:57
dansmith_btc thanks for your help folks!16:57
→ baweaver joined16:58
Vampire0 kadoban, some people follow How-Tos without really knowing what they do ;-)16:58
→ rohanrhu joined16:59
rohanrhu hi16:59
gitinfo rohanrhu: 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.16:59
grawity http://git.savannah.gnu.org/cgit/bash.git/commit/-i?id=43aebe922bc2a614c410e282fdf772e063454168 .________.16:59
← desposo left16:59
kadoban True enough.16:59
rohanrhu how can i tell dont follow a specified directory16:59
to git16:59
← nour left16:59
← kukks left17:00
→ rdbell joined17:00
← baweaver left17:00
→ desposo joined17:00
kadoban rohanrhu: You want to ignore a directory? Put it in either the repo or your global gitignore. It won't have any effect if the things you're trying to ignore are already tracked though.17:00
→ kermit joined17:00
codehotter I have a 'prepare for merge' commit and a 'merge commit'. Can I make one commit out of these?17:01
I wonder where that 'prepare for merge' commit should be in the graph17:01
it's fine if the 'prepare for merge' commit exists, I just dont want to see it in git log --first-parent17:02
cbreak codehotter: you can17:02
instead of git committing the merge, git commit --amend it17:02
← kpease left17:02
← jenni_naiaretti left17:02
jenni_naiaretti_ → jenni_naiaretti17:02
→ kpease joined17:02
cbreak if you've already made that merge commit, then you'll have to trick a bit17:03
→ baweaver joined17:03
cbreak rewrite history by squashing the merge into the previous commit17:03
→ jenni_naiaretti_ joined17:03
cbreak I know how to do that with git commit-tree, but that's plumbing, might nto be easy to use17:03
kadoban Will rebase -i do that? I never know with merge commits how it handles that17:03
→ Kulrak joined17:03
← starkhalo left17:04
← Kulrak left17:04
→ Kulrak joined17:04
cbreak no, it unravels merges17:04
→ Quevin_ joined17:04
cbreak there's -p, but I don't know how that works together with -i17:04
kadoban Hmm17:04
Scriptonaut guys, how do you deal with having way too many branches?17:05
do you delete them after a while?17:05
cbreak sure.17:05
← autonomousdev left17:05
Vampire0 It does, kind of cbreak and kadoban, but it might not produce the expected results17:05
cbreak not much point keeping them after merging17:05
Scriptonaut I've been fixing bugs on this system for a week, and I have 21 branches already17:05
kadoban Scriptonaut: If they're still meaningful, you can have hundreds...if they're useless though, no reason to keep them around.17:05
→ drummer23 joined17:05
← rdbell left17:06
cbreak you can always rename branches to dead/foo, oldbranches/foo17:06
or make tags out of them17:06
Scriptonaut git should have a feature where you can archive branches17:06
so when you git branch it only lists the active ones17:06
cbreak git branch -M foo archive/foo17:06
Scriptonaut -M for move?17:06
Vampire0 yep17:06
cbreak git will not threat them differently17:07
Scriptonaut so then when you git branch it only lists things in the root? Or would it still list archive/foo?17:07
milki github has heuristics for "active" branches17:07
cbreak but they will easily be greppable away17:07
← thedodd left17:08
→ Ryan joined17:09
codehotter cbreak: it says "you are in the middle of a merge, cannot amend"17:09
cbreak: how do I amend instead of commiting the merge?17:09
→ pbrobst joined17:09
← IIT left17:09
codehotter I did git merge --no-commit17:09
Ryan → Guest2393517:09
gitinfo set mode: +v17:09
Guest23935 → user11317:10
user113 Can someone please help me?17:10
codehotter user113: not unless you tell someone what's wrong17:10
→ chrisgeo joined17:11
→ Guest51316 joined17:11
user113 codehotter: I noticed I was running version 1.7.10.4 of git. So I installed 2.1.2. When I run git --version, I am still getting the old version.17:12
→ joeyh joined17:12
kadoban user113: Try 'which git'17:12
osse user113: how did you install it?17:12
→ listochkin joined17:12
codehotter user113: you have a much better chance of getting someone knowledgeable to answer your question if you don't ask specifically me. Now other people may not reply because they think I'm helping you already.17:12
joeyh has there been a problem with the ML? Tried to send a bug report in yesterday and vger accepted the mail but it has not posted yet17:12
→ yosito joined17:13
→ michelangelo joined17:14
→ dreiss joined17:14
→ user114 joined17:14
gitinfo set mode: +v17:15
user114 ok I am user 11317:15
→ freeman42 joined17:15
user114 when I run which git, I get /usr/bin/git17:15
← user113 left17:15
grawity how about `type -a git`?17:15
just in case.17:15
← a_le left17:15
→ pagioss joined17:16
osse user114: how did you install it?17:16
navs_ which -a git17:16
user114 I installed from here http://sourceforge.net/projects/git-osx-installer/files/git-2.0.1-intel-universal-snow-leopard.dmg/download?use_mirror=autoselect17:16
→ Mobutils joined17:17
user114 which -a git heeds /usr/bin/git /usr/local/git/bin/git17:17
navs_ nuke the old one17:17
→ a_le joined17:17
← donmichelangelo left17:17
navs_ or swap your path17:17
← encod3 left17:17
user114 can you please help me with this, I am new to git17:17
grawity navs_: `type -a` is generally more reliable because it also shows aliases, functions, and cached paths (like bash does)17:17
Nugget swap the path is the only solution. the /usr/bin one will come back every time xcode updates17:17
navs_ grawity: oh ok17:18
→ Suchit joined17:18
navs_ i figured he just had a usr/local path for the new one17:18
← a_le left17:18
← Quevin_ left17:18
← yosito left17:19
← pandeiro left17:19
→ a_le joined17:19
← bbloom left17:19
user114 navs17:19
navs_ sup dawg17:19
→ pandeiro joined17:19
user114 navs_ I would really like it if you could guide me through :)17:19
→ maqr joined17:19
← UmbraMalison left17:20
← shanee_ left17:20
→ jottr_ joined17:20
navs_ echo 'PATH=/usr/local/git/bin:${PATH}' >> ~/.bashrc && kill $$17:20
← m0viefreak left17:21
← pandeiro left17:21
→ kiran joined17:21
→ ki0 joined17:21
← martinklepsch left17:21
navs_ or just edit it yourself depending on how you want your path17:21
← beneggett left17:22
navs_ or just call the git you want directly17:22
→ Oebele joined17:22
navs_ or go to the apple store and ask a genius17:22
cbreak codehotter: hmm. git reset --soft HEAD~ will remove the newest commit17:22
→ beneggett joined17:22
← palcu_ left17:22
cbreak codehotter: after that, commit during a merge should create that commit17:22
user114 navs_ I am sorry, I don't understand what you want me to do.17:22
← Suchit left17:22
navs_ do you know what a path is?17:23
user114 yes17:23
← mennea left17:23
navs_ the order the directories are searched for a non-builtin typed into your shell17:23
right?17:23
you have two copies of git17:23
→ mennea joined17:23
user114 alright...17:23
→ CheckDavid joined17:23
navs_ /usr/bin/git and /usr/local/git/bin/git17:24
← drummer23 left17:24
navs_ you need /usr/local/git/bin to be searched before /usr/bin if you want to get that copy17:24
when you tell your shell git17:24
→ yosito joined17:24
→ maqr_ joined17:24
navs_ so modify the path variable in your shell's rc file (.bashrc) for non login shells17:24
user114 ok I follow so far17:24
→ GRX joined17:25
navs_ its in ~/.bashrc17:25
← maqr left17:25
← mizu_no_oto left17:25
navs_ you can say PATH="/usr/local/git/bin:${PATH}"17:25
to prepend that dir to your path17:25
at the bottom of the file or something incase you dont want to read it17:25
user114 PATH=/usr/local/git/bin/git:${PATH} that is the path right now17:26
navs_ well git is a macho binary17:26
not a directory right17:26
user114 correct17:26
navs_ it should be the directory that contains it17:27
→ snuffeluffegus joined17:27
← maqr_ left17:27
→ Nico_Dallas joined17:28
navs_ got it?17:28
Nico_Dallas Hi guys17:28
gitinfo Nico_Dallas: 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:28
navs_ why didnt i get a bot welcome17:29
← kermit left17:29
Nico_Dallas I guess I'm special :P17:29
So, I have a problem, and I hope someone here can give me an idea how to solve it because I'm screwed if not17:30
→ livingstn joined17:30
user114 no, I do not understand what you are telling me to do17:30
I understand I have two copies of git installed17:30
navs_ user14 your path has the entire path to the git binary17:30
_ikke_ navs_: Probably because you were already known to the bot17:30
navs_ it needs to have its parent directory17:30
user114 ok...17:30
navs_ /usr/local/git/bin:${PATH}17:30
→ kotopies joined17:30
user114 so what would the parent directory be17:31
codehotter cbreak: how would you do it with git commit-tree if the merge commti has already been made?17:31
rohanrhu kadoban: i write index.php to .gitignore but git is still tracking it17:31
→ goTAN joined17:31
_ikke_ rohanrhu: !ignore_tracked17:31
gitinfo rohanrhu: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.17:31
→ Asiajey joined17:31
→ dabar joined17:32
← Scriptonaut left17:32
← angelsl left17:32
→ gfixler joined17:32
cbreak codehotter: man git commit-tree has the details17:32
gitinfo codehotter: the git-commit-tree manpage is available at http://jk.gs/git-commit-tree.html17:32
dabar Hey everyone. If I did a git pull, and there is a conflict, and I realized I should have done a fetch/rebase anyway, is there any way to get back to version before I ran git pull?17:32
cbreak basically, it allows you to specify a tree and parent to make a commit17:32
← bezet left17:33
user114 ok navs I edited the .bashrc file to contain the line17:33
cbreak you'd take the tree from the existing merge, and as parents the parent of the pre-merge commit you want gone, and the second parent17:33
_ikke_ dabar: git merge --abort17:33
→ weemsledeux joined17:33
cbreak codehotter: also give it the commit message of your merge commit17:33
← weemsledeux left17:33
→ weemsledeux joined17:33
user114 the line PATH=/usr/local/git/bin:${PATH}17:33
cbreak that'll give you the new merge commit17:33
_ikke_ dabar: Note that rebase doesn't prevent conflicts17:33
Nico_Dallas Anyways, problem ... yesterday I tried to set SublimeText as the default editor for GIT, couldn't make it work and after I went back to vim I started to get an error when I tried to push stuff17:33
cbreak you can look at it in git log, make a new branch that points to it, or git reset --hard to it17:33
navs_ user114: yea17:33
Nico_Dallas git: 'media' is not a git command17:33
navs_ that will work17:33
← wojtasfs left17:33
dabar _ikke_: thank you very much17:33
kadoban rohanrhu: Didn't so much read the second part of my text, huh?17:33
→ greendot joined17:34
navs_ then re-launch your shells or source ~/.bashrc17:34
← weemsledeux left17:34
→ joeyDB__ joined17:34
→ oskarkv joined17:34
Nico_Dallas 'media' is a Filter I had in my .gitconfig (and I don't know where it came from), thing is ... I deleted the filter and I still get the error ( I tried relaunch my terminal, and rebooted the computer)17:34
codehotter cbreak: well what I originally did is, I merged 7.1.1, now I'm trying to merge 7.2.0, but 7.2.0 is based on 7.1.0 and not 7.1.1, so I want the changes between 7.1.0 and 7.1.1 gone so I can merge with 7.2.0 without conflicts17:34
cbreak codehotter: for example git commit-tree HEAD^{tree} -p HEAD^1^1 -p HEAD^217:35
dabar _ikke_: weird, I ran that, and it says "…have 8 and 18 different commits each…", but when I run git rebase -i origin/branch, it says "Nothing to do"17:35
codehotter cbreak: I solved that by making a diff between 7.1.1 and 7.1.0, then applying that17:35
Nico_Dallas more weird is that I only get the error on 1 repo, not every repo17:35
→ BlaXpirit-UA joined17:35
codehotter cbreak: that's my 'pre-merge' commit17:35
→ jceb joined17:35
greendot I have a branch in my repo that is taking quite a long time to switch to (over 3 minutes). this only happens with one branch, switching to other branches work fine. how can I diagnose that?17:35
codehotter cbreak: is that the proper way to solve this?17:35
cbreak: if I'm doing commit-tree magic anyway, maybe I can do it a step quicker :P that's why I'm asking17:35
user114 navs I opened and closed my terminal, still getting the old version17:35
← kwc left17:35
← jleclanche left17:35
cbreak codehotter: commit-tree doesn't merge17:35
you already have to have a tree that is as you want it to be17:36
navs_ Nico_Dallas: check the .git/config for that repo maybe?17:36
Nico_Dallas already did17:36
nothing weird17:36
navs_ grep 'media' in the repo?17:36
codehotter cbreak: right, I'm just checking with you if what I did in my pre-merge commit is proper. Right now I have a tree that is as I want it to be, with just the extra pre-merge commit17:36
navs_ do you have a hook or something maybe17:36
← BlaXpirit left17:37
Nico_Dallas not that I know of, I'll search17:37
← ki0 left17:37
← daedeloth left17:37
navs_ user114: echo $PATH17:37
cbreak codehotter: commit-tree allows you to fix that.17:37
navs_ your terminal emulator is probably using login shells or something17:37
dabar _ikke_: I ran rebase without the -i and it seems to have worked, I'm not sure17:37
cbreak codehotter: as for not arriving in this situation: instead of making a pre-merge commit you could resolve the conflicts yourself :)17:38
→ jargon joined17:38
user114 navs_: I ran that command, still the old version17:38
navs_ what did the path say17:38
user114: echo $PATH17:38
→ groolot joined17:39
codehotter cbreak: well, they're not really 'conflicts', they're just changes that upstream made in 7.1.1 that they didnt' make in 7.2.0, I just want those changes gone, I want to upgrade to upstream 7.2.0. Rather than going through commits 1 by 1, I figured I'd just diff 7.1.1 and 7.1.0 and apply that, then I can merge without conflicts17:39
user114 navs_: /Library/Frameworks/Python.framework/Versions/3.3/bin:/Library/Frameworks/Python.framework/Versions/3.3/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/git/bin17:39
codehotter cbreak: not sure if what I'm doing makes sense, though.17:39
cbreak your decision.17:39
← LucasKA left17:40
cbreak codehotter: maybe it'd be better to instead of merging those things into your branch, having a branch without those things, and merging your commits into their branches17:40
codehotter cbreak: wait, will git commit-tree give me a merge commit that looks like the origin one in git log --graph? Will it have all the commtis from upstream 'under' it?17:40
← gfixler left17:40
cbreak then you can merge it into something else and forget about the old merge17:40
codehotter: only the two you give it17:41
codehotter: as -p17:41
← dabar left17:41
navs_ user114: add '[ -e ~/.bashrc ] && source ~/.bashrc' to ~/.bash_profile17:41
→ UmbraMalison joined17:41
← nfk left17:42
user114 navs_: done17:42
navs_ launch a new shell17:43
← jenni_naiaretti_ left17:43
→ shinnya joined17:43
user114 navs_: I get version17:43
→ nfk joined17:43
user114 2.0.1!17:43
navs_ good?17:43
user114 well the latest version is 2.1.217:44
→ jenni_naiaretti_ joined17:44
← jottr_ left17:44
navs_ well what is the git version of /usr/local/git/bin/git --version?17:44
→ paulweb515 joined17:45
greendot I have a branch in my repo that is taking quite a long time to switch to (over 3 minutes). this only happens with one branch, switching to other branches work fine. how can I diagnose that?17:45
← goTAN left17:45
→ Quevin_ joined17:45
→ autonomousdev joined17:45
user114 navs_: 2.0.117:46
← greendot left17:46
→ greendot joined17:46
navs_ ok so install 2.1.2?17:46
← shigosei left17:46
user114 i thought I did...17:46
navs_ where to?17:46
user114 http://git-scm.com/downloads17:46
→ Celm joined17:46
navs_ just install whatever version you want and adjust the path like we did17:46
user114 oh17:46
→ ferreum joined17:47
user114 2.0.1 is the latest version for mac17:47
navs_ ok17:47
good talk17:47
→ simesy joined17:47
user114 thanks for the help - I am in uni for computer science and this made me feel stupid.17:47
→ Suchit joined17:47
→ LeMike joined17:49
robustus → robustus|Off17:49
→ _Vi joined17:49
← chernjie left17:49
← Quevin_ left17:50
← paulweb515 left17:51
Nico_Dallas navs_: I could kiss you right now17:51
greendot hey guys, how can I clean up a branch that is taking too long (over 3 minutes) to switch to?17:51
Nico_Dallas I had a hook "pre-push"17:51
← Pyrogerg left17:51
Nico_Dallas thanks a lot dude17:51
← weltall left17:51
→ chernjie joined17:51
← simesy left17:52
← mennea left17:53
← groolot left17:53
→ mennea joined17:53
kadoban greendot: ...what in god's name is in that branch?17:54
→ msmith_ joined17:54
cbreak greendot: delete lots of files17:55
switching between branches is usually slow because git has to change lots of files in the working dir17:55
rohanrhu kadoban: i dont understand exactly :/17:55
← livingstn left17:55
Vampire0 jacob___, http://webcache.googleusercontent.com/search?q=cache:peVxY_unb4QJ:bare-vs-nonbare.gitrecipes.de/+&cd=1&hl=de&ct=clnk&gl=de17:55
← fgqvne left17:55
← user114 left17:56
greendot the other branches work fine. it has some binary files that someone else committed. i removed them and made a new commit, but it's still taking too long to switch to.17:56
→ weltall joined17:56
← dangerousdave left17:56
→ jpf joined17:56
← Nico_Dallas left17:57
→ livingstn joined17:58
← Celm left17:58
← msmith_ left17:58
← joeyDB__ left17:59
← St_Marx left17:59
→ _leb joined18:00
← ArSn left18:00
← EminenceHC left18:00
← jiskiras left18:00
→ kermit joined18:01
→ upene joined18:02
← weltall left18:02
→ mizu_no_oto joined18:03
← joeyh left18:03
→ paulweb515 joined18:04
← hoijuiL left18:04
→ weltall joined18:04
→ Celm joined18:04
← mjuli left18:05
→ jiskiras joined18:06
→ brandonshowers joined18:06
← shinnya left18:07
→ fairuz joined18:08
→ thibaultcha joined18:08
← Celm left18:09
→ FabTG joined18:09
→ Glitches joined18:11
→ _alan_ joined18:13
Glitches I got this ssh alias so whenever I do "ssh ..." it does ssh-add so it authenticates my ssh key automaticly, I'm trying to do the same with git now18:13
→ hatzopoulos joined18:13
Glitches I want it so when I do git It runs ssh-add first then git18:14
← imkmf left18:14
Glitches this is how it looks like for the ssh one:18:14
ssh-add -l >/dev/null 2>&1 || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'18:14
→ atlantan joined18:14
Glitches I tried "ssh-add -l >/dev/null 2>&1 || alias git='ssh-add -l >/dev/null || ssh-add && unalias git; git'"18:14
but to no avail18:15
← alanwill_ left18:15
Glitches at least I just get "Please make sure you have the correct access rights"18:15
→ jeffpowrs joined18:16
→ jab416171 joined18:16
← jiskiras left18:16
← baweaver left18:16
→ jiskiras joined18:17
hatzopoulos i have no idea, but that sounds like you dont have access on the remote18:18
→ starkhalo joined18:18
→ ghostlines joined18:18
← robbyoconnor left18:18
← jeffpowrs left18:18
← ghostlines left18:18
← sdrfnord1 left18:18
→ jeffpowrs joined18:19
← beneggett left18:19
← Asiajey left18:19
← ThomasLocke left18:19
→ ghostlines joined18:19
hatzopoulos Glitches: http://stackoverflow.com/questions/13674647/cannot-push-to-git-repository-permission-denied18:20
← a-l-e left18:20
jeffpowrs Hello18:21
gitinfo jeffpowrs: 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.18:21
← x0s_ left18:21
Glitches hatzopoulos: ... when I do "ssh-add" manually, it works fine18:21
jeffpowrs I'm in kind of a messy situation and I need some expert advice :0)18:22
Glitches when I do not authenticate my ssh key it obviously doesn't work...18:22
→ irqq joined18:22
hatzopoulos don't we all :P18:22
jeffpowrs Haha18:22
→ DarkStompy joined18:23
← ruukasu left18:23
← jenni_naiaretti_ left18:23
hatzopoulos i'm also battling a git-svn dilemma18:23
← clayball left18:24
hatzopoulos what's your situation?18:24
→ jenni_naiaretti_ joined18:24
hatzopoulos !backup18:26
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups18:26
jeffpowrs Iy anyone can help me out it would be greatly appreciated! I had developed a feature on a separate feature branch. Then I merged that branch into master a few days ago (I didn't rebase... So there's a number of commits from that branch in masters history.) On top of that another developer has a couple of commits. I need to remove all of my commits but keep the other developers commits that were added on top of mine. What would be the best way t18:27
← greendot left18:27
jeffpowrs Should I git reset --hard to before my commits then cherry-pick the ones from the other developer?18:27
→ greendot joined18:27
→ joeyDB__ joined18:27
← kotopies left18:27
→ brucelee joined18:28
→ Quevin_ joined18:28
hatzopoulos i am not sure, but wouldn't you check the `git reflog`18:28
pick a point in the past18:28
and then reset --hard to that point18:28
→ blackmes1 joined18:28
hatzopoulos ? i'm not certain.18:28
Vampire0 jeffpowrs, that is one way, but be aware that you will !rewrite public history and the implications following18:29
gitinfo jeffpowrs: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum18:29
→ baweaver joined18:29
kadoban jeffpowrs: Rebase his on top of before your merge should work18:29
Vampire0 kadoban, that is effectively the same as cherry-picking them :-)18:30
← atlantan left18:30
rohanrhu kadoban: what should i do exactly to ignore a file or directory on git18:31
← greendot left18:32
jeffpowrs You can add any files or directorys you want to ignore to your .gitignore file in your root project dir.18:32
← dansmith_btc left18:32
← spatialbrew left18:32
→ beneggett joined18:32
rohanrhu is it git update-index --assume-unchanged useable for directory?18:32
← blackmes1 left18:33
kadoban Vampire0: Yes, but less work18:33
rohanrhu: You just need to ignore them and then remove them from being tracked. Don't get into update-index stuff, it's not a reasonable thing to do.18:34
→ weemsledeux joined18:34
← weemsledeux left18:34
→ weemsledeux joined18:34
Vampire0 kadoban, not really. two commands instead of one, but if you know those two commands it is less work to type those ;-)18:34
← mennea left18:34
→ martinklepsch joined18:34
Vampire0 rohanrhu, Git does not track directories, so you can also not "assume-unchanged" them or ignore them18:35
→ mennea joined18:35
rohanrhu kadoban: i put filename to .gitignore file on git initialized directory18:35
→ cagedwisdom joined18:35
← yosito left18:35
→ otakbeku joined18:35
Vampire0 rohanrhu, Git only tracks contents of files. If you add a directory to .gitignore it simply means "ignore all files in that directory"18:35
→ LucasTT joined18:36
kadoban Vampire0: Except you have to cherry-pick each commit individually. Isn't it just plain more work?18:36
rohanrhu Vampire0: i need git doesnt track modifies and file creation for a specified directory18:36
→ dangerousdave joined18:36
Vampire0 rohanrhu, while .gitignore solely works on untracked files. As soon as a file is tracked you cannot ignore it18:36
→ yosito joined18:36
← dangerousdave left18:36
Vampire0 kadoban, no, because you don't need to. You can cherry-pick a range, I just did it 5 minutes ago :-)18:36
→ dangerousdave joined18:36
Vampire0 rohanrhu, that sounds like !config18:37
gitinfo rohanrhu: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas18:37
kadoban I see18:37
Vampire0 rohanrhu, it is not supported that you do not track changes to tracked files18:37
rohanrhu, new files is easily possible with .gitignore though18:37
→ ki0 joined18:37
Vampire0 rohanrhu, but assume-unchanged you really should consider NOT using, as you will create a major fuck-up most probably18:38
→ kotopies joined18:38
Vampire0 It is a very dirty plumbing command to be used manually18:38
→ goTAN joined18:38
→ robingood joined18:38
← upene left18:38
← subhojit777 left18:39
← ghostlines left18:39
rohanrhu Vampire0: when i put ls -a seen .git .gitignore18:40
← robingood left18:40
rohanrhu Vampire0: is place of .gitignore file correct?18:40
← yosito left18:40
→ jottr_ joined18:41
← ki0 left18:42
→ MutSbeta joined18:42
→ yosito joined18:43
← livingstn left18:43
Vampire0 rohanrhu, I'm not sure what you are trying to say, but man git ignore18:43
gitinfo rohanrhu: the git manpage is available at http://jk.gs/git.html18:43
← martinklepsch left18:43
Vampire0 hm, no18:43
rohanrhu, I'm not sure what you are trying to say, but man gitignore18:44
gitinfo rohanrhu: the gitignore manpage is available at http://jk.gs/gitignore.html18:44
Vampire0 ah, yes18:44
→ EminenceHC joined18:44
hatzopoulos i think what he wants to do is remove the previously tracked files18:44
← aucecil left18:44
hatzopoulos if you have previously tracked the file, untrack them with `git rm --cached <file>`18:44
so you can still keep them18:45
← _alan_ left18:45
hatzopoulos then commit the change and then because of the new gitignore it should be cool after that18:45
→ Kitt3n joined18:45
Vampire0 hatzopoulos, I don't think so. I think he has !config18:45
gitinfo hatzopoulos: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas18:45
→ treehug8_ joined18:45
hatzopoulos (if that makes sense)18:45
→ RaceCondition joined18:46
→ thedodd joined18:47
→ simesy joined18:48
← treehug88 left18:48
← EminenceHC left18:49
← nnyk_ left18:49
hatzopoulos Vampire0: have you ever worked with git-svn?18:49
→ klj joined18:50
→ __TheDodd__ joined18:50
→ kotopies_ joined18:50
→ imkmf joined18:51
→ martinklepsch joined18:52
← martinklepsch left18:52
hatzopoulos you seem like you know your stuff.18:52
← thedodd left18:52
← simesy left18:52
← kotopies left18:53
Vampire0 hatzopoulos, I work with it since many years on a daily basis, as many employers are still stuck to SVN18:53
→ MattMaker joined18:54
← MutSbeta left18:54
← brandonshowers left18:54
→ aucecil joined18:55
← alexwhitman left18:56
→ alexwhitman joined18:58
rohanrhu Vampire0: i dont understand19:00
Vampire0 rohanrhu, what?19:01
← aucecil left19:01
← UmbraMalison left19:02
→ boombatower joined19:02
← alexwhitman left19:02
→ kwc joined19:02
← jenni_naiaretti_ left19:03
← yosito left19:04
→ UmbraMalison joined19:04
← mennea left19:04
→ smerron joined19:04
rohanrhu Vampire0: can you give example .gitignore for untrack a specified file19:04
→ jenni_naiaretti_ joined19:04
thibaultcha rohanrhu: Here are some examples (a lot actually): https://github.com/github/gitignore19:05
→ mennea joined19:05
Vampire0 rohanrhu, content of .gitignore to ignore file named "file":19:05
file19:05
that's it19:05
rohanrhu, but I hope "untrack" is just the wrong word, as it implies that the file is tracked already19:06
rohanrhu, and as I explained before, this is NOT possible19:06
rohanrhu, you can only ignore UNTRACKED files19:06
→ nour joined19:06
Vampire0 rohanrhu, you can untrack a file though (meaning deleting from the repository) and then ignore it so that it does not get readded19:07
→ alexwhitman joined19:07
hatzopoulos which is what i was saying earlier19:07
Vampire0 hatzopoulos, yes, but which is not what he asked for earlier nor now19:07
hatzopoulos i think he found him self in one of those situations where he tracked it, now wants to ignore it, and things just adding to gitignore should work19:07
thinks* not things19:08
rohanrhu: what say you?19:08
Vampire0 just read what he wrote earlier and you know his situation ;-)19:08
hatzopoulos i interpreted the broken english a different way19:09
← baweaver left19:09
hatzopoulos rohanrhu: no offence bro19:09
or bra19:09
lol19:09
→ Celm joined19:10
Vampire0 well, he said has a directory where some files are tracked and some new files will pop up and he wants to ignore the new files and the changes to existing files19:10
hatzopoulos hmm19:11
← trang left19:11
kai3x5 brah19:12
lol19:12
hatzopoulos thanx19:12
lol19:12
isn't that the fem version.19:12
if not i made it up19:12
← Quevin_ left19:14
← UmbraMalison left19:14
← Celm left19:14
rohanrhu Vampire0 hatzopoulos when i put git update-index --assume-unchanged filename git ignores that file19:15
← PinkSpecs left19:15
→ Nizumzen joined19:15
rohanrhu how can i do it with .gitignore19:16
→ UmbraMalison joined19:16
← mitzip left19:16
→ baweaver joined19:16
→ mitzip joined19:16
hatzopoulos rohanrhu, place the `file` inside your /.gitignore19:17
← dougsland left19:18
← amcsi_work left19:18
→ gfixler joined19:18
Vampire0 rohanrhu, again, it is NOT possible to ignore an already tracked file19:18
rohanrhu hatzopoulos: each file per line?19:19
Vampire0 rohanrhu, if you want to ignore an already tracked file you need to delete it first from the repository19:19
← _leb left19:19
→ jgardella joined19:19
Vampire0 rohanrhu, adding an already tracked file to .gitignore has NO effect whatsoever19:19
rohanrhu Vampire0: i understand i have a static file directory how can i ignore that?19:20
Vampire0 rohanrhu, --assume-unchanged kind of works, but is absolutely discoveraged, you will fuck-up your repository with a great certainty19:20
→ dougsland joined19:20
rohanrhu Vampire0: but can i track it sometimes19:20
hatzopoulos rohanrhu, yes if you want to be very specific. you could also use wildcards ... /path/logs*.txt19:20
rohanrhu is it possible19:20
← Jackneill left19:20
Vampire0 rohanrhu, what do you mean by static file directory and what do you mean by ignore?19:20
rohanrhu, you can NOT ignore tracked files19:21
hatzopoulos or adding the line, /pub_images19:21
← maletor left19:21
hatzopoulos would ignore everything starting with /pub_images19:21
→ bbloom joined19:21
← jiskiras left19:21
rohanrhu Vampire0: update-index --assume-unchanged can do it19:21
kadoban rohanrhu: As several people have mentioned, that's a horrible idea. You'll be back in a couple of days with awful broken behavior.19:22
→ BSaboia joined19:22
hatzopoulos :P19:22
rohanrhu kadoban: i have 2 branch testing and master and i develop project on local there are some config files i ignore them update-index --assume-unchanged19:23
kadoban Welp, good luck then. Some people are just immune to advice.19:23
← joeyDB__ left19:24
→ iliketurtles joined19:24
rohanrhu but how can i do it more understandable19:24
← iliketurtles left19:24
→ joeyDB__ joined19:24
→ jiskiras joined19:24
hatzopoulos perhaps he doesn't commit the gitignore?19:24
eh rohanrhu?19:24
→ beastd joined19:24
← Baluse left19:24
kadoban He's tracking the ignored files, that's his whole problem. He obviously doesn't listen at all though, since he's so far gone with the solution /everyone/ told him not to, so I'm not inclined to try anymore.19:25
hatzopoulos rohanru while your 2 branch testing, are you maybe adding ignored files and then updating index every time?19:26
rohanrhu i understand you files should be ignrored should not placed on git initialized directory?19:26
Vampire0 rohanrhu, as I told you mutiple times already and a LAST time now, it is NOT supported, but !config is relevant for you. And from now on I will ignore you as long as you continue to ask the same questions, sorry19:26
gitinfo rohanrhu: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas19:26
→ iamjarvo joined19:26
→ CKyle joined19:28
rohanrhu i understand thank you19:29
← RogerWS left19:29
← TheFuzzball left19:30
← zhangxaochen left19:31
→ zhangxaochen joined19:32
→ aucecil joined19:32
→ skylite_ joined19:33
→ bezet joined19:33
← Sleepy63 left19:33
← Suchit left19:33
→ Suchit joined19:34
← echelon left19:34
→ RogerWS joined19:34
← LeMike left19:35
→ LeMike joined19:36
← goTAN left19:36
← iamjarvo left19:36
→ zhangxaochen_ joined19:36
← jottr_ left19:37
← bezet left19:38
→ Shusshu joined19:38
→ maletor joined19:38
← Shusshu left19:38
← Suchit left19:38
← zhangxaochen left19:39
→ Remram joined19:41
→ mechanicalduck_ joined19:41
← beneggett left19:42
← mechanicalduck left19:42
→ beneggett joined19:43
← GT4066 left19:43
← punchagan left19:44
← jenni_naiaretti_ left19:44
→ paul424 joined19:44
→ jenni_naiaretti_ joined19:45
→ Andrevan joined19:45
← mennea left19:45
← Segfault_ left19:46
→ Segfault_ joined19:46
→ mennea joined19:46
→ blackmes1 joined19:46
→ livingstn joined19:47
← beneggett left19:47
→ Sleepy63 joined19:47
→ echelon joined19:48
← irqq left19:48
→ chrisgeorge_ joined19:48
→ mikehaas763 joined19:48
→ beneggett joined19:48
→ EminenceHC joined19:48
← armyriad left19:49
→ simesy joined19:49
→ jottr_ joined19:49
→ armyriad joined19:49
→ legrandin joined19:49
← beneggett left19:50
← chrisgeo left19:51
→ jerware joined19:51
← mechanicalduck_ left19:51
→ hatzopoulos_ joined19:51
← nfk left19:52
jerware moin.19:52
← chrisgeorge_ left19:52
← __TheDodd__ left19:53
← blackmes1 left19:53
← EminenceHC left19:53
→ nfk joined19:53
← Nizumzen left19:53
← simesy left19:53
← ecky--ptang-zoob left19:54
← hatzopoulos left19:54
→ ecky--ptang-zoob joined19:54
← otakbeku left19:54
→ timewa1ker joined19:55
offby1 Is it possible to have "git status" tell me if my submodules are out of sync, missing, etc? At first I thought it was possible, now I'm seeing "git status --porcelain" exit with 0 and no ouput, and yet "git submodule status" shows a line that begins with -, indicating that the submodule is missing.19:55
Hence, Estoy confundido19:56
Confound it.19:56
→ jhulten joined19:56
jerware How can I git fetch with an ssh public key from a connection I make via git remote add <repo> ssh://foo@some_ip19:56
← CKyle left19:56
→ EminenceHC joined19:56
mikehaas763 Is it possible to init a bare repo, clone it.. commit and push a gitattributes and gitignore file then have my coworker who has the project init a regular repo in his existing project dir and then set up a remote and "sync" with the bare repo?19:57
← joeyDB__ left19:57
→ mechanicalduck joined19:57
mikehaas763 The whole idea is I want to make sure the repo has a proper gitignore file before he starts pushing the project into it19:57
legrandin can someone help me with a merge conflict? i'm trying to fix a conflict but its forcing me to add changes to other files. i dont really need to do that with the branch because im not changing those files, and I would end up committing changes that arent mine. what do i do?19:57
→ joeyDB__ joined19:58
mikehaas763 jerware, I believe if you have your public key in the foo user's authorized_keys file on some_ip it will work19:58
jerware Oh I have to put my public key on the server's authorized_keys file ?19:59
I put the server's public key in my authorized_keys. Is that backwards?20:00
mikehaas763 jerware, yep that's how pub priv key auth works... git over ssh is just ssh essentially20:00
→ _alan_ joined20:00
← timewa1ker left20:00
→ beneggett joined20:01
← weemsledeux left20:01
← EminenceHC left20:01
offby1 legrandin: what is this "it" that is forcing you to edit files? Some gui thing? If so, quit using it and edit via a simple text editor, as God intended.20:02
← ra0 left20:02
offby1 wow, that was a really neck-beardy comic-book-guy rant, wasn't it :-|20:02
offby1 looks at the man in the mirror20:02
← mizu_no_oto left20:03
← _alan_ left20:03
← mekhami left20:03
mikehaas763 offby1, sounds like a rebase/merge issue to me20:03
→ jatt joined20:03
← imkmf left20:03
← jatt left20:04
→ jatt joined20:04
← dfaught left20:04
offby1 mikehaas763: are you responding to my question from 10 minutes ago, or are you commenting on my response to legrandin ?20:04
→ _alan_ joined20:04
mikehaas763 commenting on your response20:04
legrandin i almost got it man20:05
→ robbyoconnor joined20:05
offby1 legrandin: !repro20:05
gitinfo legrandin: 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 raise the odds of getting your problem fixed from about 30% to about 90%.20:05
legrandin ok so im using git, no gui or anything20:05
offby1 do what gitinfo says.20:05
← dangerousdave left20:05
← robbyoconnor left20:05
→ JanC_ joined20:05
→ aidalgol joined20:06
→ NAAKFH7 joined20:06
← kotopies_ left20:06
← JanC left20:06
mikehaas763 offby1, lol... I wonder how that 30% and 90% were thought up... my guess is instinct? I find it awesome either way20:06
JanC_ → JanC20:07
← DarkStompy left20:07
offby1 I pulled 'em outta my butt.20:07
Based on experience.20:07
→ robbyoconnor joined20:08
← Not_Whatever left20:08
→ Celm joined20:10
→ nour_ joined20:12
← in_deep_thought left20:12
← paulweb515 left20:13
← eletuchy left20:14
← Celm left20:15
→ eletuchy joined20:15
← mennea left20:16
← robbyoconnor left20:16
offby1 Well, that certainly shut down the discussion :-|20:16
→ mennea joined20:16
← KevinMGranger left20:16
legrandin ok, so here's my problem. i'm working on a project with several other people. i have a merge conflict that I want to solve using git, but when I try to merge my branch with master it adds changes to my branch that were made by other people20:17
→ brandonshowers joined20:17
legrandin im trying not to commit changes made by other people. seems very weird to do that20:17
offby1 legrandin: until you do the steps that gitinfo told you above, I will be unable to help.20:17
legrandin oh oops20:18
offby1 perhaps someone else will be able to help, but I won't.20:18
legrandin giving you code wont help20:18
offby1 did I ask for code?20:18
If so, I should correct those instructions.20:18
legrandin i mean terminal session20:18
offby1 well, if you are sure that a transcript won't help, then I'm sure that I can't help you.20:19
legrandin i think you can, its a simple question20:19
← eletuchy left20:19
legrandin also it involves stuff through github not pure git20:19
← skylite_ left20:19
← joeyDB__ left20:20
← jerware left20:20
thibaultcha Why would merging your branch to master make changes to *your* branch? I'd like to see the commands too and I think offby1 was right to ask for it.20:21
legrandin yes it does20:21
ok fine... hold on20:21
← justben left20:21
← dccc_ left20:22
→ LucasKA joined20:22
legrandin https://bpaste.net/show/3fbb25dcbd0c20:23
→ jleclanche joined20:23
legrandin so i dont want those files modified / added. i only want to resolve the conflicts within the file i was working on, test_compute_numpy20:24
→ joeyDB__ joined20:24
legrandin can i just merge one file?20:25
→ msmith_ joined20:25
← jenni_naiaretti_ left20:25
thibaultcha Well, you are merging master in your branch, so yes, you are merging other people's changes in your branch, why wouldn't it make sense?20:25
← rath left20:25
→ jenni_naiaretti_ joined20:25
legrandin well im not saying it doesnt make sense, im just asking how I can fix the merge conflicts without merging any other files but the one with the merge conflicts20:26
← GRX left20:26
← jgardella left20:26
legrandin im using github so i would basically be committing other people's changes to this repo20:26
thats what I want to avoid20:27
← LucasKA left20:27
← kristofferR left20:27
legrandin offby1: i got a transcript20:27
→ LucasKA joined20:27
legrandin is there no way to do this?20:29
← kpease left20:29
→ imkmf joined20:30
→ smccarthy joined20:30
← Ankhers left20:32
thibaultcha Ahhh ok! Just merge one file? Not easily that I know of, but I think some git magic is possible to do that.20:32
legrandin yes basially20:32
→ kyb3r_ joined20:33
→ attrs joined20:34
← Juzzika left20:34
→ timewa1ker joined20:36
→ alvaro_o joined20:36
→ WaReZ joined20:37
→ PinkSpecs joined20:37
← Tuna-Fish left20:38
→ weemsledeux joined20:38
← weemsledeux left20:38
→ weemsledeux joined20:38
← mikehaas763 left20:38
← spareproject left20:38
→ Tuna-Fish joined20:38
→ giusef joined20:38
→ kpease joined20:39
← livingstn left20:40
→ Quevin_ joined20:41
← baweaver left20:42
gitinfo set mode: +v20:42
attrs I'm looking for a way to set an attribute on a commit, after the commit. In particular, I want to save a summary of automated test results for each commit, eg "passed smoke tests", "failed release tests"20:42
Is there any such facility in git?20:42
→ baweaver joined20:43
← xSmurf left20:43
moritz attrs: man git notes20:43
gitinfo attrs: the git-notes manpage is available at http://jk.gs/git-notes.html20:43
moritz attrs: but they aren't easily pushed/pulled20:43
← PinkSpecs left20:43
→ dalafa_ joined20:43
← mkoskar left20:44
→ jgardella joined20:45
← starkhalo left20:45
← mennea left20:46
→ mennea joined20:46
← dalafa left20:46
← legrandin left20:47
← LeMike left20:47
← joeyDB__ left20:48
← brucelee left20:49
→ simesy joined20:50
→ St_Marx joined20:51
→ vurma joined20:51
← jgardella left20:52
→ joeyDB__ joined20:52
→ mkoskar joined20:52
→ EminenceHC joined20:53
← msmith_ left20:53
← beneggett left20:53
→ paulweb515 joined20:53
→ xSmurf joined20:54
→ in_deep_thought joined20:54
← simesy left20:54
← Neozonz left20:55
→ beneggett joined20:55
← EminenceHC left20:57
← jatt left20:57
← kiran left20:57
→ Neozonz joined20:58
← Neozonz left20:58
→ Neozonz joined20:58
← Kicer86 left20:58
← tesaf left20:59
ajustrun → ajustrun|away20:59
← ojacobson left20:59
→ zhuang joined20:59
← codeman left20:59
← WaReZ left21:00
→ Juzzika joined21:01
→ chrisgeo joined21:01
← chrisgeo left21:02
← Spacew00t left21:02
← maestrojed left21:02
← phcarioca left21:02
attrs It looks like notes will give me a fair bit of what I want, but I'd like to be able to easily find the most recent commit that passed a certain level of testing21:03
→ glebihan joined21:03
← jceb left21:04
← imkmf left21:04
kadoban attrs: Not sure if this is a horrible idea, but maybe have an automated branch that follows your publishing branch and updates when tests pass?21:04
Probably a horrible idea...21:04
← jenni_naiaretti_ left21:05
→ imkmf joined21:05
← joeyDB__ left21:05
→ jenni_naiaretti_ joined21:06
→ kaendfinger joined21:06
→ joeyDB__ joined21:07
→ iamjarvo joined21:07
← joeyDB__ left21:08
← baweaver left21:08
→ maestrojed joined21:08
→ thiago joined21:10
← akushner left21:10
→ Celm joined21:11
← attrs left21:11
→ FortySix2 joined21:12
← mdel left21:13
← imkmf left21:13
→ ncthom91 joined21:13
← AaronMT left21:15
← Celm left21:15
← aidalgol left21:15
← mennea left21:16
→ mennea joined21:16
→ anaran joined21:16
← tirengarfio left21:17
← tirengarfio_ left21:17
← BSaboia left21:18
← maestrojed left21:18
← melchesedek left21:19
→ eletuchy joined21:20
→ ruukasu joined21:21
→ kballou joined21:22
← anaran left21:23
← jenni_naiaretti left21:24
jenni_naiaretti_ → jenni_naiaretti21:24
→ lb1a joined21:25
← iamjarvo left21:26
→ iamjarvo joined21:27
← Oebele left21:28
→ tirengarfio_ joined21:28
→ tirengarfio joined21:28
← iamjarvo left21:29
→ baweaver joined21:29
→ ColKurtz joined21:31
← nour left21:31
→ kadoban_ joined21:31
← kadoban left21:32
← anomalyst left21:32
→ maestrojed joined21:32
→ Scriptonaut joined21:32
→ kristofferR joined21:33
← brandonshowers left21:34
← Xiti left21:34
→ CodeShark joined21:36
→ brandonshowers joined21:37
← _alan_ left21:37
← souther left21:38
→ ki0 joined21:38
→ souther joined21:38
→ pandeiro joined21:38
← ncthom91 left21:38
→ tristanp joined21:39
avar Just push tags marking commits that pass tests21:39
→ ncthom91 joined21:40
← ki0 left21:42
→ hustl4 joined21:42
→ Xiti joined21:42
← kaendfinger left21:43
← danemacmillan left21:43
← W0rmDr1nk left21:44
→ _alan_ joined21:44
← lb1a left21:45
→ liamkeily joined21:45
← jenni_naiaretti left21:45
← mennea left21:46
→ mennea joined21:46
→ kukks joined21:47
→ Walex joined21:47
→ jenni_naiaretti joined21:47
← klj left21:47
→ jatt joined21:47
← jatt left21:48
→ jatt joined21:48
← mennea left21:48
← brandonshowers left21:48
→ APerson_ joined21:49
→ simesy joined21:50
← ncthom91 left21:51
← dougsland left21:53
Dougie187 Does anyone know if a tool exists to manage multiple repositories regardless of the protocol? (meaning it can support svn and git?)21:54
→ EminenceHC joined21:54
← phantombeta left21:54
soerenb there is git svn21:54
← simesy left21:55
← alexwhitman left21:55
Dougie187 soerenb: for collection of multiple git and svn repos.21:55
← Pitb left21:55
← giusef left21:55
→ brandonshowers joined21:56
→ Bpit joined21:56
→ alexwhitman joined21:57
← kermit left21:57
← weemsledeux left21:58
→ kermit joined21:58
← EminenceHC left21:58
→ phantombeta joined21:59
→ dougsland joined21:59
← mellernoia left22:00
→ shinnya joined22:01
→ mellernoia joined22:01
← FortySix2 left22:01
← d10n-work left22:01
→ FortySix2 joined22:02
← souther left22:02
← autochthon left22:03
← tvw left22:04
← FortySix2 left22:06
← King_Hual left22:06
← imachuchu left22:06
← jeffpowrs left22:07
→ imachuchu joined22:07
→ souther joined22:07
Remram How do I "checkout a tree", i.e. read that tree into actual files?22:07
imachuchu Dougie187: maybe look at mr? http://linux.die.net/man/1/mr22:07
Remram read-tree updates the index alone, I want the "opposite"22:07
Dougie187 imachuchu: that's what I'm looking at now.22:07
← boombatower left22:07
→ nutron joined22:07
imachuchu Remram: man git archive22:07
gitinfo Remram: the git-archive manpage is available at http://jk.gs/git-archive.html22:07
← jiskiras left22:07
Remram I guess I could just use checkout though, but it updates the index as well22:08
imachuchu: doesn't look right22:08
→ giusef joined22:09
imachuchu Remram: it takes a tree-ish and creates an archive of it, so if you want to get a checkout of a tree without moving the index use archive and then extract it22:09
Remram that's super inefficient22:09
(fyi: I want to get these files from a hook)22:10
← jatt left22:10
Remram (I'm not sure updating the index is safe)22:10
osse that's a good argument for using git archive22:10
Remram (is there even an index in bare repos?)22:10
osse no22:11
imachuchu Remram: if you're really worried about efficency just use tar output, untarring is really really cheap22:11
Remram Can't I just do git checkout --worktree=...22:11
osse !deploy22:11
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html22:11
osse read that22:11
→ intellix joined22:11
osse it covers solutions both using checkout and archive22:11
imachuchu Remram: or, if you want a bare repo and one with a worktree then just create a local clone of the repo. Git will internally use hardlinks so it's barely bigger then the checkout, and if you really are worried then look into the --shared option22:12
← jargon left22:12
imachuchu *really worried about space then look into the --shared option22:12
Remram Hmm I guess my setup looks like some kind of deployment thing22:13
→ freudsfeud joined22:14
← giusef left22:15
Remram I might go the archive way then22:15
← vurma left22:16
freudsfeud noob question: I exported a repo to the production server, and now I want to send new commits to it and update it from the dev version of the repo. Is this possible? if so, can you direct me to a web page the tells me how?22:17
i googled my queston ans can't figure out if I am asking the right question.22:17
Remram What do you mean by "exported"?22:18
← treehug8_ left22:18
freudsfeud used the "git archive" function to export a zip file22:18
Scriptonaut ah shit guys help, we're pushing to production in a few minutes and something is weird here. I'm trying ti push to a branch, one I've pushed to many times, and it's saying: fatal branchname cannot be resolved to a branch. Unexpected end of command stream22:19
imachuchu freudsfeud: just do the same then, copying over the code that's already there? It also sounds like you too might benefit from reading !deploy22:19
gitinfo freudsfeud: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html22:19
cbreak freudsfeud: git archive is just a snapshot export. make a new snapshot export and replace all the files22:19
Scriptonaut I'm copy pasting the branch name from github22:19
so how the hell is git telling me the branch can't be resolved22:19
imachuchu Scriptonaut: first off run "git gc" just in case something really bad is wrong22:20
cbreak Scriptonaut: pastebin output of git show-ref and the git push you want to try22:20
imachuchu Scriptonaut: second, can we get a !repro of what's going on?22:20
gitinfo Scriptonaut: 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 raise the odds of getting your problem fixed from about 30% to about 90%.22:20
kadoban_ Scriptonaut: Going to need more info probably, can you paste the obvious stuff to a pastebin somewhere?22:20
freudsfeud imachuchu, @gitinfo, cbreak: thanks!22:21
gitinfo freudsfeud: you're welcome, but please note that I'm a bot. I'm not programmed to care.22:21
freudsfeud ok22:21
kadoban_ Hah22:21
→ splud joined22:22
imachuchu Scriptonaut: ack, sorry wrong command earlier, run "git fsck" to make sure nothings really wrong (gc won't do anything)22:23
Scriptonaut I see what the problem is. I somehow renamed my branch22:23
I was on my main branch, I did git checkout BUG_New_COlleague_Cant_See_Old22:24
← tristanp left22:24
Scriptonaut and it renamed BUG_New_Colleague_Cant_See_Old, it made is O in colleague uppercase22:24
splud Have a rather large binary file that was committed to a repo and pushed (by an script error in an automated process), along with some ancillary commits. What’s the BCP for hard resetting that remote repo to it’s prior state?22:24
Scriptonaut even though I never passed it -m22:24
→ skoop joined22:24
splud No other users should have this repo checked out, and I have shell access to the remote.22:24
← intellix left22:25
→ tristanp joined22:25
kadoban_ splud: Depending on what you want to do, either some invocation of 'git filter-branch' to remove the file you don't want in history, or 'git reset --hard' to before it happened. Both are fairly dangerous, take backups.22:25
← paul424 left22:25
Scriptonaut gah, fixed it22:26
kadoban_ splud: You need to do a bit extra to actually shrink the repository, due to the reflog and stuff, but that's a first step.22:26
→ Consuela joined22:28
→ Demods joined22:28
→ madewokherd joined22:28
splud if I pull and then do a hard reset, I’m _behind_ the remote. If I go to the _bare_ remote, I have to set things up so it can make a working tree (annoying, but that’s how it is). If I reset on that, I end up, yes with reflog stuff that is unchanged. What’s the process for shrinking that?22:29
I expect if I clone the repo first, then move the remote repo dir and init a bare repo in it’s place, then push from a hard reset’d repo, that would work as well. Just seems like a poor process.22:30
← smerron left22:31
kadoban_ splud: IIRC there's some way to cull the reflog, then you have to 'git gc'. Not something I do very often so I'm not sure offhand.22:31
→ neversleepz joined22:31
← RogerWS left22:31
← mike_af left22:32
← Neozonz left22:32
→ mike_af joined22:32
→ Neozonz joined22:32
← Neozonz left22:32
→ Neozonz joined22:32
← shinnya left22:34
rohanrhu what is git stash command exactly?22:34
soerenb man git stash22:35
gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html22:35
← hexagoxel left22:36
rohanrhu how can i ignore local changed files while pull?22:36
→ RogerWS joined22:36
← mike_af left22:37
← ColKurtz left22:37
← jenni_naiaretti left22:37
→ ColKurtz joined22:37
rohanrhu directory1 is at revision5 and i commit and push revision6 from another place22:37
→ RogerWS_ joined22:38
→ jenni_naiaretti joined22:38
rohanrhu but i changed file1 in directory1 but i did not commit it22:38
how can i ignore it while pull at directory122:38
→ kcj joined22:39
← Demods left22:39
→ shinnya joined22:39
→ BSaboia joined22:39
soerenb stash the change and pop it after the pull22:40
← FreezingCold left22:40
→ FreezingAlt joined22:40
← RogerWS left22:41
← baweaver left22:42
← Neozonz left22:43
← kpease left22:43
← dreiss left22:43
→ toothrot joined22:44
← mechanicalduck left22:44
FreezingAlt → FreezingCold22:45
← jacob___ left22:45
rohanrhu soerenb: thank you22:45
← polyzen left22:46
← kadoban_ left22:46
← Skapadapaduu left22:46
← mueslo left22:46
← Bpit left22:46
← souther left22:46
→ kadoban joined22:46
→ jottr joined22:46
→ polyzen joined22:47
→ ianbrandt joined22:47
→ psteinforth joined22:47
← _Vi left22:48
← psteinforth left22:48
→ baweaver joined22:49
← jottr_ left22:50
→ simesy joined22:51
← knownasilya left22:53
← shawndum_ left22:54
← liamkeily left22:54
→ liamkeily1 joined22:54
→ hebz0rl joined22:55
→ grazfather joined22:55
← simesy left22:56
→ dreiss joined22:56
grazfather Hey guys, a colleague of mine moved a file without git and then made changes. In history we have a delete and then a new file, but we'd like to maintain history. I had him revert, then re-cherry pick the change, reset mixed, move the file to a temp, git mv the moved file, replace with the changed version, and then recommit. Is there a nicer way to do this?22:56
← shinnya left22:56
← Scriptonaut left22:57
splud kadoban: thanks for the pointers. Am looking into them.22:58
← in_deep_thought left22:59
splud grazfather: I think the nicer way is for your colleague to do it properly the first time <g>22:59
← listochkin left22:59
grazfather no kidding22:59
→ kaendfinger joined23:01
kadoban grazfather: You know git doesn't actually specially record moves, right?23:01
grazfather it records them as renames...23:02
maintaining file history23:02
kadoban grazfather: It figures renames out from context on its own, they're not specially recorded. The 'git mv' is just a helpful sugar command.23:02
grazfather but it can't always figure it out23:03
← Juzzika left23:03
grazfather with git mv you can force it to23:03
osse wrong23:03
you can select the threshold for when git considers a file renamed23:03
← Sasazuka left23:03
osse git mv does not affect how git will store the files23:03
kadoban grazfather: This is why there's options in like 'git log' for how hard you want to search for moves. This is regardless of if you use 'git mv' or not. Git seriosuly doesn't record anything special for that.23:03
grazfather: Try it for yourself. 'git rm' something, add it as a different file and look at the result.23:04
→ m0viefreak joined23:04
→ listochkin joined23:05
← liamkeily1 left23:05
← jottr left23:05
→ in_deep_thought joined23:06
→ liamkeily1 joined23:07
→ ncthom91 joined23:08
← listochkin left23:09
→ intellix joined23:09
← yarco left23:09
← beastd left23:09
grazfather kadoban: Weird.23:09
which option23:10
kadoban Yeah, it's a little counter-intuitive. I've read some reasons for that that were...mostly convincing, and in general I don't think I've ever cared so far.23:11
→ Sasazuka joined23:11
← SonikBoom left23:11
← snuffeluffegus left23:11
kadoban Which option was I referring to on 'git log' you mean?23:12
→ Celm joined23:12
← Dougie187 left23:12
grazfather --follow... weird23:12
totally works23:12
kadoban grazfather: There's --follow, -M, etc. there's also -C for copies23:13
Right23:13
grazfather interesting. We wasted more time than we should have removing the delete/new file23:13
good to know, though. ty kadoban23:13
kadoban You learned something though at least :) 'welcome23:13
← rasto left23:14
→ comps joined23:14
← APerson_ left23:15
→ paul424 joined23:15
← Celm left23:16
← jenni_naiaretti left23:18
→ jenni_naiaretti joined23:19
→ jbrudvik joined23:20
← cannonball left23:20
← jbrudvik left23:20
→ jbrudvik joined23:20
← dreiss left23:21
→ MutSbeta joined23:21
→ jonmorehouse joined23:21
← jbrudvik left23:21
← Gamecubic left23:22
→ Gamecubic joined23:22
← mezod left23:22
← jenni_naiaretti left23:23
← thiago left23:26
→ rasto joined23:27
→ punchagan joined23:27
→ thiago joined23:27
→ jenni_naiaretti joined23:28
← brandonshowers left23:29
← ColKurtz left23:29
← hebz0rl left23:29
→ Marcus_ joined23:31
→ dreiss joined23:32
← thiago left23:34
→ bezet joined23:34
→ anomalyst joined23:35
→ weemsledeux joined23:36
← weemsledeux left23:36
→ weemsledeux joined23:36
→ solrize joined23:37
solrize i'm using git to track some text documents which means I'm refilling/reflowing paragraphs while editing, and the usual diff tools show whole-paragraph changes when I've really only changed a word or two. Is there some reasonable tool that just shows or highlights the changed words, like wiki editors typically do?23:38
← bezet left23:38
osse solrize: git diff --word-diff23:38
→ souther joined23:38
solrize oh nice23:38
thanks23:39
osse but that might look weird if the reflow is "heavy"23:39
kadoban When I do HTML, I split my text so one line is a sentence (or sentence fragment for long ones). But can't really do that for most text formats...23:40
→ DoCooc joined23:40
→ brandonshowers joined23:41
→ WaReZ joined23:41
← nour_ left23:41
← Cheaterman1 left23:41
→ Radivarig joined23:42
← nettoweb left23:43
→ jontmorehouse joined23:44
cbreak grazfather: git doesn't have per-file history23:45
→ jimmyy joined23:45
← jimmyy left23:46
← jonmorehouse left23:47
← in_deep_thought left23:47
← DoCooc left23:47
← intellix left23:47
← kristofferR left23:48
maestrojed Does my git terminology sound right https://gist.githubusercontent.com/maestrojed/0b8f0255b1fe344bbecf/raw/29193e8c43f05269c5b83f162678062d58645e37/gistfile1.txt? A 3rd party dev is saying "I don't know why jed's team needs my git repo, they should just create their own from the files on the server".23:49
← metRo_ left23:49
maestrojed My biggest questions are around my sentences "All teams/contributors should work from the same repo with a shared (origin). If a shared, web accessible origin does not exist we will be glad to create and host it."23:49
I know what I want to say just don't know how to say it .23:50
→ LLaurent joined23:50
← tyreld left23:52
→ Lyqyd joined23:52
→ simesy joined23:52
→ leeN joined23:52
→ ColKurtz joined23:53
→ jokajak joined23:55
→ diegoaguilar joined23:56
← Consuela left23:56
← simesy left23:56
← liamkeily1 left23:57
← punchagan left23:58
← jenni_naiaretti left23:59
→ Cheaterman1 joined23:59
← nfk left23:59
→ jenni_naiaretti joined23:59

Logs Search ←Prev date Next date→ Channels Documentation