Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-25

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

All times shown according to UTC.

Time Nick Message
00:00 Awesomecase joined #git
00:00 jasom echosystm: it stores with delta compression, not diffs, but yes it takes advantage of the fact that some objects between revisions contain redundancies
00:01 echosystm ok if i remove the actual working copy, the repo goes all the way down to 600MB
00:01 cdown joined #git
00:02 echosystm struggling to see the value in git-lfs now
00:02 jasom echosystm: you can just do a du -hs .git to get the git overhead
00:02 tgies joined #git
00:02 jasom echosystm: diffs of binary files are often inefficient (.tar is a special case; diffs of them can be quite efficient)
00:02 jasom echosystm: change it to a tar.gz and see it not work well at all
00:02 bl0w3d_0ut joined #git
00:02 eroussel joined #git
00:02 echosystm what if i use gzip --rsyncable
00:02 echosystm that's deterministic afaik
00:03 ggherdov joined #git
00:03 jasom echosystm: that might work.  It's moot for compressed binary formats like pdf though
00:04 jasom also for files that are very large, git won't work so well as I believe the delta compression loads the entire file into RAM
00:05 echosystm oh
00:05 echosystm it can't do it as a stream?
00:05 SwiftMatt joined #git
00:06 prosody joined #git
00:07 jasom echosystm: also consider something like 10s of thousands of .png files that won't delta compress.  Now consider that the artist changed the palette for all of them.  You'll basically have double the size of all of them.  LFS stores it oustide the repository so you can clone without them and get only the most recent versions out-of-band
00:07 jasom so it keeps the large files from growing the time to do a git clone
00:07 echosystm isee
00:08 truetuna joined #git
00:08 echosystm damn
00:08 echosystm ok
00:08 echosystm when i git gc i'm getting out of memory error
00:09 Derperperd joined #git
00:10 echosystm if i pack on the client before pushing to the server, will the server ever have this not-enough-memory issue?
00:10 echosystm or will it just accept the deltas
00:10 Raed joined #git
00:13 echosystm ok it doesn't look like there is much value in gzipping tars before putting them in git
00:13 dodobrain joined #git
00:14 arescorpio joined #git
00:14 echosystm i'm getting 493mb vs. 569mb compressed/uncompressed
00:14 echosystm also git seems to have some intelligence around doing the delta compression on tar files, as it didnt run out of memory
00:14 echosystm it did run out of memory on the gzipped tar files
00:15 dodobrain joined #git
00:16 sagerdearia joined #git
00:19 tribly joined #git
00:20 babilen joined #git
00:20 vmiklos joined #git
00:20 utrack joined #git
00:21 ujjain joined #git
00:21 ujjain joined #git
00:26 same_ol_2eez joined #git
00:26 knittl joined #git
00:26 knittl joined #git
00:26 Bucciarati_ joined #git
00:26 mrpackethead joined #git
00:27 Soliton_ joined #git
00:27 quizzi joined #git
00:28 kloeri_ joined #git
00:28 WakiMiko_ joined #git
00:28 stfn1 joined #git
00:29 roflincopter joined #git
00:29 _flow__ joined #git
00:29 hariel so im reading 'git pocket guide'.. what are the major changes since the release of this book that i should be aware of?
00:29 jstimm joined #git
00:29 jstimm joined #git
00:29 MeltedLux joined #git
00:29 xall joined #git
00:33 rcn joined #git
00:33 ghostlight joined #git
00:34 Rampages joined #git
00:35 Ahmed90 joined #git
00:36 jeffreylevesque joined #git
00:36 Darren_ joined #git
00:37 tgies joined #git
00:37 llamapixel hariel I would read the version log from the book upwards to todays stable version
00:37 llamapixel http://chimera.labs.oreilly.com/books/1230000000561
00:37 llamapixel I am assuming 1.8.2 upwards
00:38 llamapixel https://git-scm.com/docs/git-clone/1.8.2
00:40 romerocesar joined #git
00:42 hariel i see, tyvm
00:42 tgies joined #git
00:44 llamapixel np
00:45 fuchstronaut joined #git
00:45 llamapixel The release notes might be easier to compare. https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.10.1.txt
00:45 perrier-jouet joined #git
00:46 qpdb joined #git
00:47 lolmac joined #git
00:47 tgies joined #git
00:48 fstd_ joined #git
00:49 alex1a joined #git
00:50 cdown joined #git
00:50 geoid___ joined #git
00:52 dreiss joined #git
00:52 tgies joined #git
00:52 mischat joined #git
00:53 irqq_ joined #git
00:54 DeltaHeavy joined #git
00:55 Shentino joined #git
00:57 tgies joined #git
00:58 Remram joined #git
01:01 malcon joined #git
01:01 brokensyntax joined #git
01:02 tgies joined #git
01:04 romerocesar joined #git
01:05 bongobrown joined #git
01:06 d^sh joined #git
01:07 tgies joined #git
01:09 nawwmz joined #git
01:10 svm_invictvs joined #git
01:15 jottr_ joined #git
01:15 qws-user-1228 joined #git
01:16 Maggie joined #git
01:17 tgies joined #git
01:17 bongobrown left #git
01:20 cagedwisdom joined #git
01:20 perrier-jouet joined #git
01:21 pwnz0r joined #git
01:22 tgies joined #git
01:27 Rodya_ joined #git
01:28 yaki29 joined #git
01:29 romerocesar joined #git
01:30 Maggie joined #git
01:30 romerocesar joined #git
01:32 tgies joined #git
01:33 jottr_ joined #git
01:34 finalbeta joined #git
01:34 romerocesar joined #git
01:34 dreiss joined #git
01:35 diget joined #git
01:35 Jameser joined #git
01:42 tgies joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
01:48 _Maggie_ joined #git
01:49 Dougie187 joined #git
01:49 durham_ joined #git
01:49 Dougie187 left #git
01:50 mizu_no_oto joined #git
01:51 Dougie1871 joined #git
01:52 blackwind_123 joined #git
01:52 tgies joined #git
01:52 boombatower joined #git
01:53 mischat joined #git
01:53 yaki29 left #git
01:55 geoid___ joined #git
01:57 tgies joined #git
01:58 wenzowski joined #git
01:58 qws-user-1229 joined #git
02:00 mattcen joined #git
02:02 tgies joined #git
02:03 User458764 joined #git
02:04 Maggie joined #git
02:05 Maggie joined #git
02:07 Maggie joined #git
02:09 Shentino joined #git
02:12 tgies joined #git
02:14 mrpackethead joined #git
02:16 nettoweb joined #git
02:16 netj joined #git
02:17 tgies joined #git
02:19 hexagoxel_ joined #git
02:20 sunri5e joined #git
02:20 Shentino joined #git
02:20 watabou joined #git
02:21 durham joined #git
02:22 mkoskar joined #git
02:23 harish joined #git
02:25 thiago joined #git
02:26 e14 joined #git
02:26 sagerdearia joined #git
02:27 tgies joined #git
02:27 Jameser_ joined #git
02:28 durham joined #git
02:30 truetuna joined #git
02:32 tgies joined #git
02:34 brokensyntax joined #git
02:35 Lyqyd joined #git
02:36 sonvh joined #git
02:36 nawwmz joined #git
02:37 tgies joined #git
02:39 benbergman joined #git
02:40 romerocesar joined #git
02:41 romerocesar joined #git
02:42 chachasmooth joined #git
02:42 tgies joined #git
02:42 mkoskar joined #git
02:43 f3r70rr35f joined #git
02:44 lagothri1 joined #git
02:46 fuchstronaut joined #git
02:48 e14 joined #git
02:51 mizu_no_oto joined #git
02:51 jost__ joined #git
02:51 Dougie1871 left #git
02:51 Darren_ joined #git
02:51 Goplat joined #git
02:52 sonvh_ joined #git
02:54 diget joined #git
02:54 daynaskully joined #git
02:54 mischat joined #git
02:58 geoid___ joined #git
03:01 Jameser joined #git
03:02 tgies joined #git
03:04 diget joined #git
03:05 Andrew_K joined #git
03:06 aavrug joined #git
03:06 Jameser joined #git
03:09 mangolisk joined #git
03:11 CEnnis91 joined #git
03:11 Jameser_ joined #git
03:12 _28_ria joined #git
03:12 tgies joined #git
03:12 howdoi is there a way to auto-pull upstream, when I do a reset on upstream/<branch> ?
03:12 howdoi I don't want an alias
03:13 madewokherd joined #git
03:14 Vortex35 joined #git
03:15 Jameser_ joined #git
03:17 Anja joined #git
03:17 tgies joined #git
03:18 kisonecat joined #git
03:21 dreiss joined #git
03:24 romerocesar joined #git
03:26 Nikitaw99 joined #git
03:27 solrize joined #git
03:27 Sleepy63 joined #git
03:28 t4nk368 joined #git
03:31 robotroll joined #git
03:31 kisonecat joined #git
03:32 tgies joined #git
03:34 Nikitaw99 joined #git
03:35 diget joined #git
03:37 tgies joined #git
03:40 mehola joined #git
03:45 romerocesar joined #git
03:46 samcv joined #git
03:47 tgies joined #git
03:47 samcv i'm doing a git rebase against head, is there a way to resolve all conflicts by choosing `HEAD´'s version?
03:47 xall joined #git
03:47 samcv so i don't have to do it for like 40 things
03:47 fuchstronaut joined #git
03:49 misterpink joined #git
03:51 buddyq joined #git
03:51 Random832 samcv: that's a very bad idea, but... i'm not sure which one uses HEAD's version, but look at -Xtheirs and -Xours
03:52 liuzhen joined #git
03:52 Random832 (not 100% sure what "rebase against head" even means)
03:55 mischat joined #git
03:55 markgrady joined #git
03:56 rkazak joined #git
03:58 samcv Random832, sorry that wasn't clear, i meant just to choose the version in my HEAD. because i'm trying to squash a bunch of commits (not the most recent). i basically need to squash 39 commits about 10 commits back i think
03:59 Random832 try -Xtheirs or -Xours, and do a diff against the old head when you're done to make sure you didn't lose anything
03:59 samcv and i've done it before manually resolving the conflict, but i had to edit the file and just choose "HEAD"'s versio whenever there was a conflict between commits
03:59 samcv kk Random832
04:00 Random832 frankly if you're squashing anyway, i'd just use commit-tree
04:00 mangolisk_ joined #git
04:00 Random832 wait no that won't work for your case
04:01 samcv ok let me try with -Xours. i tried doing --ours but that is only a merge command i think?
04:01 Random832 i'd worry about the intermediate versions being wrong (they can't see what's in head, just what's in the commit they're looking at)
04:02 Random832 but you  might not care about that
04:02 tgies joined #git
04:02 sangy joined #git
04:02 Random832 it looks like you want -Xtheirs
04:02 Random832 but like i said, do the diff for a sanity check
04:02 mrpackethead joined #git
04:04 Random832 i'd probably do the rebase in two parts - the ones you want to squash (and then diff that against the original version of the last commit), and then the rest of the way to the original head
04:05 Andrew_K|2 joined #git
04:05 Aboba joined #git
04:05 romerocesar joined #git
04:06 NeverDie joined #git
04:06 ochorocho__ joined #git
04:06 flaguy48 joined #git
04:07 blackwind_123 joined #git
04:07 tgies joined #git
04:08 samcv yay it worked :) thanks Random832
04:08 qws-user-1228 joined #git
04:08 samcv this makes me sooo happy
04:09 Random832 make sure you check everything with diff and maybe even look at each commit's patch to make sure everything looks sane
04:09 geoid___ joined #git
04:10 navidr joined #git
04:12 tgies joined #git
04:13 User458764 joined #git
04:13 noyb joined #git
04:15 geoid___ joined #git
04:16 waveclaw joined #git
04:17 blackwind_123 joined #git
04:19 samcv yeah it works Random832 :) very good
04:19 nawwmz joined #git
04:21 bmahe joined #git
04:22 tgies joined #git
04:24 blackwind_123 joined #git
04:24 Limes__ joined #git
04:27 tgies joined #git
04:28 overlord_tm joined #git
04:29 basiclaser joined #git
04:30 isBEKaml joined #git
04:31 Cabanossi joined #git
04:32 tgies joined #git
04:33 romerocesar joined #git
04:35 brillenfux joined #git
04:36 sagerdearia joined #git
04:39 daey_ joined #git
04:40 a3Dman_ joined #git
04:42 rchavik joined #git
04:44 User458764 joined #git
04:44 phaleth joined #git
04:48 fuchstronaut joined #git
04:50 styx_ joined #git
04:52 tgies joined #git
04:54 kdeal joined #git
04:55 joki joined #git
04:55 mischat joined #git
04:57 tgies joined #git
05:02 styx_ joined #git
05:03 StatutoryApe joined #git
05:03 StatutoryApe so uhh
05:03 User458764 joined #git
05:04 StatutoryApe I created a new repo and cloned it.  I did not init the repo.  Then I created a development branch, wrote a bunch of code, committed and pushed the development branch.  Because I forgot to init I have no master branch.
05:08 jeffreylevesque_ joined #git
05:09 phanimahesh joined #git
05:09 hackek joined #git
05:09 raijin joined #git
05:10 cerkauskas joined #git
05:10 nawwmz joined #git
05:12 leehambley joined #git
05:12 dioxane joined #git
05:14 thekrynn_ joined #git
05:16 lordjancso joined #git
05:17 geoid___ joined #git
05:17 dioxane left #git
05:19 XenialJesse joined #git
05:19 romerocesar joined #git
05:20 XenialJesse test
05:20 XenialJesse Hi all, a question
05:22 phroa do continue
05:23 subhojit777 joined #git
05:23 XenialJesse In my .gitignore, I have this:
05:23 thekrynn joined #git
05:23 XenialJesse [Aa]ssignment\ 2/[Rr]elease/*.obj
05:24 XenialJesse prompt: /[Aa]ssignment\ 2/[Rr]elease/*.obj
05:24 XenialJesse Second one
05:24 subhojit777 joined #git
05:24 emPi joined #git
05:24 XenialJesse But the *.obj files in that folder don't appear to be getting ignored
05:25 XenialJesse When I type git status, they're all still appearing as Changes not staged for commit
05:25 subhojit777 joined #git
05:25 thiago you can't ignore tracke files
05:25 thiago git rm them
05:25 XenialJesse Would git clean -f -d do the same job?
05:26 thiago no
05:26 thiago they're tracke
05:26 subhojit777 joined #git
05:26 thiago tracked
05:26 XenialJesse So once something starts being tracked, it ignores the ignore, so to speak
05:26 thiago no
05:26 thiago a file can either be ignored, untracked or tracked
05:27 thiago there are only three states possible
05:27 subhojit777 joined #git
05:27 XenialJesse Yeah
05:27 XenialJesse So once tracked, it doesn't listen to the ignore file for those things
05:28 subhojit777 joined #git
05:28 thiago no, because the ignore file only applies to untracked files
05:28 XenialJesse Many thanks!
05:28 xall_ joined #git
05:30 _ng joined #git
05:30 styx_ joined #git
05:36 nchambers joined #git
05:39 nilg joined #git
05:40 romerocesar joined #git
05:41 User458764 joined #git
05:45 liuzhen joined #git
05:46 nilg` joined #git
05:48 PCatinean joined #git
05:48 ThomasLocke joined #git
05:49 fuchstronaut joined #git
05:49 truetuna joined #git
05:50 eoliva joined #git
05:52 qt-x joined #git
05:52 eoliva Hi, I'm trying to use deploy key to push my changes to my server (I created the key in github with write access), I've tested my key with "ssh -T git@github.com" and it's fine....but when I try to push, it asks me my username and pass
05:53 phroa I suspect the remote url for your project isn't set up with ssh.  paste `git remote -v` please
05:54 echosystm i'm trying to commit some large binary files into git
05:54 eoliva phroa: originhttps://github.com/eduardoOliva/goldenTravelResort.git (push)
05:54 echosystm whenever i git commit, it just bails and says "Killed"
05:54 echosystm does anyone know what might be the problem?
05:55 eoliva phroa: both, fetch and push are in https
05:55 phroa eoliva: try `git remote set-url origin git@github.com:eduardoOliva/goldenTravelResort.git`
05:55 Peng echosystm: It probably ran out of memory. Check dmesg or syslog, assuming Linux
05:55 echosystm is there any way to fix that?
05:55 phroa next time when you copy the url from the box on github use the drop down menu to pick ssh, not https
05:55 Peng Buy more RAM
05:55 echosystm or is this just a limitation with git that files must be smaller than ram etc.
05:55 echosystm ugh
05:55 Raging_Hog joined #git
05:55 Peng echosystm: Maybe you should use git-lfs or whatever it's called now.
05:56 eoliva phroa: wow, it worked!! :) tnx a lot, I'm gonna jot down this on my evernote :) tnxx
05:56 echosystm yeah i tried that but it doesn't do what i want
05:56 phroa echosystm: split the file?
05:56 echosystm i need a system that can store, send and retrieve binary files efficiently
05:56 echosystm git-lfs doesn't store them efficiently and, afaik, you download/upload the entire file every time
05:56 mischat joined #git
05:59 brk_ joined #git
06:00 aidalgol joined #git
06:00 xall_ joined #git
06:01 romerocesar joined #git
06:02 Phylock joined #git
06:03 zacts joined #git
06:04 Anja i suck at git. normally i'm too busy trying to solve some cockup i've done that i don't have time to actually learn anything. i've got a couple of hours spare at the moment so i thought i'd get some of the basics out of the way
06:04 LucaTM joined #git
06:04 Anja i was thinking of a nice ralaxing hour on youtube
06:04 raphink joined #git
06:05 Anja are there any "getting from intro to intermiate" videos around?
06:05 Anja well... recommended ones :)
06:06 cyan__ joined #git
06:07 djb-irc joined #git
06:09 nawwmz joined #git
06:10 TinkerTyper joined #git
06:10 rscata joined #git
06:12 Xethron joined #git
06:12 _ikke_ Anja: !videos
06:12 gitinfo Anja: [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)
06:13 syg_ joined #git
06:17 Anja sweet :)
06:17 User458764 joined #git
06:17 freimatz joined #git
06:19 geoid___ joined #git
06:19 Darren_ joined #git
06:21 romerocesar joined #git
06:24 paolooo joined #git
06:24 raijin joined #git
06:25 zulutango joined #git
06:25 nawwmz joined #git
06:26 nidr0x joined #git
06:26 staticshock joined #git
06:27 _xor joined #git
06:27 _xor joined #git
06:27 bocaneri joined #git
06:28 Remram joined #git
06:29 JeroenT joined #git
06:31 jknetl joined #git
06:32 chele joined #git
06:35 buzzLightBeer joined #git
06:35 _ikke_ Anja: If you find any other good ones, please do tell
06:35 Martian joined #git
06:36 Anja _ikke_, there's a few there to keep me going :) but I'll be sure to report back
06:37 xall_ joined #git
06:38 [twistii] joined #git
06:38 Xethron joined #git
06:40 plos joined #git
06:41 jasondockers__ joined #git
06:41 SwiftMatt joined #git
06:42 Alienpruts joined #git
06:42 romerocesar joined #git
06:42 XVar` joined #git
06:42 suy joined #git
06:43 n-st joined #git
06:43 kdeal joined #git
06:43 slick joined #git
06:43 babilen joined #git
06:44 dcpc007 joined #git
06:44 overlord_tm joined #git
06:46 lb Anja i recommend Scott Chacon, he tought me to think git :)
06:47 lb but the linked video with Jessica Kerr is really easy for pure beginners
06:47 Anja ty lb
06:47 peepsalot joined #git
06:48 ghostlight joined #git
06:48 XenialJesse joined #git
06:48 dan2k3k4 joined #git
06:49 Anja watching linus do his background chat right now. i've got time to watch a quite bit of stuff today. so i'm bloody well going to! i'm sick of this ignorance :)
06:49 davidosomething joined #git
06:49 fuchstronaut joined #git
06:50 durham joined #git
06:51 johnmilton joined #git
06:51 sparetire joined #git
06:51 sagerdearia joined #git
06:52 testuser_ joined #git
06:53 Bizkit joined #git
06:53 romerocesar joined #git
06:53 vlt Hello. Is there a way to find commits having an identical tree as current HEAD?
06:54 corsibu joined #git
06:55 macivy joined #git
06:56 vlt Other than a for loop of `git diff`s?
06:57 inflames joined #git
06:57 mischat joined #git
06:58 truetuna joined #git
06:58 Sceorem joined #git
06:58 Macaveli joined #git
06:59 _ikke_ I don't think there is a shortcut
06:59 lss8 joined #git
07:00 qpdb joined #git
07:00 Endarked joined #git
07:03 vlt _ikke_: Ok, thank you.
07:04 grift joined #git
07:10 HelloShitty left #git
07:10 HelloAtMega joined #git
07:11 dreiss joined #git
07:12 SwiftMat_ joined #git
07:13 xall joined #git
07:13 ahmedelgabri joined #git
07:14 TomyWork joined #git
07:14 Darcidride joined #git
07:18 MatthewAllan93 joined #git
07:19 overlord_tm joined #git
07:20 danslo joined #git
07:21 fees joined #git
07:25 GavinMagnus joined #git
07:26 PCatinean joined #git
07:26 PHPanos joined #git
07:27 mikecmpbll joined #git
07:29 Gonzo89 joined #git
07:29 romerocesar joined #git
07:30 romerocesar joined #git
07:31 danslo joined #git
07:35 User458764 joined #git
07:36 PHPanos joined #git
07:39 elect joined #git
07:39 mrpackethead joined #git
07:39 Anja Linus. funny guy. now i have more background than i ever thought i needed :) moving on to Scott
07:42 isBEKaml joined #git
07:44 jaguarmagenta joined #git
07:46 xall_ joined #git
07:47 mattcen joined #git
07:50 qpdb joined #git
07:50 fuchstronaut joined #git
07:55 corsibu joined #git
07:56 Endarked joined #git
07:56 xbob joined #git
07:56 Balliad joined #git
07:58 mischat joined #git
07:59 elect joined #git
08:00 xall joined #git
08:01 brandonw joined #git
08:03 geoid______ joined #git
08:06 jrm joined #git
08:09 lb Anja yeah Linus is a funny guy, if he doesn't insult you ^^
08:09 JeroenT joined #git
08:09 jimi_ joined #git
08:12 harish joined #git
08:13 selckin he was nice once and someone spend months of work on something he knew would never be accepted and still feels bad
08:14 bongjovi joined #git
08:14 ochorocho__ joined #git
08:14 danslo left #git
08:14 danslo joined #git
08:14 danslo the thing that irks me about linus is his excessive usage of the words "quite frankly" :p
08:15 staticshock joined #git
08:15 selckin i'd rather have linus then this cooperate bullshit speak
08:16 bruce_lee joined #git
08:18 madsj joined #git
08:19 brk_ joined #git
08:19 madsj I made a rebase and accidentally marked a commit I shouldn't have. As a result I did a "git checkout SHA-ID" for the commit, but now I am in a detached head state.
08:20 marcogmonteiro joined #git
08:20 leehambley joined #git
08:21 j416 madsj: keep calm, your previous state is in ORIG_HEAD
08:21 osse madsj: what did you mark it as?
08:22 PHPanos joined #git
08:22 j416 madsj: git log ORIG_HEAD # looks good? Reset to that and try again
08:22 irqq joined #git
08:23 selckin !detached
08:23 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
08:23 selckin !reattach
08:23 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
08:24 JeroenT joined #git
08:24 osse danslo: lol, glad I'm not the only one that notices
08:25 madsj j416: I still have the files and changes from the commits that were squashed into the wrong commit. "git log ORIG_HEAD" does not have any entries for the wrongly squashed commits
08:26 dimi1947 joined #git
08:26 j416 madsj: of course; ORIG_HEAD would be the state before the rebase (unless you did something after the rebase that changed it again)
08:26 ahr3n joined #git
08:27 j416 madsj: !backup
08:27 gitinfo madsj: 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
08:30 lb https://www.google.com/search?q=linus+torvald+nerd+rage
08:30 xall_ joined #git
08:34 skunkz joined #git
08:36 nettoweb joined #git
08:36 ali_r3z joined #git
08:36 lindenle joined #git
08:37 systemovich joined #git
08:37 kurkale6ka joined #git
08:38 PHPanos joined #git
08:38 romerocesar joined #git
08:41 Bucciarati_ left #git
08:43 JeroenT_ joined #git
08:44 vuoto joined #git
08:45 clmsy joined #git
08:47 star_prone joined #git
08:47 grift joined #git
08:48 WayToDoor joined #git
08:48 star_prone joined #git
08:49 jimi_ joined #git
08:50 drmt joined #git
08:51 fuchstronaut joined #git
08:52 ahr3n joined #git
08:54 chll_ joined #git
08:57 JeroenT joined #git
08:58 xall_ joined #git
08:58 brk_ joined #git
08:59 madsj j416: still detached after a "git reset --hard ORIG_HEAD" :/
08:59 drmt joined #git
08:59 romerocesar joined #git
08:59 quackgyver joined #git
09:00 osse madsj: git checkout branchname
09:01 sagerdearia joined #git
09:01 osse but... did you complete the rebase or is it still in progress? what rebase command did you type? what did you mark that commit as? what does git status say?
09:04 Limes__ joined #git
09:04 dsdeiz joined #git
09:04 madsj osse: ok, now it's back to the wrong rebase
09:04 sxen joined #git
09:05 madsj be careful with rebase :)
09:05 Serpent7776 joined #git
09:05 sxen joined #git
09:07 mischat joined #git
09:07 jozwior joined #git
09:08 star_prone joined #git
09:10 ferr joined #git
09:11 mikecmpbll joined #git
09:15 tvw joined #git
09:16 leeN joined #git
09:16 xall_ joined #git
09:16 troulouliou_div2 joined #git
09:16 dan2k3k4 joined #git
09:18 corsibu joined #git
09:18 madsj j416: I got it working with reflog and reset, finally :)
09:19 notebox joined #git
09:19 corsibu joined #git
09:20 niels_ joined #git
09:20 romerocesar joined #git
09:20 staafl_ joined #git
09:20 xall joined #git
09:21 ieee joined #git
09:21 dan2k3k4 joined #git
09:22 dsdeiz_ joined #git
09:23 PHPanos joined #git
09:25 qpdb joined #git
09:25 acosonic joined #git
09:26 acosonic Hi all, has anyone configured Redmine with gitolite integration?
09:27 achadwick joined #git
09:28 King_Hual joined #git
09:29 jozwior joined #git
09:30 m___1 joined #git
09:35 sylario joined #git
09:36 danslo_ joined #git
09:38 kimonorouge joined #git
09:40 User458764 joined #git
09:40 romerocesar joined #git
09:41 Anja just watched the Scott Chacon talk. That was an intense hour or so. Feeling better about the whole thing now. Much of the mystery has evaporated.
09:42 _ikke_ Anja: Good to hear
09:42 Anja moving on to Jesica. might not finish that today though.
09:42 robattil1 joined #git
09:42 kedare joined #git
09:44 liuzhen joined #git
09:45 staticshock joined #git
09:48 jozwior joined #git
09:50 thekrynn joined #git
09:51 dimi1947 joined #git
09:51 lmatteis joined #git
09:52 fuchstronaut joined #git
09:52 corsibu joined #git
09:55 pbrewczynski joined #git
09:56 robattila256 joined #git
10:00 mika joined #git
10:01 romerocesar joined #git
10:04 lb Anja here's another one from Scott Chacon: https://media.ccc.de/v/hs1_2_-_2011-08-20_15:15_-_wrangling_git_-_scott_chacon_-_802#video&amp;t=3
10:04 xall_ joined #git
10:05 lb Slides also available: https://speakerdeck.com/schacon/wrangling-git
10:06 Anja lb, ty. i'm fully loaded for today, but i've committed this much time, so i'll definitely get to that tomorrow.
10:06 Anja i /really/ approve of Scott's pace in that last vid
10:09 cyan__ joined #git
10:09 dodobrain joined #git
10:10 nettoweb1 joined #git
10:10 wrouesnel joined #git
10:13 quite joined #git
10:13 quite joined #git
10:14 rnsanchez joined #git
10:15 DopeMeston joined #git
10:19 InfoTest joined #git
10:19 PHPanos joined #git
10:22 romerocesar joined #git
10:27 sonvh joined #git
10:29 dan2k3k4 joined #git
10:29 corsibu joined #git
10:29 freimatz joined #git
10:35 ayogi joined #git
10:38 XenialJesse joined #git
10:39 rahtgaz joined #git
10:44 notebox joined #git
10:45 aeae64ff8df64d2a joined #git
10:46 overlord_tm joined #git
10:46 staticshock joined #git
10:47 xbob joined #git
10:49 introx joined #git
10:49 introx_ joined #git
10:49 slavanap joined #git
10:51 drbean joined #git
10:52 usm4n joined #git
10:52 fuchstronaut joined #git
10:53 tlaxkit joined #git
10:53 barteks2x joined #git
10:54 PHPanos joined #git
10:54 WayToDoor joined #git
10:57 altendky joined #git
10:58 leehambley joined #git
11:00 liuzhen joined #git
11:01 [twistii] joined #git
11:03 mizu_no_oto joined #git
11:03 mehola joined #git
11:04 usm4n_ joined #git
11:10 usm4n joined #git
11:11 sagerdearia joined #git
11:13 dan2k3k4 joined #git
11:14 fuchstronaut joined #git
11:14 inflames joined #git
11:14 pokalyis joined #git
11:15 mrpackethead joined #git
11:19 staafl joined #git
11:20 hiwk joined #git
11:20 hiwk can I see when a remote branch became stale?
11:20 Juzzika joined #git
11:20 tobiasvl hiwk: what does that mean?
11:21 tobiasvl oh hmm I found out
11:21 hiwk "git remote show origin" says that one branch is stale
11:21 tobiasvl yeah I found it http://stackoverflow.com/questions/29112156/what-is-a-stale-git-branch
11:21 hiwk and I'm not sure when, why, or who that happend
11:21 hiwk because noone remembers doing an explicit delete on it
11:26 codfection joined #git
11:26 staafl_ joined #git
11:29 User458764 joined #git
11:30 ojdo joined #git
11:30 alhariel joined #git
11:31 staafl joined #git
11:31 sdothum joined #git
11:32 qpdb joined #git
11:35 CtrlC How can I combine a repo into another one? as if they were the same from the start?
11:36 tobiasvl CtrlC: you can !stitch them together
11:36 gitinfo CtrlC: [!git-stitch-repo] The git-stitch-repo tool allows for stitching several git repositories together as a unified history without merges, see https://metacpan.org/module/git-stitch-repo for more info.
11:37 CtrlC tobiasvl, Last time I did something using fetch. I can't recall what though.
11:37 netcarver joined #git
11:38 tobiasvl you probably did something like this? http://stackoverflow.com/a/15606083/176464
11:38 CtrlC I want to move the files to a new repo and keep their commit history.
11:38 CtrlC let me see.
11:39 tobiasvl I would suggest git-stitch-repo (or fast-export/fast-import, which is the same thing only manually) over that though
11:39 romerocesar joined #git
11:39 raijin joined #git
11:39 CtrlC Not that long. ok let me try stiching.
11:40 corsibu joined #git
11:40 CtrlC tobiasvl, It won't destroy the repo I'm gonna import in. right? I need to push to the server.
11:40 jim joined #git
11:41 tobiasvl it will obviously !rewrite history
11:41 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
11:42 jim hi... I already pushed... but I want to put a different commit (which I have checked out)
11:42 CtrlC I don't think I want that. idk.
11:43 tobiasvl CtrlC: well, you said "as if they were the same from the start", that implies rewriting history
11:43 tobiasvl jim: what do you mean? you pushed the wrong thing?
11:43 jim I (also) don't want to rewrite history, so I have to checkout the working commit, then make a new commit of that... but how?
11:43 fuchstronaut joined #git
11:44 CtrlC tobiasvl, my bad. I wanted to say if I made files in the beginning into the second repo instead of a seperete one.
11:44 jim I thought it was the right thing at the time
11:44 tobiasvl jim: make a note of the working commit hash, checkout the branch you pushed earlier, then cherry-pick the working commit?
11:44 tobiasvl or merge it in obviously
11:45 jim so I should checkout the old HEAD again...
11:45 jim how can I do that
11:46 CtrlC tobiasvl, I think the third answer here does that: http://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories am i right? I don't want to mess around.
11:46 tobiasvl jim: checkout the branch?
11:46 tobiasvl or, if it was your previous HEAD, "git checkout -"
11:46 staafl_ joined #git
11:47 Kurolox joined #git
11:47 nerfquark joined #git
11:48 tobiasvl CtrlC: yep
11:48 tobiasvl !git-subtree
11:48 gitinfo git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt for more info.
11:48 CtrlC Thank you.
11:48 CtrlC wait. is it a subtree?
11:48 Orion3k joined #git
11:49 Ardethian\ joined #git
11:50 Limes__ joined #git
11:50 tobiasvl not yet?
11:50 jimi_ joined #git
11:51 staafl joined #git
11:51 hiwk alternative phrasing: I had a git remote branch foo. can I find out when it was deleted?
11:52 moritz hiwk: on the remote repo, you can look into the reflog
11:52 Ardethian\ joined #git
11:52 tobiasvl hiwk: not really. you didn't have it, the remote had it. unless you own the remote, then reflog
11:52 tobiasvl if not, you can only know when you last fetched it, git doesn't look at the remote beyond that
11:52 moritz hiwk: if you don't have direct acces to the remote repo, you can't find otu
11:53 hiwk I do have file system access to the remote repo
11:53 hiwk it is a bare repo, though, how do I do?
11:54 moritz hiwk: you change into the directory, and type "git reflog"
11:54 moritz and see if anything interesting comes up
11:54 hiwk "fatal: bad default revision 'HEAD'"
11:55 ash_workz joined #git
11:55 slavanap does it worth to use my real private e-mail address within git commits?
11:56 moritz slavanap: there is no general answer. Questions you should ask yourself: do you want to be recognized as the author? do you want to be contacted? if not, how badly do you not want it?
11:57 moritz slavanap: and, if you contribute to other projects, do they have policies regarding email address usage?
11:58 slavanap moritz, I haven't faced such policies yet, can you show any?
11:58 moritz slavanap: for example the pybee project wants a signed-off-by line with your real email address
11:59 johnmilton joined #git
11:59 slavanap moritz, as overall I'm in real doubt because if I start a freelance and use github for it, my employer may spam me after.
12:01 slavanap Can anyone share cases when you've been contacted via e-mail provided within git commit and why you've been contacted?
12:01 WayToDoor joined #git
12:02 Surfer2010 joined #git
12:02 hiwk moritz: not sure if you got my answer, but git reflog fails "(fatal: bad default revision 'HEAD')", could be either that it is a bare repo, or that it seems to be lacking a default/master branch
12:04 star_prone joined #git
12:05 johnmilton joined #git
12:05 moritz hiwk: then I'm afraid I can't help
12:07 corsibu joined #git
12:08 hiwk moritz: ok, thanks anyways!
12:09 Squarism joined #git
12:09 geoid_ joined #git
12:10 star_prone joined #git
12:11 flaguy48 joined #git
12:13 Cavallari joined #git
12:14 star_prone joined #git
12:15 traxo-xx joined #git
12:15 romerocesar joined #git
12:15 fakenerd joined #git
12:16 re1 joined #git
12:20 ayogi joined #git
12:21 lindenle joined #git
12:21 ayogi joined #git
12:23 LionsMane joined #git
12:24 mindriot101 joined #git
12:26 jeffreylevesque joined #git
12:27 dan2k3k4 joined #git
12:29 Khisanth joined #git
12:30 bejeb joined #git
12:31 Noldorin joined #git
12:33 f3r70rr35f joined #git
12:34 staticshock joined #git
12:34 gajus joined #git
12:34 gajus joined #git
12:36 Derperperd joined #git
12:38 manuel_ joined #git
12:38 CheckDavid joined #git
12:41 suchkultur joined #git
12:41 converge joined #git
12:41 converge joined #git
12:42 User458764 joined #git
12:45 kimonorouge joined #git
12:46 dendazen joined #git
12:47 PHPanos joined #git
12:48 Stummi_ left #git
12:48 Stummi_ joined #git
12:48 Stummi_ left #git
12:48 Stummi joined #git
12:51 romerocesar joined #git
12:51 JamesBaxter joined #git
12:53 gho5t joined #git
12:57 Jameser joined #git
12:58 felixjet if i have to clone from a private repo, and i need to use a private key, what options do i have?
12:58 felixjet for example if its my own key, it can sit inside .ssh/id_rsa
12:59 felixjet but what if the key is not my own one? (let's say i have some keys for different private repos)
12:59 felixjet the best option is add that keys to ssh-agent / ssh-add ?
12:59 anonymuse joined #git
12:59 felixjet or there is another way?
12:59 felixjet maybe pass the priv key as an argument to the git command?
12:59 moritz felixjet: you can also put host-specific ssh config in .ssh/cofig
12:59 moritz *config
13:00 felixjet what is best option? using the agent or config file?
13:01 moritz depends, really
13:01 moritz on the level of security you need, for example
13:01 moritz if it's not a security concern, just calling ssh-add for all secret keys is most convenient
13:02 felixjet i think both will do the same here. i'm using this git command inside a docker container, so i need to copy the privkey to the container anyway
13:02 star_prone joined #git
13:02 felixjet i don't mind if adding it to the ssh-agent or specify the privkey at the config file
13:02 liuzhen joined #git
13:02 felixjet but not sure what approach should i take
13:03 felixjet the ssh-add method seems simpler to be honest
13:04 ShekharReddy joined #git
13:05 jimi_ joined #git
13:07 Jameser joined #git
13:07 liuzhen joined #git
13:07 flaguy48 joined #git
13:08 algun Can a ptach be git apply-d if lines do not match?
13:08 _ikke_ algun: no, probably not
13:10 cdg joined #git
13:10 plos joined #git
13:10 cdg joined #git
13:11 harv joined #git
13:11 flaguy48 joined #git
13:16 dan2k3k4 joined #git
13:17 phanimahesh line numbers? you can still try if context matches
13:17 phanimahesh patch triesits best, so I don't see why git wouldn't
13:18 Rodya_ joined #git
13:24 CEnnis91 joined #git
13:24 plos joined #git
13:24 zivester joined #git
13:28 buddyq joined #git
13:28 dsdeiz joined #git
13:28 dsdeiz joined #git
13:30 eindoofus_ joined #git
13:30 BrianBlaze420 joined #git
13:33 waveclaw joined #git
13:34 kpease joined #git
13:34 p1k joined #git
13:36 anonymus_ joined #git
13:39 corsibu joined #git
13:39 griffindy joined #git
13:39 converge joined #git
13:39 converge joined #git
13:40 nilez joined #git
13:40 mrkake joined #git
13:42 romerocesar joined #git
13:42 DeltaHeavy joined #git
13:42 PHPanos joined #git
13:42 InfoTest joined #git
13:42 ExoUNX joined #git
13:45 fuchstronaut joined #git
13:45 qws-user-1229 joined #git
13:45 Dougie187 joined #git
13:46 ash_workz joined #git
13:47 NeverDie joined #git
13:47 griffindy joined #git
13:47 kpease joined #git
13:48 Dong__ joined #git
13:49 kpease_ joined #git
13:50 Dong__ guys, anyone out of head knows when you do "git log", the reverse chronological order, is that comparing commit timestamp first, if tie, authoring timestamp, then what is used to break the tie?
13:51 cdown joined #git
13:51 kadoban joined #git
13:51 Rodya_ joined #git
13:53 guampa joined #git
13:53 UTAN_dev joined #git
13:53 rnsanchez joined #git
13:55 selckin notting
13:55 Sadeukko joined #git
13:56 osse Dong__: my guess is the topological order.
13:56 osse ie which aprent
13:57 Dong__ osse: thanks for helping, I was trying to save looking at the source code.
13:57 EricPoe joined #git
13:58 User458764 joined #git
13:58 nd joined #git
13:58 mrkake joined #git
13:58 AaronMT joined #git
13:59 Dong__ but if I make an output file with default order and then another one with --date-order, it seems when I do diff on them, the default order in fact has tiny difference with --date-order, in that default does not obey child-parent relationship
13:59 IrishPrime joined #git
13:59 IrishPrime joined #git
14:00 inflames joined #git
14:01 e14 joined #git
14:03 boombatower joined #git
14:04 synchronous joined #git
14:06 katherine joined #git
14:07 dviola joined #git
14:12 inflames joined #git
14:14 geoid joined #git
14:14 NeverDie joined #git
14:16 Sonderblade joined #git
14:17 anonymuse joined #git
14:17 nv1r joined #git
14:18 romerocesar joined #git
14:19 shinnya joined #git
14:20 anonymuse joined #git
14:23 jstimm joined #git
14:23 staticshock joined #git
14:23 [cust] joined #git
14:23 dendazen joined #git
14:25 matsaman joined #git
14:25 f3r70rr35f joined #git
14:25 Darren_ joined #git
14:26 matsaman joined #git
14:29 Filiphe joined #git
14:30 VagabondAzulien joined #git
14:31 jeanres joined #git
14:32 pokalyis joined #git
14:33 Jameser joined #git
14:33 tmz joined #git
14:35 al-damiri joined #git
14:36 flaguy48 joined #git
14:38 Xethron joined #git
14:39 afuentes joined #git
14:39 interrobangd joined #git
14:41 tlaxkit joined #git
14:41 kdeal joined #git
14:43 Limes__ joined #git
14:43 VagabondAzulien joined #git
14:44 Remram joined #git
14:44 Remram joined #git
14:46 cagmz joined #git
14:46 fuchstronaut joined #git
14:46 cagmz joined #git
14:48 Lorcatar joined #git
14:49 ash_workz joined #git
14:51 Jameser_ joined #git
14:52 sonvh joined #git
14:53 romerocesar joined #git
14:54 thebloggu joined #git
14:58 aarobc joined #git
15:00 jaguarmagenta joined #git
15:00 titankiller joined #git
15:00 shubhnik joined #git
15:01 hashpuppy joined #git
15:05 clmsy joined #git
15:05 ayjay_t joined #git
15:06 eivarv joined #git
15:07 nawwmz joined #git
15:09 star_prone joined #git
15:12 star_prone joined #git
15:13 tcorneli joined #git
15:13 zivester joined #git
15:13 star_prone joined #git
15:14 bejeb joined #git
15:18 dreiss joined #git
15:18 qpdb joined #git
15:20 sea-gull joined #git
15:22 Derperperd joined #git
15:23 staticshock joined #git
15:24 shubhnik joined #git
15:25 noidea joined #git
15:26 sdlnv joined #git
15:27 utanapischti joined #git
15:27 jasondockers joined #git
15:28 fakenerd joined #git
15:28 crose joined #git
15:29 vuoto joined #git
15:29 romerocesar joined #git
15:29 jfran joined #git
15:31 MatthewAllan93 joined #git
15:32 MatthewAllan93 joined #git
15:33 Remram joined #git
15:36 emattiza joined #git
15:37 madewokherd joined #git
15:38 f3r70rr35f joined #git
15:39 emattiza joined #git
15:39 pks_ joined #git
15:41 anonymuse joined #git
15:42 staticshock joined #git
15:45 EricPoe joined #git
15:45 iLembus joined #git
15:46 svm_invictvs joined #git
15:46 Balliad_ joined #git
15:46 Es0teric joined #git
15:47 impermanence joined #git
15:48 impermanence If I'm using tagged versioning, how can I push various sets of changes to the same tag...to try new changes to my code...without make a new tag every single time I make a little change?  I've already tried creating a tag of the same name...like trying to tag over it...but I get "fatal".
15:49 emattiza joined #git
15:49 impermanence oh...apparently I have to make a new branch...k.
15:51 Limes__ joined #git
15:53 mindriot101 joined #git
15:53 tlaxkit1 joined #git
15:54 _cyril_ joined #git
15:55 dreiss joined #git
15:57 Shock_ joined #git
15:58 impermanence I guess my question is: how do people handle a tagging workflow?  For example...do you only tag AFTER you know your changes are working...or...how do you avoid make and pushing a stupid tag for every single little change you make even if it's only commenting something out?
16:00 Electrometro joined #git
16:02 oskarkv joined #git
16:02 axisys joined #git
16:04 Electrometro joined #git
16:04 axisys joined #git
16:05 nedbat impermanence: why would you make a tag for every change?
16:05 emattiza joined #git
16:05 romerocesar joined #git
16:05 courrier joined #git
16:05 lindenle joined #git
16:06 Shock_ joined #git
16:06 nedbat impermanence: it sounds like you are using tag very differently than I am, which is to mark the released versions of my code
16:07 thiago_ joined #git
16:07 impermanence nedbat: I'm not using them like that because now that I know more about them I see that's not what they're meant for :)
16:07 nedbat impermanence: ah, ok! :)
16:09 impermanence nedbat: yeah, I just made and pushed my first tag and of course it broke stuff...so...I was like...okay...lemme make some more changes...but then I was all...wait a sec...I don't want to f'ing tag for every f'ing little change...so...turns out I need to deploy using my test branch...then merge with dev branch when I'm good to go and then tag at tha
16:09 impermanence t point.  How's that sound :)
16:09 emattiza joined #git
16:10 converge joined #git
16:10 converge joined #git
16:10 robotroll joined #git
16:11 Dohplay joined #git
16:13 bluezone joined #git
16:14 Es0teric joined #git
16:14 tyreld joined #git
16:16 wwspider joined #git
16:17 xall_ joined #git
16:17 wwspider one in my team did a commit, I didn't notice and keep working. Now we want to get rid of his commit ( it was wrong anyway ) and push my last commit
16:18 Noldorin joined #git
16:18 jstimm joined #git
16:18 ericho joined #git
16:19 Salander27 joined #git
16:20 pwnz0r joined #git
16:20 Dhanya[m] joined #git
16:20 nawwmz joined #git
16:21 Dong__ wwspider: if his commit is still the last one, you just force update it to get ride of it.
16:21 nawwmz joined #git
16:23 Rodya_ joined #git
16:24 DuckHuntDog joined #git
16:25 a_thakur joined #git
16:25 ochorocho__ joined #git
16:25 wwspider bond: his is the last commit in the online repository
16:27 Rodya__ joined #git
16:28 _ADN_ joined #git
16:29 Impaloo joined #git
16:29 Limes__ joined #git
16:30 btyne79 joined #git
16:30 durham joined #git
16:31 hahuang65 joined #git
16:31 Dong__ wwspider: i suppose if you guys really don't like his commit, better take the bite now to force update now and let everyone who fetched it know
16:31 algun joined #git
16:32 nitric joined #git
16:33 alhariel joined #git
16:33 DuckHuntDog Hi. I've got a featurebranch with a ton of commits that affect files A, B and C. Now I want to merge the latest version of file C from the featurebranch into a new branch. Is there a simple way to do that?
16:34 mgbv joined #git
16:36 eka joined #git
16:37 traxo-xx joined #git
16:37 jccn joined #git
16:38 Dong__ DuckHuntDog: cherry-pick?
16:38 hackal joined #git
16:38 impermanence Is "git branch my_branch ; git checkout my_branch" == "git checkout -b my_branch"?
16:39 grayjoc joined #git
16:39 Dong__ yes
16:39 impermanence cool, thanks.
16:39 User458764 joined #git
16:39 mrpackethead joined #git
16:39 geoid joined #git
16:40 hackal Please help, my company contracted a freelancer who says "Worst thing is to waste time in command line (GIT)". He has no idea how to work with git and is getting errors all the time. I have no time to help him. Any ideas how this could be solved?
16:41 Dong__ hired another freelancer to fix his errors after him
16:41 romerocesar joined #git
16:41 DuckHuntDog Dong__: But cherry-pick works with commits. What if one commit changed file A,B and C and I want to avoid merging file A and B
16:41 Faylite joined #git
16:42 Dong__ DuckHuntDog: then you just branch from your master, checkout the C like into it?
16:42 wwspider Dong__: ok, thanks
16:42 e14 joined #git
16:43 littleforest joined #git
16:44 Xuefer joined #git
16:46 SteffanW joined #git
16:46 Xuefer after resolved all cherry-pick conflicts, i have all files staged. but by mistake i typed git cherry-pick --abort (using zsh history). is it possible to restore to exactly before abort?
16:46 cdown joined #git
16:47 xall joined #git
16:48 davidfetter_ge joined #git
16:49 cdg joined #git
16:49 fuchstronaut joined #git
16:53 dan2k3k4 joined #git
16:53 buddyq i do git status and it shows wp-content/ (using wordpress) why?
16:54 buddyq why does it give this? I've made tons of changes to code and it does not show those files.
16:54 osse Xuefer: is 'git rerere' enabled?
16:55 osse Xuefer: if no (it's not by default), then you have to dig through git fsck --lost-found to find the loose blobs
16:55 osse Xuefer: IOW it may not be worth it
16:55 Xuefer yes, but is rerere recorded only if i commit?
16:56 osse oh maybe it is
16:56 osse then you're in an even deeper hole
16:57 Spec-Chum joined #git
16:57 osse git fsck --unreachable --lost-found, then dig through .git/lost-found/blob
16:57 Xuefer checking loose  blobs for 100 files is hard :(
16:58 osse I mean .git/lost-found/other
16:58 emPi joined #git
16:59 manuels joined #git
16:59 Xuefer i'll redo cherry-pick. thanks anyway
16:59 diogenese joined #git
16:59 VagabondAzulien joined #git
16:59 osse Xuefer: maybe easier if you can grep for some fairly unique strings in .git/lost-found/other
17:00 osse class names or header guards or whatever is appropriate for your language
17:02 cagedwisdom joined #git
17:03 User458764 joined #git
17:03 Guest40600 joined #git
17:04 jaguarmagenta joined #git
17:05 xall joined #git
17:06 mindriot_ joined #git
17:06 kimonorouge joined #git
17:06 cdown joined #git
17:07 mikecmpbll joined #git
17:07 btree joined #git
17:09 btree joined #git
17:10 govg joined #git
17:11 impermanence What is the appropriate way to copy a file from  one branch *over* the same file on a *different* branch?
17:12 elementalest joined #git
17:14 btree left #git
17:14 niels_ joined #git
17:15 kyan joined #git
17:17 osse impermanence: if you have different_branch checked out:  git checkout one_branch -- file; git commit -m 'Grabbed file from one_branch for reasons'
17:17 silvers joined #git
17:17 romerocesar joined #git
17:17 xall_ joined #git
17:18 impermanence osse: I think I can just do; git checkout <branch_to_update> ; git checkout <branch_to_update_from> file_to_update.txt
17:18 impermanence osse: right?
17:18 osse that's basically what i wrote
17:18 osse IOW: yes
17:18 impermanence osse: oh, cool.  And...I can do that for a tag, right?
17:19 impermanence osse: I *hope*...
17:19 dreiss joined #git
17:20 osse yup
17:21 shubhnik joined #git
17:21 nidr0x joined #git
17:23 thiago impermanence: cp
17:23 thiago :-)
17:23 Es0teric joined #git
17:23 thiago you can also do: git show ref:filename > filename
17:23 vuoto joined #git
17:27 kimonoro_ joined #git
17:28 diogenese joined #git
17:29 e14 joined #git
17:32 Endarked joined #git
17:33 finalbeta joined #git
17:36 eruditehermit joined #git
17:36 shock- joined #git
17:37 eruditehermit hey, I have a question. I did a git commit --amend and now I want to push to master. If I do git push origin master, I get merge conflicts with my own previous commit. How do I go about doing this properly?
17:37 plasticboy joined #git
17:39 jstimm joined #git
17:41 WakiMiko_ joined #git
17:44 tlaxkit joined #git
17:44 eivarv joined #git
17:45 albel727 joined #git
17:46 tom[] joined #git
17:46 dsop joined #git
17:49 xall joined #git
17:49 littleforest joined #git
17:49 VagabondAzulien joined #git
17:49 cdown joined #git
17:50 Random832 eruditehermit: --force, but be careful
17:50 fuchstronaut joined #git
17:50 Random832 you really shouldn't have pushed the old commit if you were going to amend it
17:51 Es0teric joined #git
17:51 eruditehermit Random832: When I pushed it, I didn't think there was anything wrong
17:52 eruditehermit Random832: I read that force is bad here. I didn't quite understand why, can you help clarify?
17:52 eruditehermit Random832: http://stackoverflow.com/questions/253055/how-do-i-push-amended-commit-to-the-remote-git-repo
17:52 Random832 i thought you said it stopped you from pushing
17:52 Random832 you said if you do git push you get merge conflicts
17:52 Random832 what command exactly are you getting the merge conflicts on?
17:52 Random832 it's bad because you're removing the history that exists in the remote repository and replacing it with yours, but there's also no other way to do what you want
17:52 jfran joined #git
17:53 romerocesar joined #git
17:53 eruditehermit Random832: I did a: git push origin master
17:53 Random832 that answer, and the story in the answer, is a very long-winded way of saying "don't amend after pushing"
17:54 Random832 not that there's some magical better way of still amending after pushing but not causing problems
17:54 eruditehermit ok
17:54 eruditehermit well it's relatively safe if I was the last one that comitted right?
17:54 eruditehermit no one else need know
17:54 dsantiago joined #git
17:54 Random832 unless someone pulled in between
17:55 eruditehermit nope
17:55 impermanence How can I move (not copy) a file from one branch to another?  Is that possible?
17:55 Random832 it generally depends on how many people use your repository
17:56 Random832 if someone got scolded personally by Linus, then the repository in question was *probably* the publc linux kernel repository.
17:57 jimmyeatworld joined #git
17:57 perlpilot impermanence: copy it, then "git rm" it from the other branch.
17:58 dsantiag_ joined #git
17:58 impermanence +perlpilot: but it does not exist in the second branch?  So what if I first "touch my_file" and then copy it...would that work?  That situation is really what I am asking about...
17:59 inflames joined #git
18:00 Sasazuka joined #git
18:01 syg__ joined #git
18:01 govg joined #git
18:01 troulouliou_dev joined #git
18:01 perlpilot impermanence: branch A has the file, branch B does not.  git checkout B; git checkout A filename
18:02 eruditehermit Random832: there are only 2 possible people that could pull and I know for a fact they didn't =)
18:02 impermanence +perlpilot: thank you.
18:04 hahuang65 joined #git
18:04 danslo_ joined #git
18:05 Groscheri joined #git
18:06 cdown joined #git
18:06 zpzu joined #git
18:07 Mir4g3 joined #git
18:12 MacWinner joined #git
18:12 Impaloo joined #git
18:12 mindriot101 joined #git
18:14 Sasazuka__ joined #git
18:16 saml do you use rerere?
18:17 xall_ joined #git
18:17 skift joined #git
18:18 dsantiago joined #git
18:18 emg joined #git
18:18 joki joined #git
18:19 Ardethian joined #git
18:20 e14 joined #git
18:20 Ardethian joined #git
18:20 anonymuse joined #git
18:20 e14 joined #git
18:21 aard_ joined #git
18:26 Sasazuka joined #git
18:27 Jackneill_ joined #git
18:27 mrpackethead joined #git
18:29 dsantiag_ joined #git
18:31 Anja joined #git
18:31 Sasazuka joined #git
18:33 xall joined #git
18:36 TomyLobo joined #git
18:36 IlNominePatre joined #git
18:37 Glavata joined #git
18:39 Fomina joined #git
18:39 romerocesar joined #git
18:39 kimonorouge joined #git
18:41 Rodya_ joined #git
18:42 Sasazuka joined #git
18:42 niels_ joined #git
18:44 irqq joined #git
18:45 niels_ joined #git
18:46 nwkj86 joined #git
18:46 ivan_on_trac joined #git
18:46 star_prone joined #git
18:47 xall_ joined #git
18:49 introx joined #git
18:49 introx_ joined #git
18:49 davimore__ joined #git
18:51 fstd joined #git
18:51 fuchstronaut joined #git
18:51 Glavata left #git
18:54 Sasazuka joined #git
18:56 davidfetter_ge hi
18:58 mindriot101 joined #git
18:58 HoierM joined #git
19:00 romerocesar joined #git
19:01 fuchstronaut joined #git
19:03 hahuang65 joined #git
19:03 pxdr joined #git
19:04 overlord_tm joined #git
19:04 emPi joined #git
19:04 Lorcatar joined #git
19:05 ToBeCloud joined #git
19:06 GavinMagnus left #git
19:07 cdown joined #git
19:07 tyreld joined #git
19:10 Sasazuka joined #git
19:10 xall_ joined #git
19:11 nedbat davidfetter_ge: hi, what's up?
19:11 kimonorouge joined #git
19:16 mindriot101 joined #git
19:19 xall joined #git
19:19 Learath2 joined #git
19:20 jstimm joined #git
19:21 romerocesar joined #git
19:22 buddyq joined #git
19:23 e14 joined #git
19:24 EricPoe joined #git
19:27 star_prone joined #git
19:28 uranellus joined #git
19:28 uranellus joined #git
19:28 magellanicloud joined #git
19:29 mindriot101 joined #git
19:30 davidfetter_ge nedbat: oh, i was trying to figure out how to get git not to use a pager when there's a screenful or less of output
19:31 Es0teric joined #git
19:32 xall_ joined #git
19:33 HoierM joined #git
19:34 grayjoc joined #git
19:34 qjid joined #git
19:35 pokalyis joined #git
19:38 eivarv joined #git
19:38 nedbat davidfetter_ge: best thing to do is to configure less to always act that way
19:39 nedbat davidfetter_ge: I use this:   export LESS=-isXFRQ
19:39 davidfetter_ge nedbat: ah
19:39 davidfetter_ge thanks!
19:39 nedbat davidfetter_ge: the -F does what you want.
19:40 davidfetter_ge nedbat: got it. thanks :)
19:42 romerocesar joined #git
19:42 finalbeta joined #git
19:43 buddyq ugh please help!
19:43 buddyq I have made changes to many files in a wordpress plugin of mine and when I do git status it has nothing except that I need to add wp-content/
19:43 buddyq SO I do and then it says new file: for all wp-content/themes and wp-content plugins
19:44 buddyq then I did a git rm -r --cached wp-content/themes . and it went back to wp-content/
19:44 buddyq I just want my changed files to show up!
19:45 buddyq I then did: git add wp-content/plugins/ which added the right plugins that are allowed via my gitignore file but with new file: for every file in all those plugins.
19:45 buddyq Why not just the changed files?
19:45 buddyq what happened?
19:45 dreiss joined #git
19:46 kraut joined #git
19:47 kraut hoi
19:48 GenZai joined #git
19:48 Dohplay joined #git
19:48 _ikke_ joined #git
19:48 danimal2 joined #git
19:49 kraut i've got a question to 'git describe' in combination to 'git reset', maybe i know only 1337 from the output git describe, where the output is like foo-1337-123456e. is it possible to use git reset to jump to the commit level 1337?
19:49 WaReZ joined #git
19:49 danimal2 joined #git
19:50 _ikke_ I don't think that number is well-defined
19:50 kraut from what i understood it is the number of commits ever done
19:51 kraut other info i got is "git-16.229.34804-46755e2". but i can't get that into any git context
19:51 kraut or is 46755e2 a short tag?
19:51 Random832 maybe it's an abbreviated commit hash
19:52 kraut kraut@exodus:~/lede_old/home/kraut/lede/source$ git reset --soft 46755e2
19:52 kraut fatal: ambiguous argument '46755e2': unknown revision or path not in the working tree.
19:53 Random832 the 1337 is the number of the commit *after* tag "foo", i think
19:53 kraut is that an incorrect usage of a abbreviated commit hash?
19:53 kraut so 1337 is just unspecific
19:54 Random832 I think the 123456e is a commit hash
19:55 gfixler joined #git
19:55 kraut i don't know 123456e
19:55 kraut only 1337 or "git-16.229.34804-46755e2"
19:55 cdg joined #git
19:55 johnmilton joined #git
19:56 Xethron joined #git
19:56 Random832 hmm
19:56 xall_ joined #git
19:57 danimal2 joined #git
19:57 star_prone joined #git
19:57 Random832 is there any object in git with that hash? what does git cat-file -t 46755e2 show?
19:58 _ikke_ Note that git describe hashes start with a g, which is not a part of the hash
19:58 eivarv joined #git
19:58 kimonorouge joined #git
19:58 mjanssen joined #git
19:58 kraut Random832, fatal: Not a valid object name 46755e2
19:59 Rodya_ joined #git
19:59 _ikke_ git rev-parse 46755e2
19:59 _ikke_ git cat-file expects a complete hash iirc
19:59 Random832 works for me with a short hash
19:59 Random832 and i suggested cat-file in case it's a tree or a blob
19:59 kraut fatal: ambiguous argument '46755e2': unknown revision or path not in the working tree.
20:00 jstimm joined #git
20:02 cagedwisdom joined #git
20:02 romerocesar joined #git
20:04 Random832 when i googled that string
20:04 star_prone joined #git
20:04 Random832 i found an ftp directory, with the top level directory 0169a9b
20:05 Random832 and the following file somewhere in it:
20:05 Random832 http://firmware.pberg.freifunk.net/lede/0169a9b/targets/ramips/mt7620/VERSION.txt
20:05 Random832 Feed luci: repository from git://git.lede-project.org/project/luci.git, git branch "46755e25ba541236b56c549841e5db0cf69cdd72", revision 46755e2
20:05 p3m joined #git
20:06 dreiss joined #git
20:06 pxdr joined #git
20:06 Random832 so it is a revision identifier, just possibly to a different repository than the one you're looking in
20:06 Rodya_ joined #git
20:06 HoierM joined #git
20:06 kraut oO
20:07 liuzhen joined #git
20:07 denimsoft joined #git
20:07 kraut so 46755e2 is the abbreviated commit hash of "46755e25ba541236b56c549841e5db0cf69cdd72"
20:07 Random832 yes
20:08 kraut so shouldn't git reset --soft 46755e25ba541236b56c549841e5db0cf69cdd72 work?
20:08 Random832 are you in the "luci" git repository?
20:09 Random832 okay let's back up for a minute, what problem are you trying to solve
20:09 kraut lede source.git i think
20:09 ahr3n joined #git
20:09 Random832 it said right there where i pasted it's a revision id from luci.git
20:09 kraut https://git.lede-project.org/source.git
20:10 Random832 https://git.lede-project.org/?p=project/luci.git;a=commit;h=46755e2
20:10 aidalgol joined #git
20:10 Random832 what problem are you trying to solve
20:11 kraut Random832, i want to pull/reset my source to that commit
20:11 Random832 !xy
20:11 gitinfo 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:11 kraut and i tried to understand how this could work with git
20:12 jay-m joined #git
20:14 kraut ok, my problem is, that i got a clone of that git in reboot-1952-g32c28a7 and i've got also an older backup of reboot-668-g9233db2. i want to reset to rebot-1361-g(i don't know).
20:14 kraut and the other info i got is just git-16.229.34804-46755e2, which seems to be the description of the luci commit.
20:15 Random832 google once again to the rescue
20:15 Random832 http://firmware.pberg.freifunk.net/lede/804ccd6/targets/ar71xx/generic/VERSION.txt
20:15 Random832 http://firmware.pberg.freifunk.net/lede/804ccd6/targets/ar71xx/generic/VERSION.txt
20:15 Random832 er
20:15 Random832 LEDE project: repository from git://git.lede-project.org/source.git, git branch "533d16822c84bf33ff5d18b775dafd3ab4810b17", revision reboot-1361-g533d168
20:15 kraut how dafuq did you retrieved the info 533d168? :D
20:16 Random832 i googled "reboot 1361"
20:16 Random832 and lede
20:16 kraut oh
20:17 Random832 also, given that you had reboot-1952-g32c28a7, you could *probably* have used HEAD^{591}
20:17 Random832 where 591 is 1952-1361
20:18 kraut as in git reset --soft HEAD^{591}?
20:18 Random832 er i could have sworn
20:18 Random832 nevermind i got the syntax wrong
20:18 jay-m joined #git
20:19 Random832 what does this show you: git describe `git rev-parse HEAD~591`
20:19 kraut reboot-1361-g533d168
20:19 kraut that's pertty awesome!
20:20 Electrometro joined #git
20:20 p3m left #git
20:20 Random832 so just git reset --soft 533d168~591
20:20 chachasmooth joined #git
20:21 Random832 er no
20:21 kraut why is 591 relevant there?
20:21 Random832 32c28a7~591 which == 533d168
20:21 Random832 now that you know it i guess there's no reason not to just git reset 533d168
20:22 Random832 note that in principle that's not unique - in theory there could have been a different reboot-1361 down a different branch
20:22 Random832 but it all worked out this time
20:23 kraut kraut@exodus:~/lede/source$ git describe
20:23 kraut reboot-1361-g533d168
20:23 kraut tada.wav
20:23 romerocesar joined #git
20:23 kraut git describe `git rev-parse HEAD~591 <- this one was very useful
20:24 Random832 yeah basically that was just to verify i had the math right
20:24 Random832 i wasn't 100% sure it wasn't going to be 1360 or 1362
20:24 Random832 look before you leap and all that
20:24 kraut yes and it's a method without believing google
20:25 Random832 i think you could have actually done just 'git describe HEAD~591'
20:25 ayjay_t joined #git
20:25 daynaskully joined #git
20:27 neilthereildeil joined #git
20:27 Random832 but yeah, git describe is just counting forward from a tag [or branch maybe], so if you have a later one you can probably just count backwards
20:27 Random832 though in theory it could have been on a different fork, so having the google information is also useful
20:28 neilthereildeil hi. i have a local clone of a remote repo. when there are updates in the remote repo, i use format-patch on all commits remotely and replay them locally using git am. what do i get different commit hashes locally than remotely?
20:28 UTAN_dev joined #git
20:28 pandeiro joined #git
20:29 barteks2x joined #git
20:29 grayjoc joined #git
20:29 _ikke_ joined #git
20:30 kraut Random832, ok, i think i understood the logic and i hope i will remember that ;)
20:30 kraut Random832, thanks a lot for that tip!
20:30 Random832 neilthereildeil: why are you doing that?
20:31 Random832 the reason for the different commit hashes is different committer name/date.
20:31 neilthereildeil so i can keep my local tree updated witht he remote changes
20:31 neilthereildeil ok
20:31 Random832 yes but why not just pull
20:31 tobiasvl neilthereildeil: you get different commit hashes because the commits are different. you're not integrating the commits from the remote, you're replaying the changes like you said yourself
20:31 neilthereildeil its not a git server. its a remote machine and ill have to login and download the whole .git dir, which takes a long time
20:32 neilthereildeil ok
20:32 Random832 if you don't have any local changes it'll do a fast-forward and get the same commit hashes, if you do have local changes well there's another reason for having different commit hashes obviously
20:32 Random832 neilthereildeil: there's some command for that, i helped someone else with it a few weeks ago
20:32 tobiasvl neilthereildeil: any git repo can be a remote repo, it doesn't need to be a server
20:32 neilthereildeil Random832: when you say "it'll do a fast-forward" are you referring to git pull?
20:33 m1dnight_ joined #git
20:33 Random832 log into the remote and do git update-server-info, then you should be able to pull over HTTP.
20:33 Random832 also why can't you use ssh?
20:33 tobiasvl or pull over SSH
20:34 neilthereildeil the problem is that its just qa .git directory on the remote file system
20:34 tobiasvl that's not a problem
20:34 tobiasvl you mean it's a bare repo?
20:34 Random832 how are you accessing this remote filesystem
20:34 neilthereildeil right now im logging in over sftp and downloading the whole .git folder which is slow
20:34 neilthereildeil its not bare. it has code, but im only taking the commits
20:34 Random832 are you not able to log in via ssh [i.e. to run "git send-pack" command]? is git not installed on the server?
20:35 neilthereildeil it would be faster if i just downloaded the diffs. but hashes are an issue
20:35 neilthereildeil no git isnt installed
20:35 neilthereildeil git server isnt installed
20:35 Random832 i don't mean git server
20:35 Random832 i just mean git git
20:35 tobiasvl how do the commits enter the remote repo then?
20:35 littleforest joined #git
20:35 Random832 the git command you do git with
20:35 Random832 "git"
20:35 lb joined #git
20:35 neilthereildeil yea the remote user uses git to checkin to their local folder
20:35 neilthereildeil "git" is installed there
20:36 Random832 if you set up the remote with ssh://whatever it'll use "git upload-pack" for fetch/pull and "git receive-pack" for push
20:36 Random832 doesn't require a git server
20:36 Es0teric joined #git
20:37 neilthereildeil i can ssh to the remote if thats what you mean
20:37 Random832 yes
20:37 Random832 all you need to do is be able to ssh into the remote and run git
20:37 neilthereildeil oh cool
20:37 _ikke_ joined #git
20:38 neilthereildeil also, the remote and/or the local side might be windows
20:38 neilthereildeil would the most portable method be to just d/l the whole .git folder every time?
20:38 Random832 the "git server" protocol is generally meant for public repositories where you want to share with people who don't have remote access
20:38 Random832 er, can you set up the .git folder in a HTTP shared directory?
20:38 Random832 if so then the dumb http protocol might be easiest
20:38 UTAN_dev joined #git
20:39 nerfquark joined #git
20:39 Random832 though if you have a ssh server for windows i don't see any particular reason it shouldn't work
20:39 daynaskully joined #git
20:40 neilthereildeil thats not guaranteed
20:40 neilthereildeil because sometimes its development environments
20:40 neilthereildeil ok, ill prolly just copy .git folders around
20:40 neilthereildeil thanks
20:40 Random832 or just use one remote which is in a known place
20:40 Random832 and push to it from the other environments
20:40 Guest81590 joined #git
20:41 Random832 copying git folders around will overwrite any local changes, unless you like copy it to a separate folder and use that folder as the "remote"
20:41 drbean joined #git
20:41 mindriot101 joined #git
20:42 m1dnight2 joined #git
20:42 neilthereildeil yea thats what i do. i dopy to /tmp and then pull from there
20:43 _cyril_ joined #git
20:44 romerocesar joined #git
20:44 kimonorouge joined #git
20:46 liuzhen joined #git
20:48 jnewt_ joined #git
20:50 Mobutils joined #git
20:51 einnjo joined #git
20:54 brokensyntax joined #git
20:54 Endarked joined #git
20:54 m0viefreak joined #git
20:54 neilthereildeil left #git
20:55 nettoweb joined #git
20:56 sssilver joined #git
20:57 nwkj86 joined #git
20:58 vic joined #git
20:58 gchristensen joined #git
20:59 gchristensen Hello, I have a commit on one branch I know was cherry-picked to another branch. Is there a way take the first commit and programatically find the cherry-picked version?
20:59 Lor_ joined #git
21:00 Anja joined #git
21:00 _ikke_ gchristensen: either man git patch-id or man git cherry
21:00 gitinfo gchristensen: the git-patch-id manpage is available at http://jk.gs/git-patch-id.html
21:00 gitinfo gchristensen: the git-cherry manpage is available at http://jk.gs/git-cherry.html
21:00 kimonorouge joined #git
21:00 codfection joined #git
21:00 Anja joined #git
21:01 perlpilot huh, TIL about "git cherry"
21:01 gchristensen oh wow, yeah, cool -- thank you, _ikke_!
21:04 nettoweb joined #git
21:04 manuels joined #git
21:05 romerocesar joined #git
21:06 gchristensen gosh, these are excellent tools. so fantastic. thank you again :D
21:06 _ikke_ yw
21:07 m1dnight_ joined #git
21:08 m1dnight2 joined #git
21:10 dsdeiz joined #git
21:10 dsdeiz joined #git
21:10 stomplee joined #git
21:11 romerocesar joined #git
21:14 _August_ joined #git
21:16 _August_ joined #git
21:16 _August_ "  but when i do git status theres nothing there
21:16 _August_ can someone help me out? im trying to do a git merge from another branch and i keep getting this "You have not concluded your merge (MERGE_HEAD exists).
21:16 denimsoft joined #git
21:16 _August_ "  but when i do git status theres nothing there
21:17 _ikke_ git reset
21:17 _August_ and when i push it says everything is up to date
21:17 Learath2 joined #git
21:19 WaReZ joined #git
21:19 Rodya_ joined #git
21:19 _August_ thanks
21:20 aarobc joined #git
21:22 pxdr left #git
21:26 anonymuse joined #git
21:27 sea-gull joined #git
21:30 NeverTired joined #git
21:30 ShekharReddy joined #git
21:32 ahr3n joined #git
21:32 e14 joined #git
21:32 HoierM joined #git
21:37 karstensrage joined #git
21:39 m1dnight_ joined #git
21:40 NeverDie joined #git
21:41 buddyq joined #git
21:42 nettoweb1 joined #git
21:43 geoid joined #git
21:43 sangy joined #git
21:44 bauruine joined #git
21:50 Anja lb, _ikke_ jessica (who's name appears to have two 's's, counter to your bot's spelling) touched on interesting stuff. i'm starting to get excited now! Moving along to the second video of Scott's that lb recommended.
21:50 Learath2 joined #git
21:52 Spacew00t joined #git
21:54 xall joined #git
21:57 raijin joined #git
21:59 bauruine joined #git
22:00 jimi_ joined #git
22:01 led_belly joined #git
22:03 shaggycat joined #git
22:04 mrpackethead joined #git
22:04 pokalyis joined #git
22:04 anonymuse joined #git
22:05 Electrometro joined #git
22:05 anuxivm joined #git
22:06 silvers joined #git
22:07 e14 joined #git
22:08 nettoweb joined #git
22:08 Derperperd joined #git
22:09 dsop joined #git
22:10 Learath2 joined #git
22:11 mizu_no_oto joined #git
22:11 bauruine joined #git
22:11 pokalyis joined #git
22:13 theskillwithin joined #git
22:14 Dougie187 left #git
22:15 Haliucinas joined #git
22:15 Dougie1871 joined #git
22:17 mizu_no_oto joined #git
22:18 dsop joined #git
22:20 umpc joined #git
22:23 aarobc joined #git
22:24 ISmithers joined #git
22:31 einnjo joined #git
22:33 impermanence joined #git
22:33 elsevero joined #git
22:36 moei joined #git
22:36 jrm joined #git
22:37 Pazzaz joined #git
22:39 ResidentBiscuit joined #git
22:43 _August_ joined #git
22:45 ahr3n joined #git
22:47 netj joined #git
22:50 jfr joined #git
22:51 romerocesar joined #git
22:56 Rodya_ joined #git
22:56 john52 joined #git
23:01 WhiskerBiscuit joined #git
23:02 Rodya__ joined #git
23:08 jimi_ joined #git
23:12 sssilver_ joined #git
23:14 Orbstheorem joined #git
23:14 Orbstheorem Hello, are permisions important on my .git folder?
23:15 mindriot101 joined #git
23:15 cdown joined #git
23:15 Learath2 joined #git
23:17 rkazak joined #git
23:17 railssmith joined #git
23:24 anuxivm left #git
23:26 Remram joined #git
23:26 Rodya_ joined #git
23:26 littleforest joined #git
23:28 madewokherd joined #git
23:30 john52 left #git
23:33 SwiftMatt joined #git
23:33 danimal2 joined #git
23:35 romerocesar joined #git
23:38 jimi_ joined #git
23:39 nettoweb joined #git
23:39 Orbstheorem left #git
23:39 led_belly joined #git
23:41 dsdeiz joined #git
23:43 nettoweb1 joined #git
23:46 brokensyntax joined #git
23:47 xall joined #git
23:50 tyreld joined #git
23:50 littleforest joined #git
23:51 shinnya joined #git
23:53 flavius joined #git
23:54 nanga joined #git
23:54 nanga joined #git
23:56 romerocesar joined #git
23:56 shaggycat joined #git
23:57 nettoweb joined #git
23:57 re1 joined #git

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