Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-13

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:01 lindenle joined #git
00:02 c1arknova joined #git
00:05 converge_ joined #git
00:08 lindenle joined #git
00:09 ktoverso joined #git
00:10 ncthom91 joined #git
00:10 howitdo joined #git
00:11 VladGh joined #git
00:14 _Vi joined #git
00:14 Sample joined #git
00:16 anuxivm joined #git
00:18 mda1 joined #git
00:20 emg joined #git
00:22 rwb joined #git
00:23 Gsham joined #git
00:24 norotartagen joined #git
00:25 jmpp joined #git
00:25 jmpp joined #git
00:25 norotartagen there should be a git command called git gud that links you to a useful git doc or blog post
00:25 rwb joined #git
00:25 krillr joined #git
00:27 giraffe joined #git
00:28 rwb1 joined #git
00:29 emg joined #git
00:30 dzho norotartagen: https://www.reddit.com/r/shittyprog​ramming/comments/4zmzwg/i_tried_git​_gud_but_thats_not_a_git_command/
00:32 mikecmpbll joined #git
00:33 sdothum joined #git
00:33 dwmw2_gone joined #git
00:36 madewokherd joined #git
00:36 thebope joined #git
00:37 same_ol_geez joined #git
00:37 same_ol_1eez joined #git
00:38 arescorpio joined #git
00:41 jaguarmagenta joined #git
00:42 holodoc joined #git
00:45 einnjo joined #git
00:49 Orion3k joined #git
00:50 star_prone joined #git
00:51 _Vi joined #git
00:51 cqi joined #git
00:51 tnecniv joined #git
00:52 SwiftMatt joined #git
00:55 DolphinDream joined #git
00:57 unbalanced joined #git
00:58 norotartagen dzho: that is a highly advanced subreddit
01:07 ktoverso joined #git
01:12 lanking joined #git
01:12 particleGolem joined #git
01:14 Gsham joined #git
01:16 wxg joined #git
01:17 anuxivm left #git
01:20 Sasazuka joined #git
01:21 Oatmeal joined #git
01:21 Nilesh_ joined #git
01:23 xlegoman joined #git
01:29 duderonomy joined #git
01:34 minibar did home path expantion recently change in git config?
01:34 minibar my .gitlocal include was working but not anymore
01:37 breezy_ joined #git
01:38 donught joined #git
01:39 duderono_ joined #git
01:41 Sasazuka joined #git
01:43 dikiaap joined #git
01:43 dikiaap joined #git
01:43 austin987 joined #git
01:45 ktoverso joined #git
01:45 rwb joined #git
01:47 Shentino joined #git
01:48 lindenle joined #git
01:48 near_realtime joined #git
01:50 tnecniv joined #git
01:52 duderono_ joined #git
01:53 wget joined #git
01:56 Sasazuka joined #git
01:56 dsantiago joined #git
01:56 sdothum joined #git
02:02 ahmedelgabri joined #git
02:09 duderono_ joined #git
02:11 dodobrain joined #git
02:13 peeps[lappy] joined #git
02:13 finalbeta joined #git
02:15 snowkidind joined #git
02:17 d^sh joined #git
02:19 holodoc joined #git
02:22 ncthom91 joined #git
02:23 ome joined #git
02:27 Atrumx joined #git
02:27 sdothum joined #git
02:27 jaguarmagenta joined #git
02:33 kent\n joined #git
02:34 kent\n If I have "git mergetool" telling me "No files need merging" but "git status" says "Unmerged paths" and there's a listed "both modified" path and that file clearly has conflict markers, what am I supposed to do?
02:35 kent\n I get this all the time and its infuriating :/
02:35 kent\n "oh, so there's a diff, k, give me a merge tool", but no.
02:36 kent\n I can of course fix the conflict markers myself, but the point of having git mergetool was "I don't have to do that"
02:38 andrew711 joined #git
02:39 star_prone joined #git
02:39 thebope joined #git
02:46 dreiss joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:50 jokester joined #git
02:51 ktoverso joined #git
02:51 menip joined #git
02:53 pks joined #git
02:54 svm_invictvs joined #git
02:55 Orion3k joined #git
02:59 cyphase joined #git
03:05 cagmz joined #git
03:10 mand0 joined #git
03:10 aavrug joined #git
03:12 durham joined #git
03:12 howdoi joined #git
03:13 converge joined #git
03:14 yohnnyjoe joined #git
03:16 jaguarmagenta joined #git
03:18 zzz_ joined #git
03:20 Emperor_Earth joined #git
03:21 jon-mac joined #git
03:26 romerocesar joined #git
03:28 chachasmooth joined #git
03:32 thiago joined #git
03:34 sunri5e joined #git
03:35 converge joined #git
03:36 buffal0 joined #git
03:39 jeffreylevesque joined #git
03:39 Siegfried joined #git
03:40 thebope joined #git
03:41 blunaxela joined #git
03:42 regedit joined #git
03:43 dsantiago joined #git
03:46 duderonomy joined #git
03:52 a_thakur joined #git
03:54 hexagoxel joined #git
03:55 Andrew_K joined #git
03:58 b_rare joined #git
03:59 Milos joined #git
04:00 Gsham joined #git
04:01 dreiss joined #git
04:03 Lyqyd joined #git
04:03 mehola joined #git
04:05 jaguarmagenta joined #git
04:09 hagridaaron joined #git
04:10 blackwind_123 joined #git
04:13 raspado joined #git
04:14 Vortex35 joined #git
04:16 fstd_ joined #git
04:16 snowkidind joined #git
04:17 sbulage joined #git
04:23 steven_a_s joined #git
04:24 dreiss joined #git
04:24 robotroll joined #git
04:25 star_prone joined #git
04:28 ljc joined #git
04:29 ixjlyons joined #git
04:32 aarobc joined #git
04:37 Rodya_ joined #git
04:40 treaki_ joined #git
04:40 yohnnyjoe joined #git
04:41 thebope joined #git
04:41 subhojit777 joined #git
04:52 mjuszczak joined #git
04:52 mjuszczak joined #git
04:59 dreiss joined #git
05:04 r4nd0m-0ne joined #git
05:05 venmx joined #git
05:09 r4nd0m-0ne joined #git
05:16 acetakwas joined #git
05:18 Sample joined #git
05:24 baryon joined #git
05:25 ismithers joined #git
05:25 kfoonamalik joined #git
05:26 dreiss joined #git
05:29 peepsalot joined #git
05:30 systemovich joined #git
05:34 ayogi joined #git
05:35 dsantiago joined #git
05:36 howitdo joined #git
05:39 mahendratech joined #git
05:42 thebope joined #git
05:45 pks joined #git
05:49 Cabanossi joined #git
05:56 acetakwas joined #git
05:56 nettoweb1 joined #git
05:57 bocaneri joined #git
05:57 Limes_ joined #git
06:01 brillenfux joined #git
06:02 dsdeiz joined #git
06:03 nkouevda joined #git
06:03 jgrasser joined #git
06:07 aruns joined #git
06:13 shgysk8zer0 joined #git
06:13 ogny joined #git
06:14 overlord_tm joined #git
06:15 Oatmeal joined #git
06:15 mrmadcat joined #git
06:15 tarkus joined #git
06:18 _August_ joined #git
06:18 _August_ joined #git
06:18 _August_ need help... i just did a commit and didnt pull and im finding out that a merge happened with the branch i am trying to push to
06:19 _August_ i cant do a soft reset either
06:19 _August_ what do i do to save the changes? and push them?
06:19 _August_ is it possible to cancel the merge?
06:19 pbrewczynski joined #git
06:20 _August_ and if i cancel the merge does that cause the changes i made to be lost?
06:21 qt-x joined #git
06:22 rangergord joined #git
06:22 rangergord hiya
06:25 rangergord I have a repo I use not for code, but as a ghetto Dropbox replacement, for dot files, notes, sometimes even ebooks! Some of my documents are binary, which slowly increases the size of the repo over time. Is there a command I could run to make git delete all history that goes further than a month, since I normally don't care about old data? So the repo as it was a month ago, becomes the only
06:25 rangergord ancestor, and all previous snapshots are discarded.
06:26 richardlitt joined #git
06:26 rscata joined #git
06:27 jozwior_ joined #git
06:35 ellobo joined #git
06:38 derk0pf joined #git
06:39 jaguarmagenta joined #git
06:40 jozwior joined #git
06:41 OOPMan joined #git
06:41 milki rangergord: !bf is an easy tool
06:41 milki rangergord: !bfg
06:41 gitinfo rangergord: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
06:41 MrMojito joined #git
06:42 thebope joined #git
06:44 dsdeiz joined #git
06:44 dsdeiz joined #git
06:47 Gloomy joined #git
06:47 ThomasLocke joined #git
06:48 sbulage joined #git
06:48 kfoonamalik joined #git
06:52 cbegin joined #git
06:53 lordjancso joined #git
06:53 cbegin left #git
06:57 _ng joined #git
06:58 Rodya_ joined #git
07:00 Raging_Hog joined #git
07:01 sbulage joined #git
07:02 dermoth joined #git
07:03 tnecniv joined #git
07:03 cdown joined #git
07:06 venmx joined #git
07:07 _August_ joined #git
07:10 moei joined #git
07:16 roelmonnens joined #git
07:19 ToBeCloud joined #git
07:21 Funeral joined #git
07:23 chele joined #git
07:23 Flowinho joined #git
07:26 JeroenT joined #git
07:27 jstimm joined #git
07:27 freimatz joined #git
07:28 zeroed joined #git
07:28 zeroed joined #git
07:28 romerocesar joined #git
07:29 Muzer joined #git
07:32 tvw joined #git
07:34 derk0pf joined #git
07:38 vuoto joined #git
07:39 arnsa joined #git
07:40 zeroed joined #git
07:42 absinthe joined #git
07:43 lindenle joined #git
07:43 thebope joined #git
07:49 iliv joined #git
07:53 star_prone joined #git
07:54 star_prone joined #git
07:54 sentinal8473 joined #git
07:56 elect_ joined #git
07:58 systemov` joined #git
07:58 star_prone joined #git
07:58 diogenese joined #git
07:58 sbulage joined #git
08:01 sdlnv joined #git
08:02 raspado joined #git
08:03 lindenle joined #git
08:04 Alienpruts joined #git
08:05 jnavila joined #git
08:05 bernardio joined #git
08:05 madewokherd joined #git
08:06 nevyn joined #git
08:06 magicbit joined #git
08:06 reda joined #git
08:06 lmat joined #git
08:07 dustinm joined #git
08:09 _August_ joined #git
08:09 manuels joined #git
08:09 Mogget joined #git
08:09 CtrlC joined #git
08:11 _ng joined #git
08:11 mischat joined #git
08:13 danslo joined #git
08:13 gareppa joined #git
08:14 miguelfernandes joined #git
08:15 Sceorem joined #git
08:15 garethdaine joined #git
08:16 hahuang62 joined #git
08:17 Iota Good morning, world!
08:17 derk0pf joined #git
08:18 mablae_ joined #git
08:20 aidalgol joined #git
08:20 eduardas_m joined #git
08:20 nikow joined #git
08:25 ahmedelgabri joined #git
08:28 acetakwas joined #git
08:29 tarkus joined #git
08:30 PCatinean joined #git
08:30 jaguarmagenta joined #git
08:33 aruns joined #git
08:35 Takiito joined #git
08:38 overlord_tm joined #git
08:39 FreakySneaky joined #git
08:40 Gloomy joined #git
08:41 Balliad joined #git
08:41 olbat joined #git
08:44 thebope joined #git
08:45 FreakySneaky left #git
08:46 Singmyr joined #git
08:48 sweatsuit joined #git
08:49 a_thakur joined #git
08:49 Guest64909 joined #git
08:56 clmsy joined #git
08:57 jknetl joined #git
08:57 rafanadal joined #git
08:57 rafanadal left #git
08:58 rafanadal joined #git
08:58 rafanadal left #git
08:58 finalbeta joined #git
08:58 roelmonn_ joined #git
08:59 mikecmpbll joined #git
09:02 kedare joined #git
09:03 oskarkv joined #git
09:03 theoceaniscool joined #git
09:04 Gloomy joined #git
09:05 theoceaniscool joined #git
09:06 BadSnappa joined #git
09:06 venmx joined #git
09:07 theoceaniscool joined #git
09:09 encod3 joined #git
09:11 ferr1 joined #git
09:12 mischat joined #git
09:12 sweatsuit joined #git
09:12 sharp15 joined #git
09:13 sharp15 is there a way to restore just 1 file deleted in a previous commit?  sorry i'm new to this.
09:15 sharp15 nm.  i just misread the answer i found on stackoverflow.  sorry.
09:18 cgundersson joined #git
09:20 pdgwien joined #git
09:21 marcogmonteiro joined #git
09:22 JeroenT joined #git
09:25 Xatenev joined #git
09:25 Xatenev Hi
09:25 Xatenev I have a commit and I awnna know who merged it when into branch X?
09:26 Xatenev Is that possible?
09:26 Xatenev I googled a lot, people say git doesn't really track that
09:27 Xatenev Maybe anybody has a great idea here to help me out :p
09:27 eduardas_m joined #git
09:28 selckin check the buildserver
09:29 grawity wat
09:29 selckin jenkins etc will record that for a long time
09:29 selckin first time it saw it anyway
09:29 grawity that's assuming the project has a build server
09:29 grawity and for that matter, the project is something buildable
09:30 selckin thats why its a great idea
09:30 selckin maybe you can come up with something
09:30 grawity why, because it doesn't work?
09:30 selckin else stfu
09:30 grawity I just did, `git log --merges --first-parent $COMMIT..`
09:30 netj joined #git
09:31 selckin clearly the commit date/author is not hwat he wants
09:31 zeroed joined #git
09:31 zeroed joined #git
09:31 sunri5e joined #git
09:31 ktoverso joined #git
09:33 yohnnyjoe joined #git
09:34 diogenese joined #git
09:34 Peetz0r joined #git
09:35 bruce_lee joined #git
09:35 JeroenT joined #git
09:36 kurkale6ka joined #git
09:36 Serpent7776 joined #git
09:38 roelmonnens joined #git
09:39 cqi joined #git
09:42 tarkus joined #git
09:44 cdown joined #git
09:45 Andrew_K joined #git
09:45 thebope joined #git
09:45 bongjovi joined #git
09:45 sQVe joined #git
09:50 encod3_ joined #git
09:50 Xatenev selckin: How exactly?
09:50 Xatenev selckin: We have exactly jenkins running
09:50 Xatenev selckin: I can see when it went online
09:50 Xatenev selckin: and who DEPLOYED the build
09:50 Xatenev but not who merged it into the correct branch.
09:54 cdown_ joined #git
09:56 mischat joined #git
09:58 _ng joined #git
09:59 demize joined #git
09:59 Xatenev grawity: Yea I can easily see the commit date and author :)
09:59 Xatenev grawity: But thats not what I want :)
09:59 grawity the commit date and author is exactly what you asked, though: it shows who merged it and when
10:00 Xatenev grawity: It doesnt
10:00 grawity since it shows the relevant merge commit, not the commit in question
10:00 Xatenev grawity: For example if i type in gitk to see a visualized tree
10:00 Xatenev I can see the commit there, with all the files that have been updated
10:00 Xatenev I can see the commit author and date
10:01 Xatenev But how do I know when that commit from branch X has been merged into branch Y?
10:01 Xatenev I don't know where I can see that?
10:01 achadwick joined #git
10:02 Xatenev grawity: Okay Ive typed git log etc into the conosle
10:02 jimi_ joined #git
10:02 grawity go upwards in gitk until you find a "Merge branch X" commit
10:02 flavius joined #git
10:02 Xatenev grawity: That doesn't exist
10:02 Xatenev grawity: Thats the funny thing
10:03 Xatenev grawity: I assume somebody else opened a branch on TOP of the branch in question
10:03 Xatenev and merged THAT into my HEAD
10:04 grawity then you'd have two merge commits, one "Merge branch X" (containing your commit) and one "Merge branch Y" (containing everything)
10:04 Xatenev grawity: Yea but the changes only exist in that one commit.
10:04 Xatenev Its absolutely weird
10:04 Xatenev I typed in what you suggested
10:04 Xatenev `git log --merges --first-parent $COMMIT..`
10:04 Xatenev I get: Merge branch 'dev' of repo... into dev
10:04 Xatenev as first
10:05 Xatenev then Merge branch 'Y' into dev
10:05 mniip joined #git
10:05 Xatenev Dev is my HEAD btw
10:05 Xatenev and merge branch 'X' into dev
10:05 Xatenev I can screenshot it, gimme a second
10:05 grawity try also `git log --merges --ancestry-path $COMMIT..`
10:05 grawity I'm more interested in the gitk screenshot in this case
10:06 Xatenev grawity: http://i.imgur.com/WdqyBti.png
10:06 Xatenev Sec
10:06 rnsanchez joined #git
10:06 Xatenev Ancestry path gives the >exact< same output.
10:07 lindenle joined #git
10:07 Jackneill_ joined #git
10:07 Xatenev grawity: http://i.imgur.com/kU60z0I.png
10:07 Xatenev grawity: Commit selected in the image
10:07 Xatenev grawity: When did it get merged into the 'dev'
10:07 sybariten joined #git
10:07 Xatenev seriously im absolutely confused on that one :D
10:08 grawity it first got merged into 'dev' on Dec 9
10:08 KV joined #git
10:08 Xatenev grawity: Where exactly?
10:08 Xatenev grawity: The JC-520 thing?
10:09 Xatenev 2016-12-09 12:11:33 ?
10:09 grawity the "Merge branch 'dev'" commit by one Gerdt Steltner
10:09 Xatenev grawity: Weird, that is a pull or not?
10:09 Xatenev grawity: Merge branch 'dev' of repo... into 'dev'
10:09 Xatenev grawity: That means "pull origin branch and merge it into my dev branch" doesn't it?
10:09 grawity it probably does, yes
10:09 Kulrak joined #git
10:09 Kulrak joined #git
10:10 grawity as for when it appeared on the server's "dev" branch....
10:10 Xatenev So in the end I can't see when it got merged and from who
10:10 Xatenev because I am going from my pc?
10:10 Xatenev Because a pull is probably not the cause for the merge into the dev, is it :P
10:10 Xatenev Would it help if I type some git commands at the server directly? I got ssh access.
10:11 grawity merge into the *shared* dev? no, it isn't
10:11 grawity I'm guessing Sören Voß typed `git pull JC-506` while having checked out "dev"
10:11 Xatenev grawity: Yea merge into the shared dev
10:11 grawity and ended up fast-forwarding JC-506 onto dev
10:11 grawity and then pushed that to the server
10:11 Xatenev Why do you think that person did it?
10:11 Xatenev Because 2016-12-12 ?
10:12 grawity because it's their commits that follow
10:12 Xatenev Right
10:12 Ozymandy joined #git
10:12 grawity i.e. they git-pulled, didn't notice, kept working
10:12 grawity anyway – server access might be helpful if the server has "reflogs" enabled
10:12 grawity but I don't think that's the default on servers
10:12 Xatenev grawity: Let me check this quick!
10:12 grawity and actually regular reflogs still don't show who pushed it, only what & when
10:13 grawity now if e.g. gitolite/gitorious/gitlab/whatever has custom logging, that would be more informative
10:13 Ozymandy Hi, can I get text file with all code of files on my repo?
10:13 grawity or, ask soeren.voss to check `git reflog dev` for any accidental pulls/merges.
10:13 Ozymandy Without copy+paste
10:13 Xatenev grawity: From dev?
10:14 Xatenev grawity: git checkout dev; git reflog dev ?
10:14 grawity doesn't depend on that
10:14 Xatenev Oh it doesn't work
10:14 grawity it just reads the specified branch's reflog
10:14 Xatenev git reflog dev "ambigous argument dev"
10:14 grawity refs/heads/dev maybe
10:14 _ikke_ Ozymandy: for F in $(git ls-files); do cat "$F"; done > code.txt
10:15 Xatenev grawity: Yop
10:15 grawity (anyway, it would have to be done on their local repo, not yours -- the *ref*log is personal to every repo)
10:15 Xatenev grawity: That prints the last 20 things done on dev?
10:15 Ozymandy _ikke_: in git bash?
10:15 grawity yeah, it does
10:15 Xatenev Gotta google how to increase that
10:15 grawity there's also a similar reflog for HEAD
10:15 Xatenev to show last 100 or something maybe
10:15 _ikke_ Ozymandy: yes
10:15 grawity oh it prints as many as it has
10:15 Xatenev ah ok
10:15 grawity the only limits are date-based
10:15 grawity 4 weeks I think?
10:15 grawity unless manually purged or edited, that is.
10:15 Xatenev grawity: While {0} being the oldest or the youngest?
10:15 Xatenev Probably the youngest
10:16 grawity {0} is the latest entry
10:16 howitdo joined #git
10:16 howitdo joined #git
10:16 grawity (there is also similar `git log -g` which shows the exact same log verbosely)
10:16 hahuang62 joined #git
10:17 grawity so anyway, if a pull -- even a fast-forward, not necessarily a merge -- was done, it shows up in the reflog
10:17 grawity useful for diffing HEAD@{0}..HEAD, really
10:18 arnsa joined #git
10:18 Kaisyu joined #git
10:18 _ikke_ the reflog expiry is 90 days
10:19 grawity ah so ~12 weeks
10:20 dminuoso _ikke_: How is the reflog expiry triggered? Do git commands do this?
10:20 Dragonbird joined #git
10:20 _ikke_ dminuoso: Yes, some commands automatically trigger gc tasks when git seems it's necessary
10:21 dminuoso So if I don't interact with my git repository for a year, the reflog will still be there I guess?
10:21 _ikke_ dminuoso: correct
10:22 _ikke_ you can even increase gc.reflogExpire
10:25 ProbabilityMoon joined #git
10:26 Silox| joined #git
10:31 jaguarmagenta joined #git
10:31 cdown joined #git
10:31 breezy_ joined #git
10:31 Xatenev grawity: WE FOUND IT :p
10:31 derk0pf joined #git
10:31 Xatenev grawity: Sören Voss created the branch JC-498 on top of JC-506
10:32 Xatenev So JC-506 was the parent of JC-498
10:32 Xatenev Yea.. that ended bad xd
10:32 Xatenev Thanks for the support!:)
10:32 kyan joined #git
10:36 sweatsuit joined #git
10:37 Xatenev left #git
10:38 Gloomy joined #git
10:38 synthmeat joined #git
10:40 WaReZ joined #git
10:45 thebope joined #git
10:47 Cavallari joined #git
10:48 YuGiOhJCJ joined #git
10:49 mehola joined #git
10:50 tens0r joined #git
10:50 mehola joined #git
10:51 mehola joined #git
10:52 mehola joined #git
10:52 murgi joined #git
10:53 mehola joined #git
10:54 czart joined #git
11:03 Sample joined #git
11:03 Noodlewitt joined #git
11:05 _ng joined #git
11:06 d0nn1e joined #git
11:07 venmx joined #git
11:10 zesty joined #git
11:11 arnsa joined #git
11:15 Dragonbird joined #git
11:15 derk0pf joined #git
11:15 Gloomy joined #git
11:16 safe joined #git
11:16 zeroed joined #git
11:19 mazert joined #git
11:19 drbean joined #git
11:20 topcat joined #git
11:20 Gloomy joined #git
11:20 topcat does git subtree not have push on windows? I just get "Unpexpected option: push" git subtree push --prefix public origin gh-pages
11:20 arnsa joined #git
11:21 converge joined #git
11:23 murgi joined #git
11:24 j`ey joined #git
11:24 j`ey is there a way to undo 'git stash pop'?
11:24 j`ey it caused conflicts, and I realised I didnt want to do that
11:24 selckin git stash ?
11:25 j`ey you cant git stash, after git stash pop caused conflicts
11:25 selckin did you have changes in the working dir?
11:25 selckin (you want to keep)
11:25 j`ey no
11:25 selckin git reset HEAD .; git checkout -- .
11:26 j`ey i want to keep the stashed stuff
11:26 selckin stash is not removed when it conflicts
11:27 j`ey ah, good
11:27 j`ey so if pop conflicts, I can just reset like you said
11:27 selckin yea, git stash list/show to check
11:30 romerocesar joined #git
11:32 topcat is subtree even installed with git?
11:32 selckin isn't it a 3rd party extention ?
11:33 selckin hmm gues not i'll be quiet
11:33 topcat the only thing that works git git subtree --help.
11:33 topcat the rest is Unexpected option: push
11:33 j`ey left #git
11:34 Deamon joined #git
11:35 selckin https://github.com/git/git/blob/maste​r/contrib/subtree/git-subtree.sh#L144
11:35 selckin what exactly are you running?
11:36 topcat I've even copied subtree from the github repo now but still nothing. Does it even work on windows or not?
11:36 JeroenT joined #git
11:36 topcat git subtree push --prefix public origin gh-pages Unexpected option: push from powershell, cmd or git bash
11:36 selckin try with bash -x if you wan to debug
11:36 buffal0 joined #git
11:36 topcat git subtree is empty an line. git add "unexpeccet option"
11:36 mp3 joined #git
11:38 lg188 joined #git
11:38 davimore joined #git
11:39 deadnull joined #git
11:39 dimi1947 joined #git
11:40 lg188 hey, I'm curious if I want to implement a way of filtering changes to a specific line by putting a specific comment on it, are those smudge and clean filters the best way ?
11:40 selckin !config
11:40 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
11:41 Jackneill_ joined #git
11:42 lg188 Of course it's in the config, I'm asking if I'm looking in the right direction
11:42 selckin open the link
11:42 buffffal00 joined #git
11:43 topcat selckin: first error is "core/git-subtree: line 34: git-sh-setup: No such file or directory" looks like git doesn't get some git command on the path
11:43 lg188 for 1 line, a whole file?
11:44 selckin topcat: thats because it expects to be run from the git dir like  /usr/libexec/git-core/git-sh-setup
11:46 cdown joined #git
11:46 lg188 ah, yes, I see your point
11:46 thebope joined #git
11:48 [Saint] joined #git
11:48 topcat selckin: ok now we're hanging on +++ git sh-i18n--envsubst 'usage: $dashless $USAGE'
11:51 Ordentlig joined #git
11:52 topcat is this just me? does subtree work for anyone on windows? I'm just baffled
11:52 theonefoo joined #git
11:53 Gloomy joined #git
11:54 theonefoo I am on a feature branch, made 19 commits, but in-between these commits, I merged latest develop into my feature branch. I would like to squash *my* 19 commits related to the feature branch into one commit, without touching the commits carried over from the develop branch merge (no re-hashing of commits or squashing them). `git rebase -i HEAD~19` shows me a list of all commits of mine including those that were from develop branch merges. Am I correct to
11:54 theonefoo assume that since I see the commits that aren’t from my feature branch, even squashing only mine will rehash those commits I don’t want to touch?
11:55 Sircle_ joined #git
11:55 _Vi joined #git
11:55 selckin i'd do: git rebase develop ?
11:56 Sircle_ I have many directories inside the root git directory but I only want certain directories for git to follow and ignore others. How can I do that?
11:56 selckin !gitignore
11:56 gitinfo [!gitignore_template] Github has compiled a set of good .gitignore templates, and licensed them very liberally. https://github.com/github/gitignore
11:56 Sircle_ i see if I commit and push, it says "some untracked working tree files would be overritten by pull. Please move or remove them"
11:57 topcat how do I push public/ onto gh-pages then without subtree?
11:57 grawity Sircle_: that means someone else added those files to the repo
11:58 grawity Sircle_: git cannot half-ignore files
11:58 grawity Sircle_: if they're in the repo, then they're in the repo
11:58 theonefoo selckin: git rebase develop was directed to me? unsure if it was for someone else
11:58 tobiasvl Sircle_: !ignore_tracked
11:58 gitinfo Sircle_: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
11:58 Sircle_ selckin: How do I gitignore ALL except 2 directory trees?  eg. app/ is my root . I have app/a app/b app/c app/d and so on. How to ignore ALL except app/a and app/b
11:58 selckin theonefoo: yeah, it should drop the previous merged commits since they'll be empty so you're only left with the new stuff on top of current develop
11:58 selckin !man gitignore
11:58 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
11:58 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
11:58 Sircle_ grawity:  thsoe files are not added yet
11:59 Sircle_ but the git init was doen on root
11:59 grawity they're not added *on your side*
11:59 theonefoo ok, let’s see..
11:59 grawity but they were added on the side you're trying to pull
11:59 Sircle_ grawity:  no, I see files on git page. thsoe are nto added
12:00 grawity the error message you quoted says otherwise
12:00 _ng joined #git
12:00 felher_ left #git
12:01 star_prone joined #git
12:02 converge joined #git
12:03 Curly060 joined #git
12:05 nkouevda joined #git
12:05 yohnnyjoe joined #git
12:06 venmx joined #git
12:08 askb joined #git
12:09 theonefoo selckin: ok, so that rebased all my commits on top of latest develop and got rid of the merge commits. Now there are 18 commits that belong to me in this feature branch. I want to squash them all to one commit, which I usually do by running `git rebase -i HEAD~<COMMIT_NUMBER>` where COMMIT_NUMBER is 18 in this case. Squashing all latest commits to the first feature-branch commit yields: “You asked to amend the most recent commit, but doing so would ma
12:09 theonefoo empty.” Is this because I should run `git rebase -i HEAD~19` to account for that most recent commit?
12:10 los joined #git
12:10 theonefoo if I do that, the first commit I see in the interactive rebase prompt is the very last commit before my branch-related commits. I don’t want to change the hash of that one. Would leaving it as “pick” avoid a re-hash?
12:11 zeroed joined #git
12:12 fahadash joined #git
12:14 Hink joined #git
12:14 osse theonefoo: The only way to avoid rehashing is not changing it or any before it
12:14 cbreak theonefoo: pick means "cherry-pick"
12:14 cbreak it will change the hash since it changes the committer date, and likely the parent hash
12:16 ismithers joined #git
12:17 hahuang62 joined #git
12:19 dsdeiz joined #git
12:22 davimore_ joined #git
12:22 mischat joined #git
12:22 theonefoo hm
12:23 ismithers joined #git
12:24 QuestionTime joined #git
12:25 cgundersson joined #git
12:27 hussam joined #git
12:28 cdown joined #git
12:29 star_prone joined #git
12:31 murgi joined #git
12:31 jaguarmagenta joined #git
12:34 theonefoo aha
12:34 theonefoo I had a commit and then a revert of that commit right after
12:34 theonefoo so I had to drop those two, then squash
12:34 theonefoo all good now :)
12:34 theonefoo cbreak: thanks, you stopped me from doing something stupid :D
12:36 spaolo joined #git
12:36 Oadp joined #git
12:36 jaguarmagenta joined #git
12:37 _ng joined #git
12:39 kyan joined #git
12:45 navidr joined #git
12:47 star_prone joined #git
12:49 shinnya joined #git
12:50 ahmedelgabri joined #git
12:50 chele joined #git
12:52 encod3 joined #git
12:53 cdown joined #git
12:55 user_ joined #git
12:55 user_ joined #git
12:56 ojdo joined #git
12:59 mazert joined #git
12:59 Darcidride joined #git
12:59 user_ joined #git
12:59 jstimm joined #git
13:01 user_ joined #git
13:02 Sample joined #git
13:02 QuestionTime joined #git
13:03 QuestionTime joined #git
13:06 synthroid joined #git
13:08 chll_ joined #git
13:08 sentinal8473 joined #git
13:09 near_realtime left #git
13:09 justanotheruser joined #git
13:09 sdothum joined #git
13:11 johnmilton joined #git
13:11 jaguarmagenta joined #git
13:14 unbalanced joined #git
13:14 overlord_tm joined #git
13:15 jstimm joined #git
13:15 nkouevda joined #git
13:19 SaberArthur joined #git
13:19 [Saint] joined #git
13:19 _ng joined #git
13:23 JeroenT joined #git
13:23 cdown joined #git
13:25 denisMone joined #git
13:26 DolphinDream joined #git
13:29 b3kN joined #git
13:29 b3kN joined #git
13:31 JeroenT joined #git
13:32 ier joined #git
13:33 tmsmith joined #git
13:34 khfeng_ joined #git
13:35 cgundersson joined #git
13:35 inflames joined #git
13:35 guest___ joined #git
13:35 JeroenT_ joined #git
13:37 treehug88 joined #git
13:37 murgi joined #git
13:38 fnwz joined #git
13:39 fmcgeough joined #git
13:47 jaafar joined #git
13:47 overlord_tm joined #git
13:48 [0xAA] joined #git
13:48 thebope joined #git
13:54 near_realtime joined #git
13:54 khfeng_ joined #git
13:55 aruns joined #git
14:01 bsanford joined #git
14:02 rnsanchez_ joined #git
14:04 mischat joined #git
14:05 Codorono joined #git
14:06 nickthetait joined #git
14:08 sbulage joined #git
14:09 Gsham joined #git
14:09 jeffreylevesque joined #git
14:11 Zamerick joined #git
14:11 ShekharReddy joined #git
14:12 cdg joined #git
14:13 theonefoo joined #git
14:15 Codorono left #git
14:15 Dragonbird joined #git
14:16 ispn joined #git
14:16 ispnsn joined #git
14:17 ExoUNX joined #git
14:17 Gsham joined #git
14:17 ispn joined #git
14:18 hahuang62 joined #git
14:18 davimore__ joined #git
14:18 JeroenT joined #git
14:19 jimi_ joined #git
14:23 johnmilton joined #git
14:26 GodGinrai joined #git
14:26 pdgwien joined #git
14:27 nanga joined #git
14:27 nanga joined #git
14:27 GodGinrai joined #git
14:30 marcogmonteiro joined #git
14:32 lindenle joined #git
14:34 jimi_ joined #git
14:35 cdown joined #git
14:37 armin_ joined #git
14:38 nickabbey joined #git
14:38 zivester joined #git
14:39 Gloomy joined #git
14:39 thebope joined #git
14:39 armin joined #git
14:40 BrownBear joined #git
14:41 armin joined #git
14:41 mar77i joined #git
14:43 cdg_ joined #git
14:45 Probabil_ joined #git
14:46 boombatower joined #git
14:48 murgi joined #git
14:48 armin joined #git
14:49 Probabi__ joined #git
14:50 jimi_sanchez joined #git
14:50 mar77i_ joined #git
14:51 cdown joined #git
14:52 griffindy joined #git
14:54 cmalmber joined #git
14:54 bannakaffalatta joined #git
14:54 floatingman joined #git
14:55 masuberu joined #git
14:56 a_thakur joined #git
14:57 AaronMT joined #git
14:57 ki0 joined #git
14:57 fees joined #git
15:01 scardonian joined #git
15:02 anonymuse joined #git
15:02 mar77i joined #git
15:04 floatingman joined #git
15:07 tarkus joined #git
15:07 jimi joined #git
15:09 jimi joined #git
15:10 al-damiri joined #git
15:10 mahendratech joined #git
15:11 jstimm joined #git
15:11 mar77i_ joined #git
15:12 ck joined #git
15:12 ck left #git
15:13 otisZart joined #git
15:13 otisZart Hello people :-)
15:14 cqi joined #git
15:14 otisZart I am new to the great git world. I wanted to setup a heroku wordpress instance, then I cloned this: https://github.com/mhoofman/wordpress-heroku <- using SourceTree, but now I am totally scared by the fact of making new commits. will they be pushed to the main project? I want of course to put my plugins & themes, but don't want to make trouble on the source
15:14 alexsystemf____ joined #git
15:15 otisZart Any info would be appreciated, I tried googling a bit but it's quite difficult to center the problem
15:16 overlord_tm joined #git
15:16 nkouevda joined #git
15:16 e14 joined #git
15:16 otisZart so My questions 1) When cloning an 'official' repo, and modifying it, will my changes be pushed to the 'official' repo when committing? 2) Will my repo stay updated with 'Official' repo updates, independently from my plugins/themes and other changes?
15:16 ikonia otisZart: you won't have permissions to push to the main project
15:16 manuels joined #git
15:17 ikonia otisZart: if you're making changes, you can't stay up to date as your pulls going forward will create conflict so you'll need to resolve any conflicts
15:17 ejb joined #git
15:18 otisZart ikonia so what to do in my case? I'd like to have an updated repo of course, but to develop my own blog/plugins/themes independetly - how to achieve this?
15:18 otisZart and of course to have everything staged and source controlled
15:18 ikonia branch
15:18 ikonia but what you want isnt' really possible if you think about it
15:19 ikonia if you are modifying core files (not new theme files personal to you) how can you modify something, but then expect the upstream project to keep you up to date without being aware of your changes
15:19 Es0teric joined #git
15:19 otisZart ikonia I won't be modifying any core file, thats ok - I will just put my plugins/themes in it
15:19 ikonia then thats fine
15:20 converge joined #git
15:20 converge joined #git
15:20 ikonia as your own themes/plugins won't have directories in the upstream project
15:20 ikonia so that won't create a conflict
15:20 ikonia the easy option is to maintain your themes/plugins seperate to the core project
15:21 otisZart ikonia does your 'separate' include the fact that the source project has /wp-content/plugins/ folder created, and I can make my /wp-content/plugins/my-plugin/  ?
15:22 ikonia why would you put that in the upstream project source tree
15:22 ikonia surely that would be your own personal project and repo to maintain
15:23 jimi joined #git
15:23 mar77i_ joined #git
15:23 otisZart I get what you mean. so would you enlighten me on how to achieve this? 1. Updated core 2. My own plugins/thmes 3. Both staged differently, (1) with official repo and (2) wiht my edits
15:23 ikonia otisZart: just clone the core repo
15:23 ikonia that will keep the main product up to date.
15:23 LionsMane joined #git
15:23 ikonia then create 2 new repos on a git server somewhere
15:24 ikonia then check them out in wp-content/plugins/$your_project
15:24 brent__ joined #git
15:24 ikonia that way you can commit, push and track changes to your own project
15:24 otisZart I didn't fully get what you mean, probably my fault, but that seems messy?
15:24 Ordentlig joined #git
15:24 ikonia how is that messy
15:24 ikonia 1.) checkout project
15:25 ikonia 2.) create new project in git repo for your theme
15:25 ikonia 3.) checkout your project in the themes-directory
15:26 jimi_sanchez joined #git
15:26 nickabbey joined #git
15:26 otisZart ikonia I am reading more about the term you used to understand better
15:26 ikonia what term ?
15:27 otisZart checkout
15:27 ikonia clone
15:27 ikonia check out
15:27 ayogi joined #git
15:27 dmpeters63 joined #git
15:27 Khisanth joined #git
15:30 thebope_ joined #git
15:31 romerocesar joined #git
15:32 jimi_sanchez joined #git
15:34 ash_workz joined #git
15:35 mar77i joined #git
15:35 mikecmpbll joined #git
15:36 thebope joined #git
15:40 [gmi] joined #git
15:41 senaps joined #git
15:41 nettoweb joined #git
15:41 senaps joined #git
15:42 thebope_ joined #git
15:42 otisZart ikonia it took me 10 mins to understand but maybe I got it. 1) clone https://github.com/mhoofman/wordpress-heroku in /OfficialRepoDirectory 2) Create a separate new project in a /SeparateMainDirectory/ 3) Clone /SeparateMainDirectory/ inside my /OfficialRepoDirectory/Themes/
15:42 otisZart I hope that's it
15:42 nanga joined #git
15:42 senaps joined #git
15:42 Stummi left #git
15:43 mar77i_ joined #git
15:44 Darren_ joined #git
15:44 thebope joined #git
15:45 steelsw0rd joined #git
15:46 jimi_ joined #git
15:47 raspado joined #git
15:48 nanga joined #git
15:50 [0xAA] joined #git
15:50 thebope joined #git
15:51 systemovich joined #git
15:52 Es0teric joined #git
15:52 mar77i_ joined #git
15:52 otisZart Can anyone please show me the steps to: 1) clone https://github.com/mhoofman/wordpress-heroku 2) Make my custom new folders and work/version them independently from master (So I can write my themes and plugins) 3) have master synched with latest core updates
15:52 Cavallari joined #git
15:53 otisZart It may seems easy but I haven't yet solved it .. thanks for the help
15:53 NeverDie joined #git
15:54 [0xAA] joined #git
15:54 tarkus joined #git
15:54 kfoonamalik joined #git
15:55 rominronin joined #git
15:55 [0xAA] joined #git
15:56 Dougie187 joined #git
15:56 subhojit777 joined #git
15:59 star_prone joined #git
16:03 cdown joined #git
16:03 BadSnappa joined #git
16:03 FreakySneaky joined #git
16:04 GodGinrai joined #git
16:05 denisMone joined #git
16:05 GodGinrai joined #git
16:06 rominronin joined #git
16:07 theonefoo I have a Sequelize hook callback that is invoked after updating an Account model via `afterUpdate` hook. This callback does: `return User.findOne(…).then((user) => return sendNotification(user))`. I want to write an integration test, that when a condition is not met (not shown), hook callback does *not* invoke `sendNotification(user)`. So far, I create a test user in a test DB, create a test account associated with that user, and update that account o
16:07 theonefoo to trigger the Sequelize hook. I’ve stubbed `sendNotification()`, but the callCount is 0. Could this be because when I trigger the Sequelize hook in the test when invoking Account.update(…), I am not waiting long enough for User.findOne() to finish executing before expecting `sendNotification()` to be called in my test?
16:07 roelmonn_ joined #git
16:09 a_thakur joined #git
16:11 sigma__ joined #git
16:11 mjuszczak joined #git
16:12 dreiss joined #git
16:12 sigma__ I'm having trouble interpretting the git documentation for fetch. If I run 'git fetch' by itself, the remote tracking branches for each fetched branch will be updated, but how can I fetch just one branch and have the correct remote tracking branch updated? Or specify which remote tracking branch to update?
16:12 grawity a) update to a more recent git
16:12 sigma__ The documentation mentions "remote.<repository>.fetch", but I don't understand how to use this.
16:12 theonefoo oh my god I’m in #git
16:12 theonefoo sigh..
16:12 grawity or b) manually specify what to fetch where
16:13 GodGinrai theonefoo: indeed you are
16:13 grawity e.g. `git fetch <remote> +refs/heads/foo:refs/remotes/origin/foo`
16:13 grawity the manpage documents the refspecs
16:13 theonefoo this is the part where I go sleep
16:13 GodGinrai theonefoo: g'night, then ;)
16:13 theonefoo I wish
16:13 sigma__ grawity: Where is the documentation that explains the + in your example?
16:14 grawity also there
16:14 sigma__ In the git fetch documentation?
16:14 grawity string, the local ref that matches it is fast-forwarded using <src>. If
16:14 grawity the optional plus + is used, the local ref is updated even if it does not
16:14 grawity result in a fast-forward update.
16:14 sigma__ Thanks.
16:15 GodGinrai !spoon
16:15 gitinfo [!read] Don't expect everything to be spoon fed to you - the man pages and other documents do not bite, you need to spend some time and effort reading them.
16:15 derk0pf joined #git
16:16 sigma__ GodGinrai: It's that kind of thinking that deters some people from learning at all.
16:16 sigma__ It is very difficult for some of us to find the answers we seek. I didn't just ask for an answer, but where I can find more information.
16:16 GodGinrai sigma__: thinking that the manpages bite?
16:16 sigma__ Nope, just asking for directions.
16:16 synthroi_ joined #git
16:17 sigma__ I spend a lot of time reading man pages, and helping others find information I actually happen to know.
16:17 GodGinrai sigma__: your information was in the manpages.  All grawity did was point out the parts you didn't read
16:17 sigma__ There's a difference between that kind of help, and spoon-feeding.
16:17 sigma__ Yes, he was helpful.
16:18 GodGinrai Of course he was helpful
16:18 sigma__ I did read the entire page, but believe it or not, it's not so simple to identify when what you've read _is_ the answer you seek. Not for everyone.
16:18 Dougie187 left #git
16:18 boombatower joined #git
16:18 boombatower joined #git
16:19 GodGinrai Sure, but the "is there somewhere that explains what the + in your example does?" could have been solved by searching the manpage for +
16:19 hahuang62 joined #git
16:19 sigma__ See my last comment.
16:19 GodGinrai no, that last comment doesn't apply to that question
16:19 sigma__ Yes it does.
16:19 sigma__ I read what he quoted before he quoted it. I had no idea that's what I was even looking for.
16:19 sigma__ It didn't originally read to me the way it did once I had context.
16:19 GodGinrai You knew exactly what to look for.  You even asked him what the + does
16:20 grawity can you both just shut up
16:20 sigma__ That's how grawity was helpful.
16:21 sigma__ I'm just pointing out that accusing people of expecting to be spoon-fed does more harm than good.
16:21 snowkidind joined #git
16:21 sigma__ There is no shame in asking for help, but that kind of thing may cause some to fear asking.
16:21 mikecmpbll joined #git
16:22 GodGinrai sigma__: That's ridiculous.  If you don't encourage people to do their own research, they just become help vampires
16:23 sigma__ They should do their own research. I agree.
16:23 sigma__ I am doing mine, I just needed some help identifying what wasn't clear to me the first time around.
16:23 svm_invictvs joined #git
16:23 sigma__ Spinning my wheels, so to speak.
16:23 sigma__ Ever have the answer right in front of you, but fail to recognize it?
16:23 GodGinrai of course
16:24 sigma__ Then you must understand.
16:24 GodGinrai I think you're misunderstanding something.  Your first question, I have absolutely no problem with.  You didn't understand what the manpages were saying about fetch, and thus you seeked clarification
16:24 GodGinrai ^ that is great
16:25 GodGinrai It's asking about the + when you could've searched + in the manpage you were previously looking at that was lazy
16:25 sigma__ Ah.
16:25 sigma__ I was almost sure it was part of a different documentation in git.
16:25 sigma__ Not related to fetch directly.
16:25 sigma__ E.g. refspec page somewhere.
16:25 GodGinrai That certainly could be the case
16:25 anuxivm joined #git
16:26 sigma__ Yes, though, if I had searched the page I was already on, I'd have found it.
16:26 GodGinrai but I tend to leave such assumptions for after I search ;)
16:26 sigma__ But I won't apologize for asking.
16:26 sigma__ It saved me a lot of time, because I would've have otherwise searched the page I was on.
16:26 GodGinrai * wouldn't ?
16:26 sigma__ Wouldn't*, indeed.
16:28 tristanp joined #git
16:29 peeps[lappy] joined #git
16:32 e14 joined #git
16:33 converge joined #git
16:33 converge joined #git
16:33 _ng joined #git
16:33 vrlx joined #git
16:38 Ordentlig joined #git
16:39 tang^ joined #git
16:41 murgi joined #git
16:41 Dougie187 joined #git
16:43 cdg joined #git
16:45 overlord_tm joined #git
16:46 ahmedelgabri joined #git
16:46 nidr0x joined #git
16:48 King_Hual joined #git
16:48 Electrometro joined #git
16:51 kfoonamalik joined #git
16:54 Lauven joined #git
16:54 nickabbey joined #git
16:55 aarobc joined #git
16:56 durham joined #git
16:58 mda1 joined #git
17:00 jccn joined #git
17:00 _ng joined #git
17:02 dreampwnzor joined #git
17:04 jstein_ joined #git
17:04 thiago joined #git
17:05 murgi joined #git
17:06 theoceaniscool joined #git
17:08 rominronin joined #git
17:09 _ng joined #git
17:10 jccn joined #git
17:10 nkouevda joined #git
17:11 howitdo joined #git
17:13 jimi_sanchez joined #git
17:13 austin987 joined #git
17:15 romerocesar joined #git
17:17 tlog joined #git
17:19 jaguarmagenta joined #git
17:20 acetakwas joined #git
17:22 madewokherd joined #git
17:22 dsdeiz joined #git
17:25 Cavallari1 joined #git
17:27 NimeshNeema joined #git
17:27 algun joined #git
17:28 atomi joined #git
17:30 synthroid joined #git
17:31 cyphase joined #git
17:31 menip joined #git
17:31 LionsMane joined #git
17:31 tlaxkit joined #git
17:33 robotroll joined #git
17:34 aarobc joined #git
17:37 mar77i_ joined #git
17:38 navid_ joined #git
17:38 jaguarmagenta joined #git
17:39 danslo joined #git
17:39 e14 joined #git
17:41 lindenle joined #git
17:41 Lipp joined #git
17:45 star_prone joined #git
17:45 nickabbey joined #git
17:45 ash_workz joined #git
17:45 encod3 joined #git
17:45 Karunamon|2 left #git
17:46 jaguarmagenta joined #git
17:49 austin987 joined #git
17:49 Lipp joined #git
17:52 salamanderrake joined #git
17:52 Salander27 joined #git
17:52 mar77i joined #git
17:53 disi why doesnt git fetch have --reference?
17:53 disi (like git clone)
17:56 sigma__ left #git
17:56 svm_invictvs joined #git
17:56 vdv joined #git
17:56 theoceaniscool joined #git
17:56 hahuang62 joined #git
17:58 sea-gull_ joined #git
17:58 mda joined #git
17:58 crose joined #git
17:59 chardan joined #git
17:59 mar77i_ joined #git
17:59 guest_____ joined #git
18:00 _August_ joined #git
18:03 durham joined #git
18:05 Mutter joined #git
18:05 mar77i joined #git
18:05 pumafied joined #git
18:08 guest_____ joined #git
18:11 theoceaniscool joined #git
18:11 tnecniv joined #git
18:13 synthroi_ joined #git
18:13 BrownBear joined #git
18:14 tmsmith joined #git
18:16 dmpeters63 joined #git
18:17 Vgr_ joined #git
18:18 qqx disi: That just puts an entry in .git/info/alternates. Which needs to happen before clone actually copies data from the origin.
18:19 tmsmith joined #git
18:19 qqx For fetching additional data that can be done at any time. It also doesn't make sense to do it for only a single fetch, and the fetch command isn't expected to alter the repository configuration.
18:19 dikiaap left #git
18:19 dikiaap joined #git
18:20 freimatz joined #git
18:21 disi hmm coworkers are discussing this, and it's a little over my head. the idea behind .git/info/alternates is that it tells git where to find objects not in the local clone?
18:21 jnavila joined #git
18:21 mar77i_ joined #git
18:21 kadoban Something like that. I'm not sure when you actually use it ... it's pretty esoteric AFAIK.
18:21 disi they seem to think this would be a good idea, but i'd just like to understand it: Maybe … adding --reference to fetch might make sense (for the network transport case, i.e. the same as --reference + --disassociate with git clone)
18:22 Anja joined #git
18:22 nickabbey joined #git
18:22 FreakySneaky joined #git
18:22 disi isnt reference + disassociate what fetch already does?
18:24 qqx Fetch (unless using something like the old, dumb http protocol) negotiates with the remote to determine which objects are needed.
18:25 _Vi joined #git
18:25 MrB_ joined #git
18:25 qqx Using --reference + --disassociate would have the local git code do all of the determination of what objects need to be copied.
18:25 disi this seems like such a weird/complicated workflow
18:26 qqx I doubt that there are many cases where using that combination for a fetch would result in a noticeable performance improvement.
18:26 disi well fwiw, "It's not a big deal, just figured I could save half an hour of download time...."
18:26 romerocesar joined #git
18:27 emg joined #git
18:27 dreiss joined #git
18:27 invisbl joined #git
18:27 qqx If you're very far behind a distant repo and there's a local repo that's more up to date you can always fetch from the local one before fetching from the distant one.
18:28 qqx No need to use --reference for that.
18:28 workthrick joined #git
18:29 disi ya, that's kinda what i suggested... thanks for the info!
18:30 thebope_ joined #git
18:30 dave0x6d joined #git
18:30 mar77i joined #git
18:30 dave0x6d Is there anything like ssh-copy-id but that just uses Git instead of a shell?
18:31 grawity there's no feature like that in Git
18:31 GodGinrai dave0x6d: why do you need to do it in git?
18:31 kadoban dave0x6d: Is that the thing that copies over your stuff into authorized_keys and such? I don't think so, git usually just uses ssh commands or whatever else is appropriate itself.
18:31 grawity in fact, Git cares exactly zero about your ssh keys
18:31 nkouevda_ joined #git
18:31 dave0x6d GodGinrai: Don't have shell access.
18:32 dave0x6d grawity: Thanks, I assumed as much. =( Thought I might get lucky and amazed.
18:32 grawity then ask the repo admins
18:32 joshszep joined #git
18:32 GodGinrai ^ this
18:32 grawity dave0x6d: it'd be a bit of a security hole if Git allowed doing that on its own, even
18:32 qqx There's gitolite which manages ssh keys that are allowed to access a repository, but it has nothing to do with the normal authorized keys.
18:32 grawity now gitolite, for example, *does* keep all that stuff in an (admins-only) repo
18:32 dave0x6d grawity: probably =)
18:32 grawity but regular Git won't
18:32 GodGinrai dave0x6d: if git was able to do that, anyone with push access could give themselves access to the server for ssh
18:32 nkouevd__ joined #git
18:33 dave0x6d GodGinrai: well, you'd have to have a key in the first place.
18:33 GodGinrai dave0x6d: not really.  http urls exist
18:33 thebope joined #git
18:34 dave0x6d GodGinrai: right. In my head I was assuming you'd only be allowed to add a key if you provided a key. Should have said that out loud. =)
18:34 GodGinrai even still, that could still cause problems
18:35 GodGinrai for example
18:35 robotrolll joined #git
18:35 GodGinrai someone hacks into your system and pushes their own key using your key
18:35 workthrick hi, I have a big repo with lots (~56K) of machine-generated refs. As a part of our plumbing, we use "git ls-remote ssh://... <ref of interest>" to check whether a push is needed, but it's really slow unless the network is fast because it seems to be sending the entire list over the wire, even though only a binary yes/no is needed for a single ref. Is there a way to make it not do all that work?
18:35 GodGinrai even if you take your system, they already have access to the repo server
18:35 mar77i joined #git
18:36 dave0x6d GodGinrai: yep, agreed. I'm trying to look for a built in hardware solution for ssh keys, bit difficult on OSX.
18:36 dave0x6d GodGinrai: way off topic though, sorry :p
18:36 thebope_ joined #git
18:36 SteveCharleston joined #git
18:37 dave0x6d grawity/kadoban/GodGinrai/qqx: Thank you all for answering me, appreciate it. =)
18:37 anonymuse joined #git
18:37 decade joined #git
18:38 dave0x6d grawity: Do you know any tricks to modify authorized_keys without shell and without direct ~/.ssh/authorized_keys access?
18:38 Es0teric joined #git
18:39 Bass10 joined #git
18:41 shauna joined #git
18:41 qqx dave0x6d: That's basically asking for security holes. Anybody that knows about them probably isn't going to be sharing with arbitrary people on IRC.
18:42 dave0x6d qqx: want to hop on #r_netsec to chat? Don't want to clutter this channel up with my off-topic stuff.
18:42 Bass10 joined #git
18:42 dave0x6d or ##linux
18:42 GodGinrai dave0x6d: I know a great way.  Ask the sysadmins to do it.
18:42 GodGinrai dave0x6d: it is their job to do so.  And if you want to do it yourself, then you should be asking for access to do so
18:42 qqx dave0x6d: Not looking to join any more channels.
18:43 [0xAA] joined #git
18:43 donovank17 joined #git
18:43 donovank17 left #git
18:43 grawity dave0x6d: not without the server admins' involvement, no
18:43 ki0 joined #git
18:44 dave0x6d GodGinrai: I'm trying to use my ed25519 key instead of RSA, it's totally not the sysadmin's job to get that to work ;P
18:45 qqx dave0x6d: If they prevent you (or just don't provide a way) from modifying your own authorized keys, I'd say it is their job.
18:45 dave0x6d qqx: they don't.
18:45 dave0x6d not intentionally anyway. https://github.com/apache/mina-sshd/commit​/1875912eb1ba1cdbf1535f5b012df41b3f8efd73
18:46 dave0x6d looks like the backend is fine with ED25519, web UI refuses it though.
18:46 piling joined #git
18:46 piling hi everyone
18:47 qqx Sounds like that falls into the category of them not providing a way.
18:47 piling how can i open PR with specific commit ?
18:47 dave0x6d piling: pull requests are a github thing, not git.
18:47 aard_ joined #git
18:47 grawity they are a fairly generic thing
18:47 grawity but if you *do* mean github pull requests, then there's no built-in git command for that
18:47 grawity (there are extensions like "hub" or "git-spindle" though)
18:48 piling dave0x6d: i thought you guys can help me wt that
18:48 nanga joined #git
18:48 dave0x6d piling: to answer your question, you should create a new branch with only the specific commit you want in the pull request.
18:48 dave0x6d make sense?
18:49 piling yes, i know that. i thought i could do that without creating new branch :/
18:49 piling thanks anyway.
18:50 nanga joined #git
18:51 r4nd0m-0ne joined #git
18:51 ahmed_elgabri joined #git
18:52 cspotcode joined #git
18:52 GodGinrai dave0x6d: qqx is right, this is a problem of them not providing a way for you to do it on your own.  Hence, it *is* their job to do it.
18:52 Olipro joined #git
18:53 nanga joined #git
18:54 meg_m joined #git
18:54 Olipro joined #git
18:55 jmpp joined #git
18:56 Limes_ joined #git
18:58 salamanderrake joined #git
18:58 workthrick any takers?
18:59 tnecniv_ joined #git
19:00 dsantiago joined #git
19:00 qqx workthrick: Yeah, the current git protocols will always send the entire list of refs. There's been some design work toward changing that, but IIRC nothing really in code.
19:00 jimi_sanchez joined #git
19:01 dsantiago joined #git
19:01 workthrick qqx: so right now, the answer is "I'm out of luck"?
19:01 mikecmpbll joined #git
19:02 qqx workthrick: Unless you can move those machine-generated refs into a different repo.
19:02 workthrick qqx: it's the machine-generated ones we're checking against, so I'm not sure that'd help much
19:03 qqx workthrick: Then yes I think you're out of luck for now.
19:03 workthrick qqx: OK, thanks!
19:03 Sample joined #git
19:07 mjuszczak joined #git
19:08 nickabbey joined #git
19:08 jimi_sanchez joined #git
19:09 thebope joined #git
19:09 nd joined #git
19:09 gdg joined #git
19:10 Lipp_ joined #git
19:10 gdg is it possible to automatically pull the last commit of each day in for example a month?
19:11 gdg an user may do multiple commits a day, I am interested in the last commit of each day on a specific period
19:11 gdg (and of course, I want to script the thing)
19:13 duderonomy joined #git
19:13 JamesBaxter joined #git
19:14 robics joined #git
19:15 _ikke_ You fetch all commits locally, then you can watch whatever commits you're interested in with git log
19:15 finalbeta joined #git
19:15 arunpyasi joined #git
19:18 Sasazuka joined #git
19:18 ktoverso joined #git
19:18 mar77i_ joined #git
19:18 ReptilianBrain joined #git
19:19 GodGinrai gdg: follow what _ikke_ suggested, and you should be fine
19:19 anonymuse joined #git
19:20 gdg _ikke_, GodGinrai: ok, but is there any builtin command or standard practice?
19:20 GodGinrai gdg: git-fetch and git-log
19:20 gdg I can postprocess the logs but
19:20 GodGinrai are built-in commands
19:20 gdg ok
19:20 joki joined #git
19:20 gdg those are really basic
19:20 GodGinrai That's unix philosophy
19:20 gdg but I assume that there is not a builtin
19:21 jimi_sanchez joined #git
19:21 gdg no problem actually
19:21 gdg I wanted to be sure not to reinvent the wheel
19:21 GodGinrai to do something as specific as show the last commit from a dev on any particular day? No
19:21 GodGinrai there is not a built-in that specific
19:21 gdg ok
19:21 gdg thank you
19:21 dreiss joined #git
19:22 InfoTest joined #git
19:23 jimi_sanchez joined #git
19:25 jedix joined #git
19:26 nettoweb joined #git
19:26 jedix why is git format-patch using different emails than git commit -s ?
19:26 jedix what am I doing wrong here?
19:26 travelion joined #git
19:28 ejb joined #git
19:29 gdg actually, this may work
19:29 gdg for i in $(seq 1 13); do git log --until=2016-12-$i -n 1; done
19:29 gdg or something similar
19:30 gdg for i in $(seq 1 15); do git log --since=2016-12-$(expr $i - 1) --until=2016-12-$i -n 1; done
19:31 GodGinrai jedix: as I understand it, format-patch uses the email of the committer, so if you are not the committer for a commit you are formatting a patch for, then it would not have your email
19:31 nettoweb joined #git
19:32 nettoweb joined #git
19:32 GodGinrai gdg: that looks like it should work.
19:32 gdg yeah it works!
19:32 jedix GodGinrai: I am the committer
19:33 tnecniv joined #git
19:33 jedix it's using my private email isntead of the one I ahve set for my company..
19:33 jedix BUT the signed-off has the right one
19:33 jedix it may not have been set durign the inital clone correctly..
19:34 GodGinrai jedix: check your repo git config?
19:36 cyan__ joined #git
19:36 cagedwisdom joined #git
19:37 jccn joined #git
19:38 nos09 joined #git
19:38 nkouevda joined #git
19:39 nos09 I have my private git repositories with ssh enabled. I want to move all of them (15 or some ..) to my new GitLab docker instance. Do i have to clone them all to the local machine and then push them to new Gitlab ?
19:39 Neelixx joined #git
19:40 nos09 what would be best way to migrate existing repos on private server to gitlab private instance ?
19:40 Neelixx So, I made a mistake due to insomnia.  :)  If I did a “git checkout .”, how do I undo it?
19:40 Neelixx @nos09 git clone?
19:41 dminuoso !reflog
19:41 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
19:41 _ikke_ nos09: If you have direct access, you can also directly push from the repos
19:41 dminuoso Neelixx: ^-
19:41 Neelixx That looks sweet.  Thanks dminuoso.  Will try!
19:41 qqx dminuoso: I wouldn't expect the reflog to help there.
19:41 dminuoso Neelixx: You probably only need to git reset though
19:41 nos09 _ikke_: i have direct access to the git server root user
19:41 nos09 git uses git-shell
19:41 nettoweb1 joined #git
19:42 _ikke_ Righ
19:42 qqx Neelixx: I don't think there's a good way to recover from that unfortunately.
19:42 nos09 _ikke_: but how do i do that exactly ? can i just copy them to new server ?
19:42 _ikke_ nos09: Just add the new server as a remote and push
19:42 Neelixx qqx: Yeah, I was afraid of that.  Lack of sleep.  :)  It’s just a few hours of work, though.  2nd time is always better, right?
19:43 _ikke_ right
19:43 jnavila joined #git
19:44 jedix GodGinrai: there is no email in my repo git config..
19:44 nos09 _ikke_: just to be clear. 1. login to the Git server. 2. move to /GIT-HOME/ and into every project dir (example.git/) and add new gitlab server as remote ? and 3. push orgin ?
19:44 GodGinrai Neelixx: are you from the OpenPandora community?
19:44 nos09 _ikke_: i m a little new to git ..
19:44 GodGinrai jedix: :\
19:44 Neelixx @GodGinrai no
19:44 GodGinrai k
19:45 Neelixx But, I have that face.  I can understand why you ask.
19:45 Neelixx :P
19:45 GodGinrai lol
19:45 altendky joined #git
19:46 [0xAA] joined #git
19:46 thebope joined #git
19:46 alexsystemf____ joined #git
19:47 paul424 joined #git
19:47 Atm0spher1c joined #git
19:48 [0xAA] joined #git
19:49 finalbeta joined #git
19:50 mar77i joined #git
19:50 zzz joined #git
19:51 Es0teric joined #git
19:51 SteffanW joined #git
19:52 cgundersson joined #git
19:53 enjunear[m] joined #git
19:53 venmx joined #git
19:55 Olipro joined #git
19:58 zeroed joined #git
19:58 mar77i_ joined #git
19:59 finster joined #git
19:59 synthroid joined #git
19:59 timothy joined #git
19:59 finster hello all. using git 2.11 on osx: is it possible to selectively stash three out of five changed files?
20:00 misha joined #git
20:00 nanga joined #git
20:01 qqx finster: No, stash can't be limited by files. You may be able to `git add` the files you don't want to stash, and then use `git stash --keep-index`.
20:01 finster qqx: okay, thanks!
20:02 kedare joined #git
20:03 GodGinrai finster: what is your use-case for stashing only certain files?
20:03 nanga joined #git
20:03 kyan joined #git
20:03 alex1a joined #git
20:04 GodGinrai finster: if you don't want the changes to the other 2 files, then you could `git checkout HEAD -- file1 file2`
20:04 GodGinrai then `git stash`
20:04 dreiss joined #git
20:04 grawity that throws away the changes though
20:04 finster GodGinrai: solved it elsewhere
20:04 GodGinrai grawity: I'm assuming that's what he wants if he only wants to stash certain files
20:05 PCatinean_ joined #git
20:07 finster i floated over three files into a feature branch and edited two more files. now i needed to switch to master back again. solution: commit two files and float back again. the two committed files can later be squashed into one meaningful commit
20:07 finster does that sound reasonable?
20:07 finster !xyproblem
20:08 GodGinrai finster: here, the factoid is !xy
20:08 gitinfo finster: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
20:08 GodGinrai finster: and sure, that sounds like a reasonable solution
20:09 aidalgol joined #git
20:09 finster thanks again guys
20:10 finster left #git
20:10 mar77i joined #git
20:11 Ryanar joined #git
20:15 thomassgn joined #git
20:15 topdownjimmy joined #git
20:15 ktoverso joined #git
20:15 thomassgn is there any way of making git use lsh instead of ssh?
20:15 topdownjimmy Is it possible to merge/rebase a subdirectory of Repo B into the root directory of Repo B?
20:15 grawity thomassgn: export GIT_SSH=lsh
20:16 grawity ...is lsh even maintained anymore?
20:16 topdownjimmy er, into the root directory of Repo A
20:16 grawity topdownjimmy: do you want to make a new repo out of the subdir, or what
20:16 grawity regular merging already deals with whole-directory moves to some extent
20:16 grawity it's not uncommon
20:16 fahadash joined #git
20:17 topdownjimmy grawity: No, I just want the contents of the subdirectory of Repo B (whose files were once identical with those in the root of Repo A) to be played back onto Repo A
20:17 grawity still sounds like a regular merge would do
20:17 topdownjimmy grawity: I can specify a directory in git-merge?
20:18 thomassgn grawity: awesome, never checked the status of lsh, just started using it recently. Wikipedia says last update was 2013... Maybe it's not a good idea after all :)
20:19 grawity if you're looking for an openssh alternative, PuTTY (well, /usr/bin/plink) is an option
20:19 topdownjimmy grawity: I think I see what you're saying
20:24 thebope_ joined #git
20:24 askb joined #git
20:26 mar77i_ joined #git
20:28 nettoweb joined #git
20:29 Ryanar joined #git
20:30 mischat joined #git
20:30 netcarver joined #git
20:31 Sample joined #git
20:34 nickabbe_ joined #git
20:34 mrmadcat joined #git
20:35 Ardethian joined #git
20:35 nos09 joined #git
20:36 nb_bez___ joined #git
20:37 mar77i_ joined #git
20:38 Spec-Chum joined #git
20:38 mrmadcat_ joined #git
20:38 ki0_ joined #git
20:39 ktoverso joined #git
20:39 mrmadca__ joined #git
20:41 miczac joined #git
20:41 workthrick left #git
20:47 mar77i joined #git
20:48 miczac joined #git
20:49 nickabbey joined #git
20:49 mrmadcat joined #git
20:50 Ardethian joined #git
20:50 synthroi_ joined #git
20:52 aarobc joined #git
20:53 nickabbey joined #git
20:53 mar77i_ joined #git
20:54 Salander27 joined #git
20:54 cdown joined #git
20:55 jimi_ joined #git
20:57 jimi_ joined #git
20:59 vaskozl left #git
21:00 NeverDie joined #git
21:02 mar77i joined #git
21:03 nidr0x joined #git
21:05 mischat joined #git
21:05 jimi_sanchez joined #git
21:06 dsdeiz joined #git
21:07 FederationOfNULL joined #git
21:08 SteveCharleston joined #git
21:08 jimi_ joined #git
21:09 Gsham joined #git
21:10 timothy joined #git
21:10 jimi_sanchez joined #git
21:11 chardan joined #git
21:11 msonntag joined #git
21:11 howitdo joined #git
21:13 mrmadcat_ joined #git
21:13 ejb joined #git
21:13 teratorn joined #git
21:14 Impaloo joined #git
21:15 teratorn using git svn, I've pulled down changes from svn with 'git svn fetch', but how do I actually get those commits in to my local branch which is based on the remote branch which had the updates?
21:15 miczac joined #git
21:15 mrmadca__ joined #git
21:15 theoceaniscool joined #git
21:18 Impaloo joined #git
21:19 invisbl_ joined #git
21:19 SteveCharleston joined #git
21:19 nettoweb joined #git
21:19 invisbl_ joined #git
21:19 miczac joined #git
21:19 paul424 joined #git
21:21 bluezone joined #git
21:21 sangy is there a way to clone a repository without retrieving the blobs? I just want to look at the history locally
21:23 ochorocho__ joined #git
21:23 Impaloo joined #git
21:24 miczac joined #git
21:25 venmx joined #git
21:25 Masber_080 joined #git
21:27 Impaloo joined #git
21:28 mar77i_ joined #git
21:29 zzz joined #git
21:29 invisbl joined #git
21:31 thebope joined #git
21:33 thebope_ joined #git
21:34 quackgyver joined #git
21:35 moei joined #git
21:35 thebope joined #git
21:36 Olipro joined #git
21:36 joshszep joined #git
21:36 rwb joined #git
21:37 thebope_ joined #git
21:37 joshszep joined #git
21:38 ToBeCloud joined #git
21:38 joshszep joined #git
21:39 _nwkj86 joined #git
21:39 thebope joined #git
21:39 dreaddymck joined #git
21:39 joshszep joined #git
21:41 mar77i_ joined #git
21:41 joshszep joined #git
21:41 cagedwisdom joined #git
21:42 GodGinrai joined #git
21:42 joshszep joined #git
21:43 thebope joined #git
21:43 manuels joined #git
21:43 GodGinrai joined #git
21:44 e14 joined #git
21:45 mischat joined #git
21:45 mischat joined #git
21:46 nettoweb1 joined #git
21:47 nettoweb_ joined #git
21:47 thebope joined #git
21:47 johnmilton joined #git
21:49 jedix left #git
21:49 evilmquin joined #git
21:51 m0viefreak joined #git
21:51 Gsham joined #git
21:51 thebope joined #git
21:51 miczac joined #git
21:53 ahmedelgabri joined #git
21:53 inflames joined #git
21:53 thebope_ joined #git
21:55 cdg_ joined #git
21:56 aarobc joined #git
21:56 ktoverso joined #git
21:56 converge joined #git
21:56 thebope joined #git
21:56 Stadtpirat joined #git
21:57 mar77i joined #git
21:58 WayToDoor joined #git
21:58 Es0teric joined #git
21:59 riceandbeans joined #git
21:59 Stadtpirat Hey guys, I have a file in my repo called "password.txt" which is empty. The file itself should be in the repository and also clonable. But when I or someone else puts a password in the file, it should be ignored by git. I did add "password.txt" to ".gitignore" but any change makes "password.txt" modified. How to prevent that?
21:59 doener joined #git
21:59 miczac joined #git
22:00 riceandbeans so, please tell me if this is crazy or not, a coworker just explained to me that he clones every repo he works on again for any branch he works on to 'prevent accidentally getting any code in the other repo'
22:00 riceandbeans he says it's considered best practice, and I've NEVER heard of this before
22:00 cdg joined #git
22:00 FilipNortic_ joined #git
22:00 riceandbeans so if there's branches foo, bar, and baz he's working on, he has the repo cloned to foo/repo bar/repo baz/repo
22:01 kadoban Stadtpirat: !config applies
22:01 gitinfo Stadtpirat: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
22:01 miczac joined #git
22:01 robattila256 joined #git
22:01 kadoban riceandbeans: Don't really understand what you're saying they do
22:02 riceandbeans kadoban: ok, let's say there is branch foo and branch bar in repo baz
22:02 qqx riceandbeans: I don't think I'd call that crazy, but certainly not something that would be considered a best practice or even common.
22:02 axisys joined #git
22:03 riceandbeans he will mkdir foo; mkdir bar; cd foo; git clone http://baz; git checkout foo; cd ..; cd bar; git clone http://baz; git checkout bar
22:04 kadoban riceandbeans: Sounds fairly useless, definitely wouldn't call that a best practice.
22:04 nwkj86 joined #git
22:04 riceandbeans it sounds like not understanding how to branch properly
22:04 sea-gull_ joined #git
22:04 mar77i_ joined #git
22:04 riceandbeans I just wanted to not be the only one that thought it sounded insane, thanks
22:06 Jonathan_ joined #git
22:06 dminuoso I have 3 contiguous changes, how can I split the hunk further in a git add -p?
22:06 dminuoso (3 contiguous lines)
22:06 GodGinrai riceandbeans: sounds like this guy doesn't understand branches
22:07 GodGinrai riceandbeans: you should point him to the Pro Git book
22:07 Jonathan_ left #git
22:07 kadoban dminuoso: With the 's'plit option.
22:07 Jonathan_ joined #git
22:07 riceandbeans GodGinrai: link?
22:07 dminuoso kadoban: It just doesnt split any further.
22:08 kadoban dminuoso: Oh sorry, I meant 'e'dit
22:08 GodGinrai riceandbeans: http://www.git-scm.com/book
22:08 kadoban There'll be instructions at the end, you really just have to edit the patch, but it's fairly easy in practice.
22:09 ottodude125 joined #git
22:11 mar77i joined #git
22:11 Jonathan_ hello
22:11 gitinfo Jonathan_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
22:12 Jonathan_ I have a question about windows git installation
22:12 near_realtime left #git
22:13 Sasazuka joined #git
22:13 GodGinrai !ask
22:13 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
22:13 Jonathan_ Up until yesterday I had a working installation. I updated to 2.11.0 and now whenever I open git-bash and try to run a git command I get "bash: /mingw64/bin/git: Bad address"
22:14 Jonathan_ I've tried restarting and completely uninstalling/reinstalling but I get the same results
22:14 Jonathan_ I'm not really sure what the issue could be
22:14 Neelixx joined #git
22:14 GodGinrai Jonathan_: what does "which git" output?
22:15 Jonathan_ $ which git /mingw64/bin/git
22:15 venmx joined #git
22:15 Jonathan_ theres a new line before the /
22:16 mar77i_ joined #git
22:17 miczac joined #git
22:17 GodGinrai Jonathan_: what about `ldd $(which git)`
22:18 Jonathan_ there are 10-20 lines so I apologize for the chat spam
22:18 Jonathan_ ntdll.dll => /c/WINDOWS/SYSTEM32/ntdll.dll (0x7ffa5a050000)         KERNEL32.DLL => /c/WINDOWS/System32/KERNEL32.DLL (0x7ffa57be0000)         KERNELBASE.dll => /c/WINDOWS/System32/KERNELBASE.dll (0x7ffa56540000)         SYSFER.DLL => /c/WINDOWS/System32/SYSFER.DLL (0x66a90000)         ADVAPI32.dll => /c/WINDOWS/System32/ADVAPI32.dll (0x7ffa57b30000)         msvcrt.dll => /c/WINDOWS/System32/msvcrt.dll (0x7ffa576c0000)         s
22:19 Jonathan_ actually the paste was truncated
22:19 thebope joined #git
22:19 Jonathan_ a
22:19 kadoban Jonathan_: You should use a pastebin for such things. gist.github.com works
22:19 Jonathan_ ok thanks
22:20 shgysk8zer0 joined #git
22:20 Jonathan_ https://gist.github.com/anonymous​/568ce70f837f298ddf281d0782b87d3d
22:21 thebope_ joined #git
22:22 shgysk8zer0 left #git
22:22 kenoob joined #git
22:23 thebope joined #git
22:23 mquin joined #git
22:25 jccn joined #git
22:25 thebope joined #git
22:26 GodGinrai Jonathan_: this might be related? https://www.cygwin.com/ml/c​ygwin/2014-04/msg00477.html
22:26 ktoverso joined #git
22:26 GodGinrai Jonathan_: maybe you have some antivirus blocking the utility from running?
22:27 WayToDoor joined #git
22:27 mar77i joined #git
22:27 m0viefreak joined #git
22:27 Jonathan_ Thanks GodGinrai. I do have cygwin installed also... I'll take a look at the link you sent
22:28 hahuang62 joined #git
22:28 thebope joined #git
22:28 Neelixx joined #git
22:28 kenoob joined #git
22:28 romerocesar joined #git
22:29 kenoob joined #git
22:30 kenoob joined #git
22:30 kenoob joined #git
22:31 Jonathan_ My company installs Symantec on all of our machines... I'm updating/disabling it to see if there are any other changes. Its the only anti virus on the machine
22:33 SteveCharleston joined #git
22:34 zzz_ joined #git
22:34 SteveCharleston joined #git
22:35 SteveCharleston joined #git
22:36 star_prone joined #git
22:37 nos09 joined #git
22:39 invisbl joined #git
22:39 Noodlewitt joined #git
22:40 invisbl joined #git
22:46 Gianormagantrous joined #git
22:47 star_prone joined #git
22:48 Ram-Z joined #git
22:48 Jonathan_ GodGinrai - I've tried disabling Symantec but to no avail. It has been weeks since I have installed anything new and Symantec has always been on my machine. Maybe I will try uninstalling and reinstalling an older version
22:49 SteveCharleston joined #git
22:52 jmpp joined #git
22:52 mischat joined #git
22:53 mischat joined #git
22:54 mischat joined #git
22:54 Siegfried joined #git
22:54 mischat joined #git
22:55 mischat joined #git
22:56 nkouevda_ joined #git
22:56 mischat joined #git
22:57 mischat joined #git
22:58 mischat joined #git
22:59 mischat joined #git
23:00 _August_ joined #git
23:01 fmeerkoetter joined #git
23:08 mda1 joined #git
23:11 cdg joined #git
23:13 tmsmith joined #git
23:14 thebope joined #git
23:19 jantje joined #git
23:20 thomassgn left #git
23:24 mda joined #git
23:26 bmwill joined #git
23:29 madewokherd joined #git
23:29 Boniche joined #git
23:35 alyptik Hello, I'm trying to understand exactly what the use case of git cherry is; I've read the man but it's still kinda fuzzy to me
23:37 dminuoso alyptik: the man page has a simple yet illustrative example
23:38 Emperor_Earth_ joined #git
23:38 alyptik from what i can read it seems to do the same thing and a reverse diff?
23:38 alyptik dminuoso› or am i understanding it wrong
23:38 dsdeiz joined #git
23:39 dminuoso alyptik: Essentially you just use it to see whether your commits went upstream already or not.
23:39 alyptik ah ok, so if they are then there would be no output?
23:40 venmx joined #git
23:41 alyptik dminuoso› mostly i am confused of no output and - are the same thing
23:41 alyptik i understand the + commits
23:41 alyptik s/of/if/
23:42 thebope_ joined #git
23:44 mellernoia joined #git
23:44 Emperor_Earth__ joined #git
23:45 Neelixx joined #git
23:48 thebope joined #git
23:48 n-st joined #git
23:52 ahmed_elgabri joined #git
23:53 thebope joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary