| 2015-02-25 |
|
jim
| if they | 00:00 |
|
| are uncommited, they won't be merged | 00:00 |
|
| are not uncommited | 00:00 |
| ← wuhn left | 00:00 |
|
blckshp
| where would i find the '8c981e3f897f08f766a3cb3939add583c75791b1' and the '981e3f897f08f766a3cb3939add583c75791b1' referenced? | 00:00 |
| → EvilPenguin joined | 00:01 |
| ← jontmorehouse left | 00:01 |
|
jim
| are you the one doing the review? | 00:01 |
| ← wad left | 00:01 |
|
ebernhardson
| jim: no, i'm the one writing the patch :) | 00:01 |
|
| jim: the changes are commited, i regularly git commit --amend the patch i'm working on as i get things working. | 00:01 |
|
jim
| if you have diffs (git diff produces output), there are uncommitted changes of some sort | 00:02 |
| → rpaoi joined | 00:02 |
| → Arsonide joined | 00:02 |
|
jim
| generally as you are working, you would patch against all new committed work along that branch | 00:03 |
|
| I'll be back | 00:03 |
| → beneggett joined | 00:03 |
| ← rpaoi left | 00:03 |
|
vishal
| ebernhardson: I'm not sure I completely understand your scenario - and I've never used gerrit - but sounds like git reset --mixed might be what you need? It basically "uncommits" a number of commits and brings everything back into the working state.. | 00:03 |
| → antispaceman joined | 00:03 |
| ← joki left | 00:04 |
|
vishal
| then you can checkout another branch, and all those commits worth of changes will get merged into the new branch | 00:04 |
| → Dwtd joined | 00:04 |
|
ebernhardson
| hmm, yea i think that would work too | 00:04 |
| ← Dwtd left | 00:05 |
| ← neonalpine left | 00:06 |
| → neonalpine joined | 00:06 |
| ← FreezingCold left | 00:07 |
| → Uwvm joined | 00:07 |
| ← smccarthy left | 00:07 |
| → FreezingCold joined | 00:07 |
| → joki joined | 00:08 |
| → DolphinDream joined | 00:08 |
| ← im8bit left | 00:08 |
| ← Uwvm left | 00:08 |
| → zrqu joined | 00:09 |
| ← zrqu left | 00:10 |
| ← neonalpine left | 00:11 |
| → pdw joined | 00:11 |
| ← lsiv568 left | 00:11 |
| ← baweaver left | 00:12 |
| ← blckshp left | 00:12 |
| → dreiss joined | 00:12 |
| ← antispaceman left | 00:13 |
| ← UndeadElbowMacar left | 00:13 |
| → antispaceman joined | 00:14 |
| → lsiv568 joined | 00:14 |
| ← pm90_ left | 00:14 |
| ← mueslo__ left | 00:15 |
| → adamben joined | 00:15 |
| ← adamben left | 00:15 |
| → adamben joined | 00:15 |
| → hurley joined | 00:16 |
| → mueslo joined | 00:17 |
| → Gitzilla joined | 00:18 |
| → otter768 joined | 00:19 |
| → tmager joined | 00:19 |
| → jadne joined | 00:19 |
| → jontmorehouse joined | 00:19 |
| ← cdown left | 00:20 |
| ← pdw left | 00:21 |
| → cdown joined | 00:22 |
| → jonalmeida joined | 00:22 |
| ← s8321414 left | 00:23 |
| ← otter768 left | 00:23 |
| ← EvilPenguin left | 00:24 |
| → EvilPenguin joined | 00:24 |
| ← Noldorin left | 00:24 |
| → baweaver joined | 00:25 |
| ← arez left | 00:25 |
| → Walex joined | 00:25 |
| → multi_io joined | 00:25 |
| → Etheco- joined | 00:25 |
| ← alexwhitman left | 00:26 |
| → nb_bez___ joined | 00:27 |
| → MarkyC joined | 00:28 |
| ← Etheco left | 00:28 |
| ← multi_io_ left | 00:28 |
| ← n-st left | 00:28 |
| ← Walex2 left | 00:28 |
| ← cdown left | 00:29 |
| → jgardella joined | 00:29 |
| ← ska-fan left | 00:30 |
| ← misterpink left | 00:30 |
| ← CEnnis91 left | 00:30 |
| ← das_beard left | 00:30 |
| → Noldorin joined | 00:31 |
| ← amcgee7 left | 00:31 |
| ← leolrrj left | 00:31 |
| → alexwhitman joined | 00:32 |
| → jfbarthe joined | 00:32 |
| → cdown joined | 00:32 |
| → leolrrj joined | 00:33 |
| ← harish_ left | 00:34 |
| ← _Vi left | 00:34 |
| ← tmager left | 00:35 |
| → qoud joined | 00:35 |
| → phantombeta joined | 00:35 |
| → nagromlt joined | 00:36 |
|
jim
| sometimes reason for 550 can't retr is you don't have permission to read? | 00:36 |
| ← Noldorin left | 00:37 |
| → adamben_ joined | 00:38 |
| ← adamben left | 00:38 |
| → nettoweb joined | 00:40 |
| ← zumba_ad_ left | 00:40 |
| → zumba_addict joined | 00:41 |
| ← treaki left | 00:41 |
| ← paul424 left | 00:41 |
| → treaki joined | 00:41 |
| ← highcup left | 00:42 |
| → Noldorin joined | 00:42 |
| → rchavik joined | 00:42 |
| ← gambler left | 00:43 |
| → dm7freek joined | 00:44 |
| ← aesinv left | 00:45 |
|
jim
| hmm. curl exit code 78 means "The resource referenced in the URL does not exist." | 00:45 |
|
| so maybe you got the url wrong or the repo on the server is damaged somehow | 00:46 |
| → aesinv joined | 00:47 |
| ← SirRetnu_ left | 00:48 |
| ← thiago left | 00:48 |
| ← rubyonrailed left | 00:49 |
| → capleton joined | 00:49 |
| → FunkyELF joined | 00:49 |
|
capleton
| hi, I'm trying to wrap my head around using git to track different directories in diefferent branches.. ie. branch1 has directory1 but branch2 has directory1 AND directory2 | 00:50 |
|
FunkyELF
| how do I add a port number to a remote URL like this one: git@localhost:eric/test.git | 00:50 |
|
capleton
| is that possible? | 00:50 |
| → thiago joined | 00:50 |
| → harish_ joined | 00:50 |
| → das_beard joined | 00:50 |
| → robbyoconnor joined | 00:50 |
| → LACabeza joined | 00:51 |
| ← das_beard left | 00:51 |
| ← cdown left | 00:51 |
|
jim
| FunkyELF, is it because the sshd is running on a different port? | 00:51 |
| → eletuchy joined | 00:51 |
| → kermit joined | 00:51 |
| → tmager joined | 00:51 |
|
FunkyELF
| jim: yeah... trying to play with GitLab running in Docker on port 2222 | 00:51 |
| → cdown joined | 00:52 |
|
jim
| FunkyELF, I'm pretty sure you can... try cloning like that and see if it works | 00:52 |
| ← JEEB left | 00:53 |
|
FunkyELF
| jim: like what?... I don't have anything to clone. Where do I put the 2222? | 00:53 |
|
jim
| is it an ssh url? probably just where you put it in your example | 00:53 |
| → drfoo joined | 00:53 |
|
thiago
| git clone ssh://localhost:2222/foo/bar.git | 00:54 |
| → RDove joined | 00:54 |
|
FunkyELF
| thiago: jim I have nothing to clone yet... I need to push stuff into it | 00:55 |
|
| thiago: jim this is what it tells me.... git remote add origin git@localhost:eric/test.git | 00:55 |
|
thiago
| then git push ssh://localhsot:2222/foo/bar.git | 00:55 |
| ← Spacew00t left | 00:55 |
|
FunkyELF
| thiago: I need to add the remote first | 00:55 |
|
nagromlt
| weak | 00:56 |
| → gambler joined | 00:56 |
|
thiago
| technically, you don't | 00:56 |
| ← vekkon left | 00:56 |
| ← aesinv left | 00:56 |
|
FunkyELF
| thiago: okay... I don't understand this "git@localhost:eric/test.git" though. It already has a colon | 00:56 |
|
nagromlt
| wait | 00:56 |
|
thiago
| FunkyELF: ssh://git@localhost:2222/~/eric/test.git | 00:56 |
| → meLon joined | 00:56 |
|
FunkyELF
| git push ssh://git@localhost:2222/~/eric/test.git master | 00:57 |
|
| fatal: protocol error: bad line length character: No s | 00:57 |
| ← harish_ left | 00:57 |
| ← lsiv568 left | 00:58 |
| ← RDove left | 00:59 |
| ← dm7freek left | 00:59 |
| → tomog9991 joined | 00:59 |
|
FunkyELF
| thiago: got it.... git push ssh://git@localhost:2222/eric/test.git master | 00:59 |
| ← bitonic left | 00:59 |
| ← fstd left | 01:00 |
| ← EvilPenguin left | 01:00 |
| ← Bootinbull left | 01:00 |
| → fstd joined | 01:00 |
| ← ianbrandt left | 01:01 |
| → lsiv568 joined | 01:01 |
| → ianbrandt joined | 01:01 |
| ← tomog999 left | 01:02 |
| ← ParsectiX left | 01:02 |
| → JEEB joined | 01:02 |
| ← clarkpan left | 01:03 |
| → Milk_weed joined | 01:04 |
| ← mikecmpbll left | 01:04 |
| → Parsecti_ joined | 01:04 |
| ← meLon left | 01:04 |
| ← King_Hual left | 01:04 |
| ← devoldmx left | 01:05 |
| → fstd_ joined | 01:05 |
| ← Bass10 left | 01:05 |
| → daito joined | 01:05 |
| ← Al1ve left | 01:05 |
| ← Schrostfutz left | 01:05 |
| ← pacbard left | 01:05 |
| ← TinkerTyper left | 01:05 |
| ← qoud left | 01:05 |
| ← drager left | 01:05 |
| → Schrostfutz_ joined | 01:06 |
| ← m_tadeu left | 01:06 |
| ← heinrich5991 left | 01:06 |
| ← Guest1846 left | 01:06 |
| ← ebernhardson left | 01:06 |
| → devoldmx joined | 01:07 |
| → m_tadeu joined | 01:07 |
| ← jazzzu left | 01:07 |
| → heinrich5991 joined | 01:07 |
| ← Jeroen52 left | 01:07 |
| → fstd__ joined | 01:07 |
| → blckshp joined | 01:07 |
| → Al1ve joined | 01:07 |
| → Nikoli_ joined | 01:08 |
| ← fstd left | 01:08 |
| ← Milkweed left | 01:08 |
| ← Nikoli left | 01:08 |
| ← JanC left | 01:08 |
| ← m1dnight_ left | 01:08 |
| → m0ltar joined | 01:08 |
| ← bket left | 01:08 |
| ← pigeon left | 01:08 |
| → flipp joined | 01:08 |
| flipp → Guest22875 | 01:08 |
| ← CheckDavid left | 01:08 |
| ← nda_ left | 01:09 |
| → pigeon joined | 01:09 |
| → RDove joined | 01:09 |
| ← RDove left | 01:09 |
| → RDove joined | 01:09 |
| → vmo joined | 01:09 |
| ← Nikhil_D left | 01:09 |
| ← m_tadeu left | 01:10 |
| → moritz_ joined | 01:10 |
| → kadoban joined | 01:10 |
| ← fstd_ left | 01:10 |
| ← FunkyELF left | 01:10 |
| ← vmo left | 01:10 |
|
blckshp
| i was on earlier. tried pushing and pulling and still won't update data to latest commit | 01:11 |
| ← Soliton left | 01:12 |
| → Soliton_ joined | 01:12 |
| Soliton_ → Soliton | 01:12 |
| ← fstd__ left | 01:12 |
| → vaq joined | 01:12 |
| ← vaq left | 01:13 |
| → `Nothing4You joined | 01:13 |
| → Olipro_ joined | 01:14 |
| ← AaronMT left | 01:14 |
| ← mizu_no_oto left | 01:14 |
| ← Arsonide left | 01:14 |
| ← crestbook left | 01:14 |
| → JanC joined | 01:15 |
| ← drocsid left | 01:15 |
| → Bruno_ joined | 01:16 |
| ← glebihan_ left | 01:16 |
| ← moritz left | 01:16 |
| → Nikhil_D1 joined | 01:16 |
| → jaznow joined | 01:16 |
| ← alexwhitman left | 01:16 |
| ← cdown left | 01:16 |
| ← D-Boy left | 01:16 |
| ← Caius left | 01:16 |
| ← xnox left | 01:16 |
| ← cnj left | 01:16 |
| ← weyer_ left | 01:16 |
| ← Nevik left | 01:16 |
| ← calops left | 01:16 |
| ← mischat left | 01:16 |
| ← Turl left | 01:16 |
| ← grumbel_ left | 01:16 |
| ← a2n left | 01:16 |
| ← luminous left | 01:16 |
| ← _flow_ left | 01:16 |
| → hyperair joined | 01:16 |
| ← jaznow left | 01:16 |
| ← Nikhil_D1 left | 01:16 |
| → Nikhil_D1 joined | 01:16 |
| Olipro_ → Olipro | 01:16 |
| ← hyperair left | 01:16 |
| → hyperair joined | 01:16 |
| ← hyperair left | 01:16 |
| → hyperair joined | 01:16 |
| ← hyperair left | 01:16 |
| → hyperair joined | 01:16 |
| `Nothing4You → Nothing4You | 01:16 |
| ← FunkyAss left | 01:16 |
| → drager_ joined | 01:16 |
| → Omfta joined | 01:16 |
| → mroach joined | 01:17 |
| → JustSomeone joined | 01:18 |
| ← JustSomeone left | 01:18 |
|
blckshp
| does this set up make sense? for web development i'm forced to use ftp. | 01:19 |
| ← DolphinDream left | 01:19 |
|
blckshp
| i set up a bare repo, clone to a production directory, clone to a dev directory and clone on another host | 01:20 |
| ← EminenceHC left | 01:20 |
| → alexwhitman joined | 01:20 |
| → D-Boy joined | 01:20 |
| → Caius joined | 01:20 |
| → Turl joined | 01:20 |
| → xnox joined | 01:20 |
| → cnj joined | 01:20 |
| → _flow_ joined | 01:20 |
| → a2n joined | 01:20 |
| → weyer_ joined | 01:20 |
| → grumbel_ joined | 01:20 |
| → Nevik joined | 01:20 |
| → calops joined | 01:20 |
| → mischat joined | 01:20 |
| → gmsim joined | 01:20 |
| → fishey1 joined | 01:20 |
| → Derega joined | 01:20 |
| → marlun joined | 01:20 |
| → JStoker joined | 01:20 |
| → haasn joined | 01:20 |
| → eXeC64 joined | 01:20 |
| → manitu joined | 01:20 |
| → bremner joined | 01:20 |
| → synchronous joined | 01:20 |
| → codebam joined | 01:20 |
| → kevinfagan_ joined | 01:20 |
| → whaley joined | 01:20 |
| → Bombe joined | 01:20 |
| → hughsaunders joined | 01:20 |
| → terkelg joined | 01:20 |
| → dom96 joined | 01:20 |
| → niax joined | 01:20 |
| → luminous joined | 01:20 |
| → Bilge joined | 01:20 |
| card.freenode.net set mode: +vvv | 01:20 |
| ← intransit left | 01:20 |
| ← _flow_ left | 01:20 |
| ← kevinfagan_ left | 01:20 |
| ← alexwhitman left | 01:20 |
| ← JStoker left | 01:20 |
| ← whaley left | 01:20 |
| ← cnj left | 01:20 |
| → kukks joined | 01:20 |
|
imachuchu
| blckshp: and? | 01:20 |
| → cnj joined | 01:20 |
|
blckshp
| any work is pushed remotely to dev for testing, then to bare repo | 01:21 |
| → kevinfagan joined | 01:21 |
| → jazzzu joined | 01:21 |
|
blckshp
| that way, more than one developer cn upload and test on dev, before pushing to production | 01:21 |
| → _flow_ joined | 01:22 |
|
blckshp
| production can pull from bare repo | 01:22 |
|
imachuchu
| blckshp: sounds workable, though you could just push to the bare then pull to dev (the testing repo) | 01:22 |
| → alexwhitman joined | 01:22 |
|
blckshp
| pull to dev with hook? | 01:23 |
| ← gambler left | 01:23 |
|
blckshp
| i'm a n00b | 01:24 |
| → m1dnight_ joined | 01:24 |
|
imachuchu
| blckshp: no, I wouldn't. IMO people should be able to push to the bare without actually deploying it anywhere (that way you can have a backup and a place to share code easily with others), then when people want to test they can pull it to the dev (testing) repo | 01:24 |
| → JStoker joined | 01:24 |
| ← JStoker left | 01:24 |
| → JStoker joined | 01:24 |
| JStoker → 32NABEVRL | 01:24 |
| → DolphinDream joined | 01:25 |
|
blckshp
| ah. gotcha :D | 01:25 |
|
imachuchu
| blckshp: yeah, that way people can push their changes without messing up anybody using the dev (testing) setup. | 01:25 |
|
blckshp
| @imachuchu well, i can't even push or pull right now. getting an error so i musta fuxerd something up | 01:27 |
| ← jgardella left | 01:27 |
| → aesinv joined | 01:28 |
| ← thiago left | 01:28 |
|
blckshp
| i cloned off of the clone of teh bare repo. was that a mistake? | 01:28 |
|
imachuchu
| blckshp: not nessesarily, all git repos are just peers of eachother so it should be the exact same | 01:29 |
| → fstd joined | 01:29 |
|
imachuchu
| blckshp: I have to leave, but !repro for everybody else | 01:30 |
|
gitinfo
| blckshp: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session. | 01:30 |
| ← imachuchu left | 01:30 |
|
blckshp
| if my only good copy is on my local (not on the server) how would you fix? | 01:30 |
| ← aesinv left | 01:30 |
| ← sbogg left | 01:31 |
| → Lyqyd joined | 01:33 |
| → popl joined | 01:34 |
| ← maletor left | 01:35 |
| → Jeroen52 joined | 01:35 |
| → alysson joined | 01:35 |
| ← Nikhil_D1 left | 01:35 |
| ← Noldorin left | 01:35 |
| ← kcj left | 01:35 |
| ← Tommy[D] left | 01:35 |
| ← shinnya left | 01:35 |
| ← ap0c left | 01:35 |
| ← sparetire left | 01:35 |
| ← akushner left | 01:35 |
| ← gccostabr left | 01:35 |
| ← timewa1ker left | 01:35 |
| ← MattMake_ left | 01:35 |
| ← pandeiro left | 01:35 |
| ← Quevin left | 01:35 |
| ← coastr left | 01:35 |
| ← clone1018 left | 01:35 |
| ← Xiti left | 01:35 |
| ← robinsmidsrod left | 01:35 |
| ← Vadtec left | 01:35 |
| ← dan64 left | 01:35 |
| ← mmattice left | 01:35 |
| ← rivarun left | 01:35 |
| ← rgenito left | 01:35 |
| ← yoh left | 01:35 |
| ← marcaddeo left | 01:35 |
| ← wagle left | 01:35 |
| ← lamont left | 01:35 |
| ← gabeio left | 01:35 |
| ← nezZario left | 01:35 |
| ← proq left | 01:35 |
| ← jaggz left | 01:35 |
| ← chernjie left | 01:35 |
| ← AKPWD left | 01:35 |
| ← Novacha left | 01:35 |
| ← estan left | 01:35 |
| ← tibl left | 01:35 |
| ← msm left | 01:35 |
| ← bitslip left | 01:35 |
| ← Devels left | 01:35 |
| ← Esya left | 01:35 |
| ← rj1 left | 01:35 |
| ← marvinpinto left | 01:35 |
| ← avtobiff left | 01:35 |
| ← mtj_ left | 01:35 |
| ← hyperair left | 01:35 |
| ← Guest22875 left | 01:35 |
| ← daito left | 01:35 |
| ← Parsecti_ left | 01:35 |
| ← LACabeza left | 01:35 |
| ← jontmorehouse left | 01:35 |
| ← Vile left | 01:35 |
| ← pierre1_ left | 01:35 |
| ← PaulCapestany left | 01:35 |
| ← jwhisnant left | 01:35 |
| ← tpollard left | 01:35 |
| ← jwest left | 01:35 |
| ← Errorical left | 01:35 |
| ← warthog9 left | 01:35 |
| ← dougsland left | 01:35 |
| ← jongravois left | 01:35 |
| ← michael_mbp left | 01:35 |
| ← Ragnar left | 01:35 |
| ← Squarism left | 01:35 |
| ← zso left | 01:35 |
| ← moparisthebest left | 01:35 |
| ← thejoecarroll left | 01:35 |
| ← Slush- left | 01:35 |
| ← tango_ left | 01:35 |
| ← neunon left | 01:35 |
| ← fr33domlover left | 01:35 |
| ← berndj left | 01:35 |
| ← Joost` left | 01:35 |
| ← Vgr left | 01:35 |
| ← gagan662 left | 01:35 |
| ← hide left | 01:35 |
| ← roknir left | 01:35 |
| ← Timvde left | 01:35 |
| ← zidoh left | 01:35 |
| ← madhatter left | 01:35 |
| ← SebastianFlyte left | 01:35 |
| ← sorind left | 01:35 |
| ← gbit86 left | 01:35 |
| ← jorj left | 01:35 |
| ← erichmenge left | 01:35 |
| ← roflik left | 01:35 |
| ← javawizard left | 01:35 |
| ← minerale left | 01:35 |
| ← hxm left | 01:35 |
| ← ulkesh left | 01:35 |
| ← romanovic left | 01:35 |
| ← mancha left | 01:35 |
| ← cite left | 01:35 |
| ← zequence left | 01:35 |
| ← benbergman left | 01:35 |
| ← ivan\ left | 01:35 |
| ← jfield left | 01:35 |
| ← hfp_work left | 01:35 |
| ← Kobaz left | 01:35 |
| ← BytesAndCoffee left | 01:35 |
| ← cxz left | 01:35 |
| ← nephyrin left | 01:35 |
| ← Virox left | 01:35 |
| ← chadi left | 01:35 |
| ← Someguy123 left | 01:35 |
| ← charon left | 01:35 |
| ← nitrix left | 01:35 |
| ← iaj_ left | 01:35 |
| ← akira left | 01:35 |
| ← eliasp left | 01:35 |
| ← th0rne left | 01:35 |
| ← doobeh left | 01:35 |
| ← Phlogistique left | 01:35 |
| ← quuxman left | 01:35 |
| ← `mist_ left | 01:35 |
| ← EdwardIII left | 01:35 |
| ← Celelibi left | 01:35 |
| → FunkyAss joined | 01:36 |
| → tristanp joined | 01:37 |
| → Xiti joined | 01:37 |
| → ome joined | 01:38 |
| ← ghostpl_ left | 01:39 |
| → whaley joined | 01:39 |
| → hyperair joined | 01:39 |
| → Nikhil_D1 joined | 01:39 |
| → Guest22875 joined | 01:39 |
| → daito joined | 01:39 |
| → Parsecti_ joined | 01:39 |
| → Noldorin joined | 01:39 |
| → jontmorehouse joined | 01:39 |
| → Vile joined | 01:39 |
| → kcj joined | 01:39 |
| → Tommy[D] joined | 01:39 |
| → pierre1_ joined | 01:39 |
| → shinnya joined | 01:39 |
| → marcaddeo joined | 01:39 |
| → PaulCapestany joined | 01:39 |
| → jwhisnant joined | 01:39 |
| → tpollard joined | 01:39 |
| → ap0c joined | 01:39 |
| → sparetire joined | 01:39 |
| → akushner joined | 01:39 |
| → jwest joined | 01:39 |
| → Phlogistique joined | 01:39 |
| → Errorical joined | 01:39 |
| → warthog9 joined | 01:39 |
| → dougsland joined | 01:39 |
| → jongravois joined | 01:39 |
| → timewa1ker joined | 01:39 |
| → michael_mbp joined | 01:39 |
| → Ragnar joined | 01:39 |
| → Squarism joined | 01:39 |
| → MattMake_ joined | 01:39 |
| → zso joined | 01:39 |
| → coastr joined | 01:39 |
| → pandeiro joined | 01:39 |
| → Quevin joined | 01:39 |
| → moparisthebest joined | 01:39 |
| → thejoecarroll joined | 01:39 |
| → th0rne joined | 01:39 |
| → clone1018 joined | 01:39 |
| → Slush- joined | 01:39 |
| → tango_ joined | 01:39 |
| → yoh joined | 01:39 |
| → neunon joined | 01:39 |
| → fr33domlover joined | 01:39 |
| → rgenito joined | 01:39 |
| → berndj joined | 01:39 |
| → robinsmidsrod joined | 01:39 |
| → Joost` joined | 01:39 |
| → quuxman joined | 01:39 |
| → Vgr joined | 01:39 |
| → gagan662 joined | 01:39 |
| → hide joined | 01:39 |
| → roknir joined | 01:39 |
| → Vadtec joined | 01:39 |
| → Timvde joined | 01:39 |
| → zidoh joined | 01:39 |
| → dan64 joined | 01:39 |
| → madhatter joined | 01:39 |
| → SebastianFlyte joined | 01:39 |
| → mmattice joined | 01:39 |
| → rivarun joined | 01:39 |
| → doobeh joined | 01:39 |
| → sorind joined | 01:39 |
| → gbit86 joined | 01:39 |
| → roflik joined | 01:39 |
| → jorj joined | 01:39 |
| → erichmenge joined | 01:39 |
| → wagle joined | 01:39 |
| → lamont joined | 01:39 |
| → javawizard joined | 01:39 |
| → minerale joined | 01:39 |
| → hxm joined | 01:39 |
| → estan joined | 01:39 |
| → EdwardIII joined | 01:39 |
| → ulkesh joined | 01:39 |
| → romanovic joined | 01:39 |
| → mancha joined | 01:39 |
| → gabeio joined | 01:39 |
| → cite joined | 01:39 |
| → zequence joined | 01:39 |
| → eliasp joined | 01:39 |
| → proq joined | 01:39 |
| → jaggz joined | 01:39 |
| → chernjie joined | 01:39 |
| → benbergman joined | 01:39 |
| → Someguy123 joined | 01:39 |
| → ivan\ joined | 01:39 |
| → jfield joined | 01:39 |
| → hfp_work joined | 01:39 |
| → AKPWD joined | 01:39 |
| → Novacha joined | 01:39 |
| → `mist_ joined | 01:39 |
| → Celelibi joined | 01:39 |
| → iaj_ joined | 01:39 |
| → tibl joined | 01:39 |
| → Kobaz joined | 01:39 |
| → msm joined | 01:39 |
| → bitslip joined | 01:39 |
| → Devels joined | 01:39 |
| → BytesAndCoffee joined | 01:39 |
| → Esya joined | 01:39 |
| → cxz joined | 01:39 |
| → nephyrin joined | 01:39 |
| → rj1 joined | 01:39 |
| → Virox joined | 01:39 |
| → chadi joined | 01:39 |
| → marvinpinto joined | 01:39 |
| → charon joined | 01:39 |
| → avtobiff joined | 01:39 |
| → mtj_ joined | 01:39 |
| → kandinski joined | 01:39 |
| → nitrix joined | 01:39 |
| → akira joined | 01:39 |
| → cworth joined | 01:39 |
| → plsk joined | 01:39 |
| → Aaeriele joined | 01:39 |
| → ejnahc joined | 01:39 |
| → hellome joined | 01:39 |
| → vifon joined | 01:39 |
| → salparadise joined | 01:39 |
| → deltab joined | 01:39 |
| → uber joined | 01:39 |
| → tjbp joined | 01:39 |
| → xnrand joined | 01:39 |
| → belak joined | 01:39 |
| → blueyed joined | 01:39 |
| → teknotus joined | 01:39 |
| → crankharder joined | 01:39 |
| → CentaurWarchief joined | 01:39 |
| → zizzfizzix joined | 01:39 |
| → elnur joined | 01:39 |
| → kloeri joined | 01:39 |
| → crater2150 joined | 01:39 |
| → loglaunch joined | 01:39 |
| → BinGOs joined | 01:39 |
| → here_ joined | 01:39 |
| → buMPnet_ joined | 01:39 |
| → SporkWitch joined | 01:39 |
| → ciaranm joined | 01:39 |
| → tsunamie joined | 01:39 |
| → tomek joined | 01:39 |
| card.freenode.net set mode: +v | 01:39 |
| → skoop joined | 01:39 |
| → Stravy joined | 01:39 |
| → dawik joined | 01:39 |
| → brainproxy joined | 01:39 |
| → BeerSerc joined | 01:39 |
| → BooK joined | 01:39 |
| → gtmanfred joined | 01:39 |
| → Rylee joined | 01:39 |
| → guibou joined | 01:39 |
| → h12o joined | 01:39 |
| → winny joined | 01:39 |
| → tureba joined | 01:39 |
| → ldlework joined | 01:39 |
| → colona_ joined | 01:39 |
| → Werring joined | 01:39 |
| → bob_f joined | 01:39 |
| → Moult joined | 01:39 |
| → deavid joined | 01:39 |
| → Mekkis joined | 01:39 |
| → Neptu joined | 01:39 |
| → bdesmet joined | 01:39 |
| ← Vgr left | 01:39 |
| ← jjasinski left | 01:39 |
|
blckshp
| try this: https://gist.github.com/anonymous/0fea4d2f3506d5e4689d | 01:39 |
| → Vgr joined | 01:39 |
| ← Nikhil_D1 left | 01:40 |
| ← Noldorin left | 01:40 |
| ← kcj left | 01:40 |
| ← Tommy[D] left | 01:40 |
| ← shinnya left | 01:40 |
| ← ap0c left | 01:40 |
| ← sparetire left | 01:40 |
| ← akushner left | 01:40 |
| ← timewa1ker left | 01:40 |
| ← MattMake_ left | 01:40 |
| ← pandeiro left | 01:40 |
| ← Quevin left | 01:40 |
| ← coastr left | 01:40 |
| ← clone1018 left | 01:40 |
| ← robinsmidsrod left | 01:40 |
| ← Vadtec left | 01:40 |
| ← dan64 left | 01:40 |
| ← mmattice left | 01:40 |
| ← rivarun left | 01:40 |
| ← rgenito left | 01:40 |
| ← yoh left | 01:40 |
| ← marcaddeo left | 01:40 |
| ← wagle left | 01:40 |
| ← lamont left | 01:40 |
| ← gabeio left | 01:40 |
| ← proq left | 01:40 |
| ← jaggz left | 01:40 |
| ← chernjie left | 01:40 |
| ← AKPWD left | 01:40 |
| ← Novacha left | 01:40 |
| ← estan left | 01:40 |
| ← tibl left | 01:40 |
| ← msm left | 01:40 |
| ← bitslip left | 01:40 |
| ← Devels left | 01:40 |
| ← Esya left | 01:40 |
| ← rj1 left | 01:40 |
| ← marvinpinto left | 01:40 |
| ← avtobiff left | 01:40 |
| ← mtj_ left | 01:40 |
| ← whaley left | 01:40 |
| ← hyperair left | 01:40 |
| ← Guest22875 left | 01:40 |
| ← daito left | 01:40 |
| ← Parsecti_ left | 01:40 |
| ← jontmorehouse left | 01:40 |
| ← Vile left | 01:40 |
| ← pierre1_ left | 01:40 |
| ← PaulCapestany left | 01:40 |
| ← jwhisnant left | 01:40 |
| ← tpollard left | 01:40 |
| ← jwest left | 01:40 |
| ← Errorical left | 01:40 |
| ← warthog9 left | 01:40 |
| ← dougsland left | 01:40 |
| ← jongravois left | 01:40 |
| ← michael_mbp left | 01:40 |
| ← Ragnar left | 01:40 |
| ← Squarism left | 01:40 |
| ← zso left | 01:40 |
| ← moparisthebest left | 01:40 |
| ← thejoecarroll left | 01:40 |
| ← Slush- left | 01:40 |
| ← tango_ left | 01:40 |
| ← neunon left | 01:40 |
| ← fr33domlover left | 01:40 |
| ← berndj left | 01:40 |
| ← Joost` left | 01:40 |
| ← gagan662 left | 01:40 |
| ← hide left | 01:40 |
| ← roknir left | 01:40 |
| ← Timvde left | 01:40 |
| ← zidoh left | 01:40 |
| ← madhatter left | 01:40 |
| ← SebastianFlyte left | 01:40 |
| ← sorind left | 01:40 |
| ← gbit86 left | 01:40 |
| ← jorj left | 01:40 |
| ← erichmenge left | 01:40 |
| ← roflik left | 01:40 |
| ← javawizard left | 01:40 |
| ← minerale left | 01:40 |
| ← hxm left | 01:40 |
| ← ulkesh left | 01:40 |
| ← romanovic left | 01:40 |
| ← mancha left | 01:40 |
| ← cite left | 01:40 |
| ← zequence left | 01:40 |
| ← benbergman left | 01:40 |
| ← ivan\ left | 01:40 |
| ← jfield left | 01:40 |
| ← hfp_work left | 01:40 |
| ← Kobaz left | 01:40 |
| ← BytesAndCoffee left | 01:40 |
| ← cxz left | 01:40 |
| ← nephyrin left | 01:40 |
| ← Virox left | 01:40 |
| ← chadi left | 01:40 |
| ← Someguy123 left | 01:40 |
| ← charon left | 01:40 |
| ← kandinski left | 01:40 |
| ← nitrix left | 01:40 |
| ← iaj_ left | 01:40 |
| ← akira left | 01:40 |
| ← cworth left | 01:40 |
| ← plsk left | 01:40 |
| ← Aaeriele left | 01:40 |
| ← ejnahc left | 01:40 |
| ← hellome left | 01:40 |
| ← vifon left | 01:40 |
| ← salparadise left | 01:40 |
| ← deltab left | 01:40 |
| ← eliasp left | 01:40 |
| ← uber left | 01:40 |
| ← tjbp left | 01:40 |
| ← xnrand left | 01:40 |
| ← th0rne left | 01:40 |
| ← doobeh left | 01:40 |
| ← belak left | 01:40 |
| ← blueyed left | 01:40 |
| ← CentaurWarchief left | 01:40 |
| ← zizzfizzix left | 01:40 |
| ← kloeri left | 01:40 |
| ← crater2150 left | 01:40 |
| ← loglaunch left | 01:40 |
| ← BinGOs left | 01:40 |
| ← here_ left | 01:40 |
| ← Phlogistique left | 01:40 |
| ← buMPnet_ left | 01:40 |
| ← SporkWitch left | 01:40 |
| ← ciaranm left | 01:40 |
| ← tomek left | 01:40 |
| ← skoop left | 01:40 |
| ← Stravy left | 01:40 |
| ← dawik left | 01:40 |
| ← brainproxy left | 01:40 |
| ← BeerSerc left | 01:40 |
| ← BooK left | 01:40 |
| ← crankharder left | 01:40 |
| ← gtmanfred left | 01:40 |
| ← Rylee left | 01:40 |
| ← guibou left | 01:40 |
| ← teknotus left | 01:40 |
| ← h12o left | 01:40 |
| ← winny left | 01:40 |
| ← quuxman left | 01:40 |
| ← `mist_ left | 01:40 |
| ← EdwardIII left | 01:40 |
| ← tureba left | 01:40 |
| ← elnur left | 01:40 |
| ← ldlework left | 01:40 |
| ← colona_ left | 01:40 |
| ← Werring left | 01:40 |
| ← bob_f left | 01:40 |
| ← Moult left | 01:40 |
| ← Celelibi left | 01:40 |
| ← deavid left | 01:40 |
| ← Mekkis left | 01:40 |
| ← bdesmet left | 01:40 |
| ← Neptu left | 01:40 |
| ← tsunamie left | 01:40 |
| ← lsiv568 left | 01:40 |
| ← 32NABEVRL left | 01:40 |
| ← Omfta left | 01:40 |
| ← drager_ left | 01:40 |
| ← xk_id left | 01:40 |
| ← clone1018_ left | 01:40 |
| ← LucasTT_ left | 01:40 |
| ← surs left | 01:40 |
| ← Mogget left | 01:40 |
| ← p0g0 left | 01:40 |
| ← offbyone left | 01:40 |
| ← aboccia left | 01:40 |
| ← mtscout6 left | 01:40 |
| ← rasto left | 01:40 |
| ← bernalex left | 01:40 |
| ← levifig left | 01:40 |
| ← NightMonkey left | 01:40 |
| ← hurley left | 01:40 |
|
jim
| blckshp, a 78 from curl means resource in url does not exist | 01:41 |
| → J1G|Anon126 joined | 01:41 |
| → whaley joined | 01:41 |
| → hyperair joined | 01:41 |
| → Nikhil_D1 joined | 01:41 |
| → Guest22875 joined | 01:41 |
| → daito joined | 01:41 |
| → Parsecti_ joined | 01:41 |
| → Noldorin joined | 01:41 |
| → jontmorehouse joined | 01:41 |
| → Vile joined | 01:41 |
| → kcj joined | 01:41 |
| → Tommy[D] joined | 01:41 |
| → pierre1_ joined | 01:41 |
| → shinnya joined | 01:41 |
| → marcaddeo joined | 01:41 |
| → PaulCapestany joined | 01:41 |
| → jwhisnant joined | 01:41 |
| → tpollard joined | 01:41 |
| → ap0c joined | 01:41 |
| → sparetire joined | 01:41 |
| → akushner joined | 01:41 |
| → jwest joined | 01:41 |
| → Phlogistique joined | 01:41 |
| → Errorical joined | 01:41 |
| → warthog9 joined | 01:41 |
| → dougsland joined | 01:41 |
| → jongravois joined | 01:41 |
| → timewa1ker joined | 01:41 |
| → michael_mbp joined | 01:41 |
| → Ragnar joined | 01:41 |
| → Squarism joined | 01:41 |
| → MattMake_ joined | 01:41 |
| → zso joined | 01:41 |
| → coastr joined | 01:41 |
| → pandeiro joined | 01:41 |
| → Quevin joined | 01:41 |
| → moparisthebest joined | 01:41 |
| → thejoecarroll joined | 01:41 |
| → th0rne joined | 01:41 |
| → clone1018 joined | 01:41 |
| → Slush- joined | 01:41 |
| → tango_ joined | 01:41 |
| → yoh joined | 01:41 |
| → neunon joined | 01:41 |
| → fr33domlover joined | 01:41 |
| → rgenito joined | 01:41 |
| → berndj joined | 01:41 |
| → robinsmidsrod joined | 01:41 |
| → Joost` joined | 01:41 |
| → quuxman joined | 01:41 |
| → gagan662 joined | 01:41 |
| → hide joined | 01:41 |
| → roknir joined | 01:41 |
| → Vadtec joined | 01:41 |
| → Timvde joined | 01:41 |
| → zidoh joined | 01:41 |
| → dan64 joined | 01:41 |
| → madhatter joined | 01:41 |
| → SebastianFlyte joined | 01:41 |
| → mmattice joined | 01:41 |
| → rivarun joined | 01:41 |
| → doobeh joined | 01:41 |
| → sorind joined | 01:41 |
| → gbit86 joined | 01:41 |
| → roflik joined | 01:41 |
| → jorj joined | 01:41 |
| → erichmenge joined | 01:41 |
| → wagle joined | 01:41 |
| → lamont joined | 01:41 |
| → javawizard joined | 01:41 |
| → minerale joined | 01:41 |
| → hxm joined | 01:41 |
| → estan joined | 01:41 |
| → EdwardIII joined | 01:41 |
| → ulkesh joined | 01:41 |
| → romanovic joined | 01:41 |
| → mancha joined | 01:41 |
| → gabeio joined | 01:41 |
| → cite joined | 01:41 |
| → zequence joined | 01:41 |
| → eliasp joined | 01:41 |
| → proq joined | 01:41 |
| → jaggz joined | 01:41 |
| → chernjie joined | 01:41 |
| → benbergman joined | 01:41 |
| → Someguy123 joined | 01:41 |
| → ivan\ joined | 01:41 |
| → jfield joined | 01:41 |
| → hfp_work joined | 01:41 |
| → AKPWD joined | 01:41 |
| → Novacha joined | 01:41 |
| → `mist_ joined | 01:41 |
| → Celelibi joined | 01:41 |
| → iaj_ joined | 01:41 |
| → tibl joined | 01:41 |
| → Kobaz joined | 01:41 |
| → msm joined | 01:41 |
| → bitslip joined | 01:41 |
| → Devels joined | 01:41 |
| → BytesAndCoffee joined | 01:41 |
| → Esya joined | 01:41 |
| → cxz joined | 01:41 |
| → nephyrin joined | 01:41 |
| → rj1 joined | 01:41 |
| → Virox joined | 01:41 |
| → chadi joined | 01:41 |
| → marvinpinto joined | 01:41 |
| → charon joined | 01:41 |
| → avtobiff joined | 01:41 |
| → mtj_ joined | 01:41 |
| → kandinski joined | 01:41 |
| → nitrix joined | 01:41 |
| → akira joined | 01:41 |
| → cworth joined | 01:41 |
| → plsk joined | 01:41 |
| → Aaeriele joined | 01:41 |
| → ejnahc joined | 01:41 |
| → hellome joined | 01:41 |
| → vifon joined | 01:41 |
| → salparadise joined | 01:41 |
| → deltab joined | 01:41 |
| → uber joined | 01:41 |
| → tjbp joined | 01:41 |
| → xnrand joined | 01:41 |
| → belak joined | 01:41 |
| → blueyed joined | 01:41 |
| → teknotus joined | 01:41 |
| → crankharder joined | 01:41 |
| → CentaurWarchief joined | 01:41 |
| → zizzfizzix joined | 01:41 |
| → elnur joined | 01:41 |
| → kloeri joined | 01:41 |
| → crater2150 joined | 01:41 |
| → loglaunch joined | 01:41 |
| → BinGOs joined | 01:41 |
| → here_ joined | 01:41 |
| → buMPnet_ joined | 01:41 |
| → SporkWitch joined | 01:41 |
| → ciaranm joined | 01:41 |
| → tsunamie joined | 01:41 |
| → tomek joined | 01:41 |
| → skoop joined | 01:41 |
| card.freenode.net set mode: +v | 01:41 |
| → Stravy joined | 01:41 |
| → dawik joined | 01:41 |
| → brainproxy joined | 01:41 |
| → BeerSerc joined | 01:41 |
| → BooK joined | 01:41 |
| → gtmanfred joined | 01:41 |
| → Rylee joined | 01:41 |
| → guibou joined | 01:41 |
| → h12o joined | 01:41 |
| → winny joined | 01:41 |
| → tureba joined | 01:41 |
| → ldlework joined | 01:41 |
| → colona_ joined | 01:41 |
| → Werring joined | 01:41 |
| → bob_f joined | 01:41 |
| → Moult joined | 01:41 |
| → deavid joined | 01:41 |
| → Mekkis joined | 01:41 |
| → Neptu joined | 01:41 |
| → bdesmet joined | 01:41 |
| ← tristanp left | 01:42 |
| → dm7freek joined | 01:42 |
| ← gargola left | 01:42 |
|
blckshp
| @jim yes, i know. I cannot find (or don't know where) 981e3f897f08f766a3cb3939add583c75791b1, what it is complaining about | 01:42 |
| → highcup joined | 01:42 |
| ← blast_hardcheese left | 01:42 |
| ← ValicekB left | 01:43 |
| → bket joined | 01:43 |
| → aesinv joined | 01:43 |
|
jim
| when you cloned, did it make a dir for the working dir? | 01:43 |
| → jjasinski joined | 01:43 |
| → redbird joined | 01:44 |
|
blckshp
| if i remember correctly, i made a bare repo. i cloned it to a working directory. i then cloned the clone to a remote machine for work on | 01:45 |
| ← srcerer left | 01:45 |
| → robins joined | 01:45 |
| ← redbird left | 01:46 |
|
blckshp
| i was able to push from local to first clone, but now something is messed up | 01:46 |
| → pacbard joined | 01:46 |
| ← highcup left | 01:46 |
| ← Zentdayn left | 01:47 |
|
blckshp
| i'm unable to push, pull/fetch now | 01:47 |
| → geomyidae_ joined | 01:47 |
| ← geomyidae_ left | 01:47 |
| → geomyidae_ joined | 01:47 |
|
jim
| from/to what? | 01:47 |
|
blckshp
| i'm unable to push from local to server (clone of bare repo) and i'm unable to pull/fetch from server (clone of repo) to local. It does not update the data on either target | 01:48 |
| ← iamjarvo left | 01:49 |
| → jason237 joined | 01:49 |
|
blckshp
| i'm willing to start over, but i'm just trying to understand what could have happened | 01:49 |
|
jim
| do you have write access to the original repo on the server | 01:49 |
|
| ? | 01:49 |
|
blckshp
| yes | 01:49 |
| ← DolphinDream left | 01:50 |
|
jim
| and is the thing on the server that you have write access to, a fork? | 01:50 |
| ← damccull left | 01:50 |
|
blckshp
| yes, i suppose it is a fork | 01:50 |
|
| i also have write access to the bare repo | 01:51 |
| → bn_ joined | 01:51 |
| ← Noldorin left | 01:51 |
| ← Squarism left | 01:51 |
| ← robinsmidsrod left | 01:51 |
| → terabit joined | 01:51 |
|
jim
| so it's forked from an original repo that you didn't have write? | 01:51 |
| ← MarkyC left | 01:51 |
| ← sparetire left | 01:52 |
| ← tibl left | 01:52 |
| ← rivarun left | 01:52 |
| ← wagle left | 01:52 |
| ← pandeiro left | 01:52 |
| ← rj1 left | 01:52 |
| ← dan64 left | 01:52 |
| ← dvl- left | 01:52 |
| ← m0ltar left | 01:52 |
| → tibl joined | 01:52 |
| → wagle joined | 01:52 |
| → pandeiro joined | 01:52 |
| → sparetire joined | 01:52 |
| → dan64 joined | 01:52 |
| → ValicekB joined | 01:53 |
| → DolphinDream joined | 01:53 |
|
blckshp
| it was forked from an original repo, but i had write access to both | 01:53 |
| → xk_id joined | 01:54 |
| → blast_hardcheese joined | 01:54 |
|
jim
| you should be very careful at this point... potentially all the repos you have write to could be damaged | 01:54 |
| → Dougie187 joined | 01:55 |
| ← nettoweb left | 01:55 |
| ← robustus left | 01:55 |
| → m0ltar joined | 01:55 |
| ← SebastianFlyte left | 01:56 |
| ← hellome left | 01:56 |
| → rj1 joined | 01:56 |
| → SebastianFlyte joined | 01:56 |
|
blckshp
| thanks. i just started so it isn't a big loss to start over (carefully of course!) | 01:56 |
|
jim
| *: is there any way to check a repo for consistancy? like lint or fsck? | 01:56 |
|
blckshp
| yes | 01:57 |
|
jim
| what happens when you clone from the original directly to your local machine? | 01:57 |
| → robustus|Off joined | 01:57 |
| robustus|Off → robustus | 01:58 |
| → nettoweb joined | 01:58 |
|
blckshp
| same thing, get error and only get first intial commit | 01:58 |
|
| any certain flags to use with fsck? | 01:59 |
|
popl
| I recently attempted to push some local changes from a particular branch to the QA machine at $work, and I got a merge conflict reported in some files I hadn't even touched. How can I determine where these changes originated? | 01:59 |
| → rivarun joined | 01:59 |
| → CKyle joined | 01:59 |
| → NABEVRL joined | 01:59 |
| → Omfta joined | 01:59 |
| → drager_ joined | 01:59 |
| → aboccia joined | 01:59 |
| → clone1018_ joined | 01:59 |
| → LucasTT_ joined | 01:59 |
| → surs joined | 01:59 |
| → Mogget joined | 01:59 |
| → p0g0 joined | 01:59 |
| → offbyone joined | 01:59 |
| → mtscout6 joined | 01:59 |
| → rasto joined | 01:59 |
| → bernalex joined | 01:59 |
| → levifig joined | 01:59 |
| → NightMonkey joined | 01:59 |
|
jim
| fsck is actually a file system checker... it's not for git repos. I'm looking for something git can do to check its own repos | 02:00 |
| ← terabit left | 02:00 |
| → otter768 joined | 02:00 |
|
jim
| lint is for C program source (not for git repos) | 02:00 |
|
blckshp
| @jim I thought you meant this: http://git-scm.com/docs/git-fsck | 02:01 |
| → EminenceHC joined | 02:01 |
|
popl
| I am examining the log with git log master --graph --abbrev-commit --decorate --date=relative --all. It looks like there may be a few cycles, and some of the colors are different, but I'm not sure what the different colors mean. | 02:01 |
|
| If someone could point me to any appropriate documentation I would be much obliged. | 02:01 |
| ← jazzzu left | 02:02 |
| → Goplat joined | 02:02 |
| → druidd joined | 02:02 |
| → corey84_ joined | 02:03 |
| ← baweaver left | 02:03 |
|
jim
| blckshp yeah, that would work... (first read its manpage so you know how to use it) check one of your clones first and see if they're ok (as they are) | 02:03 |
| ← Corey84 left | 02:03 |
|
jim
| then check the server | 02:04 |
| → serapath joined | 02:04 |
|
blckshp
| ran git fsck, no probs | 02:04 |
| corey84_ → Corey84 | 02:04 |
| ← serapath left | 02:04 |
|
jim
| on all of them? | 02:04 |
| ← EminenceHC left | 02:05 |
|
jim
| ok, make sure you have plenty of free disk space | 02:05 |
| → metastableB joined | 02:05 |
|
jim
| if you have less than 5%, that could be a problem | 02:05 |
| → akushner_ joined | 02:06 |
| → watabou joined | 02:07 |
| ← ErKa left | 02:07 |
| → Vampire0_ joined | 02:07 |
| → bramgg joined | 02:07 |
| → daito_ joined | 02:08 |
| → terabit joined | 02:08 |
| ← Vampire0 left | 02:10 |
| ← rivarun left | 02:10 |
| ← CKyle left | 02:10 |
| ← Omfta left | 02:10 |
| ← drager_ left | 02:10 |
| ← clone1018_ left | 02:10 |
| ← LucasTT_ left | 02:10 |
| ← surs left | 02:10 |
| ← Mogget left | 02:10 |
| ← p0g0 left | 02:10 |
| ← offbyone left | 02:10 |
| ← aboccia left | 02:10 |
| ← mtscout6 left | 02:10 |
| ← rasto left | 02:10 |
| ← bernalex left | 02:10 |
| ← levifig left | 02:10 |
| ← NightMonkey left | 02:10 |
| ← daito left | 02:10 |
| ← shinnya left | 02:10 |
| ← akushner left | 02:10 |
| ← akushner_ left | 02:11 |
| ← jottr left | 02:11 |
| → jottr_ joined | 02:11 |
|
blckshp
| will do. thanks for the guidance | 02:11 |
|
jim
| blckshp, check how much free disk space you have, on each involved machine | 02:11 |
| ← daito_ left | 02:11 |
| → daito joined | 02:11 |
| ← Sasazuka left | 02:12 |
| → donmichelangelo joined | 02:12 |
| → clarkpan joined | 02:12 |
|
jim
| blckshp, out of curiousity, and maybe to suggest others, what are you reading or otherwise doing to learn git? | 02:12 |
| ← Corey84 left | 02:12 |
| → corey84_ joined | 02:13 |
| ← bitkiller left | 02:13 |
| → jottr__ joined | 02:14 |
| ← michelangelo left | 02:14 |
|
blckshp
| i'll have to look at this server. i'm not sure which drive it is on. it could be <5% | 02:14 |
|
| http://git-scm.com/doc mainly | 02:14 |
|
| of course i had to read up on git ftp, and see how others did their workflow | 02:15 |
| ← myst left | 02:15 |
| ← Broatcast left | 02:15 |
| ← jottr_ left | 02:15 |
| → rivarun joined | 02:16 |
| → CKyle joined | 02:16 |
| → NABEVRL joined | 02:16 |
| → Omfta joined | 02:16 |
| → drager_ joined | 02:16 |
| → aboccia joined | 02:16 |
| → clone1018_ joined | 02:16 |
| → LucasTT_ joined | 02:16 |
| → surs joined | 02:16 |
| → Mogget joined | 02:16 |
| → p0g0 joined | 02:16 |
| → offbyone joined | 02:16 |
| → mtscout6 joined | 02:16 |
| → rasto joined | 02:16 |
| → bernalex joined | 02:16 |
| → levifig joined | 02:16 |
| → NightMonkey joined | 02:16 |
| ← stylica left | 02:16 |
| ← bernalex left | 02:16 |
| ← rivarun left | 02:16 |
| ← clone1018_ left | 02:16 |
| ← NightMonkey left | 02:16 |
| ← levifig left | 02:16 |
| ← Omfta left | 02:16 |
| ← aesinv left | 02:16 |
| → harish_ joined | 02:16 |
| ← harish_ left | 02:16 |
| → harish_ joined | 02:16 |
|
jim
| ok, so... there are tons of online videos on youtube, there's pro git (scott chacon), the full text of which is on git-scm, there are the man pages of each (sub)command which you can access on the web or your machine might have it... man git-(put subcommand name here) | 02:17 |
| → clone1018_ joined | 02:17 |
| → rivarun joined | 02:17 |
| ← barmaglot left | 02:17 |
|
jim
| there's git for computer scientests and git from the bottom up | 02:17 |
| → levifig joined | 02:17 |
| ← terabit left | 02:17 |
| → NightMonkey joined | 02:17 |
|
jim
| seems like everyone made an intro video :) | 02:18 |
| → suqc joined | 02:18 |
| → bernalex joined | 02:18 |
| → zivester joined | 02:18 |
|
jim
| there's lots of stuff on workflows and branching/merging strategies | 02:18 |
| ← suqc left | 02:19 |
| → aesinv joined | 02:19 |
| ← SumDude left | 02:19 |
| → Dei joined | 02:19 |
|
blckshp
| yeah. i think mine is a little unique in that i must use ftp beacuse pureftp has a virtualized user and it would be even more painful to chown everything | 02:20 |
| ← opdavies left | 02:20 |
| ← Dei left | 02:20 |
| → stylica joined | 02:21 |
| → uigx joined | 02:21 |
|
jim
| no wonder my web search says 550 is an ftp response code | 02:21 |
| → diegoaguilar joined | 02:23 |
| ← ashokrajar left | 02:23 |
| ← tmager left | 02:23 |
| ← stylica left | 02:23 |
| → stylica joined | 02:23 |
|
blckshp
| yep | 02:24 |
| ← Radivarig left | 02:24 |
|
Vinnie_win
| Can someone please tell me where git bash for Windows puts the .bashrc or .initrc or whatever script is run when bash is launched? | 02:24 |
| → dstarh joined | 02:25 |
| ← livingstn left | 02:26 |
| ← uigx left | 02:26 |
| ← druidd left | 02:26 |
| → ashokrajar joined | 02:27 |
|
jim
| blckshp, just something to know, you can use tar to backup your whole repo incl working dir | 02:27 |
| → Iiq joined | 02:27 |
| ← Iiq left | 02:27 |
| ← J1G|Anon126 left | 02:27 |
| ← leeN left | 02:27 |
| → J1G|Anon126 joined | 02:27 |
|
blckshp
| yes, i was aware. thanks! | 02:27 |
| ← J1G|Anon126 left | 02:27 |
| → J1G|Anon126 joined | 02:27 |
|
jim
| maybe you can get peace of mind from being aware of that... you can untar it anywhere and it would work, even the remotes | 02:28 |
| → David joined | 02:28 |
| → xpe joined | 02:28 |
| ← xpe left | 02:28 |
| → druidd joined | 02:28 |
| → uaes joined | 02:29 |
| ← uaes left | 02:29 |
| → jhuua joined | 02:30 |
| ← jhuua left | 02:30 |
| → unomystEz joined | 02:30 |
| → fiajo joined | 02:31 |
| ← zapb_ left | 02:31 |
| → zapb_ joined | 02:32 |
|
unomystEz
| i would like to deploy an application and it's configs out using git, im fairly familiar with git and i know it's not really suited for large binaries, etc.. | 02:32 |
| ← J1G|Anon126 left | 02:32 |
|
unomystEz
| i tried git fat but have run into issues with it after some heavy use, git annex seems promising though | 02:32 |
| → mizu_no_oto joined | 02:32 |
|
blckshp
| it does, actually. i tar them on a cron job (which may be why i'm running out of space!) | 02:32 |
|
unomystEz
| anything else i should look at? | 02:32 |
|
jim
| probably you should look at the url given by the bot !deply | 02:34 |
|
| !deploy | 02:34 |
|
gitinfo
| Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html | 02:34 |
|
unomystEz
| jim: thanks, I missed that | 02:34 |
|
| jim: very informative link, thanks again | 02:35 |
| → macabre joined | 02:35 |
| ← dm7freek left | 02:36 |
|
jim
| hmm, I should probably read it... good review tho :) | 02:36 |
| ← dougsland left | 02:37 |
|
unomystEz
| jim: someone on my team suggested just using svn since it doesn't clone the whole repo, i got about 5 mins through the svn tutorial (i forgot how to use it 7 years ago) and gave up, really missed git =p | 02:37 |
|
jim
| heh | 02:37 |
| ← curvv left | 02:38 |
|
jim
| I guess the implication of not cloning the repo is to remove the "distributed" attributes and abilities | 02:38 |
| echo-are` → echo-area | 02:39 |
|
unomystEz
| hmm, i actually don't like any of the proposed solutions from that link | 02:40 |
|
| think I'll play around with git-annex some more | 02:40 |
| → iamjarvo joined | 02:40 |
| ← iamjarvo left | 02:40 |
| ← ianbrandt left | 02:40 |
|
jim
| can you build a separate deployment tool? | 02:41 |
| → kapil___ joined | 02:41 |
| ← blckshp left | 02:41 |
|
unomystEz
| it must have also been written before git 1.7 | 02:41 |
| → iamjarvo joined | 02:41 |
| ← iamjarvo left | 02:41 |
| ← Lyqyd left | 02:41 |
|
jim
| probably, and we're at 2.3.something | 02:41 |
| → gopar joined | 02:41 |
|
unomystEz
| jim: i can but i was hoping to leverage git | 02:41 |
| → iamjarvo joined | 02:41 |
|
unomystEz
| i like to be able to say "how did the configs change over the past week", etc.. | 02:42 |
|
| git provides all of that power | 02:42 |
| ← Jetchisel left | 02:43 |
| → nnyk_ joined | 02:43 |
| ← dstarh left | 02:43 |
| ← Consuela left | 02:43 |
| ← drfoo left | 02:45 |
| → ashnur joined | 02:45 |
| → saint_ joined | 02:46 |
| → zpr joined | 02:47 |
| ← Dorf left | 02:48 |
| ← ashokrajar left | 02:49 |
|
zpr
| greetings! i am converting a production website to a deploy workflow with git. there are currently many important files in the "work tree" directory that arent in the actual repository (uploads, various cfg folders, etc.). my deploy hook calls for "git checkout -f" on the work tree. if I am checking out a branch that does not contain files that are in the current directory, will they get erased? or "removed" from the current work tree? | 02:49 |
| → zamabe joined | 02:50 |
| ← ropav left | 02:50 |
| → ashokrajar joined | 02:50 |
| → ropav joined | 02:51 |
| → ropav_ joined | 02:52 |
| → lys joined | 02:52 |
| ← kermit left | 02:54 |
| ← lidaaa left | 02:54 |
| ← aesinv left | 02:55 |
| ← ropav left | 02:56 |
| → aesinv joined | 02:56 |
| → ahr3n joined | 02:56 |
|
ahr3n
| hey; is there any way I can check what's changed within a directory over multiple commits? | 02:57 |
|
| For example; I have /app1 and /app2, and my colleague has been updating /app2 and I want to check over his multiple commits to see if he's edited anything in /app1 also | 02:57 |
| ← joeyDB left | 02:57 |
|
filcab
| git log revs -- app1? | 02:57 |
| → J1G|Anon126 joined | 02:58 |
|
ahr3n
| i'll try it! | 02:58 |
|
| cheers | 02:58 |
| ← pks left | 02:59 |
| ← CKyle left | 02:59 |
| ← jadne left | 02:59 |
| ← nb_bez___ left | 02:59 |
| → jaznow joined | 03:00 |
| → terabit joined | 03:00 |
| → pks joined | 03:00 |
| ← terabit left | 03:00 |
|
zamabe
| If I do a revert commit, does that just do the change in reverse or does it refer to the commit being revered? Would I be able to tell which commit was revered if the commit message was useless for that? | 03:01 |
| → terabit joined | 03:01 |
| → Jetchisel joined | 03:02 |
|
J1G|Anon126
| zamabe: it just does the change in reverse. the commit message is the only thing indicating which commit is reversed | 03:02 |
| ← MattMake_ left | 03:02 |
|
zamabe
| Thanks | 03:02 |
| ← bluesm left | 03:02 |
| ← dreiss left | 03:03 |
| ← tieTYT2 left | 03:04 |
| ← jaznow left | 03:04 |
| ← mizu_no_oto left | 03:05 |
| → skorgon joined | 03:06 |
| ← skorgon left | 03:06 |
| → skorgon joined | 03:06 |
| ← corey84_ left | 03:07 |
| ← Takumo left | 03:08 |
| ← Nevik left | 03:08 |
| ← synchronous left | 03:08 |
| → Nevik joined | 03:08 |
| ← otter768 left | 03:09 |
| ← gmsim left | 03:09 |
| → gmsim joined | 03:09 |
| → synchronous joined | 03:10 |
| ← msonntag left | 03:10 |
| → otter768 joined | 03:10 |
| → Takumo joined | 03:11 |
| ← Takumo left | 03:11 |
| → Takumo joined | 03:11 |
| → msonntag joined | 03:12 |
| → luriv_ joined | 03:14 |
| → glebihan_ joined | 03:15 |
| → t0th_-_ joined | 03:15 |
| ← nettoweb left | 03:16 |
| ← luriv left | 03:17 |
| → UndeadElbowMacar joined | 03:17 |
| → ErKa joined | 03:18 |
| ← ghoti left | 03:19 |
| ← daito left | 03:19 |
| → daito joined | 03:20 |
| ← rebs left | 03:20 |
| ← otter768 left | 03:20 |
| ← t0th_-_ left | 03:24 |
| → jottr joined | 03:25 |
| ← daito left | 03:25 |
| ← jottr__ left | 03:26 |
| → Es0teric joined | 03:26 |
| ← ropav_ left | 03:26 |
| → ghostpl_ joined | 03:27 |
| → highcup joined | 03:27 |
| → MLM joined | 03:28 |
| ← schlumpi left | 03:28 |
| ← Literphor left | 03:28 |
| → schlumpi joined | 03:29 |
| → rpg joined | 03:30 |
| ← ashokrajar left | 03:31 |
| → jgardella joined | 03:31 |
| ← darkbasic left | 03:31 |
| → Bruno__ joined | 03:32 |
| ← highcup left | 03:32 |
| ← rpg left | 03:32 |
| → darkbasic joined | 03:32 |
| → rpg joined | 03:32 |
| ← epifanio_ left | 03:32 |
| ← ghostpl_ left | 03:32 |
| → teufelChiCoder joined | 03:33 |
| ← duderonomy left | 03:33 |
| → tmager joined | 03:33 |
| ← stylica left | 03:33 |
| → SirRetnuh joined | 03:35 |
| ← Bruno_ left | 03:35 |
| → rubyonrailed joined | 03:35 |
| ← linuxmint left | 03:37 |
| → linuxmint joined | 03:40 |
| ← Es0teric left | 03:40 |
| → jeromelanteri joined | 03:41 |
|
jeromelanteri
| hello, is it possible to create a sub git repository ? | 03:42 |
| ← clarkpan left | 03:42 |
| ← pacbard left | 03:42 |
|
jeromelanteri
| for exemple, i have on my local machine, a directory for all my projects for Qt, an other one for my porjects from djang, an other one for projects for Rails... and then, in git, i would like to have QT5 repository, Rails and Django repository, and inside each, sub-repositories for each little ptest projects... is it possible and how to do that ? | 03:43 |
|
milki
| jeromelanteri: !subrepo | 03:43 |
|
gitinfo
| jeromelanteri: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding. | 03:43 |
| → clarkpan joined | 03:46 |
| → JR____ joined | 03:46 |
| → cagedwisdom joined | 03:46 |
|
jeromelanteri
| gitinfo and milki: thanks for answer and information, also, i'm newbie user of git... i see on web site that there is not simple way to add subrepo... but by terminal, for exemple, i'm on the local directory of one of my own QT5 project... and i want to create a subreop of my git QT5 repo... and push the project inside this git supbrepo... | 03:46 |
|
gitinfo
| jeromelanteri: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 03:46 |
|
jeromelanteri
| how to do it simple for exemple ? | 03:46 |
| ← alysson left | 03:47 |
| ← adamben_ left | 03:47 |
|
jeromelanteri
| ok milki, i go for search around subrepo command use. thanks | 03:47 |
| → githogori_ joined | 03:48 |
| ← githogori_ left | 03:48 |
| ← helgikrs left | 03:49 |
| → pacbard joined | 03:49 |
| → mueslo_ joined | 03:51 |
| → helgikrs joined | 03:51 |
| ← rubyonrailed left | 03:51 |
| → ropav joined | 03:52 |
| ← unomystEz left | 03:52 |
| → drodger joined | 03:53 |
| → joeyDB joined | 03:54 |
| ← mueslo left | 03:54 |
| ← schlumpi left | 03:57 |
|
jeromelanteri
| ok, i read this, if i well understand, there is no real subrepository, but virtual ones with organisation by a "submodule file" added to the repository... and then, for exemple, after that you can not mount them easily by QtCreator for exmple... because this change the command line for access the subrepository, because the real https adress suberpository not exist. right ? | 03:57 |
|
| so, if i understand, it is not possible to have a real sub repository. | 03:57 |
| → Segfault_ joined | 03:58 |
| → schlumpi joined | 03:59 |
| → das_beard joined | 03:59 |
| → CKyle joined | 03:59 |
| ← joeyDB left | 03:59 |
| ← rpg left | 04:01 |
| ← UndeadElbowMacar left | 04:01 |
| → ghoti joined | 04:01 |
| → dreiss joined | 04:02 |
| ← jgardella left | 04:02 |
| ← m0viefreak left | 04:02 |
| ← macabre left | 04:02 |
| → daito joined | 04:03 |
| ← SirRetnuh left | 04:04 |
| ← Dougie187 left | 04:04 |
| ← viscera left | 04:05 |
| ← ghoti left | 04:06 |
| ← lys left | 04:06 |
| ← jottr left | 04:09 |
| → ghoti joined | 04:10 |
| ← dreiss left | 04:12 |
| ← tmager left | 04:13 |
| ← kadoban left | 04:15 |
| ← ghoti left | 04:15 |
| ← mezod left | 04:17 |
| ← fiajo left | 04:18 |
| ← madewokherd left | 04:19 |
| → Guest98427 joined | 04:19 |
| ← leolrrj left | 04:20 |
| → kermit joined | 04:21 |
| ← jontmorehouse left | 04:21 |
| ← stymo left | 04:23 |
| → Bruno_ joined | 04:25 |
| → Mobutils joined | 04:25 |
| ← kukks left | 04:26 |
| ← Bruno__ left | 04:28 |
| → kyb3r_ joined | 04:29 |
| → ozialien joined | 04:29 |
| ← thomas left | 04:30 |
| ← druidd left | 04:31 |
| ← toothrot left | 04:31 |
| ← JanC left | 04:32 |
| → thomas joined | 04:32 |
| ← lindenle left | 04:33 |
| → MattMaker joined | 04:33 |
|
dmarr
| if i have an upstream and want to check it out to a new branch how would i? | 04:33 |
|
| co -b upstream/foo localfoo # didnt work i guess because i dont have a localfoo branch? | 04:34 |
|
milki
| swap your arguemtns and read man git checkout | 04:34 |
|
gitinfo
| the git-checkout manpage is available at http://jk.gs/git-checkout.html | 04:34 |
|
dmarr
| ah that makes more sense | 04:35 |
|
| startpoint would be the upstream | 04:35 |
| → fatalhalt joined | 04:35 |
| → JanC joined | 04:36 |
| ← DolphinDream left | 04:36 |
| → BuenGenio joined | 04:37 |
| → ropav_ joined | 04:38 |
| ← saint_ left | 04:38 |
| → specious joined | 04:38 |
| ← MattMaker left | 04:39 |
| → lpmulligan joined | 04:39 |
|
jeromelanteri
| milki: that i think about sub-repo is correct or not ? | 04:39 |
| → GODDOG joined | 04:40 |
| ← ropav left | 04:40 |
| → autochthon joined | 04:41 |
|
milki
| 6i dont know what a "real" sub repository means | 04:42 |
|
| and i have no clue about your !gui | 04:42 |
|
gitinfo
| Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed. | 04:42 |
| → Consuela joined | 04:42 |
| → stymo joined | 04:43 |
| ← stymo left | 04:43 |
| → beautifulmind joined | 04:44 |
| → diegoaguilar_ joined | 04:44 |
| ← diegoaguilar_ left | 04:45 |
| → RaceCondition joined | 04:46 |
| → curiousmansi joined | 04:46 |
| ← CKyle left | 04:47 |
| → lindenle joined | 04:47 |
| → jaznow joined | 04:49 |
| → stacks_ joined | 04:51 |
| → Xethron joined | 04:52 |
|
stacks_
| the nsa has their hands in everything. Very informative and powerful documentary about Edward Snowden called Citizenfour http://weshare.me/e33be3d590f32460/Citizenfour_(2014)_-_The_Edward_Snowden_Story.mp4 | 04:53 |
| ← stacks_ left | 04:53 |
| ← m0ltar left | 04:53 |
| ← jaznow left | 04:53 |
| ← beautifulmind left | 04:53 |
| → beautifulmind joined | 04:54 |
| ← pacbard left | 04:55 |
| ← iamjarvo left | 04:56 |
| → jeffmjack joined | 04:57 |
| → Vadimus joined | 04:57 |
| ← lpmulligan left | 04:58 |
|
milki
| ... | 04:58 |
| → irqq joined | 04:58 |
|
milki
| 21:00 [freenode] -!- p 0 staff members | 05:00 |
|
| no ops are available -.- | 05:00 |
| ← lindenle left | 05:00 |
| → BackEndCoder joined | 05:00 |
| → lindenle joined | 05:01 |
| → The_Phoenix joined | 05:01 |
|
BackEndCoder
| hi, i am trying to change authour on a single commit (it was a root fresh install) | 05:01 |
| ← The_Phoenix left | 05:01 |
|
BackEndCoder
| problem is, when a rebase, it says its mid cherry pick | 05:01 |
|
| so i can't set an author | 05:01 |
|
| and finish the rebase | 05:01 |
|
| but sad cause it makes the contributors look werid on github :( | 05:02 |
|
milki
| "it says its mid cherry pick" | 05:02 |
|
| a !repro would be good | 05:02 |
|
gitinfo
| [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session. | 05:02 |
| ← Xethron left | 05:03 |
| → The_Phoenix joined | 05:03 |
|
BackEndCoder
| and also, the commit i want to edit, happens to be one that moves loads of files around | 05:03 |
| ← The_Phoenix left | 05:03 |
| → The_Phoenix joined | 05:03 |
| → Xethron joined | 05:03 |
| ← The_Phoenix left | 05:04 |
|
dmarr
| is that correct syntax? git ls-remote -h [email@hidden.address] HEAD | 05:04 |
| → SirRetnuh joined | 05:04 |
|
milki
| "correct" for what? | 05:05 |
|
| and !tias | 05:05 |
|
gitinfo
| Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS. | 05:05 |
| → subhojit777 joined | 05:05 |
|
milki
| dmarr: also man git ls-remote | 05:06 |
|
gitinfo
| dmarr: the git-ls-remote manpage is available at http://jk.gs/git-ls-remote.html | 05:06 |
|
BackEndCoder
| https://gist.github.com/BackEndCoder/c98ced32e076cd643cb3 | 05:06 |
| ← lindenle left | 05:06 |
|
BackEndCoder
| i didn't get as fafter as the cherry pick this time | 05:06 |
| ← GODDOG left | 05:06 |
|
BackEndCoder
| the rebase line gave me a file, i changed the commit i wanted to change the author to 'edit form pick' | 05:06 |
| ← robbyoconnor left | 05:06 |
|
dmarr
| jenkins git plugin is saying it couldnt connect, so i tried over https, and I don't get any errors but i also don't see any output | 05:06 |
| → MattMaker joined | 05:07 |
|
milki
| BackEndCoder: why are you talking about a cherry pick if you are showing a rebase? | 05:07 |
|
| BackEndCoder: have you done things before this rebase? | 05:07 |
|
BackEndCoder
| cause i didn't do a cherry pick | 05:07 |
|
| no, it was a clean pull | 05:08 |
|
dmarr
| milki: i see -h Limit to only refs/heads and refs/tags, respectively. | 05:08 |
|
BackEndCoder
| no attempt at a cherry pick | 05:08 |
|
dmarr
| but i'm not clear what that is for | 05:08 |
| → lidaaa joined | 05:08 |
|
milki
| BackEndCoder: o, by file ,you mean thing the pick, edit lines | 05:08 |
|
dmarr
| refs/heads? | 05:08 |
|
BackEndCoder
| yes milki | 05:09 |
| ← ozialien left | 05:09 |
|
milki
| BackEndCoder: if you only do picsk and edits, this shouldnt have happened | 05:09 |
| ← Vadimus left | 05:09 |
|
BackEndCoder
| i've done this before | 05:09 |
|
milki
| unless you have an explicit empty commit | 05:09 |
|
BackEndCoder
| hence why i came here to ask | 05:09 |
| ← SirRetnuh left | 05:09 |
| → jontmorehouse joined | 05:09 |
|
BackEndCoder
| i did try it a different way, the last commit is a empty commit | 05:10 |
|
| is that why its breaking ? i can do a revert ? | 05:10 |
|
milki
| if this is intentional, then its safe to git rebase --skip | 05:10 |
| ← autochthon left | 05:10 |
| → Polyatomic joined | 05:10 |
|
BackEndCoder
| ok, so i did that command | 05:11 |
|
| but i'm worried that its pulled back my old .gitignore | 05:11 |
|
| so its asking me to commit a load of files i wanted ignored | 05:12 |
| → irqq_ joined | 05:12 |
|
milki
| BackEndCoder: a rebase will not add or delete any extra files that werent made in the commits | 05:12 |
|
| it will only do what the commits told it to do | 05:13 |
| ← beautifulmind left | 05:13 |
| ← irqq left | 05:13 |
| irqq_ → irqq | 05:13 |
|
BackEndCoder
| my new improved .gitignore might be in a later commit | 05:13 |
|
| i'm in danger of trying to upload 1000 images to github | 05:14 |
|
milki
| sure. gitignore will not apply retroactively | 05:14 |
| → Raging_Hog joined | 05:14 |
|
milki
| and it doesnt apply to tracked files | 05:14 |
|
| you need to fix that yourself | 05:14 |
|
| and itll probably be difficult to fix | 05:14 |
|
| there might be ways with filter-branch, but im not going to try to figure it out | 05:15 |
|
| the internets might have a decent example | 05:15 |
| ← beneggett left | 05:16 |
| → ghostpl_ joined | 05:16 |
|
BackEndCoder
| yeah when i try and ammend the authour at this stage | 05:17 |
|
| it thinks i'm mid cherry pick | 05:18 |
|
| figures | 05:18 |
| → cromero joined | 05:18 |
|
BackEndCoder
| thanks for your help | 05:18 |
|
jeromelanteri
| milki: my question is not around GUi or not (definitly not), but about the fact of something i maybe not understand: the subrepo sommand create a REAL (check the definition of the word if you not understand what is REAL) "sub repository" that can show a link to a representative url or just an artifice to make a simulation of a sub repository ? | 05:19 |
|
jim
| BackEndCoder, you're not in any danger, you have full control of everything... nothing gets sent to github that's not in a local commit, nothing gets in a local commit without being added and then committed | 05:19 |
|
BackEndCoder
| but when i try to amend the authour, it thinks i'm mid cherry pick | 05:20 |
|
| so it just fails anyway | 05:20 |
| ← ahr3n left | 05:20 |
|
jim
| does git status show clean? | 05:20 |
|
jeromelanteri
| for exemple (to illustrate my question), if i use subrepo command, does i have an url like: https://github.com/my_name/my_repo/my_sub_repo or not ? | 05:21 |
| → otter768 joined | 05:21 |
| → Literphor joined | 05:21 |
| ← ghostpl_ left | 05:21 |
|
milki
| jeromelanteri: no, sub repos are normal repos that live somewhere else | 05:22 |
| ← daito left | 05:22 |
|
milki
| jeromelanteri: github.com/your_name/your_sub_repo | 05:22 |
|
| jeromelanteri: they must exist as independent sub repos | 05:23 |
|
| er | 05:23 |
|
| independent repos | 05:23 |
| → daito joined | 05:23 |
|
jim
| is this true: "a subrepo is just a repo and it follows all the same rules"? | 05:23 |
|
milki
| but you can "link" them | 05:23 |
| → beautifulmind joined | 05:23 |
|
jeromelanteri
| so it is not a REAL su_repo. ok , thanks milki | 05:23 |
|
milki
| what are teh "same rules" | 05:23 |
| ← daito left | 05:23 |
| → GT4066 joined | 05:23 |
|
jim
| all the things that apply to a plain ol regular repo | 05:23 |
| → hahuang65 joined | 05:24 |
|
milki
| yes, they all apply | 05:24 |
|
| they are repos | 05:24 |
| → pacbard joined | 05:24 |
| → daito joined | 05:24 |
|
milki
| you[Bthey have a .git repo in themdirectory in them | 05:24 |
|
jeromelanteri
| so there is not too much sens to do a (strange) sub_repos (ther is some, but very limited) | 05:24 |
|
milki
| if you sbscribe to the workflow they are trying to solve, then they are useful | 05:25 |
|
iveqy
| jeromelanteri: we are talking about git subrepo here and not git submodules right? | 05:25 |
|
milki
| otherwise, if you have no idea what you are trying to do with them, its a bad idea (tm) | 05:25 |
|
jim
| it seems to just be a structure surrounding a group of repos | 05:25 |
| ← ahmetalpbalkan left | 05:25 |
| ← otter768 left | 05:25 |
|
jeromelanteri
| iveqy: i don't know... yes... i'm new for use git and would just like to have some sub repos to use inside repos. | 05:25 |
|
milki
| if you think you want a sub repo, you probably dont need one | 05:26 |
|
jeromelanteri
| milki: i can not undertsand the sens of your form of answer... | 05:26 |
|
iveqy
| jeromelanteri: then you should use git submodule. | 05:26 |
|
| jeromelanteri: !submodules | 05:26 |
|
gitinfo
| jeromelanteri: [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules | 05:26 |
|
milki
| but if you dont know anything about Makefiles and scripts, then its a quickfix | 05:26 |
|
| jeromelanteri: _why_ do you want repos inside repos? | 05:27 |
|
jeromelanteri
| iveqy: i read about submodeul too... but in fact, that i understand (and maybe bad), is that after do that, you will have some special commands to access tem... | 05:27 |
|
| milki: i explain my idea again (like i do just one hour ago): | 05:27 |
|
jim
| in my case the subrepos or submodules or subtrees might be plugins | 05:28 |
|
iveqy
| jeromelanteri: no you wont. You will have special commands to handle them, but not to access them | 05:28 |
|
jeromelanteri
| i have many differents projects: some of them from Qt5, some other from Rails, some other from Django | 05:28 |
|
| and then, i want to have repos for type of projects (one for Rails, one for Django, one for QT5) | 05:28 |
|
| inside each of them, i would like to have sub-repo for each project | 05:28 |
| ← netj left | 05:29 |
|
jeromelanteri
| and then, handle them like a normal repo | 05:29 |
|
| possible or not ? | 05:29 |
|
iveqy
| jeromelanteri: so say that you've 2 Qt5 projects | 05:29 |
|
milki
| ok, that doenst explain much still. " i would like to have sub-repo for each project | 05:29 |
|
| " | 05:29 |
|
jim
| but really the plugin repos are just subdirs which happen to have .git and which have remotes | 05:29 |
|
milki
| why do you want that? | 05:29 |
|
jeromelanteri
| iveqy: yes | 05:29 |
| → netj joined | 05:29 |
|
jeromelanteri
| milki: why not ? (i like organisation) | 05:30 |
| → ahr3n joined | 05:30 |
|
iveqy
| jeromelanteri: named a and b. Project A is version 1 and project B is version 1. Now you develop project B to version 2. How does this effect project A? Is it so that project A might need adjustments to handle a new version of B? | 05:30 |
|
jeromelanteri
| why am i lik ethis or like that ? it is because it is like that. | 05:30 |
|
| iveqy: i follow you, thanks... | 05:30 |
|
| iveqy: no | 05:31 |
|
| project A and B are totaly separate thinks in my situation | 05:31 |
|
iveqy
| jeromelanteri: then you've no need to keep track of the versions between two repositories and hence you should keep them apart and not as submodules. Submodules are when you have a relation between your repositories | 05:31 |
|
jeromelanteri
| iveqy: ok, i understand the idea around this choice. | 05:32 |
|
iveqy
| (of course you could use git submodule, but it would just be extra work) | 05:32 |
| ← irqq left | 05:32 |
|
jeromelanteri
| so for be able to have some organisation seprattion between langegs use for projects, i need to create different account... right ? | 05:33 |
|
milki
| if its _just_ organization, you dont need anything special | 05:33 |
|
| like !subrepo says, just put your repo there | 05:33 |
|
gitinfo
| [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding. | 05:33 |
|
iveqy
| using git submodule each child repo is like a normal (almost) git repo, and you work inside that repo as you normally do. It's just when you update the parent repo you use git submodule commands | 05:33 |
|
jeromelanteri
| or give them a specific name and all of them are in the basket in "bordel"... | 05:33 |
| ← J1G|Anon126 left | 05:33 |
|
milki
| iveqy has this. my itnernet is lagging out -.- | 05:33 |
| → thiago joined | 05:34 |
|
jeromelanteri
| ok huys, i better understand what i can do or not with git now. My solution have to open different account for separate projects coding style. | 05:35 |
|
| guys | 05:35 |
|
| thanks | 05:35 |
| → lindenle joined | 05:36 |
| → ashokrajar joined | 05:37 |
| ← ashokrajar left | 05:38 |
| ← lindenle left | 05:38 |
| → ashokrajar joined | 05:38 |
| → egray_ joined | 05:38 |
| ← beautifulmind left | 05:38 |
| → beautifulmind joined | 05:39 |
| ← wethu left | 05:40 |
| ← knownasilya left | 05:41 |
| ← beautifulmind left | 05:41 |
| ← thiago left | 05:41 |
| → beautifulmind joined | 05:42 |
| ← JR____ left | 05:42 |
| → joeyDB joined | 05:43 |
| ← jongravois left | 05:44 |
| → thiago joined | 05:44 |
| ← in3xes left | 05:44 |
| → jongravois joined | 05:44 |
| → in3xes joined | 05:45 |
| ← Parsecti_ left | 05:46 |
| → ParsectiX joined | 05:46 |
| ← devoldmx left | 05:47 |
| → bb010g joined | 05:49 |
| ← jongravois left | 05:49 |
| ← joeyDB left | 05:49 |
| → devoldmx joined | 05:51 |
| → mennea joined | 05:51 |
| → Tommy[D]_ joined | 05:52 |
| ← beautifulmind left | 05:53 |
| ← clarkpan left | 05:53 |
| ← egray_ left | 05:53 |
| ← tpollard left | 05:54 |
| → beautifulmind joined | 05:54 |
| ← Tommy[D] left | 05:56 |
| ← ahr3n left | 05:56 |
| ← zamabe left | 05:57 |
| → clarkpan joined | 05:58 |
| ← The-Compiler left | 05:58 |
| ← nnyk_ left | 05:59 |
| ← echo-area left | 05:59 |
| → echo-area joined | 05:59 |
| ← ashokrajar left | 06:00 |
| → ashokrajar joined | 06:01 |
| ← RaceCondition left | 06:02 |
| → boombatower joined | 06:03 |
| ← boombatower left | 06:03 |
| → boombatower joined | 06:03 |
| ← gyeates left | 06:04 |
| ← beautifulmind left | 06:06 |
| → jonmorehouse joined | 06:06 |
| ← jontmorehouse left | 06:06 |
| → barduck joined | 06:07 |
| ← ParsectiX left | 06:09 |
| → zoso joined | 06:10 |
|
iveqy
| jeromelanteri: accounts are in now way a part of git. Git doesn't do access control | 06:11 |
| ← mennea left | 06:11 |
| ← clarkpan left | 06:11 |
| → nnyk_ joined | 06:13 |
| ← specious left | 06:14 |
| → beautifulmind joined | 06:15 |
| → pantsman- joined | 06:15 |
| ← beautifulmind left | 06:15 |
| → settermjd joined | 06:16 |
| → SirRetnuh joined | 06:16 |
| ← cromero left | 06:17 |
| → highcup joined | 06:17 |
| ← Xiti left | 06:18 |
| → Xiti joined | 06:18 |
| ← Bruno_ left | 06:19 |
| → devoldmx3 joined | 06:20 |
| ← settermjd left | 06:20 |
| ← Guest98427 left | 06:21 |
| ← highcup left | 06:21 |
| → lqi joined | 06:22 |
| → Ioa joined | 06:22 |
| ← zivester left | 06:23 |
| ← devoldmx left | 06:23 |
| → MechtiIde joined | 06:28 |
| ← Goplat left | 06:28 |
| → clarkpan joined | 06:29 |
| → Xeago joined | 06:29 |
| → arup_r joined | 06:29 |
| ← pierre1_ left | 06:30 |
| → curvv joined | 06:30 |
| ← nnyk_ left | 06:33 |
| ← pantsman- left | 06:36 |
| → jaznow joined | 06:37 |
| → aviraldg joined | 06:37 |
| → dreiss joined | 06:38 |
| ← aviraldg left | 06:38 |
| → lindenle joined | 06:38 |
| → aviraldg joined | 06:39 |
| ← aviraldg left | 06:39 |
| → aviraldg joined | 06:40 |
| ← aviraldg left | 06:40 |
| → [aviraldg] joined | 06:41 |
| → Osi joined | 06:41 |
| ← Osi left | 06:41 |
| ← SirCmpwn left | 06:41 |
| ← [aviraldg] left | 06:41 |
| ← aesinv left | 06:41 |
| ← jaznow left | 06:42 |
| → aviraldg joined | 06:42 |
| ← Ioa left | 06:42 |
| → TomyLobo joined | 06:42 |
| ← aviraldg left | 06:42 |
| ← clarkpan left | 06:43 |
| ← lindenle left | 06:43 |
| ← hvxgr left | 06:43 |
| → ghoti joined | 06:43 |
| → sinkensabe joined | 06:43 |
| ← das_beard left | 06:44 |
| → beautifulmind joined | 06:45 |
| ← boombatower left | 06:45 |
| ← beautifulmind left | 06:46 |
| → SirCmpwn joined | 06:48 |
| ← starkhalo left | 06:48 |
| ← ghoti left | 06:48 |
| → wachterjohannes joined | 06:49 |
| → ThomasLocke joined | 06:49 |
| → thebrush joined | 06:49 |
| → Eeuq joined | 06:49 |
| ← Eeuq left | 06:49 |
| ← thebrush left | 06:50 |
| → thebrush joined | 06:50 |
| → crestbook joined | 06:50 |
|
jeromelanteri
| iveqy: good... i will go by this way: an account for each code style project. It is ok for me like that. | 06:51 |
| ← Xeago left | 06:51 |
| → Hih joined | 06:52 |
| ← Hih left | 06:52 |
| ← ome left | 06:53 |
| → jargon joined | 06:53 |
| → Vqeg joined | 06:54 |
| ← Vqeg left | 06:54 |
| ← sinkensabe left | 06:55 |
| ← linuxmint left | 06:56 |
| → mkaesz joined | 06:56 |
| ← crestbook left | 06:56 |
| → beautifulmind joined | 06:57 |
| → PCatinean joined | 06:58 |
| → Silmarilion joined | 06:58 |
| → Guest25837 joined | 06:59 |
| ← aerth left | 07:00 |
| → aerth joined | 07:00 |
| ← Consuela left | 07:00 |
| ← SirRetnuh left | 07:01 |
| → arup_r_ joined | 07:01 |
| ← ErKa left | 07:02 |
| → Consuela joined | 07:02 |
| ← Consuela left | 07:03 |
| → Consuela joined | 07:03 |
| ← arup_r left | 07:05 |
| ← MechtiIde left | 07:05 |
| → pm90_ joined | 07:05 |
| → ghostpl_ joined | 07:05 |
| ← polyzen left | 07:06 |
| ← watabou left | 07:06 |
| ← nagromlt left | 07:07 |
| → Macaveli joined | 07:08 |
| → mskaesz joined | 07:08 |
| ← Macaveli left | 07:08 |
| → Macaveli joined | 07:09 |
| ← mkaesz left | 07:09 |
| ← Literphor left | 07:10 |
| → serengeor joined | 07:10 |
| → ciampix joined | 07:10 |
| ← ghostpl_ left | 07:10 |
| → freimatz joined | 07:11 |
| → aesinv joined | 07:12 |
| → opdavies joined | 07:12 |
| → mennea joined | 07:13 |
| → hvxgr joined | 07:13 |
| ← veebers left | 07:14 |
| ← hahuang65 left | 07:16 |
| ← curiousmansi left | 07:17 |
| ← MLM left | 07:17 |
| → acolson joined | 07:18 |
| ← aesinv left | 07:19 |
| → ghoti joined | 07:19 |
| → aswen joined | 07:19 |
| → roelmonnens joined | 07:20 |
| ← kermit left | 07:21 |
| ← jeffmjack left | 07:21 |
| ← mroach left | 07:21 |
| → otter768 joined | 07:22 |
| ← metastableB left | 07:22 |
| ← tyreld left | 07:22 |
| → jceb joined | 07:23 |
| → pcypher joined | 07:23 |
| → thms joined | 07:25 |
| ← gsingh93 left | 07:25 |
|
thms
| Hi everyone. I am freelancing and some guy asked me to add all files to bitbuck. | 07:25 |
|
| Turns out the thing is 109G. | 07:25 |
|
| I ran git add origin, and git add . (it took hours alrady) | 07:26 |
|
| I'm doing commit -am "first commit" which runs for 25mins already.. too. | 07:26 |
| ← skorgon left | 07:26 |
|
thms
| I would like to clean the shit and do another repo, but how will git commit behave if I start removing files at this point ? | 07:26 |
| ← otter768 left | 07:26 |
| → sinkensabe joined | 07:27 |
| ← SirCmpwn left | 07:28 |
| → wethu joined | 07:28 |
| → NosBit joined | 07:29 |
| → leolrrj joined | 07:30 |
| ← zpr left | 07:30 |
| ← ghoti left | 07:30 |
| → Corey84 joined | 07:31 |
| → ghoti joined | 07:31 |
| ← paulweb515 left | 07:31 |
| ← cwillu_at_work left | 07:32 |
| → jongravois joined | 07:32 |
| → paulweb515 joined | 07:32 |
| → ende joined | 07:32 |
| → joeyDB joined | 07:33 |
| → kotopies joined | 07:34 |
| ← kotopies left | 07:34 |
| → SirCmpwn joined | 07:35 |
|
bremner
| thms: !large | 07:35 |
|
gitinfo
| thms: [!large_files] Git isn't yet great at large files(larger than RAM). Look at !annex for solutions. You can find them (after gc) with: git verify-pack -v .git/objects/pack/pack-*.idx | grep blob | sort -k3nr | head | while read s x b x; do git rev-list --all --objects | grep $s | awk '{print "'"$b"'",$0;}'; done | 07:35 |
| ← NosBit left | 07:35 |
| ← sinkensabe left | 07:35 |
| → sinkensabe joined | 07:35 |
| ← pcypher left | 07:36 |
| ← dodobrain left | 07:36 |
|
bremner
| if the files are already in a commit, then you will have to rewrite history to get rid of them. The git-filter-branch man page has examples. | 07:36 |
|
| but then you face the hazards of !rewrite | 07:36 |
|
gitinfo
| 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/waqum | 07:36 |
| ← jongravois left | 07:37 |
|
jim
| a way to remove files (without rewriting history): use git rm, then commit | 07:37 |
| → digitalextremist joined | 07:37 |
| ← joeyDB left | 07:38 |
| → jaznow joined | 07:38 |
| ← dreiss left | 07:38 |
| ← sinkensabe left | 07:38 |
| → sinkensabe joined | 07:39 |
|
eto
| bremner: bot says: "isn't yet great" does it mean this thing is planned to get eventyualy fixed, without annex? | 07:40 |
| ← digitalextremist left | 07:40 |
| ← jaznow left | 07:42 |
| ← beautifulmind left | 07:43 |
| ← gopar left | 07:43 |
|
Seveas
| eto: there is nothing concrete (or even abstract) going on to fix this. | 07:44 |
| → ska-fan joined | 07:44 |
| → khurram joined | 07:44 |
|
khurram
| i have given access to one of my collegue to upload files , wondering if there is any utility / tool through which i can get a log what he uploaded with datentime and what he downloaded etc , im on debian wheezy ? | 07:44 |
| ← TomyLobo left | 07:44 |
|
Seveas
| khurram: that doesn't seem to be git-related.... | 07:44 |
|
khurram
| Seveas: the developer is doing FTP to the location where git is installed and git doesn't track direct FTP upload changes to the file | 07:45 |
|
Seveas
| khurram: check your ftp server's documentation | 07:45 |
| ← Gamecubic left | 07:46 |
|
jim
| khurram, yeah, that seems to be a problem that git is not said to handle | 07:47 |
| ← thiago left | 07:48 |
| ← mennea left | 07:48 |
|
jim
| is this someone you trust? | 07:49 |
|
khurram
| jim: yes he is my collegue | 07:49 |
| → Error404NotFound joined | 07:49 |
|
khurram
| jim: i have added his account on my server using adduser command on linux , is there a specific log per user on linux ? through which we can track the activities user did ? | 07:50 |
| → Trudko joined | 07:51 |
|
jim
| want to control what he does? don't give him shell access... so, I'm getting conflicting messages from you (which is fine by me; I don't know either one of you): one message says: "I trust this user", the other says "how can I watch everything he does" | 07:53 |
|
eto
| Seveas: that is what i wanted to know | 07:54 |
| → robbyoconnor joined | 07:54 |
| ← robbyoconnor left | 07:54 |
| → r0bby_ joined | 07:54 |
|
jim
| probably you want to resolve in yourself these messages... trust? watch? how do they go together? what do you really want? | 07:55 |
|
| what's the problem? | 07:55 |
|
eto
| jim: maybe he just wants audit | 07:55 |
| ← r0bby_ left | 07:55 |
|
eto
| khurram: what server ? ftp is very vague, more i over i wouldn't use ftp for that | 07:56 |
|
| khurram: ssh comes with sftp builtin and it works with major clients | 07:56 |
| ← Error404NotFound left | 07:56 |
| ← c0ded left | 07:56 |
|
eto
| khurram: seeing what he pushed up, is matter of watching logs of given ftp/sftp server software | 07:57 |
| → jnavila joined | 07:57 |
|
jim
| I'd still ask "why"... it's still conflicting, and I'd still want to know what he actually wants, and what problem he actually wants to solve... | 07:57 |
|
| having said all that... | 07:57 |
| ← wethu left | 07:57 |
|
jim
| it's all good | 07:57 |
| → jagob joined | 07:58 |
|
eto
| jim: roger | 07:59 |
| ← Raging_Hog left | 08:00 |
| → irqq joined | 08:01 |
| ← ende left | 08:01 |
|
Seveas
| khurram: have a look at auditd | 08:01 |
| → d4ryus_ joined | 08:01 |
| ← Guest25837 left | 08:03 |
| → c0ded joined | 08:03 |
| → fnma joined | 08:03 |
|
khurram
| Seveas: nopes doing it now... | 08:04 |
| ← fnma left | 08:04 |
|
jim
| and it's not just him... if the user is doing anything besides contributing to a repository, it's either something he specifically allows, or it's a violation of the trust (insofar as it's unexpected) | 08:04 |
| ← d4ryus left | 08:05 |
| ← ska-fan left | 08:05 |
| → ghostpl_ joined | 08:06 |
| → Literphor joined | 08:07 |
|
thms
| I have a git commit -am running for hours, htop used to show some moves, but now it doesnt | 08:07 |
| → darkbasic_ joined | 08:08 |
|
thms
| how can I check it still runs ? | 08:08 |
| ← darkbasic left | 08:08 |
|
grawity
| thms: attach strace to it | 08:10 |
|
| thms: sudo strace -p <pid> | 08:10 |
| ← diegoaguilar left | 08:11 |
| ← ghostpl_ left | 08:11 |
|
grawity
| (sudo may be optional depending on distro) | 08:11 |
|
osse
| and quality of life | 08:11 |
| → ska-fan joined | 08:11 |
| → ScioMin joined | 08:11 |
|
thms
| grawity: thanks | 08:12 |
|
Seveas
| thms: how in the world did you do this? Committing a complete filesystem? | 08:12 |
| → rath joined | 08:12 |
|
thms
| Seveas: accepting a freelance from someone not very smart. | 08:12 |
|
| I don't have strace installed on his system but lsof shows some kind of activity | 08:13 |
|
Seveas
| thms: ls -la /proc/$(pidof git)/fd | 08:13 |
| → hebz0rl joined | 08:13 |
| → Raging_Hog joined | 08:13 |
|
Seveas
| stupid commit hook perhaps (ps auxf should help see if there's one running) | 08:14 |
| → Xauz joined | 08:14 |
| ← Xauz left | 08:14 |
|
osse
| thms: it sounds a bit like you commited binary artifacts also | 08:14 |
|
| 109 GB of original content is pretty good | 08:14 |
| → das_beard joined | 08:15 |
|
thms
| Seveas: returns: | 08:16 |
|
| lr-x------ 1 helidirect-ssh clp 64 Feb 25 00:09 6 -> /home/cloudpanel/htdocs/www.helidirect.com/.git/objects/pack/pack-988a576312dc6106ff48a6c7431b125499ca0f67.pack | 08:16 |
| → pcypher joined | 08:17 |
|
thms
| but lsof |grep git shows me it still runs. | 08:17 |
|
Seveas
| ooh fun, it's packing. That can take a while if you have stupid things in the repo | 08:17 |
|
| (like large binary things) | 08:17 |
| → wicope joined | 08:17 |
|
thms
| Seveas: there probably is :D | 08:17 |
| → aqhv joined | 08:18 |
| ← das_beard left | 08:20 |
| moritz_ → moritz | 08:22 |
| → oldWelff joined | 08:22 |
| → tuor joined | 08:22 |
| ← ska-fan left | 08:23 |
| → TomyWork joined | 08:23 |
| ← Raging_Hog left | 08:23 |
| → ska-fan joined | 08:26 |
| → Hounddog joined | 08:26 |
| ← drodger left | 08:26 |
| → workerbeetwo joined | 08:27 |
| → lindenle joined | 08:28 |
| → Dudi joined | 08:30 |
| ← lindenle left | 08:32 |
| → jaznow joined | 08:33 |
| → lb1a joined | 08:33 |
| → ki0 joined | 08:35 |
| → cvanball joined | 08:35 |
| → CheckDavid joined | 08:36 |
| → The_Phoenix joined | 08:36 |
| ← The_Phoenix left | 08:36 |
| ← ska-fan left | 08:36 |
| → The_Phoenix joined | 08:37 |
| ← The_Phoenix left | 08:38 |
| robins → robinsmidsrod | 08:38 |
| ← netj left | 08:39 |
| → netj joined | 08:39 |
| → devll joined | 08:39 |
| → aidalgol joined | 08:40 |
| → The_Phoenix joined | 08:40 |
| ← rivarun left | 08:40 |
| → rivarun joined | 08:40 |
| → mennea joined | 08:42 |
| → pretodor joined | 08:44 |
| ← pcypher left | 08:46 |
| → darkbasic joined | 08:46 |
| ← darkbasic_ left | 08:47 |
| ← lidaaa left | 08:48 |
| → vurma joined | 08:48 |
| ← hebz0rl left | 08:49 |
| ← arup_r_ left | 08:49 |
| ← xk_id left | 08:49 |
| ← Literphor left | 08:50 |
| ← Rhonda left | 08:54 |
| → Raging_Hog joined | 08:55 |
| → yxejamir joined | 08:55 |
| → ska-fan joined | 08:57 |
| ← PCatinean left | 08:57 |
| → benibadboy joined | 08:58 |
|
benibadboy
| git-tree | 08:58 |
| → petersr joined | 09:01 |
| → bvi joined | 09:01 |
| ← Corey84 left | 09:02 |
| → ende joined | 09:02 |
| ← thms left | 09:02 |
| → mikecmpbll joined | 09:02 |
| ← zumba_addict left | 09:03 |
| → Takle joined | 09:04 |
| → rkmylo joined | 09:06 |
| → ghostpl_ joined | 09:07 |
| ← ende left | 09:07 |
|
osse
| git-forest | 09:07 |
| → nnyk_ joined | 09:09 |
| → zxd joined | 09:09 |
| ← jonmorehouse left | 09:10 |
|
osse
| git-f0rest | 09:11 |
| ← ghostpl_ left | 09:11 |
| → fooforge joined | 09:11 |
| ← BuenGenio left | 09:12 |
| → random-user-name joined | 09:12 |
|
rkmylo
| hi all, i have a staging branch that's has some key differences from master. when a new feature is to be developed, i branch out from staging, then i merge the feature branch to staging and test. finally, all changes that took place in the feature branch are also merged to master. the problem is that i have branch that has been --ff merged to staging and then deleted. as a result, i tried to cherry-pick the change but i'm getting an | 09:13 |
|
| error "Commit ... is a merge but no -m option was given.". what should be my approach in order to merge the changes of the feature branch to master? | 09:13 |
| ← leolrrj left | 09:14 |
| ← pm90_ left | 09:14 |
| → Rhonda joined | 09:14 |
|
osse
| rkmylo: sounds like it wasn't ff'ed since there is a merge commit involved | 09:14 |
| → Cust0sL1men joined | 09:14 |
|
osse
| !lol might help to see what is going on | 09:14 |
|
gitinfo
| A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 09:14 |
| → aesinv joined | 09:15 |
|
rkmylo
| @osse: i think it was. i basically merged with no --ff switch specified but the resulting network shows it was an -ff | 09:15 |
| → mlechner joined | 09:16 |
| → das_beard joined | 09:16 |
| → curiousmansi joined | 09:16 |
| → Trudko_ joined | 09:16 |
| → arup_r joined | 09:17 |
|
osse
| rkmylo: you can do git merge abd234 . that works just like git merge <somename> | 09:17 |
|
curiousmansi
| guys i want to know the complete history of the file on github like some file xyz.js is present in the branch i am working on | 09:17 |
|
| how can i know the complete history of it ? | 09:18 |
|
rkmylo
| @osse: so this will have the same effect as `git cherry-pick abd234` in a sense, right? | 09:18 |
| → leolrrj joined | 09:18 |
|
osse
| rkmylo: no | 09:18 |
| → tvw joined | 09:18 |
| → hans_s joined | 09:18 |
| → Arsonide joined | 09:18 |
|
curiousmansi
| tell me both the command line and github.com approach | 09:19 |
| ← ranchodev left | 09:19 |
| ← daito left | 09:19 |
|
osse
| curiousmansi: git log -- filename | 09:19 |
|
rkmylo
| @osse: so..? what will merge do? | 09:19 |
|
osse
| curiousmansi: in github, navigate to the file and click history | 09:19 |
| → howlymowly joined | 09:19 |
| ← Trudko left | 09:20 |
| Trudko_ → Trudko | 09:20 |
| → daito joined | 09:20 |
|
osse
| rkmylo: hmm, it sounded to me like you were comfortable with merging. | 09:20 |
| ← daito left | 09:20 |
| ← aesinv left | 09:20 |
| ← das_beard left | 09:20 |
| ← michael_mbp left | 09:20 |
|
rivarun
| suppose i have branch A, from which i branched to B and made 10 commits. then from B i branched to C and made 1 more commit. in reality i wanted to branch from A, so now i have 11 commits instead of 1 in C. what's the easiest way to amend this? can i ask git to intersect the branches in order to resolve this for me? | 09:20 |
| → daito joined | 09:20 |
|
osse
| rivarun: git checkout C; git rebase --onto=A B | 09:21 |
|
rkmylo
| @osse: i can't understand the effect to --ff merging tbh, and when cherry-pick required me to specify the parent for merging i was confused! | 09:21 |
| → jongravois joined | 09:21 |
|
curiousmansi
| not fetching me anything | 09:21 |
| → michael_mbp joined | 09:22 |
|
osse
| rkmylo: it sounds like it's cherry-pick you don't understand and not merge. cherrypick makes a duplicate commit that introduces the same changes as the commit you specify. but when you specify a merge then there are two sets of changes that are associated with that commit and you have to decide which one | 09:22 |
|
curiousmansi
| i gave like git log -- 'xyz.js' | 09:22 |
| → joeyDB joined | 09:22 |
|
curiousmansi
| no result no error nothing | 09:22 |
| → otter768 joined | 09:23 |
|
osse
| then you're on a branch where that file has never existed | 09:23 |
|
rivarun
| osse: awesome and fantastic. thank you | 09:23 |
|
osse
| rivarun: pretty pictures (not really): https://raw.githubusercontent.com/Osse/git-stuff/master/rebase-onto.txt | 09:24 |
| → settermjd joined | 09:24 |
|
osse
| rivarun: TL;DR: --onto equals transplant surgery | 09:24 |
|
rkmylo
| @osse: well, it seems like merge did what i was expecting. it merged all changes that exist in the staging branch into master. however, i want only the changes of the feature branch. | 09:25 |
|
rivarun
| osse: that's very helpful graphic for remembering the order of the A and B arguments, because 'onto' doesn't speak to me | 09:25 |
| → marcogmonteiro joined | 09:25 |
|
osse
| rivarun: then merge only the feature branch | 09:25 |
| → mennea_ joined | 09:25 |
|
osse
| rivarun: but since that doesn't exist anymore, find the commit that once was the tip of the feature branch and merge that | 09:26 |
|
rivarun
| another question; what if i've forgotten which branch i branched from? | 09:26 |
|
rkmylo
| @osse: the feature branch has been --ff merged and deleted! | 09:26 |
|
osse
| oops, all of that was for rkmylo | 09:26 |
| ← jongravois left | 09:26 |
|
osse
| rkmylo: doesn't matter | 09:26 |
| → xk_id joined | 09:26 |
| ← settermjd left | 09:26 |
| ← harish_ left | 09:26 |
| ← joeyDB left | 09:27 |
| → ome joined | 09:27 |
| → arez joined | 09:27 |
| ← otter768 left | 09:28 |
|
osse
| rivarun: then you're screwed. best way is to eyeball it with !lol | 09:28 |
|
gitinfo
| rivarun: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 09:28 |
|
rkmylo
| @osse: how can i find the tip of the feature branch? | 09:28 |
| ← mennea left | 09:29 |
|
osse
| rkmylo: you have to look at the log and figure it out | 09:29 |
|
| rkmylo: maybe 'git reflog feature' can help | 09:29 |
| ← eletuchy left | 09:30 |
|
rkmylo
| @osse: when i specify the name | 09:30 |
|
rivarun
| osse: cool, that's good enough for me | 09:30 |
|
rkmylo
| @osse: of the feature branch in reflog it returns "fatal: ambiguous argument" | 09:30 |
| → darkbasic_ joined | 09:30 |
| ← darkbasic left | 09:30 |
|
rkmylo
| @osse: unknown revision or path not in the working tree | 09:30 |
|
osse
| rkmylo: then you don't have the reflog for it. in other words: you don't have a log of where that name has pointed before. | 09:31 |
|
| unless you gave it the wrong name. could it be origin/feature instead of feature, for example? | 09:32 |
|
rkmylo
| @osse: oops! yes, you are right, i was missed origin. it gave me: "f23f364 refs/remotes/origin/feature@{0}: update by push" | 09:34 |
| → wethu joined | 09:34 |
|
osse
| then presumable f23f364 is where the feature was before it was deleted | 09:34 |
|
rkmylo
| @osse: this is the i commit that when merged into master, brought all changes from staging | 09:35 |
|
osse
| rkmylo: what about the commit before it | 09:36 |
|
| or was that the only output? | 09:37 |
| ← kyb3r_ left | 09:37 |
|
rkmylo
| @osse: it was the only output | 09:37 |
| ← geomyidae_ left | 09:38 |
| → BuenGenio joined | 09:38 |
|
rkmylo
| @osse: i found those: http://pastie.org/9980751 on `git reflog`. f23f364 is the commit shown in `git reflog origin/feature` | 09:39 |
| ← Junior left | 09:39 |
|
osse
| then that has to be the tip of the feature branch. nothing else makes sense | 09:39 |
| ← dannymichel left | 09:39 |
|
osse
| f23f364 I mean | 09:39 |
| → intellix joined | 09:39 |
|
osse
| because the line above it is "moving from feature to staging" | 09:40 |
| → inamoriti joined | 09:40 |
|
osse
| If f23f364 also contains a lot of crap you don't want then that's a different problem. the feature branch was created in the wrong place | 09:40 |
|
rkmylo
| @osse: so assuming this was the tip, then `git merge f23f364` shouldn't merge the staging files | 09:41 |
|
| @osse: right? | 09:41 |
|
osse
| I don't know | 09:41 |
| → Junior joined | 09:42 |
| ← mostlybadfly left | 09:42 |
|
osse
| it should merge exactly as if there was a branch there. *What* is merged depends a bit on where you merge into | 09:42 |
| ← FreezingCold left | 09:43 |
| → ranchodev joined | 09:43 |
|
rkmylo
| @osse: the feature branch (fortunately) contains only 3 changed files so it will be easy to cross-check the effect of the merge | 09:43 |
| → leeN joined | 09:43 |
|
rkmylo
| @osse: and i also know the sha1's for all commits in the feature branch, could that be of any help? | 09:44 |
| → crestbook joined | 09:44 |
|
osse
| hmmmmmmmmmm | 09:45 |
|
| you said feature FF'ed into staging right? | 09:45 |
| ← michael_mbp left | 09:45 |
|
rkmylo
| @osse: right, it was me and the network that claim this fact! | 09:45 |
|
osse
| rkmylo: that means that even before that happened feature contained all of staging. meaning that even then merging feature would in effect also merge all of staging | 09:46 |
| ← BuenGenio left | 09:46 |
|
osse
| the only way that could happen is if the feature branch was created off staging in the first place | 09:46 |
| ← sinkensabe left | 09:47 |
|
rkmylo
| @osse: true! initially i stated "when a new feature is to be developed, i branch out from staging" | 09:47 |
|
osse
| then I don't see what the problem is. | 09:47 |
| → FreezingCold joined | 09:48 |
| → michael_mbp joined | 09:48 |
| ← darkbasic_ left | 09:50 |
|
rkmylo
| @osse: the problem is that staging is different from master, and i only merge in staging to test the feature. then i want to merge the changeset of the feature into master. | 09:50 |
| → eletuchy joined | 09:50 |
| → Gizburdt joined | 09:50 |
|
rkmylo
| @osse: assume that no feature modifies the files that make the staging branch differ from master. | 09:51 |
| → darkbasic joined | 09:51 |
| tomog9991 → tomog999 | 09:51 |
|
osse
| rkmylo: "i only merge in staging to test the feature". what do you mean here? | 09:52 |
| → skullcrasher joined | 09:53 |
|
rkmylo
| @osse: i explained the reason behind the existence of staging. i think all problems started because the feature was --ff merged and then deleted. | 09:53 |
| → sinkensabe joined | 09:54 |
| → dannymichel joined | 09:54 |
| → s8321414 joined | 09:54 |
| → t4nk643 joined | 09:54 |
| ← t4nk643 left | 09:54 |
| → Matt_ joined | 09:54 |
| ← wethu left | 09:55 |
| Matt_ → Guest64450 | 09:55 |
| ← sparetire left | 09:55 |
|
osse
| rkmylo: no, that wouldn't have helped | 09:56 |
|
| rkmylo: the only way to get feature *and only feature* into master is to cherry-pick/rebase | 09:56 |
|
| rkmylo: you said you know all the hashes, in that case: git checkout master; git cherry-pick hash1 hash2 hash3... etc. | 09:57 |
| ← mskaesz left | 09:58 |
| ← benibadboy left | 09:59 |
|
rkmylo
| @osse: all those commits (from feature) have the same parent (35ff267). what if i use `git cherry-pick f23f364 -m 35ff267` | 09:59 |
|
| ? | 09:59 |
| ← darkbasic left | 10:00 |
| → vla joined | 10:00 |
| → barmaglot joined | 10:00 |
| → darkbasic joined | 10:00 |
| → myyst joined | 10:00 |
|
Guest64450
| hello, how can I get all the branches of a remote repo on to my local machine? | 10:01 |
|
osse
| all commits have the same parent? that's not possible | 10:01 |
|
rkmylo
| @osse: weirdly enough, all sha1's from the feature show the same changeset and cherry-picking i don't think will help | 10:01 |
| myyst → myst | 10:01 |
|
osse
| because then gitly speaking they would all be separate branches | 10:01 |
|
rkmylo
| @osse: it it possible that this is the effect of deleting the branch? | 10:01 |
| → eijk_ joined | 10:01 |
|
lqi
| Guest64450: http://stackoverflow.com/questions/67699/clone-all-remote-branches-with-git ? | 10:02 |
|
osse
| rkmylo: I'm confused and suddenly realize I have NO IDEA what your log looks like. You need to show me !lol | 10:02 |
|
gitinfo
| rkmylo: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 10:02 |
|
osse
| deleting a branch does nothign | 10:02 |
|
| maybe you're looking at previous "versions" of the same commit | 10:02 |
|
| that have been rebased | 10:02 |
| → PeterBooker joined | 10:03 |
|
Guest64450
| lqi: thank you! | 10:03 |
|
jim
| making a branch is creating a named pointer that knows how to move to the next commit... | 10:03 |
| → wethu joined | 10:03 |
| → ende joined | 10:03 |
|
lqi
| Guest64450: please try google at first, thanks | 10:03 |
| ← wethu left | 10:03 |
| → wethu joined | 10:03 |
|
jim
| deleting a branch is deleting the pointer, and NOTHING else | 10:03 |
| → cdown joined | 10:03 |
| → nettoweb joined | 10:04 |
|
Guest64450
| lqi: sure, I did, but used the wrong terms. point taken though. | 10:04 |
| → ghostpl_ joined | 10:04 |
|
lqi
| Guest64450: ok, I just tried "checkout all remote branches git" | 10:05 |
|
rkmylo
| @osse: here is the graph: http://pastie.org/9980797 | 10:05 |
|
osse
| 35ff267 isn't shown here. | 10:06 |
| → jonmorehouse joined | 10:07 |
|
rkmylo
| @osse: i know, but it is shown in the ui! btw, master tip is pointing to: 934f66a | 10:07 |
|
osse
| "the ui" ? | 10:08 |
|
rkmylo
| @osse: yup, i'm using gitlab | 10:08 |
|
osse
| if this is s3cret stuff that's fine, but it would be helpful to see the stuff that --decorate generates. in fact, that's the only interesting thing | 10:08 |
|
rkmylo
| @osse: you mean the commit messages? it wouldn't be a problem to show them but i tried to make it a bit abstract! | 10:09 |
|
osse
| rkmylo: no I mean the (HEAD, staging, origin/staging) stuff | 10:09 |
| → King_Hual joined | 10:09 |
|
rkmylo
| @osse: i can provide all details you need but i don't understand what you are asking for now! | 10:10 |
|
| @osse: oops! i got it, give me a moment | 10:11 |
| ← cdown left | 10:11 |
| ← jonmorehouse left | 10:11 |
| ← pretodor left | 10:11 |
| → twoface88 joined | 10:13 |
| ← ende left | 10:13 |
|
rkmylo
| @osse: http://pastie.org/9980824 | 10:13 |
| → mikecmpb_ joined | 10:15 |
|
rkmylo
| @osse: is that what you asked for? | 10:15 |
|
osse
| now we're talkin! | 10:15 |
|
| filcab: so I suppose this feature you want in master is feature-B ? | 10:16 |
|
| shit | 10:16 |
|
| rkmylo: that was for you, and I meant feature-A | 10:16 |
| ← leeN left | 10:16 |
|
rkmylo
| @osse: i want feature-A | 10:16 |
| → das_beard joined | 10:16 |
| → aesinv joined | 10:16 |
| ← daito left | 10:17 |
|
rkmylo
| @osse: further down the line i'm going to merge feature-B too, but i thikn rebase will easily do for the feature-B case | 10:17 |
| ← twoface88 left | 10:17 |
| → daito joined | 10:17 |
|
osse
| rkmylo: the principle behind a merge (eg. git checkout master; git merge feature) is to take the effects of all commits reachable from feature and not from master, then stick them into master. | 10:17 |
| ← mikecmpbll left | 10:18 |
|
rkmylo
| @osse: but merging f23f364 will also bring all staging changes | 10:18 |
|
osse
| rkmylo: in this case we can tell from the "topology" that those commits are all the commits on lines 21-33 | 10:18 |
| ← mikecmpb_ left | 10:18 |
| ← jagob left | 10:18 |
|
rkmylo
| @osse: that't why i will go with rebase for feature-B that has been --no-ff merged | 10:18 |
|
osse
| rkmylo: and you don't want that => merge is not the right tool for the job | 10:18 |
| → Solid1 joined | 10:19 |
| → mikecmpbll joined | 10:19 |
| ← Jetchisel left | 10:19 |
|
rkmylo
| @osse: the commits in lines 21-33 are the commits that exist only in staging and i want to avoid merging them into master! | 10:20 |
|
osse
| yes I know | 10:20 |
| → leeN joined | 10:20 |
|
osse
| I presume you want only the commits on lines 21-24 or 25 or something like that? | 10:20 |
| ← Takle left | 10:20 |
|
rkmylo
| @osse: i want only f23f364 | 10:21 |
| ← aesinv left | 10:21 |
|
osse
| rkmylo: the only way to get that commit into master is to cherry-pick it. | 10:21 |
|
| rkmylo: git checkout master; git cherr-pick f23f364 | 10:21 |
| ← daito left | 10:21 |
| ← das_beard left | 10:21 |
|
rkmylo
| @osse: but cherry-pick requires me to specify the parent with the -m switch! | 10:22 |
|
| i have no clue what to specify for the parent | 10:22 |
|
osse
| bullshit | 10:22 |
|
| then you're not showing me the complete graph | 10:22 |
|
rkmylo
| @osse: i promise i do!!!! | 10:22 |
|
osse
| because there's no indication that f23f364 is a merge commit (ie. it has more than one parent) | 10:22 |
| ← teran left | 10:22 |
| → daito joined | 10:23 |
| ← teadrop__ left | 10:23 |
|
osse
| rkmylo: what's the first line of git show --parents f23f364 | 10:23 |
| → Takle_ joined | 10:23 |
|
rkmylo
| @osse: "commit f23f36417e0e56b89f842754a39cce29b340dc8b 65dc6c8f4ec6f8bdf1bedff0238ca4d77cbf765e" | 10:24 |
| → dougsland joined | 10:24 |
| → mkaesz joined | 10:24 |
|
osse
| then it only has one parent | 10:24 |
|
| and that is 65dc6c8f4ec6f8bdf1bedff0238ca4d77cbf765e | 10:24 |
| → beautifulmind joined | 10:24 |
|
rkmylo
| @osse: so if i run `git cherry-pick f23f364 -m 65dc6c6` wouldn't this bring all staging changes? | 10:25 |
| ← mikecmpbll left | 10:25 |
| → zadock joined | 10:25 |
|
osse
| rkmylo: no, just git cherry-pick f23f364 | 10:25 |
|
rkmylo
| @osse: i can't believe it worked!!! | 10:27 |
| ← drathir left | 10:27 |
| → Gama11 joined | 10:27 |
| → IIT joined | 10:27 |
|
osse
| :-) | 10:28 |
| → PCatinean joined | 10:28 |
|
rkmylo
| @osse: however, when i push the graph is screwed | 10:28 |
|
| @osse: master tip is pointing ahead of last staging commit (6463b92) | 10:29 |
| → mikecmpbll joined | 10:30 |
| ← aidalgol left | 10:31 |
| → drag0nius joined | 10:32 |
|
drag0nius
| can i create patch that can be applied without access to repo? | 10:32 |
|
osse
| rkmylo: isn't there a loooooooooooooong line leading straight down to 934f66a ? | 10:32 |
|
drag0nius
| like in: 1. first time client gets zipped sources without repo, 2+. client gets .patch file to apply to their code | 10:33 |
|
osse
| rkmylo: if yes, then there's no problem. it's just that your new commit has the most recent timestamp. if no, then I've no idea :O brb lunch | 10:34 |
|
rkmylo
| @osse: exactly, | 10:34 |
|
tobiasvl
| drag0nius: sure, git can both create patch files that can be applied with the regular patch command, and git can also apply patches if the client wants to make some | 10:34 |
|
rkmylo
| @osse: cool. thanks a lot!!!! | 10:34 |
| → cllamas joined | 10:35 |
| ← daito left | 10:36 |
| ← hyperair left | 10:36 |
| → daito joined | 10:36 |
| ← catsup left | 10:37 |
| → catsup joined | 10:37 |
|
cllamas
| does anybody know how to delete a concrete commit in the middle of more commits? | 10:37 |
| ← darkbasic left | 10:37 |
| ← catsup left | 10:37 |
| → danjordan joined | 10:37 |
| → darkbasic joined | 10:37 |
| ← Junior left | 10:37 |
| → cllamas_ joined | 10:39 |
| → settermjd joined | 10:39 |
| → teran joined | 10:39 |
| → h4ml3t joined | 10:40 |
| → jadne joined | 10:40 |
|
random-user-name
| cllamas: as far as I know you can use git rebase -i, but that would rewrite history; maybe you want git revert | 10:40 |
| ← IIT left | 10:41 |
| ← daito left | 10:41 |
| → RaceCondition joined | 10:41 |
| ← cllamas left | 10:41 |
| ← Guest58291 left | 10:42 |
| → harish_ joined | 10:42 |
| → drathir joined | 10:44 |
| ← teran left | 10:44 |
| → gccostabr joined | 10:44 |
| → gv joined | 10:45 |
| ← arez left | 10:45 |
| gv → Guest54411 | 10:45 |
| → Kulrak joined | 10:45 |
| ← Kulrak left | 10:45 |
| → Kulrak joined | 10:45 |
| ← darkbasic left | 10:45 |
| → darkbasic joined | 10:45 |
| ← rkmylo left | 10:48 |
| → darkbasic_ joined | 10:50 |
| ← cllamas_ left | 10:51 |
| ← darkbasic left | 10:51 |
| → timini joined | 10:51 |
| → m8 joined | 10:52 |
| ← fatalhalt left | 10:52 |
|
tobiasvl
| good bye cllamas | 10:52 |
| ← ThomasLocke left | 10:52 |
| → basiclaser joined | 10:52 |
|
timini
| Hey I have 2 branched b1 and b2, I want to merge one into the other, how does git choose which commits to prioritise? Is it by time stamp? | 10:52 |
|
canton7
| "which commits to prioritise" <-- explain what you mean by that | 10:53 |
| ← govg left | 10:53 |
| ← Takle_ left | 10:53 |
| → govg joined | 10:53 |
| → EminenceHC joined | 10:53 |
|
bremner
| how to resolve conflicts I guess. | 10:53 |
|
random-user-name
| my guess is that question was about the destination branch for merging (and your current branch is the destination) | 10:54 |
| → jazzzu joined | 10:55 |
| ← settermjd left | 10:56 |
| → kukks joined | 10:56 |
| ← kukks left | 10:56 |
| → kukks joined | 10:56 |
|
timini
| OK so i want my merge to mostly look like b1 but when i merge b2 into b1 i get | 10:56 |
|
| "already at newest change" | 10:56 |
| → Syzygy_ joined | 10:56 |
|
timini
| already up-to-date I mean | 10:56 |
| → settermjd joined | 10:56 |
|
random-user-name
| maybe the branches were not diverged at all? (they pointed to the same commit) | 10:57 |
| ← FreezingCold left | 10:58 |
|
random-user-name
| you could have forgotten commit your changes or switch to the newly created branch | 10:58 |
|
| before commiting | 10:58 |
| ← EminenceHC left | 10:58 |
| → Syzygy__ joined | 10:59 |
| → zumba_addict joined | 11:01 |
| ← settermjd left | 11:01 |
| → interrobangd joined | 11:01 |
| ← Syzygy_ left | 11:03 |
| → net2014 joined | 11:03 |
|
net2014
| hello | 11:04 |
|
gitinfo
| net2014: 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. | 11:04 |
| → Aune joined | 11:04 |
| ← Solid1 left | 11:04 |
|
net2014
| suppose I have a local directory with packages that I want available from a remote repository | 11:04 |
|
| I create a git in each package, then I create a git for each package in repote repository | 11:05 |
| ← darkbasic_ left | 11:05 |
| ← NBhosting left | 11:05 |
| ← zadock left | 11:05 |
| ← Gitzilla left | 11:05 |
|
net2014
| that I way, I can push to remote repository and then use composer(php) to install packages? | 11:06 |
| → LotR joined | 11:06 |
| → gluten_hell joined | 11:06 |
|
net2014
| compose downloads/installs packages from git repositories | 11:06 |
|
| *composer | 11:06 |
| ← michael_mbp left | 11:06 |
| ← LotR left | 11:06 |
| → darkbasic joined | 11:06 |
|
net2014
| I am wondering if the above scenario is correct | 11:07 |
| ← Gizburdt left | 11:07 |
| ← drag0nius left | 11:08 |
| → zadock joined | 11:08 |
| → michael_mbp joined | 11:08 |
| → ende joined | 11:09 |
| → encod3 joined | 11:09 |
| → jongravois joined | 11:10 |
| → settermjd joined | 11:11 |
| → t0th_-_ joined | 11:11 |
| → joeyDB joined | 11:11 |
| → Takle joined | 11:11 |
| → jds joined | 11:12 |
| ← ende left | 11:14 |
| → teran joined | 11:14 |
| ← jongravois left | 11:14 |
| ← joeyDB left | 11:15 |
| ← settermjd left | 11:16 |
| ← eletuchy left | 11:16 |
| → eletuchy joined | 11:16 |
| → aesinv joined | 11:17 |
| → das_beard joined | 11:17 |
| → Nizumzen joined | 11:17 |
| → rt joined | 11:18 |
| → teran_ joined | 11:18 |
| ← gluten_hell left | 11:19 |
| ← teran left | 11:19 |
| ← sarri left | 11:19 |
| ← random-user-name left | 11:19 |
| ← arup_r left | 11:20 |
| → sarri joined | 11:20 |
| ← cvanball left | 11:21 |
| ← Entomo left | 11:21 |
| ← drager_ left | 11:22 |
| → drager_ joined | 11:22 |
| ← das_beard left | 11:22 |
| drager_ → drager | 11:23 |
| → arup_r joined | 11:23 |
| → rnsanchez joined | 11:23 |
| ← leolrrj left | 11:23 |
| → otter768 joined | 11:24 |
| ← khurram left | 11:24 |
| → cvanball joined | 11:24 |
| ← aesinv left | 11:24 |
| → settermjd joined | 11:24 |
| ← otter768 left | 11:28 |
| ← paulweb515 left | 11:28 |
| → bitkiller joined | 11:28 |
| → FreezingCold joined | 11:28 |
| → euyc joined | 11:29 |
| ← settermjd left | 11:29 |
| ← euyc left | 11:29 |
| → tvnuz joined | 11:30 |
| ← aqhv left | 11:32 |
| ← ap0c left | 11:32 |
| → Syzygy_ joined | 11:32 |
| ← Syzygy__ left | 11:34 |
| → jagob joined | 11:36 |
| → cavallari joined | 11:37 |
| → Gizburdt joined | 11:39 |
| ← warthog9 left | 11:40 |
| ← jagob left | 11:42 |
| → jongravois joined | 11:43 |
| → lidaaa joined | 11:44 |
| ← Milk_weed left | 11:45 |
| ← jongravois left | 11:45 |
| → jongravois joined | 11:46 |
| → twoface88 joined | 11:46 |
|
jim
| net2014, separating out any php piece (as I choose to not go in that direction)... | 11:46 |
| ← Polyatomic left | 11:46 |
| → darkbasic_ joined | 11:46 |
|
jim
| you can have separate repos per project, and have each of those repos have a separate remote | 11:47 |
|
| the compose/php thing, I have no idea for | 11:47 |
| ← opdavies left | 11:47 |
| ← darkbasic left | 11:47 |
|
_ikke_
| .version | 11:48 |
| gitinfo changed the topic to: Welcome to #git, the place for git help and existentialism | Current stable version: 2.3.1 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | What we push in life echoes in eternity | 11:48 |
| → daedeloth joined | 11:48 |
| → settermjd joined | 11:48 |
| ← lidaaa left | 11:49 |
|
jim
| when did that happen | 11:49 |
| ← mkoskar left | 11:49 |
|
Joost`
| for a uni project, people now use redmine to track hours on issues - everything else has been migrated to github already | 11:50 |
|
| does anyone here know if there's a nice way tocombine hour tracking with github? | 11:50 |
| ← Gizburdt left | 11:51 |
|
Joost`
| (I realise it's offtopic but figured you might be the crowd to know) | 11:51 |
| ← Sleepy63 left | 11:51 |
| → jottr joined | 11:51 |
| → linuxmint joined | 11:51 |
| → Gizburdt joined | 11:52 |
| → Jetchisel joined | 11:52 |
| ← Takle left | 11:52 |
|
net2014
| jim thanks | 11:53 |
| → Takle joined | 11:53 |
| → rkmylo joined | 11:53 |
| → jonmorehouse joined | 11:55 |
| ← intellix left | 11:56 |
| ← neanderslob left | 11:57 |
| → JR____ joined | 11:57 |
| → JR_____ joined | 11:58 |
| ← ropav_ left | 11:58 |
| → alekks joined | 12:00 |
| ← jonmorehouse left | 12:00 |
| ← JR____ left | 12:01 |
| ← cagedwisdom left | 12:02 |
| ← Raging_Hog left | 12:03 |
| ← tonyj left | 12:03 |
| ← tvnuz left | 12:03 |
| → Sleepy63 joined | 12:04 |
| → IIT joined | 12:04 |
| → dpcu joined | 12:04 |
| ← dpcu left | 12:04 |
| ← alekks left | 12:05 |
| → lindenle joined | 12:05 |
| → Hcin joined | 12:06 |
| → bitonic joined | 12:06 |
| ← wicope left | 12:06 |
| → iamjarvo joined | 12:07 |
| ← iamjarvo left | 12:07 |
| ← bernalex left | 12:09 |
| → bernalex joined | 12:09 |
| ← lindenle left | 12:10 |
| ← timini left | 12:11 |
| → nfk joined | 12:11 |
| ← arup_r left | 12:12 |
| ← h4ml3t left | 12:12 |
| → send joined | 12:13 |
| ← wethu left | 12:13 |
| → tonyj joined | 12:15 |
| → mizu_no_oto joined | 12:15 |
| → drodger joined | 12:16 |
| ← eijk_ left | 12:16 |
| → danguafer joined | 12:17 |
| → das_beard joined | 12:18 |
| → mojibake joined | 12:19 |
| → aesinv joined | 12:20 |
| → BuenGenio joined | 12:21 |
| → wethu joined | 12:21 |
| ← settermjd left | 12:21 |
| ← kcj left | 12:22 |
| ← das_beard left | 12:23 |
| ← aesinv left | 12:25 |
| → Raging_Hog joined | 12:26 |
| → mroach joined | 12:27 |
| ← FreezingCold left | 12:27 |
| → FreezingCold joined | 12:28 |
| ← Takle left | 12:29 |
| ← net2014 left | 12:30 |
| → arup_r joined | 12:32 |
| ← darkbasic_ left | 12:32 |
| → darkbasic joined | 12:33 |
| ← in3xes left | 12:34 |
| ← linuxmint left | 12:34 |
| ← rivarun left | 12:36 |
| ← Raging_Hog left | 12:36 |
| → opdavies joined | 12:36 |
| → settermjd joined | 12:36 |
| ← jantje left | 12:37 |
| → darkbasic_ joined | 12:37 |
| → rivarun joined | 12:37 |
| ← Syzygy_ left | 12:38 |
| ← darkbasic left | 12:38 |
| → dv^laptop joined | 12:39 |
| → strehi_ joined | 12:40 |
| → warthog9 joined | 12:40 |
| → paulweb515 joined | 12:41 |
| → Corey84 joined | 12:41 |
| → jagob joined | 12:41 |
| ← fstd left | 12:42 |
| ← subhojit777 left | 12:42 |
| → EminenceHC joined | 12:42 |
| → stymo joined | 12:42 |
| ← eletuchy left | 12:43 |
| ← m8 left | 12:43 |
| → eletuchy joined | 12:43 |
| → timini joined | 12:44 |
| ← elementalest left | 12:44 |
|
timini
| Hey I have 2 branches b1 and b2, I want b1 to look exactly like b2, how can I make this so? | 12:44 |
| → Bruno_ joined | 12:45 |
|
timini
| I guess i could just delet the remote branch b1 and then recreate it as b2 | 12:45 |
| ← paulweb515 left | 12:46 |
| → elementalest joined | 12:46 |
| ← elementalest left | 12:46 |
| → elementalest joined | 12:46 |
| → tyll_ joined | 12:46 |
|
timini
| the problem is whenever i try to merge b2 into b1, git tells me 'already up-to-date' | 12:46 |
| ← EminenceHC left | 12:47 |
|
timini
| I guess this means that b1 is ahead of b2. But this is not the way I want, I want b1 to be where b2 is | 12:47 |
|
| I guess I just check which commit b2 is at then revert b1 to that commit | 12:47 |
| → jantje joined | 12:48 |
|
timini
| confused | 12:48 |
| → fstd joined | 12:48 |
| → in3xes joined | 12:48 |
| ← eletuchy left | 12:48 |
|
tobiasvl
| timini: !lol | 12:48 |
|
gitinfo
| timini: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 12:48 |
|
tobiasvl
| and !repro | 12:48 |
|
gitinfo
| [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session. | 12:48 |
| ← fstd left | 12:50 |
| → darkbasic joined | 12:50 |
|
tobiasvl
| if you mean you want the branches to look exactly the same with the same commit hashes and everything, then I'd delete b1 and make a new branch b1 off b2, yes. if you only mean the end working directory state (since you're merging) then paste us the output of git log above and we can have a look. | 12:50 |
|
osse
| timini: while on b1 git reset --hard b2 | 12:50 |
|
| timini: or if on b2 git branch -f b1 | 12:51 |
| ← darkbasic_ left | 12:51 |
| ← jnavila left | 12:52 |
| ← jantje left | 12:52 |
|
timini
| http://ur1.ca/jsrgy | 12:53 |
| ← jwhisnant left | 12:53 |
| ← netj left | 12:53 |
|
timini
| i want develop to be at b168acc (transition) tidy | 12:53 |
| → netj joined | 12:54 |
| ← mizu_no_oto left | 12:54 |
|
osse
| git branch -f develop b168acc | 12:54 |
| → shruggar joined | 12:54 |
|
tobiasvl
| aha, so basically reverting the merge. then `git reset --hard b168acc` or `git branch -f develop b168acc` | 12:54 |
| → jnavila joined | 12:55 |
| → subhojit777 joined | 12:55 |
|
timini
| OK problem is I've already pushed to remote, so i can reset to b168acc but i cannot push | 12:56 |
| → mtakkman joined | 12:56 |
|
osse
| push -f | 12:57 |
|
| !rewrite > timini | 12:57 |
|
gitinfo
| 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/waqum | 12:57 |
|
timini
| I have done >>(develop) git reset --hard transitoin | 12:57 |
| → fstd joined | 12:57 |
| ← wethu left | 12:57 |
|
timini
| then git push is rejected | 12:57 |
| → tjm_jimmy joined | 12:58 |
| → ende joined | 12:58 |
| ← fstd left | 12:59 |
| → cdown joined | 12:59 |
| → joeyDB joined | 13:00 |
| → paulweb515 joined | 13:00 |
| → fstd joined | 13:00 |
|
timini
| so does push -f rewire the history? | 13:00 |
|
tobiasvl
| yes | 13:00 |
| → paolooo joined | 13:01 |
| → iamjarvo joined | 13:01 |
| ← fstd left | 13:01 |
|
osse
| it rewrites it on the remote. the local rewrite has already happened | 13:01 |
| ← iamjarvo left | 13:01 |
| → fstd joined | 13:01 |
| → intellix joined | 13:01 |
| ← subhojit777 left | 13:01 |
| → iamjarvo joined | 13:02 |
| → darkbasic_ joined | 13:02 |
| → mezod joined | 13:02 |
| ← dsdeiz left | 13:03 |
| ← ende left | 13:03 |
| ← darkbasic left | 13:03 |
| → Takle joined | 13:03 |
| ← fstd left | 13:03 |
| → Asiajey joined | 13:04 |
| ← JR_____ left | 13:04 |
| ← joeyDB left | 13:05 |
| → ferr joined | 13:05 |
| → Xethron_ joined | 13:05 |
| → Zupoman joined | 13:05 |
| ← ScioMin left | 13:07 |
| → ScioMin joined | 13:07 |
| → CKyle joined | 13:07 |
| ← ScioMin left | 13:07 |
| → ScioMin_ joined | 13:07 |
| ← Xethron left | 13:07 |
| ← ScioMin_ left | 13:08 |
| → mizu_no_oto joined | 13:09 |
| → Raging_Hog joined | 13:10 |
| ← darkbasic_ left | 13:10 |
| → ScioMin joined | 13:11 |
| ← Takle left | 13:11 |
| → freestyl3r joined | 13:12 |
| → fstd joined | 13:12 |
| → darkbasic joined | 13:12 |
| → Takle joined | 13:13 |
| ← IIT left | 13:13 |
| ← ghoti left | 13:16 |
| → BSaboia_ joined | 13:16 |
| ← jazzzu left | 13:18 |
| → das_beard joined | 13:19 |
| ← encod3 left | 13:19 |
| ← BSaboia left | 13:19 |
| → aesinv joined | 13:20 |
| → ScioMin_ joined | 13:20 |
| ← settermjd left | 13:21 |
| → settermjd joined | 13:21 |
| ← mtakkman left | 13:21 |
| ← opdavies left | 13:21 |
| ← ScioMin left | 13:23 |
| ← das_beard left | 13:23 |
| ← rt left | 13:24 |
| → eijk_ joined | 13:24 |
| → otter768 joined | 13:24 |
| ← ScioMin_ left | 13:25 |
| → ScioMin joined | 13:25 |
| ← aesinv left | 13:25 |
| ← barduck left | 13:26 |
| → BlaXpirit joined | 13:28 |
| ← settermjd left | 13:28 |
| → hardenedapple joined | 13:28 |
| → dsdeiz joined | 13:28 |
| ← otter768 left | 13:29 |
| → m0ltar joined | 13:30 |
| → zarac joined | 13:30 |
|
zarac
| Yo! | 13:30 |
|
| Why is .git/config sometimes u+x ? | 13:30 |
|
| any guesses? : ) | 13:31 |
| → toothrot joined | 13:31 |
|
zarac
| i've come across it a few times now.. | 13:31 |
| → knownasilya joined | 13:31 |
|
tobiasvl
| umask? | 13:32 |
| ← jagob left | 13:32 |
|
moritz
| my umask is standard 022, and it still made it executable for me | 13:32 |
| → KRV joined | 13:32 |
| ← adhawkins left | 13:33 |
| → nettoweb_ joined | 13:34 |
| ← nettoweb_ left | 13:34 |
| ← Asiajey left | 13:34 |
| → adhawkins joined | 13:35 |
|
zarac
| 022 now.. | 13:35 |
| → adamben joined | 13:35 |
| ← adamben left | 13:35 |
| → adamben joined | 13:35 |
| ← ScioMin left | 13:35 |
| → KRV_ joined | 13:36 |
| ← nettoweb left | 13:36 |
| → tmager joined | 13:36 |
| → Asiajey joined | 13:36 |
| ← tmager left | 13:37 |
| ← taru left | 13:39 |
| ← cavallari left | 13:40 |
| ← freimatz left | 13:40 |
| → leolrrj joined | 13:41 |
| → h4ml3t joined | 13:42 |
| → Sarco joined | 13:42 |
| → tristanp joined | 13:42 |
| → settermjd joined | 13:42 |
| ← KRV_ left | 13:43 |
| ← KRV left | 13:43 |
| ← mizu_no_oto left | 13:43 |
| → gyeates joined | 13:43 |
| ← t0th_-_ left | 13:43 |
| → eletuchy joined | 13:44 |
| → jonmorehouse joined | 13:44 |
| → dstarh joined | 13:44 |
|
Sarco
| what is going wrong here? http://paste.pound-python.org/show/W3J3ylNT5C6NTa9qUnIP/ can somebody help me? | 13:44 |
| → t0th_-_ joined | 13:44 |
| ← iamjarvo left | 13:44 |
| → taru joined | 13:44 |
| ← leolrrj left | 13:45 |
|
adhawkins
| Does bitbucket use an SSH key to push? Is the SSH key of that user accepted by bitbucket? | 13:46 |
| → Bruno__ joined | 13:46 |
| → Zuton joined | 13:47 |
| → opdavies joined | 13:47 |
| ← cdown left | 13:47 |
| → mellernoia joined | 13:47 |
|
Sarco
| how do I check that? I added an ssh key in bitbucket and everything looked fine | 13:47 |
|
jast
| Sarco: you've got an empty repository with no commits in it. what exactly are you expecting push to do? | 13:47 |
| ← Zuton left | 13:47 |
| → ScioMin joined | 13:48 |
| ← teufelChiCoder left | 13:48 |
| → cdown joined | 13:48 |
| → tier joined | 13:48 |
|
Sarco
| jast: moment let me check | 13:48 |
| ← Bruno_ left | 13:49 |
| ← jonmorehouse left | 13:49 |
|
jast
| why check? you literally pushed after doing a 'git init' that said "Initialized empty Git repository" :) | 13:49 |
| ← eletuchy left | 13:49 |
|
Sarco
| http://paste.pound-python.org/show/2Pysr8iXEmBAAbHkBxMn/ | 13:50 |
|
| I tried git commit, I am pretty new to all this stuff | 13:50 |
|
tobiasvl
| you need to add the file, it's untracked | 13:50 |
|
Sarco
| aah | 13:50 |
|
jast
| you haven't told git to care about index.html yet: git add index.html | 13:50 |
|
| whenever you want to mark something for git to add to the next commit, use 'git add' on it | 13:50 |
| → druidd joined | 13:50 |
|
adhawkins
| !book | 13:50 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 13:50 |
| ← darkbasic left | 13:50 |
|
Sarco
| thanks, it works now :) | 13:51 |
| → darkbasic joined | 13:51 |
|
Sarco
| in bitbucket you can click I have an existing project, so I took it from there and did not think about adding and committing | 13:52 |
| → arez joined | 13:52 |
| ← settermjd left | 13:53 |
| ← bitkiller left | 13:53 |
| → danjordan_ joined | 13:54 |
| → leolrrj joined | 13:54 |
| → lindenle joined | 13:54 |
| → settermjd joined | 13:54 |
| ← rkmylo left | 13:54 |
| ← danjordan left | 13:54 |
| danjordan_ → danjordan | 13:54 |
| → random-user-name joined | 13:55 |
| → cavallari joined | 13:56 |
| ← h4ml3t left | 13:56 |
| → jagob joined | 13:56 |
| → metastableB joined | 13:57 |
| → mkoskar joined | 13:57 |
| → Bruno_ joined | 13:58 |
| → dvl- joined | 13:58 |
| ← lindenle left | 13:58 |
| ← antispaceman left | 13:59 |
| ← Hcin left | 13:59 |
| → HoMM joined | 13:59 |
| → mostlybadfly joined | 14:00 |
| → darkbasic_ joined | 14:00 |
| → dvl_ joined | 14:01 |
| ← dvl_ left | 14:01 |
| → dvl_ joined | 14:01 |
| → gmt joined | 14:01 |
| → h4ml3t joined | 14:01 |
| → antispaceman joined | 14:01 |
| ← darkbasic left | 14:01 |
| ← Bruno__ left | 14:01 |
| ← gmt left | 14:02 |
| ← bsanford left | 14:02 |
| ← lqi left | 14:02 |
| ← mistertim left | 14:02 |
| ← King_Hual left | 14:03 |
| → hmyw joined | 14:03 |
| ← Dudi left | 14:03 |
| ← dvl- left | 14:04 |
| ← hmyw left | 14:04 |
| ← netcarver left | 14:04 |
| → Dorf joined | 14:04 |
| → vrok joined | 14:05 |
| → Bpit joined | 14:05 |
| → sburgess joined | 14:05 |
| ← vrok left | 14:05 |
| → Vadimus joined | 14:06 |
| ← freestyl3r left | 14:06 |
| → cjwilburn joined | 14:06 |
|
ruediger
| Is it a good or bad idea to make the first commit in a git repo an empty commit? (git commit --allow-empty -m "Initial commit") | 14:06 |
| → iamjarvo joined | 14:06 |
| → Tfdu joined | 14:07 |
| ← s8321414 left | 14:07 |
| ← jargon left | 14:07 |
| ← Tfdu left | 14:07 |
| → aesinv joined | 14:07 |
| → tanzim joined | 14:08 |
| ← zumba_addict left | 14:08 |
|
osse
| ruediger: I don't see what's bad about it. But I don't see what's good about it either. | 14:08 |
| → uuei joined | 14:08 |
| ← shruggar left | 14:09 |
|
osse
| what can an empty commit represent that a nonempty initial commit cannot? | 14:09 |
| → NosBit joined | 14:10 |
| ← druidd left | 14:10 |
| ← arup_r left | 14:10 |
|
ruediger
| osse: I currently only have a messy design document and some sample code. It feels ugly having that as the initial commit :) | 14:10 |
| ← BlaXpirit left | 14:11 |
| ← paolooo left | 14:11 |
| ← Consuela left | 14:12 |
| → beckyconning_ joined | 14:13 |
| ← twoface88 left | 14:14 |
| → das_beard joined | 14:15 |
| → twoface88 joined | 14:15 |
| ← vla left | 14:15 |
| → druidd joined | 14:15 |
| → bsanford joined | 14:15 |
| → jerius joined | 14:16 |
| ← opdavies left | 14:17 |
| → MarkyC joined | 14:18 |
| ← Guest64450 left | 14:18 |
| → JR_____ joined | 14:18 |
| → hebz0rl joined | 14:19 |
| ← das_beard left | 14:19 |
| → ErKa joined | 14:22 |
| → shruggar joined | 14:23 |
| → eijk joined | 14:23 |
| → denete joined | 14:24 |
| ← denete left | 14:24 |
| ← Dorf left | 14:24 |
| ← BackEndCoder left | 14:24 |
| → Dorf joined | 14:24 |
| ← zxd left | 14:25 |
| → denete joined | 14:25 |
| ← denete left | 14:26 |
| → BackEndCoder joined | 14:26 |
| → denete joined | 14:26 |
| → roelmonn_ joined | 14:26 |
| → Bass10 joined | 14:26 |
| ← eijk_ left | 14:26 |
| ← arez left | 14:27 |
| → subhojit777 joined | 14:27 |
| ← Gizburdt left | 14:28 |
| → tier_ joined | 14:28 |
| → jantje joined | 14:28 |
| ← KennyRay left | 14:29 |
| ← zarac left | 14:29 |
| ← roelmonnens left | 14:29 |
| → EminenceHC joined | 14:31 |
| ← iamjarvo left | 14:31 |
| ← cavallari left | 14:31 |
| ← tier left | 14:31 |
|
timini
| hey does anyone have a tool to help manage changes between branches? | 14:32 |
| → iamjarvo joined | 14:32 |
| → SiddhantT joined | 14:32 |
|
timini
| Were trying a branching model like git flow but having a lot of problems with merging the branches | 14:32 |
| ← jantje left | 14:32 |
| → zivester joined | 14:32 |
| → zxd joined | 14:33 |
|
tobiasvl
| what kind of problems? | 14:34 |
| → Dougie187 joined | 14:34 |
| ← iamjarvo left | 14:35 |
|
cbreak
| timini: maybe you're doing it wrong :) | 14:35 |
|
| or you work on the wrong kind of content | 14:35 |
| ← EminenceHC left | 14:35 |
|
cbreak
| git works best with code in text form | 14:35 |
| → paolooo joined | 14:35 |
|
timini
| workflow seems to go in two ways at the minute | 14:35 |
|
cbreak
| it can't handle image conflicts on its own | 14:35 |
| → zumba_addict joined | 14:36 |
| → jtPretzel80 joined | 14:36 |
| ← settermjd left | 14:38 |
| → settermjd joined | 14:39 |
| → B1n4r10 joined | 14:39 |
| ← MarkyC left | 14:39 |
| ← kukks left | 14:39 |
| ← JR_____ left | 14:40 |
| ← darkbasic_ left | 14:40 |
| → darkbasic joined | 14:40 |
| ← msonntag left | 14:41 |
| → wicope joined | 14:41 |
| ← Bass10 left | 14:41 |
| → im8bit joined | 14:41 |
| ← B1n4r10 left | 14:42 |
| → macabre joined | 14:42 |
| → livingstn joined | 14:43 |
| ← roelmonn_ left | 14:44 |
| → roelmonnens joined | 14:44 |
| → joeyDB joined | 14:45 |
| ← beautifulmind left | 14:46 |
| ← bannakaffalatta left | 14:46 |
| → chitopunk joined | 14:47 |
| ← dvl_ left | 14:47 |
| → ende joined | 14:47 |
| → B1n4r10 joined | 14:48 |
| ← druidd left | 14:48 |
|
iveqy
| timini: could you elaborate? | 14:48 |
| → devoldmx joined | 14:49 |
| ← joeyDB left | 14:50 |
| ← zumba_addict left | 14:50 |
| → hcc23 joined | 14:50 |
| → carif joined | 14:50 |
| → zumba_addict joined | 14:50 |
| → zenith_ joined | 14:50 |
| ← zumba_addict left | 14:50 |
| ← uuei left | 14:52 |
| ← ende left | 14:52 |
| ← Bpit left | 14:52 |
| → zumba_addict joined | 14:52 |
| ← strehi_ left | 14:52 |
| → oeex joined | 14:52 |
| ← aesinv left | 14:53 |
| ← devoldmx3 left | 14:53 |
| ← jottr left | 14:53 |
| → aesinv joined | 14:53 |
| → neonalpine joined | 14:53 |
| → epifanio_ joined | 14:54 |
| → roelmonn_ joined | 14:54 |
| ← oeex left | 14:54 |
| → jottr joined | 14:54 |
| ← roelmonnens left | 14:55 |
| ← SiddhantT left | 14:55 |
| → lsiv568 joined | 14:55 |
| → kuxm joined | 14:55 |
| → IrishPrime joined | 14:56 |
| ← zenith_ left | 14:57 |
| → Nash joined | 14:57 |
| → TinkerTyper joined | 14:57 |
| ← BuenGenio left | 14:57 |
|
Nash
| how can I download an archive from a specific remote repository? | 14:57 |
| ← bsanford left | 14:58 |
|
cbreak
| Nash: man git-archive | 14:58 |
|
gitinfo
| Nash: the git-archive manpage is available at http://jk.gs/git-archive.html | 14:58 |
|
cbreak
| but the remote has to support this | 14:58 |
| → roelmonnens joined | 14:58 |
| ← aesinv left | 14:58 |
|
cbreak
| many probably don't | 14:58 |
| ← oldWelff left | 14:59 |
| ← jagob left | 14:59 |
| → jost joined | 14:59 |
| → aesinv joined | 14:59 |
| ← MissionCritical left | 15:00 |
| ← Bruno_ left | 15:00 |
| epifanio_ → epifanio | 15:00 |
| → BSaboia joined | 15:01 |
| → JR_____ joined | 15:01 |
| ← tjm_jimmy left | 15:01 |
| → thiago joined | 15:01 |
| ← roelmonn_ left | 15:01 |
| → druidd joined | 15:01 |
| ← aesinv left | 15:01 |
| → tjm_jimmy joined | 15:02 |
| ← crestbook left | 15:02 |
| → teufelChiCoder joined | 15:02 |
| → aesinv joined | 15:03 |
| ← jgornick left | 15:03 |
| → jgornick joined | 15:04 |
| ← aesinv left | 15:04 |
| → AaronMT joined | 15:04 |
| ← NosBit left | 15:05 |
| ← rchavik left | 15:05 |
| → lindenle joined | 15:05 |
| → ghoti joined | 15:06 |
| → IIT joined | 15:06 |
| ← tjm_jimmy left | 15:06 |
| → gargola joined | 15:06 |
| ← gyeates left | 15:06 |
| → KennyRay joined | 15:07 |
| → star114 joined | 15:07 |
| → DavidA joined | 15:07 |
| → gargola_ joined | 15:08 |
| ← michael_mbp left | 15:08 |
| ← DavidA left | 15:08 |
| → Ahmed90 joined | 15:09 |
| ← gargola_ left | 15:09 |
| ← star114 left | 15:09 |
| ← devoldmx left | 15:09 |
| → michael_mbp joined | 15:09 |
| → tevfik joined | 15:09 |
| ← lsiv568 left | 15:10 |
| → gargola_ joined | 15:10 |
| ← lindenle left | 15:10 |
| → joeyDB joined | 15:10 |
| → Mission-Critical joined | 15:10 |
| ← gargola left | 15:11 |
| ← ghoti left | 15:11 |
| → aesinv joined | 15:12 |
| → arez joined | 15:12 |
| ← Ahmed90 left | 15:12 |
| → devoldmx joined | 15:13 |
| ← zumba_addict left | 15:14 |
| → zumba_addict joined | 15:14 |
| ← kuxm left | 15:14 |
| ← Nash left | 15:15 |
| → eletuchy joined | 15:15 |
| → iamjarvo joined | 15:16 |
| → shinnya joined | 15:16 |
| ← subhojit777 left | 15:18 |
| ← devoldmx left | 15:18 |
| ← eletuchy left | 15:19 |
| ← serengeor left | 15:20 |
| → Spacew00t joined | 15:20 |
| → devoldmx joined | 15:20 |
| Mission-Critical → MissionCritical | 15:21 |
| → mizu_no_oto joined | 15:21 |
| → vla joined | 15:23 |
| → lqi joined | 15:23 |
| → highcup joined | 15:24 |
| → gyeates joined | 15:24 |
| → net2014 joined | 15:24 |
|
net2014
| hello | 15:24 |
| ← devoldmx left | 15:24 |
| ← settermjd left | 15:25 |
|
net2014
| if I have a git repository, want to call it v.1 and use a tag | 15:25 |
| → lucianangelus joined | 15:25 |
| ← Corey84 left | 15:25 |
| → darkbasic_ joined | 15:25 |
|
net2014
| and then I change code and call it v.2 with a tag | 15:25 |
| → otter768 joined | 15:25 |
| ← darkbasic left | 15:25 |
|
net2014
| how would I change/execute the data of v.1? | 15:26 |
| → devoldmx joined | 15:26 |
| → kevwil joined | 15:26 |
|
chitopunk
| net2014: I have something similar and I do, git checkout tags/v.1 | 15:26 |
| → amcgee7 joined | 15:27 |
|
jim
| a tag is similar to a branch in that it has a name and points at a commit but unlike a branch in that it can't be moved | 15:27 |
|
net2014
| chitopunk: so, basically I switch to old version and then I can access the files, as I would access a normal directory? | 15:27 |
|
chitopunk
| net2014: yes that is correct | 15:28 |
| ← zivester left | 15:28 |
| → ehynds joined | 15:28 |
| ← rath left | 15:28 |
|
net2014
| ok | 15:28 |
|
| thanks | 15:28 |
|
jim
| you use a tag to point at the commit you want to be the version to release as that tag (like: v1.0) | 15:28 |
|
| so you don't name the whole repo to be the version, you tag it | 15:29 |
|
net2014
| when I use branches, I always assume that I want to merge differences, right? | 15:29 |
| ← paolooo left | 15:30 |
|
net2014
| while tags can live independently? | 15:30 |
| ← otter768 left | 15:30 |
| ← harish_ left | 15:30 |
|
jim
| you can check out a tag, but since it's not a branch, you usually go into separated HEAD state | 15:30 |
| → subhojit777 joined | 15:31 |
|
osse
| net2014: branches can live independently as well | 15:31 |
|
net2014
| ok | 15:31 |
| ← subhojit777 left | 15:31 |
| → DolphinDream joined | 15:31 |
| → subhojit777 joined | 15:32 |
| ← mkaesz left | 15:32 |
| ← jadne left | 15:32 |
| → mkaesz joined | 15:32 |
| → Gizburdt joined | 15:32 |
|
random-user-name
| net2014: and you have to use —tags flag to push tags into some remote (this doesn’t happen automagically) | 15:33 |
| → jonmorehouse joined | 15:33 |
| → zeepr joined | 15:33 |
| ← random-user-name left | 15:33 |
| → hyperair joined | 15:33 |
| ← dsdeiz left | 15:33 |
| → random-user-name joined | 15:33 |
|
net2014
| thanks | 15:33 |
| ← darkbasic_ left | 15:35 |
| → uncx joined | 15:35 |
| → nettoweb joined | 15:35 |
| → dreiss joined | 15:35 |
| → darkbasic joined | 15:35 |
| → MLM joined | 15:36 |
| ← uncx left | 15:36 |
| → Technocrat7 joined | 15:36 |
| ← Takle left | 15:36 |
| → Gamecubic joined | 15:36 |
| ← subhojit777 left | 15:37 |
|
zeepr
| hello all. i have a production website using a git workflow, and a post deploy hook runs fetch and merge/branch. i have been using this for weeks with no problem. i'm not sure why but on the live webserver (which i am SSH'ing into), git status says my branch is ahead of origin/branch by 150 commits, and recommending i push my changes. strange thing is, i have never made any commits on this machine, only pulled from the remote repository. | 15:37 |
| → Junior joined | 15:37 |
| ← devoldmx left | 15:37 |
| ← mkaesz left | 15:37 |
| → pcypher joined | 15:37 |
| ← jonmorehouse left | 15:38 |
| → devoldmx joined | 15:38 |
|
zeepr
| i don't want to push the changes upstream because i dont know what they are, and i dont want to reset them (.. because i dont know what they are and this is a live website currently being used) | 15:38 |
| ← jceb left | 15:39 |
| → barduck joined | 15:39 |
|
jim
| then you have two repos that are like 150 commits out of sync, and you don't want to fix that because you don't know what will happen... | 15:40 |
|
| ok | 15:40 |
| → Topcat joined | 15:40 |
| → zumba_ad_ joined | 15:40 |
|
jim
| one thing you can do is back up the whole repo | 15:40 |
|
| on both sides | 15:40 |
| ← tanzim left | 15:41 |
|
Topcat
| can I edit my last commit to take a like out. Say lines 1 -10 should have been 1-4, 7-10 | 15:41 |
|
jim
| then you can try things that you're otherwise a little uncomfortable since it's the unknown | 15:41 |
| ← zumba_addict left | 15:41 |
| → Shusshu joined | 15:41 |
| ← timini left | 15:42 |
| → jwhisnant joined | 15:42 |
| → d10n-work joined | 15:42 |
| ← m0ltar left | 15:42 |
|
zeepr
| jim: well, i believe this happened when i checked out the production branch on the staging server, to test it. then merged the branch (probably should have done this elsewhere), and re-checked out the staging branch. | 15:42 |
| ← Technocrat7 left | 15:42 |
|
zeepr
| because if i checkout the production branch on that server, it says i'm up-to-date. and those branches should be in sync at this point | 15:42 |
| → Technocrat7 joined | 15:43 |
| → HDL joined | 15:43 |
|
jim
| so are you on staging or production branch? | 15:43 |
| ← HDL left | 15:44 |
| → Ankhers joined | 15:44 |
| ← mizu_no_oto left | 15:44 |
|
zeepr
| the staging server is on the staging branch, and the production server is on the production branch | 15:44 |
|
jim
| I think that means your production and the remote version (origin/production) match | 15:44 |
| → TheRealHDL joined | 15:44 |
|
zeepr
| its a fairly reasonable workflow other than my slight fuckup | 15:44 |
| ← Trudko left | 15:44 |
| → Takle joined | 15:44 |
| → zumba_addict joined | 15:44 |
| ← zumba_ad_ left | 15:44 |
| ← lamppid left | 15:44 |
|
zeepr
| yes, they do | 15:44 |
| → MarkyC joined | 15:45 |
| → darkbasic_ joined | 15:45 |
| → lamppid joined | 15:45 |
|
zeepr
| and my local box's staging branch is up to date with origin/staging as well | 15:45 |
|
jim
| how many developers? | 15:45 |
|
zeepr
| i am pushing changes on my local staging onto my staging server, which does fetch and merge | 15:45 |
|
| of the staging branch | 15:45 |
|
| however suddenly i am getting the "please explain why this merge is necessary" prompt.. which i can dismiss and it recursively merges fine.. but its strange this is happening at all | 15:46 |
|
| just me for now | 15:46 |
| → sonthonax joined | 15:46 |
| ← darkbasic left | 15:46 |
| ← sonthonax left | 15:47 |
|
TheRealHDL
| Hello all, I’d looking for help with compiling. I get this error: https://www.dropbox.com/s/98ier16dd1p0m1j/Git%20Output?dl=0 | 15:47 |
| → harish_ joined | 15:48 |
|
moritz
| TheRealHDL: looks like you need some (more up-to-date maybe) iconv libraries? | 15:48 |
|
zeepr
| i think the 150 commits are just a merge of the production branch | 15:48 |
|
jim
| so -maybe- rewriting history is sorta ok since it's just you viewing and using that history | 15:49 |
| → zumba_ad_ joined | 15:49 |
| ← zumba_addict left | 15:49 |
|
zeepr
| jim: i may have accidentally checked out staging and merged origin/production, or vice versa on this server | 15:49 |
| ← CKyle left | 15:49 |
| → sonthonax joined | 15:49 |
| ← sonthonax left | 15:49 |
| → smccarthy joined | 15:49 |
|
jim
| do you think that's the last thing you did? | 15:49 |
|
TheRealHDL
| I just installed all the dependencies from source so it should be up-to-date. | 15:50 |
| → sonthonax joined | 15:50 |
| → starkhalo joined | 15:50 |
| → zenith_ joined | 15:50 |
|
zeepr
| jim: so are you saying I should push the changes, pull them on my local machine, inspect the gitk log, and either revert or re-commit correctly and push back to server? | 15:50 |
|
| jim: yes, i definitely did one or the other. | 15:50 |
| → nnyk joined | 15:51 |
|
jim
| well I think you should back up first | 15:51 |
| → tyreld joined | 15:51 |
|
jim
| on both sides (your local repo and the remote, your web service) | 15:51 |
| ← nnyk_ left | 15:51 |
| → sonthonax_ joined | 15:51 |
|
zeepr
| the repo itself or the working tree you mean? | 15:51 |
|
jim
| both | 15:51 |
|
sonthonax_
| I have a question about best practice/personal-preference. | 15:52 |
|
jim
| i.e., the working tree which has the repo in it | 15:52 |
|
zeepr
| this is thousands of files many gigs large, is there anyway to see which files have been affected by the commits? | 15:52 |
|
jim
| on both sides | 15:52 |
|
sonthonax_
| If you’ve made a few changes, and they’re kind of seperate. | 15:52 |
|
iveqy
| TheRealHDL: does git support clang? Have you tried with gcc? | 15:52 |
|
jim
| then try to restore it and see if you can do it again | 15:52 |
|
| on both sides | 15:52 |
|
sonthonax_
| Should you selectively commit each group of files? | 15:52 |
|
zeepr
| jim: sorry, restore it? | 15:52 |
|
jim
| we're talking about backing up your repo | 15:53 |
|
moritz
| zeepr: git log --stat or git diff --stat rev1..rev2 | 15:53 |
|
jim
| if you are to feel comfortable experimenting with your production server, you probably must back up all the time anyway | 15:54 |
| ← bvi left | 15:54 |
| ← sonthonax left | 15:54 |
| sonthonax_ → sonthonax | 15:54 |
|
TheRealHDL
| iveqy: gcc is my default. Not sure if git supports clang, haven’t tried compiling it before now. | 15:54 |
|
zeepr
| yes, i have numerous backups, of course. | 15:54 |
| → noobsie joined | 15:54 |
|
jim
| and that backup includes the .git? | 15:55 |
| → Bootinbull joined | 15:55 |
|
noobsie
| basic question, but how can I look up what commands means in git? I want to for example know what "git -m" means? git help is not helping | 15:55 |
|
iveqy
| TheRealHDL: you're using clang | 15:55 |
| ← zenith_ left | 15:55 |
|
jim
| git --help | 15:55 |
|
| or man git | 15:56 |
|
gitinfo
| the git manpage is available at http://jk.gs/git.html | 15:56 |
|
zeepr
| jim,moritz: in looking through these commits, i dont see anything that was actually done on this machine... in fact, the problem is surely more fundamental... i am 100% sure "git commit" has never been run on this server, so how coudl there be 150 commits ahead of the remote branch? | 15:56 |
|
bremner
| merges? | 15:56 |
| → Eue joined | 15:56 |
|
iveqy
| TheRealHDL: or rather, your configure script says gcc but the error code is from clang clang: error: linker command failed with exit code 1 (use -v to see invocation) | 15:56 |
| → SumDude joined | 15:56 |
|
zeepr
| bremner: indeed, but how? | 15:56 |
| ← zumba_ad_ left | 15:56 |
| ← Eue left | 15:56 |
| ← FreezingCold left | 15:56 |
| → MasterPiece joined | 15:56 |
| → zumba_addict joined | 15:56 |
| ← Technocrat7 left | 15:57 |
| ← jottr left | 15:57 |
| → Ugop joined | 15:57 |
| ← net2014 left | 15:57 |
|
bremner
| from the pulls? | 15:57 |
|
| sorry, I have | 15:58 |
|
| not followed closely. | 15:58 |
| ← zumba_addict left | 15:58 |
| ← Ugop left | 15:58 |
|
TheRealHDL
| iveqy: I see, how do I force it to use gcc then? | 15:58 |
|
jim
| if you have a backup of the repo and the .git (on both sides) then you can try merging or pulling to see if it will work and restore from your backup if it doesn't | 15:59 |
|
zeepr
| jim, bremner: i pinpointed the issue by replicating it on my local machine :P i checked out the staging branch ,and merged in the production branch | 15:59 |
| ← sinkensabe left | 15:59 |
|
zeepr
| now its reporting my staging branch is ahead by 151 commits | 15:59 |
|
| (locally) | 15:59 |
|
| and i have a list of files affected by the merge | 15:59 |
| → zoi joined | 15:59 |
|
iveqy
| TheRealHDL: I've no idea. It seems like you're using gcc as compiler and then clang as a linker | 15:59 |
| ← iamjarvo left | 16:00 |
|
random-user-name
| TheRealHDL: you should use “make all” instead of “make” | 16:00 |
| ← acolson left | 16:00 |
|
random-user-name
| clang works ok, btw | 16:00 |
| ← zoi left | 16:00 |
| ← danguafer left | 16:01 |
| → Bruno_ joined | 16:01 |
| ← Silmarilion left | 16:01 |
| ← DrShoggoth left | 16:01 |
| → Ztrio joined | 16:01 |
| ← interrobangd left | 16:01 |
| → b00^wk2 joined | 16:01 |
| ← Gizburdt left | 16:02 |
| → pm90_ joined | 16:02 |
| → lsiv568 joined | 16:02 |
|
b00^wk2
| hello, i have 'detached HEAD', because i've reset to a previous revision , hard reset it. How can i now go back to my latest HEAD? dumping everything, and no more detached heads | 16:02 |
|
| :) | 16:02 |
|
| is it also git --reset hard ? | 16:02 |
|
offby1
| b00^wk2: !reflog | 16:02 |
|
gitinfo
| b00^wk2: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H` | 16:02 |
| ← pm90_ left | 16:03 |
| → pm90_ joined | 16:03 |
| ← paulweb515 left | 16:04 |
| ← mennea_ left | 16:04 |
| ← wachterjohannes left | 16:04 |
| → editshare-ericf joined | 16:04 |
| ← shinnya left | 16:04 |
| ← BSaboia left | 16:04 |
| ← roelmonnens left | 16:04 |
| → opdavies joined | 16:04 |
|
b00^wk2
| gees, what are all these heads log -g shows .. | 16:04 |
| → Noldorin joined | 16:05 |
| → mizu_no_oto joined | 16:05 |
| ← noobsie left | 16:05 |
| → iamjarvo joined | 16:06 |
| → EminenceHC joined | 16:07 |
|
TheRealHDL
| random-user-name: Tried ./configure CC=/usr/bin/clang and got the same error. | 16:07 |
|
b00^wk2
| offby1, i don't think i need to do the -b part | 16:07 |
|
| i don't want to branch | 16:07 |
| ← Ztrio left | 16:09 |
| → kermit joined | 16:09 |
|
b00^wk2
| ok, i did hard reset again to latest, | 16:10 |
|
| but why do i still have HEAD detached message ? | 16:10 |
|
thiago
| b00^wk2: git checkout <branchname> | 16:11 |
| → joo-_ joined | 16:11 |
|
b00^wk2
| there is no branch | 16:11 |
|
| just head | 16:11 |
|
thiago
| b00^wk2: that's the cause of your message then | 16:12 |
| → settermjd joined | 16:12 |
|
b00^wk2
| thiago, why do i need a branch? i wanted to go back to head | 16:12 |
|
thiago
| b00^wk2: you are on HEAD | 16:12 |
|
| b00^wk2: by definition of HEAD, you're always on it | 16:12 |
|
| b00^wk2: you don't need a branch. But you're asking about the message that is given when you're not on a branch. | 16:13 |
| → steele joined | 16:13 |
|
thiago
| b00^wk2: if you don't want a branch, live with the message. | 16:13 |
|
b00^wk2
| ok, but how can i go to <branchname> , where there is no name | 16:13 |
|
thiago
| b00^wk2: if you want to get rid of the message, switch to a branch | 16:13 |
|
b00^wk2
| ok, but i don't think i had such message before .. | 16:13 |
|
thiago
| you must never have been on a detached HEAD before | 16:13 |
|
b00^wk2
| today i reverted to few days revision, right, with hard reset | 16:13 |
|
thiago
| b00^wk2: that was not the cause | 16:14 |
|
b00^wk2
| then i got that message. then , after checking stuff, i hard reset back to latest | 16:14 |
|
| and then i got it | 16:14 |
|
random-user-name
| b00^wk2: this is DAG (directed acyclic graph) - all the links between your commits are directed and you can’t go backwards | 16:14 |
|
thiago
| b00^wk2: have you tried to rebase recently? | 16:14 |
|
b00^wk2
| thiago, no | 16:15 |
|
thiago
| b00^wk2: you did something else that caused a detached HEAD | 16:15 |
|
| b00^wk2: the two operations that result in that are rebase and checkout | 16:15 |
|
b00^wk2
| git branch -a | 16:15 |
|
| * (detached from 2f10978) | 16:15 |
|
| master | 16:15 |
|
| nusom | 16:15 |
| → DrShoggoth joined | 16:15 |
| → Technocrat7 joined | 16:16 |
| → eletuchy joined | 16:16 |
| ← zoso left | 16:16 |
|
TheRealHDL
| Seems like I avoid the compile error if I simply don’t use the configure script. | 16:16 |
|
b00^wk2
| i want to go back to latest 'nusom' | 16:16 |
|
PerlJam
| b00^wk2: git checkout nusom | 16:16 |
| → Oombn joined | 16:16 |
| → das_beard joined | 16:16 |
| ← Oombn left | 16:16 |
|
b00^wk2
| PerlJam, nice band, ok :) | 16:16 |
| ← tevfik left | 16:16 |
| → sinkensabe joined | 16:17 |
| ← pcypher left | 16:17 |
| → unv joined | 16:17 |
| → naftilos76 joined | 16:18 |
| → m0ltar joined | 16:18 |
| ← sinkensabe left | 16:19 |
|
random-user-name
| TheRealHDL: that is strange because I’ve built git from sources on OSX10.10 without any errors using just the recipe from the INSTALL file (and I installed gnu libraries previously via homebrew) | 16:19 |
| ← DrShoggoth left | 16:19 |
|
iveqy
| TheRealHDL: I'm glad you solved your problem but it's not quite good that there was a problem from the beginning. If you manage to find it, feel free to send a patch to !list | 16:19 |
|
gitinfo
| TheRealHDL: [!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#git (git@vger.kernel.org, subscription optional) | 16:19 |
|
b00^wk2
| thiago, was really really confusing. That detached head revision is on branch numsom. | 16:19 |
| → wrk joined | 16:19 |
|
PerlJam
| b00^wk2: you mean "commit", not "branch" | 16:20 |
|
b00^wk2
| yes | 16:20 |
| → intransit joined | 16:20 |
| ← eletuchy left | 16:20 |
|
b00^wk2
| and that was the latest commit , all i wanted was: 1) go back a few commites, and then 2) go back to latest, on that same branch | 16:20 |
|
| i did not switch it | 16:20 |
| → iliv joined | 16:20 |
|
PerlJam
| why did you want to "go back a few commits"? | 16:20 |
|
b00^wk2
| but now the messgge is gone | 16:20 |
|
| :D | 16:20 |
| → DrShoggoth joined | 16:20 |
|
b00^wk2
| thiago, no more detached heads | 16:21 |
| ← das_beard left | 16:21 |
|
b00^wk2
| PerlJam, because something got broken i thought with latest ones | 16:21 |
| → Ahmed90 joined | 16:21 |
| ← intransit left | 16:21 |
| ← Ahmed90 left | 16:21 |
| ← Technocrat7 left | 16:21 |
| → Ahmed90 joined | 16:22 |
| → MarkyC_ joined | 16:22 |
|
iliv
| when I'm on branch blah and viewing "git diff stable" (stable is another branch name) what "-" and "+" indicate? That deletions and additions are going to happen in stable branch of committed? | 16:22 |
|
| if committed * | 16:22 |
|
osse
| iliv: the lines with - are replaced with the lines with + | 16:22 |
| → zenith_ joined | 16:22 |
|
thiago
| iliv: git config diff.mnemonicprefix=true | 16:22 |
|
| then it will show "c" and "w" instead of "a" and "b" | 16:23 |
|
| "c" for commit and "w" for working dir | 16:23 |
| ← unv left | 16:23 |
|
iliv
| osse, that is obvious, but in which of the two branches those changes are going to happen? | 16:23 |
| → SiddhantT joined | 16:23 |
|
zeepr
| for posterity: merging the changes locally allowed me to see the files, i reset the merge, backed up the files, merged, push upstream, and the conflict was resolved. $ git diff origin/develop..HEAD helped as well | 16:24 |
| ← toothrot left | 16:24 |
|
thiago
| iliv: sorry, with a space instead of = | 16:24 |
|
osse
| iliv: the question itself is flawed. git diff foo bar calculates the difference *from* foo *to* bar. | 16:24 |
|
b00^wk2
| thiago, and yes, i did a checkout to beging with ... as per here :http://stackoverflow.com/questions/4114095/revert-to-a-previous-git-commit | 16:25 |
|
| thiago, so that was the detached head problem ? | 16:25 |
|
osse
| iliv: 'git diff stable' is the same as 'git diff stable blah' in this case | 16:25 |
| → tritone joined | 16:25 |
| ← FunkyAss left | 16:25 |
| ← MarkyC left | 16:25 |
|
b00^wk2
| PerlJam, if i want to go back a few revisions, i always have to checkout , right? and then I get a detached head | 16:25 |
|
| :P | 16:25 |
|
thiago
| b00^wk2: yes, that was the cause | 16:25 |
|
b00^wk2
| phew, | 16:25 |
| ← devll left | 16:25 |
| ← ciampix left | 16:26 |
|
random-user-name
| iliv: git diff blah stable | 16:26 |
|
iliv
| osse, in other words, "-" and "+" show what will be removed and added to bar (based on differences between foo and bar, with foo content appearing in bar eventually, if committed)? | 16:27 |
|
osse
| iliv: the total difference you see is probably a combination of the effects of many different commits. some of them on one branch, some on the other. | 16:27 |
|
iliv
| ah | 16:27 |
| → MarkyC joined | 16:27 |
|
osse
| iliv: do you have any uncommited changes? | 16:27 |
|
iliv
| not that simple | 16:27 |
|
random-user-name
| iliv: your current branch is the base for diffing | 16:27 |
| ← Gamecubic left | 16:27 |
| ← jaznow left | 16:27 |
|
osse
| random-user-name: not if you give exactly one branch as argument. then that branch becomes the base. | 16:27 |
|
| and it diffs against the working dir. | 16:28 |
| ← MarkyC_ left | 16:28 |
| ← IIT left | 16:28 |
| → gsingh93 joined | 16:29 |
|
aspiers
| just made a new demo video! easy backporting using git-deps: http://youtu.be/DVksJMXxVIM | 16:29 |
| ← joo-_ left | 16:29 |
|
random-user-name
| osse: yes you are right | 16:29 |
| ← hebz0rl left | 16:30 |
| ← Topcat left | 16:32 |
| → axl_ joined | 16:32 |
| → MechtiIde joined | 16:32 |
| → tevfik joined | 16:32 |
| → Gamecubic joined | 16:34 |
| → ParsectiX joined | 16:34 |
| ← iamjarvo left | 16:35 |
| → joo-_ joined | 16:36 |
| → CEnnis91 joined | 16:36 |
|
faheem_
| can I get just the 'debian' directory here -> https://github.com/agx/icedove/tree/master/debian ? | 16:36 |
|
| If so, how? | 16:36 |
| → pecg joined | 16:36 |
|
faheem_
| get -> clone | 16:36 |
| → paulweb515 joined | 16:37 |
|
iveqy
| faheem_: no | 16:37 |
|
faheem_
| iveqy: bummer. I thought git had a partial clone thingy. or is that shallow clone? | 16:38 |
| → zumba_addict joined | 16:38 |
|
iveqy
| faheem_: it's shallow clone, and that make you to only get a part of the history, you still get the whole worktree | 16:38 |
| → kukks joined | 16:38 |
| → jazzzu joined | 16:38 |
| → subhojit777 joined | 16:39 |
| ← petersr left | 16:39 |
|
faheem_
| iveqy: ok. can I get just the last rev then? That might not be too bad. | 16:40 |
|
iliv
| osse, you said against the working dir.. not the committed state of both branches? To answer your question, my branches are actually in divergent state. | 16:40 |
| ← subhojit777 left | 16:40 |
| → pcypher joined | 16:40 |
| → subhojit777 joined | 16:40 |
| ← zadock left | 16:41 |
| → polyzen joined | 16:41 |
| ← subhojit777 left | 16:41 |
| → iamjarvo joined | 16:42 |
| → bsanford joined | 16:42 |
| ← mlechner left | 16:42 |
| → diegoaguilar joined | 16:42 |
|
_ikke_
| iliv: git diff with only one arguments diffs that commit against the working tree | 16:42 |
| → subhojit777 joined | 16:42 |
|
_ikke_
| if you want to diff two branches, you have to provide them btoh | 16:42 |
|
| both* | 16:42 |
| → skorgon joined | 16:42 |
| → jaznow joined | 16:43 |
| ← jaznow left | 16:43 |
| ← SiddhantT left | 16:43 |
| → gerep joined | 16:43 |
|
gerep
| Hello lords! | 16:43 |
|
| I'm creating a pre-commit script to deal with the following situation: | 16:44 |
|
iveqy
| faheem_: yes, see man git clone look for shallow | 16:44 |
|
gitinfo
| faheem_: the git-clone manpage is available at http://jk.gs/git-clone.html | 16:44 |
|
iveqy
| faheem_: sorry, I meant --depth | 16:44 |
|
gerep
| I have some new commits but before allowing it to be pushed, I need to test it first | 16:44 |
|
faheem_
| iveqy: ok | 16:44 |
|
gerep
| Is it possible, in the pre-commit, to get the new commits? | 16:44 |
| ← bgerber left | 16:45 |
| → thiss joined | 16:45 |
| → petersr joined | 16:45 |
| → Aeterne joined | 16:45 |
|
gerep
| I had this script in the post-commit script but I was having trouble with broken builds, that's why I want to check the new commits in the pre-commit phase | 16:45 |
| → bgerber joined | 16:46 |
| → FreezingCold joined | 16:46 |
| ← lb1a left | 16:46 |
| ← pcypher left | 16:47 |
| ← Cust0sL1men left | 16:47 |
| ← b00^wk2 left | 16:47 |
|
iliv
| _ikke_, sing my initial example, if I'm on blah and doing git diff stable I'm actually comparing latest blah commit (or working directory?) to the most recent commit of stable or working tree/directory of stable? | 16:47 |
| ← druidd left | 16:47 |
| ← Bruno_ left | 16:47 |
|
_ikke_
| iliv: you are comparing the latest commit on stable against your current working tree | 16:47 |
| ← daedeloth left | 16:48 |
| → Kicer86 joined | 16:48 |
| → jonmorehouse joined | 16:48 |
| → pcypher joined | 16:50 |
| → jadne joined | 16:51 |
| ← skorgon left | 16:52 |
| ← Ahmed90 left | 16:52 |
| → akushner joined | 16:52 |
| ← gerep left | 16:52 |
| → ToTheInternet joined | 16:52 |
| ← lqi left | 16:52 |
| → jottr joined | 16:53 |
| → lqi joined | 16:53 |
|
ToTheInternet
| I corrected a single line in a commit and therefore i want to ammend the change to the latest commit. However, I already pushed the lastest commit to remote. Can I still use ammend? | 16:53 |
| ← GT4066 left | 16:53 |
|
milki
| ToTheInternet: that depends on if you care about !public | 16:54 |
|
gitinfo
| ToTheInternet: [!rewrite] 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/waqum | 16:54 |
| ← pcypher left | 16:54 |
|
ToTheInternet
| milki: what will the people that have pulled have to do? | 16:54 |
|
| (assuming they simply pulled but have not yet done any changes based on that commit) | 16:55 |
| ← pecg left | 16:55 |
| ← jonmorehouse left | 16:55 |
| ← jorj left | 16:56 |
| → jagob joined | 16:56 |
| → Trudko joined | 16:56 |
| ← Raverix_ left | 16:57 |
|
milki
| if they know what they are doing, they'll want to rebase | 16:57 |
| → pheaver joined | 16:57 |
|
milki
| if not, they'll have wierd merges or complain | 16:57 |
| → dunpeal joined | 16:57 |
| ← JR_____ left | 16:57 |
|
dunpeal
| So gitlab basically competes against Gitorious? | 16:57 |
| ← jottr left | 16:58 |
|
milki
| !gitorious | 16:58 |
|
gitinfo
| Gitorious is a free code-hosting website for open-source projects. The software powering it is also available for you to self-host repos. https://gitorious.org/ | 16:58 |
|
milki
| o | 16:58 |
|
dunpeal
| it looks vastly superior | 16:58 |
|
milki
| right | 16:58 |
|
ToTheInternet
| milki: ok, moving on as suggested... thanks | 16:58 |
|
milki
| that thing | 16:58 |
| → HG` joined | 16:58 |
| ← Macaveli left | 16:58 |
| ← hans_s left | 16:59 |
| ← lsiv568 left | 16:59 |
| → gdrc joined | 17:00 |
| ← bb010g left | 17:00 |
| ← MarkyC left | 17:00 |
| ← jnavila left | 17:00 |
| → aldodelgado joined | 17:01 |
|
dunpeal
| yeah | 17:01 |
|
| basically trying to figure out Github vs Gitorious vs Gitlab | 17:02 |
| → TMess_ joined | 17:02 |
|
TMess_
| hey guys | 17:02 |
|
gitinfo
| TMess_: 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:02 |
| → stylica joined | 17:03 |
|
ToTheInternet
| !backup | 17:03 |
|
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/#backups | 17:03 |
|
dunpeal
| Basically, seems like Github is really about hosting the code on their servers | 17:03 |
| smccarthy → smccarthy1 | 17:03 |
| ← HG` left | 17:03 |
|
Seveas
| dunpeal: or giving them lots of money for something on-prem | 17:03 |
|
TMess_
| I can't seem to find repopick anywere.... Can someone help me out??? | 17:03 |
| → Gizburdt joined | 17:04 |
|
dunpeal
| Seveas: yeah, the basic free account isn't really useful, especially not for any kind of non-public repo | 17:04 |
|
ToTheInternet
| dunpeal: i don't know gitorious but we have used gitlab for a few months and i really like it so far. haven't used a lot of its features so far though | 17:04 |
| ← dyce left | 17:04 |
| → nmz787_i joined | 17:04 |
|
Seveas
| dunpeal: there's also bitbucket if you want hosted private repos | 17:04 |
|
dunpeal
| Gitorious and Gitlab seems like they're more about allowing you to host your own instance. | 17:04 |
| ← thiago left | 17:04 |
| → intransi_ joined | 17:04 |
|
dunpeal
| Seveas: right, as far as I can tell, Gitlab also supports unlimited private repos on the free account. | 17:04 |
| ← dreiss left | 17:05 |
|
Seveas
| dunpeal: correct | 17:05 |
|
yxejamir
| If considering Gitorious, may also be worth considering Gitolite. | 17:05 |
| ← ToTheInternet left | 17:05 |
| smccarthy1 → smccarthy | 17:05 |
|
dunpeal
| honestly, both should be more popular than Github, which I guess just has popularity and network effects working for it | 17:05 |
| ← tevfik left | 17:05 |
|
dunpeal
| yxejamir: Gitlab looks the most impressive so far | 17:06 |
|
TMess_
| guys? | 17:06 |
|
dunpeal
| so I'm considering using that. | 17:06 |
| → daedeloth joined | 17:06 |
|
rom1504
| there's gitlab.com too now dunpeal | 17:06 |
| ← kukks left | 17:06 |
|
rom1504
| which is a public instance, kind of like github | 17:07 |
|
Seveas
| TMess_: I've necer even heard of it | 17:07 |
|
dunpeal
| TMess_: this repopick? https://gitorious.org/replicant/build/source/3e39ecabad250118c613b71e01738bb4c7a4d51c:tools/repopick.py | 17:07 |
|
| (first result on google search) | 17:07 |
|
TMess_
| unable to get that to work | 17:07 |
|
dunpeal
| TMess_: that's unfortunate, but probably OT | 17:08 |
|
TMess_
| http://wiki.cyanogenmod.org/w/Doc:_using_gerrit#Retrieving_and_building_a_patch_submission_already_on_Gerrit | 17:08 |
| ← aesinv left | 17:08 |
|
TMess_
| here they use it as a command | 17:08 |
|
| I don't think they are running a py script ... are they? | 17:08 |
|
dunpeal
| TMess_: I'm guessing it's somewhere in the Gerrit toolchain then | 17:08 |
|
| it is a Python script. | 17:08 |
| ← zeepr left | 17:09 |
| ← jfbarthe left | 17:09 |
| → imachuchu joined | 17:09 |
|
dunpeal
| rom1504: I am using Gitlab.com for my personal projects, and it works great. My friend needs a local deployment, so I'm going to recommend Gitlab | 17:09 |
|
| Seeing the main options are Gitorious or Gitlab, and Gitlab seems vastly superior. | 17:10 |
| → Sasazuka joined | 17:10 |
|
TMess_
| are they using a python script in the wiki? | 17:10 |
| → ende joined | 17:10 |
|
dunpeal
| yxejamir: Gitolite seems a little less featureful than he'd like. | 17:10 |
| ← ScioMin left | 17:10 |
| → freestyl3r joined | 17:11 |
|
rom1504
| yeah gitlab is much better | 17:11 |
| ← jadne left | 17:12 |
| ← iamjarvo left | 17:12 |
| → SFLimey joined | 17:12 |
|
jast
| afaik gitlab still crashes when viewing repositories with empty trees | 17:13 |
|
| :} | 17:13 |
|
TMess_
| guys can you walk me through running that repopick.py script? .... I think I maybe doing something wrong | 17:13 |
| ← yxejamir left | 17:14 |
| ← Ankhers left | 17:14 |
| → aesinv joined | 17:14 |
|
dunpeal
| jast: did you submit a bug report? sounds like an easy bug to fix... | 17:15 |
| → CKyle joined | 17:15 |
|
jast
| the bug is actually in rugged (a gem used by gitlab) | 17:15 |
|
| and, in turn, in the version of libgit2 they're using | 17:15 |
| → Ankhers joined | 17:15 |
|
jast
| it's fixed in a beta version of rugged IIRC | 17:15 |
| ← arez left | 17:15 |
| ← Sasazuka left | 17:15 |
|
jast
| hard to work around outside of rugged | 17:15 |
| → das_beard joined | 17:16 |
| → thiago joined | 17:16 |
|
rom1504
| jast: just tested, I got a 404 that's all | 17:16 |
|
| no crash | 17:16 |
|
jast
| on your own install? | 17:16 |
|
rom1504
| yes | 17:16 |
|
TMess_
| got it to work | 17:17 |
|
| thanks | 17:17 |
|
jast
| and you've got a commit with an empty tree? | 17:17 |
| ← TMess_ left | 17:17 |
|
rom1504
| oh no, no commit | 17:17 |
| → cromero joined | 17:17 |
|
rom1504
| how do you do a commit with an empty tree ? | 17:17 |
|
jast
| git commit --allow-empty | 17:17 |
| ← cvanball left | 17:17 |
|
rom1504
| let's try | 17:17 |
| → Una joined | 17:17 |
| → jottr joined | 17:17 |
|
rom1504
| 404 | 17:18 |
|
jast
| interesting. I get a 500. | 17:18 |
|
| anyway, gotta go, no time to dig deeper | 17:19 |
|
rom1504
| what version ? I got 7.7.0 | 17:19 |
| ← inamoriti left | 17:19 |
|
jast
| 7.6.2 | 17:19 |
|
rom1504
| maybe they fixed it in 7.7 then | 17:19 |
| ← irqq left | 17:19 |
|
jast
| fun, 7.6.2 isn't even in the changelog | 17:20 |
| ← gyeates left | 17:20 |
|
osse
| 7.62 mm NATO | 17:20 |
|
rom1504
| I can't see anything about that in the changelog of 7.7.0 | 17:20 |
|
| weird | 17:20 |
| → irqq joined | 17:21 |
| → daedeloth_ joined | 17:21 |
| → FunkyAss joined | 17:21 |
| → kukks joined | 17:21 |
| ← kukks left | 17:21 |
| → kukks joined | 17:21 |
|
random-user-name
| osse: AK-47 also has that gauge | 17:21 |
| → lsiv568 joined | 17:22 |
| → git-man joined | 17:22 |
| → zoso joined | 17:22 |
| ← metastableB left | 17:22 |
|
git-man
| Hi! How do I search using git grep for a match of two lines? ( 'def test.*\n"""' ) makes it match upto n and not the newline... any help would be awesome | 17:23 |
|
osse
| random-user-name: nope | 17:23 |
| ← daedeloth left | 17:23 |
|
osse
| random-user-name: that diameter, yes. that exact round, no | 17:23 |
|
| hmm, maybe that's what gauge means | 17:23 |
| → ciss joined | 17:23 |
| ← shruggar left | 17:23 |
|
random-user-name
| osse: i think it is | 17:24 |
|
osse
| git-man: git grep -A1 line1 | grep line2 | 17:24 |
|
dunpeal
| jast: why is it so hard to work around? can't they just catch an exception? | 17:24 |
| → mennea joined | 17:24 |
|
git-man
| osse: thanks! I'll try that :) | 17:24 |
| → lindenle joined | 17:24 |
| ← dvl left | 17:24 |
| ← TomyWork left | 17:25 |
| → EvilPenguin joined | 17:25 |
|
ciss
| hi, i'm trying to merge a repo into another repo, inside a sub directory (in order to delete the merged repo), while keeping the history. i've read several references to read-tree, which in my tests didn't keep the history. do i have to use filter-branch for this? | 17:25 |
| ← Takle left | 17:26 |
| ← zenith_ left | 17:26 |
| ← stylica left | 17:26 |
|
git-man
| osse: That works! thanks ;) ( btw I assume -A1 flag returns the next line too? ) | 17:26 |
| ← ende left | 17:26 |
|
milki
| ciss: filter-branch would be good for the repo going to a subdir | 17:26 |
| ← scottschecter left | 17:26 |
| → ende joined | 17:26 |
| → otter768 joined | 17:26 |
|
milki
| hmm | 17:26 |
| → stylica joined | 17:26 |
|
milki
| though its usually the other way around... | 17:26 |
|
osse
| git-man: oui. -A == --after | 17:27 |
|
| git-man: -B = --before and -C = --context (just -A and -B combined) | 17:27 |
|
milki
| ciss: maybe --tree-filter will let you move everything into a subdir | 17:27 |
|
git-man
| osse: thanks a lot :) | 17:27 |
|
milki
| then you can treat the remote repo as just a bunch of branches and do regular merges | 17:27 |
|
osse
| git-man: grep itself has the exact same options | 17:27 |
|
git-man
| Are there any specific advantages to using git grep over grep directly? | 17:28 |
| ← The_Phoenix left | 17:28 |
| ← intransi_ left | 17:28 |
| ← epifanio left | 17:29 |
|
PerlWebDev
| probably not, unless you're on a system that lacks grep (Windows) | 17:29 |
|
git-man
| osse: Sorry I should have googled that up - http://stackoverflow.com/a/17558278 :) | 17:29 |
|
osse
| git-man: speed. both in the literal searching sense (I *think*, not sure), but most importantly it automatically avoids files that are not part of the repo (ie. binary build artifacts, temp files, etc.) | 17:29 |
|
git-man
| hmm thanks for the response!! | 17:30 |
|
osse
| but git grep doesn't have -o, which can be useful | 17:30 |
| ← hardenedapple left | 17:30 |
|
osse
| (not all actual greps have it either, but that's a different story) | 17:30 |
| ← danjordan left | 17:30 |
| → ende_ joined | 17:30 |
| ← stylica left | 17:30 |
| → stylica joined | 17:30 |
| ← veganista left | 17:30 |
| ← git-man left | 17:30 |
| ← ki0 left | 17:31 |
| → danjordan joined | 17:31 |
| ← otter768 left | 17:31 |
| ← tango_ left | 17:32 |
| ← MMukherjee left | 17:32 |
| → zenith_ joined | 17:33 |
| ← devoldmx left | 17:33 |
| ← ende left | 17:33 |
| ← teufelChiCoder left | 17:33 |
| → tango_ joined | 17:34 |
| ← Pookz left | 17:34 |
| ← basiclaser left | 17:34 |
| ← cjwilburn left | 17:34 |
| → SirRetnuh joined | 17:34 |
| → MMukherjee joined | 17:34 |
| ← zenith_ left | 17:34 |
| → cjwilburn joined | 17:34 |
| ← mikecmpbll left | 17:34 |
| → zenith_ joined | 17:35 |
|
ciss
| milki: thanks, looking into it now. i guess i won't get around doing some reading to understand how filter-tree is supposed to be applied | 17:35 |
| → ojacobson joined | 17:35 |
| → metastableB joined | 17:36 |
| ← cbonobo left | 17:36 |
| → cbonobo joined | 17:36 |
| → incredible joined | 17:37 |
| → The_Phoenix joined | 17:37 |
| ← The_Phoenix left | 17:37 |
| ← Gizburdt left | 17:37 |
|
milki
| you want to move everyone in the repo into a subdir _before_ you do the merging | 17:39 |
| ← cjwilburn left | 17:39 |
| → Pookz joined | 17:39 |
| → dannymic_ joined | 17:39 |
| ← dannymichel left | 17:39 |
| → shruggar joined | 17:40 |
| → xampel joined | 17:40 |
| ← dannymic_ left | 17:40 |
| ← MMukherjee left | 17:41 |
| → King_Hual joined | 17:41 |
| → dannymichel joined | 17:41 |
| → MMukherjee joined | 17:42 |
| ← achadwick left | 17:42 |
| ← ome left | 17:43 |
| → jaznow joined | 17:43 |
| → gopar joined | 17:44 |
| ← Una left | 17:45 |
| ← random-user-name left | 17:45 |
| ← Walex left | 17:46 |
| → Walex2 joined | 17:46 |
|
ciss
| milki: i think i got it now. from what i understand the idea is to move the files of a commit via tree-filter while filter-branch processes the commit, and expect git to automatically detect that the files have been moved. correct? | 17:46 |
| ← Asiajey left | 17:47 |
| → msonntag joined | 17:48 |
| → iamjarvo joined | 17:48 |
| ← dv^laptop left | 17:48 |
| ← jaznow left | 17:48 |
| ← xampel left | 17:49 |
| → random-user-name joined | 17:49 |
| → veebers joined | 17:49 |
| ← zenith_ left | 17:49 |
| ← hiironymus left | 17:50 |
| ← workerbeetwo left | 17:50 |
| ← random-user-name left | 17:51 |
| ← Aune left | 17:51 |
|
milki
| that sounds wierd o.O | 17:52 |
| → pcypher joined | 17:52 |
|
milki
| use use filter-branch --tree-filter to pretend for every commit, you actualy committed everything in a subdir | 17:52 |
| → dreiss joined | 17:53 |
|
milki
| o wait | 17:53 |
|
| ya, if you want the history to look right we want to do this... maybe | 17:53 |
|
| otherwise, just git mv everything in a new commit | 17:53 |
|
| and then merge | 17:53 |
| → mennea_ joined | 17:53 |
|
ciss
| nope, need to keep the history | 17:54 |
|
milki
| ya history will be there | 17:54 |
| → SimonNa joined | 17:54 |
|
milki
| you just have to recognize whoever moved the files will be blamed at that commit | 17:54 |
| ← govg left | 17:54 |
|
milki
| history across renames is not easy | 17:54 |
| ← irqq left | 17:54 |
| → jonmorehouse joined | 17:54 |
| ← ashokrajar left | 17:55 |
| ← ska-fan left | 17:55 |
| ← mennea left | 17:57 |
| → hahuang65 joined | 17:57 |
| → TomyLobo joined | 17:58 |
| ← aswen left | 17:58 |
| ← vishal left | 17:59 |
| → mikecmpbll joined | 18:00 |
| → tevfik joined | 18:00 |
| ← cromero left | 18:00 |
| ← jerius left | 18:00 |
| → kadoban joined | 18:01 |
| → jerius joined | 18:01 |
| ← Trudko left | 18:01 |
| ← howlymowly left | 18:01 |
| ← stylica left | 18:02 |
| → ELFrederich joined | 18:02 |
| → stylica joined | 18:02 |
| ← vurma left | 18:03 |
| ← MissionCritical left | 18:04 |
| ← iamjarvo left | 18:04 |
| → eletuchy joined | 18:04 |
| ← mizu_no_oto left | 18:05 |
| → jadne joined | 18:07 |
| ← intellix left | 18:07 |
| ← barduck left | 18:07 |
| → neurot1k joined | 18:07 |
| → bb010g joined | 18:08 |
| ← netj left | 18:09 |
| ← eletuchy left | 18:09 |
| → netj joined | 18:09 |
| → pcypher_ joined | 18:09 |
| → tieTYT2 joined | 18:09 |
| → erichf joined | 18:10 |
| ← pcypher_ left | 18:10 |
| ← pcypher left | 18:10 |
| → pcypher joined | 18:10 |
|
erichf
| Hello, what is the term for referring to the companies that host git repositories i.e. bitbucket and github? What are these companies called? | 18:10 |
| → ashokrajar joined | 18:11 |
| ← CKyle left | 18:11 |
| ← wrk left | 18:11 |
|
_rgn
| saas git repo host? | 18:12 |
| → shinnya joined | 18:12 |
| ← kukks left | 18:12 |
| ← subhojit777 left | 18:13 |
| → upeb joined | 18:13 |
| → MissionCritical joined | 18:13 |
| ← upeb left | 18:13 |
| → iamjarvo joined | 18:14 |
| ← joeyDB left | 18:14 |
| → ujo joined | 18:14 |
| ← joki left | 18:15 |
| → Una joined | 18:16 |
| → random-user-name joined | 18:16 |
| ← jonmorehouse left | 18:16 |
|
erichf
| _rgn, yea, I think that's a good description -- ty | 18:16 |
| → mkaesz joined | 18:16 |
| ← ujo left | 18:16 |
| ← ashokrajar left | 18:17 |
| → EvilPeng1 joined | 18:17 |
| ← EvilPeng1 left | 18:17 |
| → Mii joined | 18:18 |
| → intransit joined | 18:18 |
| ← dreiss left | 18:18 |
| ← joo-_ left | 18:18 |
| → EvilPeng1 joined | 18:18 |
| ← ranchodev left | 18:19 |
| ← intransit left | 18:19 |
| ← EvilPeng1 left | 18:19 |
| ← EvilPenguin left | 18:19 |
| ← m0ltar left | 18:19 |
| → cjwilburn joined | 18:19 |
| ← nnyk left | 18:20 |
| → mennea joined | 18:20 |
| → Ahmed90 joined | 18:20 |
| → joki joined | 18:20 |
| ← pcypher left | 18:20 |
| ← Una left | 18:20 |
| ← ItSANgo left | 18:20 |
| → sinkensabe joined | 18:20 |
| ← shruggar left | 18:21 |
| → EvilPenguin joined | 18:21 |
| ← tevfik left | 18:21 |
| ← sinkensabe left | 18:21 |
| ← mennea_ left | 18:22 |
| → pcypher joined | 18:22 |
| → Una joined | 18:23 |
| → ashokrajar joined | 18:23 |
| → jonmorehouse joined | 18:24 |
| ← zoso left | 18:25 |
| → m0ltar joined | 18:25 |
| → _cmosguy_ joined | 18:25 |
| gitinfo set mode: +v | 18:26 |
| ← OnkelTem left | 18:26 |
| ← pm90_ left | 18:26 |
| ← send left | 18:26 |
| ← thiago left | 18:26 |
| ← amcgee7 left | 18:27 |
| ← neurot1k left | 18:27 |
| ← dstarh left | 18:27 |
| → OnkelTem joined | 18:27 |
|
_cmosguy_
| hello, i have a git directory called /foo, which has a repo on gitbub foo, but i want to create a sub-directory, /foo/bar, where bar goes to another repository bar, is this possible? | 18:27 |
| ← ghostpl_ left | 18:27 |
| ← cdown left | 18:27 |
| ← Una left | 18:27 |
| → zenith_ joined | 18:27 |
| → nnyk joined | 18:28 |
| ← Ahmed90 left | 18:28 |
|
qsuscs
| _cmosguy_: !subrepo | 18:28 |
|
gitinfo
| _cmosguy_: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding. | 18:28 |
| ← SirRetnuh left | 18:29 |
| → hiironymus joined | 18:29 |
| → dreiss joined | 18:29 |
|
_cmosguy_
| ok | 18:29 |
|
| thank | 18:29 |
|
| x | 18:29 |
| ← Mii left | 18:29 |
| → mihaicris joined | 18:30 |
| ← iamjarvo left | 18:30 |
| ← tvw left | 18:31 |
| → sparetire joined | 18:31 |
| → mmitchell joined | 18:31 |
| ← phantombeta left | 18:32 |
| ← nettoweb left | 18:32 |
| → SirRetnu_ joined | 18:32 |
| ← Aeterne left | 18:33 |
| ← MasterPiece left | 18:33 |
| → cdown joined | 18:34 |
| ← nnyk left | 18:34 |
| ← marcogmonteiro left | 18:34 |
| → MasterPiece joined | 18:35 |
| ← skullcrasher left | 18:35 |
| ← jtPretzel80 left | 18:35 |
| → Squelos joined | 18:36 |
|
Squelos
| hi | 18:36 |
|
gitinfo
| Squelos: 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:36 |
| → aard_ joined | 18:36 |
| ← mkaesz left | 18:36 |
| ← flaguy48 left | 18:37 |
| ← B1n4r10 left | 18:37 |
| → Takle joined | 18:37 |
| ← mellernoia left | 18:37 |
| ← tsnow left | 18:37 |
| ← jost left | 18:37 |
| → phantombeta joined | 18:37 |
| → intransit joined | 18:38 |
|
Squelos
| I was wondering if my workflow is totally wrong or I just dont know which commands to do : I develop mainly on my master branch, but also on some other branches (related to features, or versions running on different runtimes). But sometimes some branches get left behind. Whats the best way to bring them up to date with the master ? | 18:38 |
| ← Vile left | 18:38 |
| → BSaboia___ joined | 18:39 |
| ← d10n-work left | 18:39 |
| ← thebrush left | 18:39 |
|
Squelos
| (note: i mainly rebase in order to pull changes from my feature branches into the master, i rarely merge) | 18:39 |
|
imachuchu
| Squelos: has anyone else pulled from those branches? Use either rebase of merge | 18:39 |
| → Literphor joined | 18:40 |
|
imachuchu
| Squelos: rebase is fine. Also realize that if you develop on a branch and then wish to bring it back in to master, if master is a direct ancestor of the branch then you can just merge it in (an ff-merge) | 18:40 |
| → oriba joined | 18:40 |
| ← jerius left | 18:41 |
| ← leolrrj left | 18:41 |
|
Squelos
| ok, so just rebase, and maybe do a hard reset if i want to remove the top commits that dont make any sense anymore (because either i already done some equivalent fix/change or some other reason) | 18:41 |
| ← jottr left | 18:41 |
| ← BSaboia_ left | 18:42 |
| ← adamben left | 18:42 |
|
Squelos
| yeah, but its often a 3 way merge because the other devs only push to the master so ill nearly always end up with a merge commit and i want to avoid the "useles" merge commit. | 18:42 |
| → skylite joined | 18:42 |
| → jerius joined | 18:43 |
|
Squelos
| thanks imachuchu, i got the answer I was looking for. | 18:43 |
| ← petersr left | 18:44 |
| → chiemseesurfer joined | 18:44 |
|
Squelos
| other question, what tools do you people use ? Im on windows, and as is, I use Git extensions and git bash (when I dont know what exactly git extensions is going to do, I rather just type the command) | 18:44 |
| → teran joined | 18:45 |
| → leolrrj joined | 18:45 |
| → baweaver joined | 18:45 |
| ← highcup left | 18:45 |
| ← phantombeta left | 18:46 |
| ← mennea left | 18:46 |
|
kadoban
| I just use plain git, and gitk for visualization occasionally. Other than that…just gitolite. I don't like GUIs and helpers and such, they tend to be more limiting/annoying than helpful. | 18:46 |
| → phantombeta joined | 18:47 |
| ← teran_ left | 18:47 |
| ← jonmorehouse left | 18:47 |
|
imachuchu
| Squelos: I use tig all of the time (it's a console based history viewer). Mirroring kadoban I think the command line is the best for manipulating the repo with another tool to view it | 18:48 |
| ← phantombeta left | 18:48 |
| → mennea joined | 18:48 |
| → phantombeta joined | 18:48 |
| → Aeterne joined | 18:48 |
| → barduck joined | 18:48 |
|
MattMaker
| kadoban: I'd say the one exception is for when you are preparing a commit by staging changes of only certain parts of many files | 18:48 |
| → thiago joined | 18:49 |
|
kadoban
| I just use add -p for that. Is there actually a tool that helps greatly? | 18:49 |
|
Squelos
| MattMaker: yeah, havent yet gotten into such "advanced" things. | 18:49 |
|
MattMaker
| kadoban: is that the one where git asks me line-by-line which lines I want to add to staging? | 18:50 |
| → sinkensabe joined | 18:50 |
|
Squelos
| And do you people usually squash commit/ do an interactive rebase in order to clean up stuff before pushing (with the correct work items marked in the comments etc ... ) | 18:50 |
| ← Raging_Hog left | 18:50 |
|
kadoban
| MattMaker: It asks piece by piece, not for each line, but yeah. | 18:50 |
| ← nmz787_i left | 18:51 |
| → gebjgd joined | 18:51 |
| ← gebjgd left | 18:51 |
| → gebjgd joined | 18:51 |
|
MattMaker
| kadoban: then yes, that's exactly the use case that visual tools make realistic for using routinely | 18:51 |
| ← teran left | 18:52 |
|
MattMaker
| kadoban: piece by piece, I'd never be able to know if I'd gotten all the pieces I wanted | 18:52 |
|
_cmosguy_
| !submodule | 18:52 |
|
gitinfo
| git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules | 18:52 |
| ← chiemseesurfer left | 18:52 |
|
kadoban
| MattMaker: What visual tool even helps for that? I'm curious what interface it could even have that'd help. | 18:53 |
| → joeyDB joined | 18:53 |
|
ciss
| how can i pass a variable into the shell run by filter-tree? | 18:53 |
|
MattMaker
| kadoban: Not everyone's workflow needs the sort of intense "deinterlacing" that I do constantly, but I find that's because it would be painful to do as hundreds of yes/no prompts | 18:53 |
| → kukks joined | 18:54 |
| ← ParsectiX left | 18:54 |
| ← Literphor left | 18:54 |
|
MattMaker
| kadoban: I use Sourcetree to visualize preparing a complex selection of parts of many files across many folders | 18:54 |
| → ParsectiX joined | 18:54 |
| → AndroidLoverInSF joined | 18:55 |
|
MattMaker
| kadoban: also, your short-term memory may be better than mine :) | 18:55 |
| ← ParsectiX left | 18:55 |
| ← incredible left | 18:55 |
| → ParsectiX joined | 18:55 |
| ← zenith_ left | 18:56 |
| → konr joined | 18:56 |
| → bckea joined | 18:57 |
|
kadoban
| I probably just don't use that kind of thing as often or extensively as you. Not sure either is better, heh. I tend to commit /really/ often, so it doesn't come up unless I forget momentarily and then have to go back and commit what I should have. | 18:57 |
|
| I'll check out how it does it, maybe it'll be an improvement even so. | 18:57 |
| ← Aeterne left | 18:57 |
| ← bckea left | 18:57 |
|
Squelos
| kadoban : how many initial commits a day ? | 18:57 |
|
| (per work day) | 18:57 |
| → eletuchy joined | 18:58 |
| ← cbonobo left | 18:58 |
|
kadoban
| I don't know, never counted. Several per hour for sure, when I'm actually doing raw coding. | 18:58 |
|
ciss
| the commands i'm trying to run are these: http://privatepaste.com/27910857fd | 18:58 |
| → jonmorehouse joined | 18:58 |
| → Ibo joined | 18:58 |
|
MattMaker
| kadoban: I tried to make a screenshot that summarizes the power that it gives you, but it'd take a half hour to really build a good example. But the two or three people that I have shown it to in person has found it a useful addition to their flow. (of course, they are doing similar work as me) | 18:59 |
| ← Hounddog left | 18:59 |
|
ciss
| unfortunately something goes terribly wrong, resulting in several errors, the first being: Rewrite 0cc4a75bee65f81a9e002b6b24c12a3893b3b841 (1/17)/usr/lib/git-core/git-filter-branch: 2: eval: ./fonts: not found | 18:59 |
| → B1n4r10 joined | 18:59 |
|
kadoban
| Ya no worries, I'll try it out sometime. | 18:59 |
| → jaznow joined | 19:00 |
| → Una joined | 19:00 |
| ← kukks left | 19:00 |
| → The_Phoenix joined | 19:00 |
|
ciss
| the working dir is supposed to be the current git root, if i've read the docs correctly | 19:00 |
| ← The_Phoenix left | 19:00 |
| ← B1n4r10 left | 19:00 |
|
ciss
| i've made sure that the commands themselves work, before i passed them on to tree-filter | 19:01 |
|
Squelos
| MattMaker: so you use sourcetree ? | 19:01 |
| → zadock joined | 19:01 |
| → The_Phoenix joined | 19:01 |
| → Milkweed joined | 19:01 |
| ← eto left | 19:01 |
| ← The_Phoenix left | 19:01 |
| ← thiago left | 19:01 |
| → The_Phoenix joined | 19:02 |
|
MattMaker
| Squelos: I do. It bogs down a little sometimes, but I like the "bird's eye view" that it gives me, and the nice UI around the concept of "staging" | 19:02 |
| ← The_Phoenix left | 19:03 |
| → cbonobo joined | 19:03 |
| ← TheRealHDL left | 19:03 |
| → m8 joined | 19:03 |
| → Literphor joined | 19:03 |
| → The_Phoenix joined | 19:03 |
| ← The_Phoenix left | 19:04 |
| ← jaznow left | 19:04 |
|
kadoban
| ciss: Well, is there a fonts file, or anything named like that? | 19:04 |
| → tvw joined | 19:04 |
|
MattMaker
| I also tend to have a dozen copies of my repo checked out side by side, some pointed at different branches, and with notes about what I was doing in it; multiple working copies lets me use visual folder diff apps to figure out what I'm doing | 19:05 |
| → The_Phoenix joined | 19:05 |
| ← cbonobo left | 19:05 |
| ← The_Phoenix left | 19:05 |
|
ciss
| kadoban: yes, but apparently it's being looked for in the wrong directory | 19:05 |
| → Aeterne joined | 19:06 |
| → The_Phoenix joined | 19:06 |
| ← tg left | 19:06 |
| → javaJake joined | 19:06 |
| → jceb_ joined | 19:06 |
| → tevfik joined | 19:08 |
| ← steele left | 19:08 |
| ← PCatinean left | 19:09 |
| → steele joined | 19:09 |
| → cbonobo joined | 19:09 |
|
ciss
| kadoban: nvm, just found a script that actually _does_ what i'm still trying to achieve: https://gist.github.com/x3ro/6242017 x_x | 19:10 |
| ← Ibo left | 19:10 |
| ← Aeterne left | 19:10 |
| → AeterneBygones joined | 19:11 |
|
kadoban
| Ah, I didn't realize that that was the goal, heh. | 19:11 |
| → JustinMac joined | 19:11 |
| ← metastableB left | 19:11 |
| → Hqlr joined | 19:12 |
| → PCatinean joined | 19:12 |
| → einmalfel joined | 19:12 |
| ← The_Phoenix left | 19:12 |
| → Aeterne joined | 19:13 |
|
ciss
| would have loved to find that piece of gold hours ago. very bad seo … :] | 19:13 |
| ← hahuang65 left | 19:13 |
| → andlabs joined | 19:14 |
|
andlabs
| okay here's a question that may strike some of you as odd: | 19:14 |
|
ciss
| apparently i'm not the only one: starred counter just jumped up by two :D | 19:14 |
| ← Hqlr left | 19:14 |
| → chiemseesurfer joined | 19:14 |
|
andlabs
| is there a way I can create a new repo by takinga ll the commits from one repo that affected files in a specific directory and creating a new repo out of that? | 19:14 |
| ← tevfik left | 19:15 |
|
osse
| andlabs: oh god that question is so perfect | 19:15 |
|
andlabs
| I know right | 19:15 |
| ← AeterneBygones left | 19:15 |
|
osse
| andlabs: git filter-branch --subdirectory-filter | 19:15 |
| ← baweaver left | 19:15 |
|
ciss
| andlabs: atlassian has a post on that. hold on ... | 19:15 |
|
| andlabs: http://blogs.atlassian.com/2014/04/tear-apart-repository-git-way/ | 19:15 |
|
osse
| andlabs: it's like you're a teacher reading through the git manual pages trying to come up with a question for each paragraph :p | 19:16 |
| ← jason237 left | 19:16 |
| → sovt joined | 19:16 |
|
andlabs
| lol | 19:16 |
|
| in my case I don't intend on scrubbing the commmits from the first repo | 19:16 |
|
osse
| make a copy of it first | 19:17 |
|
andlabs
| I should have made this side component on a separate repo from the start but then integrating it with the main library would be more difficult | 19:17 |
|
osse
| the copy will be your new repo | 19:17 |
| → mizu_no_oto joined | 19:17 |
| ← steele left | 19:17 |
|
ciss
| … interesting. the script i mentioned above actually modifies the index. i only found it after i dumped the idea of using tree-filter and looked for ways to directly rewrite the paths | 19:18 |
| → mennea_ joined | 19:18 |
|
andlabs
| I'll try this later I guess | 19:19 |
|
| but glad to know it's possible | 19:19 |
|
| thanks | 19:19 |
| → steele joined | 19:19 |
| → ril joined | 19:19 |
| ← cbonobo left | 19:20 |
| ← Aeterne left | 19:20 |
| ← zxd left | 19:20 |
|
osse
| andlabs: make a copy of your repo and in that copy run git filter-branch --subdirectory-filter thediryouwanttokeep -- --all. | 19:20 |
| → leolrrj-alt joined | 19:20 |
|
osse
| if you have any tags you need to add --tag-name-filter cat for some reason | 19:21 |
| ← leolrrj left | 19:21 |
|
osse
| prolly want --prune-empty too, although I wouldn't be surprised if that is implied by --subdirectory-filter | 19:21 |
| ← steele left | 19:21 |
| ← mennea left | 19:21 |
| → jantje joined | 19:23 |
| ← sonthonax left | 19:23 |
| ← gopar left | 19:23 |
| → nettoweb joined | 19:25 |
|
andlabs
| okay, thanks | 19:25 |
| → ropav joined | 19:26 |
| → steele_ joined | 19:26 |
| ← ciss left | 19:26 |
| ← leolrrj-alt left | 19:26 |
| → leolrrj joined | 19:27 |
|
osse
| de nada | 19:27 |
| → joel_falcou joined | 19:27 |
| → otter768 joined | 19:27 |
| ← pcypher left | 19:28 |
| → vrishab joined | 19:28 |
| → nmz787_i joined | 19:29 |
| → diego1 joined | 19:29 |
| ← vrishab left | 19:29 |
| → pcypher joined | 19:30 |
| → teran joined | 19:30 |
| ← otter768 left | 19:32 |
| → ska-fan joined | 19:33 |
| → philwantsfish joined | 19:33 |
| ← stylica left | 19:34 |
| → stylica joined | 19:34 |
|
philwantsfish
| is forking a repo a git concept or a platform that uses git concept? | 19:34 |
| → leolrrj-alt joined | 19:35 |
| → mskaesz joined | 19:35 |
| ← Shusshu left | 19:35 |
|
osse
| philwantsfish: on the fundamental level there is no difference between a fork and a clone | 19:35 |
| ← mskaesz left | 19:35 |
| ← leolrrj left | 19:35 |
| → baweaver joined | 19:35 |
|
osse
| philwantsfish: git itself has no fork command and I'm not sure how often that word is used in the official docs. | 19:35 |
| → aswen joined | 19:36 |
| → mskaesz joined | 19:36 |
| ← Vgr left | 19:36 |
|
philwantsfish
| thanks osse | 19:36 |
| → inigomontoya joined | 19:36 |
| → BSaboia_ joined | 19:37 |
|
osse
| philwantsfish: when hosting solutions use "fork" they usually mean create a clone on the server itself, which you in turn can clone/push to | 19:37 |
|
deltab
| one match in https://www.kernel.org/pub/software/scm/git/docs/user-manual.html ("the latest commit in your current branch since their histories forked") | 19:37 |
| → metastableB joined | 19:37 |
| ← BSaboia___ left | 19:37 |
| ← gebjgd left | 19:38 |
| ← _cmosguy_ left | 19:38 |
|
osse
| philwantsfish: TL;DR: it's not a git concept | 19:39 |
| → rubyonrailed joined | 19:40 |
| ← inigomontoya left | 19:41 |
| → inigomontoya joined | 19:41 |
| → dspirito joined | 19:42 |
| → Vgr joined | 19:42 |
| → iamjarvo joined | 19:42 |
| ← inigomontoya left | 19:42 |
| ← ende_ left | 19:42 |
| → inigomontoya joined | 19:42 |
| → ende_ joined | 19:43 |
| ← lsiv568 left | 19:44 |
| → thiago joined | 19:44 |
| ← settermjd left | 19:44 |
| → gebjgd joined | 19:46 |
| ← gebjgd left | 19:47 |
| → gebjgd joined | 19:47 |
| → lsiv568 joined | 19:47 |
| → Omnissions joined | 19:48 |
| ← PCatinean left | 19:48 |
| ← Omnissions left | 19:48 |
| ← mennea_ left | 19:48 |
| → nattyrice joined | 19:51 |
| → dev_ joined | 19:51 |
| → mennea joined | 19:51 |
| → KennyRay_ joined | 19:51 |
| ← dev_ left | 19:51 |
| ← Nizumzen left | 19:51 |
| ← KennyRay left | 19:51 |
| ← gsingh93 left | 19:52 |
| ← jceb_ left | 19:52 |
|
nattyrice
| testing testing | 19:53 |
|
| ok good | 19:53 |
|
| i wasn't sure if it identified me properly | 19:53 |
|
| feeling pumped! | 19:53 |
| → highcup joined | 19:53 |
|
nattyrice
| just aced my last set of CDC's | 19:53 |
| → WaReZ joined | 19:53 |
| → settermjd joined | 19:54 |
|
nattyrice
| time to slam some more energy drinks and learn some vim | 19:54 |
| → blr joined | 19:54 |
|
nattyrice
| woops wrong window, meant to put that in vim haha | 19:55 |
| ← pandeiro left | 19:55 |
| → Gama11_ joined | 19:56 |
| ← Gama11 left | 19:57 |
| ← pcypher left | 19:57 |
| → CKyle joined | 19:58 |
| → vrishab joined | 19:59 |
|
Eugene
| nattyrice - git is the multiplayer mode for vim | 19:59 |
| ← vrishab left | 19:59 |
| ← jantje left | 19:59 |
| → Newls joined | 20:00 |
| → jeffmjack joined | 20:00 |
| → looper_ joined | 20:01 |
| → Xz joined | 20:01 |
|
nattyrice
| haha | 20:01 |
|
Xz
| hi there, I clonned a git repo that I want to 'ungit' now. Is rm .git/ -rf enough? | 20:02 |
| ← mojibake left | 20:02 |
|
Eugene
| Yes, git stores all of its info inside of .git/ | 20:02 |
|
| Depending upon your goal, you may have been better served by a tarball instead of a clone.... man git-archive will tell you how you can obtain one from a git:// remote if the original source doesn't provide a .tgz | 20:03 |
|
gitinfo
| the git-archive manpage is available at http://jk.gs/git-archive.html | 20:03 |
|
Newls
| I'd just 'rm -fr .git' instead of rm .git/ -rf | 20:03 |
|
| but it's personal | 20:03 |
| → ghostpl_ joined | 20:03 |
| → sq-one joined | 20:03 |
| ← looper_ left | 20:03 |
|
Eugene
| I always put -rf last on my `rm`, because what happens if you have a file named .gi and push <enter> too soon? ;-) | 20:03 |
| ← beckyconning_ left | 20:03 |
| → looper_ joined | 20:04 |
|
Newls
| don't you <tab> Eugene ? | 20:04 |
| → nnyk joined | 20:04 |
|
Newls
| like rm -fr .gi<TAB> (while avoiding ENTER before you thought twice | 20:04 |
|
Eugene
| Of course I do, but the danger still exists | 20:04 |
| → Technocrat7 joined | 20:05 |
|
Eugene
| Put the most dangerous thing at the end, not the beginning | 20:05 |
|
Newls
| I agree that's an interesting point of view | 20:05 |
|
Xz
| Eugene: I'm doing a tarball eventually, but I couple that with some other stuff I need to cvs/wget | 20:05 |
|
Newls
| I just go with the fact that options are generally syntactically correct before arguments | 20:05 |
|
Eugene
| Yeah, totally. This is the exception-proving-the-rule | 20:05 |
|
Newls
| and sometimes, are not syntactically correct on some commands | 20:05 |
| ← ghostpl_ left | 20:05 |
|
Xz
| Newls: that's a good spot | 20:05 |
| ← aswen left | 20:06 |
|
Newls
| Thank you Xz :) | 20:06 |
| ← HSaka left | 20:06 |
|
Newls
| my sentence wasn't complete | 20:07 |
| ← iamjarvo left | 20:07 |
|
Newls
| 'and sometimes, are not syntactically correct after arguments' | 20:07 |
| ← ska-fan left | 20:07 |
| → ska-fan joined | 20:08 |
| ← KennyRay_ left | 20:08 |
| → arez joined | 20:08 |
| → pecg joined | 20:08 |
| → ahr3n joined | 20:08 |
| → HSaka joined | 20:08 |
| ← thiago left | 20:09 |
| ← baweaver left | 20:09 |
| ← duckydan left | 20:11 |
| → osfd joined | 20:11 |
| ← eletuchy left | 20:12 |
| → Cust0sL1men joined | 20:13 |
| → intransi_ joined | 20:13 |
| ← jonmorehouse left | 20:13 |
| → tevfik joined | 20:14 |
| → jonmorehouse joined | 20:15 |
| → c355E3B joined | 20:16 |
| ← EminenceHC left | 20:16 |
| ← sovt left | 20:17 |
| ← intransit left | 20:17 |
| → mennea_ joined | 20:18 |
| → Utic joined | 20:18 |
| → dvl- joined | 20:19 |
| ← Utic left | 20:19 |
| → duckydan joined | 20:20 |
| → Ervzf joined | 20:20 |
| ← lsiv568 left | 20:21 |
| → m0viefreak joined | 20:21 |
| → gsingh93 joined | 20:21 |
|
dvl-
| Anyone have a working Kerberos auth for git? I'm getting prompted for credentials even with a valid Kerberos ticket. | 20:21 |
| ← mennea left | 20:22 |
| → jottr_ joined | 20:22 |
|
iliv
| will "git checkout master" ever create a remote tracking branch? I'm not entirely sure but I think there was no master before I had run "git checkout master" and as a result of that I got this informational message from git: Branch master set up to track remote branch master from origin. ... | 20:23 |
|
| ... Switched to a new branch 'master' | 20:23 |
|
| I thought -b is required, or git branch | 20:23 |
| → KennyRay joined | 20:23 |
| → baweaver joined | 20:23 |
| → sgen_ joined | 20:24 |
| ← kevwil left | 20:25 |
| ← jds left | 20:25 |
| → pcypher joined | 20:25 |
|
_ikke_
| iliv: It's a so called "do what I mean" feature | 20:25 |
| ← tevfik left | 20:26 |
| → iamjarvo joined | 20:26 |
|
_ikke_
| iliv: Note that the tracking branch was already there, git only added tracking information | 20:26 |
|
iliv
| you mean the remote origin/master? | 20:27 |
|
| okay how do I remove this new master branch | 20:27 |
|
_ikke_
| iliv: the remote is called origin. origin/master is a remote tracking branch | 20:27 |
|
iliv
| correct | 20:27 |
|
| that what I mean too :) | 20:27 |
|
| that's * | 20:27 |
| ← doener left | 20:28 |
|
_ikke_
| iliv: Just to make it clear | 20:28 |
|
| iliv: Is it a problem that master is there? | 20:28 |
| → ghostpl_ joined | 20:28 |
| → srcerer joined | 20:28 |
| → cbonobo joined | 20:28 |
|
iliv
| well.. it wasn't there before I ran "git checkout master" and I rather keep things that way.. We're trying to make sense of this git setup so.. it is not going to help to complicate things by adding extra branches etc. | 20:29 |
| ← nettoweb left | 20:29 |
|
_ikke_
| ok | 20:29 |
|
| checkout another branch, and then git branch -D master | 20:30 |
| ← KennyRay left | 20:30 |
| → cagedwisdom joined | 20:31 |
| → jaznow joined | 20:31 |
| ← intransi_ left | 20:31 |
| ← naftilos76 left | 20:31 |
| → ams__ joined | 20:31 |
| → tevfik joined | 20:31 |
| → pandeiro joined | 20:31 |
| → eletuchy joined | 20:32 |
| → pm90_ joined | 20:32 |
| ← MattMaker left | 20:32 |
| → intransit joined | 20:32 |
| ← pm90_ left | 20:33 |
| → pm90_ joined | 20:33 |
| diego1 → diegoviola | 20:34 |
| ← nnyk left | 20:34 |
| ← jaznow left | 20:35 |
| → nrsk joined | 20:35 |
| ← ghostpl_ left | 20:35 |
| ← jottr_ left | 20:35 |
| → nnyk joined | 20:35 |
|
andlabs
| osse, ciss - all right, done (result https://github.com/andlabs/wintable) | 20:37 |
| ← sinkensabe left | 20:37 |
| → thebrush joined | 20:37 |
| → lsiv568 joined | 20:37 |
| → tjm_jimmy joined | 20:38 |
| ← hgl left | 20:40 |
| → MattMaker joined | 20:41 |
| → hgl joined | 20:41 |
| → jaznow joined | 20:41 |
| ← Ervzf left | 20:41 |
| ← random-user-name left | 20:42 |
| → ghostpl_ joined | 20:42 |
| → oriba_ joined | 20:43 |
| ← aesinv left | 20:44 |
| → LBV_User joined | 20:44 |
| → aesinv joined | 20:44 |
| → jason237 joined | 20:44 |
| ← chiemseesurfer left | 20:45 |
| ← iamjarvo left | 20:46 |
| ← oriba left | 20:46 |
| → ItSANgo joined | 20:48 |
| → mennea joined | 20:48 |
| → akiva joined | 20:48 |
| ← mennea_ left | 20:52 |
| → His joined | 20:53 |
| → diego1 joined | 20:53 |
| ← settermjd left | 20:53 |
| ← His left | 20:53 |
| ← rnsanchez left | 20:53 |
| ← einmalfel left | 20:54 |
| → devoldmx joined | 20:54 |
| ← ghostpl_ left | 20:54 |
| ← diegoviola left | 20:54 |
| → nnir joined | 20:55 |
| ← MasterPiece left | 20:55 |
| → KennyRay joined | 20:55 |
| → Corey84 joined | 20:55 |
| ← ril left | 20:55 |
| → ghostpl_ joined | 20:56 |
| → Ahmed90 joined | 20:56 |
| ← Ahmed90 left | 20:56 |
| → Ahmed90 joined | 20:56 |
| ← ferr left | 20:57 |
| ← nnir left | 20:57 |
| ← Ahmed90 left | 20:57 |
| → Ahmed90 joined | 20:57 |
| → MasterPiece joined | 20:57 |
| ← Ahmed90 left | 20:57 |
| → Ahmed90 joined | 20:58 |
| ← Ahmed90 left | 20:58 |
| → Ahmed90 joined | 20:59 |
| → geomyidae_ joined | 20:59 |
| ← Ahmed90 left | 20:59 |
| ← dvl- left | 20:59 |
| → KennyRay_ joined | 20:59 |
| → mykespb joined | 21:00 |
| ← diego1 left | 21:00 |
| → diego1 joined | 21:00 |
| diego1 → diegoviola | 21:00 |
| ← KennyRay left | 21:00 |
|
iliv
| _ikke_, thanks! | 21:00 |
| → dsdeiz joined | 21:01 |
| ← m0ltar left | 21:01 |
| → pcypher_ joined | 21:02 |
| ← pcypher_ left | 21:02 |
| ← IrishPrime left | 21:02 |
| ← tvw left | 21:03 |
| → pcypher_ joined | 21:03 |
| → thiago_ joined | 21:04 |
| ← CKyle left | 21:04 |
| ← metastableB left | 21:04 |
| → zxd joined | 21:04 |
| ← pcypher left | 21:05 |
| ← ashnur left | 21:06 |
| ← nrsk left | 21:06 |
| → Acidnerd joined | 21:06 |
| → tg joined | 21:06 |
| ← intransit left | 21:06 |
| → leolrrj joined | 21:07 |
| ← leolrrj-alt left | 21:08 |
| ← pcypher_ left | 21:09 |
| ← tg left | 21:09 |
| ← BSaboia_ left | 21:09 |
| ← jason237 left | 21:09 |
| → tg joined | 21:10 |
| → pierre1_ joined | 21:10 |
| → iamjarvo joined | 21:10 |
| → leolrrj-alt joined | 21:10 |
| ← leolrrj left | 21:11 |
| ← Xethron_ left | 21:13 |
| → random-user-name joined | 21:13 |
| → jason237 joined | 21:13 |
| → EminenceHC joined | 21:15 |
| ← konradb left | 21:15 |
| ← zapb_ left | 21:15 |
| ← JEEB left | 21:17 |
| ← mizu_no_oto left | 21:17 |
| ← ELFrederich left | 21:17 |
| ← mennea left | 21:18 |
|
| osse looks up ciss | 21:18 |
| → mennea joined | 21:18 |
|
osse
| andlabs: uhhhh? | 21:18 |
| → thiago joined | 21:19 |
| → scientes joined | 21:19 |
| ← scientes left | 21:19 |
| → scientes joined | 21:19 |
| ← dougsland left | 21:20 |
| → zapb_ joined | 21:20 |
| ← sgen_ left | 21:22 |
| → linuxmint joined | 21:23 |
| ← thiago_ left | 21:23 |
|
qsuscs
| osse: you found http://www.urbandictionary.com/define.php?term=Ciss (nsfw)? | 21:23 |
| ← konr left | 21:23 |
|
osse
| lol | 21:24 |
| ← MechtiIde left | 21:24 |
| ← lsiv568 left | 21:25 |
| → sinkensabe joined | 21:25 |
| → Es0teric joined | 21:25 |
| ← scientes left | 21:26 |
| → Sasa100 joined | 21:26 |
|
Sasa100
| hello | 21:26 |
|
gitinfo
| Sasa100: 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. | 21:26 |
|
Sasa100
| I'm trying to figure out git... heres what i figured so far.... | 21:27 |
| ← LBV_User left | 21:27 |
|
andlabs
| osse: I did the repository split now | 21:27 |
| ← inigomontoya left | 21:27 |
|
osse
| yeah I got that part | 21:27 |
| → isifreek joined | 21:27 |
| ← marienz left | 21:28 |
|
imachuchu
| Sasa100: it might also help to read some !books | 21:28 |
|
gitinfo
| Sasa100: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 21:28 |
| → dougsland joined | 21:28 |
|
Sasa100
| ... so i joined github, i have an account, a made a repo.... but thats it.... what i don't get is, i know its like a version control system but is it like a server- a place where you store all your files you code? | 21:28 |
| → otter768 joined | 21:28 |
|
tobiasvl
| Sasa100: github is a server, git is the underlying version control system | 21:28 |
|
Sasa100
| yes, i tried all that.. i need some professional help... :) | 21:28 |
|
imachuchu
| Sasa100: no, in matter of fact you can use git just fine without ever leaving your box | 21:29 |
|
Sasa100
| thanks tobiasv1 | 21:29 |
|
isifreek
| i have a repo in github, and i want to clone it to another github. last time i tried this, i botched it real nice. how can i do this cleanly? i curreently have a clean locl working dir, and that's it. i tried to push to github2, but i get remote repo not found (because it doesnt exist) | 21:29 |
|
Sasa100
| yes but i don't think i've got the idea of git properly.... | 21:29 |
| ← freestyl3r left | 21:29 |
| → rvandam joined | 21:29 |
| → tritone_ joined | 21:29 |
| ← TomyLobo left | 21:29 |
|
Sasa100
| like I'm used to creating html files and working on them on my computer then i upload them to my linux server.... | 21:30 |
|
| so, like i said I'm really new to git... | 21:30 |
|
moritz
| isifreek: you need to create the second repo in the github web UI | 21:30 |
|
tobiasvl
| isifreek: what's "another github"? another account/organization? if so, click "fork". if it's the same account, create the repo in github and then push to it | 21:30 |
|
kadoban
| isifreek: You can do that just with the github interface. It's called "fork" there I believe. | 21:30 |
|
Sasa100
| i managed to create a repo but i can't seem to add the files | 21:30 |
|
moritz
| isifreek: and then 'git remote add github2 <repourl>' | 21:30 |
|
| isifreek: then you can push to github2 | 21:30 |
|
Sasa100
| they are existing files on my computer | 21:30 |
|
moritz
| git add path/to/file | 21:30 |
|
isifreek
| Sasa100: you'd revise that to: "I usually work on the files on my computer then i commit and push them to github." | 21:30 |
| → m0ltar joined | 21:30 |
|
moritz
| git commit | 21:31 |
|
isifreek
| tobiasvl: enterprise github | 21:31 |
|
tobiasvl
| ah ok. | 21:31 |
|
Sasa100
| ahhh | 21:31 |
| ← zapb_ left | 21:31 |
|
isifreek
| kadoban: diff github | 21:31 |
| → govg joined | 21:31 |
| ← tritone left | 21:31 |
| ← joel_falcou left | 21:31 |
|
Sasa100
| so basically i have a folder now called test and i ran git from the command line | 21:31 |
|
isifreek
| Sasa100: i do that with my personal blog, then i log into my host's server and git pull | 21:31 |
|
Sasa100
| but when i try to git add . it does nothing | 21:31 |
| ← eletuchy left | 21:32 |
|
isifreek
| Sasa100: did you do git init? | 21:32 |
|
Sasa100
| and says its on the branch master or something | 21:32 |
|
| yes i did | 21:32 |
|
isifreek
| Sasa100: is . empty? | 21:32 |
| ← bramgg left | 21:32 |
|
Sasa100
| umm how do i check that? | 21:32 |
|
moritz
| 'ls -a' | 21:33 |
|
isifreek
| Sasa100: ls -la | 21:33 |
|
Sasa100
| i have a folder called test which has a bunch of files and folders within it | 21:33 |
| ← otter768 left | 21:33 |
| → intransit joined | 21:33 |
|
tobiasvl
| are you inside test, and is that where you did git init? | 21:33 |
|
Sasa100
| and i tried to add that after i ran git init | 21:33 |
|
isifreek
| Sasa100: so . has one folder called test. you run git init, then git add test | 21:33 |
| ← stylica left | 21:34 |
| ← SirRetnu_ left | 21:34 |
|
Sasa100
| sorry one sec | 21:34 |
| ← das_beard left | 21:34 |
|
isifreek
| nice, everythin works fine as long as you dont init your repo on github w a readme or gitignore :) | 21:35 |
|
andlabs
| osse: so what are you asking about? | 21:35 |
| ← lucianangelus left | 21:35 |
| → eletuchy joined | 21:36 |
| → beckyconning_ joined | 21:36 |
| → lsiv568 joined | 21:36 |
| ← dougsland left | 21:36 |
| → irqq joined | 21:36 |
| → Qzie joined | 21:37 |
| → zapb_ joined | 21:37 |
| → SirRetnuh joined | 21:37 |
| → stylica joined | 21:37 |
| ← Qzie left | 21:38 |
|
osse
| andlabs: what 'ciss' means | 21:38 |
|
andlabs
| oh | 21:38 |
|
Sasa100
| so i ran git init in the directory | 21:38 |
|
| it says | 21:38 |
|
| reinitialiased | 21:38 |
|
andlabs
| ciss was here earlier and also answered the question | 21:38 |
|
osse
| oh right | 21:38 |
|
andlabs
| not atm though :/ | 21:38 |
|
Sasa100
| reinitialiased exising git repository | 21:38 |
|
andlabs
| *not here | 21:38 |
| → ufi joined | 21:38 |
|
osse
| unfortunate nick given qsuscs's link. oh well | 21:38 |
|
| or maybe that's the point | 21:39 |
| → ttt_fff joined | 21:39 |
| ← barduck left | 21:39 |
|
ttt_fff
| ping | 21:39 |
| ← AaronMT left | 21:39 |
| ← Corey84 left | 21:39 |
|
osse
| tennis | 21:39 |
|
isifreek
| Sasa100: heh, never done that before | 21:39 |
|
| pong | 21:39 |
| ← Es0teric left | 21:39 |
|
ttt_fff
| anyone else feel, when using vim, that they wish "/" was bound to "git grep" instead of "search this local file" ? | 21:39 |
| ← Una left | 21:39 |
| ← AndroidLoverInSF left | 21:39 |
|
isifreek
| nope | 21:39 |
| ← kadoban left | 21:39 |
| → neanderslob joined | 21:39 |
|
ttt_fff
| so often I am searching for something, but I want to search my entire repo, not just the current file | 21:39 |
| → AndroidLoverInSF joined | 21:40 |
|
osse
| ttt_fff: Get fugitive, nnoremap / :Ggrep <space> | 21:40 |
| ← stylica left | 21:40 |
| → stylica joined | 21:40 |
|
osse
| you're welcome | 21:40 |
|
ttt_fff
| osse: you deserve the + | 21:40 |
| ← dspirito left | 21:40 |
| → dougsland joined | 21:40 |
| ChanServ set mode: +o | 21:41 |
| osse set mode: -v | 21:41 |
| osse set mode: -o | 21:41 |
|
osse
| say whaaaat | 21:41 |
| ← tristanp left | 21:41 |
| ChanServ set mode: +v | 21:41 |
|
Sasa100
| back, so when i type git status i get : On branch master nothing to commit, working directory clean | 21:41 |
|
| this has me stumped..... | 21:41 |
|
| any ideas, why....? | 21:41 |
| → tristanp joined | 21:41 |
| ← carif left | 21:42 |
| → wethu joined | 21:42 |
| → carif joined | 21:42 |
|
osse
| maybe you've created a commit | 21:42 |
|
| run git log | 21:42 |
|
Sasa100
| ok | 21:42 |
| → tcurdt joined | 21:42 |
|
Sasa100
| yes it says commit ...blahblah, author, blahblah.... date etc | 21:43 |
|
| what does that mean | 21:43 |
| ← oojacoboo left | 21:43 |
| → Una joined | 21:44 |
| → nettoweb joined | 21:44 |
|
qsuscs
| Sasa100: read the !book. | 21:44 |
|
gitinfo
| Sasa100: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 21:44 |
| ← ttt_fff left | 21:44 |
|
osse
| Sasa100: it means you've created a commit. | 21:44 |
|
| Sasa100: git log shows the log (history) of the repo | 21:44 |
|
Sasa100
| like i've said a few times... i looked at everything i don't get it, thats why i've come here | 21:44 |
|
| if you can't help me, just say, pls don't refer me to stuff I've already done | 21:45 |
| ← iamjarvo left | 21:45 |
| → Es0teric joined | 21:45 |
|
Sasa100
| um whats !cs etc? | 21:46 |
|
gitinfo
| "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup | 21:46 |
| ← ufi left | 21:46 |
|
osse
| Sasa100: triggers for the bot (Hi, gitinfo) | 21:46 |
|
Sasa100
| unfortunately I'm not a computer scientist | 21:46 |
|
osse
| !snack | 21:46 |
|
gitinfo
| [!botsnack] Om nom nom | 21:46 |
|
osse
| Sasa100: I answered your latest question. Feel free to ask more. | 21:47 |
|
Sasa100
| I'm actually one of those people who knows nothing but would like to know something, so I'm trying to figure it out... | 21:47 |
| → dodobrain joined | 21:47 |
|
Sasa100
| oh thanks osse | 21:47 |
| ← mennea left | 21:47 |
|
Sasa100
| !cs | 21:48 |
|
gitinfo
| "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup | 21:48 |
|
Sasa100
| !bottomup | 21:48 |
|
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) | 21:48 |
|
Sasa100
| osse, thanks v much | 21:48 |
| → mennea joined | 21:48 |
|
Sasa100
| !designers | 21:48 |
|
gitinfo
| 'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/ | 21:48 |
|
Sasa100
| cool, thats more my thing... | 21:48 |
| ← Dreamer3 left | 21:49 |
| ← sinkensabe left | 21:49 |
|
Sasa100
| appreciate the help guys | 21:49 |
|
osse
| hmm, that's 6 years old. | 21:49 |
| ← HoMM left | 21:49 |
|
osse
| Ah, probably doesn't matter. The basics are all the same. | 21:49 |
| ← ropav left | 21:49 |
|
qsuscs
| the output has slightly changed | 21:49 |
| ← looper_ left | 21:49 |
|
qsuscs
| no ^# | 21:49 |
|
| and rewording probably | 21:50 |
| → ropav joined | 21:50 |
| ← zumba_addict left | 21:50 |
| → zumba_addict joined | 21:51 |
| → pcypher joined | 21:51 |
| → iamjarvo joined | 21:52 |
| → HoMM joined | 21:52 |
| → Aeterne joined | 21:52 |
| ← iamjarvo left | 21:52 |
| ← ska-fan left | 21:52 |
| → iamjarvo joined | 21:52 |
| ← tristanp left | 21:53 |
| ← dsdeiz left | 21:53 |
| ← osfd left | 21:53 |
| → davidfetter_fbn joined | 21:53 |
|
Sasa100
| me again | 21:53 |
|
davidfetter_fbn
| hi | 21:53 |
|
Sasa100
| so i scanned a doc... | 21:53 |
|
popl
| Hi. I've currently got a branch checked out that I've committed some changes to. I did git pull --rebase HEAD from the production repo (what I normally do before I push my changes to our QA machine) and after doing a git diff master on my machine I see changes to some file that I did not make. | 21:54 |
| → ropav_ joined | 21:54 |
|
Sasa100
| now my question is , is there such a thing as being able to 'upload' files you've already created to a github repository? | 21:54 |
| ← Technocrat7 left | 21:54 |
|
popl
| How do I determine where those changes came from, and how can I get rid of them? If I send this to QA it will cause a conflict. :/ | 21:54 |
|
Sasa100
| or... does it only do that if you make a change to the files? | 21:54 |
|
tobiasvl
| Sasa100: adding a file is also a change. | 21:54 |
| ← t0th_-_ left | 21:55 |
|
Sasa100
| why do you think its not adding my files? | 21:55 |
| → riceandbeans joined | 21:55 |
|
Sasa100
| i tried git add . | 21:55 |
| → ska-fan joined | 21:55 |
|
Sasa100
| i tried git add *.c | 21:55 |
| ← random-user-name left | 21:55 |
|
Sasa100
| nothing... | 21:55 |
| ← th3fallen left | 21:55 |
|
tobiasvl
| Sasa100: !repro | 21:55 |
|
gitinfo
| Sasa100: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session. | 21:55 |
|
popl
| nothing? surely there's a message. | 21:55 |
| ← thiago left | 21:55 |
|
riceandbeans
| have any of you converted a mercurial or cvs to git and if so, how difficult is it / how long does it take / can it fail? | 21:55 |
| → tpollard joined | 21:56 |
| → t0th_-_ joined | 21:56 |
|
Nugget
| cvs to git is a breeze, it's well-exercised code, and doesn't take long | 21:56 |
|
tobiasvl
| I've done both, it's not difficult | 21:56 |
|
qsuscs
| riceandbeans: mercurial is okay. branch information gets lost (mercurial records the branch a commit was made on, which git does not support), but it’s reasonably okay. | 21:57 |
|
| riceandbeans: but i’d recommend doing it the other way round, i.e. hg --config hgext.hg-git= push git://… | 21:57 |
|
Sasa100
| um tobias did you just send me to a link that tells me how to copy and paste? | 21:57 |
|
riceandbeans
| qsuscs: I don't follow | 21:57 |
| ← ropav left | 21:58 |
|
tobiasvl
| Sasa100: no, I told you how you can show us the output of the commands you ran... | 21:58 |
| ← tevfik left | 21:58 |
|
qsuscs
| riceandbeans: don’t use git-remote-hg to clone a hg repo from git, use hg and hg-git to push to a git repo from hg | 21:58 |
| ← sq-one left | 21:59 |
| → cdown_ joined | 21:59 |
|
riceandbeans
| ok | 21:59 |
|
isifreek
| Sasa100: git add -A if you want to add everything | 21:59 |
|
riceandbeans
| qsuscs: is there much work past that one initial command? | 22:00 |
| → rpg joined | 22:00 |
| ← diegoviola left | 22:00 |
| ← tier_ left | 22:01 |
|
qsuscs
| riceandbeans: to import subsequent commits? no | 22:01 |
| ← ehynds left | 22:02 |
|
qsuscs
| riceandbeans: if you intend to work on a hg repo with git (instead of a one-time conversion), you’d probably be better of with git-remote-hg (or simply hg itself, it’s not that bad) | 22:02 |
| ← cdown left | 22:02 |
| → alekks joined | 22:02 |
| → ivan_on_trac joined | 22:02 |
|
riceandbeans
| qsuscs: no, I just need to convert a cvs and a hg to git, one time, one way | 22:03 |
| → diegoviola joined | 22:04 |
| ← Spacew00t left | 22:04 |
| ← nettoweb left | 22:05 |
|
ivan_on_trac
| The pull, only updates if I'm within the current branch? | 22:05 |
| → Technocrat7 joined | 22:05 |
| ← FreezingCold left | 22:05 |
| → kadoban joined | 22:06 |
| ← alekks left | 22:06 |
|
Sasa100
| git push -u origin master Permission denied (publickey). fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. | 22:07 |
|
| what could i be doing wrong? | 22:07 |
| ← rvandam left | 22:07 |
| ← mennea left | 22:07 |
| → tevfik joined | 22:08 |
| ← DrShoggoth left | 22:08 |
| ← mihaicris left | 22:08 |
| ← gebjgd left | 22:08 |
| ← Aeterne left | 22:08 |
|
popl
| Sasa100: Do you have access to the remote machine? | 22:09 |
| → vreo__ joined | 22:09 |
|
Sasa100
| the remote machine should be my github account i think | 22:09 |
|
| how do i check I'm.... connected? | 22:09 |
|
popl
| make sure you've got your ssl certs configured correctly. there should be a howto on github for that iirc. | 22:10 |
|
Sasa100
| (I would like to apologise if i sound like one of the dumbest people ever in here... :S ) | 22:10 |
| → adamben joined | 22:10 |
|
Sasa100
| wow, sounds like i still have a lot more to learn... i though it would be straight forward | 22:10 |
| → ende__ joined | 22:11 |
| → konr joined | 22:11 |
|
isifreek
| Sasa100: it is straightforward. i prefer using SSH to HTTP(S). log onto github, click the gear in the upper right, select ssh keys, copy yours (yours should be in ~/.ssh/id_*.pub), then you can push without having to type your password. | 22:12 |
| ← helgikrs left | 22:13 |
| ← Jetchisel left | 22:13 |
| vreo__ → vreo | 22:13 |
| → clarkpan joined | 22:13 |
| ← ende_ left | 22:14 |
| → FreezingCold joined | 22:14 |
| → lrae joined | 22:14 |
| → helgikrs joined | 22:14 |
| ← aesinv left | 22:14 |
| → aesinv joined | 22:14 |
| ← ropav_ left | 22:15 |
|
Sasa100
| does it look like [email@hidden.address] | 22:15 |
| → Corey84 joined | 22:15 |
|
isifreek
| Sasa100: was that @ me? | 22:15 |
| ← lrae left | 22:15 |
|
Sasa100
| yes isifreek | 22:16 |
|
| i looked in the ssh keys bit, i have nothing there | 22:16 |
|
| do i need to create one? | 22:16 |
|
isifreek
| Sasa100: if you type `git remote -v` and see remotes prefixed with [email@hidden.address] then that means you are telling (local) git to use ssh to connect to github, yes. | 22:17 |
| → rqzp joined | 22:17 |
|
isifreek
| Sasa100: if you dont have an ssh key, create one with `ssh-keygen` | 22:17 |
| ← RaceCondition left | 22:17 |
| ← zumba_addict left | 22:17 |
|
isifreek
| (press enter until the command exits) | 22:17 |
|
Sasa100
| well i did the first git remote -v and is has come up with the right [email@hidden.address] thing | 22:18 |
|
| fetch and push | 22:18 |
| ← rqzp left | 22:18 |
|
Sasa100
| umm what the ssh-keygen? | 22:18 |
| ← cdown_ left | 22:18 |
| → dsdeiz joined | 22:19 |
| → Wtjw joined | 22:19 |
|
isifreek
| Sasa100: does `which ssh-keygen` produce any output? | 22:19 |
|
| Sasa100: what OS are you on? | 22:19 |
| ← lsiv568 left | 22:20 |
| → HoMM_ joined | 22:20 |
| ← dunpeal left | 22:20 |
| → thiago joined | 22:20 |
|
Sasa100
| apple | 22:20 |
| → chiemseesurfer joined | 22:20 |
| → rvandam joined | 22:20 |
|
isifreek
| Sasa100: oh, do you have fink or homebrew? (you need openssh) | 22:20 |
| ← pcypher left | 22:20 |
| ← plsk left | 22:20 |
|
Sasa100
| I'm using the regular terminal | 22:20 |
| → pcypher joined | 22:21 |
| → cdown joined | 22:21 |
|
Sasa100
| but do i need to do the keygen thing if i already get the thing connecting to it? | 22:21 |
| ← Wtjw left | 22:21 |
| → noise98 joined | 22:22 |
|
isifreek
| Sasa100: what do you mean "already connecting"? are you saying that your local git is able to push/pull to/from github? | 22:22 |
| → Una_ joined | 22:22 |
| ← Una left | 22:22 |
|
Sasa100
| it says fetch and push | 22:22 |
| → s8321414 joined | 22:22 |
|
Sasa100
| so i guess so | 22:22 |
| ← irqq left | 22:22 |
| ← nnyk left | 22:22 |
|
isifreek
| Sasa100: that's NOT what that means... | 22:22 |
| → svteoi joined | 22:23 |
| ← AndroidLoverInSF left | 22:23 |
| ← clarkpan left | 22:23 |
| ← aesinv left | 22:23 |
| ← HoMM left | 22:23 |
|
isifreek
| Sasa100: those are the links git will use when it tries to push/pull, but that doesnt mean the server will give you what you want. you must authenticate to the server usually via https or ssh | 22:23 |
| ← Vadimus left | 22:23 |
|
isifreek
| with https, it asks you for your password on the terminal everytime | 22:24 |
| → tmager joined | 22:24 |
|
Sasa100
| isifreek: yup.... because now i get permission denied publicly fatal could not read from remote repository... please make sure you have the correct access rights and the repository exists | 22:24 |
|
ottanta
| so, I want to take a commit I just made to a branch, say 'foo', and check it out as a branch bar, then rewind the foo branch to the commit before the one I made | 22:24 |
|
isifreek
| Sasa100: exactly, so you're connecting just fine, you just arent authenticating | 22:24 |
| → teran_ joined | 22:25 |
|
Sasa100
| isifreek: ohhh | 22:25 |
|
isifreek
| Sasa100: does `which ssh-keygen` produce any output when you type it? | 22:25 |
|
Sasa100
| so how do i authenticate | 22:25 |
| → AndroidLoverInSF joined | 22:25 |
|
c355E3B
| Sasa100, ensure your public key is on the server you are trying to ssh to | 22:25 |
|
Sasa100
| isifreek: when i do ssh-keygen i get /usr/bin/ssh-keygen | 22:25 |
| ← akiva left | 22:25 |
|
ottanta
| so all I do is like, git branch -m right | 22:25 |
|
isifreek
| Sasa100: oh perfect | 22:25 |
|
Sasa100
| isifreek: how/where do i get a public key? | 22:26 |
|
| is that my ip address kind of thing? | 22:26 |
|
qsuscs
| ottanta: git checkout foo; git branch bar; git reset --hard @^ # but you are still on foo | 22:26 |
|
isifreek
| Sasa100: type this: `ssh-keygen` <-- generates a public key and a corresponding private key | 22:26 |
| ← thiago left | 22:26 |
|
isifreek
| Sasa100: it will ask you some Questions... ignore them all by pressing enter | 22:26 |
| ← riceandbeans left | 22:26 |
|
isifreek
| Sasa100: when you're done with tht tell me | 22:27 |
|
Sasa100
| its asking me to enter file to save the key? | 22:27 |
|
isifreek
| enter | 22:27 |
| ← teran left | 22:27 |
| → teran__ joined | 22:27 |
|
Sasa100
| cool done | 22:27 |
| ← baweaver left | 22:27 |
|
ottanta
| qsuscs you mean I'll end up on foo? or I'll still be on where foo was pointing before | 22:28 |
|
Sasa100
| isifreek: all done | 22:28 |
|
| isifreek: what do i do with the key? | 22:28 |
|
isifreek
| Sasa100: it automatically put them in ~/.ssh/id_rsa*.... so type `less ~/.ssh/id_rsa.pub` | 22:28 |
| ← mroach left | 22:28 |
|
isifreek
| Sasa100: that will show you your public key | 22:28 |
|
| Sasa100: copy it | 22:28 |
|
| (everything you see) | 22:28 |
|
qsuscs
| ottanta: you’ll end up on foo, but the commit before the one it used to be | 22:28 |
|
Sasa100
| isifreek: what do i do with the copied key? | 22:29 |
|
ottanta
| qsuscs that's what I want, then, I can just git checkout bar at the end anyway | 22:29 |
| ← chiemseesurfer left | 22:29 |
|
isifreek
| Sasa100: then you'll paste it to github > settings (gear in the upper right) > ssh keys | 22:29 |
|
ottanta
| I just didn't want to overthink it and do non-porcelain commands, thank you | 22:29 |
|
isifreek
| Sasa100: looks like this: https://help.github.com/assets/images/help/settings/ssh-key-paste.png | 22:29 |
|
ottanta
| :D | 22:29 |
| ← teran_ left | 22:29 |
|
Sasa100
| isifreek: got it | 22:30 |
| → thiago joined | 22:30 |
|
isifreek
| Sasa100: as soon as you save, you can push/pull | 22:30 |
|
| Sasa100: press 'q' to return to your termianl btw (idk if you're familiar with `less`) | 22:31 |
|
Sasa100
| isifreek: my key does not end with a email address.... | 22:31 |
| ← jagob left | 22:32 |
|
isifreek
| Sasa100: should be ok. usually it is the username of the user that made the key @ the host where the key was made | 22:32 |
| ← nfk left | 22:32 |
|
Sasa100
| isifreek: ok all done now i got back to the terminal and... | 22:32 |
|
isifreek
| Sasa100: afaik, it doent matter what is there as long as you have the corresponding private key. | 22:32 |
| → khisanth_ joined | 22:33 |
|
isifreek
| Sasa100: back on the terminal, press 'q', then try to push | 22:33 |
| → clarkpan joined | 22:34 |
| ← denete left | 22:34 |
| → queuetip joined | 22:34 |
| ← daedeloth_ left | 22:34 |
| ← Khisanth left | 22:35 |
|
queuetip
| hi, i have a file that git status shows i have local changes, i commit it, but when i try to push it says up to date, i can't checkout another branch because it says i have local modifications, i even do a git checkout file but still the same thing | 22:35 |
|
| what causes that? | 22:35 |
|
Sasa100
| isifreek: i have this on the end of my key is it ok? /.ssh/id_rsa.pub (END) | 22:35 |
|
| isifreek: i tried to push , but same prob | 22:35 |
|
isifreek
| Sasa100: yes, that is the public key, that's the one you should give to github (or everyone) | 22:36 |
| → intransi_ joined | 22:36 |
| ← ParsectiX left | 22:36 |
|
queuetip
| the changes are already pushed to origin, so i could probably git reset the file but i want to know what the cause is | 22:36 |
|
isifreek
| Sasa100: ok, that means there may not yet be a corresponding repo on github to read (which makes sense since you havent pushed this repo before) | 22:36 |
|
Sasa100
| isifreek: git push master fatal: 'master' does not appear to be a git repository fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. | 22:36 |
| ← tonyj left | 22:36 |
| → Xovu joined | 22:36 |
| ← jerius left | 22:36 |
| → Ahmed90 joined | 22:36 |
| ← AndroidLoverInSF left | 22:37 |
| → ParsectiX joined | 22:37 |
|
queuetip
| Sasa100: git push origin master? | 22:37 |
|
isifreek
| Sasa100: on github, create a new completely empty git repo (plus in the upper right, uncheck license, uncheck readme, gitignore none) | 22:37 |
| ← Xovu left | 22:37 |
|
isifreek
| queuetip: that wont work | 22:37 |
|
| queuetip: there is nothing to push to yet | 22:37 |
| → tonyj joined | 22:37 |
|
Sasa100
| queuetip: yay! | 22:37 |
| → AndroidLoverInSF joined | 22:37 |
|
isifreek
| wow, rly? | 22:37 |
|
queuetip
| isifreek: ah i see, sorry i came into the conversation late, i had my own question haha | 22:38 |
|
Sasa100
| isifreek: yup | 22:38 |
|
queuetip
| well cool ;) glad i could help | 22:38 |
|
isifreek
| Sasa100: magic lol | 22:38 |
|
| you should be able to do git push now | 22:38 |
|
Sasa100
| isifreek: :) so how do i check now if it did it | 22:38 |
| ← Una_ left | 22:38 |
|
isifreek
| Sasa100: it will say already up to date now | 22:38 |
| → hvo joined | 22:38 |
| ← ParsectiX left | 22:38 |
|
isifreek
| Sasa100: github.com/user/repo.git | 22:38 |
|
queuetip
| Sasa100: look on origin, if origin is github, check that | 22:38 |
| → ParsectiX joined | 22:38 |
| ← clarkpan left | 22:39 |
| ← hvo left | 22:39 |
| ← intransit left | 22:39 |
|
Sasa100
| OhMG!!!!! | 22:39 |
| ← jason237 left | 22:39 |
| ← jazzzu left | 22:39 |
|
Sasa100
| yay!! | 22:39 |
|
queuetip
| Sasa100: origin though could be whatever you want it to be, it could be a deploy repo on your own computer even | 22:39 |
|
Sasa100
| thank you so much | 22:39 |
|
| no, i just could not figure out how to get my files uploaded to git and now its all done! | 22:39 |
| ← cdown left | 22:40 |
|
queuetip
| Sasa100: it's a good habit to always specify what you're pulling from and to, and what your pushing from and to, rather than leave git to try to figure it out | 22:40 |
| → ooeoj joined | 22:40 |
|
Sasa100
| queuetip: thanks for the tip | 22:40 |
|
isifreek
| Sasa100: now you're rolling... i often find it easier to create the repo on github first, then clone. | 22:40 |
|
| (personal pref tho) | 22:40 |
| → nadirvardar joined | 22:40 |
| → cvanball joined | 22:40 |
|
Sasa100
| queuetip: when u say look on origin... you mean check my github account right? | 22:41 |
|
queuetip
| Sasa100: in your case, yes | 22:41 |
| ← ende__ left | 22:41 |
| ← jeffmjack left | 22:41 |
|
Sasa100
| I've been trying all some tutorials on the mean stack | 22:41 |
|
queuetip
| Sasa100: but "origin" there could be whatever, you could create an empty repo on an AWS instance and then that could be your origin | 22:41 |
|
Sasa100
| and i just wanted to get them up there | 22:41 |
| → ende__ joined | 22:41 |
|
Sasa100
| its so confusing.... at the start.... | 22:41 |
|
queuetip
| Sasa100: git isn't meant to be user friendly, but it sure is maintainer friendly :D | 22:42 |
|
c355E3B
| Everything always is | 22:42 |
|
queuetip
| so, on to my question! lol what causes a file to show as needing to be committed when it's committed and pushed, and git won't let me checkout another branch even if i've checked out the file that git is complaning has local modifications | 22:43 |
|
Sasa100
| queuetip: I'm just trying to get into the flow of it, i know once i've done it a few times i'll be fine... it just seems a bit daunting... i got so far with it but then i just hit a wall.... so i came here and voilé its done | 22:43 |
|
c355E3B
| queuetip, when you modify or delete the file | 22:43 |
|
queuetip
| Sasa100: checkout git flow | 22:43 |
|
| c355E3B: it's not modified or deleted | 22:44 |
|
Sasa100
| whats git flow? | 22:44 |
| → texasmynsted joined | 22:44 |
|
c355E3B
| queuetip, you sure? | 22:44 |
|
queuetip
| c355E3B: i mean i did modify it but then i committed and pushed it, it's pushed | 22:44 |
|
| c355E3B: yes: even after doing a git checkout file | 22:44 |
|
| c355E3B: it still shows as locally modified | 22:44 |
| → sinkensabe joined | 22:44 |
|
queuetip
| c355E3B: when i try to push, git says up to date | 22:44 |
|
c355E3B
| what does git status say? | 22:44 |
|
queuetip
| c355E3B: it says that that file has local modifications | 22:44 |
|
texasmynsted
| There is no way to somehow mark a set of commits in branch "B" to never be merged into branch "A", right? | 22:44 |
|
queuetip
| c355E3B: although git log shows my commit, git show shows my changes | 22:45 |
| ← editshare-ericf left | 22:45 |
|
jim
| you can push commits, you can't push local mods | 22:45 |
| → nda_ joined | 22:45 |
|
texasmynsted
| I know there is a way to say for file xyz take "ours". | 22:45 |
|
queuetip
| jim: i've committed the file 4 times already | 22:45 |
|
| jim: there's nothing more to commit | 22:45 |
| → Consuela joined | 22:45 |
|
c355E3B
| queuetip, have you checked that the remote has your file? | 22:45 |
|
queuetip
| c355E3B: yes, and it does | 22:46 |
|
jim
| did you add it first? :) | 22:46 |
|
queuetip
| jim: yes, the file has been there for like 2 years too | 22:46 |
|
c355E3B
| try adding it first then recommiting | 22:46 |
| ← aard_ left | 22:46 |
|
jim
| no I mean "git add thatfile" | 22:46 |
|
c355E3B
| but you can always reset origin/master | 22:46 |
|
queuetip
| c355E3B: i've never needed to do that before except when resolving a conflict or when adding a new file | 22:46 |
| ← thiss left | 22:46 |
|
queuetip
| c355E3B: i know i can git reset --hard HEAD on that file... but i want to know what causes this | 22:46 |
|
c355E3B
| can you git diff the file agasint its last revision? | 22:47 |
|
jim
| yeah I'm curious too | 22:47 |
|
queuetip
| jim: the last, last msg was meant for you | 22:47 |
| ← sinkensabe left | 22:47 |
|
queuetip
| c355E3B: yes and the "changes" that i've committed 4 times show up | 22:47 |
| → ap0c joined | 22:47 |
|
c355E3B
| does the name show up in git status? | 22:48 |
| ← steele_ left | 22:48 |
|
nda_
| I should have had a submodule as I do have the files and an entry in .gitmodules; yet, Git apparently has no knowledge of the submodule. "git submodule status --recursive" doesn't list the submodule either. Is there a good way to fix this, or should I manually remove the entry in .gitmodules as well as the submodule folder, then add it again? | 22:48 |
|
queuetip
| c355E3B: yes | 22:48 |
|
jim
| as what? | 22:48 |
|
queuetip
| jim: as the right name of the file | 22:48 |
|
c355E3B
| can you pastebin the terminal output somewhere? | 22:48 |
|
queuetip
| c355E3B: yes | 22:48 |
|
jim
| yeah I'd like to see that too | 22:48 |
| ← tmager left | 22:48 |
| ← ams__ left | 22:49 |
| → steele joined | 22:49 |
| → lsiv568 joined | 22:50 |
|
jim
| queuetip, git has a slightly different workflow... before you can commit, you have to "git add ..." | 22:50 |
| → jottr_ joined | 22:51 |
| ← adamben left | 22:51 |
|
jim
| it sounds like you've been working with this project awhile... how long has it been under git? | 22:51 |
| → aesinv joined | 22:51 |
| ← kermit left | 22:52 |
|
nda_
| As for my problem, I now see that the folder referred to in the .git file of the submodule doesn't exist in .git\modules.. Somehow, Git still knows that the submodule is a different repository without having its own ".git" folder. :S | 22:52 |
| ← chitopunk left | 22:52 |
| → kermit joined | 22:53 |
| ← aesinv left | 22:53 |
|
nda_
| Sorry, I said something wrong. .git\modules\* exists after all. | 22:53 |
| ← mskaesz left | 22:54 |
| → hahuang65 joined | 22:54 |
| ← lsiv568 left | 22:55 |
| ← Ankhers left | 22:55 |
| ← jottr_ left | 22:55 |
|
texasmynsted
| So anybody have a neat way to identify a set of commits that you want to ensure never get pulled into another branch? | 22:57 |
| ← m0ltar left | 22:57 |
|
kadoban
| texasmynsted: Don't commit them? What's in them exactly? | 22:58 |
|
texasmynsted
| Just shell scripts that help with testing | 22:58 |
| → ende___ joined | 22:58 |
| → mkaesz joined | 22:58 |
|
texasmynsted
| I do not want to lose them for the branch they exist on, and it would be useful to manage them is git, but they should not leave the branch | 22:59 |
|
| I thought about git notes | 22:59 |
| ← intransi_ left | 22:59 |
| ← ivan_on_trac left | 22:59 |
|
queuetip
| jim: i've actually never had to add before a commit | 22:59 |
|
| jim: c355E3B: http://pastie.org/9982682 | 22:59 |
| → clarkpan joined | 22:59 |
|
texasmynsted
| but I am not sure that is great. I could search for all notes with content like NOMOVE or something. | 22:59 |
|
queuetip
| jim: unless it's to add a new file or ot resolve a conflict | 22:59 |
| ← aldodelgado left | 22:59 |
|
kadoban
| texasmynsted: Are they on a branch that's commonly merge into other places or something? If not…doesn't seem like a problem. I mean just…don't merge them in. | 23:00 |
|
c355E3B
| texasmynsted, you can amend the commit messages of the commits and stick a DONTMERGE at the front of them | 23:00 |
| → lsiv568 joined | 23:00 |
| → baweaver joined | 23:00 |
| ← sburgess left | 23:00 |
|
texasmynsted
| It is on a branch that is common to merge into the dev branch | 23:00 |
|
c355E3B
| queuetip, you need to say git commit | 23:00 |
|
kadoban
| texasmynsted: If they are for some reason. I dunno, I guess you could merge them in and then immediately revert the merge. That way they won't get merged in again unless someone reverts the revert. | 23:00 |
| ← HoMM_ left | 23:01 |
| → jazzzu joined | 23:01 |
|
kadoban
| That's kinda gross, but…I guess it does what you're asking for, technically…kinda. | 23:01 |
|
texasmynsted
| Hmm, that is an interesting idea | 23:01 |
| ← ende__ left | 23:01 |
|
queuetip
| c355E3B: what do you mean? | 23:02 |
|
texasmynsted
| I would like something more like notes maybe. | 23:02 |
|
Sasa100
| thanks for your help guys, bye bye | 23:02 |
|
texasmynsted
| merge then revert seems . . . | 23:02 |
| ← Sasa100 left | 23:02 |
|
kadoban
| texasmynsted: If it was me, I'd probably just move them to a different branch, one that's not commonly merged in. | 23:02 |
|
c355E3B
| queuetip, every time you edit then add a file in git | 23:02 |
|
jim
| howbout if you do the commit without specifying the path? (just: git commit) | 23:02 |
|
c355E3B
| you need to run the `git commit` command to tell git to accept the changes | 23:02 |
|
queuetip
| c355E3B: i do, i pasted a pasties above | 23:03 |
| ← mkaesz left | 23:03 |
| → intransit joined | 23:03 |
|
queuetip
| c355E3B: you can see the workflow | 23:03 |
|
| jim: i've never had to do that before | 23:03 |
|
| jim: i always commit my files one at a time, so i always specify the path | 23:03 |
| ← thiago left | 23:03 |
| ← tonyj left | 23:03 |
| ← pm90_ left | 23:03 |
|
c355E3B
| queuetip, just do `git commit -m 'message'` | 23:03 |
|
jim
| so the file is definitely added | 23:03 |
| ← Es0teric left | 23:04 |
|
queuetip
| jim: the file is definitely there | 23:04 |
|
| c355E3B: why? | 23:04 |
|
jim
| to see if it works, and to commit the file | 23:04 |
|
texasmynsted
| If I move them to a different branch then I kind of have the same problem because every time I need to merge into the branch I need to identify the patches to leave out. | 23:04 |
| ← Technocrat7 left | 23:04 |
|
queuetip
| jim: is that the same as git commit . -m 'message' | 23:04 |
| → zumba_addict joined | 23:05 |
|
texasmynsted
| I am starting to like the idea of NOMERGE at the start of the commit message | 23:05 |
|
jim
| yes (except it fires up an editor into which you type the -m message) | 23:05 |
| → tonyj joined | 23:05 |
|
texasmynsted
| It would be easy to see in the log, could be grepped | 23:05 |
| ← zxd left | 23:05 |
|
texasmynsted
| etc | 23:05 |
|
kadoban
| texasmynsted: Hmm? Never merge the branch with the scripts in anywhere. Just rebase it on top of what you want to test or something. NOMERGE…I dunno how that helps. You're still likely to do it accidentally. | 23:05 |
|
texasmynsted
| Might be better than notes | 23:05 |
|
c355E3B
| There isnt really a good way to keep it from happening | 23:06 |
|
jim
| so, either "git commit" or "git commit -m 'some message'" | 23:06 |
|
c355E3B
| but its a bit more visiable than a note | 23:06 |
|
texasmynsted
| kadoban: hmm yes, you are right | 23:06 |
| ← cjwilburn left | 23:06 |
|
kadoban
| It's not like when you merge, it asks you to okay each commit. | 23:06 |
| ← wicope left | 23:06 |
| ← Vgr left | 23:07 |
|
jim
| it looks like the arg you were passing to git commit caused it to not do the commit | 23:07 |
| ← SirRetnuh left | 23:07 |
| → viscera joined | 23:07 |
|
texasmynsted
| I need a way to put some commits into a special status that makes them ineligible for merge. | 23:08 |
| ← clarkpan left | 23:08 |
| → Vgr joined | 23:08 |
| ← lqi left | 23:08 |
| ← Literphor left | 23:08 |
| → Jetchisel joined | 23:08 |
| → clarkpan joined | 23:09 |
| ← intransit left | 23:09 |
|
texasmynsted
| hmm submodules kind of work like that.. | 23:09 |
| ← nadirvardar left | 23:10 |
|
texasmynsted
| submodule not a viable solution | 23:12 |
| ← AndroidLoverInSF left | 23:12 |
| ← c355E3B left | 23:12 |
| → SirRetnuh joined | 23:12 |
| ← SirRetnuh left | 23:13 |
| → SirRetnuh joined | 23:13 |
| → AndroidLoverInSF joined | 23:13 |
| ← JanC left | 23:13 |
| ← iamjarvo left | 23:13 |
| ← btree_ left | 23:13 |
|
queuetip
| i ended up doing a git reset --hard HEAD and that fixed my issue just fine,but i do have another question, i've never used git add or git commit -am when just modifying a file that already exists in the repo, i just make my changes and then git commit file -m 'msg', then push, it's always worked just fine without issue | 23:15 |
| ← Acidnerd left | 23:15 |
|
queuetip
| i'm trying to find any documentation online to support this,but all documentation points to having to add first after modify | 23:15 |
|
| does git just do it for you if you don't? i've literally never had to | 23:15 |
| → akiva joined | 23:16 |
| ← thebrush left | 23:16 |
| → AaronMT joined | 23:16 |
| → nadirvardar joined | 23:17 |
|
queuetip
| here's the workflow and it works just fine: http://pastie.org/9982726 | 23:17 |
|
| no git add or -am needed | 23:17 |
|
texasmynsted
| Need a merge strategy of never | 23:18 |
|
| http://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes | 23:18 |
| ← svteoi left | 23:18 |
| → Technocrat7 joined | 23:18 |
| ← clarkpan left | 23:18 |
|
queuetip
| texasmynsted: you can probably write a hook script if you need to check certain files, but that's way out of my range | 23:18 |
| ← ooeoj left | 23:19 |
| ← PeterBooker left | 23:19 |
|
texasmynsted
| I think I would like to create a custom merge strategy of ignore. | 23:19 |
| → oojacoboo joined | 23:19 |
| → m0ltar joined | 23:19 |
|
texasmynsted
| anybody have any urls that might be helpful for this heh? | 23:20 |
| → unomystEz joined | 23:20 |
|
texasmynsted
| then I could set the merge strategy in .gitattributes, to ignore | 23:20 |
| → Literphor joined | 23:20 |
| ← Sarco left | 23:21 |
| ← Vampire0_ left | 23:21 |
| ← zumba_addict left | 23:21 |
| ← Corey84 left | 23:21 |
| ← Gama11_ left | 23:21 |
| ← steele left | 23:22 |
| → drfoo joined | 23:22 |
| → zumba_addict joined | 23:22 |
|
queuetip
| texasmynsted: i think writing a custom strategy and recompiling git would be far more complicated than writing a hook script to do what you need, IMO, i really don't know though | 23:22 |
| → _Atom_ joined | 23:23 |
|
texasmynsted
| oh, yeah. | 23:23 |
| → gopar joined | 23:23 |
| → ani joined | 23:23 |
| ← baweaver left | 23:23 |
| → mroach joined | 23:24 |
| ← ani left | 23:24 |
| ← tevfik left | 23:24 |
| → clarkpan joined | 23:25 |
| ← davidfetter_fbn left | 23:25 |
| → Acnao joined | 23:25 |
|
texasmynsted
| hmm. http://stackoverflow.com/questions/23140240/git-how-do-i-add-a-custom-merge-strategy | 23:25 |
| ← kadoban left | 23:25 |
| ← macabre left | 23:25 |
|
texasmynsted
| I guess what I was thinking of would be a merge driver and would only be used in conflict | 23:25 |
|
| so not going to work | 23:26 |
| ← Ahmed90 left | 23:26 |
| → jottr_ joined | 23:26 |
| ← Acnao left | 23:26 |
| → steele joined | 23:26 |
|
texasmynsted
| So I guess the answer is there is no way, or maybe some kind of hook | 23:26 |
| → whitby joined | 23:27 |
| → JanC joined | 23:27 |
| → Ecaa joined | 23:28 |
| → HelloShitty joined | 23:28 |
| ← Gianormagantrous left | 23:28 |
| ← ParsectiX left | 23:28 |
| → Vampire0 joined | 23:29 |
| → ParsectiX joined | 23:29 |
| → otter768 joined | 23:29 |
| ← h4ml3t left | 23:29 |
| ← stymo left | 23:30 |
| ← cbonobo left | 23:30 |
| → Gianormagantrous joined | 23:30 |
| → danzilio joined | 23:32 |
| ← otter768 left | 23:34 |
| → btree joined | 23:35 |
| ← btree left | 23:35 |
| ← pcypher left | 23:36 |
| ← leolrrj-alt left | 23:37 |
| ← t0th_-_ left | 23:37 |
| ← Dougie187 left | 23:37 |
| ← ap0c left | 23:37 |
| → t0th_-_ joined | 23:38 |
| ← bgerber left | 23:38 |
| → kadoban joined | 23:38 |
| ← carif left | 23:38 |
| → scientes joined | 23:38 |
| ← scientes left | 23:38 |
| → scientes joined | 23:38 |
| ← neonalpine left | 23:39 |
| ← ska-fan left | 23:39 |
| → h4ml3t joined | 23:40 |
| ← fooforge left | 23:40 |
| ← mikecmpbll left | 23:41 |
| ← SirRetnuh left | 23:41 |
| → ap0c joined | 23:41 |
| ← axl_ left | 23:42 |
| → phix joined | 23:42 |
| → Vile joined | 23:42 |
| → baweaver joined | 23:42 |
|
phix
| hi, can I remove commits? My use case is I applied an update to a website that is under git, I commited it and a few other things, now I want to removed a few commits as it contains useless and incorrect data that I dont want to keeop the history of. my questions are 1) Is this possible? 2) which git commands should I read up on to perform this task? | 23:44 |
| ← scientes left | 23:44 |
|
soerenb
| !fixup | 23:44 |
|
gitinfo
| 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! | 23:44 |
|
phix
| cheers | 23:44 |
| ← hahuang65 left | 23:44 |
| ← eijk left | 23:44 |
|
phix
| That was a quick response, how many cups of coffee have you had today? :) | 23:45 |
|
soerenb
| none, i prefer tea | 23:45 |
|
| just had a minute to relax and checked in on irc | 23:45 |
| → s8321414_ joined | 23:45 |
| ← s8321414 left | 23:45 |
| ← danzilio left | 23:45 |
| ← tritone_ left | 23:46 |
| ← Zupoman left | 23:46 |
|
phix
| nice, good timing then :) | 23:46 |
| s8321414_ → s8321414 | 23:47 |
|
queuetip
| phix: git rebase -i will allow you to remove certain commits, and reapply the rest, but it is rewriting git history, so be careful | 23:47 |
| → undecim joined | 23:48 |
|
phix
| that is fine, basically what I did was apply an update, reverted update plus added more stuff, now I want to apply an update. I want to remove the first update (there are a few commits) as it was a failure. | 23:48 |
| → davidfetter_fbn joined | 23:48 |
| → danzilio joined | 23:49 |
| ← danzilio left | 23:49 |
|
queuetip
| phix: sure, git rebase is good for that, which is also mentioned in the above pasted article on github. just know that rewriting history is a complicated thing, and other users of this repo may be adversely affected | 23:49 |
| ← Takle left | 23:50 |
|
phix
| I have done that a few times so I would like to remove a bunch of commits in the middle of my commit log or what ever you would call it | 23:50 |
|
undecim
| I'm a git noob. I just cloned a repo (took about 5 min to download 0.5G), and there's nothing there (except .git). I was expecting some source code (git clone git://git.omapzoom.org/kernel/exynos.git) | 23:50 |
|
queuetip
| phix: git rebase -i then :) | 23:50 |
|
phix
| queuetip: only one user, me, I use it to keep track of changed files on a website, and easily restore files if a user messess it up (yes I do backups as well, but git checkout is alot easier :)) | 23:51 |
| ← h4ml3t left | 23:51 |
|
queuetip
| phix: easy mode then and consider yourself lucky! | 23:51 |
| ← oojacoboo left | 23:51 |
|
phix
| woooooo! | 23:51 |
|
| oh I have two repos though, local and origin (a server that I am the only user / admin on) | 23:52 |
| ← steele left | 23:52 |
| ← Technocrat7 left | 23:53 |
|
undecim
| I just clone'd and downloaded ~500MB, but there is nothing in the tree. What did I just download 500MB of? (git clone git://git.omapzoom.org/kernel/exynos.git) | 23:53 |
| → jorj joined | 23:54 |
| ← kadoban left | 23:55 |
| → madewokherd joined | 23:55 |
|
dodobrain
| undecim, check git log | 23:55 |
|
| maybe someone accidentally pushed a delete all commit | 23:55 |
|
| or something weird like that | 23:55 |
|
undecim
| Shows 1 commit "empty commit" | 23:55 |
|
dodobrain
| what? | 23:55 |
| → SirRetnuh joined | 23:55 |
|
dodobrain
| maybe dot files? | 23:55 |
|
undecim
| no, just .git | 23:55 |
| → rpg_ joined | 23:56 |
| ← akiva left | 23:56 |
| ← vreo left | 23:56 |
| ← rpg_ left | 23:56 |
| → scientes joined | 23:56 |
| ← scientes left | 23:56 |
| → scientes joined | 23:56 |
| → jgardella joined | 23:56 |
| ← nmz787_i left | 23:56 |
| ← jgardella left | 23:57 |
|
undecim
| How can I revert to before that commit? | 23:57 |
|
| Or can I even do that, since there is no commit before? | 23:57 |
| ← tjm_jimmy left | 23:58 |
| ← joeyDB left | 23:58 |
| ← oriba_ left | 23:59 |
