Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-15

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

All times shown according to UTC.

Time Nick Message
00:00 jungsubk joined #git
00:00 Fallen0223 joined #git
00:01 pizza_before_ctf joined #git
00:02 venmx joined #git
00:02 pizza_before_ctf left #git
00:03 Levex joined #git
00:05 mysticjohn joined #git
00:07 Hashtag joined #git
00:08 Noodlewitt joined #git
00:08 rkazak_ joined #git
00:08 menip joined #git
00:10 Hashtag Can I get help with an issue pushing to a server? It says (non-fast-forward) when I try to push, but it says I'm up to date when I pull.
00:10 Guest62183 joined #git
00:10 x5a joined #git
00:12 kubuntu_ joined #git
00:12 Hashtag I probably broke something with --amend
00:12 mysticjohn joined #git
00:14 MacGyver Did you amend a commit you pushed to a server previously?
00:15 MacGyver Because that's rewriting public history. Rewriting public history is often a bad thing (though there are legitimate usecases and workflows involving it), and the server is not letting you without explicitly specifying that that's what you want to happen.
00:15 mysticjohn joined #git
00:15 MacGyver The way to do that is by passing --force-with-lease to the command.
00:16 Hashtag I don't think so. I'll check the command history, but I think I amended it before I pushed it
00:16 Hashtag Tried to push it, rather. The commit isn't showing up on the remote server.
00:16 MacGyver That's unlikely. Server and client seem to disagree on the state of the tree.
00:17 Hashtag git status says my branch is ahead by one commit
00:18 rewt use gitk (or similar) to see what the history looks like -- easy to spot where it diverged and why
00:19 bruce_lee joined #git
00:19 fragMental joined #git
00:20 Rodya_ joined #git
00:20 MacGyver Oh well, then it's simply not caused by the amend.
00:21 MacGyver Or rather.
00:21 MacGyver It's much more likely that somebody else pushed to the server while you were amending.
00:21 safe joined #git
00:21 Hashtag I suppose it's not caused by the amend, then.
00:22 MacGyver You'll have to fetch their changes and rebase or merge.
00:23 Hashtag My story is missing a key element.
00:23 Hashtag The server is configured to use git-trac to communicate with git, so "git push" never would have worked, I think.
00:23 Hashtag Sorry. I forgot that detail.
00:25 ffilozov joined #git
00:25 Cabanossi joined #git
00:26 Hashtag I was really just trying to make it so my username and email displayed correctly.
00:27 Hashtag Now I'm getting an error that the key "user.name" has multiple values. What file is the key stored in? I feel like I'm less likely to break it by editing the file than by using the command line.
00:28 rewt ~/.gitconfig
00:29 Hashtag Nice. Thanks!
00:30 koko joined #git
00:33 Levex joined #git
00:34 g0th joined #git
00:34 luke_nukem joined #git
00:38 BackEndCoder joined #git
00:46 menip joined #git
00:46 xaviergmail_ joined #git
00:47 msonntag joined #git
00:48 am55_ joined #git
00:48 yunyang joined #git
00:50 jameser joined #git
00:51 matoro joined #git
00:55 SwiftMatt joined #git
00:55 Cabanossi joined #git
00:59 cdown joined #git
01:00 dviola joined #git
01:00 a_thakur joined #git
01:02 durham joined #git
01:04 Lyqyd joined #git
01:04 anuxivm left #git
01:04 livingstn joined #git
01:05 durham_ joined #git
01:09 x5a joined #git
01:21 Lunatrius joined #git
01:22 netj joined #git
01:23 d90 joined #git
01:24 hotpancakes joined #git
01:26 cqi joined #git
01:26 thiago joined #git
01:31 chipotle joined #git
01:31 bn_ left #git
01:32 ankit01ojha joined #git
01:36 eroux joined #git
01:37 dirtyroshi joined #git
01:38 dsantiago joined #git
01:43 hahuang65 joined #git
01:44 am55_ joined #git
01:48 mar77i_ joined #git
01:49 matoro joined #git
01:49 durham joined #git
01:51 klusark I sent a patch/rfc to the mailing list on saturday, and then resent an updated one yesterday, but haven't had any responses. Am I doing something wrong? http://public-inbox.org/git/2017031​3222318.23312-1-joel@teichroeb.net/
01:52 Eugene klusark - patience is a virtue. Mailing lists are not instantaneous
01:53 brent__ joined #git
01:53 klusark Eugene, I understand that, and I don't need instant response, but as this is my first time contributing to git, it's just a bit disheartening
01:54 klusark I'm honestly just interested in if this could even make it in and if I should keep working on it.
01:55 Eugene Its more likely that Junio or whomever simply hasn't read it yet
01:56 Eugene I'm not really sure what the etiquette is - if you stick around here I'm sure sooooomebody helpful will say so
01:56 Eugene I stopped subscribing to the mailing list years ago, too much noise for my tastes
01:56 mizu_no_oto joined #git
01:57 gopar joined #git
01:57 rnsanchez joined #git
01:59 durham joined #git
02:03 Vampire0_ joined #git
02:03 venmx joined #git
02:06 brent__ joined #git
02:10 Cabanossi joined #git
02:17 markmarkmark joined #git
02:17 pks joined #git
02:17 SwiftMatt joined #git
02:18 brewmaster joined #git
02:18 finalbeta joined #git
02:22 durham joined #git
02:22 amrits joined #git
02:22 Sergio965 joined #git
02:23 dsdeiz joined #git
02:25 d^sh joined #git
02:26 chachasmooth joined #git
02:34 durham joined #git
02:34 hexagoxel joined #git
02:35 pks joined #git
02:37 raijin joined #git
02:38 wizardyesterday joined #git
02:38 afuentes joined #git
02:43 xaviergmail_ joined #git
02:46 hahuang65 joined #git
02:47 zumba_ad_ joined #git
02:49 qmr joined #git
02:49 mar77i joined #git
02:50 dreiss joined #git
02:50 SirFunk joined #git
02:51 sunri5e joined #git
02:52 Vampire0 joined #git
02:56 fstd_ joined #git
03:00 svm_invictvs joined #git
03:01 Vortex35 joined #git
03:02 Motoko joined #git
03:03 d90 joined #git
03:03 shinnya joined #git
03:04 StuartMI joined #git
03:04 ojdo joined #git
03:06 Junior joined #git
03:10 Chinggis6 joined #git
03:10 ahrs joined #git
03:10 Cabanossi joined #git
03:12 chachasmooth joined #git
03:14 rchavik joined #git
03:14 andrew710 joined #git
03:14 Chinggis6 joined #git
03:15 oich joined #git
03:16 Chinggis6 joined #git
03:18 Blend|away left #git
03:19 xall joined #git
03:20 hotpancakes joined #git
03:22 unenforcer joined #git
03:22 watabou_ joined #git
03:22 pR0Ps left #git
03:24 Andrew_K joined #git
03:25 rnsanchez joined #git
03:27 mizu_no_oto joined #git
03:32 andrew710 joined #git
03:33 kfoonamalik joined #git
03:33 tanuki joined #git
03:36 glnz joined #git
03:37 rkazak_ joined #git
03:38 SwiftMatt joined #git
03:39 mehola joined #git
03:41 wizardyesterday ls
03:44 hahuang65 joined #git
03:46 justanotheruser joined #git
03:49 mar77i joined #git
03:51 diogenese joined #git
03:52 kfoonamalik joined #git
03:53 hexagoxel joined #git
03:54 kousu rm
03:55 Cabanossi joined #git
03:55 klusark rm: missing operand
03:55 klusark Try 'rm --help' for more information.
03:57 beautifulmind joined #git
04:00 fedepad joined #git
04:00 Vortex34 joined #git
04:00 pks joined #git
04:00 raijin joined #git
04:01 venmx joined #git
04:03 Peng joined #git
04:04 roelmonnens joined #git
04:06 Cabanossi joined #git
04:06 fatalhalt joined #git
04:11 x5a joined #git
04:12 duderonomy joined #git
04:15 fuzzybear3965 joined #git
04:15 Chinggis6 joined #git
04:16 matoro joined #git
04:18 dsdeiz joined #git
04:18 impliedn joined #git
04:21 eclecticjohny joined #git
04:27 fuzzybear3965 joined #git
04:33 pks_ joined #git
04:33 hexagoxel joined #git
04:34 lucido-cl joined #git
04:40 soerenb joined #git
04:43 taoqy1 joined #git
04:45 hahuang65 joined #git
04:47 howdoi joined #git
04:51 bruce_lee joined #git
04:51 bruce_lee joined #git
04:53 hexagoxel joined #git
04:54 gopar joined #git
04:59 menip joined #git
05:02 venmx joined #git
05:03 pratham_pc joined #git
05:03 Cabanossi joined #git
05:04 pratham_pc joined #git
05:04 tmg joined #git
05:06 xaviergmail_ joined #git
05:07 SantaClauze joined #git
05:15 pks joined #git
05:18 impliednude joined #git
05:18 ayogi joined #git
05:18 minn joined #git
05:21 minn How can I find the names of the people responsible for changed lines? E.g., if someone modifies likes 10-20 of a file, is there a way to list the people (last) responsible for those lines (just knowing the file and commit)?
05:23 kousu minn: git blame
05:23 kousu git blame -- path/to/file
05:25 windy-black joined #git
05:25 kousu or to go back through history: git blame commit -- path/to/file
05:25 kousu (where commit is your commit sha1 or name or tag or whatever)
05:25 cqi joined #git
05:26 chachasmooth joined #git
05:26 minn Oh, I see. So if someone made changes in commit A (with parent B), then I can use git blame to discover who the last author responsible for changing lines in the file were by using git blame on the file (at B).
05:27 minn (sorry, which author the person who modified the file was over-writing)
05:27 cqi joined #git
05:27 geoid_ joined #git
05:29 Murr joined #git
05:30 miha_S7 left #git
05:31 venmx joined #git
05:34 kousu minn: with parent B? you mean, A is a commit on top of B?
05:34 kousu minn: that wouldn't show you anything about A because commit B only knows about history going back from itself.
05:35 kousu but `git blame A -- file` would get you your answers
05:35 kousu I think
05:36 minn I was unclear, sorry. I'm trying to determine whose lines a particular author modified (on some commit). I think `git blame A -- file` would only tell me who modified each line (at that commit, which I already know).
05:37 dave0x6d joined #git
05:41 pwnz0r joined #git
05:42 Rodya_ joined #git
05:43 miha_S7 joined #git
05:44 moL-Ou joined #git
05:45 hahuang65 joined #git
05:46 unenforcer left #git
05:52 dreiss joined #git
05:53 miha_S7 left #git
05:53 silverdust joined #git
05:56 gtristan joined #git
05:57 ToBeCloud joined #git
05:58 eclecticjohny joined #git
05:58 Chinggis6 joined #git
06:02 moei joined #git
06:03 MrJoshua joined #git
06:07 acetakwas joined #git
06:07 dec0n joined #git
06:07 overlord_tm joined #git
06:08 geoid_ joined #git
06:08 hexagoxel joined #git
06:12 miha_S7_ joined #git
06:14 senaps joined #git
06:14 MineCoins joined #git
06:14 qt-x joined #git
06:17 miczac joined #git
06:17 rscata joined #git
06:20 t0by joined #git
06:24 oskarkv joined #git
06:30 Chinggis6 joined #git
06:32 Chinggis6 joined #git
06:33 Chinggis6 joined #git
06:33 Cabanossi joined #git
06:34 dersand joined #git
06:34 geoid_ joined #git
06:35 pdgwien joined #git
06:35 stevenspasbo joined #git
06:40 z8z joined #git
06:40 ToxicFrog joined #git
06:41 a3Dman joined #git
06:41 hexagoxel joined #git
06:43 MACscr joined #git
06:45 pdgwien- joined #git
06:45 dreiss joined #git
06:47 hahuang65 joined #git
06:48 ThomasLocke joined #git
06:49 xaa joined #git
06:49 lyxus joined #git
06:51 fedepad joined #git
06:54 matoro joined #git
06:55 geoid_ joined #git
06:55 Keverw joined #git
06:56 freimatz joined #git
06:56 Goplat joined #git
06:58 d90 joined #git
06:58 sbulage joined #git
06:59 Raging_Hog joined #git
07:01 Silmarilion joined #git
07:05 JeroenT joined #git
07:07 z8z joined #git
07:08 a3Dman joined #git
07:09 a_thakur joined #git
07:12 blahdodo joined #git
07:13 miha_S7_ joined #git
07:13 TbobbyZ joined #git
07:15 Vampire0_ joined #git
07:20 moL-Ou joined #git
07:21 ExpiredDev joined #git
07:23 roelmonnens joined #git
07:26 yitz joined #git
07:26 yitz Is there some way to tell if a local file is tracked in the local repo?
07:27 zeroed joined #git
07:27 zeroed joined #git
07:31 midnightmagic joined #git
07:32 eroux joined #git
07:32 hotpancakes joined #git
07:33 xall joined #git
07:33 xC0DEB10C joined #git
07:33 xC0DEB10C question about .gitignore ...
07:33 dminuoso yitz: git ls-files filename
07:34 xC0DEB10C if I got multiple ignores like: [Bb]in/* [Bb]uild/* [Ii]nclude/* and etc
07:34 xC0DEB10C and one !*.gitkeep statement, will that apply to every file, including the ones in subdirectories ?
07:35 Silenced joined #git
07:35 xC0DEB10C or do I have to do [Bb]in/* and then ![Bb]in/.gitkeep
07:36 yitz dminuoso: Thanks. I tried `git ls` but apparently that's not a command
07:37 chele joined #git
07:43 ljc joined #git
07:44 finalbeta joined #git
07:45 sarri joined #git
07:45 sarri joined #git
07:45 jnavila joined #git
07:48 hahuang65 joined #git
07:49 Silenced joined #git
07:49 Silenced joined #git
07:52 xaviergmail_ joined #git
07:53 elect joined #git
07:55 thib joined #git
07:55 andrew710 joined #git
07:56 hexagoxel joined #git
07:57 roelmonn_ joined #git
07:58 imack joined #git
08:03 hotpancakes joined #git
08:03 Tobbi joined #git
08:04 fedepad joined #git
08:06 bschindler joined #git
08:06 fedepad joined #git
08:07 bschindler Hi - I'm trying to get a diffstat from a given range, so I do git diff --stat from..to - now I'd like to exlicde a given file from the diffstat. How can I achieve that?
08:08 tekniq joined #git
08:08 venmx joined #git
08:10 adac joined #git
08:10 ljc joined #git
08:10 cluelessperson joined #git
08:11 cluelessperson joined #git
08:13 Flowinho joined #git
08:13 platzhirsch joined #git
08:13 cluelessperson joined #git
08:13 platzhirsch How can I create a remote branch without pushing the commits I've already added to it locally?
08:13 miha_S7_ joined #git
08:13 jast git push origin somecommit:branchname
08:14 jast and pick an older commit from the branch
08:14 platzhirsch like the first one before I added my first commit
08:15 Flowinho platzhirsch You basically want an empty remote branch with no commits?
08:15 thinkpad joined #git
08:15 platzhirsch basically what I would get if I do git checkout -b branchname and then push it
08:15 platzhirsch error: unable to push to unqualified destination: fcm .... hm
08:16 xissburg joined #git
08:16 Flowinho You can use the following
08:16 Flowinho platzhirsch choose HEAD commit that is going to be pushed
08:17 Flowinho git push origin HEAD:refs/heads/platzreh (or whatever branchname you desire)
08:17 lb1c joined #git
08:17 minn Why would `git blame rev -- file` fail with 'no such path file in rev' while git log rev -- file` succeeds?
08:18 platzhirsch well, just used GitHub
08:18 Flowinho Be aware that manually pushing refs can really screw up the repo your pushing to so if its a production repo with CI enable better talk to the person responsible for it.
08:18 platzhirsch to create branch then push
08:18 roelmonnens joined #git
08:18 cluelessperson joined #git
08:18 Cabanossi joined #git
08:19 Flowinho platzhirsch my answer was intended to create a remote branch that does not exist locally - because you mentioned you want to avoid having your local changes.
08:19 platzhirsch oh sorry Flowinho
08:19 Flowinho in general i suggest a 30 day challenge: use GIT from command line for 30 days to get familiar with the basic commands and how its working. then switch back to UI if still intended.
08:20 TomyWork joined #git
08:20 platzhirsch I am using git on the command line for I think 5 years now
08:20 platzhirsch I never use GitHub to do these things
08:21 Flowinho platzhirsch im sorry i hope i didnt offend you.
08:21 platzhirsch Oh no, I mean, after all I wasn't able to do it just with the command line
08:22 platzhirsch It's a total edge case and really there's not much reason to first push the branch and then the commits, I just got curious if that's possible
08:22 zefferno joined #git
08:25 Lunatrius joined #git
08:26 Flowinho Well its not a that much of an edge-case when working on a team. Sometimes a coworker requires a branch that is based on a commit they dont have locally and may as well not exist on a repository you agreed to work on collaboratively
08:27 Flowinho but what if that branch contains unfinished work / unsquased commits?
08:27 Flowinho Better push that ref to a new branch on remote so your coworker can grab it.
08:27 k5tux joined #git
08:27 Flowinho (ofc the best solution imho would be pushing it to directly into his repo but thats like.... guns on birds)
08:29 dvaske joined #git
08:32 dvaske_ joined #git
08:32 Junior joined #git
08:32 King_Hual joined #git
08:34 mazert_ joined #git
08:34 elect joined #git
08:37 rokups joined #git
08:38 bolo200 joined #git
08:39 TikityTik joined #git
08:42 platzhirsch Flowinho: yeah, absolutely :)
08:42 nowhereman joined #git
08:44 jast it's really straightforward to do on the command line, though
08:44 cyphase joined #git
08:45 platzhirsch jast: so how
08:45 platzhirsch just for reference
08:45 jast as I said about 30 minutes ago
08:45 jast you find the commit ID of whatever is before your local commits
08:46 jast then you do: git push origin commitid:nameofbranch
08:46 jast done!
08:46 pwnz0r joined #git
08:46 Balliad joined #git
08:47 kurkale6ka joined #git
08:49 hahuang65 joined #git
08:49 xaa joined #git
08:50 nowhereman joined #git
08:51 JeroenT_ joined #git
08:54 JeroenT_ joined #git
08:54 platzhirsch jast: that result in the error messages I posted 30min ago :D
08:54 platzhirsch resulted*
08:55 venmx joined #git
08:55 JeroenT joined #git
08:56 platzhirsch git push origin 425d53f....:fcm > error: unable to push to unqualified destination: fcm
08:56 jast platzhirsch: oh, right, some combinations of git versions are a little picky, but if you use refs/heads/fcm instead of fcm it should work
08:56 platzhirsch awesome, ok :)
08:56 platzhirsch thanks, yeah Flowinho posted that, too. Missed that
08:57 jast it's basically the long form of the branch name, used internally. apparently some versions don't like guessing if you use the refspec (foo:bar) syntax on something that doesn't exist yet.
08:57 borkr joined #git
08:57 jast okay, so we both missed something, that makes us even ;)
08:58 platzhirsch Well, I also rambled about using git for 5 years but obviously not knowing how to just push a branch without commits, ahaha
08:58 platzhirsch also surprised it's only 5 years
08:58 platzhirsch pretty sure that up until 2011 I used svn
09:00 jast while we're on the subject of splitting hairs... technically you're not pushing without commits. you're just pushing a subset of the commits on the branch (after all, at the branch level, Git doesn't distinguish which commits became part of the branch just by creating it, and which you added to it afterwards0
09:01 dhollin3 joined #git
09:01 platzhirsch jast: oh indeed
09:01 platzhirsch I mean, a branch is just a pointer
09:01 jast exactly
09:03 Flowinho And if nothing else helps, just append --force and see what happens ;)
09:04 platzhirsch I don't always force push, when I do I do it as --force-with-lease
09:05 platzhirsch :P *opens a beer*
09:05 Flowinho Oh god we have opened _that_ territory again
09:05 platzhirsch oh dear
09:05 xissburg joined #git
09:06 Flowinho My all-time-favorits are `Git knows what you did last summer!` and `In Soviet Russia, git commits YOU!`
09:06 platzhirsch Hahahah
09:06 Flowinho Id love to switch that offtopic discussion to a private chat bud sadly platzhirsch your client doesnt support OTR
09:06 platzhirsch I thought because --force-with-lease was controversial
09:07 Flowinho Hehe
09:07 platzhirsch Oh really, wow Weechat, bad!
09:09 marcogmonteiro joined #git
09:11 ryxxed joined #git
09:12 theoceaniscool joined #git
09:14 jast !offtopic
09:14 gitinfo From the #git website: it's okay to talk about anything (within general limits of reason), as long as you don't get in the way of people talking about on-topic things (mainly questions about git and using git). Accordingly, please consider pausing off-topic discussions to help people having trouble with git (if any).
09:14 ferr1 joined #git
09:14 miha_S7_ joined #git
09:16 TbobbyZ joined #git
09:17 a_thakur joined #git
09:18 Flowinho Yeah thats why intended moving the talk about --force-with-leash to PM
09:18 Sheogorath[m] left #git
09:18 Jarrah[m] left #git
09:18 daopu[m] left #git
09:18 hallogallo[m] left #git
09:18 Salander271 left #git
09:18 jast you mean because it's allowed to talk about anything in here? :P
09:19 platzhirsch He was just hinting, that as long as there are no git topics being discussing, you can't interfere with OT :D
09:19 platzhirsch discussed*
09:20 Flowinho jast no because i personally dislike offtopic discussion in themed channels even if they are allowed.
09:20 Flowinho its like "omg why did i set up a bouncer just to read this"
09:20 jast fair enough
09:21 jast but it won't stop other people :)
09:21 platzhirsch I think private messages work in Weechat
09:21 osse force-with-lease is off topic‽
09:22 ^7heo world, I dislike your use of English. please use French.
09:22 flaviodesousa joined #git
09:22 Flowinho osse only if you talk about it in a NSFW or StarWars (which can be the same thing surprisingly) manner
09:23 ^7heo World, I am more important than you, obey me!
09:23 osse z
09:24 Flowinho ^7heo is french people in a nutshell
09:24 osse Flowinho: oh, was the "leash" intentional?
09:24 Flowinho i guess so
09:24 grawity that'd be a `git pull` option though, not a `git push` one
09:25 finalbeta joined #git
09:25 ^7heo Flowinho: I was making fun of you, but you probably missed that part. Along with most things requiring intelligence...
09:25 inflames joined #git
09:25 jast grumpy much?
09:26 seni13 joined #git
09:26 Flowinho ^7heo kek - calm down
09:26 platzhirsch DFTT
09:26 ^7heo Just woke up; to read a prick witing "I dislike that [now stop it]"
09:26 jast didn't actually say the thing you bracketed, though
09:26 ^7heo jast: so yeah it does not help
09:26 Flowinho a prick? Whats wrong with you?
09:26 osse I once implemented --force-with-tease
09:27 osse But I never sent the patch in
09:27 Flowinho osse hrhr
09:27 ^7heo Flowinho: stupidity, people, in two words.
09:27 ^7heo jast: hence the brackets
09:27 ^7heo jast: it's what implying is all about
09:28 jast personally I didn't get that sense from it
09:28 Flowinho LOL i wanted to point out that i  PERSONALLY dislike offtopic personal discussions so i tried to move it somewhere else because people should not read the nonsense i sometimes write
09:29 jast yeah, that was my understanding of it
09:29 ^7heo jast: yeah that's how trolling works. Say something that only a few people will understand as an offensive manner, change often
09:29 Flowinho Huh? What?
09:29 jast I tend to err on the side of too favourable interpretations, makes my life a lot more relaxing
09:30 seni1 joined #git
09:30 ^7heo I mean *good* trolling. Not that spamming shit we sometimes see.
09:30 jast so are you implying that Flowinho is a troll?
09:30 jast if so, could you please not?
09:31 ^7heo jast: indeed, but think how many opressed people's life it makes a nightmare...
09:31 jast what does oppression have to do with any of this
09:31 ^7heo jast: well, I think he is yes
09:32 ^7heo jast: not the right time for me to explain, but I'll try to find a link. One sec
09:32 platzhirsch joined #git
09:32 jast you're entitled to your opinion, but please keep personal grievances out of the channel
09:33 ^7heo And that is what you tell ME, not the person starting the freedom of speech troll, see?
09:33 ^7heo but alright
09:33 permalac joined #git
09:33 ^7heo one minute, I search for that link and I'm gone
09:33 zefferno joined #git
09:33 sbasso joined #git
09:34 Cabanossi joined #git
09:35 Paraxial joined #git
09:36 leeN joined #git
09:36 tmg joined #git
09:37 jast freedom of speech troll is, like, your opinion, man (and mine happens to be different)
09:41 jast gah... things that shouldn't exist, ep. 286454: putting margarine on slices of cake
09:41 ^7heo jast, the whole point of what I'm going for is that opinions do not work like a democracy. It's not because you exist that you have a valid one. I do not have opinions about stuff I do not understand.
09:42 ^7heo was kicked by jast: whatever
09:42 Flowinho Wow that was rather harsh imho
09:42 jast the last line, or my reaction?
09:42 Flowinho But since its only my opinion and simply because i exist doesnt mean its a valid one, go ahead. :D
09:43 Flowinho your reaction. But its fair enough. Im thank ful for it.
09:43 clmsy joined #git
09:43 Flowinho Those are some pretty twisted thoughts
09:44 Flowinho anyways. lets close this chapter for now.
09:44 Jellyg00se joined #git
09:44 jast I don't personally mind debating these kinds of things, but these things have a tendency to affect the channel and there has to be a limit somewhere
09:44 Flowinho thats true.
09:44 Flowinho osse where you actually serious about implementing --force-with-tease? ;)
09:47 osse Flowinho: Yes. All it did was a regular push, and if that failed it pushed again, this time with --force
09:47 Flowinho I shouldnt be laughing that hard about it
09:47 Flowinho :D
09:48 jast :)
09:48 xC0DEB10C left #git
09:49 platzhirsch haha
09:50 hahuang65 joined #git
09:50 manuelschneid3r joined #git
09:52 Anja joined #git
09:53 Taikibansei joined #git
09:55 netj joined #git
09:56 venmx joined #git
09:57 kpglvm joined #git
09:59 Chinggis6 joined #git
10:00 stamina joined #git
10:00 tmg joined #git
10:01 Acorn joined #git
10:01 zefferno joined #git
10:03 hotpancakes joined #git
10:06 lb1c osse i love the idea of a silent --force push :D
10:07 dsdeiz joined #git
10:07 dsdeiz joined #git
10:07 mkoskar joined #git
10:08 Raging_Hog joined #git
10:08 achadwick joined #git
10:10 j08nY joined #git
10:11 jameser joined #git
10:11 fedepad_ joined #git
10:13 n1ce joined #git
10:14 pullphinger joined #git
10:15 CussBot joined #git
10:15 miha_S7_ joined #git
10:17 bwn joined #git
10:22 sea-gull joined #git
10:25 finalbeta joined #git
10:25 aard_ joined #git
10:26 albel727 joined #git
10:32 hexagoxel joined #git
10:33 de-vri-es joined #git
10:34 Cabanossi joined #git
10:35 irqq joined #git
10:37 Snugglebash joined #git
10:39 Flowinho joined #git
10:39 Wysi joined #git
10:40 xaviergmail_ joined #git
10:41 schleppel joined #git
10:43 cebor joined #git
10:44 P4nther joined #git
10:44 IndigoTiger_ joined #git
10:44 cebor joined #git
10:45 _rgn joined #git
10:45 _rgn joined #git
10:45 leprechau joined #git
10:47 cebor joined #git
10:50 YuGiOhJCJ joined #git
10:51 hahuang65 joined #git
10:56 hotpancakes joined #git
10:56 sbasso joined #git
10:58 fedepad joined #git
10:58 j7k6 joined #git
11:00 a_thakur joined #git
11:01 kexmex joined #git
11:01 gypsydave5 joined #git
11:04 Cabanossi joined #git
11:04 a_thakur joined #git
11:04 Jackneill joined #git
11:05 nevodka joined #git
11:06 theoceaniscool joined #git
11:10 afuentes joined #git
11:11 ayogi joined #git
11:12 Levex joined #git
11:13 cdown joined #git
11:14 CptHaddock joined #git
11:15 __rgn joined #git
11:15 cdown joined #git
11:16 miha_S7_ joined #git
11:16 tcorneli joined #git
11:16 j08nY joined #git
11:19 TbobbyZ joined #git
11:20 noteness joined #git
11:20 finalbeta joined #git
11:23 joeco joined #git
11:25 guampa joined #git
11:28 cdown_ joined #git
11:29 nikitasius joined #git
11:30 a_thakur joined #git
11:31 thebird joined #git
11:31 a_thakur joined #git
11:32 Knirch joined #git
11:35 am55_ joined #git
11:36 wxg joined #git
11:38 robattila256 joined #git
11:39 Raging_Hog joined #git
11:40 d0nn1e joined #git
11:40 Jesterboxboy joined #git
11:40 alexandre9099 joined #git
11:40 stamina joined #git
11:41 Jesterboxboy is there a way to query a remote repository to get the tag of latest-release
11:41 whaley joined #git
11:42 MineCoins joined #git
11:43 xall joined #git
11:43 hotpancakes joined #git
11:44 Es0teric joined #git
11:46 IntruderSRB joined #git
11:46 _ikke_ Jesterboxboy: man git ls-remote
11:46 gitinfo Jesterboxboy: the git-ls-remote manpage is available at http://jk.gs/git-ls-remote.html
11:47 DolpheenDream joined #git
11:48 eh3- joined #git
11:48 Flowinho joined #git
11:48 _Cyclone_ joined #git
11:50 Raging_Hog joined #git
11:51 Vampire0 Jesterboxboy, how would you define "latest release"?
11:52 canton7 I came up with this monstrosity: git ls-remote --tags --refs origin | awk '{ gsub("refs/tags/", "", $2); print $2 }' | sort -r --version-sort | head -1
11:54 armyriad joined #git
11:55 tvw joined #git
11:57 venmx joined #git
11:58 Jesterboxboy @canton7 thanks :D
12:01 xall joined #git
12:02 mizu_no_oto joined #git
12:04 dsdeiz joined #git
12:04 dsdeiz joined #git
12:05 sostenuto joined #git
12:06 ifra201 joined #git
12:06 amrits joined #git
12:06 JeroenT joined #git
12:07 vamiry left #git
12:08 thebird joined #git
12:08 scottjl joined #git
12:09 a3Dman joined #git
12:09 marcogmonteiro joined #git
12:10 vamiry joined #git
12:11 djb-irc joined #git
12:12 zxd joined #git
12:12 thebird joined #git
12:12 zxd is there an argument to git clone , to have it checkout to a tag?
12:12 zxd instead of HEAD
12:12 roelmonn_ joined #git
12:12 aielima joined #git
12:12 canton7 zxd, man git checkout -b
12:12 gitinfo zxd: the git-checkout manpage is available at http://jk.gs/git-checkout.html
12:13 zxd -b
12:13 zxd thanks
12:13 canton7 uh, man git clone -b
12:13 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
12:13 grawity I think `git clone -b` should work with that
12:13 grawity even if it's named --branch
12:13 _ng joined #git
12:13 tobiasvl --branch can also take tags and detaches the HEAD at that commit in the resulting repository.
12:13 tobiasvl from the manpage
12:13 dsdeiz_ joined #git
12:15 bsanford joined #git
12:15 hahuang65 joined #git
12:16 ankit01ojha joined #git
12:16 miha_S7_ joined #git
12:19 Cabanossi joined #git
12:20 dsdeiz joined #git
12:22 vamiry_ joined #git
12:22 a3Dman joined #git
12:23 kpease joined #git
12:25 z8z joined #git
12:30 PCatinean joined #git
12:30 DaveTaboola joined #git
12:32 hotpancakes joined #git
12:33 j08nY joined #git
12:34 nowhereman joined #git
12:37 polyrob_ joined #git
12:37 polyrob_ joined #git
12:40 xissburg joined #git
12:40 czeq joined #git
12:40 doener joined #git
12:41 Commander_Cody joined #git
12:42 CalimeroTeknik what hook should I use to send an e-mail with the log of what was pushed?
12:42 canton7 man githooks says that the example hook for one of them sends email
12:42 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
12:42 canton7 can't remember which one it was, exactly
12:42 CalimeroTeknik oh, nice
12:42 Vampire0 I think post-receive it is
12:43 Commander_Cody I want to merge a few previous commits. I ran `git rebase --interactive HEAD~2` to join the last two.
12:43 eroux joined #git
12:43 Commander_Cody How could I join arbitrary commits earlier in my history?
12:43 Vampire0 Commander_Cody, the same way?
12:43 grawity same, just pass a high enough number
12:44 Vampire0 Commander_Cody, just be aware to not !rewrite published history or are ok with the consequences
12:44 gitinfo Commander_Cody: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
12:44 CalimeroTeknik Vampire0, I tried post-receive but am lost when it comes to generating the log old..new
12:44 Commander_Cody That would join my recent squash, which is not what I want
12:44 Commander_Cody Lets say my recent commits are a, b, c.
12:45 Commander_Cody I want to merge b and c.
12:45 MapMan Hi! Can I create a subtree in an existing folder (so that it sits alongside other files)?
12:45 Vampire0 CalimeroTeknik, and why is this the case? What problem do you have?
12:45 MarioBranco joined #git
12:46 CalimeroTeknik no idea how to generate the log
12:46 Vampire0 Commander_Cody, so? You do `git rebase -i c~`, then in the editor you set c to fixup or squash and leave a and b at pick
12:47 CalimeroTeknik basically I'd like one mail for each push (or one per branch even, it doesn't matter)
12:47 CalimeroTeknik containing the log of commits pushed
12:47 canton7 CalimeroTeknik, look at the example hook
12:48 Commander_Cody Vampire0: So I just leave several picks, correct?
12:48 pmatulis joined #git
12:48 Vampire0 CalimeroTeknik, https://github.com/git/git/blob/mast​er/contrib/hooks/post-receive-email e. g.
12:48 pmatulis a file is being .gitignored but i still want it in other branches. how can i "backport" it in?
12:49 pmatulis usually i would do "git checkout master file"
12:49 Vampire0 Commander_Cody, sure, normal use-case. "pick" means apply as is and continue. "fixup" or "squash" means merge this commit into the previous one. You don't set both that should be squashed to "squash", just the second one.
12:50 Vampire0 pmatulis, what is your problem? .gitignore just takes effect in the branch it is present. And even if not, you could force-add the file, because as soon as it is tracked, .gitignore has no effect anymore
12:51 ExpiredDev joined #git
12:51 Sound joined #git
12:51 Cavallari joined #git
12:53 CalimeroTeknik thanks!
12:54 livingstn joined #git
12:55 gitinfo CalimeroTeknik: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
12:55 MarioBranco joined #git
12:55 Vampire0 yw CalimeroTeknik
12:58 acetakwas joined #git
12:58 venmx joined #git
12:59 JeroenT_ joined #git
12:59 sbasso joined #git
13:00 hotpancakes joined #git
13:00 eroux joined #git
13:01 mazert_ joined #git
13:01 JeroenT__ joined #git
13:01 hs366 joined #git
13:01 finalbeta joined #git
13:01 ExoUNX joined #git
13:03 pullphinger joined #git
13:04 Tobbi joined #git
13:05 cdg joined #git
13:06 dviola joined #git
13:07 xissburg joined #git
13:07 hotpancakes joined #git
13:07 pmatulis Vampire0, my command above cannot find the file. i don't want it to be tracked. how do i force-add?
13:07 txm joined #git
13:08 Vampire0 pmatulis, if you don't want it tracked, you should not force-add it
13:08 Vampire0 pmatulis, and of course a git command will not find the file, because it is not tracked
13:08 pmatulis Vampire0, 'xactly. so what to do?
13:09 Vampire0 pmatulis, and as it is not tracked, it also is not touched when you are changing branches, so the file is just a local untracked file and available in all branches you check out, because it is not IN the branches, but just laying around
13:09 txm Hi.  wpengine.com supports git push .. but I need to “git push ~/local-wordpress” only, as ~ also contains grunt, README etc. and I don’t want these being pushed
13:09 osse pmatulis: try git checkout master -- :/path/to/file  with path relative to the top of the repo
13:09 Vampire0 pmatulis, if that doesn't answer your question, please rephrase it, because at least I didn't understand it correct yet then
13:10 Glooomy joined #git
13:10 txm One way round it I can see is to “cd local-wordpress && git init” but then afaict I can’t just git push, I’d have to git commit and create a new branch first?
13:11 Vampire0 txm, you can only push the whole tree, not subparts. If you want to only push that directory, it has to be an own repository
13:11 boombatower joined #git
13:12 Vampire0 txm, so yes, you could create a new repo in there, then add the files and commit to a branch that you then push
13:13 txm Thanks for confirming Vampite0, so I have a repo in a repo I’d best get googling :/
13:13 pmatulis Vampire0, your comment made me do 'ls' for some reason and wow there it is. i didn't expect that
13:14 pmatulis "a file just laying around". i need to remember that :)
13:14 PCatinean_ joined #git
13:14 fahadash joined #git
13:15 ExpiredDev Hey guys! I'm getting pretty desperate - not sure if it is bitbucket issue but is there a way to trigger git hook when pull request is merged on the server?
13:15 bremner that would be a question for your hoster
13:15 muhannad joined #git
13:15 am55_ joined #git
13:16 Vampire0 txm, !subrepo
13:16 gitinfo txm: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
13:17 bauruine joined #git
13:18 bremner ExpiredDev: if you mean trigger some action on the client when something happens on a central server, the answer is no, at least not using git.
13:19 tobiasvl ExpiredDev: that's a bitbucket question, because it has to happen on the server
13:19 ExpiredDev @bremner, I mean trigger action on the server side when merge is done through pull request. I have self-hosted bitbucket server thus I have access to all git hooks and can put scripts.
13:20 ExpiredDev oh hey again @tobiasvl
13:20 eroussel joined #git
13:20 zxd how to check if a var doesn't have only tabs/empty space etc
13:20 zxd ahh
13:21 muhannad joined #git
13:21 pmatulis left #git
13:21 bauruine joined #git
13:21 bremner ExpiredDev: I guess it's still a bitbucket software question as pull requests are not part of git. At least not the pull requests you are thinking of
13:21 Commander_Cody joined #git
13:21 thebird joined #git
13:21 bremner and who knows how bitbucket runs their server
13:22 ExpiredDev @bremner, I had an idea that it just runs merge with some extra flags :/
13:22 Khisanth joined #git
13:22 Flowinho joined #git
13:22 TbobbyZ joined #git
13:23 theoceaniscool joined #git
13:23 sherm4n4tor joined #git
13:24 bytefire joined #git
13:24 a3Dman joined #git
13:25 zxd [[ "" == ${var//[[:blank:]]/} ]]
13:26 bytefire hi, i want to some of the files in repo to be locally ignored by git, i.e. not show as modified and not to sync with remote repo when i do git fetch etc. but they are source controlled in remote repo
13:26 cdown joined #git
13:26 jast bytefire: !ignore
13:26 gitinfo bytefire: [!ignore_dir] Git doesn't track directories, so you can't ignore them. If you want them ignored, ignore the files in the directory. Matching a directory in .gitignore means you ignore all files in that directory
13:26 jast argh, someone added a new one
13:26 jast sorry
13:26 jast !ignore_tracked
13:26 gitinfo 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.
13:27 serialoverflow joined #git
13:27 jast that's not exactly what I meant, either...
13:27 jast !assume
13:27 gitinfo [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
13:27 zxd wrong channel
13:27 jast it boils down to: "it's complicated"
13:28 bytefire jast: i see. yes
13:28 jast bytefire: the most reliable and sane thing you can do is use the sparse checkout feature to basically tell Git to never actually checkout some of your files, then put a copy of the file in the same place where it would be normally, and Git will leave it alone
13:28 roelmonnens joined #git
13:28 jast !sparse
13:28 gitinfo [!sparse_checkout] Sparse checkout can be used to restrict which files/folders are updated with all checkout and status operations. It cannot change the tree the checkout is rooted from. One common use case is locally keeping Git from updating some of the files tracked in your repository. See the "Sparse Checkout" section in man git-read-tree (http://jk.gs/git-read-tree.html).
13:29 hotpancakes joined #git
13:29 jast another option is committing your changes, but keeping those commits in a separate branch (that you rebase against the original frequently) and never sharing it with anyone
13:29 Greench joined #git
13:29 chipotle joined #git
13:30 Greench Hello. I have updated my .gitignore file. How do I reload my git diff to take changes into account?
13:31 Vampire0 Greench, !ignore_t
13:31 gitinfo Greench: [!ignore_tracked] 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.
13:32 bremner ExpiredDev: it's basically a sysadmin question, and the devil is in the details
13:32 bytefire jast: thanks. i am looking into sparse checkout option
13:33 sherm4n4tor joined #git
13:34 DammitJim joined #git
13:34 Greench thanks Vampire0 :)
13:34 DammitJim is a git repository just a name? can I rename it without any repercusions?
13:34 DammitJim I created a clone from another server and named it looker.git
13:34 DammitJim so, it shows as: /srv/git/looker.git
13:35 DammitJim can I just rename it to /srv/git/playground.git ?
13:35 bremner sure
13:35 DammitJim or is there more than that?
13:35 ExpiredDev @bremner, maybe I am just thinking the wrong way. How would you tag a branch before it is merged into main branch?
13:35 moritz DammitJim: there's only more than that if you use some kind of management software (like gitlab) that keeps its own database of names
13:35 a_thakur joined #git
13:35 JeroenT joined #git
13:35 DammitJim oh no, I don't
13:35 DammitJim thank you!
13:36 gitinfo DammitJim: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
13:36 bremner ExpiredDev: I don't really work with pull requests. I consider feature branches as ephemeral patch series, so the question doesn't arise for me.
13:36 DammitJim LOL
13:36 a_thakur joined #git
13:37 muhannad joined #git
13:37 jast okay, who's cheating with the bot
13:38 GodGinrai joined #git
13:38 bremner kinky
13:38 Greench .topkarma
13:38 gitinfo top karmic beings of past 30 days ('all' arg to see totals): _‍ikke_: 4,  o‍sse: 3,  j‍ast: 2,  v‍ampire0: 1,  q‍qx: 1
13:39 qqx ExpiredDev: bitbucket supports setting up hooks through the web UI. And the explanation there lists merging of pull requests as an available event, although none of the hooks on my instance use that.
13:39 Greench left #git
13:39 DammitJim left #git
13:39 __rgn why make this reddit? i think it's worked pretty well before
13:39 sword joined #git
13:39 a_thakur joined #git
13:40 BSaboia joined #git
13:41 daskjfd joined #git
13:42 GodGinrai joined #git
13:44 bremner the difference is here nobody cares
13:44 bremner _rgn++
13:45 bremner or however you trigger the damn bot.
13:45 daskjfd left #git
13:45 muhannad joined #git
13:46 skalpin joined #git
13:46 mikecmpbll joined #git
13:47 GodGinrai bremner: who knows?  We don't care. *badum* *tish*
13:47 _ikke_ bremner: It tracks it silently
13:47 sbulage joined #git
13:49 tmg __rgn++
13:52 xaviergmail_ joined #git
13:52 Greench joined #git
13:54 Greench so I "git rm --cached file.ext" the file I didn't want to push, and now that I created the git commit msg, I see "delete mode 100644 file.ext". Is that normal? It's not going to delete the remote file is it?
13:54 osse Greench: yes, and yes it will
13:54 osse i mean if you push
13:54 Greench so it was not the command I was looking for...
13:55 Greench I want file.ext to not be touched by git, neither pulled nor pushed
13:55 osse it is the command you're looking for, but after others pull your changes they will have to ressurect that file
13:56 Greench resurrect o_o
13:56 hotpancakes joined #git
13:56 osse as in dig it up from git history
13:56 Vampire0 Greench, the nearest you can get to what you want is !assume, but you will easily loose local modifcations then
13:56 gitinfo Greench: [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
13:56 Greench oh okay
13:56 jast sounds more complicated than it is, though
13:57 Greench yeah assume unchanged will make me lose my local changes at every pull
13:57 jast assume-unchanged is terrible for that. the best option in that general direction is sparse checkout
13:57 jast !sparse
13:57 gitinfo [!sparse_checkout] Sparse checkout can be used to restrict which files/folders are updated with all checkout and status operations. It cannot change the tree the checkout is rooted from. One common use case is locally keeping Git from updating some of the files tracked in your repository. See the "Sparse Checkout" section in man git-read-tree (http://jk.gs/git-read-tree.html).
13:57 jast it's something you have to set up locally, though
13:57 Greench let me look into that...
13:58 seni1 joined #git
13:59 venmx joined #git
13:59 ayogi joined #git
14:02 Greench do I have to undo the git rm --cached before using the sparse checkout trick?
14:02 osse Greench: is it a config file?
14:03 Greench several :/
14:03 osse Greench: if yes, rename it to file.ext.template. make others copy it to file.ext and make changes as appropriate
14:03 osse ignore file.ext in .gitignore
14:03 osse everybody wins
14:04 Greench I don't want to bother other contributors
14:04 osse You will make the repository easier to use for contributors
14:04 moritz and you think other contributors won't have the same challenges?
14:05 osse Because you will make it harder for them to commit crap
14:05 sweatsuit joined #git
14:05 GodGinrai Greench: you're trying to remove files they use from the repo
14:05 czeq joined #git
14:05 GodGinrai Greench: there is no way to not bother other contributors
14:05 GodGinrai Greench: you just need to properly communicate what they need to do
14:05 altinu left #git
14:05 Greench no I certainly don't want to do that
14:06 am55_ joined #git
14:06 Greench I want the remote config files to stay the way they are, and local copies stay the way they are
14:06 jast Greench: sparse checkout is something that doesn't affect anyone else, so that sounds like a good choice. and yes, you're going to have to undo the 'git rm --cached' stuff.
14:06 Greench ok thanks
14:06 osse Greench: git can't do that
14:07 jast after that, the general idea is: move the file aside. set up sparse checkout to checkout everything except that file. do a 'git reset --hard' (discards uncommitted changes). move the file back in its normal place. done!
14:07 sea-gull joined #git
14:07 jast just so you know, you won't be able to commit changes to that file
14:07 Greench I guessed so, but it's not important
14:08 Greench but why do I have to move the file aside?
14:08 Greench isn't sparse-checkout here to take care of not seeing the file?
14:08 jast I'm not entirely certain 'git reset --hard' won't mess it up
14:08 jast it's just a safety measure
14:09 jast and only this once
14:09 Greench ah I see
14:09 Greench thanks jast
14:09 Greench and the others :)
14:09 jast if it doesn't have uncommitted changes, you don't have to be careful, it's easy to restore a committed version at any time
14:11 LeBlaaanc joined #git
14:12 dvaske joined #git
14:13 chigang joined #git
14:14 Dougie187 joined #git
14:15 publio joined #git
14:16 hahuang65 joined #git
14:17 Darcidride joined #git
14:17 def_jam joined #git
14:18 eb0t_ joined #git
14:18 lmatteis joined #git
14:18 NaviNick joined #git
14:19 Snugglebash joined #git
14:20 Levex joined #git
14:21 mikecmpbll joined #git
14:21 brent__ joined #git
14:23 a_thakur joined #git
14:24 DammitJim joined #git
14:25 DammitJim is there something special I need to do after I cloned a repo to another server
14:25 DammitJim then I checked out the code in the repo
14:25 Anja joined #git
14:25 DammitJim made changes and when I try to commit to master, I'm getting an error about "branch is currently checked out"
14:26 DarkPsydeLord joined #git
14:26 osse DammitJim: the original repo was bare and the new one isn't (my guess)
14:26 osse DammitJim: use 'git clone --mirror' to clnoe to the new server
14:26 DammitJim oh, I guess I need to learn what bare is
14:26 osse !bare
14:26 gitinfo A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
14:26 nicoulaj joined #git
14:26 DammitJim so, I need to use git clone --mirror?
14:26 DammitJim thanks
14:26 forgon joined #git
14:27 davimore joined #git
14:27 Greench So, I created the sparse-checkout file, I did a git reset to undo my commit, I did a "git update-index --skip-worktree" and the files still show up in "git status"... perhaps I'm not using the correct paths in sparse-checkout?
14:27 xissburg joined #git
14:29 jast Greench: well, what's in your sparse-checkout file and which file did you want to skip?
14:29 freimatz joined #git
14:30 am55_ joined #git
14:32 Greench let's say I have /base/.git/info.sparse-checkout , inside the file, I put "/*", "!accounts/signals.py", "!app/settings.py", "!shops/signals.py" on each line. the accounts, app and shops folders being inside the base folder
14:32 Greench /base/.git/info/sparse-checkout*
14:32 JeroenT joined #git
14:32 xissburg joined #git
14:32 Greench or do I have to relative path starting from the info folder?
14:33 jast no, that looks fine
14:33 zivester joined #git
14:34 jast be careful to not have any extra whitespace on any line
14:35 Greench I only had an extra line I removed, but no change
14:35 Greench Is  git update-index --skip-worktree the proper command?
14:36 Greench no need to specify where the sparse-checkout is?
14:36 cdg joined #git
14:36 am55_ joined #git
14:36 hotpancakes joined #git
14:37 DammitJim thank you!
14:37 jast git update-index --skip-worktree without arguments does nothing, by the way... and you shouldn't need it at all, because the reset should be applying the flag to the files
14:37 DammitJim osse, thanks man
14:38 ep-wi joined #git
14:38 sherm4n4tor joined #git
14:38 reddodgem joined #git
14:39 erctng joined #git
14:39 Greench oh..
14:40 sherm4n4tor Does anyone know how to ignore the bin and obj folders on a Visual Studio project?  I've tried adding "[Bb]in/" and "[Oo]bj/" in the ".gitignore" but doesn't seem to be working.
14:40 osse !ignore_tr > sherm4n4tor
14:40 gitinfo [!ignore_tracked] 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.
14:41 sfan786_ joined #git
14:42 Snugglebash joined #git
14:42 am55_ joined #git
14:42 XVar joined #git
14:42 gugah joined #git
14:43 Gsham joined #git
14:43 shgysk8zer0_ joined #git
14:43 JeroenT joined #git
14:44 zxd fatal: destination path  ...   already exists and is not an empty directory.
14:44 steve joined #git
14:44 zxd is there a parameter to delete the dir and continue git clone
14:44 andrew710 joined #git
14:44 zxd or must I remove the dir manually
14:45 osse (re)move manually
14:45 andrew711 joined #git
14:45 raspado joined #git
14:45 sea-gull joined #git
14:46 sherm4n4tor osse: Thank you.  I'll try this.
14:49 cdg_ joined #git
14:50 sotoz joined #git
14:55 am55_ joined #git
14:56 a_thakur joined #git
14:56 MineCoins joined #git
14:56 math-alpha joined #git
14:59 reddodgem joined #git
14:59 immae joined #git
15:00 cluelessperson joined #git
15:01 impliednude joined #git
15:02 hasc joined #git
15:04 immae Hey all! I got a little lost looking at the git code to find the answer to my question, maybe someone knows: I'm trying to find out a precise definition of "reachability" for a git object. There are the obvious (reverse reachability) ones: (1) a commit pointed by a ref is reachable (2) if a commit is reachable, then from his header the lines starting with tree and parent point to tree/commit that are
15:04 immae reachable, and (3) if a tree is reachable, his trees and blob are reachable. Is there any other way (in commits headers for instance?) to be reachable?
15:04 xissburg joined #git
15:04 czeq joined #git
15:05 Greench OK, so I deleted everything, I pulled from master and I created my branch again. I git status and it says it's clean, I modify a file that is in .gitignore, I git status, and the file shows up. Is that expected?
15:05 grawity yes
15:06 Greench good... so .gitignore only applies to commits?
15:06 grawity gitignore does not automagically untrack files which are *already* tracked the repo
15:06 Greench ah..
15:06 grawity basically it just hides 'untracked' files so you don't accidentally git-add some junk
15:07 Greench okidoki.
15:07 clemf joined #git
15:08 JeroenT joined #git
15:08 TbobbyZ joined #git
15:10 eroussel joined #git
15:10 Greench OK I give up. I set it --assume-unchanged and that will do.
15:10 selckin joined #git
15:11 immae Greench: you want changes to be ignored so that you never commit them?
15:11 immae (this is rather different than not commiting it in the first place)
15:12 dreiss joined #git
15:12 Greench yes but I would also like the file not to revert each time I pull
15:12 oscaral joined #git
15:12 osse Assume unchanged doesn't carry over to other clones
15:12 mark-use joined #git
15:12 King_Hual` joined #git
15:13 oscaral Hello everybody. First time here.
15:13 hotpancakes joined #git
15:13 Greench hello oscaral
15:13 oscaral I am a developer from Spain
15:13 oscaral Hi Greench
15:13 oscaral May I write here a question about Git deployment?
15:13 immae git update-index --assume-unchanged <your-file> should ignore the file from now on
15:14 immae I don't know what happens if you pull though, you should test it
15:14 Greench it gets overwritten when I'll pull, from what I read, but nevermind, I'll keep a local copy on my desktop and copypaste it at each pull
15:15 mark-use Hmm, I try to understand git...I set up a rep on a remote server and already pushed things to there. Now I deleted some folters on my local rep and want them to get checked-out/fetched/pulled again...how I do that?
15:15 Gsham joined #git
15:16 GodGinrai mark-use: you want to restore them locally?
15:16 mark-use GodGinrai,  get them again from remote yes
15:16 GodGinrai mark-use: `git checkout -- filename` should work, IIRC
15:17 jstimm joined #git
15:17 hahuang65 joined #git
15:17 mark-use GodGinrai, haha, nice....and if I want all files? * does not work... \*? :-)
15:17 clemf joined #git
15:18 immae mark-use: git reset --hard && git checkout upstream/branch ?
15:18 immae this will remove all modifications to your worktree and checkout the wanted branch
15:19 mark-use imack, worked...thanks a lot!
15:20 impliednude joined #git
15:20 immae (note that you're now in a branch in which you cannot commit)
15:20 xall joined #git
15:20 oscaral fork?
15:20 al-damiri joined #git
15:20 nettoweb joined #git
15:20 oscaral Druplicon: fork is Fork by yourself, shame on you. Fork with a friend, now we're getting somewhere.
15:21 oscaral sorry, it was not for here :)
15:21 selckin joined #git
15:21 GodGinrai mark-use: well, if you don't care about your changes, you can just `git reset --hard HEAD`
15:23 Ownix Stupid question, if I ammend a previous commit that I already pushed to remote, will my new commit be merged in with those changes or will it wipe all my previous commits in favor of the new one?
15:23 Ownix Its also giving me the option to "pull with merge" and pull with rebase"
15:23 selckin !rewrite
15:23 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
15:24 Ownix welp that makes sense thanks selckin lol
15:24 mark-use GodGinrai, thanks a lot
15:24 GodGinrai np
15:25 oscaral How do you guys work with different envionments? Let's say 3 simple branches and environments: your own, development and master...and having your machine, the develop machine and production
15:26 mark-use left #git
15:26 oscaral ...Do you repeat the same users at each machine?
15:26 GodGinrai oscaral: that really depends on what you need to do
15:26 Greench left #git
15:26 GodGinrai oscaral: to deploy, you probably don't need numerous users
15:27 immae Greench: would --skip-worktree be what you want? http://stackoverflow.com/questions/13630​849/git-difference-between-assume-unchan​ged-and-skip-worktree/13631525#13631525
15:27 oscaral Let's say we want to all be able to commit to develop and to the develop machine at least
15:27 oscaral When I say commit, I also mean to deploy there
15:28 GodGinrai !deploy
15:28 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
15:28 a_thakur joined #git
15:28 GodGinrai ;)
15:28 adac joined #git
15:28 oscaral Do you recommend just have a "general" user at the development machine?
15:28 oscaral (for git )
15:28 oscaral GodGinrai++
15:29 oscaral karma GodGinrai
15:29 cluelessperson joined #git
15:33 w9qbj left #git
15:34 minn joined #git
15:35 sixtel joined #git
15:35 brent__ joined #git
15:35 ep-wi_ joined #git
15:36 bytefire is there a way to have a chosen set of files which you can stash and unstash as many times as you like
15:36 sotoz joined #git
15:36 brent__ joined #git
15:37 Levex joined #git
15:37 hotpancakes joined #git
15:37 LauJensen joined #git
15:39 mda1 joined #git
15:40 utrack joined #git
15:40 cymen joined #git
15:40 nopf joined #git
15:40 mozzarella joined #git
15:40 XVar joined #git
15:41 Werring joined #git
15:42 seni1 joined #git
15:43 Kuukunen joined #git
15:43 Gustavo6046 joined #git
15:43 bitmod joined #git
15:43 relgar joined #git
15:43 alexandre9099 joined #git
15:44 troyt joined #git
15:45 dminuoso I did a stash, checkout master, stash pop. Now I have an "unmerged path" with a file marked as "deleted by us" => what does this mean?
15:45 y_sekino joined #git
15:45 Muzer joined #git
15:46 rominronin joined #git
15:46 rominron_ joined #git
15:47 _Vi joined #git
15:47 rominronin joined #git
15:47 boz_v1 joined #git
15:48 xall joined #git
15:48 jmesmon joined #git
15:48 tuor__ joined #git
15:48 fuzzybear3965 joined #git
15:49 selckin joined #git
15:49 DelphicOkami joined #git
15:49 dminuoso Is this because I have an unstaged change it was trying to apply to a file that on master was never there?
15:50 leeN joined #git
15:50 bgerber joined #git
15:50 grawity pretty much, yes
15:51 dminuoso What a confusing message.
15:51 aielima joined #git
15:51 dminuoso seeing as it was never there to begin with.
15:52 grawity `git stash pop/apply` is a weird-ass merge
15:52 grawity due to the way it stores both staged and unstaged changes
15:52 ToxicFrog joined #git
15:53 sixtel joined #git
15:55 JeroenT joined #git
15:55 clemf joined #git
15:55 ToxicFrog joined #git
15:55 NaviNick I have a project that I moved from TFVC to GIT. When I added the project to GIT I included every file in the commit - this resulted in having many files tracked that I don't want to be tracked (i.e. debug .dlls). I tried running: git rm -r . --cached  to utilize my .gitignore file, but it appears to want to delete a bunch of my .vb/.cs project files that I want to be tracked. Can someone...
15:55 NaviNick ...please advise on an easy way to clean this situation up? Thanks!
15:55 roelmonn_ joined #git
15:56 moritz NaviNick: if you don't have much history in git, maybe it's easiest to start new, from scratch
15:56 grawity that's not what `git rm` does
15:56 MineCoins joined #git
15:56 theoceaniscool joined #git
15:56 fuzzybear3965 joined #git
15:56 grawity it literally removes files you ask it to remove
15:56 moritz make a fresh checkout/clone/whatever from TFVC, import it into git, be done
15:57 selckin NaviNick: if you want to unstage everything, and stage all excluding gitingore, you'd do soemthing like git reset HEAD .; git add .
15:57 moritz NaviNick: also if you want to include history, use something like https://github.com/git-tfs/git-tfs/blob/m​aster/doc/usecases/migrate_tfs_to_git.md
15:58 BackEndCoder joined #git
15:58 NaviNick moritz: Yes, I would like to keep history in this case. I'll look into that - thank you!
15:58 BrianBlaze420 joined #git
15:59 Ranhir joined #git
15:59 moritz NaviNick: when embarking on such a project, I recommend to google "migrate from tfvc to git" or something, and read the first few hits. Can save you lots of time later on :-)
15:59 venmx joined #git
16:00 moritz it's not like your problem is a unique snowflake or something :)
16:00 NaviNick moritz: Thanks, I did this but I guess it wasn't as clean as I thought
16:00 Tacoder joined #git
16:01 troulouliou_div2 joined #git
16:03 sbasso joined #git
16:04 ilogger2 joined #git
16:05 CalimeroTeknik joined #git
16:06 fuzzybear3965 joined #git
16:06 JeroenT joined #git
16:07 crose joined #git
16:10 a3Dman joined #git
16:11 vuoto joined #git
16:11 orbyt_ joined #git
16:11 Zort0n joined #git
16:12 Ring0` joined #git
16:12 mmlb joined #git
16:12 raijin joined #git
16:12 dendazen joined #git
16:13 roelmonnens joined #git
16:13 albel727 joined #git
16:14 overlord_tm joined #git
16:14 sz0 joined #git
16:15 NeXTSUN joined #git
16:16 cluelessperson joined #git
16:17 hotpancakes joined #git
16:17 hahuang65 joined #git
16:17 Tobbi joined #git
16:18 manuelschneid3r joined #git
16:18 hanthings joined #git
16:18 Levex joined #git
16:19 clemf joined #git
16:19 Cabanossi joined #git
16:19 miha_S7_ joined #git
16:20 clemf joined #git
16:21 hotpancakes joined #git
16:22 ToxicFrog joined #git
16:22 oich joined #git
16:22 cdg joined #git
16:22 Glooomy joined #git
16:22 robotroll joined #git
16:23 BrianBlaze420 joined #git
16:25 gugah_ joined #git
16:25 thebird joined #git
16:25 TomyLobo2 joined #git
16:25 robotroll joined #git
16:26 jstimm joined #git
16:27 robotroll joined #git
16:27 madewokherd joined #git
16:27 xaviergmail_ joined #git
16:29 SporkWitch joined #git
16:29 tureba joined #git
16:29 remote joined #git
16:29 SirCmpwn joined #git
16:30 catsup joined #git
16:30 doppo joined #git
16:30 a_thakur_ joined #git
16:30 mar77i joined #git
16:30 Jguy joined #git
16:30 souther joined #git
16:31 hfp joined #git
16:31 bipolar joined #git
16:31 ajpiano joined #git
16:31 manuelschneid3r joined #git
16:31 rnsanchez joined #git
16:32 a_thakur joined #git
16:32 tang^ joined #git
16:33 batrick joined #git
16:35 steve joined #git
16:35 imack joined #git
16:36 hahuang65 joined #git
16:36 kfoonamalik joined #git
16:36 svm_invictvs joined #git
16:36 johnnyfive joined #git
16:36 Zort0n joined #git
16:37 hotpancakes joined #git
16:37 Levex joined #git
16:38 gnarf joined #git
16:39 jungsubk joined #git
16:40 oscaral left #git
16:40 livingstn joined #git
16:40 eroux joined #git
16:41 Danny_ joined #git
16:41 navidr joined #git
16:41 guest joined #git
16:42 guest I'm authoring a commit message but I don't want to make this commit! I accidentally did --amend. Can I cancel at this point or do I have to go throuhg with it, and un-pick it after
16:42 rivarun joined #git
16:43 grawity either a) delete the entire message, or b) go through it and just undo with `git reset @{1}`
16:43 guest git reset won't work I did "git commit --amend" when I wanted to do "git commit"
16:43 guest I'll try a blank message
16:44 guest worked.
16:44 guest grawity++
16:44 netj joined #git
16:44 grawity uh sure it'll work
16:44 grawity why wouldn't it
16:45 puff Good afternoon.
16:45 math-alpha joined #git
16:47 guest I thought ammend might be special
16:47 guest ie I can't "abort" the commit because it already exists
16:47 grawity no difference really
16:47 grawity since editing a commit means creating a new one regardless
16:48 durham joined #git
16:48 guest OK makes sense
16:49 BackEndCoder joined #git
16:49 bluepixel joined #git
16:51 HardlySeen joined #git
16:51 aubreypwd_ joined #git
16:52 cdg_ joined #git
16:52 zxd what does the '^'  mean in git rev-list -n 1 --grep '^WIP' "$range
16:52 _ikke_ zxd: man gitrevisions
16:52 gitinfo zxd: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
16:53 qqx zxd: That's a regexp special character to anchor the match to the start of a line.
16:53 qqx Nothing to do with gitrevisions.
16:53 _ikke_ I should read better :P
16:55 jkremer joined #git
16:56 Dougie187 joined #git
16:57 aubreypwd_ Hello, will a force push containing squashed commits break anyone using the repo as a submodule? I'm assuming no based on my understanding of how submodules work.
16:58 lordjancso joined #git
16:58 bitmod when should git init --bare be used?
16:58 canton7 aubreypwd_, maybe if they use --merge, or the corresponding config option?
16:58 moritz bitmod: when you want to use a repo for pushing to and pulling from
16:58 canton7 bitmod, it's commonly used for servers, where you have a repo that people will push to and pull from, but noone will work inside of that repo directly
16:58 Dougie187 aubreypwd_: Or if they are using one of the squashed commits.
16:59 aubreypwd_ I'm just squashing 8 commits into a new commit and force pushing. I don't want to bork anyone tracking master in a submodule though, but I don't think this will.
16:59 Dougie187 Are the 8 commits already published on master?
16:59 aubreypwd_ If they are using a squashed commit, it will be on their local checkout. If they git submodule update --init --recursive then the new commit should be used right?
16:59 aubreypwd_ They are.
16:59 bitmod moritz, canton7: ah, is this the type of repo a host like github would have?
16:59 canton7 bitmod, yes, exactly
16:59 Dougie187 aubreypwd_: Then yes, it could easily mess someone else up
16:59 jkremer___ joined #git
17:00 bitmod so i should only use this option if i want to self-host git?
17:00 Dougie187 aubreypwd_: No, the commit in the super project points to a specific commit in the submodule.
17:00 canton7 Dougie187, I think it would only mess someone up if they had set up the submodule to track a specific branch, and were using the merge strategy to update it
17:00 canton7 by default, submodules just checkout the new commit
17:00 Dougie187 aubreypwd_: So, if they try to checkout that version, and it points to one of the commits you squashed it'd fail.
17:00 aubreypwd_ Yeah, but as soon as they update it the new commit will be avail right. As long as they don't update, they should have the commit locally, right?
17:00 canton7 ah yeah, if they had set up the submodule to point to the commit which was rewritten, then things will break
17:00 venmx joined #git
17:01 Dougie187 aubreypwd_: No, it won't pull in the newer commit, because it doesn't know which commit to pull in
17:01 jnewt joined #git
17:01 canton7 there's a case where the person doesn't update their submodule, but someone else clones the supermodule
17:01 Dougie187 aubreypwd_: It'll definitely break any versions in the super project that point at one of the commits you're removing.
17:01 canton7 that will break if you force-push
17:01 aubreypwd_ It's tracking master shouldn't it Magically figure that out lol
17:01 chardan joined #git
17:02 canton7 submodules work by grabbing a specific *commit*
17:02 Dougie187 aubreypwd_: Check out an older version of your superproject, and do `git submodule --init --recursive` on it. And see what version you're pointing it.
17:02 Dougie187 Hopefully you have an older version of your super project that points at a different commit of your submodule. In which case you should be able to see the point I'm making.
17:02 jagob joined #git
17:03 aubreypwd_ Good point....If they go back in history I guess they could be pointed at an old commit.   But they could then do the update and it would fix it right?
17:03 Dougie187 No, that won't fix it.
17:03 Dougie187 That commit is tied to a specific commit of the submodule.
17:03 jnewt i need to split a repository.  i can use git filter-branch --prune-empty --subdirectory-filter <FOLDER> <NEW_BRANCH>  to get each of the two folders i want to split out.  but i want to put them together (the folder was simply renamed at one point in the repo).  any idea how to do that?
17:03 canton7 the supermodule tracks the *specific* commit to check out in the submodule. "check out commit abc123 at path foo/bar"
17:03 Dougie187 aubreypwd_: In general, squashing published commits is a bad idea.
17:04 Dougie187 aubreypwd_: you need a really good reason to make it seem worth it.
17:04 aubreypwd_ Right, so anytime they go in the past they would have to update the submodule manually e.g. checkout master to fix it.
17:04 Dougie187 aubreypwd_: Yes, they would need to put in effort to make it work.
17:04 Dougie187 aubreypwd_: But, simply checking out master doesn't mean it works.
17:04 canton7 aubreypwd_, but bear in mind, updating to masting might break that old version of the supermodule!
17:04 aubreypwd_ Yeah lol trying to justify not wanting to revert 8 commits because I'll want to un-revert them later and fix the changes up.
17:04 aubreypwd_ Right now they're dirty.
17:05 canton7 since the code will expect an older version of the submodule, and you'll be checking out a newer version
17:05 Dougie187 ^^
17:05 Dougie187 There are tons of cases where you're going to break things worse than you think by doing this
17:05 Dougie187 You'
17:05 canton7 the code will have been written to work against a version of the submodule which now doesn't exist :P
17:05 Dougie187 You're ultimately the only one who will know if it will work or not.
17:05 Sound joined #git
17:06 canton7 aubreypwd_, you can revert the 8 commits in a single revert commit. Then you can revert that single revert later
17:06 Dougie187 If you're squashing comments, and no one points at the intermediate commits you're squashing away, you're probably fine.
17:06 aubreypwd_ You can!? lol
17:06 ddavidd If someone left a password in a file a few commits back, and needs to scrub the repo and not just push a corrected file. Is there a command for this? I'm assuming it won't be pretty for anyone who pulled those commits.
17:06 Dougie187 !bfg
17:06 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
17:06 canton7 aubreypwd_, yeah, see the examples in man git revert
17:06 gitinfo aubreypwd_: the git-revert manpage is available at http://jk.gs/git-revert.html
17:07 Dougie187 Oh, no that's not what I was looking for.
17:07 Dougie187 Oh, maybe it is.
17:07 Dougie187 ddavidd: !bfg
17:07 gitinfo ddavidd: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
17:07 Exaeta_ joined #git
17:07 aubreypwd_ You sold me, not going to squash the commits. But I like the idea of being able to revert them and un-revert one commit to get them back later.
17:07 BSaboia joined #git
17:07 aubreypwd_ Hey man! Thanks for your help!
17:07 ddavidd Thanks Dougie187
17:07 Cthalupa joined #git
17:08 ddavidd I'll also checkout revert canton7. Appreciate it!
17:08 canton7 ddavidd, that wasn't aimed at you
17:08 canton7 revert won't remind a password from history
17:08 canton7 *won't remove
17:08 kevr joined #git
17:08 ddavidd Oh! Gotcha canton7
17:08 grawity ddavidd: !filter_sensitive
17:08 gitinfo ddavidd: You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/arti​cles/remove-sensitive-data/
17:08 kevr is git clone supposed to show progress for local repositories?
17:08 qqx ddavidd: If the password has been pushed somewhere public, you may just want to change the password and not worry about scrubbing it from history.
17:09 ddavidd qqx: Good point.
17:09 xall joined #git
17:11 Derperperd joined #git
17:12 dglambert joined #git
17:12 dglambert yo, accidently ask my question in ##git
17:12 dglambert facepalm
17:12 dglambert So I think I asked this the other day as part of a barage of questions.
17:12 dglambert I have MainLine branch, and Feature branch. I am currently working in Feature, and I see in the remote repo someone has updated MainLine. Instead of checking out MainLine, pulling, checking out Feature, then merging MainLine, is there a move to do this in fewer steps
17:13 Dougie187 dglambert: You're trying to merge mainline into your feature branch?
17:13 dreiss joined #git
17:13 dglambert yes, but remote MainLine
17:13 Dougie187 Yeah
17:13 grawity well, 1) it doesn't matter if you merge your local branch or a remote-tracking branch
17:13 Dougie187 There are several ways to do this.
17:13 grawity so `git fetch` and merging origin/MainLine would have the same effect
17:14 Dougie187 ^^
17:14 Dougie187 I think you can also do `git pull <remote> MainLine`
17:14 dglambert oh because pull also has merge built in?
17:14 canton7 pull *means* a fetch + a merge
17:14 dglambert oh hey canton7 !
17:14 canton7 o/
17:14 multi_io joined #git
17:14 dglambert \o
17:15 psprint yeah one should get confidence about this pull=fetch+merge to be able to do git log ..FETCH_HEAD
17:17 dglambert psprint: ?
17:17 cahoots joined #git
17:19 cahoots hi, i'm getting large file warnings for a git push, but when i do a git diff, all i see is a one-line change. my default git push behavior is simple and my git command was "git push origin branch-name". any ideas?
17:19 psprint dglambert: if you fetch, you can see commits to be merged, by git log ..FETCH_HEAD
17:19 nevodka joined #git
17:20 dglambert So you are arguing the value of git fetch over git push?
17:20 psprint I gained the confidence when I implemented this via libgit2 hehe, fast forward is pull + refs/<branch> move to tip
17:20 psprint no
17:20 psprint s/pull/fetch/
17:21 dglambert So your saying I can still see the history then if I pull ?
17:21 einnjo joined #git
17:22 psprint dglambert: no, I'm saying that you can see what will be merged before the merge
17:22 dglambert ohhh
17:23 dglambert but I need to do FETCH_HEAD
17:23 dglambert before
17:24 dglambert So if I have Feature branch checkout and, git pull origin MainLine
17:24 dglambert that will recognize I am trying to Merge MainLine into Feature
17:25 soygabo joined #git
17:25 skalpin yes
17:25 dglambert oh I see FETCH_HEAD now in the response
17:26 dglambert so does this also update my MainLine local branch?
17:26 jstimm joined #git
17:27 duderonomy joined #git
17:28 pwnz0r joined #git
17:28 cdg joined #git
17:28 dglambert Ok, it seems like it worked,
17:28 dglambert ty psprint
17:28 dglambert .karma
17:28 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
17:28 dglambert ty canton7
17:29 dglambert ty Dougie187
17:29 dglambert ty grawity
17:29 dglambert karma for everyone
17:29 dtrott joined #git
17:30 Levex joined #git
17:31 sbeller joined #git
17:34 hotpancakes joined #git
17:36 thiago joined #git
17:37 re1 joined #git
17:41 inflames joined #git
17:41 Dougie187 joined #git
17:42 bitmod joined #git
17:42 eroussel joined #git
17:44 pks joined #git
17:45 tristanp joined #git
17:46 arooni to unstage a file from the index (but not to delete it, or remove it from git tracking) i use git rm --cached ?
17:47 TheMattyMonster joined #git
17:48 rishi joined #git
17:49 a_thakur joined #git
17:49 _ikke_ No
17:49 _ikke_ git rm --cached will remove the file from tracking (which is implied by it not being in the index)
17:50 Snugglebash joined #git
17:50 arooni then how do i simply unstage a file from the index
17:50 arooni glad i asked first lol
17:50 Es0teric joined #git
17:51 Peuc joined #git
17:51 TheMattyMonster joined #git
17:52 LauJensen I have local changes to master, and a new commit was just pushed to the repo. They arent in conflict I think, so can I merge them?
17:53 fedepad joined #git
17:54 DammitJim joined #git
17:54 DammitJim I've asked this before, but I honestly don't remember what I need to do
17:54 DammitJim what is the proper way of backing up git?
17:55 kexmex joined #git
17:59 djb-irc joined #git
18:00 dtrott DammitJim: Not sure how you define “proper” but a clone of a repo has a full copy of the commit history, branches and tags.
18:01 thiago_ joined #git
18:01 canton7 DammitJim, !backup
18:01 gitinfo DammitJim: 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
18:02 Guest55 joined #git
18:03 hahuang65 joined #git
18:08 Anja joined #git
18:09 miczac joined #git
18:09 xall joined #git
18:11 Vampire0_ joined #git
18:11 hahuang61 joined #git
18:12 miczac joined #git
18:13 nowhere_man joined #git
18:13 DammitJim I guess the same applies to doing an rsync...
18:14 raijin joined #git
18:14 txm joined #git
18:14 sotoz joined #git
18:16 Sasazuka joined #git
18:18 djb-irc left #git
18:19 Ryanar joined #git
18:19 rominron_ joined #git
18:20 cahoots hi, i'm getting large file warnings for a git push, but when i do a git diff, all i see is a one-line change. my default git push behavior is simple and my git command was "git push origin branch-name". any ideas?
18:23 xaviergmail_ joined #git
18:23 sbasso joined #git
18:24 canton7 cahoots, maybe you're pushing more than one commit? 'git diff --stat origin/branch-name'?
18:24 Atm0spher1c joined #git
18:25 DammitJim left #git
18:25 keebs joined #git
18:26 eperez joined #git
18:26 yehowyada joined #git
18:26 yehowyada joined #git
18:26 o132 joined #git
18:26 cahoots canton7, i see a ton of files with that command, but i don't see them without --stat, and when i do "git log origin/branch-name", i just see the same two small commits. what might be the issue?
18:27 pbrewczynski joined #git
18:27 canton7 'git log origin/branchname' just shows the commits present on the remote, not what you're trying to push
18:27 canton7 also, !repro
18:27 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:27 canton7 (I need to head home in a minute, but someone else will step in I'm sure)
18:27 qqx cahoots: That log command would list commits already at the origin. To list commits since then use `git log origin/branch-name..` (not the trailing dots).
18:28 qqx s/not/note/
18:29 djb-irc joined #git
18:30 math-alpha left #git
18:30 cahoots qqx, https://gist.github.com/michaeleisel​sc/9244ee8adc4313e9d3e514050cff9843
18:30 EricPoe joined #git
18:31 canton7 yeah, those will do largely the same thing
18:31 qqx Those commands are doing pretty much the same thing. Try using `log` rather than `diff` for the second command.
18:32 Noldorin joined #git
18:32 qqx Although the first command would include uncommitted changes while the second would not.
18:32 blackwind_123 joined #git
18:33 __rgn joined #git
18:34 Cabanossi joined #git
18:38 a3Dman joined #git
18:38 netj joined #git
18:38 hotpancakes joined #git
18:38 dsteplight__ joined #git
18:39 cahoots when i run "git log --stat origin/branch-name..", i see my two commits which are small, then i see a commit before that from someone else which is huge
18:39 cahoots when i run "git log --stat origin/branch-name", i see my two small commits and then some other small commits
18:40 cahoots the latter has the same set of commits as when i just run "git log"
18:41 djb-irc joined #git
18:42 Anja joined #git
18:44 ep-wi_ left #git
18:44 mehwork joined #git
18:45 sea-gull joined #git
18:45 mehwork i just merged a branch to develop, with 'git merge <branch>' but changed my mind. How should i roll back real quick (i haven't pushed anything yet)
18:47 glowdemon1 joined #git
18:48 chachasmooth joined #git
18:49 soygabo joined #git
18:49 o132 joined #git
18:49 luke_nukem joined #git
18:49 SilverBe joined #git
18:49 LauJensen I have local changes to master, and a new commit was just pushed to the repo. They arent in conflict I think, so can I merge them?
18:51 Endarked joined #git
18:51 adymitruk joined #git
18:51 arooni how whats the difference between git rm foo.txt ; and git reset HEAD -- foo.txt ; (in the case that foo.txt is in the index)
18:51 bruce_lee joined #git
18:51 nd joined #git
18:51 grawity the former removes foo.txt entirely
18:52 grawity the latter merely unstages any changes that were added to the index since last commit
18:52 cahoots qqx, ^^
18:52 arooni but git rm --cached foo.txt ; would leave foo.txt intact; but now its not something git tracks anymore
18:52 arooni thanks grawity
18:53 arooni is HEAD inferred from reset ?  i.e. superflous?  also what's with the -- in the middle of the command
18:53 arooni haven't seen that before
18:54 azerus joined #git
18:54 j08nY joined #git
18:57 aidalgol joined #git
18:59 raijin joined #git
18:59 dvaske_ joined #git
19:00 adymitruk joined #git
19:00 a3Dman joined #git
19:00 a3Dman joined #git
19:01 mda1 joined #git
19:01 manuelschneid3r joined #git
19:01 venmx joined #git
19:02 hotpanca_ joined #git
19:02 n1ce_ joined #git
19:02 finalbeta joined #git
19:03 tobiasvl arooni: http://unix.stackexchange.com/quest​ions/11376/what-does-double-dash-me​an-also-known-as-bare-double-dash
19:03 LeBlaaanc joined #git
19:03 arooni cool; i thought it was git specific
19:03 arooni thanks for expanding my mind
19:03 chachasmooth joined #git
19:03 grawity well, no, it doesn't have exactly the same meaning in git as in most other tools
19:03 grawity as in, it doesn't only separate *options* but also two different kinds of parameters
19:04 tobiasvl yeah, in git it separates the options from the path names, mostly to disambiguate names of branches and filenames
19:04 tobiasvl uuuh
19:04 tobiasvl that was mangled and wrong
19:10 Ryanar joined #git
19:13 stickperson joined #git
19:13 stickperson i have a feature branch A. i have another feature B that depends on A. should i create branch B off of A, or should i create a new branch off master and cherry pick from A?
19:14 dodgems joined #git
19:15 GodGinrai stickperson: you should branch off of B
19:15 aielima joined #git
19:15 stickperson GodGinrai: alright. and then probably rebase once A is in since B will also have A's commits?
19:16 GodGinrai stickperson: cherry-picking from a branch that is intended to be merged will just create duplicate commits with different hashes when merged
19:17 GodGinrai you don't necessarily ever need to rebase
19:17 GodGinrai since the commits in B that are from A would have the same hashes, there would be no problem
19:17 stickperson ah i see
19:17 stickperson cool. will give it a try. thanks for the info
19:17 GodGinrai np
19:17 hotpancakes joined #git
19:18 tvw joined #git
19:18 Emperor_Earth joined #git
19:19 stickperson left #git
19:20 lucido-cl joined #git
19:22 akkad joined #git
19:23 elemeno_ joined #git
19:25 brokensyntax joined #git
19:27 Guest55 joined #git
19:28 hotpancakes joined #git
19:28 svm_invictvs joined #git
19:29 elemeno_ left #git
19:29 eperez joined #git
19:30 n1ce joined #git
19:31 dvaske joined #git
19:32 dvaske_ joined #git
19:32 Levex joined #git
19:32 Kevad joined #git
19:32 Dougie187 joined #git
19:37 Fischmiep joined #git
19:38 eperez joined #git
19:39 Darion joined #git
19:39 causasui anybody got a tutorial for setting up dirmngr.conf?
19:39 causasui sorry, wrong channel
19:40 caper joined #git
19:40 caper anyone know how I can exclude a file from a git diff (i dont want to gitignore it)
19:40 grawity set the -diff gitattribute on it
19:40 cr34ton joined #git
19:40 elemeno_ joined #git
19:41 Darion joined #git
19:41 scoobert1on joined #git
19:42 gopar joined #git
19:43 elemeno_ Can anyone explain if this is possible. Say I've got a master branch of a PHP site, and it's got things like documnetation and scripts under it. I want a release branch that contains everythingneeded to run the project, leaving out documantation and the like. Is it possible, say on commit to master to have it update the relase branch, but leaving out unneeded things?
19:43 peepsalot joined #git
19:44 grawity can't say I see any reason to exclude docs from releases in the first place
19:45 cr34ton joined #git
19:45 elemeno_ Well, it's not going to get served by the website. My aim is to log into the server, do a git pull from the release branch, and have everything updated
19:45 HurricaneHarry joined #git
19:46 Fischmiep joined #git
19:46 eperez joined #git
19:47 eperez joined #git
19:48 hotpancakes joined #git
19:48 Glooomy joined #git
19:49 Dazzyp joined #git
19:51 hotpanca_ joined #git
19:55 Dougie187 joined #git
19:56 elemeno_ left #git
19:57 einnjo joined #git
19:58 nivag joined #git
19:58 Fallen0223 joined #git
19:58 hahuang65 joined #git
19:59 Balliad joined #git
20:00 Kevad left #git
20:00 Kevad joined #git
20:02 venmx joined #git
20:03 raijin joined #git
20:03 Fischmiep joined #git
20:04 cyberz joined #git
20:06 buzzLightBeer joined #git
20:06 satifant joined #git
20:07 MasterNayru joined #git
20:09 Aeterne joined #git
20:09 a_thakur joined #git
20:11 sotoz joined #git
20:11 cyberz joined #git
20:11 davimore joined #git
20:13 KaibutsuX joined #git
20:13 KaibutsuX anyone here know much about GitPython?
20:14 KaibutsuX I'm getting GitCommandError exception on repo.git.diff(path) where path has spaces in it
20:15 miha_S7_ joined #git
20:16 Kronuz joined #git
20:17 cdg joined #git
20:17 Serus joined #git
20:19 caper_ joined #git
20:20 matsaman joined #git
20:21 dminuoso left #git
20:21 rafalcpp joined #git
20:21 RussianNinjaCat joined #git
20:28 devslash joined #git
20:29 devslash Im new to git/github. if i check out someones github repo by doing git clone url and make changes to one of the scripts, will i be able to check it back in or do I need a special permission for that
20:29 BSAlb joined #git
20:29 _ikke_ devslash: You can commit locally, but you need push access to push it upstream
20:29 devslash pushing it will upload my changes back to github
20:30 qqx devslash: You'd need special permission to push to their repo. Typically you'd push to your own fork, and then create a pull request.
20:30 jstimm joined #git
20:30 devslash oh how do i do that
20:30 devslash do i create my own branch
20:30 _ikke_ That's the first step
20:31 devslash then what
20:31 hotpancakes joined #git
20:31 Sasazuka joined #git
20:32 _ikke_ devslash: Typically, in the webinterface, you click on a button called 'fork'
20:32 devslash I did git branch CLI then switched to that branch
20:32 _ikke_ that makes a copy of the project where you can push to
20:32 Derperperd joined #git
20:33 ToBeCloud joined #git
20:33 alex1a joined #git
20:34 vuoto joined #git
20:34 mehwork left #git
20:35 __rgn joined #git
20:35 mlvnd joined #git
20:37 chachasmooth joined #git
20:40 Vampire0 joined #git
20:40 dminuoso joined #git
20:42 Kevad joined #git
20:42 Fischmiep joined #git
20:42 devslash ikke so would i push my changes after im done ?
20:42 _ikke_ devslash: After you forked the project, you need to add a new remote to your repository so that you can push to it
20:43 devslash how do you fork
20:43 devslash is that the same as a branch
20:43 _ikke_ no
20:43 _ikke_ forking in this context is a term github invented
20:43 _ikke_ You do it in the web interface
20:44 Kevad Hello, I have installed git with mac’s commandline tools and got 2.10.x.
20:44 Kevad Later I installed 2.12.x from www.git-scm.com
20:44 Kevad but I still get 2.10.x when I do “git —version”
20:44 devslash check the path
20:45 Kevad how can I use the latest one ?
20:45 devslash you probably have a conflict in your path thats pointing to the old version
20:45 devslash or uninstall the old version if you can
20:45 devslash set the environment path
20:46 Kevad can I uninstall older version of git ??
20:46 menip joined #git
20:46 devslash how did you install it
20:47 Kevad when I typed “git” on command line, it says it is not available and hence ready to install from XCode’s tools
20:47 Noldorin joined #git
20:47 l33ch joined #git
20:47 Kevad I did a fresh installation of Mac… so eveything was gone
20:49 Kevad actually I don’t know where the installation from git-scm’s “.pkg” went !!!
20:50 irqq joined #git
20:50 Kevad “/bin, /usr/local/bin” both weren’t updated
20:50 tang^ which -a git
20:50 jstimm joined #git
20:50 re1 joined #git
20:50 Kevad “/usr/bin/git
20:50 Kevad
20:51 Kevad “/usr/local/bin/git”
20:51 LauJensen I have local changes to master, and a new commit was just pushed to the repo. They arent in conflict I think, so can I merge them?
20:51 Kevad both have 2.10.1
20:51 _Vi joined #git
20:51 hotpancakes joined #git
20:52 re1 joined #git
20:52 tang^ git version 2.10.1 (Apple Git-78)
20:53 matoro joined #git
20:53 _cyril_ joined #git
20:54 tang^ I have 2.12.0 installed in /usr/local/bin via machomebrew
20:55 sea-gull joined #git
20:56 tang^ the git-scm package is actually 2.10.1
20:56 Kevad @tang^ : Hmm, ok.. Think I have to install with brew again… 3 installations in total :(
20:56 orbyt_ joined #git
20:57 tang^ despite that the link says 2.12
20:57 Kevad oh.. :-/
20:57 tang^ no, the source link is 2.12
20:57 tang^ when you get to the Mac page it says 2.10.1
20:57 diogenese joined #git
20:58 tang^ so looks like brew is the only place it's current
20:58 Kevad aah… you were right..
20:58 LauJensen I have local changes to master, and a new commit was just pushed to the repo. They arent in conflict I think, so can I merge them?
20:58 Kevad Now.. all good then.. Thanks a lot @tang^
20:58 tang^ welcome
20:59 tang^ LauJensen: sure
20:59 LauJensen how?
20:59 tang^ git pull?
20:59 seni1 joined #git
21:00 LauJensen git pull says there are changes to master that arent local, so it wont pull
21:00 tang^ what is the exact message?
21:01 LauJensen Updates were rejected because the remote contains work that you do not have locally
21:01 LauJensen Thats when I tried to push my local changes
21:01 tang^ yeah, you can't push
21:01 LauJensen if I pull, I assume I override my latest local commit
21:01 tang^ pull = fetch + merge by default
21:01 tang^ you can do fetch + rebase if you want
21:01 dminuoso Im in feature_branch and decided to be stupid and make an application wide refactor to remove trailing whitespaces. How can I take "just the diff from that commit" and apply it to master?
21:02 tang^ but no, your local commits won't be removed
21:02 dminuoso If I tried to stash, checkout master, stash pop => I would be left with one big ass major conflict.
21:02 LauJensen Right, pull then push actually did what I hoped
21:02 dminuoso Mmm. Ohh!
21:02 LauJensen Thanks for helping out
21:02 dminuoso cherry-pick!
21:03 Cavallari joined #git
21:03 EricPoe_ joined #git
21:04 devslash left #git
21:05 tyreld joined #git
21:07 luke_nukem joined #git
21:08 davimore joined #git
21:10 dminuoso Wow okay I think I created a real mess now. :-)
21:12 bocaneri joined #git
21:12 jost__ joined #git
21:13 bocaneri joined #git
21:14 minn joined #git
21:16 askb joined #git
21:16 mar77i_ joined #git
21:16 miha_S7_ joined #git
21:18 sbasso joined #git
21:19 dsdeiz joined #git
21:20 sotoz joined #git
21:21 bocaneri joined #git
21:23 astrofog joined #git
21:24 m0viefreak joined #git
21:24 Ryanar joined #git
21:27 karoal joined #git
21:28 Levex joined #git
21:30 Silenced joined #git
21:30 Silenced joined #git
21:30 zahodinikola joined #git
21:32 zahodinikola left #git
21:33 Cabanossi joined #git
21:41 Panacea joined #git
21:41 atomi joined #git
21:42 jeffreylevesque joined #git
21:43 hotpanca_ joined #git
21:44 Anja joined #git
21:45 tmg joined #git
21:45 swalladge joined #git
21:49 Dougie187 left #git
21:50 Kevad left #git
21:51 Noldorin joined #git
21:54 l33ch joined #git
21:55 Fallen0223 joined #git
21:59 hotpancakes joined #git
21:59 snits joined #git
21:59 t0by joined #git
22:00 ryxxed joined #git
22:01 bsm1175322 joined #git
22:02 cyberz joined #git
22:02 venmx joined #git
22:02 roelmonnens joined #git
22:05 impliednude joined #git
22:05 cdg joined #git
22:05 sweatsuit joined #git
22:05 cahoots joined #git
22:06 shgysk8zer0_ joined #git
22:07 aidalgol joined #git
22:07 hotpancakes joined #git
22:07 matoro joined #git
22:07 inflames joined #git
22:09 miczac joined #git
22:10 Orphis joined #git
22:12 xaviergmail_ joined #git
22:13 sargas joined #git
22:14 yunyang left #git
22:14 Ryanar joined #git
22:16 raynold joined #git
22:17 sbasso joined #git
22:17 miha_S7_ joined #git
22:18 kent\n is there a way to set the date-format defaults globally?
22:18 kent\n the defaults are *useless* as-is.
22:18 Cabanossi joined #git
22:19 kent\n nothing like seeing 2 commit timestamps at relatively close hours and not noticing the TZ's are different to ruin your week
22:19 orbyt_ joined #git
22:19 kent\n config.log.date seems the ticket
22:20 Derperperd joined #git
22:20 luke_nukem joined #git
22:24 Ryanar_ joined #git
22:27 ispn joined #git
22:28 cyberz joined #git
22:30 Sasazuka_ joined #git
22:31 einnjo joined #git
22:33 Oatmeal joined #git
22:34 Eugene kent\n - commit objects are created using the system's timezone configuration, and displayed(by default) as they were created.
22:34 Eugene So..... "fix your timezone" is the generic answer, or man git-log and use --date; but you already found that config option
22:34 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
22:37 robattila256 joined #git
22:41 pifon joined #git
22:41 kent\n Eugene: yeah. "fix your timezone" , doesn't make sense here.
22:41 kent\n the timezones are real
22:42 kent\n that's what happens when you have committers on every continent.
22:42 Eugene Time is an illusion
22:42 kent\n I live at GMT+13 right now, this makes every timezone useless most days.
22:43 kent\n and makes me lucky enough to find date-handling bugs on a regular basis.
22:46 raijin joined #git
22:47 cahoots joined #git
22:51 raijin joined #git
22:52 Eugene Sounds like everything is working as-designed; whether that design makes sense.... eh
22:52 sbasso_ joined #git
22:53 raijin joined #git
22:53 a3Dman joined #git
22:56 hahuang65 joined #git
22:57 roelmonnens joined #git
23:02 matoro joined #git
23:04 Levex joined #git
23:04 Cabanossi joined #git
23:04 venmx joined #git
23:08 rkazak_ joined #git
23:11 mizu_no_oto joined #git
23:13 eh3 joined #git
23:18 miha_S7_ joined #git
23:20 jstimm joined #git
23:21 raijin joined #git
23:22 gopar joined #git
23:23 ispnsn joined #git
23:23 sherm4n4tor joined #git
23:23 TbobbyZ_ joined #git
23:26 raijin joined #git
23:30 raijin joined #git
23:31 hotpancakes joined #git
23:36 raijin joined #git
23:37 adamru joined #git
23:38 madewokherd joined #git
23:38 raijin joined #git
23:39 raijin joined #git
23:39 vargaslo joined #git
23:41 raijin joined #git
23:44 DolpheenDream joined #git
23:45 jnewt joined #git
23:48 aidalgol joined #git
23:51 livingstn joined #git
23:52 justanotheruser joined #git
23:54 HardlySeen joined #git

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