Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-18

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

All times shown according to UTC.

Time Nick Message
00:00 rominronin joined #git
00:01 mattfoo joined #git
00:02 eka joined #git
00:03 jontmorehouse joined #git
00:03 nettoweb joined #git
00:03 medeirosthiiago joined #git
00:06 |2701 joined #git
00:06 |2701 joined #git
00:08 mellernoia joined #git
00:08 ochorocho__ joined #git
00:12 a_thakur joined #git
00:13 hahuang65 joined #git
00:13 jstimm joined #git
00:14 anu0 joined #git
00:17 a_thakur_ joined #git
00:18 drewo joined #git
00:18 cdg joined #git
00:22 kus joined #git
00:23 aghalarp joined #git
00:23 stantonk joined #git
00:27 mischat joined #git
00:30 kus joined #git
00:31 tomog999_ joined #git
00:34 zjaffee joined #git
00:35 daynaskully joined #git
00:36 Nikesh joined #git
00:37 Nikesh I have commits (e.g.) 1..2..3..4 where 4 is the latest. How can I remove commit 2, so the tree is 1..3..4 ? I.e. discard the changes from that commit, but replay the changes after it?
00:38 Gsham joined #git
00:40 Nikesh Maybe rebase ?
00:40 mybigfriendjo joined #git
00:41 Nikesh Hm.. I'm on a working branch. Maybe I could do `git rebase -i master` then delete the line with the commit I don't want?
00:42 Nikesh Seems that works
00:44 Nikesh Out of fear I keep branching off of branches in case I mess things up.. which results in a branch named `api-upgrade-rebased-rebase-remove-commit` :P
00:45 prsn joined #git
00:46 moei joined #git
00:47 bitkiller joined #git
00:50 rewt Nikesh, you can use gitk to see exactly how things look in your history
00:51 flaguy48 joined #git
00:51 qpdb joined #git
00:51 rewt Nikesh:  use `gitk --all` inside the repo
00:54 fahadash joined #git
00:54 ajf- joined #git
00:56 csd_ joined #git
01:02 rominronin joined #git
01:05 dermoth__ joined #git
01:07 pks joined #git
01:07 nilg joined #git
01:14 eletuchy joined #git
01:15 hahuang65 joined #git
01:22 bronson joined #git
01:29 nilg joined #git
01:34 t-mart__ joined #git
01:38 ajf- joined #git
01:38 BSaboia joined #git
01:40 thiago joined #git
01:46 harish joined #git
01:46 jimi_ joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and tig welding | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Error: insufficient entries in https://madeitwor.se/git-jokes
01:49 Motoko joined #git
01:49 fuchstronaut joined #git
01:54 aidalgol- joined #git
01:58 Nikesh rewt: Aha
02:00 harish joined #git
02:00 theskillwithin joined #git
02:03 SimonNa joined #git
02:03 rominronin joined #git
02:04 joki joined #git
02:04 kam270 joined #git
02:05 linuxmint joined #git
02:06 clarens0000 joined #git
02:07 clemf joined #git
02:09 ochorocho__ joined #git
02:11 boombatower joined #git
02:12 HenriettaSalt joined #git
02:13 Kulrak joined #git
02:13 Kulrak joined #git
02:15 fujinuma left #git
02:18 clemf joined #git
02:21 nilg joined #git
02:24 HenriettaSalt joined #git
02:26 hexagoxel joined #git
02:27 fscala joined #git
02:31 d4rklit3 joined #git
02:33 chachasmooth joined #git
02:35 Asiajey joined #git
02:38 peepsalot joined #git
02:40 ForgottenPlayer_ joined #git
02:41 Sparea joined #git
02:45 liuzhen joined #git
02:45 |ifei5g00d joined #git
02:46 ForgottenPlayer_ left #git
02:49 aubar joined #git
02:54 drupald_ joined #git
02:54 Goplat joined #git
02:58 aghalarp joined #git
03:00 ajf- joined #git
03:04 rominronin joined #git
03:07 EduardoMartins joined #git
03:13 jbitdrop_ joined #git
03:14 bayman joined #git
03:15 inondle joined #git
03:15 bayman how to git pull when i made changes to local files? i don't care about the local changes and want the changes from repo instead
03:18 kinokoio joined #git
03:23 inondle If you really don't care about the local changes you could perform a hard reset and then pull the remote changes
03:24 fahadash joined #git
03:25 bayman i did git reset --hard
03:25 bayman then git pull
03:25 Eugene !transcript
03:25 gitinfo Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
03:25 bayman now I get error: The following untracked working tree files would be overwritten by merge:
03:25 stantonk joined #git
03:26 Eugene The problem is right there in the error: you have files git doesn't know about yet, and what you're asking it to do(pull=fetch+merge) would overwrite those files.
03:26 inondle I think that means you have untracked local files. `git status` should tell you which ones aren't added
03:26 Eugene You can use `git clean -fdx` to get rid of files git doesn't know about. This WILL delete them, so make sure it's what you want first.
03:27 bayman ok
03:27 inondle Eugene: +1
03:28 Eugene `git status` is a good place to go if you don't know what an error message means - it'll tell you about the repo's state.
03:28 hahuang65 joined #git
03:37 aubar joined #git
03:46 MattMaker joined #git
03:46 grift joined #git
03:51 fuchstronaut joined #git
03:51 mehola joined #git
03:51 fracting joined #git
03:53 andyhoang-work joined #git
03:57 csd_ joined #git
03:57 mjuszczak joined #git
03:57 jontmorehouse joined #git
04:01 johnwhitton joined #git
04:02 meadmoon joined #git
04:03 sd512 joined #git
04:04 sd512 hello, is it possible to do a git diff ignoring whitespace, or more specifically, ignoring differences in spaces/tabs indentation?
04:05 rominronin joined #git
04:05 preaction yes. -b, see man git diff
04:05 gitinfo the git-diff manpage is available at http://jk.gs/git-diff.html
04:05 HenriettaSalt joined #git
04:07 diogenese joined #git
04:09 eletuchy joined #git
04:10 ochorocho__ joined #git
04:11 oich joined #git
04:11 YoLoGrimm joined #git
04:12 rscata joined #git
04:17 muthu joined #git
04:17 sd512 preaction, great. Thank you.
04:18 realz joined #git
04:19 justanotheruser joined #git
04:19 Gsham joined #git
04:22 rscata joined #git
04:22 bayman joined #git
04:24 bronson joined #git
04:26 rscata joined #git
04:26 eletuchy joined #git
04:31 eletuchy joined #git
04:37 toothe joined #git
04:37 toothe when I try to do a push, I am told...
04:37 toothe failed to push some refs, updates were rejected because the tip of your current branch is behind its remote counterpart.
04:38 toothe isn't that the point of a push?
04:38 Motoko Is the remote perhaps ahead?
04:38 Motoko The point of a push is to bring your newer copy to the remote.
04:38 toothe i just forced it...
04:38 Motoko That error says your local is missing changes in the remote.
04:39 toothe um...i don't think it was ahead...I'm the only editor...
04:39 toothe yeah, I was definitely ahead locally. But that's the point.
04:43 cuqa_ joined #git
04:46 aavrug joined #git
04:47 Cabanossi joined #git
04:49 thiago toothe: don't argue with the evidence
04:49 thiago toothe: you were behind some changes from the other repository
04:49 thiago with the -f option, you've deleted whatever it was that was ahead
04:50 toothe hm..that's odd. But I am the only editor, so I guess that's fine.
04:51 PCatinean joined #git
04:52 fuchstronaut joined #git
04:52 Fissure joined #git
04:53 kenansulayman joined #git
04:53 Fissure joined #git
04:54 fracting joined #git
04:55 Fissure joined #git
04:58 OnBrokenWings joined #git
04:58 jaguarmagenta joined #git
05:00 elsevero joined #git
05:02 jetpack_joe joined #git
05:04 MattMake_ joined #git
05:04 rvsjoen_ joined #git
05:05 yaewa joined #git
05:05 jaguarma_ joined #git
05:05 blackwind_123 joined #git
05:06 Zarthus_ joined #git
05:06 andyhoang1 joined #git
05:06 sfan786_ joined #git
05:06 huhlig_ joined #git
05:06 dpower__ joined #git
05:06 Dazzyo joined #git
05:06 rominronin joined #git
05:06 preaction toothe: did you rebase perhaps? commit --amend? otherwise rewrite history?
05:06 rafalcpp_ joined #git
05:07 toothe I don't even remember.
05:07 soerenb_ joined #git
05:07 toothe I might have...i dunno. Maybe?
05:07 toothe but its okay.
05:07 preaction you could've checked. hope it wasn't important
05:07 jaafar_ joined #git
05:07 tier2vil1ain_ joined #git
05:08 angseus_ joined #git
05:08 baloney_ joined #git
05:08 yang_ joined #git
05:08 bittin_ joined #git
05:08 Shapeshi1ter joined #git
05:09 scoobert1on joined #git
05:11 florian^ joined #git
05:11 Phanes- joined #git
05:11 zalatovo_ joined #git
05:11 sorc_ joined #git
05:12 fkm_ joined #git
05:12 tabakhase__ joined #git
05:12 Olipro_ joined #git
05:12 martinbjeldbak_ joined #git
05:12 totte_ joined #git
05:12 rxc_ joined #git
05:12 johnnyfive_ joined #git
05:13 hyamamoto joined #git
05:13 bit_ joined #git
05:13 quentusrex joined #git
05:13 quentusrex joined #git
05:13 tyreld joined #git
05:13 kinokoio joined #git
05:13 sebb joined #git
05:13 parasite__ joined #git
05:13 ilogger2 joined #git
05:13 Cork joined #git
05:14 bgamari joined #git
05:14 Chunk2 joined #git
05:14 crs joined #git
05:14 jason237 joined #git
05:14 flaguy48 joined #git
05:14 thunfisch joined #git
05:14 HenriettaSalt joined #git
05:14 Gianormagantrous joined #git
05:14 Dirkson joined #git
05:14 EvanDotPro joined #git
05:15 todd_dsm joined #git
05:15 MattMaker joined #git
05:15 KellerFuchs joined #git
05:15 cite joined #git
05:15 d1z joined #git
05:15 groundnuty joined #git
05:15 d1z how can I add a folder to git but not its contents
05:15 przemoc joined #git
05:16 sebhoss joined #git
05:16 preaction you can't. git doesn't track folders
05:16 preaction you can make a hidden, empty file that git can track inside that folder
05:16 preaction but you'd be better off making a build script that created the necessary folders when necessary
05:16 akkad joined #git
05:17 grawity creating a dummy myfolder/.keep file isn't that uncommon
05:17 monokrome joined #git
05:17 d1z all good because it's not for deploy, it's just mostly for structure
05:19 preaction but if it's empty, what's the point in tracking it? if it's only needed when the app is running, build it when starting up the app
05:19 a_thakur joined #git
05:20 Hello71 joined #git
05:20 aavrug joined #git
05:20 d1z let's just say there's an abstract level at which it is useful
05:23 Phanes- left #git
05:27 heroux joined #git
05:30 harish joined #git
05:31 sauvin joined #git
05:36 rchavik joined #git
05:38 nopf joined #git
05:38 mda1 joined #git
05:38 cagedwisdom joined #git
05:39 f3r70rr35f joined #git
05:41 Alienpruts joined #git
05:42 ThomasLocke joined #git
05:45 maestrojed joined #git
05:46 Raging_Hog joined #git
05:48 rscata joined #git
05:49 akushner joined #git
05:50 LucaTM joined #git
05:50 f3r70rr35f joined #git
05:52 LucaTM joined #git
05:53 fuchstronaut joined #git
05:54 LucaTM joined #git
05:55 leeN joined #git
05:56 oich joined #git
05:56 emPi joined #git
05:56 inflames joined #git
05:57 TomyLobo joined #git
05:57 zeroed joined #git
05:58 qt-x joined #git
06:05 apotry joined #git
06:06 zeroed joined #git
06:06 zeroed joined #git
06:07 K7 joined #git
06:07 rominronin joined #git
06:09 Seveas but at a concrecte level it's absolutely pointless :)
06:09 nilsi_ joined #git
06:10 jceb joined #git
06:11 ochorocho__ joined #git
06:14 rscata joined #git
06:15 jaguarmagenta joined #git
06:16 HenriettaSalt joined #git
06:17 acolson joined #git
06:17 stantonk joined #git
06:18 Balliad joined #git
06:19 dsdeiz joined #git
06:19 Balliad joined #git
06:21 f3r70rr35f joined #git
06:21 rominronin joined #git
06:22 diogenese joined #git
06:27 bronson joined #git
06:27 rscata joined #git
06:29 elsevero joined #git
06:29 f3r70rr35f joined #git
06:29 Junior joined #git
06:30 Drzacek joined #git
06:31 Alienpruts joined #git
06:31 twb joined #git
06:32 twb If I want to write a tiny, stupid python script to generate reports about my git repos, what's the best git/python glue?
06:32 twb It looks like there's python3-git and separate python3-pygit2
06:32 d0nn1e joined #git
06:33 osse twb: maybe one is a wrapper around the git binary itself and the other uses libgit2
06:34 twb The latter is around libgit2
06:34 twb The former appears to be pure python
06:34 twb I guess that means it's slower but portabler
06:36 aidalgol joined #git
06:37 lamppid joined #git
06:37 Mobutils joined #git
06:37 Sceorem joined #git
06:38 twb Flip, to install either of them I gotta upgrade all my stale python packages
06:38 Drzacek Hello. I just installed git and trying to use it. I believe I started new repo in my project dir. Now how can my friend get a clone of that repository?
06:39 fwdit joined #git
06:39 twb Drzacek: does $friend have access to the same computer as you?
06:39 eletuchy joined #git
06:39 Drzacek twb, no, but his machine is in the same local network
06:40 fscala joined #git
06:40 prsn joined #git
06:40 twb Well you gotta both be able to access (e.g. SSH) the same host somehow
06:41 twb Although that host could be something like github
06:41 Drzacek twb, does network hdd count as "host"?
06:42 twb you mean a NAS?
06:42 Drzacek twb, not sure
06:44 twb I guess you could use anything, even a USB key
06:44 twb Drzacek: are you coming from a svn/cvs background?
06:45 alaing joined #git
06:45 alaing joined #git
06:46 alaing hi
06:46 alaing if I gitignore files and I then do git pull would my untracked files be removed?
06:47 alaing untracked as in git hidden file
06:47 twb alaing: the .gitignore file only affects things like "git add"
06:47 twb alaing: e.g. changes to an already-tracked file will still be picked up
06:48 twb alaing: "git pull" is downloading commits from somewhere else, so it won't be adding anything at all
06:49 twb alaing: if you're asking whether pull will clobber untracked files, the answer is no: http://sprunge.us/DSFZ
06:51 alaing joined #git
06:52 penna joined #git
06:52 penna hey when I use cherry-pick I have to commit those changes again on my branch. Can't I pick them and it automatically commits them to branch?
06:53 fuchstronaut joined #git
06:54 jstimm joined #git
06:54 jast penna: it does if there are no conflicts
06:54 kadoban I thought it commits automatically unless there's conflicts
06:54 twb penna: here, when I do "git cherry-pick deadbee", it commits it immediately
06:55 twb If- what they said
06:55 jast in fact there's an extra flag to make it *not* commit automatically :)
06:55 penna yeah thats why I wondered. But I have one conflict so it seems it struggles about that
06:56 jast conflicts always need to be fixed manually, so there's really no way around not committing
06:57 dan2k3k4 joined #git
06:57 nandi_ge___ joined #git
06:57 penna I deleted a bunch of subfolders in the other branch and wanted to cherry-pick those. It had one conflict for one subfolder, it seems it does not commit the non-conflict folders either.. well which is good actually I think
06:57 pantsman- joined #git
06:58 JeroenT joined #git
06:59 penna would be nice to have the same commit message in reserve after solving those conflicts. :)
07:00 MattMaker joined #git
07:00 pks joined #git
07:01 johnwhitton joined #git
07:03 alexbligh1 joined #git
07:03 SpeakerToMeat joined #git
07:03 nilg joined #git
07:04 alaing how do i remove a file that been committed some point but now I've added it to gitignore
07:04 Levitator joined #git
07:04 alaing so I want it to never appear in the repo commit history
07:04 Levitator joined #git
07:05 Levitator joined #git
07:05 subhojit777 joined #git
07:06 JeroenT joined #git
07:08 milki alaing: !secret
07:08 gitinfo alaing: [!topsecret] If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust?  There are people with clearances even on #git but they may not want to identify themselves.  However, you are protected by the biggest secret of all:  We just don't care.
07:08 milki hmm
07:08 milki not that one
07:08 milki alaing: !sensitive
07:08 gitinfo alaing: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
07:09 gajus left #git
07:10 prsn joined #git
07:10 johnwhitton joined #git
07:12 Gitzilla joined #git
07:12 qt-x joined #git
07:14 Drzacek twb, I have never used any version control
07:15 maestrojed joined #git
07:15 jast penna: git commit -c <other commit> copies the commit message
07:16 jast if you're feeling brave you can use -C and it won't even open up an editor
07:16 HenriettaSalt joined #git
07:17 br0kenman joined #git
07:17 twb Drzacek: sorry I gotta focus on work
07:17 Drzacek ok
07:17 nkygle joined #git
07:20 JeroenT joined #git
07:21 xbob joined #git
07:23 Arahael By "clearances", I presume they mean US-government clearance.
07:24 penna okay thanks jast
07:25 voiter joined #git
07:25 TomyWork joined #git
07:25 BlessJah what are preffered ways to prevent users from pushing binary blobs?
07:26 Arahael BlessJah: Team agreement and collaboration.
07:26 BlessJah and from hosting admin perspective?
07:27 Arahael BlessJah: Why should the hosting admin care?
07:27 ahmedelgabri joined #git
07:27 BlessJah because disk space, disk I/O, network bandwidth and user happiness
07:28 Arahael BlessJah: By the time disk space becomes an issue on the server, it will _already_ be an issue on the clients.
07:28 jast disk quotas or write a hook that analyzes the data that was just uploaded and possibly rejects the whole thing
07:28 jast the latter is not straightforward
07:29 Arahael I mean, seriously: 1 TB or two is cheap.
07:29 NebuK_work_ joined #git
07:29 NebuK_work_ hi
07:29 gitinfo NebuK_work_: 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.
07:29 Arahael But a 1 TB git repo? Insane.  Do any exist?
07:29 Balliad joined #git
07:30 BlessJah Arahael: with tousands of users and storage without deduplication? yes
07:30 Xethron joined #git
07:30 NebuK_work_ i‘m looking for a tool that will help me read git diffs better — i’m especially looking for diff-coloring (add/remove/same) as well as syntax highlighting (language syntax) at the same time…
07:30 Arahael BlessJah: git already deduplicates.
07:30 xbob joined #git
07:30 Arahael BlessJah: But what you're now explaining sounds like user quotas are probalby the better idea.
07:31 kadoban Arahael: Wouldn't be surprised if repos that big exist, probably some people use it for bad stuff like keeping track of their movies and such.
07:31 Arahael BlessJah: As it now sounds like you're not worried about a single repo.
07:31 BlessJah Arahael: gitlab doesn't deduplicate across forks of the same repository
07:31 aavrug joined #git
07:31 Arahael BlessJah: Of course not.  They're separate repositories.
07:31 BlessJah yep
07:32 Arahael kadoban: I tried to use it as a package manager at one point, for my personal computer.  Never again - that kind of shit is a lesson you should only learn once.  If at all.
07:32 Arahael And a quota would take care of that nicely. :)
07:32 BlessJah Arahael: it won't, everything is owned by git:git
07:33 rscata joined #git
07:33 oich joined #git
07:33 oich left #git
07:33 Arahael BlessJah: You must be using some sort of git service, then?
07:33 BlessJah gitlab
07:33 kadoban Arahael: Yeah, it's … initially tempting until you either learn how git works in depth or just try it, and then … it's not tempting at all.
07:34 eletuchy joined #git
07:34 Arahael kadoban: Well, it was a source-based repository.  All those apps on a linux system are sourcecode, right?  So adding them in as you add projects....  Compile, make install, committ...  git add...
07:34 JeroenT_ joined #git
07:34 Arahael kadoban: glibc is freaking huge, though.
07:35 Arahael BlessJah: Ah, I don't know what management tools gitlab offers.
07:35 BlessJah none but custom hooks
07:35 Arahael BlessJah: Time to get stuck on those, then.
07:35 Arahael BlessJah: Or else a cron job that investigates space hogs and nags the respective project.
07:36 Arahael THe former would be better, though.
07:37 qt-x BlessJah: I think gitlab has git lfs integration for large files
07:37 Arahael Doesn't that compound his problem?
07:40 BlessJah oh, i'm talking about preventing, not providing alternative solution (at the moment)
07:40 BlessJah gitlab has git-lfs, enterprise version has git-annex as well
07:40 JeroenT joined #git
07:40 btree joined #git
07:41 Arahael BlessJah: Sometimes you do actually want binaries in teh repo though.
07:41 JeroenT joined #git
07:42 BlessJah in rare cases end-user may request changing limits or disabling hook entirely
07:43 jceb joined #git
07:44 Arahael In that case, a hook sounds lideal.
07:44 Arahael *ideal.
07:45 wicope joined #git
07:45 jontmorehouse joined #git
07:46 BlessJah and the only (or horrible .gitignore that would prevent accidential commits)
07:47 doener joined #git
07:48 cyan__ joined #git
07:48 fracting joined #git
07:51 clmsy joined #git
07:54 fuchstronaut joined #git
07:58 kurkale6ka joined #git
08:01 osse If a file is committed with CRLF terminators and has CRLF terminators on disk why does it appear as modified?
08:02 knutstrut joined #git
08:02 am0eba joined #git
08:03 slappymcfry joined #git
08:04 totte_ left #git
08:04 prsn joined #git
08:06 qballer joined #git
08:06 aavrug joined #git
08:09 osse I removed '* text=auto' which "fixed" it. Seems like that will make Git consider files to have LF in the repo even when they actually don't.
08:11 _pix joined #git
08:11 Arahael osse: i really hate the way git does that.
08:11 osse It's moronic
08:11 ochorocho__ joined #git
08:12 Arahael the whole crlf thing on windows with git hasn't really been thought out :(
08:12 ahmed_elgabri joined #git
08:12 _pix joined #git
08:13 osse Hmm... For the most part I'm happy with it.
08:13 Twirl joined #git
08:14 Twirl Hey guys, just starting out with a repo that has 40GB of images in several directories I don't need to be touched or tracked or w/e, and I was wondering if *.jpg in the gitignore would work?
08:15 osse if *.jpg matches all the files then yes
08:15 osse if 25 GB of the images are *.jpeg or *.tiff then no.
08:15 Twirl they are in different directories
08:15 osse that's fine
08:16 osse patterns in .gitignore that don't have a slash in them match everywhere
08:16 bongjovi joined #git
08:16 JeroenT joined #git
08:16 Twirl so if I push from my repo it won't delete those jpegs right
08:16 Twirl I don't have them locally
08:17 jontmorehouse joined #git
08:17 osse it won't
08:17 osse but it sounds like you want to push into a non-bare repo. that's not recommended
08:17 Twirl it's a bare repo
08:18 eme joined #git
08:18 osse then there are no jpegs in it
08:18 osse unless you've placed them into it, next to refs/ and objects/ etc.
08:18 woodruffw joined #git
08:19 osse which sounds weird, but anyway git won't delete them
08:19 Twirl in the work dir yes
08:19 osse if it has a work dir it's not a bare repo
08:19 marcogmonteiro joined #git
08:19 woodruffw joined #git
08:19 HenriettaSalt joined #git
08:19 Twirl it's a bare repo with post-receive script
08:20 ferr joined #git
08:20 osse ah, so it doesn't have a work dir, but there is a dir where the hook dumps stuff
08:20 NebuK_work_ answer to self… meld as a DT does a pretty good job at what i liked
08:20 osse in that case it depends on what the hook does
08:20 Twirl anyways i'm seeing that in another repo it didn't delete any images so i guess it's probably not going to be a problem
08:20 osse if you ignore some files that aren't in the repo to begin with git can't delete them
08:20 osse if your hook does 'rm -rf' then that's on you
08:21 _pix joined #git
08:22 Twirl git --work-tree=/usr/share/nginx/ --git-dir=/home/site.main checkout -f
08:22 Twirl that's what the post-receive looks like
08:22 _pix joined #git
08:22 osse there's no way that can delete jpgs git doesn't know about
08:23 osse unless you commit files with the same paths and names, or there is a really horrible bug in git
08:23 Twirl alright then there is nothing to worry about then i guess
08:23 osse but that makes me wonder, why is there a need to ignore them in the first place?
08:24 Twirl it don't matter, i don't feel like getting lectured about my bad practices :)
08:24 alaing joined #git
08:24 alaing joined #git
08:25 alaing Hi milki, thanks for suggesting I look at github article to remove sensitive data
08:25 osse this doesn't sounds like bad practice, it just sounds like unneeded practice.
08:25 osse but if you also have some jpgs locally then it makes complete sense, even if it's not all of them
08:25 alaing its not really sensitive, just some .idea directory that RubyMine created and accidentally added to the repo
08:25 Twirl no the jpegs are in the working tree
08:26 Twirl of the repo
08:26 alaing I've add .idea to my gitignore but now i need to remove it from the index so it isn't tracked at all
08:26 osse alaing: git rm --cached
08:27 prsn joined #git
08:27 JeroenT joined #git
08:28 qballer_ joined #git
08:28 Balliad joined #git
08:29 lindenle joined #git
08:29 bronson joined #git
08:29 eletuchy joined #git
08:30 faux___ joined #git
08:36 alaing thanks osse
08:37 Gonzo89 joined #git
08:37 acetakwas joined #git
08:39 mweshi joined #git
08:40 zeroed_ joined #git
08:40 t-mart_ joined #git
08:40 btree_ joined #git
08:41 jargan joined #git
08:41 mehola_ joined #git
08:42 moop_ joined #git
08:43 mikecmpbll joined #git
08:43 angiebadillo_ joined #git
08:43 z4zz_ joined #git
08:43 parliament_ joined #git
08:43 paperziggurat_ joined #git
08:43 codedmart_ joined #git
08:43 skelterjohn_ joined #git
08:43 GameGamer43_ joined #git
08:43 spr0tsuki_ joined #git
08:43 shauna_ joined #git
08:44 sfan786_ joined #git
08:44 kadoban_ joined #git
08:44 eqs joined #git
08:44 jonmorehouse joined #git
08:44 bbhoss_ joined #git
08:44 contracode_ joined #git
08:44 rfv_ joined #git
08:44 kkirsche joined #git
08:44 jrm2 joined #git
08:44 lmatteis_ joined #git
08:44 r3c0d3x_ joined #git
08:44 venmx_ joined #git
08:44 rideh- joined #git
08:44 High joined #git
08:44 phroa` joined #git
08:44 Cerise_ joined #git
08:44 Cerise_ joined #git
08:44 braderhart_ joined #git
08:44 mukmuk_ joined #git
08:44 gravitron_ joined #git
08:44 tomek2 joined #git
08:44 vals_ joined #git
08:44 danieli_ joined #git
08:44 pwnawannab joined #git
08:45 Virox_ joined #git
08:45 kake|| joined #git
08:45 Kehet_ joined #git
08:45 sbeller_ joined #git
08:45 greymalkin_ joined #git
08:45 sangy_ joined #git
08:45 adamm_ joined #git
08:45 tvl joined #git
08:45 fscala_ joined #git
08:45 cmosguy_ joined #git
08:45 tjbp_ joined #git
08:45 des_cons1lado joined #git
08:45 ionelmc_ joined #git
08:45 JeremyD joined #git
08:45 colona_ joined #git
08:45 esc_ joined #git
08:45 Slush-_ joined #git
08:45 abec0_ joined #git
08:45 ecraven- joined #git
08:45 Xe` joined #git
08:45 asdofindia_ joined #git
08:45 axisys_ joined #git
08:45 ueberall joined #git
08:46 GingerGeek joined #git
08:46 preilly joined #git
08:46 bazz joined #git
08:46 grawity joined #git
08:46 jbondhus_ joined #git
08:46 bodie__ joined #git
08:46 GingerGeek joined #git
08:46 Jellyg00se joined #git
08:46 dx- joined #git
08:46 Remram joined #git
08:46 ariver joined #git
08:46 TheVoid joined #git
08:46 davidstrauss joined #git
08:46 dwmw2_gone joined #git
08:46 githogori_ joined #git
08:46 batrick_ joined #git
08:46 j416_ joined #git
08:46 ashnur joined #git
08:46 ashnur joined #git
08:46 stfn joined #git
08:46 Diabolik joined #git
08:46 hiroki joined #git
08:46 chrysa joined #git
08:46 peterz joined #git
08:46 codebam joined #git
08:46 TheBrayn joined #git
08:46 lamppid joined #git
08:46 asd5a joined #git
08:46 ReenignE joined #git
08:46 ReenignE joined #git
08:46 boingy joined #git
08:46 codebam joined #git
08:46 _rgn joined #git
08:46 _rgn joined #git
08:46 CustosLimen joined #git
08:46 jhermann joined #git
08:46 jhermann_ joined #git
08:46 Urbany joined #git
08:46 blackwind_123 joined #git
08:46 gniourf joined #git
08:46 Chunk2 joined #git
08:46 jokester joined #git
08:47 fiete joined #git
08:47 CentaurWarchief joined #git
08:47 liuzhen_ joined #git
08:47 Lowell joined #git
08:47 blackjid joined #git
08:47 Kamilion joined #git
08:47 Caelum joined #git
08:47 cuqa_ joined #git
08:48 JeroenT joined #git
08:48 razieliyo joined #git
08:48 prsn joined #git
08:48 arand joined #git
08:48 bedouin joined #git
08:48 lamont joined #git
08:48 rainbyte joined #git
08:48 CussBot joined #git
08:48 jackburton joined #git
08:48 sadmac joined #git
08:49 daytime joined #git
08:49 eggoez joined #git
08:49 Mobutils joined #git
08:49 Nothing4You joined #git
08:49 apipkin_ joined #git
08:50 ilmari joined #git
08:50 MrFeedback joined #git
08:50 Ph_ joined #git
08:50 Macaveli joined #git
08:51 rancyd joined #git
08:51 bttf joined #git
08:51 MrFeedback i installed a plugin in my repository via composer. then commited and pushed it to the repo. on the dev server i pulled the repo but it didn´t download the installed plugin, as it seems to be a submodule. how can I tell git, that there is a submodule which should be also tracked?
08:51 marcogmonteiro joined #git
08:52 NightStrike joined #git
08:52 DistantStar joined #git
08:52 osse git submodule add
08:52 chigang_ joined #git
08:52 dhanush joined #git
08:52 osse regardless you have to du git submodule init or somesuch at the other repo
08:52 knutstrut joined #git
08:52 Twirl hi, any possible reason for some changes not being commited to my bare repo?
08:53 Eugene joined #git
08:53 Twirl it works for most files except this particular one
08:53 MrFeedback osse: this means i should do git submodule add on my pc and then recommit ?
08:53 beckyconning_ joined #git
08:53 cstrahan joined #git
08:53 Didac joined #git
08:54 DarkMukke joined #git
08:54 elijah joined #git
08:54 osse MrFeedback: i think perhaps git has done that for you when you did git add that/directory. I'm not sure
08:54 Tee_Pee joined #git
08:54 ggherdov_ joined #git
08:54 drewo joined #git
08:54 MrFeedback when i use git submodule foreach git pull origin master it tells me on the server that there are no submodules
08:54 MrFeedback so i guess i hasn´t
08:54 osse try git submodule init først
08:55 ajm203_ joined #git
08:55 quackgyver joined #git
08:55 fuchstronaut joined #git
08:55 MrFeedback can this command be undone/reverted if this now breaks things?
08:56 eliasp joined #git
08:56 osse what's "this command" ?
08:56 _ikke_ composer does not use submodules..
08:57 MrFeedback ?
08:57 cspotcode joined #git
08:57 circ-user-iSXQf joined #git
08:57 shennyg joined #git
08:57 acetakwas joined #git
08:57 mehdi_ joined #git
08:58 fuchstronaut joined #git
08:58 fwdit joined #git
08:58 JohnLea___ joined #git
08:58 murph joined #git
08:58 harleypig joined #git
08:58 iamdevnul joined #git
08:58 Twirl nvm i was editing the wrong file
08:58 etcinit joined #git
08:59 aendrew joined #git
08:59 da5id joined #git
08:59 jonha joined #git
08:59 [diecast] joined #git
08:59 daxroc joined #git
09:00 angular_mike joined #git
09:00 sans_s3r1f joined #git
09:00 sr___ joined #git
09:00 _ikke_ MrFeedback: composer typically puts the libraries in the vendor directory
09:01 _ikke_ common practice is to not commit this, but use composer to fetch the libraries instead
09:01 MrFeedback hmm
09:01 _ikke_ composer creates a lock file that specifies exactly what versions to use
09:02 d0nn1e joined #git
09:02 qtax^w joined #git
09:02 noahsussman joined #git
09:02 zeroed joined #git
09:02 MrFeedback thanks for the input!
09:02 prosodyContexte joined #git
09:02 inflames joined #git
09:03 nnyk joined #git
09:03 troyt joined #git
09:04 radsy joined #git
09:05 ToeSnacks joined #git
09:06 skylite joined #git
09:06 twisted` joined #git
09:06 attila_ joined #git
09:07 infernix joined #git
09:09 King_Hual joined #git
09:10 jaguarmagenta joined #git
09:11 c0ded joined #git
09:12 c0ded joined #git
09:13 toogley joined #git
09:16 mdw joined #git
09:18 JohnBat26 joined #git
09:20 HenriettaSalt joined #git
09:20 Sceorem joined #git
09:20 AndreSomers joined #git
09:22 muthu joined #git
09:23 Trieste joined #git
09:24 LeBlaaanc joined #git
09:25 NebuK_work_ left #git
09:27 ocbtec joined #git
09:28 JeroenT joined #git
09:30 gaen joined #git
09:32 sdothum joined #git
09:35 AIDE joined #git
09:35 AIDE left #git
09:35 theresajayne joined #git
09:36 ferr joined #git
09:36 totte joined #git
09:37 testild joined #git
09:38 dsdeiz joined #git
09:39 MadHatter42 joined #git
09:40 aavrug joined #git
09:41 prsn joined #git
09:42 [cust] joined #git
09:43 jceb joined #git
09:44 mdw joined #git
09:47 vrandkode joined #git
09:48 drewo joined #git
09:58 csd_ joined #git
09:59 mda1 joined #git
10:01 _noblegas joined #git
10:02 JeroenT joined #git
10:02 AndreSomers joined #git
10:02 fracting joined #git
10:02 Virox_ left #git
10:04 Virox joined #git
10:04 darkbit joined #git
10:09 btree joined #git
10:12 ochorocho__ joined #git
10:13 stantonk joined #git
10:14 CheckDavid joined #git
10:15 diegoaguilar joined #git
10:16 Junior joined #git
10:16 dopesong joined #git
10:16 Panacea joined #git
10:17 maestrojed joined #git
10:18 nardev joined #git
10:18 bgamari joined #git
10:20 AndreSomers joined #git
10:20 HenriettaSalt joined #git
10:21 rominronin joined #git
10:24 bgamari- joined #git
10:25 notebox joined #git
10:26 Cracker2_ joined #git
10:27 DonRichie joined #git
10:28 LeMike joined #git
10:29 noteness joined #git
10:31 lindenle joined #git
10:31 bronson joined #git
10:32 rchavik joined #git
10:35 aguimaraes1986 joined #git
10:35 dopesong joined #git
10:35 noteness joined #git
10:36 prsn joined #git
10:36 aavrug joined #git
10:37 FunkyAss joined #git
10:38 jimi_ joined #git
10:38 WayToDoor joined #git
10:39 MattMaker joined #git
10:40 nilsi joined #git
10:40 Elysia joined #git
10:40 rafalcpp joined #git
10:42 drewo joined #git
10:45 dcpc007 joined #git
10:46 boboc joined #git
10:53 Bubo joined #git
10:53 Bubo how do I remove a file names :w
10:53 jimmybuffet joined #git
10:53 johnmilton joined #git
10:53 Bubo ± git rm :w
10:53 Bubo fatal: pathspec ':w' did not match any files
10:53 selckin try rm -- :w
10:56 Bubo selckin, doesn't work
10:57 Bubo selckin, I did a rm :w and now in status I have deleted: :w
10:57 Bubo how do I commit this
10:57 Bubo left #git
10:57 Bubo joined #git
10:58 osse Bubo: git add -u
10:59 diegoaguilar joined #git
10:59 tabakhase__ left #git
10:59 tabakhase joined #git
11:00 Bubo thanks
11:00 deadnull joined #git
11:01 ximvan joined #git
11:01 nettoweb joined #git
11:07 mweshi joined #git
11:09 fracting joined #git
11:10 jaguarmagenta joined #git
11:11 mweshi joined #git
11:12 ajf- joined #git
11:13 JeroenT joined #git
11:13 ajf- joined #git
11:14 noidea joined #git
11:20 mischat joined #git
11:20 mischat joined #git
11:21 HenriettaSalt joined #git
11:22 achadwick joined #git
11:22 rnsanchez joined #git
11:23 dpower joined #git
11:25 BtbN joined #git
11:25 sonOfRa joined #git
11:26 mrkat joined #git
11:30 prsn joined #git
11:32 mweshi joined #git
11:33 PCatinean joined #git
11:33 acetakwas joined #git
11:34 acetakwas joined #git
11:34 rivarun joined #git
11:35 ashka` joined #git
11:36 mweshi joined #git
11:37 drewo joined #git
11:38 nikio_ joined #git
11:38 nikio_ why does the master branch on github not show the commits from a branch that just got merged into it?
11:39 piling joined #git
11:39 rahtgaz joined #git
11:39 BtbN does it show the merge commit?
11:39 nikio_ yes
11:39 BtbN scroll down then.
11:39 BtbN Depending on how old the commits in the merged branch were, a lot.
11:39 digidog joined #git
11:40 nikio_ BtbN, what if i do git reset --hard HEAD^ on the master
11:40 nikio_ going to the commit before the merge commit
11:40 BtbN you'll be doing exactly that?
11:40 nikio_ yes
11:41 nikio_ the commits from the merged branch would disappear from the master commit history?
11:41 osse yes
11:41 nikio_ hmm i must hv just not seen them then
11:41 nikio_ since i already did the reset
11:42 nikio_ I was just worried that those commits would remain in history
11:42 nikio_ so all is good I guess
11:42 mizu_no_oto joined #git
11:43 ahmed_elgabri joined #git
11:43 nikio_ because I googled about whats the best way to undo a merge
11:43 nikio_ and they were talking about revert
11:44 nikio_ but I just did the reset
11:44 nikio_ I guess that works too
11:44 nikio_ i think the reset is the only True undo
11:45 nikio_ revert is the save undo but the commit history is left modified
11:46 nikio_ is that true osse?
11:47 BtbN resetting alters histroy, so causes hazzard for anyone using that repo.
11:48 nikio_ lets hope nobody branched of the dirty master
11:48 nikio_ what if they did? whats the fix?
11:49 BtbN hard reset to master, and hope they didn't modify anything yet.
11:49 BtbN to origin/master
11:49 nikio_ what if they have a long branch branching of the dirty master?
11:50 BtbN Just don't force-push if you're not the only one using a repo.
11:50 nikio_ well we like to be naughty sometimes
11:50 merlyn joined #git
11:51 nikio_ i guess you can rebase or something
11:52 merlyn left #git
11:52 nikio_ right?
11:52 ams_ joined #git
11:52 |2701 joined #git
11:53 osse yes
11:54 osse but you have to be clever about it
11:54 osse so that you don't accidentally include the unwanted merged-in commits
11:55 ojdo joined #git
11:55 osse see "Recovering from upstream rebase" in man git-rebase
11:55 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
11:57 josuebrunel joined #git
11:59 fuchstronaut joined #git
12:00 prsn joined #git
12:01 fstd joined #git
12:02 JeroenT joined #git
12:04 ahmed_elgabri joined #git
12:05 hanthings_ joined #git
12:05 albel727 joined #git
12:05 Sceorem joined #git
12:07 zeroed joined #git
12:07 mdw joined #git
12:09 baxx joined #git
12:09 chachasmooth joined #git
12:09 italoacasas joined #git
12:10 fahadash joined #git
12:10 aavrug joined #git
12:10 jimmybuffet joined #git
12:11 am0eba joined #git
12:12 maucar joined #git
12:12 tinajohnson___ joined #git
12:13 JeroenT joined #git
12:13 ochorocho__ joined #git
12:14 LeMike joined #git
12:15 JeroenT joined #git
12:17 ahmed_elgabri joined #git
12:22 HenriettaSalt joined #git
12:24 Smashcat joined #git
12:24 fuchstronaut joined #git
12:25 Smashcat Hi, is there an easy way to edit a Readme.md file on github without having to pull the repository down to my PC? I created the Readme on the site, but it won't allow me to edit it - error is that I have to create a branch.
12:26 baxx is it your repo?
12:26 baxx usually you can edit things on line
12:26 baxx Smashcat: ^
12:26 Smashcat Yes the site created the file in the repo
12:26 MattMaker joined #git
12:26 fuchstronaut joined #git
12:27 dopesong joined #git
12:27 baxx then click on the file
12:27 fuchstronaut joined #git
12:27 baxx in the top right theres a pencil by history
12:27 baxx you can edit from there
12:27 Smashcat Yeah but I can't edit it as it tells me it has to be on a branch to edit
12:28 baxx well idk what's happend sorry i've never seen that, if you've set up a repo, go to it, click on a file , click on the pencil you can usually edit it from there
12:29 Smashcat Must be a new thing they've added. Or a bug I guess.
12:29 wviana_ joined #git
12:29 baxx dunno, works fine here
12:29 selckin link?
12:29 tobiasvl Smashcat: perhaps you are viewing a different commit
12:29 zeroed joined #git
12:29 Smashcat It's a private repo
12:29 tobiasvl a commit not pointed to by a branch
12:29 chachasmooth joined #git
12:29 rgrinberg joined #git
12:29 tobiasvl aka. a detached HEAD
12:30 jaeckel joined #git
12:31 Smashcat tobiasvl: All I've done is go to the repo on the github site - clicked the button to add a Readme.md, and created one. It added it ok to the repo, but now won't allow me to edit it. I'll try pulling the entire thing down, so I can edit the file then push it back up I guess
12:31 drewo joined #git
12:31 baxx Smashcat: have you actually finished making the repo etc?
12:31 baxx open it in a new tab and try it
12:31 Smashcat Yeah this is a finished project, just wanted to add the Readme
12:32 Smashcat Repo is about 4 months old.
12:32 fracting joined #git
12:33 lindenle joined #git
12:33 notebox joined #git
12:34 deadnull joined #git
12:34 Smashcat Filing it as a bug with support - they can look into it :)
12:34 Maxis joined #git
12:35 MarkyC joined #git
12:37 circ-user-iSXQf joined #git
12:37 acetakwas joined #git
12:37 Smashcat Ah right, opened it in Chrome, and now can edit it. I've refreshed FF numerous times, and it's still unable to edit it. <shrug>
12:38 aavrug joined #git
12:38 Impaloo29 joined #git
12:39 jost joined #git
12:39 KeelOfSteel joined #git
12:40 rwb joined #git
12:40 grindhold joined #git
12:41 Lipp joined #git
12:43 baxx Smashcat: ;)
12:43 rafalcpp so, I often do:
12:44 rafalcpp git merge somerepo/the_branch_I_have_now   where the_branch_I_have_now is the one shown e.g. by git ps1
12:44 rafalcpp how to avoid typing "the_branch_I_have_now" each time
12:44 rafalcpp I could bind a key in bashrc for one, but is there some other good solution?
12:46 medeirosthiiago joined #git
12:46 Evui joined #git
12:49 jast if it's usually always the same repo for the same branch, you can just set somerepo/thebranch as thebranch's upstream
12:49 jast then the short hand becomes 'git merge' :)
12:51 bitkiller joined #git
12:53 rafalcpp jast: I have say 4 repositories.  and any of the branches I want to push to them
12:54 narendraj9 joined #git
12:54 prsn joined #git
12:54 jast different story, then, I guess
12:54 tach_ joined #git
12:55 jost joined #git
12:57 csd_ joined #git
12:59 EY rafalcpp, @{u}?
13:02 osse rafalcpp: git config --global merge.defaultToUpstream true;  now you can just type 'git merge' \o/
13:02 WayToDoor joined #git
13:03 jast that's what I said :}
13:03 puff Good morning.
13:05 APic Hi
13:06 osse jast: almost. I think you have to set that config thingy yourself; it's not default
13:06 DevAntoine joined #git
13:06 DevAntoine hi
13:06 rafalcpp EY: @{u} does not work for me, how should it work?
13:06 King_Hual joined #git
13:06 osse jast: hmm, maybe that has changed... but i did add that to my own config for a reason
13:06 rafalcpp osse: but if I just "git merge" then how to once merge from repository1, and other time merge from repository2
13:06 Gamecubic joined #git
13:06 King_Hual joined #git
13:06 King_Hual joined #git
13:07 DevAntoine really noob question here: I want to checkout the remote branch origin/feature/API_Sychro. How do I do that? If I try "git checkout feature/API_Synchro" => error: pathspec 'feature/API_Synchro' did not match any file(s) known to git.
13:07 narendraj9 joined #git
13:07 rafalcpp workflow is like,  when I am on branch stableversion
13:07 rafalcpp git merge john/stableversion
13:07 rafalcpp git merge bob/stableversion
13:09 Pieplay joined #git
13:09 rafalcpp git merge satoshi/stableversion
13:09 rafalcpp then I go to branch demo2016, and do the same there for 3 repositories
13:10 osse I don't think there is a shorthand for that
13:10 osse you could create a small script to do it.
13:11 raijin joined #git
13:11 DevAntoine is there an issue because I have a slash in the branch name?
13:11 jaguarmagenta joined #git
13:11 DevAntoine because this seems dead simple: http://stackoverflow.com/questions/​1783405/checkout-remote-git-branch
13:11 osse DevAntoine: try adding a -- after the name
13:12 DevAntoine with a space osse?
13:12 osse yes
13:12 osse git checkout blah --
13:12 osse !--
13:12 DevAntoine osse: fatal: invalid reference: feature/API_Synchro
13:12 gitinfo [!dashes] Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"
13:13 osse DevAntoine: then you have to do it manually:  git checkout -b feature/API_Synchro origin/feature/API_Sychro
13:13 DevAntoine osse: yes, I know this way, but I'm wondering why the shortcut doesn't work?
13:14 rnsanchez_ joined #git
13:14 osse DevAntoine: in addition to origin/feature/API_Sychro is there also a otherremote/feature/API_Sychro ?
13:14 DevAntoine erf, it doesn't work that well... fatal: Couldn't find remote ref feature/API_Synchro
13:14 osse ah, then it must be a typo on your part
13:14 DevAntoine oh fml
13:14 DevAntoine API_Sychro
13:14 DevAntoine thanks awesome coworker
13:14 DevAntoine TT
13:15 prsn joined #git
13:15 netj joined #git
13:17 EY joined #git
13:18 eletuchy joined #git
13:18 dopesong joined #git
13:18 madewokherd joined #git
13:18 osse you're welcome
13:18 jimi_ joined #git
13:20 bgamari joined #git
13:20 dopesong joined #git
13:20 rchavik joined #git
13:22 Asiajey joined #git
13:22 Gsham joined #git
13:22 Darcidride joined #git
13:23 HenriettaSalt joined #git
13:24 rbr joined #git
13:25 drewo joined #git
13:25 faux___ joined #git
13:26 chitopunk joined #git
13:27 ajf- joined #git
13:27 f3r70rr35f joined #git
13:28 mweshi joined #git
13:28 eeuymh joined #git
13:30 fuchstronaut joined #git
13:33 DevAntoine thanks osse :)
13:34 bronson joined #git
13:34 aavrug joined #git
13:34 nivag joined #git
13:36 leeN joined #git
13:36 noteness joined #git
13:38 toogley joined #git
13:38 nilsi joined #git
13:41 mangolisk_ joined #git
13:42 synthmeat joined #git
13:43 synthroid joined #git
13:43 dopesong joined #git
13:44 AaronMT joined #git
13:44 dsfreak93 joined #git
13:44 cdg joined #git
13:46 narendraj9 joined #git
13:48 Dougie187 joined #git
13:48 jimmybuffet joined #git
13:49 RickyB98 joined #git
13:49 RickyB98 joined #git
13:50 prsn joined #git
13:50 LekeFly joined #git
13:51 Gsham joined #git
13:54 jaguarmagenta joined #git
13:55 HenriettaSalt joined #git
13:55 fracting joined #git
13:58 phaleth joined #git
14:00 jab416171 joined #git
14:00 leonarth joined #git
14:07 fuchstronaut joined #git
14:07 relipse2 joined #git
14:08 csd_ joined #git
14:11 Panacea joined #git
14:11 robotroll joined #git
14:12 durham joined #git
14:14 ochorocho__ joined #git
14:14 harish_ joined #git
14:14 kus joined #git
14:14 turbofluxinator joined #git
14:14 tvw joined #git
14:15 MattMaker joined #git
14:17 dhollinger joined #git
14:17 ajf- joined #git
14:18 molgrum left #git
14:18 nivag joined #git
14:18 SpeakerToMeat joined #git
14:19 mweshi joined #git
14:19 scorphus joined #git
14:19 drewo joined #git
14:19 ash_workz joined #git
14:20 neanderslob joined #git
14:23 atrigent joined #git
14:24 ahmed_elgabri joined #git
14:24 turbofluxinator left #git
14:24 mozzarel1 joined #git
14:27 am0eba joined #git
14:27 EY joined #git
14:28 jonmorehouse joined #git
14:28 mikecmpbll joined #git
14:28 jast osse: I may have skipped over a few minor details :}
14:30 OliverJAsh joined #git
14:30 sebboh joined #git
14:31 sebboh Can you help me fill in the blank?  fetch is to pull as ??? is to push.
14:31 troulouliou_div2 joined #git
14:31 Dougie187 sebboh: There isn't anything to fill in there.
14:31 Dougie187 Fetch isn't really like pull. But fetch is more like push than anything.
14:31 Dougie187 At least, the opposite of push
14:32 rodrigograca31_ joined #git
14:32 sebboh Ok, I didn't see anything in the help -a output that looked like it would fill in that blank.
14:32 Dougie187 So, fetch and push are like opposites, and pull is like fetch + merge.
14:33 scorphus joined #git
14:33 sebboh But push will update HEAD on the remote, right?
14:33 roentgen joined #git
14:33 sebboh Can I just send the commits but not alter the... uh refs? HEAD and such?
14:34 SimonNa joined #git
14:34 mmlb joined #git
14:34 faheem joined #git
14:34 Dougie187 The remote doesn't really have a HEAD.
14:34 Dougie187 It's a bare repo, so it doesn't have a checkout.
14:35 Dougie187 Well, depending on how you set it up at least.
14:35 subhojit777 joined #git
14:35 Dougie187 push will update a ref though. As will fetch.
14:35 efco joined #git
14:35 lindenle joined #git
14:35 Dougie187 But as far as I know, no, you can't. But similarly you can't fetch commits that don't have a ref.
14:35 sebboh This one has a HEAD, yes.  These are all checkouts, three workstations with slightly different versions of an application. I just want all the code in one place so I can do comparisons.
14:35 Dougie187 (as far as I know at least)
14:37 espindola joined #git
14:37 atrigent_ joined #git
14:37 ahmed_elgabri joined #git
14:37 sebboh I thought fetch pulled the changes down into ... the git db? but didn't change your checkout. Actually it doesn't much matter what I thought--I already know that what actually happens isn't what I think happens.  I'm just going to log into the other workstation and add this one as a remote and fetch.
14:38 sebboh and still, thanks for the information.  It will eventually congeal into understanding. ;)
14:40 sebboh ... can't fetch commits that don't have a ref.  At least not by default.  That makes sense, I guess when you fetch you say "hey what is HEAD?  Ok, send that
14:40 sebboh and the parents", eh?
14:40 quenode_ joined #git
14:41 a_thakur joined #git
14:41 tach__ joined #git
14:41 durham_ joined #git
14:44 rewt sebboh, in git, HEAD is what you currently have checked out in your working files... you can't "fetch HEAD" because the remote has no idea where your HEAD is
14:44 jstimm joined #git
14:44 kurkale6ka joined #git
14:44 sebboh What is the latest commit on a branch in a remote (bare repo) called?
14:44 rewt the branch
14:45 rewt a branch in git is just a pointer to the last commit in a series of commits
14:45 MadHatter42 joined #git
14:45 rewt when you commit to a branch, you make a child commit to the commit currently pointed to by the branch, and move the branch pointer to the new commit
14:45 scorphus joined #git
14:46 sebboh ie master. ok.  So when you fetch... what you ask for is .. 'the brach', ie the pointer you refer to.  And you may ask for all branches, but that's an aside.
14:46 rewt when you push, you send the new commit(s) to the remote and tell it to move the branch pointer to the same commit as it points to locally
14:46 faux___ joined #git
14:46 rewt when you fetch, you ask for all commits that you don't have locally
14:46 rewt and refs (branches/tags)
14:47 rewt note that when you fetch, your local repo's branch may not be updated to match the remote branch (which is designated as something like remotes/origin/branchname)
14:47 sebboh ... oh.  Like, literally, you ask for all commits you don't have, not just those in the refs?  That sounds.. expensive. :)
14:48 rewt yeah, well, git is smart about transferring as little as possible
14:48 Zamyatin joined #git
14:50 tach___ joined #git
14:51 jonmorehouse joined #git
14:51 emdete joined #git
14:53 bsanford joined #git
14:53 Twirl Hi, i'm on git 1.9.1, deleted a bunch of files and then git add . and it's telling me that the paths (removed files) are ignored, idk what that means, it's suggesting to git add --all <pathspec> that will also let me record removals, so i need to git add --all . ?
14:54 emdete hi, i have a weird problem: git generates modified files for me ;) i checkout a branch and it says many files were modified which i did not touch. it seems to be a crlf problem... what does git do here?
14:54 emdete Twirl: do you use `git rm`?
14:54 Twirl nope just git add .
14:54 emdete i mean "deleted a bunch of files"
14:54 emdete how so?
14:55 emdete git add . adds new files but you deleted ... so use `git rm` or a pathspec with commit
14:55 NeverDie joined #git
14:55 njbair joined #git
14:57 baba_ joined #git
14:58 Caelum joined #git
14:58 Twirl no I don't want to delete the files foreve
14:58 Twirl i want to delete them in this branch
14:58 Twirl maybe git rm --cached . ?
14:59 clemf joined #git
14:59 fuchstronaut joined #git
15:01 tg` joined #git
15:01 doppo joined #git
15:01 purrkode joined #git
15:01 deepy joined #git
15:01 jast Twirl: git rm --cached is one way to do it, but in your case you can use 'git add -u' which does the exact same thing as 'git add' except it picks up deletions, too
15:02 LeBlaaanc joined #git
15:02 stantonk joined #git
15:02 Twirl jast alright so i checked out to my different branch in where i want the files deleted
15:02 jast 'git add --all .' is equivalent too, but it will also add all new files
15:02 Twirl yea that's what i need
15:02 jast that's not a good habit to get into, using 'git add .' indiscriminately
15:02 Twirl anyways, will it delete the files from the other branch i'm not checked in ?
15:02 jast git add -u without args will automatically pick up only changes and deletions
15:03 Twirl if i manually delete a file and then git add . will it keep existing in the other branch i commited and checked out?
15:04 ferr joined #git
15:04 Twirl idk if that's the right way to put it though
15:06 eletuchy joined #git
15:07 zivester joined #git
15:08 zalatovo joined #git
15:10 Sasazuka joined #git
15:10 kilo_bravo joined #git
15:11 emdete left #git
15:11 stantonk_ joined #git
15:12 prsn joined #git
15:12 fees joined #git
15:13 drewo joined #git
15:14 jast Twirl: if the file exists in the topmost commit in one branch, and you delete it in another branch, it won't disappear from that first one
15:14 bango2 joined #git
15:15 Panacea joined #git
15:16 kpease joined #git
15:17 baba_ joined #git
15:22 ahmedelgabri joined #git
15:22 EY joined #git
15:24 hobodave joined #git
15:31 maucar joined #git
15:32 ahmedelgabri joined #git
15:32 blackpajamas joined #git
15:32 thiago joined #git
15:33 CJKinni joined #git
15:33 ceaucari joined #git
15:34 |2701 joined #git
15:34 |2701 joined #git
15:34 Alienpruts joined #git
15:35 dopesong joined #git
15:35 tlaxkit joined #git
15:36 Motoko joined #git
15:36 SteffanW joined #git
15:36 bronson joined #git
15:37 wavis joined #git
15:38 wavis is there a git equivalent for hg's 'bundle'? IE, how to send a group of commits over email?
15:38 jast yes, it's called 'bundle' :)
15:38 _ikke_ or git am to send them as plain-text patches
15:38 jast though if you like plaintext mails you may want to look at git format-patch
15:39 _ikke_ sorry, what jast said
15:39 wavis ah... i just assumed it would be different :P thanks
15:39 irqq joined #git
15:39 osse statistically speaking a sound assumption
15:39 perlpilot osse: how do you figure?
15:40 jast well, git did name quite a few things differently
15:41 tomek2 left #git
15:41 tomek joined #git
15:41 osse perlpilot: if hg_to_git is f(x) then f(x) != x
15:41 osse u feel me bruh
15:42 osse except for x = bundle, commit, log, push, clone, and probably several others
15:42 perlpilot Aye, I'm asking for your statistics that show it a valid assumption  :)
15:42 osse I made it up on the spot
15:42 _ikke_ git <-> hg: pull <-> fetch, fetch <-> pull
15:43 perlpilot of course, 83% of all statistics are made up on the spot
15:43 Caelum joined #git
15:43 SporkWitch joined #git
15:45 stantonk joined #git
15:45 madewokherd joined #git
15:45 stantonk joined #git
15:48 chachasmooth joined #git
15:49 CJKinni joined #git
15:49 jbitdrop joined #git
15:50 nettoweb joined #git
15:51 dopesong joined #git
15:52 Levitator joined #git
15:52 Levitator joined #git
15:53 Levitator joined #git
15:56 chachasmooth joined #git
15:58 soc42 joined #git
15:58 LeBlaaanc how do i get the tag message for a specific tag?
15:58 elastix joined #git
15:59 _ikke_ Probably using git show
15:59 jonmorehouse joined #git
16:00 eletuchy joined #git
16:00 CJKinni joined #git
16:01 gmurop joined #git
16:01 maestrojed joined #git
16:02 f3r70rr35f joined #git
16:02 ToBeCloud joined #git
16:02 LeBlaaanc hrm
16:03 MattMaker joined #git
16:03 Kicer86 joined #git
16:03 cold_sau- joined #git
16:04 LeBlaaanc git tag -l -nx is all i can find to list it
16:04 LeBlaaanc but that doesn't only do one tag it does all the tags
16:05 sssilver joined #git
16:05 LeBlaaanc oh show has it up top...
16:05 Mobutils joined #git
16:06 Noldorin joined #git
16:06 lindenle joined #git
16:06 drewo joined #git
16:08 _ikke_ Best I could come up with: git show v2.8.2 --format='' --no-patch
16:08 des_consolado joined #git
16:10 LucaTM joined #git
16:10 LeBlaaanc eee so close
16:13 wicope left #git
16:14 btree joined #git
16:14 InfoTest joined #git
16:15 chachasmooth joined #git
16:15 ochorocho__ joined #git
16:15 aavrug joined #git
16:16 csd_ joined #git
16:17 imachuchu joined #git
16:17 akushner joined #git
16:18 unbalancedparen joined #git
16:18 ericvw joined #git
16:21 tcsc lets say i want to do the equivalent of `git checkout foo; git rebase bar;` without ever actually checking out foo. e.g. i want to rebase foo to be on top of bar, without checking out foo, is there a way to do this?
16:21 fuchstronaut joined #git
16:22 tomboy65 git rebase -i foo
16:23 tcsc erm, really?
16:23 tcsc isn't that about changing the current branch?
16:23 tomboy65 you stay on your current branch and rebase against another
16:23 jast tcsc: there's no way unless the history is such that a fast-forward would be possible
16:23 tomboy65 it's what i do all the time
16:24 tcsc jast: really?
16:24 hahuang65 joined #git
16:24 tcsc tomboy65: i don't want to change the current branch at all
16:25 jast to fast-forward a branch that isn't checked out, you can do this nasty piece of work: git push . bar:foo, which will fast-forward foo to bar if possible
16:25 synthroid joined #git
16:25 jast that only works if there haven't been any commits to foo
16:25 tcsc ah, it wouldn't be a fast forward
16:26 jast you're out of luck, then
16:26 toothe left #git
16:26 tcsc damn, really? nothing with --onto or whatever would do it
16:26 jast well, rebase has an option that checks out another branch first
16:26 jast but then you still have to switch back afterwards :)
16:27 jast I gotta go, have a good time-of-day
16:27 tcsc i don't mind switching back, the issue is that i have to do a full rebuild if i check it out before the rebase
16:27 ojacobson turn off whatever software does that
16:27 tcsc due to build system weirdness that i'd be lying if i said i fully understood
16:28 dopesong joined #git
16:30 purrkode joined #git
16:30 tcsc ojacobson: it's not software that does it per se, there's a file that gets touched which causes it to decide it needs to rebuild. i'm just trying to avoid needing to do this rebuild multiple times due to switching branches
16:30 tcsc its a suboptimal system, admittedly
16:31 ojacobson At risk of giving you a "why don't you just" answer, what forces you to do a build every time you switch, rather than once at the end of the branch surgery you want to do?
16:31 Gsham joined #git
16:33 tcsc well, the biggest issue is that i need to decide up front which branches i'll need to rebase against first
16:33 nitin joined #git
16:34 tcsc if i have N (usually ~5) bugs i'm working on, each as separate branches, and i update the master branch from remote, i then need to figure out all the ones i'm likely to get to before the next build
16:34 tcsc s/build/time i decide to update master/
16:34 LeBlaaanc _ikke_ should format:<string> do what i need?
16:34 LeBlaaanc I don't see anything mentioning tags
16:34 tcsc although i guess rebasing first does sound like a better option than what i'm doing now
16:35 ochorocho__ joined #git
16:35 tcsc and now it makes sense why one of my coworkers mentioned he rebases all of his active branches every time he updates master, which seemed like a big hassle at the time.
16:35 tcsc i didn't realize he meant before doing the build, but that would avoid the issue and make sense
16:36 Zamyatin joined #git
16:36 xbob joined #git
16:36 csd_ joined #git
16:37 tcsc bleh, that doesn't fix the fact that i'll have to do another 30 minute build today though ;_;
16:37 sentriz joined #git
16:37 mase-tech joined #git
16:37 johnwhitton joined #git
16:38 LeBlaaanc how do i even use format? `git show v2.7.0+1240 --pretty=format:%cn` doesn't seem to do anything?
16:38 LeBlaaanc still outputs the whole thign
16:39 LeBlaaanc it's like none of this applies to showing a tag?
16:40 narendraj9 joined #git
16:42 _ikke_ Yeah, most of it applies to showing commits, not tags
16:43 LeBlaaanc soooo eee man this is stupid
16:43 LeBlaaanc git show v2.7.0+1240 --format='' --no-patch and send it through grep maybe to get stuff after the double newline?
16:45 osse LeBlaaanc: you can use tag^{commit}
16:45 osse ''log -1'' is shorter than ''show --no-patch'' :3
16:46 LeBlaaanc log -1 is a format="" ?
16:46 shinnya joined #git
16:46 LeBlaaanc can you provide full commands?
16:47 LeBlaaanc I don't follow what you are suggesting is all....
16:49 osse git log -1 --format=%cn v2.7.0^+1240^{commit}
16:50 Fijit joined #git
16:51 safe joined #git
16:51 Kulrak joined #git
16:51 Kulrak joined #git
16:54 mmlb joined #git
16:55 istrasci1 joined #git
16:55 rominronin joined #git
16:55 githogori joined #git
16:56 istrasci1 left #git
16:58 dreiss joined #git
16:58 dfaught joined #git
16:58 mikecmpbll joined #git
16:59 istrasci1 joined #git
17:00 istrasci1 If you tag a commit on a branch and then the branch is deleted, does that tag get deleted too?  Or is that one commit somehow preserved "outside" of the branch?
17:00 jimi_ joined #git
17:00 mweshi joined #git
17:00 puff istrasci1: Interesting question.
17:01 osse istrasci1: no and yes, respectively
17:01 puff istrasci1: I don't know, but I can tell you that when you "delete a branch", you're actually only deleting the label.
17:01 rgrinberg joined #git
17:01 puff istrasci1: The actual commits that comprised the branch are, as far as I know, left untouched.
17:02 puff istrasci1: What osse said. :-)
17:02 puff I really, really want to build a git repo visualizer that shows everything in the repo.
17:03 ilmari unreferenced commits are deleted by git gc after 90 days
17:03 puff So when you make a chance, you can see what's really affected.
17:03 mweshi joined #git
17:03 puff ilmari: Unreferenced in what sense?
17:03 osse istrasci1: the commit is preserved because a tag points to it
17:03 ilmari puff: not reachanble from any branch or tag
17:03 puff ilmari: directly or indirectly?
17:03 osse istrasci1: more or less the same as if two branches point to the same commit and then you deleteone of them
17:04 ilmari puff: either
17:04 ilmari "reachable" by recursively following parent pointers
17:04 puff ilmari: Okay, that's what I thought.
17:05 ojacobson after 90 days, plus however long it takes for some command to trigger git-gc
17:05 ojacobson which can be quite a while :)
17:05 ilmari yeah
17:06 HerrThees joined #git
17:06 puff I.e. you have branch sprint4 which has, say, 10 commits on it, then you create branch feature1.  You make 4 commits to feature1, finish the feature, merge feature1 back into sprint4, then delete branch feature4.   However, the branch label for sprint4 still exists, and by tracing commits from the tip of sprint4 back to the tenth commit on sprint4, and then back down the four commits in what used to be branch feature1, etc.
17:06 tinajohnson___ joined #git
17:06 mbrzuzy joined #git
17:06 puff So really all of those commits stay reachable. When would commits become unreachable in the normal scheme of things?
17:07 ojacobson when they're not in the transitive closure over the parents of some named object
17:07 osse puff: when you rebase a branch for example
17:07 ojacobson eg. if you delete a branch without merging it, all the commits that were unique to that branch become unreachable
17:07 osse or use git commit --amend
17:08 ojacobson (things are reachable via either refs or the reflog, so it may take a while for rebase or commit --amend to render something unreachable)
17:08 fuchstronaut joined #git
17:09 puff ojacobson: Hm, I was going to say can't you still reach the commits on the branch by tracking down from the proto-commit (i.e. the commit where you branched off).  But then I remembered that the commit references are all backward, not forward.
17:09 puff So for any given commit, you really have no idea what is "descended" from it.
17:09 puff Only by finding the endpoints, which are labeled by branchs or tags or etc, and tracking backward.
17:10 ojacobson honestly the most common form of unreachable object is the stray blobs created by git-adding a file and then git-adding a different version of the same file before committing
17:10 ojacobson (eg. because you're using the staging area to build up a commit, or because you realize your change needs work before committing)
17:11 puff Hm, yeah.
17:14 LeMike joined #git
17:14 pantsman- joined #git
17:14 MattMaker joined #git
17:14 munish__ joined #git
17:16 thiago joined #git
17:16 faux___ joined #git
17:17 rgrinberg joined #git
17:18 amdi_ joined #git
17:18 notebox joined #git
17:19 soerenb_ joined #git
17:20 elsevero joined #git
17:22 TomyLobo joined #git
17:23 CheckDavid joined #git
17:25 hahuang65 joined #git
17:26 alex1a joined #git
17:28 piling_ joined #git
17:29 Bodger joined #git
17:32 drewo joined #git
17:33 Xethron joined #git
17:34 UrsoBranco joined #git
17:35 NateAGeek joined #git
17:35 Limes_ joined #git
17:35 munish__ left #git
17:36 Bodger Hi, folks. Possible FAQ, but the man page is confusing me: I have unstaged changes to file a, and I have untracked file b which I suspect is identical to the last commited version of file a. Is `git diff HEAD:./a b` the right comparison to answer that question?
17:36 mikecmpbll joined #git
17:37 Sasazuka joined #git
17:37 _ikke_ Looks correct
17:38 purrkode joined #git
17:39 bronson joined #git
17:39 astrofog joined #git
17:40 johnnyfive joined #git
17:40 rwb joined #git
17:41 aeontech joined #git
17:41 ojacobson if you don't feel like trusting it, `diff -u <(git cat-file blob HEAD:./a) b` will do it, too, on most shells
17:42 nizram joined #git
17:44 nizram joined #git
17:45 nevodka joined #git
17:45 Bodger Cool, thanks.
17:45 Bodger When I'm feeling very suspicious I've also been known to git stash && cp b a && git diff, but that gets to be a pain when the directory is dirty.
17:46 dreiss joined #git
17:47 mischat_ joined #git
17:47 nizram joined #git
17:47 red82 joined #git
17:48 red82 hi there.  I have a question about workflow.  we work with a proprietary system that creates folders per version of software when uploaded.
17:49 Noldorin joined #git
17:49 red82 so we have a group of files in a folder called X, which is our baseline.  when we deploy, it becomes X-laksjdflkiasdjf
17:49 red82 then when we update, a new folder is automatically created for us called X-lkjglikjsgffgf
17:49 hahuang65 joined #git
17:49 red82 with the same files in it
17:49 red82 and so on
17:50 red82 what should our workflow be?  something involving symbolink links ?  any thing I could read up on?
17:50 tobiasvl doesn't sound like something for git tbh
17:50 tobiasvl why do you create those folders?
17:50 red82 we don’t, it does
17:51 sesh_ joined #git
17:51 tobiasvl what's "it"
17:51 red82 but the folders all contain the same files
17:51 red82 shopify
17:51 tvw joined #git
17:51 IWishIKnew joined #git
17:51 tobiasvl but are those generated files from something?
17:51 tobiasvl !config
17:51 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
17:52 red82 no we create a theme, say its called foo.  and we deploy it.  then when we want to update it, shopify creates a new folder called foo-something, clones the file there, and we edit those and then push that when we’re done
17:52 Guest90991 left #git
17:52 seshasdf joined #git
17:52 red82 so every version of our theme is called foo-something, foo-somethingelse, etc.  but the files inside them are all the same
17:53 red82 well, minus the updates of course
17:53 tobiasvl pretend like I don't know what shopify and themes are
17:53 tobiasvl how does shopify create that new folder and why can't you just push the repo to that new folder?
17:53 tobiasvl and of course _why_ does it do that
17:53 tobiasvl I don't understand the workflow
17:53 red82 I don’t like it either, trust me
17:54 red82 the idea is that you can work on a new version without breaking the old.  when you are happy with the new, you just point the store to the updated folder and make it live
17:55 NeverDie joined #git
17:56 aeontech joined #git
17:56 tobiasvl maybe !deploy has something that kinda fits your scenario, I dunno
17:56 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
17:56 tobiasvl do you have a bare repo on the shopify side?
17:56 seshasdf hi, we seem to have an issue with our staging branch where over time it has accumulated commits that aren't in master via people abandoning changes
17:56 tobiasvl well probably not bare because it copies the files
17:57 seshasdf i want to reset staging to master but we've done it before and it seems the old commits creep back in from people's local copies of staging
17:57 zivester joined #git
17:57 aeon_ joined #git
17:57 tobiasvl seshasdf: perhaps people shouldn't be able to merge directly to master then? sounds like an issue with your workflow
17:57 tobiasvl make people merge into staging and only merge staging into master, nothing else?
17:57 tobiasvl !workflow
17:57 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
17:58 seshasdf we do feature branches, merge those features into staging to test them and then merge the features into master
17:59 tobiasvl sounds like one step too many perhaps
17:59 tobiasvl but that's up to you
17:59 tobiasvl if you do it like that then staging and master will of course come out of sync
17:59 red82 tobiasvl: shopify doesn’t have naything git, I have my own repo, I’m mainly trying to find the best way to capture what we do
17:59 seshasdf i don't have the political power to change our workflow i don't think
18:00 rahtgaz joined #git
18:00 red82 so I have my own repo, and then we use the shopify client software to sync
18:00 tobiasvl seshasdf: then what are you asking precisely? this is bound to happen then
18:00 seshasdf tobiasvl: basically i think i wanted confirmation that this is actually happening as i think it is
18:00 tobiasvl red82: hm ok. google told me this https://www.shopify.com/partners/blog/19752835-​using-git-to-simplify-shopify-theme-deployment
18:00 InfoTest joined #git
18:01 seshasdf sorry thats awful english
18:01 tobiasvl seshasdf: are people allowed to force-push to staging?
18:01 tobiasvl if so, that could explain how the old commits would "creep" back in
18:01 red82 yeah, looked at that, didn’t care for it much.  I’ll do some more reading and see if I can come up something I like
18:01 mjuszczak joined #git
18:01 seshasdf tobiasvl: yes
18:02 seshasdf everyone is allowed to force-push to everything
18:02 tobiasvl well then
18:03 tobiasvl you allow people to merge directly to master and/or directly to staging in any order they choose, and you even allow them to force-push to them. you don't have any control aand should expect the branches to change all the time basically.
18:03 mikecmpbll joined #git
18:04 romankl joined #git
18:05 Mateon1 joined #git
18:05 fracting joined #git
18:05 AaronMT joined #git
18:05 seshasdf so if you are eventually merging staging into master how do you know the commits in staging are fully baked
18:05 stantonk_ joined #git
18:06 m0viefreak joined #git
18:06 seshasdf i assume for a shared "dev" branch you have to treat it like master since it eventually will be
18:07 seshasdf i think we have underlying issues with the application that are really exacerbating this... there is basically one machine that can reliably run the application so everyone uses the staging branch as their sandbox
18:07 ahmedelgabri joined #git
18:07 seshasdf its almost impossible to run locally
18:08 tobiasvl well it's fine to use it as sandbox, but you can't then also expect it to be in sync with master, which it sounded like you wanted
18:08 tobiasvl different workflows for different teams/projects
18:09 seshasdf i think i can resolve this if i become the only person with force push to staging
18:09 seshasdf and i delete it and branch it from master
18:09 ojacobson policy first, implementation second -- don't do that until you've talked to your team and figured out how to make sure everyone's needs are met
18:09 sangy joined #git
18:09 ojacobson locking people out of tools is never popular even when it's necessary, so don't set yourself up to fail on the people side :)
18:09 seshasdf lol
18:10 chachasmooth joined #git
18:12 seshasdf alright i'll see if i can get this solved via talking
18:13 seshasdf thanks i mostly just needed confidence that our current workflow wasn't working
18:17 toogley joined #git
18:20 irqq joined #git
18:21 zjaffee joined #git
18:21 LeMike dang. The diff heuristic in `git add -p` guesses wrong so I am unable to choose the correct changes. Is there a way to bypass it? In detail: The end of the file and the end of the appended code matches in two lines. So now the diff heuristic thinks, that I inserted code in between instead of the end.
18:22 marksei joined #git
18:24 jstimm joined #git
18:25 wviana joined #git
18:26 _ikke_ LeMike: Does it matter in the end? diffs might be weird, but in the end, always correct
18:27 drewo joined #git
18:28 perlpilot LeMike: or, if you think it does matter, you can always edit the diff.
18:37 LeMike Yee. Thanks perlpilot. that's the part that makes the problem _ikke_ . When editing I remove the lines I don't need and git leaves me alone with a broken file in the commit. :/ I need to bypass that.
18:38 HerrThees joined #git
18:40 _ikke_ can you show it?
18:40 hahuang65 joined #git
18:40 rewt if you apply the unedited patch, is the result correct?
18:41 schmoozle joined #git
18:41 chachasmooth joined #git
18:41 schmoozle left #git
18:42 scrote joined #git
18:42 scrote Hi !!
18:43 MattMaker joined #git
18:43 scrote I'm not allowed to connect to git from work or I'll get in trouble.  I can vpn out because it looks like ssl.  How can I connect to github through a proxy?  Is there a git proxy?
18:44 hahuang65 joined #git
18:45 Sc0rpius github is via https so I don't understand why you can't from work.
18:45 ojacobson git uses libcurl, which can use socks5 proxies
18:46 ojacobson though consciously subverting your employer's usage policies is a good way to get fired, so
18:46 Sc0rpius ssh -D also works
18:47 scrote I'd rather get fired than interupt my github fun.
18:47 leeN joined #git
18:47 scrote work sucks.
18:47 ojacobson ssh -D is a socks proxy
18:47 Sc0rpius yup
18:48 scrote wont using a socks proxy look fishy?  I can't ssh out if socks is port 22.
18:48 LeMike here it is _ikke_ , rewt . I did it again carefully and got a message "Patch does not apply" - feels not careful enough :P https://gist.github.com/sourcerer-mi​ke/1815d54195e9f58ece45bc52412710dd
18:48 mar77i joined #git
18:48 Xethron joined #git
18:48 mar77i good evening #git. I appear to have made a mess.
18:49 PryMar56 joined #git
18:50 clemf_ joined #git
18:51 OnBrokenWings joined #git
18:51 rewt LeMike, that edited.patch is not correct
18:51 rewt the numbers at the top are wrong
18:52 rewt also your indents are inconsistent, which could also be a problem -- whitespace is not insignificant
18:54 scrote I can just use https proxy if git uses https.  socks would be overkill.
18:54 rewt look at lines 9 and 10 of before.patch -- it's changing the line because of the spaces that were removed
18:54 LeMike the doku says "To remove + lines, delete them." so the numbers at the top might never be correct rewt :/ I'll try it again and watch for the indents
18:54 rewt what doku?
18:54 mar77i there appears to be a dangling tree on my remote repository and I'm not sure how to pull it. I intend to merge the current master onto it and make the other master afterwards.
18:55 rewt those lines at the top tell patch what lines to change -- if they don't match the patch, patch cannot patch
18:56 LeMike See the last lines of each file rewt . It tells me to remove "+" lines if I don't want them in the commit.
18:56 rewt mar77i, there has to be a ref (branch/tag) pointing to the last commit
18:56 scrote $ HTTP_PROXY=http://proxy.mycompany:80
18:56 rewt LeMike, no, you cannot just remove lines and expect it to work
18:56 scrote $ git config --global http.proxy $HTTP_PROXY
18:56 mar77i hmm. there's no branch for it, though. https://github.com/mar77i/opennic/tree/f​b0fb65899406ea2df5b634e7fce5f9934137220
18:56 acetakwas joined #git
18:56 LeMike Damn. I hoped for that ^^
18:56 rominronin joined #git
18:56 ChurroLoco joined #git
18:57 ChurroLoco left #git
18:58 perlpilot rewt: It's always worked for me when I've done it.  It's just that the context lines become way more important at that point.
18:58 chachasmooth joined #git
18:58 rewt yeah, that too -- the change in indent is also making the context wrong
18:58 mar77i ah, it appears to be attached to the v0.2 tag.
18:58 perlpilot LeMike: and since you don't have any context after the lines you've added, it will be confused
18:59 stantonk joined #git
18:59 LeMike It confuses me already because I appended new lines to the file while it thinks they were added somewhere in between perlpilot ^^ I try it again renumbering the things.
19:00 rewt LeMike, your edited.patch is also missing the crmp.inquiry.panel.offer section
19:01 LeMike yee. that's the part I don't want in the commit.
19:01 fuchstronaut joined #git
19:01 perlpilot LeMike: as _ikke_ said, as long as it's right in the end, it shouldn't matter.
19:01 rewt why not just make a new patch?
19:01 perlpilot yeah, especially for 4 lines
19:03 perlpilot LeMike: though, I think it would work if you deleted lines 10-13 and 18-20 and 24,25 but left everything else alone
19:03 perlpilot LeMike: from your before.patch I mean
19:04 WayToDoor joined #git
19:05 stantonk joined #git
19:05 irqq_ joined #git
19:05 stantonk joined #git
19:06 elastix joined #git
19:07 rewt no, that would put crmp.customer.panel.contract line right after crmp.customer.panel.offer
19:08 perlpilot oh, so it would.
19:08 perlpilot (we've talked about this patch longer than it would have taken to recreate it properly  ;)
19:08 mar77i my tag has diverted with master. how can I base master on that tag now?
19:09 LeBlaaanc joined #git
19:09 rewt checkout master; rebase on tag
19:09 mar77i I have only managed to check out the first commit in that tree, though.
19:09 dsdeiz joined #git
19:09 mar77i not sure whether somthing there is missing.
19:10 acetakwas joined #git
19:10 mar77i locally I mean. I guess I need to chew through git fetch, first.
19:10 LeMike yee perlpilot . sorry for that. I could've solved it several times now via IDE but I like to solve it via console until the crossword makes sense in my head ^^
19:11 rewt you can make patch files in console too
19:12 rewt even without git
19:12 rewt something like:  diff -C 3 file.a file.b > new.patch
19:12 ojacobson diff -u
19:12 ojacobson the only reason -u isn't the default is historical stupidity :)
19:12 mar77i what the fuck did I do wrong anyway?
19:13 mar77i so, I'm still stuck on the first commit of that tag.
19:13 mar77i there appear to be 3 of them, though https://github.com/mar77i/opennic/commits​/fb0fb65899406ea2df5b634e7fce5f9934137220
19:14 fracting joined #git
19:15 multi_io joined #git
19:15 rewt mar77i, looks like on github you have:  v0.1 tag having 2 child commits: 1) master branch, 2) v0.2 tag
19:16 rewt you probably want to checkout master and then git merge v0.2
19:16 mweshi joined #git
19:17 FunkyAss joined #git
19:17 MattMaker joined #git
19:18 Psychiatrist joined #git
19:18 LeBlaaanc joined #git
19:19 rewt mar77i, `gitk --all` makes it easy to see what's branched where
19:19 chachasmooth joined #git
19:19 MarkyC joined #git
19:19 btree left #git
19:19 MattMaker joined #git
19:21 drewo joined #git
19:22 ahmedelgabri joined #git
19:22 fuchstronaut joined #git
19:22 iatkotep joined #git
19:24 nwkj86 joined #git
19:25 Dyonisos joined #git
19:25 nevodka joined #git
19:25 Dyonisos joined #git
19:26 mar77i derp
19:26 nevodka joined #git
19:26 elux joined #git
19:27 Psychiatrist Hey guys. If I add a folder that already exists on Github to .gitignore do I have to manually delete the folder from github or would it be deleted in the next push automatically?
19:27 nevodka joined #git
19:28 moei joined #git
19:28 Eugene Psychiatrist - !ignore_tracked
19:28 gitinfo Psychiatrist: 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.
19:29 Psychiatrist Thanks Eugene!
19:30 kadoban_ joined #git
19:31 mar77i rewt: so, how can I get this one on my local tree? https://github.com/mar77i/opennic/commit/​02be058e35fe31c2d0725e09c1bf5c65070bceea
19:31 mar77i I only see its parent using gitk/git log
19:32 acetakwas joined #git
19:32 NateAGeek joined #git
19:35 boombatower joined #git
19:36 Smashcat joined #git
19:37 boombatower joined #git
19:38 Smashcat Hi, I'm trying to pull updates from github to a local copy of a repo using "git pull". This is someone elses project, I'm just pulling an update. I don't usually use git, and it's falling over with "There is no tracking information for the current branch". I can see that there are updates waiting on the local machine, so what should i look for?
19:39 aard joined #git
19:39 aubar joined #git
19:39 Smashcat I tried "git pull master origin" too, but that fails as it can't find master. Also tried pulling with "git pull http://..." from github, but it fails the same way. Is it easier to just clone again from github into a new directory?
19:40 aelgabri joined #git
19:41 ojacobson 'git pull' is not, in any meaningful sense, an "update my code" command. It's shorthand for fetching and merging changes. You proooobably want 'git fetch --all' followed by some variation on 'git checkout origin/master -b some-new-branch' or 'git checkout origin/master'
19:41 ojacobson (the latter is only useful if you're not making changes)
19:41 bronson joined #git
19:42 LeBlaaanc joined #git
19:42 chachasmooth joined #git
19:42 ahmedelgabri joined #git
19:42 Smashcat Ah ok, thanks. There are local commits too.
19:42 GT joined #git
19:43 khmarbaise joined #git
19:43 Smashcat So git fetch will merge in changes from master, and not just blindly overwrite them?
19:43 NateAGeek joined #git
19:44 unreal joined #git
19:45 MarkyC_ joined #git
19:46 tcsc i always do git remote update instead of fetching, but i didn't know there was an --all option for fetch
19:47 MattMaker joined #git
19:48 Smashcat I've copied the entire local copy into another directory to test an update first :) Just in case...
19:49 ojacobson git fetch will update the cached copies of the remote repo's branches ("origin/master", which is a cached copy of "master" in the remote repo, for example)
19:49 heroux joined #git
19:49 ojacobson integrating that into your local branch is something you have a couple of options on
19:49 ojacobson git merge is probably the easiest to reason about
19:49 anon27834 joined #git
19:50 josuebrunel joined #git
19:51 mostlybadfly joined #git
19:53 Guest83980 joined #git
19:53 Smashcat Seemed to work in the end using "git pull origin master" then just "git push origin master" :) Seems to be 3-4 different ways to do anything with git - haha
19:54 satifant joined #git
19:54 mario_ joined #git
19:55 rwb joined #git
19:56 Guest83980 joined #git
19:56 Guest83980 joined #git
19:56 stantonk_ joined #git
19:57 leshanks joined #git
19:57 johnmilton joined #git
19:57 dfeuer joined #git
19:57 rominronin joined #git
19:58 dfeuer Could someone remind me how to squash some commits together? I have a pull request with a bunch of commits, but I really only need a couple.
19:58 ojacobson 'git pull origin master' is broadly equivalent to 'git fetch origin && git merge origin/master'
19:59 Chill_Surf joined #git
20:01 LeBlaaanc joined #git
20:01 chachasmooth joined #git
20:02 aeontech joined #git
20:02 Smashcat Yeah, I normally handle projects on svn, so I'm used to mainly using "svn co / up / ci", so just try to find the equivalents in git really.
20:03 MarkyC joined #git
20:04 arooni joined #git
20:04 rewt mar77i, how did you get that commit into github?  did you do a force push after pushing that comit?
20:05 mischat joined #git
20:08 Twirl left #git
20:09 djb-irc joined #git
20:09 MattMaker joined #git
20:11 Sound joined #git
20:12 ojacobson Smashcat: as a side effect of allowing distributed workflows, there's no direct equivalent - 'svn update' relies on there being a single source of truth about history
20:12 Alienpruts joined #git
20:12 ojacobson and that the only outstanding work is outstanding uncommitted work
20:13 Smashcat ojacobson: But if I'm pulling updates from a single master server, there would only be a single source of truth wouldn't there?
20:13 ojacobson you said you have local changes
20:14 Smashcat Yes.
20:14 Eugene dfeuer - !sausage
20:14 gitinfo dfeuer: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.c​om/GitBestPractices/#sausage and !perfect
20:14 ojacobson then there are two sources of equally valid truth
20:14 ojacobson welcome to distributed version control :)
20:14 chachasmooth joined #git
20:15 drewo joined #git
20:15 dfeuer Eugene, thanks. Got an answer elsewhere in the mean time. Definitely no need to see all the back and forth here; just want to be sure to have one commit for the first author's contributions and another for the second author's.
20:15 johnmilton joined #git
20:15 Smashcat ojacobson: From my perspective I'm doing the same thing though - usually in svn I'd do an "avn up" first to ensure the local copy has any updates from the master server, then I'm commit changes back. In git, I assume doing a pull then a push is the equivalent?
20:16 ojacobson nope
20:16 cdg joined #git
20:16 ojacobson integrating upstream changes into a local branch is a policy decision, in git - you have multiple ways to do it, depending on how you want the resulting history to look
20:16 ojacobson pull implements two ways (merge, rebase), as shorthand, that's all
20:17 leshanks Forgive beginner ignorance: If I have a project local, have done git init and the first add and commits, to then set up the remote on a vps, I init a --bare on remote, then from local add origin and push master?
20:17 zjaffee joined #git
20:17 Smashcat So what is the practical difference - i.e. if I do a pull, does that not merge changes in, ready to commit back?
20:17 neanderslob_ joined #git
20:17 boombatower joined #git
20:17 leshanks Then if some one joined the project, they can clone the remote?
20:18 ojacobson it does - if you want a merge, that's one way to do it. I always encourage people to do the steps individually, at least until they're familiar with git, rather than using pull, because pull does _a lot_ and it's not always obvious what it's doing or why
20:18 xall joined #git
20:20 xall joined #git
20:20 Smashcat I suppose it's easier for me to just set up a repo with some text files, and try push pull, rebase and whatever else to see what most closely approximates what I'd normally do in svn.
20:23 mwhooker joined #git
20:23 MattMaker joined #git
20:25 troulouliou_dev joined #git
20:26 nerium joined #git
20:27 nerium Is there a way to list all files that has existed between two commits?
20:27 nerium Like git ls-tree commit1..commit2
20:28 nnyk joined #git
20:29 nerium Aha git diff --name-only A B
20:30 ahmed_elgabri joined #git
20:30 acetakwas joined #git
20:30 rgrinberg joined #git
20:30 grawity joined #git
20:30 mdw joined #git
20:31 red82 left #git
20:31 madewokherd joined #git
20:32 neanderslob joined #git
20:33 nanga joined #git
20:33 nanga joined #git
20:34 ajf- joined #git
20:36 sea-gull joined #git
20:36 nick1 joined #git
20:36 mar77i rewt: I fixed it. I probably did the work on may 7th on a tree I hadn't pulled the post-v2.0 commits to.
20:37 raijin joined #git
20:37 eletuchy joined #git
20:38 nerium Is there a way to get the commit for a specific date?
20:38 hahuang65 joined #git
20:39 mar77i rewt: I dug out a local copy that had the commit and created a branch new_master from it. I merged (--strategy=ours) the current master with the gap in the history into new_master and pulled the whole thing back into master, so it looks as if the "main" history line had always contained the three formerly lost commits.
20:39 d4rklit3 joined #git
20:39 rewt nerium, git log --after x --before y
20:40 mar77i I'm not sure whether http://stackoverflow.com/a/2763118 was redundant, though.
20:40 fuchstronaut joined #git
20:41 mar77i this was pretty adventurous. thanks for trying to get me off the ground :)
20:42 nerium rewt: Is there a way to use it without using head? ’git log --after "2000-01-01" --reverse | head’
20:43 nerium I want the first commit in this case
20:43 nerium (as there are not other before(
20:44 rewt man git log says there's also -n
20:44 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
20:44 nerium rewt: samething
20:45 nerium The results are reverted after -n 1 is applied
20:46 mda1 joined #git
20:46 slappymcfry joined #git
20:47 s00pcan_ joined #git
20:47 Corosauce joined #git
20:48 rewt --after "2000-01-01" --before "000-01-02"
20:48 rewt --after "2000-01-01" --before "2000-01-02"
20:48 garyserj joined #git
20:49 ahmed_elgabri joined #git
20:51 Jellyg00se joined #git
20:52 mwhooker joined #git
20:52 mweshi joined #git
20:52 jstimm joined #git
20:53 sandbox99 joined #git
20:53 frem_ joined #git
20:54 davisonio joined #git
20:55 aeontech joined #git
20:56 WizJin joined #git
20:56 sandbox99 Hello, I'm using teamcity to deploy the changes made to my repos but when I remove a directory from a repo it does not get deleted after build. Does anyone know how could I configure teamcity to automatically remove the garbage folders from old builds?
20:57 j416 I don't know what teamcity is
20:57 j416 sandbox99: git wouldn't do that.
20:58 j416 perhaps someone in #teamcity would know
20:58 arand joined #git
20:58 * j416 guesses channel names that probably don't exist
20:58 liamonade joined #git
20:58 sandbox99 left #git
20:58 rewt you're supposed to guess channel names to do exist
20:58 rominronin joined #git
20:59 jimmybuffet joined #git
21:00 aidalgol joined #git
21:00 LeBlaaanc joined #git
21:00 glebihan joined #git
21:01 mwhooker joined #git
21:02 glebihan joined #git
21:03 jonmorehouse joined #git
21:04 CussBot_ joined #git
21:05 flopsec joined #git
21:05 sagerdearia joined #git
21:05 nettoweb joined #git
21:05 Gloomy joined #git
21:06 nerium rewt: Thanks!
21:06 mischat joined #git
21:07 NateAGeek joined #git
21:08 yqt joined #git
21:10 acetakwas joined #git
21:10 mwhooker joined #git
21:10 MattMaker joined #git
21:14 Orion3k joined #git
21:14 piling_ joined #git
21:16 madewokherd joined #git
21:16 Orion3k joined #git
21:17 Orion3k joined #git
21:18 CubiK joined #git
21:20 cdg_ joined #git
21:23 satbyy joined #git
21:23 Anchakor joined #git
21:24 cdg joined #git
21:24 fscala joined #git
21:25 efco joined #git
21:26 mweshi joined #git
21:27 relipse2 how can you quickly squash all your commits into one (as opposed to find/replacing pick with squash
21:27 IWishIKnew joined #git
21:28 xall joined #git
21:28 dalias there's an easy way to do it with git commit-tree but that's probably scary to play with :-p
21:29 j416 relipse2: git reset --soft thatcommit && git commit --amend
21:29 MattMaker joined #git
21:29 j416 relipse2: but I still prefer interactive rebase.
21:30 j416 relipse2: visual select, :s/pick/f/, :wq
21:30 rahtgaz joined #git
21:30 j416 relipse2: doesn't take much time.
21:30 dalias I was with you until ":wq" :-p
21:30 j416 dalias: ZZ or :x or what have yuo then :P
21:30 j416 I prefer good old :wq :)
21:30 eletuchy joined #git
21:30 dalias C-x C-s C-x C-c :-)
21:31 j416 oh my
21:31 j416 RUN
21:31 Anchakor Hi I got a problem I'm failing to google solution to
21:31 j416 your google fu is weak young padawan
21:32 Anchakor I accidentally added and commited too many files when I wanted to stage and commit just one file, how do I undo this?
21:32 j416 Anchakor: git reset HEAD^
21:32 Anchakor I still want to retain all changes I made in the curret working directory
21:32 j416 nod
21:32 Anchakor and add them and commit them as separate commits
21:32 j416 also, !backup can't hurt.
21:32 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
21:33 Anchakor won't reset discard my working directory changes?
21:33 j416 no
21:33 j416 reset --hard will, however.
21:34 ycyclist joined #git
21:35 relipse2 what does Fast-forward newbase.php mean?
21:35 relipse2 it said it removed 125 lines from newbase.php
21:35 relipse2 after i did a git merge
21:35 ycyclist I am getting this message for a git pull:  fatal: Authentication failed for 'http://...'
21:35 j416 relipse2: it didn't need to merge, it just moved the branch pointer.
21:36 Anchakor j416: cool I did that, and that is it?
21:36 puff Anyone familiar with intellij idea? I'm trying to figure out how to do the equiv of git status/git diff using idea's git support.
21:37 relipse2 j416 but why does it have a------- 125 next to one of my files that I don't think i touched
21:37 j416 relipse2: the branch you merged touched it.
21:37 j416 relipse2: something like this is probably what happened. observe the last command. http://goo.gl/wNXTHI
21:38 relipse2 how do I see the diff just to check what it did?
21:38 blackwind_123 joined #git
21:38 j416 relipse2: git diff @{1} iirc
21:38 relipse2 yeah i understand the fastforwad but i dont know why it is listing a key file that i dont think i touched
21:38 j416 Anchakor: then do the commit again
21:38 j416 Anchakor: as you wanted it
21:39 Anchakor j416: magic! thanks a lot! can't believe it was so hard to google this
21:39 relipse2 ok j416, i checked the diff and it appears some very important code was removed and I don't know why
21:39 j416 Anchakor: :)
21:40 j416 relipse2: git log -- thatfile
21:40 j416 relipse2: should tell you why
21:42 bronson joined #git
21:43 hahuang65 joined #git
21:44 Anchakor left #git
21:46 relipse2 j416 ok the file was deleted but i dont know why
21:46 relipse2 is there a way to see what happened to the file whether modified or deleted
21:46 j416 relipse2: I just told you
21:47 relipse2 that didn't tell me anything about whether or not it was deleted just told me commit message
21:47 j416 --stat
21:47 j416 or --patch if you need more info
21:47 Kulrak joined #git
21:47 Kulrak joined #git
21:48 relipse2 j416 odd it says my quick commit deleted it
21:48 relipse2 thanks
21:48 relipse2 about 45 minutes ago
21:48 j416 there you go
21:48 relipse2 it must not of screwed up the website because rsync was only set to add modify
21:49 stantonk joined #git
21:50 nwkj86 joined #git
21:52 mwhooker joined #git
21:52 Ardethian\\work joined #git
21:52 rinwa joined #git
21:53 Dougie187 left #git
21:53 relipse2 what does this mean: error: unable to create file newbase.php (Permission denied) error: unable to create file public_html/lib/config-DEFAULT.inc.php (Permission denied) and now the files are deleted?
21:53 pandeiro joined #git
21:54 nikio_ joined #git
21:57 relipse2 somethign is going terribly wrong
21:57 ojacobson it means pretty much what it says it means
21:57 relipse2 it keeps deleting files
21:57 relipse2 something keeps deleting my file
21:58 ojacobson the user and group you ran git as doesn't have permission to create those files
21:58 Urbany joined #git
21:58 relipse2 i'm on windows
21:58 ojacobson a fine non-answer; windows has permissions, too, though they work a bit differently
21:58 relipse2 i think i need to reboot
21:58 relipse2 this is nonsense
21:59 Arahael "a bit"
22:00 rominronin joined #git
22:01 Groscheri joined #git
22:04 jstimm joined #git
22:04 Jellyg00se joined #git
22:05 xall_ joined #git
22:05 bazz joined #git
22:07 rinwa joined #git
22:09 mjuszczak joined #git
22:12 nocbreak joined #git
22:12 mar77i joined #git
22:13 Ardethian\\work joined #git
22:14 Topic for #git is now Welcome to #git, the place for git help and zerg rushes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | YOU MUST SUBMIT ADDITIONAL JOKES https://madeitwor.se/git-jokes
22:16 dfeuer joined #git
22:16 dfeuer joined #git
22:17 Gsham joined #git
22:19 hahuang65 joined #git
22:20 yanome joined #git
22:20 njt joined #git
22:21 clemf joined #git
22:21 elastix joined #git
22:21 Cork joined #git
22:21 mischat joined #git
22:22 mischat joined #git
22:22 kadoban joined #git
22:23 tokkee joined #git
22:23 maxorator joined #git
22:24 DonRichie joined #git
22:25 ilogger2 joined #git
22:27 mda1 joined #git
22:27 editshare-ericf joined #git
22:28 chris_wot joined #git
22:29 BadApe joined #git
22:29 sssilver_ joined #git
22:30 istrasci1 left #git
22:31 jaguarmagenta joined #git
22:32 mwhooker joined #git
22:32 kadoban joined #git
22:32 fuchstronaut joined #git
22:36 aidalgol joined #git
22:37 gaen joined #git
22:38 sssilver joined #git
22:40 mwhooker joined #git
22:41 csd_ joined #git
22:41 HenriettaSalt joined #git
22:41 Urbany joined #git
22:43 faux___ joined #git
22:45 jantje Hi!
22:45 njt When developing a feature on a dev branch, that is composed of 8 commits, the feature is merged into master with "git merge --squash". However, when merging from the branch into master again with the same command, those same 8 commits are merged again, or at least, the commit messages are.
22:45 njt What is the "git way" to do this?
22:45 njt Basically, given a dev branch with x commits, I want those x commits to be squashed into one single commit when merging on master, but I want someone looking at those x commits to be able to go to the dev branch to "zoom in" on that one commit and see the 8 individual commits.
22:46 jantje For some reason we're having a bunch of git4windows users that get "fatal: Out of memory, malloc failed (tried to allocate 1076688 bytes)" when trying to rebase
22:47 mwhooker joined #git
22:48 Eugene njt - when you squash you're creating a new commit from the existing ones. They dont' get magically disappeared
22:49 Eugene njt - `the git way` would be to just do a normal merge instead of rebase or squashing
22:49 Eugene !lol may be of interest
22:49 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
22:50 puff Hm, I branched, made some commits, just realized that the branch name is ill-chosen. I haven't pushed yet, can I rename the branch?
22:51 Eugene puff - yup, man git-branch -m
22:51 gitinfo puff: the git-branch manpage is available at http://jk.gs/git-branch.html
22:51 jimi_ joined #git
22:52 rkazak joined #git
22:53 jimi_ joined #git
22:54 Pulp joined #git
22:55 puff Eugene: Cool, thanks.
22:57 njt Eugene: thanks for the info…quick question….if a feature is composed of 8 separate commits, and you merge those 8 commits into your master branch, how does one know (from just looking at the master) that the feature is 8 separate commits, apart from looking at the log messages?
22:58 Eugene njt - you don't; that's what the purpose of the log is.
22:58 njt okay…thank you
22:59 Eugene I recommend giving !flow a read if you haven't yet
22:59 gitinfo [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-succ​essful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for other workflow suggestions/references
22:59 WizJin joined #git
22:59 satbyy joined #git
23:00 nerium When running ”git blame A..B” should I include commit A?
23:01 rominronin joined #git
23:02 acetakwas joined #git
23:03 bakanon_ joined #git
23:04 osse nerium: i can't say what *you should* do, but I know git doesn't include A in A..B
23:04 nerium hehe, yeah, i know that too :)
23:05 osse can git blame accept a range? sounds weird to me
23:05 sssilver joined #git
23:05 Kallis joined #git
23:06 osse ah, it just marks even older (or even newer) lines as if they were from the oldest (or newest) commit in the range
23:06 nerium It does, but A isn’t included
23:06 elementalest joined #git
23:06 osse that would be expected, given how A..B works
23:06 osse if you want to include A you can do A~1..B
23:07 sssilver joined #git
23:07 MattMaker joined #git
23:07 arand joined #git
23:08 mellernoia joined #git
23:08 osse (unless A is a merge; then it gets hairy)
23:08 osse hmm, maybe A^!..B works.
23:08 nerium osse: Doesn’t seam to work :/
23:08 nerium Tried it with shortlog
23:08 cdg joined #git
23:09 skunkz joined #git
23:09 nerium Getting ”unknown revision or path not in the working tree"
23:10 nerium Nope, did not work eather
23:10 nerium Same error
23:11 nerium I want to check use shortlog (for example) up to a certain commit
23:12 arescorpio joined #git
23:12 aidalgol joined #git
23:12 chardan joined #git
23:14 osse None of them?
23:16 nerium Nope, same error
23:16 chardan Hi! I have a git question and hope this is the place to ask! I have a project I've cloned on github along with its submodules. I have a fork of one of those submodules, and I want to clone my submodule into this. When I do "git submodule add https://blah/foo.git" I get a message saying that "foo/project" already exists in the index. What's the right way to do this?
23:17 sbeller_ chardan: git submodule update
23:17 chardan sbeller_: I'll RTFM for that, thank you!
23:18 ffabi joined #git
23:19 eletuchy joined #git
23:19 aghalarp joined #git
23:19 kappy joined #git
23:21 chardan sbeller_: I'm still missing a step, I think. "submodule update" is saying that the pathspec doesn't match any files known to git, but if I use "submodule add" it still tells me that the submodule already exists in the index.
23:22 Gsham joined #git
23:23 chardan sbeller_: Do I need to use update --remote? I'm trying to grok the manpage but likely just don't understand what's going on here...
23:23 acetakwas joined #git
23:24 gnoel joined #git
23:27 mwhooker joined #git
23:28 siva joined #git
23:28 chardan Ah hah! Got it! I had to use "git rm my_submodule", then do a "git submodule add". Thanks, folks!
23:28 mischat joined #git
23:29 apotry joined #git
23:31 nwkj86 joined #git
23:32 sangy joined #git
23:32 italoacasas joined #git
23:33 fuchstronaut joined #git
23:34 Kulrak joined #git
23:34 Kulrak joined #git
23:34 eletuchy joined #git
23:35 ochorocho__ joined #git
23:35 mwhooker joined #git
23:43 nwkj86 joined #git
23:47 mwhooker joined #git
23:47 Lipp joined #git
23:48 harish_ joined #git
23:48 chardan left #git
23:52 raijin joined #git
23:53 dfeuer joined #git
23:53 dfeuer joined #git
23:54 Gord joined #git
23:55 Gord joined #git
23:57 Gord joined #git
23:58 mischat joined #git
23:59 fstd joined #git
23:59 Lipp_ joined #git
23:59 mattfoo joined #git

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