Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-09

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

All times shown according to UTC.

Time Nick Message
00:01 LandonJH joined #git
00:02 durham joined #git
00:05 BoldInterrobang joined #git
00:05 dhollinger joined #git
00:08 aspiers joined #git
00:08 dsdeiz joined #git
00:08 dsdeiz joined #git
00:09 SpeakerToMeat joined #git
00:09 JackMc joined #git
00:14 caliculk joined #git
00:16 xaa joined #git
00:22 ejb joined #git
00:25 rominronin joined #git
00:26 Gsham joined #git
00:27 re1 joined #git
00:29 Droolio joined #git
00:30 cqi joined #git
00:32 mns Besides GitHub, GitLab, and Bitbucket, are there any other equivalents that I can look at for commerical use internally at work ?
00:34 mizu_no_oto joined #git
00:35 kadoban Depends what you mean by equivalents.
00:36 kadoban I find gitolite sufficient, others need way more features, etc.
00:36 durham joined #git
00:36 cdown joined #git
00:38 aidalgol joined #git
00:39 Anja joined #git
00:40 cagedwisdom joined #git
00:40 DINOWILLIAM joined #git
00:40 mns kadoban: By equivalent, I mean they offer commercial grade repository management (with support, etc).  Issue tracking,  wiki, and  Code review are plus points.
00:41 mizu_no_oto joined #git
00:41 mns Looking at the market, there seem to be the 3 that I mentioned:  Github, Gitlab, and Bitbucket.  I'd like to ensure I've looked at all the options before presenting to the bosses.
00:44 boombatower joined #git
00:44 sitaram /away
00:44 sitaram oops
00:44 bl0w3d_0ut joined #git
00:45 sitaram mns: I'm not sure about *support* but gerrit is another one, with more focus on code review
00:45 sitaram s/support/commercial support/
00:45 mns I'll take a look at gerrit
00:46 curiousmansi joined #git
00:46 mns but like you I was under the impression that its more for code review.
00:46 bl0w3d_0ut joined #git
00:46 cdown_ joined #git
00:48 mns Gerrit does do repo management as well, but doesn't look like there's any commercial support. :(
00:48 sitaram gitolite has no *commercial* support, and no GUI stuff (issue tracking, code review, etc...).  I know lots of people use it along with redmine, but I have no personal experience with that
00:48 * sitaram doesn't even know what is redmine's feature list
00:48 PaulCapestany joined #git
00:52 tunafizz joined #git
00:52 mns sitaram: yeah there is gitolite, as well as gogs (http://gogs.io/),  taht I am aware of.  I recently setup gogs for my personal stuff (for kicks).  But I guess as far as commercial stuff goes, there is Github, Gitlab and Bitbucket as far as I can tell.
00:53 mns sitaram: you wrote gitolite, yes ?
00:56 ianmethyst joined #git
00:56 Noodlewitt joined #git
00:56 endiruna joined #git
00:56 Derperperd joined #git
00:58 nickabbey joined #git
00:58 dreiss joined #git
00:59 thiago joined #git
01:00 kadoban Yes
01:01 pbrewczynski joined #git
01:01 caliculk joined #git
01:02 sitaram mns: yes, but I don't think it fits your needs.  No GUI.  (My usual response to "is there a GUI for gitolite" is "yes, it's called gvim" ;-)
01:02 kadoban Hah
01:03 sitaram I also one changed the topic of #gitolite to "Social Coding.  Without the 'social'" :)
01:03 sitaram meaning we don't have issue tracking and discussions and code review and so on
01:04 sitaram that said, gitolite is easily the most powerful in terms of granularity of authorisation controls (I'm pretty sure of this even without personally checking out alternatives)
01:05 rossome joined #git
01:05 polyrob_ joined #git
01:05 manuelschneid3r joined #git
01:06 sitaram https://groups.google.com/forum/#!topic/gitolite/71ivmqOTrbc -- for a funny example.  Though this was for gitolite v2, it'll still work in v3 of course
01:06 leeN joined #git
01:07 cdown_ joined #git
01:08 mahakal joined #git
01:08 dsdeiz joined #git
01:08 sitaram (with suitable changes)
01:09 polyrob joined #git
01:10 caliculk joined #git
01:12 pasky_ joined #git
01:12 BinGOs_ joined #git
01:12 AciD` joined #git
01:12 AciD` joined #git
01:12 MeltedLux joined #git
01:12 heroux_ joined #git
01:12 arooni_team_b joined #git
01:12 nedbat_ joined #git
01:12 cjbrambo_ joined #git
01:12 LeMike joined #git
01:12 devster31 joined #git
01:12 AustinMatherne joined #git
01:12 kanzure joined #git
01:12 webstrand joined #git
01:12 pigeon joined #git
01:12 bipolar joined #git
01:12 TSS_ joined #git
01:12 pepijndevos joined #git
01:12 marvi joined #git
01:12 uebera|| joined #git
01:12 uebera|| joined #git
01:12 yaiyan joined #git
01:12 Bigcheese joined #git
01:12 waveclaw joined #git
01:12 austin987 joined #git
01:12 McKraken_zzzzz joined #git
01:12 davidstrauss joined #git
01:12 tjbp joined #git
01:12 nedbat_ joined #git
01:12 LaptopBrain joined #git
01:12 aca20031 joined #git
01:13 chosafine joined #git
01:13 ShoaibJahejo joined #git
01:13 mgedmin joined #git
01:13 kent\n joined #git
01:13 MatthewAllan93 joined #git
01:13 Timvde joined #git
01:13 dhanush joined #git
01:13 quesker left #git
01:13 Soliton joined #git
01:13 Furai joined #git
01:13 nixdork joined #git
01:14 ianmethyst joined #git
01:14 Outsider__ joined #git
01:15 zpaz joined #git
01:15 fhackdro- joined #git
01:15 zpaz joined #git
01:16 nuck joined #git
01:16 cust joined #git
01:16 tobie joined #git
01:16 ensign_ joined #git
01:17 karstensrage joined #git
01:17 dikiaap joined #git
01:17 da5id joined #git
01:17 markelite joined #git
01:18 nettoweb joined #git
01:18 t-mart_ joined #git
01:19 nanga joined #git
01:19 rnsanchez_ joined #git
01:19 Ryanar joined #git
01:20 nanga joined #git
01:23 nkhoit joined #git
01:23 imMute joined #git
01:23 Levex joined #git
01:23 iron_houzi joined #git
01:23 spacemud joined #git
01:23 runlevl4 joined #git
01:23 schneider joined #git
01:23 c^ joined #git
01:23 gusnan joined #git
01:23 gusnan joined #git
01:23 cafuser001 joined #git
01:23 atomi joined #git
01:23 dysfigured joined #git
01:23 varx1 joined #git
01:23 bittyx_ joined #git
01:23 heftig joined #git
01:23 SirFunk joined #git
01:23 niax joined #git
01:23 ReenignE joined #git
01:23 ReenignE joined #git
01:23 SleePy joined #git
01:23 rishi joined #git
01:23 Ph__ joined #git
01:23 Sc0rpius joined #git
01:23 guardian joined #git
01:23 vrishab joined #git
01:23 kba joined #git
01:24 acr4 joined #git
01:24 sparr joined #git
01:24 epta joined #git
01:24 scarcry joined #git
01:24 nebg joined #git
01:24 ThiefMaster joined #git
01:24 LaptopBrain joined #git
01:24 saidelike joined #git
01:24 swift1 joined #git
01:24 deepy joined #git
01:24 Sigma joined #git
01:24 danmackay joined #git
01:24 wagle joined #git
01:24 kisonecat joined #git
01:24 i7c joined #git
01:24 danemacmillan joined #git
01:24 ohcibi joined #git
01:24 athaller joined #git
01:24 VampiricPadraig joined #git
01:24 AlexanderS joined #git
01:24 VampiricPadraig joined #git
01:24 snowinferno joined #git
01:24 gitinfo joined #git
01:24 quizzi joined #git
01:24 nickabbe_ joined #git
01:25 qguv joined #git
01:25 ugjka joined #git
01:25 cmn joined #git
01:25 BinGOs_ left #git
01:25 Nothing4You joined #git
01:25 catern joined #git
01:25 ikelso joined #git
01:26 BinGOs joined #git
01:26 Eugene joined #git
01:26 HedgeMage I've checked the alternatives...the granularity of access control is why I use gitolite.
01:27 Urbany joined #git
01:27 _joes__ joined #git
01:28 milkshoes joined #git
01:28 skelterjohn joined #git
01:28 salamanderrake joined #git
01:28 WizJin joined #git
01:28 kier joined #git
01:30 Xe joined #git
01:31 ctcrnitv joined #git
01:31 Peetz0r joined #git
01:31 huhlig joined #git
01:31 ctcrnitv I have a local repo with some files that I want to push to gh-pages (first time)
01:32 rockfruit joined #git
01:32 Sazhen86 joined #git
01:32 ctcrnitv can't find any tutorials for making a gh pages not-from-scratch like this
01:32 inflames joined #git
01:33 CIAguy joined #git
01:33 VoidFox joined #git
01:33 ctcrnitv i already have an origin remote that doesn't point to the right location, I think that might be the issue
01:34 kfc joined #git
01:36 curiousmansi joined #git
01:36 RickyB98 joined #git
01:36 RickyB98 joined #git
01:37 zpaz joined #git
01:37 MatthewAllan93 joined #git
01:37 ejb joined #git
01:37 harrymoreno joined #git
01:40 arescorpio joined #git
01:41 ctcrnitv so when I try to add my gh pages remote I get error..nvm found the issue
01:41 carpii joined #git
01:42 bl0w3d_0ut joined #git
01:43 archaic joined #git
01:44 m1dnight2 joined #git
01:44 bl0w3d_0ut joined #git
01:48 Maple__ joined #git
01:48 Maple__ joined #git
01:48 Maple__ joined #git
01:49 Nilesh_ joined #git
01:51 minibar joined #git
01:52 mahakal ctcrnitv , the program files that you created on your computer are not in the git format..as you yourself are saying ..so first convert them in git format
01:54 thierryp joined #git
01:54 aartist joined #git
01:55 jhasse joined #git
01:55 rivarun joined #git
01:56 snowkidind joined #git
01:57 rominronin joined #git
01:57 pks joined #git
01:59 inflames joined #git
01:59 jameser joined #git
02:00 ctcrnitv why isn't this working? I'm pushing to the right remote
02:00 ctcrnitv https://github.com/ctcrnitv/ctcrnitv.github.io
02:01 ctcrnitv hm maybe because master is behind?
02:02 Guest6 joined #git
02:03 carpii what is git saying when you push?
02:03 atrigent joined #git
02:03 carpii showing a github doesnt tell us much about the problem
02:04 ctcrnitv i got it working ;p
02:04 polyrob joined #git
02:04 ctcrnitv my gh-pages was ahead of master
02:05 ctcrnitv time to get some design advice for my not so great site
02:07 stick-sh_ joined #git
02:08 mahakal joined #git
02:09 curiousmansi how to know what is parent branch of the branch you have created
02:11 Limes_ joined #git
02:13 mahakal Mansi , i think by observing commits
02:13 mellernoia joined #git
02:14 MrWoohoo joined #git
02:15 mizu_no_oto joined #git
02:15 curiousmansi How
02:16 mahakal observe commits
02:16 SwiftMatt joined #git
02:16 mahakal dont you know how to observe commits
02:17 mahakal https://blog.liplex.de/git-show-parent-branch/
02:17 mahakal that may be helpful
02:17 bmahe joined #git
02:18 curiousmansi git log?
02:18 finalbeta joined #git
02:18 mahakal curious madam, phley vo to pdhlo jo link bheji hai
02:20 curiousmansi why there is o command which provides me the info of the branch
02:21 curiousmansi just straightforward
02:21 curiousmansi i have checked that link
02:22 stux|RC joined #git
02:22 ianmethyst joined #git
02:24 GodGinrai joined #git
02:26 mahakal so now what is your real queation ..the o command?
02:26 _ikke_ joined #git
02:27 NeverDie_ joined #git
02:27 curiousmansi info*
02:29 mahakal i think that one of the files git creates during the initilisation of project
02:29 mahakal but not sure
02:30 mahakal info-path is the command
02:30 mahakal and
02:31 mahakal typing .. man git | grep info
02:31 gitinfo the git manpage is available at http://jk.gs/git.html
02:32 mahakal will clar you a lot of points Manso
02:39 Vampire0_ joined #git
02:39 m1dnight2 joined #git
02:41 hahuang61 joined #git
02:46 PtxDK_ joined #git
02:46 cttttt joined #git
02:46 parliament joined #git
02:46 shennyg joined #git
02:46 da5id joined #git
02:46 yena joined #git
02:46 angelsl joined #git
02:46 dunk joined #git
02:46 [diecast] joined #git
02:46 Oatmeal joined #git
02:46 llamapixel joined #git
02:46 nikivi joined #git
02:46 worstadmin joined #git
02:46 ELLIOTTCABLE joined #git
02:46 sbeller_ joined #git
02:46 theresajayne joined #git
02:46 thiago joined #git
02:46 KekSi joined #git
02:46 arunpyasi joined #git
02:46 uidzer0 joined #git
02:46 Spinkzeit joined #git
02:46 idmistir joined #git
02:46 idmistir joined #git
02:46 WakiMiko joined #git
02:46 Outsider__ joined #git
02:46 xkr47 joined #git
02:46 batrick joined #git
02:46 ski7777 joined #git
02:46 dan2k3k4 joined #git
02:46 nebg joined #git
02:46 prosody joined #git
02:46 dwmw2_gone joined #git
02:46 d^sh joined #git
02:46 CustosLimen joined #git
02:46 mehdi___ joined #git
02:46 ddavidd joined #git
02:46 lolmac_ joined #git
02:46 XDS2010 joined #git
02:51 ilbot3 joined #git
02:51 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:52 cqi joined #git
02:52 Maple__ joined #git
02:52 Maple__ joined #git
02:52 Maple__ joined #git
02:54 bjoe2k4 joined #git
02:55 Samual joined #git
02:55 Samual joined #git
02:56 durham joined #git
02:56 xlegoman joined #git
02:56 ColdKeyboard joined #git
02:58 aavrug joined #git
02:58 pks joined #git
03:01 Bloo[m] joined #git
03:01 dmj` joined #git
03:02 Carlos[m] joined #git
03:04 Pie_Napple joined #git
03:05 Miguel[m] joined #git
03:06 alaeri[m] joined #git
03:09 meadmoon joined #git
03:11 Remram joined #git
03:11 Remram joined #git
03:12 GT4066 joined #git
03:15 evanc joined #git
03:18 mahakal joined #git
03:19 SwiftMatt joined #git
03:21 vcoinminer joined #git
03:22 hexagoxel joined #git
03:22 mahakal joined #git
03:22 chosafine joined #git
03:27 rivarun joined #git
03:28 ikelso joined #git
03:28 rominronin joined #git
03:29 Noodlewitt joined #git
03:30 mitzip joined #git
03:33 chandu20 joined #git
03:35 mitzip joined #git
03:36 adambrenecki joined #git
03:38 khagler_ joined #git
03:38 sunri5e joined #git
03:42 askb joined #git
03:43 chandu20 joined #git
03:55 thierryp joined #git
03:55 chachasmooth joined #git
03:56 fstd_ joined #git
03:57 a_thakur joined #git
03:59 jeffreylevesque joined #git
03:59 harrymoreno joined #git
04:06 brent__ joined #git
04:06 AlineGomes joined #git
04:07 ruskie joined #git
04:08 howdoi joined #git
04:09 YuGiOhJCJ joined #git
04:11 chosafine joined #git
04:11 chosafine joined #git
04:12 Learath2 joined #git
04:16 dreiss joined #git
04:17 BSAlb joined #git
04:22 robotroll joined #git
04:29 ybden joined #git
04:39 thiago joined #git
04:40 henriquev joined #git
04:40 richardlitt joined #git
04:46 ianmethyst joined #git
04:48 richardlitt joined #git
04:49 subhojit777 joined #git
04:50 nikivi joined #git
04:57 surfnturf_ joined #git
04:59 surfnturf_ I'm using jenkins to pull code from my github and run tests. For some reason, git fetch is not pulling the latest code changes. I tried git pull and it still did not pull the latest changes. https://dpaste.de/Ogfw
04:59 rominronin joined #git
05:01 Siegfried joined #git
05:01 curiousmansi joined #git
05:02 sbulage joined #git
05:02 kadoban surfnturf_: You're fetching a URL, I would be very surprised if that created/changed/whatever remote tracking branches like origin/whatever
05:02 kadoban At least without you telling it to
05:02 surfnturf_ so should i put origin/<branch> at the end of my url?
05:02 surfnturf_ I'm using the url because I have to use a token from inside jenkins
05:03 kadoban I highly doubt that'll work. You probably have to mess with the refspec stuff in the command to tell it what stuff to fetch and into where.
05:04 cagedwisdom joined #git
05:05 khagler joined #git
05:08 brent__ joined #git
05:09 armyriad joined #git
05:15 Aboba joined #git
05:29 ikelso joined #git
05:31 done joined #git
05:32 lindenle joined #git
05:37 JanC_ joined #git
05:39 quizzi joined #git
05:41 durham joined #git
05:45 a_thakur_ joined #git
05:46 _nwkj86 joined #git
05:47 shgysk8zer0_ joined #git
05:48 Cabanossi joined #git
05:48 Guest68442 joined #git
05:54 nickabbey joined #git
05:56 pbrewczynski joined #git
05:57 thierryp joined #git
05:57 sbulage joined #git
05:58 quizzi joined #git
06:01 freimatz joined #git
06:04 gnoirzox1 joined #git
06:06 brent__ joined #git
06:13 rscata joined #git
06:15 ddavidd joined #git
06:15 ddavidd joined #git
06:16 sbulage joined #git
06:18 WayToDoor joined #git
06:20 surfnturf_ joined #git
06:21 nevodka joined #git
06:22 brillenfux joined #git
06:23 _ng joined #git
06:25 thiago joined #git
06:26 jozwior joined #git
06:26 ihradek joined #git
06:26 Endarked joined #git
06:28 acetakwas joined #git
06:30 ikelso joined #git
06:31 GodGinrai joined #git
06:32 rominronin joined #git
06:34 Gloomy joined #git
06:35 nyuszika7h joined #git
06:38 Siegfried joined #git
06:38 vdv joined #git
06:39 Vortex34 joined #git
06:39 overlord_tm joined #git
06:40 Raging_Hog joined #git
06:44 AfroThundr joined #git
06:45 nebg joined #git
06:45 phanimah1sh joined #git
06:48 surfnturf_ joined #git
06:48 Guest25512 joined #git
06:48 Guest25512 joined #git
06:51 ronskisika joined #git
06:52 Siegfried joined #git
06:57 zeroed joined #git
06:57 zeroed joined #git
06:58 ThomasLocke joined #git
07:01 cdown joined #git
07:06 cdown_ joined #git
07:07 dreiss joined #git
07:07 hhee joined #git
07:07 rivarun joined #git
07:08 joshuaturner joined #git
07:10 zeroed joined #git
07:10 zeroed joined #git
07:12 cqi joined #git
07:13 chele joined #git
07:15 Macaveli joined #git
07:15 JeroenT joined #git
07:15 roflin joined #git
07:16 spacelord_ joined #git
07:17 roelmonnens joined #git
07:19 Alienpruts joined #git
07:20 ki0 joined #git
07:22 sea-gull_ joined #git
07:23 JeroenT joined #git
07:24 rominronin joined #git
07:24 cyan__ joined #git
07:25 nikivi- joined #git
07:26 nikivi left #git
07:26 astrofog joined #git
07:28 elect joined #git
07:31 rominronin joined #git
07:31 ikelso joined #git
07:31 fstd joined #git
07:32 freimatz joined #git
07:36 jnavila joined #git
07:44 nikivi joined #git
07:44 wootehfoot joined #git
07:45 eduardas_m joined #git
07:48 Guest11750 left #git
07:48 Noodlewitt joined #git
07:49 hhee joined #git
07:50 hhee guys, how can i view full code list on certain commit?
07:51 LordRyan git diff <commit> <commit>^ ?
07:51 LordRyan i think it's something like that.
07:52 LordRyan Actually, switch the two. Also `git show <commit>` works too but shows more data.
07:52 hhee LordRyan, got it thx. but not diif i need, just code tree
07:52 LordRyan what is a 'code tree'
07:53 surfnturf_ joined #git
07:53 Peng You can 'git checkout <commit>'
07:53 hhee LordRyan, like code explorer but on certain point
07:53 LordRyan oh
07:53 LordRyan then use what Peng said.
07:53 lordjancso joined #git
07:54 hhee LordRyan, Peng maybe it's rollback to certain commit? or change branch?
07:54 hahuang61 joined #git
07:55 qt-x joined #git
07:55 nickabbey joined #git
07:55 LordRyan hhee: use `git checkout <commit>` and that will set the work environment to what it was during that commit
07:56 hhee LordRyan, got it
07:56 xeviox joined #git
07:56 gabrielschulhof left #git
07:57 zefferno joined #git
07:58 xeviox hi guys, how can I fetch a remote branch to check if it has changes not present in my local version of it? (I can't see the branch with "$ git branch -r" altough I've a local copy of it present)
07:59 LordRyan can't you just `git fetch` then merge if there's a change?
07:59 Sceorem joined #git
07:59 fstd_ joined #git
08:01 Siegfried joined #git
08:03 pepperingranivor joined #git
08:03 xeviox LordRyan: when I git fetch I can't see the branch
08:03 xeviox I tried "$ git fetch origin my/remote/branch"
08:04 xeviox but "$ git branch -r" doesn't show it afterwards
08:05 Ardethian\work joined #git
08:05 Ardethian\work joined #git
08:07 csk157 joined #git
08:09 thiago joined #git
08:10 phanimahesh joined #git
08:13 csk157 joined #git
08:15 Darcidride joined #git
08:16 aidalgol joined #git
08:16 Darcidride joined #git
08:16 pepperingranivor joined #git
08:17 mp3 joined #git
08:19 jameser joined #git
08:21 dsantiago joined #git
08:21 osse xeviox: are you asking how you can check whether it exists? :S
08:22 xeviox osse: how can I check if there are changes between remote and local?
08:22 osse xeviox: and by "remote" and "local" you mean...?
08:22 osse xeviox: changes between master and origin/master, for example?
08:23 osse or changes between origin/master and the actual master at origin?
08:23 dsantiago joined #git
08:26 a_thakur joined #git
08:27 xeviox osse: changes between local-copy and remote-branch
08:28 xeviox lets say I have a branch called "team"
08:28 xeviox now I have a local branch "team"
08:28 xeviox but I don't see a branch "remotes/origin/team"
08:29 osse xeviox: it doesn't have to exist
08:29 osse if you run 'git branch poopfart' then you can be pretty sure that there is no remotes/origin/poopfart
08:29 jagob joined #git
08:30 xeviox osse: because then I've created a new local branch
08:30 xeviox but the "team" branch is already from the remote repository
08:30 osse xeviox: do  git ls-remote origin | grep team
08:30 xeviox osse: yep, then I can see the branch
08:31 osse xeviox: then do  git fetch origin 'refs/heads/*:refs/remotes/origin/*'
08:32 Guest26 joined #git
08:32 xeviox osse: thanks, now there is a branch origin/team ($ git branch -r)
08:33 osse xeviox: then your fetch isn't configured properly
08:33 osse xeviox: what does   git config
08:33 xeviox osse: to fetch only this branch -> ($ git fetch origin 'refs/heads/team:refs/remotes/origin/team' ?
08:33 osse xeviox: what does   git config remote.origin.fetch  say ?
08:33 osse xeviox: yes
08:33 JeroenT_ joined #git
08:34 xeviox osse: +refs/heads/master:refs/remotes/origin/master
08:34 osse xeviox: that means that whenever you run 'git fetch' ONLY master will be updated
08:34 osse not all branches
08:34 JeroenT joined #git
08:35 xeviox aha
08:35 xeviox and when I add the '*' it will fetch all branches?
08:35 osse yes
08:35 osse you can keep it this way if you wish
08:35 jameser joined #git
08:35 osse or you can run   git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
08:35 xeviox osse: or can I list a couple of remotes in the config to fetch?
08:36 osse i think you can
08:36 xeviox ok, thanks :D
08:38 Romain[m]1 joined #git
08:41 jbu joined #git
08:41 tvw joined #git
08:41 Severin42 joined #git
08:43 Balliad joined #git
08:44 oskarkv joined #git
08:44 jameser joined #git
08:45 Romain[m]1 left #git
08:46 rivarun joined #git
08:49 acetakwas joined #git
08:49 eduardas_m joined #git
08:50 cqi joined #git
08:53 sostenuto joined #git
08:53 sunri5e joined #git
08:54 _rnsanchez_ joined #git
08:57 jknetl joined #git
08:58 Anja joined #git
08:59 ki0 joined #git
08:59 UniFreak joined #git
08:59 joshszep joined #git
09:00 qt-x joined #git
09:01 Anja joined #git
09:01 omegak joined #git
09:03 Anja joined #git
09:07 qt-x joined #git
09:08 byte512 joined #git
09:12 mindfart joined #git
09:16 nettoweb joined #git
09:17 t0by joined #git
09:17 t0by joined #git
09:19 timvisher joined #git
09:20 Anja joined #git
09:22 dhollinger joined #git
09:23 _rnsanchez_ joined #git
09:23 MatthewAllan93 joined #git
09:24 jameser joined #git
09:27 theoceaniscool joined #git
09:29 cjbrambo joined #git
09:29 kugel joined #git
09:33 clmsy joined #git
09:33 ikelso joined #git
09:35 lindenle joined #git
09:36 GavinMagnus joined #git
09:37 curiousmansi joined #git
09:40 xaa joined #git
09:42 NwS joined #git
09:44 rorro joined #git
09:46 GavinMagnus left #git
09:48 lb1c joined #git
09:49 apotry joined #git
09:50 mischat joined #git
09:51 thiago joined #git
09:52 phanimahesh joined #git
09:55 hahuang61 joined #git
09:55 qt-x joined #git
09:55 nickabbey joined #git
09:58 joco42 joined #git
10:03 Serpent7776 joined #git
10:05 chll_ joined #git
10:05 ams__ joined #git
10:06 csk157 joined #git
10:07 madknight joined #git
10:08 rominronin joined #git
10:10 Miguel[m] left #git
10:11 Caelum joined #git
10:12 djb-irc joined #git
10:16 howitdo joined #git
10:16 howitdo joined #git
10:16 jfr joined #git
10:18 Silox| joined #git
10:19 jfelchner joined #git
10:19 hhee guys do you actually ofter use rebase?
10:19 hhee often*
10:20 hhee question about workflow
10:20 selckin everytime i "pull"
10:21 Knirch almost daily
10:21 sbalousek joined #git
10:21 sbalousek sbalousek has joined the channel.
10:22 hhee selckin, Knirch got it, thx
10:22 manuelschneid3r joined #git
10:23 Knirch sbalousek: you certain of that? :D
10:24 ferr1 joined #git
10:28 rorro joined #git
10:30 Naan joined #git
10:31 inflames joined #git
10:32 mp3 joined #git
10:33 JeroenT_ joined #git
10:34 thierryp joined #git
10:34 ikelso joined #git
10:37 Lord_Garfield joined #git
10:37 a_thakur_ joined #git
10:37 Lord_Garfield left #git
10:37 brillenfux_ joined #git
10:38 hhee guys, if i just want to get only info about branches in remote repo - i need to use git fetch?
10:39 brillenfux__ joined #git
10:40 dminuoso hhee: Yeah
10:40 hhee dminuoso, and git fetch - only get remote info without any merges?
10:40 dminuoso hhee: The reason is that even a "remote" is just local refs.
10:41 dminuoso hhee: Unless public history has been rewritten, a git fetch should work without an issue.
10:43 brillenfux joined #git
10:46 brillenfux_ joined #git
10:47 Naan joined #git
10:48 brillenfux__ joined #git
10:48 gh0st_chs2 joined #git
10:51 hussam joined #git
10:51 jast hhee: 'git fetch' updates the local mirrors of remote branches (shown by 'git branch -r'), which is safe in any sanely configured repository (and it's hard to mess it up by accident :))
10:52 ElCapitanMarklar joined #git
10:52 brillenfux joined #git
10:53 ElCapitanMarklar Hi, tiny question. Someone has just force pushed their local repo which has deleted all of the branches they didn't have checked out locally :D
10:53 ElCapitanMarklar And closed all PRs for those branches on github
10:53 tobiasvl ouch.
10:53 ElCapitanMarklar ya
10:53 MacGyver Hope you have a local copy.
10:53 MacGyver Also kick that person.
10:53 ElCapitanMarklar Question, if everyone does a git push we should eventually build the big repo back up right?
10:53 MacGyver As in, physically kick 'm.
10:53 selckin force push doesn't delete branches, but ok
10:53 ElCapitanMarklar doesn't it...
10:53 bremner push --mirror does
10:54 ElCapitanMarklar let me ask what hes actually run...
10:54 re1 joined #git
10:55 selckin can try using event log https://api.github.com/repos/git/git/events as a poor mans reflog and recover from that too
10:56 selckin !reflog
10:56 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
10:56 ElCapitanMarklar `git push -f --mirror`
10:57 selckin heh
10:57 ElCapitanMarklar oh boy :)
10:58 mehola joined #git
10:58 acetakwas joined #git
10:59 jast that's... thorough
10:59 armin joined #git
10:59 jast (--mirror actually implies -f already, which really goes to show how that command is extra thorough)
11:00 rivarun joined #git
11:00 bremner !drdr
11:00 selckin how do you even find out mirror exists when you don't know what you're doing
11:00 selckin ElCapitanMarklar: anyway try that events page, could list all the deleted branches (change url to yours offcourse)
11:01 shinnya joined #git
11:01 jast selckin: shell auto-complete?
11:01 jast try ALL THE OPTIONS
11:02 jagob joined #git
11:02 Ardethian joined #git
11:02 ElCapitanMarklar cool thank's for the tip, will have a look. ugh :D
11:02 jast https://i.imgflip.com/1hbyrl.jpg
11:02 FilipNortic_ joined #git
11:07 brent__ joined #git
11:08 Guest68442 joined #git
11:08 theoceaniscool joined #git
11:09 TomyWork joined #git
11:15 YuGiOhJCJ joined #git
11:16 phanimahesh joined #git
11:17 CussBot joined #git
11:19 seine joined #git
11:20 Oatmeal joined #git
11:23 mikecmpbll joined #git
11:24 freimatz joined #git
11:29 dsdeiz joined #git
11:29 luke_penn joined #git
11:33 kulelu88 joined #git
11:33 averell joined #git
11:33 thiago joined #git
11:34 ikelso joined #git
11:39 nevodka joined #git
11:39 _rht joined #git
11:39 nettoweb joined #git
11:41 ToBeCloud joined #git
11:42 joki joined #git
11:42 jameser joined #git
11:45 JelmerD joined #git
11:46 elh9 joined #git
11:52 Ediz joined #git
11:52 ertesx joined #git
11:52 kevleyski joined #git
11:55 leeN joined #git
11:56 JeroenT joined #git
11:56 hahuang61 joined #git
11:56 nickabbey joined #git
11:59 jameser joined #git
12:01 mindfart joined #git
12:01 cyan__ joined #git
12:01 jknetl joined #git
12:02 murgi0 joined #git
12:03 aard_ joined #git
12:04 Domhack joined #git
12:06 ShalokShalom joined #git
12:11 quackgyver joined #git
12:13 zefferno joined #git
12:17 wrouesnel2 joined #git
12:17 Zamerick joined #git
12:19 CheckDavid joined #git
12:22 acetakwas joined #git
12:23 ManiacTwister joined #git
12:24 dregad joined #git
12:25 masuberu joined #git
12:26 ManiacTwister joined #git
12:29 ManiacTwister joined #git
12:31 ManiacTwister joined #git
12:34 mischat_ joined #git
12:35 ikelso joined #git
12:36 eihabarabia joined #git
12:36 ShalokShalom left #git
12:39 al-damiri joined #git
12:44 steven joined #git
12:46 steven so just looking for input, stash vs unfinished commit (+ later squash)?
12:46 z8z joined #git
12:47 jast I use both
12:48 _ikke_ me too
12:49 steven atm I am only stashing and it gets a tad annoying / messy
12:50 hhee2 joined #git
12:51 jast basically if it makes sense in your situation to have the unfinished work tied to a branch, a temp commit is way more convenient IMO
12:53 steven I bet, the stashes get messy. and I pmuch only work in branches so it's pmuch all of the time tied to a branch
12:53 jast right
12:54 jast my main use cases for stashes is for a quick rebase, i.e. pretty much only 'git rebase --autostash'
12:54 jast sometimes temporarily removing temporary changes (like tracer code)
12:56 sdothum joined #git
12:56 steven so what is a temp commit jast? do you just git add . git commit -m "random stuff, WIP"
12:56 steven or do you still add -p and pick the stuff you really want ?
12:56 jast I main anything unfinished that will be reworked later
12:57 jast sometimes I make them with add -p, sometimes not
12:57 jast I use interactive rebase liberally, in any case
12:57 JeroenT joined #git
12:57 ojdo joined #git
12:57 arount joined #git
12:58 jameser joined #git
12:59 arount Hi there, Is there a way to make gitconfig for subfolders ? I've my two mains directories 'work' & 'personal', each store several git repos (not bar) I would like personal/*/ use my personal email and work/*/ my pro one as author.
12:59 JeroenT joined #git
13:00 Darcidride joined #git
13:01 jast arount: no... the cleanest way to do it would be to have two different accounts, I guess
13:02 arount jast: I'm looking at bash function that play with $GIT_AUTHOR_EMAIL but I'm not really happy about it ..
13:02 arount anyway, thank you
13:02 mischat joined #git
13:03 converge joined #git
13:03 regedit joined #git
13:04 arount if someone is intersted by this script: https://gist.github.com/trinitronx/5979265
13:07 JuliusN_ left #git
13:07 gareppa joined #git
13:07 manuelschneid3r joined #git
13:07 csk157 joined #git
13:07 JuliusN joined #git
13:08 brent__ joined #git
13:09 nowhere_man joined #git
13:11 PtxDK joined #git
13:12 mischat joined #git
13:14 zefferno joined #git
13:14 JeroenT joined #git
13:17 Guest82 joined #git
13:17 thiago joined #git
13:20 JeroenT joined #git
13:24 kexmex joined #git
13:26 Arokh joined #git
13:27 JeroenT joined #git
13:27 guampa joined #git
13:28 flavius joined #git
13:28 jknetl joined #git
13:31 pepperingranivor joined #git
13:31 siddart joined #git
13:35 King_Hual joined #git
13:38 synthroid joined #git
13:39 lindenle joined #git
13:40 iohehe joined #git
13:40 nettoweb joined #git
13:41 gareppa joined #git
13:43 mariusm joined #git
13:45 Tobbi joined #git
13:46 jeffreylevesque joined #git
13:47 cagedwisdom joined #git
13:47 rwb joined #git
13:48 Derperperd joined #git
13:49 Guest82 joined #git
13:49 gh0st_chs joined #git
13:50 cdown joined #git
13:52 eclaesson joined #git
13:57 JeroenT joined #git
13:57 eduardas_m joined #git
14:00 mischat joined #git
14:00 mariusm joined #git
14:01 cdg joined #git
14:02 garethdaine joined #git
14:05 theoceaniscool joined #git
14:05 zeroed joined #git
14:06 pR0Ps joined #git
14:13 garethdaine joined #git
14:14 rnsanchez joined #git
14:15 netj joined #git
14:17 nezZario joined #git
14:17 converge joined #git
14:17 converge joined #git
14:17 porsche944 joined #git
14:17 gmac_ joined #git
14:20 ExoUNX joined #git
14:20 jimi_ joined #git
14:22 noecc joined #git
14:23 ShekharReddy joined #git
14:24 Darcidride joined #git
14:27 blr joined #git
14:29 GodGinrai joined #git
14:30 Kronuz joined #git
14:30 jbitdrop joined #git
14:32 tobeplugged joined #git
14:34 a_thakur_ joined #git
14:34 garethdaine joined #git
14:34 mda1 joined #git
14:35 ManiacTwister joined #git
14:36 Guest68442 joined #git
14:39 GarethAdams joined #git
14:39 GodGinrai joined #git
14:41 aavrug joined #git
14:44 ikelso joined #git
14:46 sword joined #git
14:49 Derperperd joined #git
14:51 anonymuse joined #git
14:52 AaronMT joined #git
14:53 ResidentBiscuit joined #git
14:56 ash_workz joined #git
14:57 mda1 joined #git
14:57 mahakal joined #git
14:58 finalbeta joined #git
14:59 e14 joined #git
15:00 converge joined #git
15:00 converge joined #git
15:01 tokkee joined #git
15:01 albel727 joined #git
15:01 mischat_ joined #git
15:03 Murii joined #git
15:03 ihradek joined #git
15:03 mischat_ joined #git
15:04 thiago joined #git
15:05 ocbtec joined #git
15:06 howitdo joined #git
15:06 Dougie187 joined #git
15:08 Es0teric joined #git
15:09 eduardas_m joined #git
15:09 zivester joined #git
15:11 c_thun joined #git
15:11 chosafine joined #git
15:11 chosafine joined #git
15:12 c_thun hello
15:12 gitinfo c_thun: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
15:12 crose joined #git
15:12 rnsanchez_ joined #git
15:12 Darcidride joined #git
15:13 mahakal !backup
15:13 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
15:14 bdeferme joined #git
15:14 nickabbey joined #git
15:14 andyhhp joined #git
15:14 dminuoso I don't backup. I just push very very regularly. :-)
15:15 Guest68442 joined #git
15:15 c_thun i want to use git for my website, i have the local repository, and i can then push it to my server, but its pushed to a folder.git, after which i have to clone that folder.git into another different folder before i can see the files, in order for nginx to serve the content, how can i just have it so that the git push pushes the updates and new files to that new folder?
15:16 kpease_ joined #git
15:16 dminuoso !deploy
15:16 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:17 dminuoso c_thun: The reason you can't see these files is that it's probably a bare repository. The solution is to have some deployment that actually manages cloning from that. Check the link in the description above.
15:17 dminuoso Separating deployment from git is usually a very wise thing. :)
15:17 andyhhp Hey.  I have an issue and the web isn't being very helpful.  Is there any way to get the equivalent of `git describe` put into a file during `git archive`, in the same way as export-subst does for other information?
15:17 andyhhp I can make it happen locally with a smudge filter, but that doesn't work for remote repos
15:18 c_thun i see, i will look into it more then. i was trying to use capistrano, but kept running into endless problems, could you recommend any other good deployment tools? I am still kinda new to this aspect of things
15:18 dminuoso c_thun: capistrano is pretty solid actually, you likely made some silly mistakes if you felt to have any problems.
15:19 dminuoso c_thun: I'd be happy to assist with capistrano if you like.
15:21 GarethAdams_ joined #git
15:22 denisMone joined #git
15:22 c_thun thanks
15:23 BSaboia joined #git
15:25 aw1 joined #git
15:26 AlineGomes joined #git
15:26 boombatower joined #git
15:29 Noldorin joined #git
15:29 shgysk8zer0_ joined #git
15:29 tokkee joined #git
15:29 blr joined #git
15:30 synthroid joined #git
15:30 ejb joined #git
15:30 ash_workz joined #git
15:30 cdg joined #git
15:30 finalbeta joined #git
15:30 Arokh joined #git
15:30 pR0Ps joined #git
15:30 nettoweb joined #git
15:30 denis_M joined #git
15:30 nezZario joined #git
15:31 mda1 joined #git
15:33 shiriru joined #git
15:34 eduardas_m joined #git
15:34 Bizkit joined #git
15:39 mischat joined #git
15:39 bongjovi joined #git
15:40 theoceaniscool joined #git
15:40 Murii joined #git
15:42 zefferno joined #git
15:43 Guest68442 joined #git
15:43 subhojit777 joined #git
15:44 nettoweb1 joined #git
15:45 tobeplugged joined #git
15:45 mischat joined #git
15:46 overlord_tm joined #git
15:47 robotroll joined #git
15:49 govg joined #git
15:50 Derperperd joined #git
15:51 aarobc joined #git
15:51 Murii joined #git
15:52 LionsMane joined #git
15:53 dviola joined #git
15:55 deadnull joined #git
15:55 Domhack joined #git
15:56 tokkee joined #git
15:57 hahuang61 joined #git
15:58 nowhere_man joined #git
15:58 hhee joined #git
16:00 Macaveli joined #git
16:00 arount left #git
16:00 garethdaine joined #git
16:01 rnsanchez_ joined #git
16:03 mda1 joined #git
16:05 theoceaniscool joined #git
16:08 zeroed joined #git
16:08 zeroed joined #git
16:08 diogenese joined #git
16:10 Guest82 joined #git
16:12 bipolar joined #git
16:13 Guest1913 joined #git
16:15 jimi_ joined #git
16:15 hashpuppy joined #git
16:16 Phlogistique joined #git
16:17 a_thakur joined #git
16:17 Phlogistique hi
16:17 thiago joined #git
16:18 Phlogistique http://sprunge.us/HiQN I have the history on the left. Is there any way I could have arranged my merge commit and/or my log command to see something that looks like the history on the right?
16:19 Phlogistique ... what did I do!?
16:20 finalbeta joined #git
16:21 grawity the log won't show anything different in any case
16:22 grawity if 'left' is what you're seeing, then it looks like the commits themselves were occassionally made on the "wrong" branch
16:23 jimklo joined #git
16:24 Phlogistique grawity: well, what do you mean with "wrong"? I have commits A, B, C in a linear history, then A', B', C' upon A, B, and C respectively, and then a commit merging A', B' and C' on top of C
16:25 hramrach joined #git
16:26 denisMone joined #git
16:27 Phlogistique Oh!
16:27 grawity hmm is that so
16:27 Phlogistique using "git merge C' B' A'" produces the nicer graph
16:27 Phlogistique instead of "git merge A' B' C'"
16:28 danslo joined #git
16:29 Phlogistique aaaand, adding --no-ff does the trick
16:29 Phlogistique I get a nice history
16:29 jast merging multiple branches at the same time (=octopus merge) is generally not recommended, not least because conflicts become much more of a nightmare to handle with it
16:30 GodGinrai plus multi-way diffs
16:30 nickabbey joined #git
16:30 jast it's used extremely rarely in the wild. for instance, the linux kernel has a few historical octopus merges but they haven't been used for years
16:31 grawity jast: you might want to recheck `git log --min-parents=3`
16:31 grawity that's a weekly occurence
16:32 jast huh. guess I was misinformed. :)
16:32 rivarun joined #git
16:33 grawity though 10+ parent merges are uncommon, yeah
16:33 GodGinrai What could *possibly* go wrong?[/Bubsy]
16:34 Eugene octomerges work fine if there's no conflicts. Otherwise its trivial to --abort(tthe default, IIRC)
16:34 _rnsanchez_ joined #git
16:34 Guest6562 joined #git
16:35 denisMone joined #git
16:35 jstimm joined #git
16:35 e14 joined #git
16:36 Murii joined #git
16:36 Peetz0r joined #git
16:37 ikelso joined #git
16:37 ikelso joined #git
16:38 a_thakur joined #git
16:39 dendazen joined #git
16:39 jimklo joined #git
16:40 dgarstang joined #git
16:41 dgarstang I'm trying to find a way to differentiate between A. A commit to master and B. A merge to master. How can I do that? I've some of the suggestions at http://stackoverflow.com/questions/3824050/telling-if-a-git-commit-is-a-merge-revert-commit but they all seem to show the same info for a merge to master and a commit to master
16:41 seveneve1 joined #git
16:43 Iopku4 joined #git
16:44 grawity dgarstang: 'real' merges always have more than one parent listed
16:45 jast dgarstang: there are different types of merges. a fast-forward merge is indistinguishable from normal commits in retrospect, and it happens automatically if the destination branch has not seen any new commits since the source branch was branched off (or last merged).
16:45 grawity fast-forward merges are entirely indistinguishable
16:45 jstimm joined #git
16:45 jast a real merge happens in any other case, or when you use --no-ff with 'git merge'
16:45 chksome joined #git
16:46 dgarstang All I know is the suggestions on that page show me the same info for a commit to master and a merge to master from another branch
16:46 jast that would happen if you ended up with a fast-forward merge, yes
16:46 grawity all I know is you're repeating yourself
16:46 dgarstang jast: don't believe these are fast forward merges not sure. They're being handled by gitlab
16:47 jast in that case you may be getting fast-forward merges without being able to influence that
16:47 dgarstang Great. Sigh
16:47 dreiss joined #git
16:47 King_Hual` joined #git
16:47 jast possibly there's an option in the repo config to always create non-ff merges, not sure about what gitlab offers
16:48 dgarstang jast: beyond my knowledge. So frustrating. If only jenkins allowed me to determine this
16:50 Sheogorath[m] joined #git
16:50 Derperperd joined #git
16:52 POQDavid joined #git
16:52 brent__ joined #git
16:53 LionsMane joined #git
16:53 aicasn joined #git
16:54 Electrometro joined #git
16:54 endiruna joined #git
16:55 aicasn i have a github fork of another project and i want to submit a pull request. i only want to send a subset of the diff between the original and the fork, though. i made changes such as adding things to .gitignore and whatnot that the original project members probably don't care about. is there a way to exclude those from the pull request?
16:55 Rodya_ joined #git
16:55 Dougie187 aicasn: You'd need to make a branch with only the changes you want to submit.
16:55 Dougie187 And then submit a PR from that.
16:56 andyhhp Anyone got thoughts about getting `git describe` information via `git archive` ?
16:57 kadoban aicasn: By the way, you usually shouldn't be adding things to .gitignore that only apply to you, not the rest of the project. Those can go in your global .gitignore, or in .git/info/excludes
16:57 tlaxkit joined #git
16:57 kadoban .git/info/exclude , sorry
16:57 mmlb joined #git
16:57 aicasn Dougie187: a branch off of the original project or can i branch off of my fork and cherrypick? i would have to do this every time i submit a PR i suppose O.o
16:57 Dougie187 aicasn: Your fork contains the original project.
16:57 gopi1410 joined #git
16:57 cyan__ joined #git
16:57 Dougie187 So, you'd branch off of some appropriate place, and cherry-pick the relevant commits (or rebase)
16:58 aicasn kadoban: imho they should be added to the original project. things like CMakeFiles and .po's that should be ignored, but that's a different issue
16:58 Dougie187 aicasn: Then I'd suggest submitting two PRs. One with the changes you're thinking about submitting right now, and another with the .gitignore changes.
16:58 kadoban aicasn: If it's just the usual build artifacts, those go in your global one
16:58 gopi1410 joined #git
16:59 mmlb joined #git
16:59 aicasn yeah good point. why duplicate them for every project, right? that's probably why they're not included
16:59 re1 joined #git
16:59 gopi1410 joined #git
16:59 kadoban Exactly
16:59 perlpilot_ joined #git
16:59 Rodya_ joined #git
16:59 gopi1410 joined #git
17:00 dweelie joined #git
17:00 valize joined #git
17:01 synthroid joined #git
17:01 converge joined #git
17:01 converge joined #git
17:01 aicasn thanks
17:02 mmlb joined #git
17:03 Bucciarati joined #git
17:04 Rapture joined #git
17:05 Electrometro joined #git
17:06 endiruna joined #git
17:09 zeroed joined #git
17:09 zeroed joined #git
17:09 nicksloan joined #git
17:11 Darcidride joined #git
17:11 jccn joined #git
17:12 peeps[lappy] joined #git
17:14 aicasn left #git
17:16 noecc joined #git
17:16 endiruna joined #git
17:17 crayon joined #git
17:17 durham joined #git
17:18 dviola joined #git
17:19 crayon joined #git
17:21 dweelie joined #git
17:22 dgarstang Why would "git log -1 --oneline" show me "1232874 Merge branch 'dg/test133' into 'master'" when that's not the last commit to master?
17:23 dgarstang Scrap that
17:24 dreiss joined #git
17:25 hasc joined #git
17:25 Derperperd joined #git
17:25 Derperperd joined #git
17:27 Limes_ joined #git
17:27 druonysus joined #git
17:30 dikiaap joined #git
17:32 imachuchu joined #git
17:33 Noob joined #git
17:35 spacelord_ joined #git
17:36 chardan joined #git
17:36 mariusm joined #git
17:36 sea-gull_ joined #git
17:36 synthroid joined #git
17:37 PioneerAxon joined #git
17:38 nidr0x joined #git
17:39 jstimm joined #git
17:41 antonioasmoura joined #git
17:42 lindenle joined #git
17:43 stick-shift joined #git
17:44 zuck05 joined #git
17:45 blackwind_123 joined #git
17:49 mtso[m] joined #git
17:49 kineticrootkit[m joined #git
17:49 monomon[m] joined #git
17:49 spinningarrow[m] joined #git
17:49 M-shine joined #git
17:49 aviraldg joined #git
17:49 enjunear[m] joined #git
17:49 M-nated joined #git
17:49 saintaquinas[m] joined #git
17:49 kikijiki[m] joined #git
17:49 Dhanya[m] joined #git
17:49 M-meznak joined #git
17:49 Tiaan[m] joined #git
17:49 am2on joined #git
17:49 samwise[m] joined #git
17:49 unclechu joined #git
17:49 WillianPaiva[m] joined #git
17:49 alaeri[m] joined #git
17:49 Ineentho[m] joined #git
17:49 srkrishna[m] joined #git
17:49 Mher[m] joined #git
17:49 M-mistake joined #git
17:49 Start[m] joined #git
17:49 scrambo[m] joined #git
17:49 eltopo[m] joined #git
17:49 timlyo[m] joined #git
17:49 Remramm joined #git
17:49 patrickr[m] joined #git
17:49 unilovelight[m] joined #git
17:49 SpEcHiDe joined #git
17:49 mei[m] joined #git
17:49 davix[matrix] joined #git
17:49 Salander27 joined #git
17:49 UncleCJ joined #git
17:49 musicmatze[m] joined #git
17:49 hallogallo[m] joined #git
17:49 daopu[m] joined #git
17:49 Carlos[m] joined #git
17:49 malo[m] joined #git
17:49 M64137[m] joined #git
17:49 kjsage[m] joined #git
17:49 Bloo[m] joined #git
17:49 ljubak joined #git
17:53 svm_invictvs joined #git
17:53 aeontech joined #git
17:53 ash_workz what is the controversy between `git checkout -- .` vs `git reset HEAD` in terms of dropping unstaged changes?
17:54 kadoban ash_workz: What?
17:55 Bucciarati joined #git
17:56 YuGiOhJCJ joined #git
17:56 Zamyatin joined #git
17:56 ash_workz kadoban: well, I want to discard unstaged changes and this post on stackoverflow says to use `git stash save --keep-index` but the comments say 'The question specifically asks about changes that are not in the index. The git reset command will discard changes in the index too' & 'This pollutes the stash stack. git checkout -- . does the job with one command only'
17:57 athaller joined #git
17:57 ash_workz so I can imagine that `git checkout -- .` may not be intended for just clearing unstaged changes and as such would have possible unwanted side-effects.
17:58 kadoban That's really all that 'git checkout -- .' does, discards unstaged changes.
17:58 dviola joined #git
17:58 bocaneri joined #git
17:58 kadoban I know of no case where it does more, or doesn't do that effectively.
17:58 finalbeta joined #git
17:58 ash_workz I see
17:58 kadoban The stash thing is safer, if you're worried.
17:58 hahuang61 joined #git
17:59 kadoban git reset HEAD ... doesn't discard unstaged changes, or staged changes. All it does is unstage things.
18:00 dwmw2_gone joined #git
18:01 nickabbey joined #git
18:03 ash_workz I see
18:04 jnavila joined #git
18:04 ash_workz `kadoban` == corner number?
18:04 ronny joined #git
18:05 gareppa joined #git
18:05 anjen joined #git
18:06 kadoban Oh, uhm literally yeah, it's a term in sumo and go and some other things, it's when you have your back to the wall and if you lose you'll like, go down in rank or lose a match or something.
18:06 freimatz3 joined #git
18:09 mar77i joined #git
18:10 zeroed joined #git
18:10 zeroed joined #git
18:10 TomyLobo joined #git
18:11 ash_workz oh, I see
18:12 eibo joined #git
18:13 meLon joined #git
18:15 tristanp joined #git
18:15 kpease joined #git
18:16 dreiss joined #git
18:16 thierryp joined #git
18:17 ash_workz I always seem to f' this up; when I push a new branch if I want to pull that on a server; I should do `git fetch` first right? That's not going to overwrite anything on the current branch, right?
18:18 duderonomy joined #git
18:19 jstimm joined #git
18:21 dminuoso If I do a git rebase origin/master - what logic does git use to figure which commit to take off, and rebase onto origin/master? Does it simply use the last common commit?
18:22 tyreld joined #git
18:22 dminuoso I guess "common ancestor" is the proper term
18:24 aartist joined #git
18:24 ResidentBiscuit joined #git
18:25 creppe joined #git
18:25 Celelibi I have several branches stacked onto each other.
18:26 Nerbrun joined #git
18:26 Celelibi And I would like to insert a commit in a branch that's not the tip. :D
18:26 shgysk8zer0_ joined #git
18:26 Celelibi Is there another solution than adding the commit and rebasing everything?
18:26 Celelibi (It's only local, BTW, I haven't pushed anything.)
18:27 ki0 joined #git
18:27 imachuchu ash_workz: "git fetch" just tells your copy of git what's on the server. "git pull" does a git fetch, but also merges in what it finds with your current work
18:27 jagob joined #git
18:28 imachuchu Celelibi: git rebase -i, but that will only change the branch you currently have checked out. To do the rest, rebase the longest one and then "reset --hard" the rest to have them point to their corresponding commits.
18:29 Celelibi That means checking by hand the old and new commit ids.
18:31 imachuchu Celelibi: well no. You checkout the end branch and rebase it. Then checkout each branch that has diverged because of your changes, then reset --hard them to whatever their new commit should be.
18:32 zeroed joined #git
18:32 imachuchu Celelibi: since commits in git are written in stone, if you change one what you're actually doing is making new ones and recreating all of their children as new commits. All a branch does is point to a commit, so you need to rearrange the branches to point at the newly created commits
18:32 worstadmin I created a new branch (checkout -b mynewbranch) and then did a git pull - what Im wonder is my git pull pulled form master or the remote:mynewbranch?
18:32 LeBlaaanc joined #git
18:32 doener joined #git
18:32 Celelibi it's the "reset --hard them to whatever their new commit should be." that require finding by hand the new commit ids.
18:32 GodGinrai imachuchu: that still means he needs to keep track of the old and new commit ids by hand
18:32 Nikitaw99 joined #git
18:33 grumble joined #git
18:33 FSadino joined #git
18:33 Derperperd joined #git
18:33 Nikitaw99 joined #git
18:34 Tobbi joined #git
18:35 druonysus joined #git
18:36 HardlySeen joined #git
18:36 HardlySeen joined #git
18:36 imachuchu GodGinrai: I see, I wasn't understanding. I saw the checking out old and new commit ids, and I was thinking he would be literally checking out commits (which would put him in detached head state, which he doesn't need)
18:37 jedahan joined #git
18:37 imachuchu Celelibi: Yes, you will need to check each one out and reset it (well, the ones after the changes) but I don't think their's any way around that
18:37 imachuchu *there's
18:38 Nikitaw99 joined #git
18:38 ejb joined #git
18:38 Celelibi I would need to make a git zip command.
18:38 GodGinrai Celelibi: But honestly, the solution is complicated because you are branching off of branches
18:38 GodGinrai You brought it on yourself
18:38 Es0teric joined #git
18:38 PioneerAxon joined #git
18:39 Celelibi GodGinrai: I know.
18:40 Celelibi I should probably merge those branches into master and push them.
18:40 imachuchu and really it won't take that long. How many branches are we talking about?
18:40 GodGinrai *ding**ding**ding*
18:40 GodGinrai we have a winner!
18:41 Celelibi Like, 4 branches!!!1!
18:41 denisMone joined #git
18:41 imachuchu 4 branches? That's like under a minute
18:42 lindenle joined #git
18:42 Celelibi I know, I usually just rebase them one at a time.
18:42 Celelibi But I wanted to know if there's a better solution.
18:43 imachuchu Celelibi: yeah, rebase the end one, then reset hard the rest to wherever you want them to point
18:44 truckcrash joined #git
18:45 Celelibi Well, I also rebase to change the order. My config branch isn't always on top.
18:45 truckcrash Hello, When I run "$ git help push" I get "Launching default browser to display HTML ..." but no web browser opens anything.
18:45 truckcrash (using gitbash for windows)
18:46 siddart joined #git
18:46 truckcrash How can I get this to work (in broswer or commandline)
18:46 truckcrash ?
18:46 jost_ joined #git
18:46 njbair joined #git
18:47 vdv joined #git
18:48 nettoweb joined #git
18:48 GodGinrai git has a help command?
18:48 perlpilot_ truckcrash: maybe the "default browser" is one you don't have?  check what help.browser is set to in your config
18:48 perlpilot_ GodGinrai: since forever  :)
18:48 ToxicFrog GodGinrai: yes; on linux 'git help foo' just forwards to 'man git-foo' by default
18:48 GodGinrai I see
18:48 aeontech joined #git
18:48 ToxicFrog Apparently on windows it opens a browser!
18:49 kadoban Kinda makes sense, if 'man' isn't around. Probably more like what other windows programs do for help as well.
18:49 SwiftMatt joined #git
18:49 ToxicFrog I thought mingw came with `man` and also thought that gitforwindows was based on mingw, but it's been a while since I used either.
18:49 GodGinrai kadoban: doesn't git bash come with man?
18:50 kadoban Fuck if I know ...
18:50 truckcrash perlpilot_, That would be in ~/.gitconfig? There seems to be no such value there. Can I just add a line that says "help.browser=c:/path/to/firefox.exe" ?
18:50 ToxicFrog truckcrash: 'git config --global help.browser "path to your browser here"'
18:50 ToxicFrog And it'll edit the file for you.
18:51 truckcrash ToxicFrog, Thanks
18:51 joshszep joined #git
18:53 spica joined #git
18:53 nowhere_man joined #git
18:53 spica hi guys. How can I change my email in all commits without resetting the log?
18:53 ToxicFrog What do you mean by "resetting the log"?
18:54 ToxicFrog If you mean "without changing the commit IDs/requiring 'push -f'", the answer is it can't be done; the email is part of what's used to compute the commit ID.
18:54 kadoban spica: You'll probably have to use 'filter-branch', note that this will change history obviously. Ya that ^
18:54 kyan joined #git
18:54 spica without affecting history*. I know it can be done, I've done it, but I cannot remeber how
18:55 dhollinger joined #git
18:55 kadoban spica: You're probably thinking of mailmap then, look for that in git config. But it doesn't change what's in the actual commits.
18:56 truckcrash Hm... This does not seem to be working. No matter what I put as the help.browser value, the help seems to be opening in Notepad++ (a programmers plain-text editor program)
18:56 spica it actually changed the commits. Git log shows the right email, and the history wasn't reset
18:56 spica I just can't find out how I did it
18:56 GodGinrai truckcrash: what does `env` return? (do not paste in channel)
18:57 jimklo joined #git
18:57 jstimm joined #git
18:57 tobiasvl spica: it's not possible that you changed the e-mail addresses in the commits without getting new SHAs for the commits
18:57 kadoban spica: If it changed commits, then they wouldn't have the same sha-id. You're thinking of mailmap ... look where I said.
18:57 kadoban It does *not* change the commits though, though you can make 'git log' look like it did.
18:58 spica I don't really care about the sha, I just care about the commit dates
18:58 spica I want them unchanged
18:58 GodGinrai lol
18:58 kadoban That's fairly easy to do, if you use filter-branch correctly it won't change the dates.
18:58 GodGinrai the sha is more important than the dates... <.<
18:58 kadoban Not always.
18:59 GodGinrai it is when you are working with others
18:59 kadoban If you haven't shared history, the changing the shaids matters almost not at all. You could very well care when you commited things in the future though.
18:59 kadoban Yes, which they haven't specified they are.
19:02 truckcrash GodGinrai, environment vars here: https://hastebin.com/upihasulip.tex
19:02 spica this is what I was looking for: http://stackoverflow.com/a/2931914  Worked, and it hasn't touched the dates
19:03 Sasazuka joined #git
19:04 Nerbrun joined #git
19:06 ych joined #git
19:07 GodGinrai spica: that's literally the first thing kadoban mentioned
19:08 t0by joined #git
19:08 t0by joined #git
19:08 GodGinrai truckcrash: hrm, that didn't seem to give me any useful information.  However, it did reveal that you should have man.  Why not just use that?
19:13 Murii joined #git
19:17 pietv joined #git
19:17 jimklo joined #git
19:18 dsantiago joined #git
19:20 dsantiag_ joined #git
19:20 ResidentBiscuit joined #git
19:20 shgysk8zer0_ joined #git
19:21 gmac_ left #git
19:23 jnavila joined #git
19:25 jbu joined #git
19:26 satifant joined #git
19:28 mar77i joined #git
19:28 xaa joined #git
19:29 truckcrash GodGinrai, bash: man: command not found
19:29 madewokherd joined #git
19:31 GodGinrai wow
19:31 sea-gull_ joined #git
19:31 Jellyg00se joined #git
19:31 GodGinrai I don't even know why this sets man-related env vars if there is no man installed...
19:32 GodGinrai This is why I prefer cygwin on windows.  None of this crap
19:32 nickabbey joined #git
19:32 _nwkj86 joined #git
19:33 Fabricio20 joined #git
19:35 Guest54781 joined #git
19:38 jimklo joined #git
19:38 nickabbey joined #git
19:40 truckcrash GodGinrai, Ok. Thanks for the help anyway
19:41 karstensrage where does gitolite config usually reside?
19:41 GodGinrai truckcrash: if I think of anything else, I'll ping you
19:42 Derperperd joined #git
19:45 jstein_ joined #git
19:46 Anja joined #git
19:47 Rodya_ joined #git
19:49 ispn joined #git
19:49 jimi_ joined #git
19:51 aidalgol joined #git
19:52 Groscheri joined #git
19:52 zeroed joined #git
19:52 zeroed joined #git
19:59 hahuang61 joined #git
20:00 cdown_ joined #git
20:00 finalbeta joined #git
20:00 cagedwisdom joined #git
20:00 d5sx43 joined #git
20:01 rt joined #git
20:07 Sasazuka_ joined #git
20:07 rogerjv joined #git
20:09 jwmann joined #git
20:09 Rodya_ joined #git
20:10 ManiacTwister joined #git
20:10 Balliad joined #git
20:12 Zamerick joined #git
20:12 Guest6_ joined #git
20:14 ManiacTwister joined #git
20:14 arooni_team_b left #git
20:15 cdown joined #git
20:15 noecc left #git
20:17 ManiacTwister joined #git
20:18 dweelie joined #git
20:18 Atm0spher1c joined #git
20:18 Ryanar joined #git
20:20 Ragnor joined #git
20:20 aeontech joined #git
20:21 ManiacTwister joined #git
20:22 PioneerAxon joined #git
20:22 Bizkit joined #git
20:24 ManiacTwister joined #git
20:27 Es0teric joined #git
20:27 keltvek joined #git
20:28 ManiacTwister joined #git
20:29 YaM2 joined #git
20:31 ManiacTwister joined #git
20:31 BlessJah /1/3
20:34 Es0teric i dont get it.. whats the difference between github flow and git flow? it seems like the same thing
20:34 ManiacTwister joined #git
20:36 mellernoia joined #git
20:37 dminuoso Es0teric, github flow is just how github wants you to contribute to projects
20:38 nick123_ joined #git
20:38 Es0teric dminuoso right.. but how is it any different than git flow?
20:38 ManiacTwister joined #git
20:38 _ikke_ github flow is much simpler
20:39 _ikke_ one master branch, and then topic branches
20:39 _ikke_ not much more
20:39 dminuoso Es0teric, github flow is a very simplistic model that revolves around a few concepts such as "master is deployable" and "all changes come through branches > PR"
20:39 Es0teric dminuoso hmmm
20:39 Es0teric ok
20:39 Balliad joined #git
20:39 Es0teric but i thought thats how git flow was either way
20:40 sogpotato joined #git
20:40 _ikke_ Es0teric: git flow has a master branch, a develop branch, topic branches, release branch, hotfix branches
20:40 Es0teric _ikke_ ahhhh i see now
20:40 Ragnor joined #git
20:40 Es0teric _ikke_ so then github flow only has the master branch and PR aside from the topic(feature) branches, correct?
20:40 _ikke_ yeah
20:41 Es0teric man... that is too simple
20:41 Es0teric im used to git flow then
20:41 ManiacTwister joined #git
20:42 pikajude joined #git
20:43 brent__ joined #git
20:44 khagler joined #git
20:44 Learath2 joined #git
20:44 dminuoso Es0teric, the rule of thumb is: pick the easiest git flow that works for you, and then increase as you require it. ;-)
20:44 dminuoso That's what I was tought
20:44 ManiacTwister joined #git
20:44 sogpotato Hey guys, having trouble un-ignoring in .gitignore. This is what I have: https://gist.github.com/anonymous/947cb6f48b739609ec67dec4abb115d3
20:45 sogpotato I want to unignore .cpp .h files across the entire project in all directories/subdirectories
20:45 Es0teric dminuoso yeah i got that lol
20:46 j416 sogpotato: so why ignore them in the first place? just remove the original ignore?
20:46 siddart joined #git
20:47 kpease joined #git
20:47 sogpotato Then I wouldn't ignore every other file.
20:47 j416 why would you want that? o_O
20:48 sogpotato Not sure why that's relevant
20:48 ManiacTwister joined #git
20:48 garethdaine joined #git
20:49 sogpotato Simply to share projects without the visualstudio extras
20:50 tobiasvl sogpotato: **/*.cpp
20:51 tobiasvl A leading "**" followed by a slash means match in all directories. For example, "**/foo" matches file or directory "foo" anywhere, the same as pattern "foo". "**/foo/bar" matches file or directory "bar" anywhere that is directly under directory "foo".
20:51 tobiasvl sogpotato: man gitignore
20:51 gitinfo sogpotato: the gitignore manpage is available at http://jk.gs/gitignore.html
20:51 denisMone joined #git
20:51 Jackneill_ joined #git
20:51 ManiacTwister joined #git
20:51 sogpotato tobiasvl: Unfortunately, that didn't work. I, too, read that in the manual. Which is why I came here.
20:53 Gloomy joined #git
20:54 tobiasvl OK, so you tried !**/*.cpp before you ended up with !*/*.cpp ?
20:54 sogpotato true
20:54 sogpotato Neither of which seem to work.
20:54 ManiacTwister joined #git
20:55 tobiasvl sogpotato: and just straight up !*.cpp doesn't work either?
20:55 sogpotato That's right. It really is frustrating.
20:56 sogpotato .ignore is being unignored just fine
20:56 sogpotato .gitignore, I mean
20:58 ManiacTwister joined #git
20:59 Domhack joined #git
21:00 cdg joined #git
21:01 ManiacTwister joined #git
21:02 Guest49665 joined #git
21:03 ki0 joined #git
21:04 ManiacTwister joined #git
21:06 nickabbey joined #git
21:08 HardlySeen left #git
21:08 ManiacTwister joined #git
21:08 sogpotato You can experiment here: https://github.com/adabo/GitTest
21:09 sogpotato Just rename .gitignorej.bak to .gitignore (I typoed the j sorry)
21:10 tobiasvl mv .gitignorej.bak .gitignore && touch foo.cpp
21:11 tobiasvl and foo.cpp shows up as untracked
21:11 banana_pancakes joined #git
21:11 nickabbey joined #git
21:11 tobiasvl touch foo
21:11 ManiacTwister joined #git
21:11 tobiasvl foo does not show up in git status
21:12 tobiasvl so works for me
21:12 lb1c38 joined #git
21:12 tobiasvl sogpotato: or did I misunderstand
21:13 sogpotato i don't understand
21:13 sogpotato I'm on windows if that helps
21:14 tobiasvl sogpotato:
21:14 tobiasvl the .gitignore seems to work as intended for me
21:14 tobiasvl .gitignore, .cpp and .h files are not ignored, anything else is ignored
21:14 Balliad joined #git
21:15 tobiasvl was that not what you wanted? please re-state your problem
21:15 sea-gull_ joined #git
21:15 shgysk8zer0_ joined #git
21:15 ManiacTwister joined #git
21:16 tobiasvl oh hm wait a minute. it's just working in the root directory for you, not resources/ ?
21:16 tobiasvl quite
21:17 tobiasvl sogpotato: add this to .gitignore: !resources
21:17 NickMaster joined #git
21:18 ManiacTwister joined #git
21:19 tobiasvl sogpotato: or, for the general case: !*/
21:19 dsdeiz joined #git
21:19 dsdeiz joined #git
21:19 tobiasvl sogpotato: http://stackoverflow.com/questions/9162919/whitelisting-and-subdirectories-in-git
21:19 tobiasvl or perhaps a better explanation http://stackoverflow.com/questions/8024924/gitignore-ignore-all-files-then-recursively-allow-foo
21:20 emg joined #git
21:22 ManiacTwister joined #git
21:22 dsop_ left #git
21:24 dave0x6d joined #git
21:25 chardan joined #git
21:25 ManiacTwister joined #git
21:27 stomplee joined #git
21:28 GT4066 joined #git
21:28 Tobbi joined #git
21:28 ManiacTwister joined #git
21:29 sizur joined #git
21:29 gajus joined #git
21:29 sizur Does --date=short also imply local?
21:31 mda1 joined #git
21:31 joshszep joined #git
21:31 sizur or can it show an older commit between two younger?
21:32 ManiacTwister joined #git
21:32 sizur sorry, that's in the git-log command
21:32 cagedwisdom joined #git
21:32 sogpotato tobiasvl: OK, nice. Right on. Thanks for the links :)
21:33 joshszep joined #git
21:33 Es0teric joined #git
21:34 joshszep joined #git
21:35 Sasazuka joined #git
21:35 ManiacTwister joined #git
21:38 done joined #git
21:38 ManiacTwister joined #git
21:39 m0viefreak joined #git
21:42 ManiacTwister joined #git
21:42 Sadeukko joined #git
21:44 jeffreylevesque joined #git
21:44 cagedwisdom joined #git
21:45 Sasazuka_ joined #git
21:45 druonysus joined #git
21:46 ManiacTwister joined #git
21:47 worstadmin Is there a way to rebase back to a certain sha ?
21:47 worstadmin instead of HEAD~4 can I specify the sha?
21:48 Ryanar joined #git
21:48 setuid joined #git
21:48 _ikke_ sure
21:48 _ikke_ HEAD~4 is this a shortcut to writing a specific commit
21:49 ManiacTwister joined #git
21:51 nettoweb joined #git
21:52 hahuang61 joined #git
21:53 aeontech joined #git
21:53 chosafine joined #git
21:54 Rapture joined #git
21:58 rorro joined #git
21:59 shgysk8zer0_ left #git
21:59 Sasazuka joined #git
22:00 hhee joined #git
22:01 adino joined #git
22:02 joshszep joined #git
22:03 aeontech joined #git
22:03 ki0 joined #git
22:04 atomi joined #git
22:06 jimklo joined #git
22:08 str joined #git
22:10 LaptopBrain joined #git
22:10 sogpotato Well I have no idea what's going on. I'm following the guys instructions precisely and it's not unignoring. http://stackoverflow.com/questions/8024924/gitignore-ignore-all-files-then-recursively-allow-foo?answertab=votes#tab-top
22:11 shgysk8zer0_ joined #git
22:11 durham_ joined #git
22:19 brent__ joined #git
22:24 ToBeCloud joined #git
22:24 LaptopBrain joined #git
22:24 sizur in `git log --graph --pretty...` How can i pad the graph part to have the rest align?
22:26 anonymus_ joined #git
22:30 rwb joined #git
22:34 ikelso joined #git
22:37 GodGinrai joined #git
22:37 timvisher joined #git
22:40 sogpotato Alright. Deleted old .git, started fresh. Looks like it's working, I think. Thanks for those links tobiasvl :)
22:40 metachr0n joined #git
22:40 vdv joined #git
22:41 Noodlewitt joined #git
22:41 jimi_ joined #git
22:43 ruby joined #git
22:46 emg joined #git
22:47 menip joined #git
22:49 GodGinrai joined #git
22:50 anonymuse joined #git
22:54 umpc joined #git
22:58 dmc joined #git
22:59 dendazen joined #git
22:59 theoceaniscool joined #git
22:59 durham joined #git
23:01 fmeerkoetter joined #git
23:01 Neo joined #git
23:02 Jackneill joined #git
23:05 timvisher joined #git
23:08 aw1 joined #git
23:09 durham joined #git
23:10 raatiniemi joined #git
23:11 GavinMagnus joined #git
23:11 GavinMagnus left #git
23:12 aw1 [noob question] master and dev branch had lots of differences(for a long time changes in dev were not brought into master) then a bug was discovered and a hotfix branch was created from master to fix the issue. hot_fix_master was merged back into master. THIS I understand this hotfix was based on the master ... then my senior checked out dev branch and merged the master into dev. I was expecting that both master and dev will become the same after this merge but
23:12 aw1 that did not happen ... so why did not merge the the other changes in the dev branch and made both the branches same?
23:12 SwiftMatt joined #git
23:12 Dougie187 left #git
23:13 Ragnor joined #git
23:14 kexmex joined #git
23:16 howitdo joined #git
23:16 howitdo joined #git
23:17 worrelsik joined #git
23:18 jave joined #git
23:21 aeontech joined #git
23:23 _ADN_ joined #git
23:24 h0h0h0 joined #git
23:25 DolpheenDream joined #git
23:26 dsdeiz joined #git
23:30 timvisher joined #git
23:31 de-vri-es joined #git
23:32 Algebr joined #git
23:33 spacelord_ joined #git
23:34 dave0x6d joined #git
23:37 zivester joined #git
23:37 nettoweb joined #git
23:38 Olipro joined #git
23:44 nidr0x joined #git
23:47 e14 joined #git
23:50 ianmethyst joined #git
23:52 thierryp joined #git
23:53 e14 joined #git
23:54 cdown joined #git
23:54 timvisher joined #git
23:56 e14 joined #git
23:56 tiger0 joined #git

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