Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-19

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

All times shown according to UTC.

Time Nick Message
00:02 nettoweb1 joined #git
00:02 Vortex34 joined #git
00:02 mizu_no_oto joined #git
00:06 madewokherd joined #git
00:07 Sasazuka joined #git
00:07 cdown joined #git
00:11 tunafizz left #git
00:13 xissburg joined #git
00:14 cmalmber_ joined #git
00:15 mostlybadfly joined #git
00:20 emg joined #git
00:20 sdothum joined #git
00:20 nettoweb joined #git
00:22 emg joined #git
00:24 PettanShoutaKun joined #git
00:24 YourTheBombNow23 joined #git
00:25 dreiss joined #git
00:25 hasc_ joined #git
00:26 hasc_ joined #git
00:26 felixjet joined #git
00:26 hasc_ joined #git
00:27 hasc_ joined #git
00:28 chardan joined #git
00:28 hasc_ joined #git
00:29 hasc_ joined #git
00:29 hasc_ joined #git
00:33 hasc_ joined #git
00:34 hasc_ joined #git
00:34 hasc_ joined #git
00:35 a_thakur joined #git
00:35 hasc_ joined #git
00:35 PettanShoutaKun joined #git
00:36 hasc_ joined #git
00:36 hasc_ joined #git
00:37 hasc_ joined #git
00:37 PettanShoutaKun joined #git
00:37 hasc_ joined #git
00:38 hasc_ joined #git
00:39 Wulf left #git
00:39 hasc_ joined #git
00:40 hasc_ joined #git
00:42 felixjet joined #git
00:47 Ryanar joined #git
00:47 hasc_ joined #git
00:50 manuelschneid3r joined #git
00:50 Electrometro joined #git
00:53 dsdeiz hey all, git log --not --author="Foo" still shows commits from "Foo".. any ideas?
00:53 dsdeiz ah it only applies to revisions
00:56 pity joined #git
00:56 krarkrrrc joined #git
00:56 oskarkv joined #git
00:57 krarkrrrc i recently accepted a pull request then accidentally checked the option to create a merge commit, so i deleted the merge commit from the remote repo, but now the forked repo of the other dev cant make a pull request, why is this?
00:58 dirtyroshi joined #git
00:58 matsaman I'm sure git pull will say why
00:58 krarkrrrc ?
00:59 mischat joined #git
00:59 nickabbey joined #git
01:01 hasc_ joined #git
01:02 hasc_ joined #git
01:03 hasc_ joined #git
01:03 hasc_ joined #git
01:04 hasc_ joined #git
01:05 hasc_ joined #git
01:05 zivester joined #git
01:05 hasc_ joined #git
01:07 hasc_ joined #git
01:07 hasc_ joined #git
01:07 qpdb joined #git
01:08 hasc_ joined #git
01:09 hasc_ joined #git
01:09 UnnamedPlayer joined #git
01:11 hasc_ joined #git
01:13 druonysus joined #git
01:15 Rodya_ joined #git
01:19 umpc joined #git
01:23 sdothum joined #git
01:24 jimi_ joined #git
01:25 prg318 joined #git
01:26 druonysus joined #git
01:27 pity joined #git
01:29 Hink joined #git
01:30 timvisher joined #git
01:32 Sasazuka__ joined #git
01:33 roelmonnens joined #git
01:34 cqi joined #git
01:36 cqi joined #git
01:37 cqi joined #git
01:45 tang^_ joined #git
01:45 davimore joined #git
01:46 sr___ joined #git
01:48 s2013 joined #git
01:50 VladGh joined #git
01:52 druonysus joined #git
01:59 Sasazuka joined #git
01:59 krs93 joined #git
02:00 mischat joined #git
02:01 timvisher joined #git
02:03 VladGh joined #git
02:05 mentazoom joined #git
02:07 anonymuse joined #git
02:07 finalbeta joined #git
02:13 madewokherd joined #git
02:13 jimi_ joined #git
02:22 voldz1tic3n joined #git
02:25 jameser joined #git
02:27 ome joined #git
02:27 brent__ joined #git
02:29 cdg joined #git
02:30 ayogi joined #git
02:32 krs93_ joined #git
02:32 t-mart__ joined #git
02:33 oaaao joined #git
02:33 durham_ joined #git
02:33 deepa joined #git
02:33 Rodya__ joined #git
02:33 btree joined #git
02:34 mutex___ joined #git
02:34 druonysus_ joined #git
02:34 dem joined #git
02:35 duderono_ joined #git
02:35 wenzowski_ joined #git
02:35 cloudcell__ joined #git
02:35 gugah_ joined #git
02:35 berndj-blackout joined #git
02:35 holdsworth_ joined #git
02:35 Ekho- joined #git
02:35 d^sh joined #git
02:35 Tee_Pee_ joined #git
02:36 hwoarang_ joined #git
02:36 kadoban_ joined #git
02:36 timewalk1r joined #git
02:36 enleeten_ joined #git
02:36 Ariadeno joined #git
02:36 robogoat_ joined #git
02:36 boz_v1 joined #git
02:36 gigq_ joined #git
02:36 dsop_ joined #git
02:36 exussum_ joined #git
02:36 BlessJah_ joined #git
02:37 runlevl4_ joined #git
02:37 przemoc86 joined #git
02:37 Bigcheese_ joined #git
02:37 plasticboy joined #git
02:37 kentnl joined #git
02:37 qqx_ joined #git
02:37 xkr47_ joined #git
02:37 jaafar_ joined #git
02:37 mikap joined #git
02:37 systmkor_ joined #git
02:37 styx__ joined #git
02:37 xall joined #git
02:38 Peng__ joined #git
02:38 cdesai_ joined #git
02:38 salamanderrake_ joined #git
02:38 pks joined #git
02:39 jmpp_ joined #git
02:39 tmcmahon joined #git
02:39 timvisher joined #git
02:40 xaviergmail joined #git
02:40 MikeChernev_ joined #git
02:40 ColdKeybo[a]rd joined #git
02:40 yaiyan_ joined #git
02:40 Matsv- joined #git
02:40 Don joined #git
02:40 Ph_ joined #git
02:40 c0d3d joined #git
02:40 BrAsS_mOnKeY joined #git
02:40 c0 joined #git
02:40 jamick_ joined #git
02:40 hfp__work joined #git
02:41 SegFaultAX_ joined #git
02:41 tmz_ joined #git
02:41 mgedmin_ joined #git
02:41 h12o joined #git
02:41 ldleworker joined #git
02:41 mikar joined #git
02:41 atrus- joined #git
02:41 sparetire_ joined #git
02:41 BackEndCoder_ joined #git
02:41 shakalaka joined #git
02:41 Neic0 joined #git
02:46 ertes joined #git
02:46 yaiyan_ left #git
02:46 mrnuke joined #git
02:46 bremner joined #git
02:46 bremner joined #git
02:46 doppo joined #git
02:46 strugee joined #git
02:46 brent__ joined #git
02:46 Yaiyan joined #git
02:46 BeerSerc joined #git
02:49 ilbot3 joined #git
02:49 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:49 Derega_ joined #git
02:49 berndj-blackout left #git
02:49 ilogger2 joined #git
02:49 aw1 joined #git
02:49 kineticrootkit[m joined #git
02:49 spaceone joined #git
02:50 quite joined #git
02:50 parasite_ joined #git
02:50 discopatrick joined #git
02:51 umpc joined #git
02:51 fus joined #git
02:51 ayogi joined #git
02:51 berndj joined #git
02:52 NeverDie joined #git
02:52 Urbany joined #git
02:52 nioncode joined #git
02:54 fahadash joined #git
02:55 aavrug joined #git
02:56 mohan joined #git
02:58 druonysus_ joined #git
02:58 pity joined #git
02:58 Vampire0_ joined #git
02:59 alphor joined #git
03:00 krillr joined #git
03:00 mischat joined #git
03:01 nedbat joined #git
03:02 r3c0d3x joined #git
03:02 gugah joined #git
03:02 Guest55 joined #git
03:03 chipotle joined #git
03:03 chachasmooth joined #git
03:03 dhanush joined #git
03:03 davimore_ joined #git
03:03 synchronous joined #git
03:04 vrishab joined #git
03:04 CussBot joined #git
03:04 Samual joined #git
03:05 cschneid joined #git
03:05 aca20031 joined #git
03:06 rancyd joined #git
03:06 hagabaka joined #git
03:06 dsantiago joined #git
03:11 timvisher joined #git
03:12 karstensrage joined #git
03:13 asdofindia joined #git
03:14 ertesx joined #git
03:14 hexagoxel joined #git
03:16 markelite joined #git
03:19 druonysus__ joined #git
03:20 govg joined #git
03:23 johnlage joined #git
03:26 svm_invictvs joined #git
03:30 swords joined #git
03:31 sunri5e joined #git
03:31 YuGiOhJCJ joined #git
03:33 eycsigfy joined #git
03:34 hqd joined #git
03:38 fstd_ joined #git
03:38 murph joined #git
03:39 Celelibi joined #git
03:40 mki joined #git
03:40 pur3eval joined #git
03:40 mizu_no_oto joined #git
03:41 metachr0n joined #git
03:44 lb1c joined #git
03:47 gibsjose joined #git
03:48 drbean joined #git
03:48 brent__ joined #git
03:49 jimi_ joined #git
03:51 timvisher joined #git
03:53 dreiss joined #git
03:53 arescorpio joined #git
03:54 a_thakur joined #git
03:55 a_thakur_ joined #git
03:57 hip2theehop joined #git
03:59 cyan__ joined #git
03:59 pity_ joined #git
03:59 jimi_ joined #git
04:01 mischat joined #git
04:02 oskarkv joined #git
04:06 roelmonnens joined #git
04:07 Rodya_ joined #git
04:20 safe joined #git
04:20 tmcmahon joined #git
04:23 gfixler joined #git
04:23 neunon joined #git
04:25 miczac joined #git
04:25 govg joined #git
04:28 Rodya_ joined #git
04:29 tmcmahon joined #git
04:31 timvisher joined #git
04:31 Kaisyu joined #git
04:32 angular_mike_ joined #git
04:34 metachr0n joined #git
04:35 mehola joined #git
04:36 Vortex34 joined #git
04:39 _geoff joined #git
04:39 tabakhase uhm, isnt "git fetch origin dev" or "git fetch origin dev:dev" not supposed to pull down the remote so i could git merge origin/dev after that? o.O
04:40 tabakhase or did i miss a line in the docu :D
04:40 TomTheDragon joined #git
04:41 kadoban You shouldn't usually provide refs or ref specs to fetch, it gets confusing, IMO.
04:41 kadoban 'git fetch' is usually all you need, or at most 'git fetch origin'
04:43 Gsham joined #git
04:45 lindenle joined #git
04:45 TomTheDragon What's the best way to clean up a commit so it'd be more easily applied to an upstream repository? I've mainly only used git for personal stuff up til now.
04:46 kadoban TomTheDragon: Is this for purposes of create a pull request or something similar?
04:47 TomTheDragon kadoban: yeah, a pull request / git patch
04:49 arnsa joined #git
04:49 kadoban TomTheDragon: Usually you rebase or cherry-pick your changes (in a new branch) on top of the upstream branch you're going to create the PR against.
04:49 kadoban That by defitition applies cleanly really, at least at the time you create it.
04:51 TomTheDragon kadoban: is it considered bad practice to delete the existing commit? if I'm going to go that route? or should I just revert it?
04:52 kadoban TomTheDragon: I don't understand the question
04:52 TomTheDragon I didn't think to create a new branch, and I don't want half of my changes in the new branch and half in my master
04:53 xall joined #git
04:54 thiago if you haven't shared the commits yet, then you can dowhateevr you want
04:54 kadoban TomTheDragon: Is any of this history shared anywhere? And are you just tracking an upstream repo that you'll do PRs against (or whatever) occasionally, or is the workflow more complicated?
04:54 thiago making patches that your upstream will accept is usally a good idea
04:55 kadoban Ya, both of those ^
04:55 TomTheDragon kadoban: I don't think it's shared anywhere. It's just personal changes to work with my own build system.
04:56 TomTheDragon kadoban: with a few changes, it could actually be useful to upstream.
04:56 kadoban Then I'd start with a clean upstream branch, usually called master though it's up to you, and create local branches, by either rebasing your current stuff or using cherry-pick.
04:57 kadoban Generally you leave master alone, it *only* ever has commits that come from upsteram, you never commit into it, just create feature branches off of it.
04:57 TomTheDragon aha, that's good to know.
04:57 kadoban Or, other kinds of branches too I suppose, you can have a long-running branch alongside sometimes or ... whatever.
04:59 buzzLightBeer joined #git
04:59 tabakhase embrace cherry-pick and "rebase -i" :P
05:01 dermoth joined #git
05:01 Darren_ joined #git
05:02 mischat joined #git
05:05 nickabbey joined #git
05:08 msonntag joined #git
05:09 pR0Ps joined #git
05:11 mizu_no_oto joined #git
05:12 timvisher joined #git
05:17 [0xAA] joined #git
05:24 romerocesar joined #git
05:25 Anja joined #git
05:26 Oatmeal joined #git
05:32 pR0Ps joined #git
05:32 ayogi joined #git
05:35 sbulage joined #git
05:36 govg joined #git
05:36 Cabanossi joined #git
05:39 pR0Ps_ joined #git
05:43 alex1a joined #git
05:47 dreiss joined #git
05:49 holodoc joined #git
05:50 pR0Ps joined #git
05:51 jstimm joined #git
05:51 Rodya_ joined #git
05:54 khubo joined #git
05:55 khubo hi, i accidently type git reset --hard on a just initialized repository and lost all files
05:55 khubo anyways to replace it?
05:55 bocaneri joined #git
05:56 tirej joined #git
05:57 Boniche joined #git
05:57 _ikke_ khubo: Did you git add the files?
05:57 khubo _ikke_, nope
05:58 khubo i did reset hard
05:58 khubo _ikke_, yes i git add the files
05:58 timvisher joined #git
05:58 _ikke_ khubo: git fsck --lost-found
05:59 khubo _ikke_, head points to a unborn branch master
05:59 khubo I havent made any commits yet
05:59 _ikke_ That's normal
05:59 khubo _ikke_, anyway to recover?
05:59 _ikke_ did you run that command?
05:59 dec0n joined #git
05:59 _ikke_ Then check .git/lost-found
06:00 khubo _ikke_, yes. and it shoed head points to unborn branch master.
06:00 khubo _ikke_, there are some hashes in .git/lost-found/other folder
06:00 khubo _ikke_, how do i recover from it
06:00 _ikke_ Check their contents
06:01 khubo _ikke_, how can i check their contents?
06:01 khubo they are hashed
06:01 _ikke_ Are they binary files or plain text files
06:01 khubo _ikke_, binary.
06:03 _ikke_ normally git cat-file, not sure how it works for objects in lost-found
06:03 mischat joined #git
06:03 nevodka joined #git
06:04 _ikke_ But if they are binary files, they're probably not blobs
06:04 khubo _ikke_, so i lost the files?
06:04 _ikke_ most likely, yes
06:05 khubo i lost a lot of my code :|
06:05 khubo _ikke_, ughh
06:05 mohabaks joined #git
06:08 bocaneri joined #git
06:15 rscata joined #git
06:15 Oatmeal joined #git
06:17 mgedmin joined #git
06:18 msonntag joined #git
06:19 Raging_Hog joined #git
06:21 dreiss joined #git
06:22 s2013 joined #git
06:24 Boniche joined #git
06:25 wcpan joined #git
06:25 qt-x joined #git
06:26 wcpan joined #git
06:34 DrAwesome joined #git
06:34 DrAwesome joined #git
06:35 zefferno joined #git
06:37 DrAwesome joined #git
06:38 tvw joined #git
06:41 msonntag joined #git
06:42 pR0Ps_ joined #git
06:47 ThomasLocke joined #git
06:47 ThomasLocke joined #git
06:50 davimore joined #git
06:52 phanimahesh joined #git
06:52 Rodya_ joined #git
06:54 timvisher joined #git
06:58 DrAwesome joined #git
06:59 ShalokShalom joined #git
06:59 rivarun joined #git
07:00 Rodya_ joined #git
07:00 nickabbey joined #git
07:01 g5pw joined #git
07:02 DrAwesome joined #git
07:03 menip joined #git
07:04 Atm0spher1c joined #git
07:05 freimatz joined #git
07:08 polyrob joined #git
07:08 polyrob joined #git
07:08 JeroenT joined #git
07:08 cyan__ joined #git
07:09 JeroenT joined #git
07:10 nostrora joined #git
07:13 zeroed joined #git
07:13 zeroed joined #git
07:13 mischat joined #git
07:15 ihradek joined #git
07:16 mischat joined #git
07:17 sea-gull joined #git
07:18 phanimahesh joined #git
07:19 m4sk1n joined #git
07:20 jknetl joined #git
07:22 chachasmooth joined #git
07:24 dersand joined #git
07:26 nidr0x joined #git
07:29 roelmonnens joined #git
07:30 spacelord_ joined #git
07:32 jaggz joined #git
07:33 eduardas_m joined #git
07:38 sea-gull joined #git
07:38 JeroenT_ joined #git
07:38 s2013 joined #git
07:38 elect__ joined #git
07:40 jeffreylevesque joined #git
07:44 timvisher joined #git
07:45 JeroenT joined #git
07:45 Sceorem joined #git
07:46 JeroenT_ joined #git
07:47 chachasmooth joined #git
07:47 lordjancso joined #git
07:49 SwiftMatt joined #git
07:51 tarkus joined #git
07:53 TomyLobo joined #git
07:55 romerocesar joined #git
07:55 MineCoins joined #git
07:56 finalbeta joined #git
07:59 SwiftMatt joined #git
08:00 roelmonn_ joined #git
08:01 ojdo joined #git
08:03 MrMojito joined #git
08:03 MrMojito joined #git
08:06 BSAlb joined #git
08:08 ToBeCloud joined #git
08:09 gottaname|wurk joined #git
08:11 buzzLightBeer joined #git
08:12 gottaname|wurk does tortise git support git-lfs?
08:12 SwiftMatt joined #git
08:12 jagob joined #git
08:13 SwiftMatt joined #git
08:14 SwiftMatt joined #git
08:17 Mo joined #git
08:17 DelTree ok... probably a pretty stupid one... but how do I create a foo.git file ?
08:18 s17 touch foo.git
08:18 DelTree yeah... poorly asked... poorly answered... ^_^
08:18 kadoban xD
08:19 kadoban You're probably either asking for git init --bare  or git bundle ... probably
08:22 DelTree I don't quite understant git init --bare, should try it somehow... git bundle seems promising... I'll have to practice it in a sandbox... ^_^
08:23 jast bare repositories are for hosting, as in fetching from and pushing to and nothing else
08:24 codemann joined #git
08:26 DelTree not sure I aim at the right tool, but what I want to do is backup... probably shall have started from there, indeed...
08:28 osse DelTree: you're talking about bare repos, so I assume you want a foo.git *directory*
08:28 jfr joined #git
08:29 osse DelTree: mkdir myproject.git; cd myproject.git; git init --bare
08:29 roelmonnens joined #git
08:29 aw1 joined #git
08:30 Guest9 joined #git
08:30 Guest9 joined #git
08:31 a_thakur joined #git
08:33 acetakwas joined #git
08:34 overlord_tm joined #git
08:35 timvisher joined #git
08:37 ckruczek joined #git
08:38 DelTree osse: aren't those "foo.git" you usually clone from *files* ?
08:39 osse DelTree: what you get is files. What is inside is a git repository
08:40 osse DelTree: you need a directory to run 'git init --bare' in to create your bare repository. that directory is conventionally named projectname.git
08:40 jnavila joined #git
08:41 Junior joined #git
08:53 flaviodesousa joined #git
08:54 a_thakur joined #git
08:56 HcsOmot joined #git
08:56 HcsOmot greetings
08:56 Balliad joined #git
08:57 osse and salutations
08:57 feodaron joined #git
08:59 nickabbey joined #git
08:59 absence joined #git
09:01 Alienpruts joined #git
09:03 sim642 joined #git
09:03 ski7777 joined #git
09:04 bongjovi joined #git
09:07 jesk joined #git
09:07 garethdaine joined #git
09:07 kurkale6ka joined #git
09:08 perlpilot joined #git
09:09 marcogmonteiro joined #git
09:11 arnsa joined #git
09:17 ams__ joined #git
09:17 jaeckel joined #git
09:17 mehola joined #git
09:19 SwiftMatt joined #git
09:19 Shashikant86 joined #git
09:19 timvisher joined #git
09:19 elsevero joined #git
09:22 tvw joined #git
09:22 rivarun joined #git
09:23 mehola joined #git
09:25 jameser joined #git
09:27 Shashikant86 joined #git
09:28 dmc joined #git
09:30 rasto joined #git
09:32 MrMojito joined #git
09:32 MrMojito joined #git
09:32 Balliad joined #git
09:39 GavinMagnus joined #git
09:41 apotry joined #git
09:43 ferr1 joined #git
09:43 mudana joined #git
09:43 finalbeta joined #git
09:43 JeroenT joined #git
09:44 Shashikant86 joined #git
09:44 Snugglebash joined #git
09:46 roelmonn_ joined #git
09:46 arnsa joined #git
09:47 nivag joined #git
09:47 ablackack joined #git
09:50 chll joined #git
09:51 xall joined #git
09:51 rominronin joined #git
09:51 govg joined #git
09:54 Serpent7776 joined #git
09:54 aw1 joined #git
09:54 mehola joined #git
09:56 Anja joined #git
09:57 timini joined #git
09:57 djb-irc joined #git
10:01 msonntag joined #git
10:02 nioncode joined #git
10:07 timvisher joined #git
10:08 achadwick joined #git
10:09 King_Hual joined #git
10:09 King_Hual joined #git
10:13 l33ch joined #git
10:14 ocbtec joined #git
10:14 jbitdrop joined #git
10:14 djb-irc joined #git
10:15 zefferno joined #git
10:17 stefanha joined #git
10:17 pity joined #git
10:18 stefanha I get the follow output from git-grep(1) (git-core-2.9.3-1.fc25.x86_64): $ git grep malloc v2.7.0:util/
10:18 stefanha v2.7.0:util/:acl.c:    acl = g_malloc(sizeof(*acl));
10:18 stefanha Strange that there's an extra colon in the output: v2.7.0:util/:acl.c
10:19 stefanha git show v2.7.0:util/:acl.c fails, so it's not a valid string that git can parse
10:19 stefanha I expected v2.7.0:util/acl.c
10:21 stefanha This patch from 2013 seems related but was never merged: http://git.661346.n2.nabble.com/PATCHv2-grep-use-slash-for-path-delimiter-not-colon-td7594522.html
10:22 theoceaniscool joined #git
10:23 pity joined #git
10:29 Gloomy joined #git
10:29 alwyn joined #git
10:31 alwyn Hello! We have a git 'bundle' of submodules that gets checked out on our servers, on which we change the permissions to 0640/0750. Is it possible to ignore permission changes?
10:32 alwyn Because when we try to update the bundle it will recognize the permission changes and the checkout can't continue
10:33 ohcibi when using -m with cherry-pick on a merge commit the manpage says that it takes numerical value starting from 1 to decide which side of the parent is used, but which side is actually 1? how is the order determined?
10:34 moritz ohcibi: the commit has an ordered list of parents
10:34 moritz ohcibi: if you do a "git merge a b c", then the parents are the old HEAD first, then a, then b, then c
10:35 leeN joined #git
10:35 shinnya joined #git
10:36 ohcibi moritz: so given I am on master with head=a and I do git merge origin/master with head of origin/master=b then 1 is a and 2 is b ?
10:36 roelmonnens joined #git
10:39 ohcibi I did not make the merge, so i don't really know if the person has done git merge a while b checked out or the other way around... can I find out the order afterwards?
10:40 manuelschneid3r joined #git
10:40 alwyn I see this answer as an option, but that would spam the command line every time we check for updates, for every submodule, not just the ones that have updates: http://stackoverflow.com/a/17871677
10:41 alwyn Same for doing a deinit and update
10:41 cdown joined #git
10:41 ShalokShalom joined #git
10:41 romerocesar joined #git
10:44 elsevero Can I replace AnotherAuthour (in git history) ? (ValidAuthor committed with AnotherAuthor 6 days ago e80ae83)
10:45 msonntag joined #git
10:45 mablae joined #git
10:45 ckruczek elsevero: yes but you have to rewrite history and that might not what you want to do
10:46 elsevero ckruczek: I’m ok with that. Can you give me a tip how to achieve that? Thanks!
10:47 pietv joined #git
10:47 xall_ joined #git
10:47 ckruczek elsevero: http://stackoverflow.com/questions/3042437/change-commit-author-at-one-specific-commit took me 20sec to find -.-
10:48 elsevero ckruczek: oh, thanks. but how I’m able to use the git commit --amend --author="Author Name <email@address.com>" ?
10:49 ispn joined #git
10:49 gajus joined #git
10:49 timvisher joined #git
10:49 nadley joined #git
10:49 nadley hi people !
10:49 gitinfo nadley: 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.
10:49 ckruczek the first answer in this stackoverflow article describes it very well
10:49 durham joined #git
10:50 nadley small question is it possible to use git over https with a client side certificate (I mean a two way authentication SSL)
10:51 grawity yes
10:52 nadley grawity: small tip to do that ?
10:53 m1dnight_ joined #git
10:53 jast man git-config, http.sslCert/http.sslKey?
10:53 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
10:54 borkr joined #git
10:54 chachasmooth joined #git
10:55 nadley jast: ok was not sure about this param and his purpose
10:56 mehola joined #git
10:57 pity joined #git
11:00 nickabbey joined #git
11:03 Lope joined #git
11:03 clmsy joined #git
11:03 Lope I did a bad commit 10 commits ago.
11:04 Lope Normally if it were the last commit I would just run `git undo` (which is some kind of git reset command)
11:04 clmsy joined #git
11:04 NwS joined #git
11:04 Lope But since it's 10 commits back I'm not going to manually recommit all of those again.
11:04 Lope Is there a way to delete one commit?
11:04 selckin interactive reabse
11:04 canton7 Lope, follow the instructions on !fixup
11:04 gitinfo Lope: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
11:05 canton7 Lope, you should end up in "Removing an entire commit" if you follow the options
11:05 Lope Thanks
11:07 JeroenT joined #git
11:08 mischat joined #git
11:11 Fuco left #git
11:13 afuentes joined #git
11:13 msonntag joined #git
11:14 notebox joined #git
11:14 s2013 joined #git
11:14 zefferno joined #git
11:14 hussam joined #git
11:17 aard_ joined #git
11:18 acetakwas joined #git
11:24 Faux joined #git
11:26 SwiftMatt joined #git
11:26 dsdeiz joined #git
11:26 dsdeiz joined #git
11:27 [0xAA] joined #git
11:28 Faux I've managed to hit a "line endings issue cause the file to always be changed" issue on a machine/setup that has worked for literally years. autocrlf is off, .gitattributes is set, don't remember changing anything. Any guesses? Transcript: https://paste.debian.net/909492/
11:28 ssitani joined #git
11:28 ronskisika joined #git
11:30 Lope Thanks canton7
11:30 Lope I've made a branch foo which I've worked on. I've committed all new changes to the foo branch. Now I want to merge foo back into master and continue working on master. How can I do that?
11:31 pity joined #git
11:31 tobiasvl Lope: git checkout master; git merge foo
11:31 Lope thanks :)
11:32 selckin Faux: its not crlf in the repo?
11:32 Lope :D
11:33 Faux selckin: It is, at least according to git show HEAD~2:gradlew.bat | file - #. It also hasn't been touched in months. Should it be? I actually don't know what should happen in that case.
11:33 selckin Faux: best way to sanity is to have remove all the options like gitattributes and have git just not ever change it, editors should be smart enough not to fuck it up in 2017
11:34 freimatz joined #git
11:34 Faux Unfortunately, for .bat (and .sh), both cmd.exe and /bin/sh mong it up if the line endings are wrong.
11:34 SwiftMatt joined #git
11:34 timvisher joined #git
11:34 selckin yes so have them correct and then don't change them? what is the problem
11:34 Shashikant86 joined #git
11:35 Faux Oh, you mean, remove gitattributes and trust nobody to change them. Unfortunately, autocrlf is on by default in many Windows clients, so they corrupt the .bat by default. :(
11:36 selckin slap them with the cluebat
11:36 Faux It's actually easier for me to maintain a local commit, deleting this file, than it is to do that. >.>
11:36 Guest38850 joined #git
11:38 selckin try deleting the file and then git checkout -- .
11:38 selckin if that doesn't work, its beyond my knowledge
11:38 Faux Nope, it doesn't like that, either; recreates a confused file. Cool one, isn't it.
11:39 nettoweb joined #git
11:39 selckin if i maintained git first thing i'd do was remove all these options, bytes in bytes out
11:40 Faux If autocrlf is off everywhere, I would expect it to work, yes. :)
11:40 JeroenT joined #git
11:41 Faux (Are commit messages bytes or utf-8?)
11:41 jast Faux: normally this happens when someone manages to commit CRLF endings despite .gitattributes (e.g. when using a weird third-party client that doesn't support it). now git will always think the file needs to be different from what's in the repo until you go ahead and commit again
11:42 rnsanchez joined #git
11:42 jast commit that file, I mean
11:42 selckin the git show is probably applying it too then
11:43 zefferno joined #git
11:43 jast (I'm very much in favour of using .gitattributes for normalizing line endings, by the way, because there's always those two or three crazies in each project that ignore all good practices :P)
11:44 selckin its a bad technical solution to a social problem
11:44 jast it's not a bad technical solution at all, if all clients actually obeyed the attributes
11:44 Faux Mmm. I'm pretty sure the file in the repo is in crlf, and that git show isn't messing with it.
11:44 jast Faux: the file *should not* be CRLF in the repo
11:45 jast eol=crlf means: transform LF to CRLF upon checkout
11:45 jast and vice versa upon staging
11:45 selckin if people don't even look at diffs before commiting and notice they fucked up, notting will help you
11:45 selckin and yes i work with ppl like that too, they fuck stuff up thats way worse then line endings
11:46 jast true
11:46 Faux Okay, that's good to know. But that's apparently not what I have managed to do in the past. (I only have committed from linux machines, and gitattributes hasn't been touched in years either.)
11:46 Faux (The file is a generated bootstrap script, from the buildsystem, so it's sensible not to read the diffs.)
11:46 jast git show will trick you, though, because it smudges the file, too
11:47 Faux git show HEAD:gradlew.bat #, after committing, shows LF endings, so unsmudged.
11:47 Cavallari joined #git
11:47 Faux And it is successfully smudging on checkout.
11:48 phanimahesh joined #git
11:48 Spherical joined #git
11:49 Spherical joined #git
11:49 jast okay, I probably remembered it wrong then
11:50 brainysmurf joined #git
11:50 jast does a diff on the "modified" file remove/add all of the lines, or just a few?
11:51 brainysmurf I merged from the wrong branch, and then added commits.  What's the right way to proceed to merge from the right branch?
11:51 Faux All of them; see the diffstat at the end of my paste.
11:51 Faux If we think that having LF endings in the repo, and trusting gitattributes is the right thing, then I'll go with that; it's certainly what my git wants to do locally.
11:51 jast well, I didn't know 90 lines was all of the file, did I :)
11:52 Faux I counted it, in the paste!
11:52 jast yes you did, and I'm slow
11:52 Faux Hi slow, nice to meet you. I'm pedantic.
11:52 jast who's slow? I'm tired
11:53 ertesx joined #git
11:53 jast brainysmurf: depends, did you push at any point after doing your bad merge?
11:53 steve joined #git
11:54 brainysmurf i pushed yes
11:54 jast Faux: so anyway, the file should behave now, if someone else doesn't commit breakage
11:54 brainysmurf from what I recall it means i should rebase?
11:54 jast well
11:55 jast pushing a bad merge is a situation you don't want to happen at all... :)
11:55 brainysmurf jast: which is why I'm consulting experts :)
11:55 Gloomy joined #git
11:55 jast is it a sufficiently small project that it's extremely unlikely for anyone to have fetched/pulled in the meantime?
11:56 jast because then we can do open heart surgery on it and fix everything. the alternative is not as straightforward as that. ;)
11:56 brainysmurf jast: I pulled it, so at least I can do something about that from that end
11:56 Gloomy joined #git
11:56 jast the important question is, does anyone else have your bad merge?
11:56 brainysmurf jast: also the project is for one single client. So no, and if they did, I don't care.
11:57 Gloomy joined #git
11:57 brainysmurf jast: open heart surgery sounds like fun to me
11:57 jast right. in that case, our plan is basically this: save the commits you made after merging, go back to before the merge, merge the right thing, re-apply your commits
11:58 Gloomy joined #git
11:58 jast then do a (dramatic voice) FORCE PUSH
11:58 ckruczek omg
11:58 ckruczek did i hear force push?
11:58 m1dnight_ joined #git
11:58 * brainysmurf is feeling lucky
11:58 Gloomy joined #git
11:58 brainysmurf Alright, well I thought that should be my plan of attack.  le sigh
11:59 brainysmurf would the bad merge looks like a checkout in my git log?
12:00 brainysmurf checkout: moving from master to BRANCHNAME
12:00 chachasmooth joined #git
12:00 ckruczek a checkout is never tracked in the history because it's not a commit object
12:01 ckruczek or what do you mean brainysmurf
12:01 brainysmurf K I did git reflog and found that message. I'm trying to identify the sha for the bad merge
12:01 ckruczek its in the reflog, yes.
12:02 ckruczek a merge looks like a merge, even in the reflog iirc
12:05 brainysmurf Okay, so I'm using git show to look at what is marked as (merge) in the reflog and I am not seeing the code I'm expecting.
12:05 brainysmurf Trying to identify the sha, ... it's like the merge isn't here??
12:05 selckin !reflog
12:05 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`
12:05 selckin try that gitk command, makes thing easier
12:06 msonntag joined #git
12:06 brainysmurf selckin: yes I used that
12:06 mniip_ joined #git
12:07 brainysmurf oh my goodness.
12:07 brainysmurf gitk for the win!
12:10 timvisher joined #git
12:10 jagob joined #git
12:13 brainysmurf okay i identified the sha before the merge
12:13 mentazoom joined #git
12:13 brainysmurf git reset --hard SHA?
12:16 rnsanchez joined #git
12:16 selckin yea
12:20 msonntag joined #git
12:20 llamapixel gitk is gui fail
12:21 mniip joined #git
12:24 chipotle joined #git
12:28 WayToDoor joined #git
12:30 _geoff joined #git
12:30 sdothum joined #git
12:30 douglascorrea joined #git
12:32 m1dnight_ joined #git
12:35 rnsanchez joined #git
12:36 strixx joined #git
12:37 Vortex35 joined #git
12:40 notebox joined #git
12:40 m1dnight_ joined #git
12:40 Shashikant86 joined #git
12:42 m1dnight_ joined #git
12:43 m1dnight_ joined #git
12:43 JeroenT_ joined #git
12:44 phanimah1sh joined #git
12:46 pingwindyktator joined #git
12:52 lindenle joined #git
12:53 pingwindyktator joined #git
12:54 drbean joined #git
12:56 timvisher joined #git
12:56 GavinMagnus joined #git
12:56 YuGiOhJCJ joined #git
12:58 ojdo joined #git
12:59 _geoff joined #git
12:59 phanimahesh joined #git
13:00 ReptilianBrain joined #git
13:01 zack_s_ joined #git
13:01 ShalokShalom_ joined #git
13:01 Faux left #git
13:01 nickabbey joined #git
13:02 zack_s_ can I remove an already merged branch from my local repo? Remark: the merged branch is not available, as branch I see it only in the source tree
13:04 timewalker joined #git
13:09 moritz zack_s_: I'm not sure I understand your question. Do you want to delete the branch? Or undo the effect of the merge?
13:09 zack_s_ moritz: I have on my develop branch  2 merged branches
13:09 zack_s_ both are not available anymore
13:10 zack_s_ now I want to remove branch A, which was merged before branch B
13:10 zack_s_ moritz: is this possible?
13:10 moritz zack_s_: so you want to undo the merge of branch A?
13:10 zack_s_ yes
13:11 moritz zack_s_: you can revert it, man git revert
13:11 gitinfo zack_s_: the git-revert manpage is available at http://jk.gs/git-revert.html
13:11 moritz though you'll have to specify a parent when reverting a merge
13:12 noecc joined #git
13:12 zack_s_ moritz: that would be branch B?
13:12 zack_s_ I mean to commit merge of branch B?
13:12 selckin fff
13:12 mentazoom joined #git
13:14 synthroid joined #git
13:14 moritz zack_s_: if you want to remove branch A, you have to revert the merge commit that brought in branch A
13:14 SilverBe joined #git
13:14 zack_s_ moritz: yes, and as parent I set what?
13:15 moritz zack_s_: typically the first parent commit of the merge commit
13:15 moritz zack_s_: have you read the relevant part in the man page yet?
13:15 jameser joined #git
13:17 str joined #git
13:17 ssitani joined #git
13:18 mischat_ joined #git
13:18 zack_s_ moritz: "Reverting a merge commit declares that you will never want the tree changes brought in by the merge. As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge. This may or may not be what you want."
13:18 zack_s_ I dont understand this sentence
13:19 zack_s_ what ancestors?
13:20 canton7 zack_s_, the ancestors of a merge are the two commits that were merged together, plus their parents, plus their parents, etc
13:21 canton7 it's saying that if you revert a merge, you're telling git that you don't want the changes which the merge introduced. If you create another branch which contains some of those same commits which were merged in, and try and merge *that* in, the commits which were previously merged in (and then reverted) won't be reintroduced
13:22 zeroed joined #git
13:22 zeroed joined #git
13:23 moritz if you want to undo the revert, you could still revert the revert commit though :-)
13:23 zack_s_ canton7: "If you create another branch which contains some of those same commits which were merged in"
13:24 zack_s_ can you give an example? I mean, when I create a branch from the already merged branch, I have the changes in my new branch
13:24 canton7 zack_s_, https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt has some good pictures
13:24 zack_s_ we have one "develop" branch, were we merge everything in
13:24 canton7 the first two describe this case - merge, revert, some of those commits merged in again
13:25 theoceaniscool joined #git
13:25 ronny is there any way to make git history not show the source side of a merge in order to limit/trim down the displayed history
13:25 jeffreylevesque joined #git
13:25 canton7 ronny, depends on what you mean by "source side"
13:26 canton7 there's a bunch of stuff like --first-parent to man git log
13:26 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
13:28 l33ch joined #git
13:29 Blkt joined #git
13:29 timvisher joined #git
13:33 mentazoom joined #git
13:33 netj joined #git
13:35 ronny joined #git
13:35 allcentur joined #git
13:40 phanimahesh joined #git
13:41 King_Hual` joined #git
13:42 CussBot joined #git
13:43 AlexanderZ_ joined #git
13:44 AlexanderZ joined #git
13:44 AlexanderZ Hello all, I have been using git pull for some time and never created a new commit. However, lately one of my branches is creating a new commit and asking for a commit message. Why is that? Is there a way to avoid it? Any help is more than welcome
13:45 AlexanderZ thanks in advanced
13:47 HardlySeen joined #git
13:47 whitby I would guess that you created a commit on the branch and that when you're running `git pull` it's asking for another commit message? Is the message prepopulated with "something something Merge branch"
13:47 canton7 AlexanderZ, do you understand what a fast-forward merge is?
13:47 canton7 !ff
13:47 gitinfo A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf
13:47 JeroenT joined #git
13:48 canton7 'git pull' will do fast-forward merges where possible. If that's not possible, it'll do a "normal" merge and prompt you for a merge commit message
13:50 allcentur left #git
13:53 lordjancso joined #git
13:55 _geoff joined #git
13:56 lindenle joined #git
13:56 aavrug joined #git
13:58 CheckDavid joined #git
13:59 mikecmpbll joined #git
13:59 Shashikant86 joined #git
13:59 Ryanar joined #git
14:00 Gsham joined #git
14:00 AlexanderZ canton7: When fast-forward would not be possible? Thanks for helping :)
14:00 whitby When you have introduced a new commit
14:00 canton7 AlexanderZ, when the remote branch has a commit which your local branch doesn't have
14:00 jabberwock joined #git
14:00 canton7 as the PDF I linked to shows
14:00 jabberwock Hi all :)
14:01 jabberwock Before I write a script I figured I would ask - is there a nifty way of showing the top contributor(s) in a local git repo?
14:02 AlexanderZ canton7: So in a team of multiple people I am assuming fast-forwarding is not possible since other people could have committed something
14:02 jabberwock I'm making a bash alias 'maybe-blame-this-one-for-deploying-git-to-public-webapp'
14:02 _geoff_ joined #git
14:02 AlexanderZ canton7: Thanks for the link
14:02 AlexanderZ Trying to digest :)
14:02 canton7 AlexanderZ, if people have committed something else, then a fast-forward merge is not possible on pull. If they haven't pushed any new commits, a fast-forward merge will be possible
14:03 jabberwock n/m: git shortlog -s -n
14:05 AlexanderZ canton7: Thank makes sense. I am still confused tbh. Here is my scenario: We have two branches, master and develop. We usually branch off from develop and then create PRs back to develop. Same applies to master, but we only create PR from develop to master once something is ready to be released. Pulling master never creates a new commit, but develop starting to do so lately.
14:06 anonymuse joined #git
14:06 AlexanderZ From my understanding both should create new commits , correct?
14:07 timvisher joined #git
14:13 jimi_ joined #git
14:14 mikecmpbll joined #git
14:15 salamanderrake joined #git
14:16 jabberwock Hmm. So if Directory Indexing is enabled, is there anything I can glean to get the object packs? like something from /.git/packed-refs or elsewhere
14:17 msonntag joined #git
14:17 porsche944 joined #git
14:19 MrMojito joined #git
14:20 aavrug joined #git
14:21 ssitani joined #git
14:21 tirej joined #git
14:21 tirej joined #git
14:22 Ranmaru joined #git
14:23 ShekharReddy joined #git
14:24 yehowyada joined #git
14:24 JeroenT joined #git
14:24 douglascorrea joined #git
14:25 LionsMane joined #git
14:26 fragMental joined #git
14:26 delboy1978uk joined #git
14:27 voldz1tic3n joined #git
14:27 delboy1978uk git config --unset https.proxy
14:27 delboy1978uk why isnt that unsetting? ^
14:27 cdg joined #git
14:27 cyan__ joined #git
14:27 cdg joined #git
14:27 eduardas_m joined #git
14:28 delboy1978uk its not in .git/config, where can i manually remove tis
14:28 delboy1978uk this?
14:29 jast --global?
14:29 jast (~/.gitconfig)
14:30 todd_dsm joined #git
14:30 delboy1978uk jast: it was indeed global. thanks so much! :-)
14:31 lindenle joined #git
14:32 kpease joined #git
14:34 aavrug joined #git
14:34 jabberwock noob q: Is git checkout -- synonymous wth git checkout HEAD ?
14:35 noecc left #git
14:36 rominronin giiiiiiiiiit
14:36 rominronin muvaf*ca
14:36 jabberwock lolwut
14:36 JeroenT joined #git
14:37 rominronin came to rant about my favourite tool (git)
14:37 rominronin first time git has ranally aped me
14:37 rominronin dev environment? check
14:37 rominronin testing environment check?
14:37 rominronin check
14:38 rominronin build and develop on dev, push to testing.
14:38 rominronin great.
14:38 rominronin client approves
14:38 rivarun joined #git
14:38 rominronin push to live, sync up databases
14:38 rominronin check.
14:38 rominronin live site doesn't work
14:38 jabberwock dude. calm with the spam notices :P
14:38 jabberwock that jarred my brain in an unsavory way
14:39 jabberwock That sounds like a deployment issue and not a git issue to me
14:39 kyan joined #git
14:39 rominronin *really* weird error, authenticated users cannot access the site! Checked everything, reverted to days old database nothing. In the end, I copied files directly from testing environment to live, site works!
14:40 Dougie187 joined #git
14:40 rominronin what's more, git status shows a raft of untracked files? how? I mean, i just copied from a clean working tree (no untracked files), so the git status should be identical
14:41 jast well who knows what whoever else has been doing directly in the live repo/tree
14:41 rominronin i mean, it's no surprise that the live site doesn't work. There were critical files missing from the repo that git was unaware of
14:41 rominronin weird.
14:42 rominronin i mean, bad weird. When this site is live, i need to track down the source of the discrepencey
14:42 rominronin because I need to make sure this never happens again.
14:42 rominronin user error, I'm sure, this never happens on sites I work on alone.
14:42 rominronin sorry for stream of messages jabberwock, seriously in need of a rant.
14:43 jabberwock Na it was just the /notice
14:43 jabberwock and no worries :)
14:43 rominronin no-one here gets the shock of rock solid stable git fucking me up digital ain-hole
14:44 timvisher joined #git
14:44 rominronin I needed to vent before resuming the process of going live.
14:44 romerocesar joined #git
14:45 selckin go start a blog, none of this is appropriate for this channel
14:45 jast well it's probably not git's fault, that's why :P
14:45 GodGinrai joined #git
14:45 jabberwock It's too difficult to say where the issue is, rominronin
14:45 jabberwock And yeah it doesn't sound like a git thing
14:45 tango_ !deploy
14:45 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
14:45 jabberwock If your devs aren't committing critical files then that's a dev issue
14:45 jast people messing things up who happen to be using git isn't that shocking
14:46 jabberwock rominronin: and while we're on the topic, make sure that your life site doesn't include the .git repo :P
14:46 jabberwock *live site
14:46 jast running a live system directly out of a server-side git clone has a certain potential for misuse, so the common recommendation is to not do it
14:47 jast of course my live web app runs from inside a git clone, anyway, but then again I know what I'm doing and also how to fix stuff :}
14:47 rominronin jabberwock: why? i use git for updates
14:47 rominronin it's a drupal site
14:47 jabberwock I mean I don't want to see www.yoursite.tgt/.git/
14:48 jabberwock Doing a full writeup on it because I've found around 90 during the last 2 external netsec engagements I've done
14:48 delboy1978uk left #git
14:48 Myr joined #git
14:49 rominronin jabberwock: regarding devs not commiting, the problem is not even that straightforward. git status in staging shows no untracked files. git status in the live site - which I created by copying files directly from testing - shows ~7 untracked files
14:49 Myr i have a question about rebasing
14:49 AaronMT joined #git
14:49 ash_workz joined #git
14:50 rominronin those files got there by copying the entire folder. since git doesn't see them, they were not in the repo, so when I created the live environment from a git clone, those files were missing - hence a broken live site, but working testing site
14:50 Myr lets say I want to rebase "git rebase master mybranch" and it hangs on the current version of a subdirectory, can I force my changes?
14:50 rominronin those files are not in the .gitignore
14:50 Hink joined #git
14:51 rominronin I have no idea why the test environment 'ignores' those files
14:51 bannakaffalatta joined #git
14:51 jast Myr: which kind of "hangs"? conflicts?
14:51 Myr yeah
14:51 theoceaniscool joined #git
14:52 mkoskar joined #git
14:53 Myr There is a subdirectory in the the master branch named "projectx" its only being changed in my branch (mybranch). I want to ignore all conflicts on that subdirectory
14:53 Myr seeing as my branch is the best branch
14:53 jast if there were no modifications on master you shouldn't be seeing conflicts in that subdir
14:54 jast but anyway, you can grab your versions using 'git checkout --theirs <path>'. I'm not actually sure you can do it on a whole subdir at once, but it's easy to find out :) after checking that it did the right thing, you can mark the conflicts as solved using standard 'git add'
14:55 ikelso joined #git
14:55 duderonomy joined #git
14:55 LionsMane joined #git
14:56 jast rominronin: maybe someone broke the .git/index file or ran 'git rm --cached' on those file
14:56 JeroenT joined #git
14:57 mehola joined #git
14:57 rominronin i did a git rm --cached but not on those files, for sure.
14:58 rominronin thanks jast. tbh, I need to get this site live asap. I'll save a deeper investigation for later.
14:58 rominronin i'll be here when I do though
14:58 rominronin ;)
14:59 nickabbey joined #git
14:59 jast I'm sure we'll enjoy being subjected to more ranting :P
15:01 al-damiri joined #git
15:02 Darcidride joined #git
15:02 Gsham joined #git
15:04 noecc joined #git
15:04 Shashikant86 joined #git
15:05 anonymuse joined #git
15:05 UTAN_dev joined #git
15:06 Sceorem joined #git
15:06 irco joined #git
15:07 aavrug joined #git
15:07 Es0teric joined #git
15:08 Sceorem_ joined #git
15:09 Rodya_ joined #git
15:10 rnsanchez joined #git
15:12 zefferno joined #git
15:15 LeBlaaanc joined #git
15:17 eduardas_m joined #git
15:17 jaafar joined #git
15:18 JeroenT joined #git
15:18 shgysk8zer0 joined #git
15:18 nettoweb joined #git
15:19 ski7777 hi
15:19 gitinfo ski7777: 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:19 timvisher joined #git
15:20 grilled-cheese joined #git
15:21 ski7777 I have a git repo. and I need a subfolder of another repo as "module". Is this possible?
15:22 mazert_ joined #git
15:23 Sceorem__ joined #git
15:23 anonymuse joined #git
15:25 nickabbey joined #git
15:25 m4sk1n joined #git
15:26 Rodya_ joined #git
15:28 PioneerAxon joined #git
15:28 GodGinrai joined #git
15:30 jstimm joined #git
15:30 elwan7[m] joined #git
15:31 zefferno joined #git
15:33 Rodya_ joined #git
15:35 JanC_ joined #git
15:36 hashpuppy joined #git
15:38 jstimm joined #git
15:39 nd joined #git
15:41 phanimah1sh joined #git
15:41 ac3takwas joined #git
15:42 nettoweb joined #git
15:44 cyan__ joined #git
15:44 Sceorem joined #git
15:47 crose joined #git
15:47 mischat joined #git
15:50 dreiss joined #git
15:51 JeroenT joined #git
15:54 lvh joined #git
15:55 _ikke_ !subproject
15:55 gitinfo [!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.
15:55 Hink joined #git
15:56 douglascorrea joined #git
15:57 Sceorem_ joined #git
15:58 sbulage joined #git
15:58 rominronin joined #git
15:58 nettoweb joined #git
15:59 timvisher joined #git
16:00 zivester joined #git
16:01 peeps[lappy] joined #git
16:01 mentazoom joined #git
16:02 roelmonn_ joined #git
16:04 jabberwock left #git
16:05 blackwind_123 joined #git
16:05 Gloomy joined #git
16:05 kyan joined #git
16:06 lektrik joined #git
16:07 kyan joined #git
16:07 zefferno joined #git
16:08 mischat_ joined #git
16:11 canuk joined #git
16:19 msonntag joined #git
16:20 denete_ joined #git
16:20 pur3eval joined #git
16:22 HcsOmot joined #git
16:23 madewokherd joined #git
16:23 boombatower joined #git
16:24 bannakaf_ joined #git
16:24 PioneerAxon joined #git
16:25 brent__ joined #git
16:25 durham joined #git
16:26 oskarkv joined #git
16:26 HcsOmot joined #git
16:27 Darren_ joined #git
16:29 HcsOmot joined #git
16:30 ac3takwas joined #git
16:30 HcsOmot joined #git
16:31 a_thakur joined #git
16:31 pur3eval joined #git
16:33 timvisher joined #git
16:34 lordjancso joined #git
16:35 APNG do git commits need time to operate or do they rely on sha1s?
16:35 APNG can I just set time to 1970-01-01 or w/e?
16:35 _ikke_ APNG: Time is part of the commit
16:35 APNG _ikke_, yes, but what's time actually used for?
16:36 _ikke_ It's onlt metadata
16:36 _ikke_ only
16:36 nic__ joined #git
16:36 _ikke_ And you can sort commits on date
16:36 APNG alright, so I can just set it to 1970-01-01 aka 0, yes?
16:37 msonntag joined #git
16:37 GodGinrai why?
16:37 APNG I'm using git from a system with no knowledge of the real time
16:37 _ikke_ Yeah, should not be a problem
16:39 HcsOmot joined #git
16:39 metachr0n joined #git
16:40 ResidentBiscuit joined #git
16:41 EliasH joined #git
16:44 byte512 joined #git
16:45 a-l-e joined #git
16:45 Noldorin joined #git
16:45 tang^ joined #git
16:49 romerocesar joined #git
16:49 synthroid joined #git
16:49 romerocesar joined #git
16:50 navidr joined #git
16:50 Kehet joined #git
16:51 nickabbey joined #git
16:51 HcsOmot joined #git
16:52 Shashikant86 joined #git
16:53 aavrug joined #git
16:54 aavrug joined #git
16:55 aavrug joined #git
16:55 HcsOmot joined #git
16:57 HcsOmot joined #git
16:58 rominronin joined #git
16:58 mehola joined #git
16:59 HcsOmot joined #git
16:59 invisbl_ joined #git
17:00 HcsOmot joined #git
17:01 ShalokShalom joined #git
17:03 MrMojito joined #git
17:03 HcsOmot joined #git
17:04 HcsOmot joined #git
17:04 stickperson joined #git
17:05 nettoweb joined #git
17:05 stickperson i made two commits that i pushed and now want to undo entirely. should i use git-revert or just go in and manually take out everything?
17:05 aavrug_ joined #git
17:06 jccn joined #git
17:06 thiago joined #git
17:06 perlpilot stickperson: why would you do it manually?
17:07 perlpilot stickperson: or ... why *wouldn't* you use git revert?
17:07 stickperson perlpilot: because i haven't done git-revert before and i'm not sure if it's advised not to use it :D
17:07 perlpilot oh, okay
17:07 perlpilot use git revert  :)
17:08 timvisher joined #git
17:09 perlpilot stickperson: If these commits are the most recent ones and you don't care about the people you're sharing the repo with (because there are none), you could use git reset and force push to undo
17:10 stickperson perlpilot: i'm working on my own branch, so no worries about conflicts. i did a revert and a normal push and it seems to have worked a-ok
17:10 HcsOmot joined #git
17:10 jccn joined #git
17:11 PettanShoutaKun joined #git
17:12 MrMojito joined #git
17:12 perlpilot good, because that other way is slightly evil  :)
17:12 DelTree with revert you see both the commit and the revert in the history... by forcing you have none of them in the history... that's the only interest of forcing...
17:12 sunri5e_ joined #git
17:12 whitby stickperson: if it's your own branch, resetting and force pushing would be my vote (thought this is a matter of preference)
17:12 whitby That way you don't end up with a commit (or two) that are immediately undone in the history
17:12 whitby As I think that serves no purpose
17:13 stickperson interesting, forcing would just remove the commits entirely
17:13 whitby Yep
17:13 GavinMagnus left #git
17:13 stickperson oh if it's a reset, duh
17:13 stickperson got it
17:13 marcogmonteiro joined #git
17:13 stickperson thanks for the help everyone
17:14 DelTree but if someone fetched it where you pushed it... then there'll be something odd...
17:16 HcsOmot joined #git
17:16 denisMone joined #git
17:18 HcsOmot joined #git
17:19 svm_invictvs joined #git
17:19 HcsOmot joined #git
17:20 HcsOmot joined #git
17:20 douglascorrea joined #git
17:21 ac3takwas joined #git
17:21 Xethron joined #git
17:22 Abbott joined #git
17:22 HcsOmot joined #git
17:23 Xethron_ joined #git
17:23 hasc joined #git
17:26 HcsOmot joined #git
17:26 Abbott so I've just cloned a repo on github with `git clone`, made a new branch with `git checkout -b new_branch`, edited the code, committed with `git commit -m "fixed this and that"`, then tried to push, but got "current branch has no upstream branch." I have gathered this is because the online repo doesn't have a branch "new_branch". Git suggests `git push --set-upstream origin new_branch`, which looks like I am
17:26 Abbott pushing the 'origin' commit (first commit?) of the branch new_branch to a new upstream branch called new_branch
17:27 HcsOmot left #git
17:27 Abbott Does that all sound right?
17:28 Kulrak joined #git
17:28 Kulrak joined #git
17:29 whitby A better way to think of it would be that you are pushing to origin (the origin of the repo) new_branch with the flag --set-upstream which means to set that default destination (i.e. origin)
17:29 lvh joined #git
17:31 Abbott oh so git is reading where I cloned it from and setting that destination to 'origin'?
17:31 pietv joined #git
17:31 cagedwisdom joined #git
17:31 Abbott and the "no upstream branch" error means it doesn't know where to upload it to
17:31 Abbott (until i tell it to upload it to origin (where i got it from))
17:32 ikelso joined #git
17:32 elbeardmorez joined #git
17:32 Abbott err specifically --set-upstream github_link branch_in_the_repo
17:33 Abbott or something analogous
17:33 canton7 (--set-upstream-to supercedes --set-upstream, as it's a lot more intuitive)
17:33 jstimm joined #git
17:34 tang^ and yet git still suggests --set-upstream if you are pushing a branch for the first time
17:34 mentazoom joined #git
17:34 kesslerfrost joined #git
17:34 canton7 ><
17:36 lindenle joined #git
17:36 whitby Abbott: something like that. I oft recommend people rename origin to something more descriptive (e.g. `git remote rename origin github`) for that exact reason. `git push github my-cool-feature-branch` reads a little better
17:36 roelmonnens joined #git
17:36 Abbott I gotcha
17:36 Abbott okay, thanks guys
17:36 whitby No problem!
17:38 b1tchcakes joined #git
17:38 gareppa joined #git
17:39 thiago github is also often vague
17:39 thiago try "upstream" and "personal"
17:39 Arban joined #git
17:39 thiago but whatever works for you and you know what it is
17:40 tyreld joined #git
17:41 whitby Yep, if you have multiple upstreams on GitHub, then yeah, that doesn't work as well :)
17:41 whitby I usually have GitHub and $private-work-mirror
17:41 whitby So it works nicely in that case
17:42 concerti joined #git
17:43 roelmonnens joined #git
17:44 miczac joined #git
17:46 kesslerf_ joined #git
17:46 nzyws joined #git
17:49 sarri joined #git
17:49 sarri joined #git
17:49 timvisher joined #git
17:50 spacelord_ joined #git
17:50 mischat joined #git
17:51 diogenese joined #git
17:51 qpdb joined #git
17:52 Es0teric joined #git
17:52 msonntag joined #git
17:53 svm_invictvs joined #git
17:53 metachr0n joined #git
17:54 kyan joined #git
17:54 lindenle joined #git
17:56 robotroll joined #git
17:56 nickabbey joined #git
17:57 mischat joined #git
17:58 jagob joined #git
17:59 douglascorrea joined #git
18:00 l2y will everything break if i stash current progress on my feature-x branch, then fetch the upstream like described here (http://stackoverflow.com/a/7244456), apply it on my master and then cherry-pick it on my feature-x branch, then apply stash on that branch?
18:00 borkr joined #git
18:02 Eugene l2y - you'll have to deal with any merge/conflict-resolution no matter how you get there, but yes, that will work fine
18:02 l2y Eugene: thanks, i suppose no merge conflicts arise
18:03 mischat joined #git
18:03 hahuang65 joined #git
18:06 SilverBe joined #git
18:06 anonymuse joined #git
18:06 invisbl joined #git
18:07 invisbl joined #git
18:07 _borkr_ joined #git
18:07 ResidentBiscuit joined #git
18:09 cyan__ joined #git
18:10 Domhack joined #git
18:10 flavius joined #git
18:10 stickperson joined #git
18:10 aw1 joined #git
18:12 sea-gull joined #git
18:12 elsevero joined #git
18:12 ShekharReddy joined #git
18:12 vdv joined #git
18:14 sargas joined #git
18:17 dreiss joined #git
18:19 msonntag joined #git
18:20 finalbeta joined #git
18:21 Cthalupa joined #git
18:23 finalbeta joined #git
18:23 lvh joined #git
18:24 TFrag joined #git
18:25 irco joined #git
18:25 timvisher joined #git
18:26 wrkrcoop joined #git
18:26 wrkrcoop hi, im committing using “git commit -m” but how do i add the longer message?
18:28 phroa if you don't use -m it brings up a text editor where you can add a message as long as you like
18:29 matsaman joined #git
18:29 ppilus joined #git
18:30 wrkrcoop phroa: so how do i add the short message and long message?
18:30 rominronin joined #git
18:30 hamster joined #git
18:30 phroa the short message is anything on the first line (stylistic limit of ~50 chars).  leave a blank space and start writing the long message on the third line
18:31 phroa https://github.com/erlang/otp/wiki/writing-good-commit-messages
18:31 wrkrcoop ok thanks :D
18:31 zugzug joined #git
18:31 zugzug joined #git
18:33 Xethron joined #git
18:35 treia joined #git
18:36 lindenle joined #git
18:36 ferr1 joined #git
18:37 mki joined #git
18:40 ferr1 joined #git
18:40 Xethron joined #git
18:43 Pseudocrat joined #git
18:43 Pseudocrat joined #git
18:43 Mikerhinos joined #git
18:48 wrkrcoop im trying to commit using ‘git commit’ but after i enter my message and hit esc, : wq!
18:48 wrkrcoop it doesn’t seem to commit
18:48 wrkrcoop whats going on?
18:48 jost_ joined #git
18:48 Celelibi How do I find the commit that removed a line with a specific word in it?
18:50 whitby wrkrcoop: I don't think you want to use the exclamation mark
18:50 wrkrcoop ok
18:51 wrkrcoop whitby: ur right, ty
18:51 whitby np
18:51 Celelibi Looks like git log -S works.
18:52 dsantiago joined #git
18:53 treia joined #git
18:55 overlord_tm joined #git
18:56 timvisher joined #git
18:57 meLon joined #git
18:58 nickabbey joined #git
18:58 EricPoe joined #git
18:58 benwbooth joined #git
18:59 Ryanar joined #git
19:01 nickabbey joined #git
19:01 borkr joined #git
19:02 xall_ joined #git
19:03 pur3eval joined #git
19:04 duderonomy joined #git
19:05 pur3eval joined #git
19:06 Sasazuka joined #git
19:06 anonymuse joined #git
19:13 dreiss joined #git
19:13 dave0x6d joined #git
19:14 anonymuse joined #git
19:14 treia joined #git
19:15 pur3eval joined #git
19:15 Bizkit joined #git
19:18 NeverDie joined #git
19:18 jnavila joined #git
19:22 timvisher joined #git
19:23 finalbeta joined #git
19:24 gugah joined #git
19:27 nidr0x joined #git
19:30 PettanShouta-Kun joined #git
19:31 jagob joined #git
19:32 jagob joined #git
19:32 phos1 joined #git
19:33 Es0teric joined #git
19:33 phos1 I am having an issue with GIT. If I do a diff between my dev branch and UAT, it shows the changes i want. If I do a PULL or a Merge, it says already up to date.
19:33 xall joined #git
19:34 raspado joined #git
19:34 GodGinrai phos1: pull doesn't merge between 2 local branches
19:34 GodGinrai that's for pulling in changes from upstream
19:35 shgysk8zer0 joined #git
19:35 GodGinrai or from another remote
19:35 phos1 So how should I do that?
19:36 jagob joined #git
19:36 GodGinrai use git merge to do that
19:38 Myr joined #git
19:40 mikecmpbll joined #git
19:41 finalbeta joined #git
19:41 sword``` joined #git
19:42 elbeardmorez joined #git
19:44 phos1 Git merge says already up  to date
19:45 osse then your branch has those changes
19:45 Macaveli joined #git
19:46 phos1 if i check the code it’s not updated
19:46 jccn joined #git
19:46 osse what specific diff do you run?
19:46 osse and have those changes - or +
19:46 phos1 git diff origin / branch
19:46 kadoban That's the *exact* command you're running?
19:47 phos1 It’s editing a line, so a - and a +
19:47 phos1 git merge origin/branch
19:47 mischat joined #git
19:48 doener joined #git
19:48 jccn joined #git
19:49 Starky joined #git
19:51 GodGinrai phos1: origin is not a branch, so that diff command seems suspect
19:51 timvisher joined #git
19:51 thierryp_ joined #git
19:51 kadoban I don't think you can randomly put / in the arguments to git commands either
19:52 Balliad joined #git
19:53 nickabbey joined #git
19:53 ToBeCloud joined #git
19:53 nickabbey joined #git
19:53 bernardio joined #git
19:54 sdothum joined #git
19:54 Endarked joined #git
19:55 multi_io_ joined #git
19:55 lvh joined #git
19:56 aidalgol joined #git
19:56 phos1 origin is my remote
19:57 crayon joined #git
19:58 ResidentBiscuit get rid of the spaces
19:58 ResidentBiscuit origin/remote != origin / remote
19:58 phos1 i don’t have any spaces in my query
19:58 ResidentBiscuit > git diff origin / branch
19:58 ResidentBiscuit I'm just quoting you
19:58 GodGinrai you have soaces in what you pasted here
19:58 ResidentBiscuit If you give us wrong info, we give you wrong answers
19:58 GodGinrai *spaces
19:58 phos1 sorry, I did git diff origin/branch
19:59 chardan joined #git
19:59 phos1 and git merge origin/branch
20:00 GodGinrai phos1: are you sure the diff output isn't showing you that you are ahead of origin/branch?
20:00 MineCoins joined #git
20:01 PettanShouta joined #git
20:01 rominronin joined #git
20:01 phos1 going to paste the results one sec
20:02 jstimm joined #git
20:02 phos1 http://pastebin.com/rN7nVY6Z
20:03 superCarlos joined #git
20:05 crayon left #git
20:06 _nwkj86 joined #git
20:06 phos1 Do you see what i am missing? This issue has been driving me crazy, Other updates have happened around it but this one seems to not be changing
20:06 EricPoe_ joined #git
20:09 hashpuppy joined #git
20:09 jimi_ joined #git
20:10 wrkrcoop joined #git
20:10 djb-irc joined #git
20:15 magellanicloud joined #git
20:17 Endarked joined #git
20:17 umpc joined #git
20:19 bernardio left #git
20:20 satifant joined #git
20:22 timvisher joined #git
20:24 grilled-cheese joined #git
20:25 dsantiago joined #git
20:25 gugah joined #git
20:26 pbrewczynski joined #git
20:28 options joined #git
20:28 phanimahesh joined #git
20:28 Atm0spher1c joined #git
20:29 s2013 joined #git
20:29 kyan joined #git
20:30 options Just crossed over to git from cvs. I like it. Looking at git log of a branch I need to see the entire "snap shot" of that file when that commit was made. How would that be done?
20:30 chardan joined #git
20:31 wezaui joined #git
20:31 nickabbey joined #git
20:32 options git show hash gives me a diff but I need to view the working file and test it to see if works. Hunting down a bug that get into the code.
20:32 Eugene phos1 - what does `git status` say? I suspect you need to !unlearn some SVN terms
20:32 gitinfo phos1: Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.
20:33 j416 options: 'git checkout thatcommit' and then just looking at the file would be common
20:33 j416 options: if you really want to just print the file contents, you can git show thatcommit:path/to/thatfile
20:34 options j416, oh cool thx. Why did we not use git a long time ago!
20:34 j416 options: also, if you are searching for what commit might have introduced a bug, use man git-bisect
20:34 gitinfo options: the git-bisect manpage is available at http://jk.gs/git-bisect.html
20:35 j416 options: it'll binary-search the history for you.
20:35 options o.O
20:37 nickabbey joined #git
20:37 mvensky joined #git
20:39 risKArt joined #git
20:40 elsevero joined #git
20:42 dhollinger joined #git
20:43 mellernoia joined #git
20:44 risKArt left #git
20:47 wouter0100 joined #git
20:47 overlord_tm joined #git
20:48 mvensky joined #git
20:49 timvisher joined #git
20:50 tango_ I keep forgetting, what is the correct syntax, while on branch B, to do a rebase of C..D on top of B?
20:50 wouter0100 joined #git
20:50 tango_ do I need to checkout D and then rebase C B?
20:50 tango_ or can I do without?
20:50 druonysus__ joined #git
20:51 j416 what is C..D?
20:51 tango_ stuff in D but not in C
20:51 tango_ ok I think I found it
20:52 tango_ git rebase --onto B C D
20:52 j416 I know the syntax but I don't understand your explanation; maybe I'm just tired. :) need visuals
20:52 j416 I almost never use the three-argument rebase, I checkout first, then rebase
20:53 elbeardmorez joined #git
20:53 ramsub07 joined #git
20:53 j416 git rebase --onto B C D will checkout D, throw away C and start D off of B
20:54 jeffreylevesque joined #git
20:54 tango_ hm not exactly what I want
20:55 debian joined #git
20:55 j416 could give some kind of visual of the graph and the desired result?
20:55 j416 s/could/could you&
20:55 j416 bah.
20:55 j416 s/could/could you/
20:55 j416 :)
20:55 ikelso joined #git
20:55 wrkrcoop joined #git
20:56 tango_ j416: I basically want to do the equivalent of a cherry-pick C..D while on B
20:56 tango_ without getting warnings about the empty patches for commits which are already there
20:56 j416 yeah, sorry I still don't quite get it
20:57 nettoweb joined #git
20:57 j416 pastebin some fancy ascii art maybe
20:57 j416 :)
20:58 j416 or show the repo
20:58 j416 or visualise it using http://learngitbranching.js.org/?NODEMO
20:58 j416 you can put commands as params like http://learngitbranching.js.org/?NODEMO&amp;command=git%20commit;git%20commit
21:00 mehola joined #git
21:03 j416 tango_: assuming the history looks like B <- C <- D, you can just "git checkout B && git merge --ff-only D"
21:03 j416 but, I don't know what your history looks like
21:04 tango_ let me see if I can draw it up
21:04 j416 (or simply "git reset --hard D", but I have a feeling your history is not that simple?)
21:04 j416 there is also !lol
21:04 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
21:05 coco joined #git
21:06 brent___ joined #git
21:06 chachasmooth joined #git
21:07 j416 off to bed in about 5 mins
21:11 tango_ j416: http://sprunge.us/ULfO
21:11 Es0teric joined #git
21:12 dsdeiz joined #git
21:12 dsdeiz joined #git
21:12 cdg joined #git
21:12 nettoweb joined #git
21:12 brent__ joined #git
21:13 InfoTest joined #git
21:13 j416 tango_: D1, D4, D5 are not continuous, there's D2 and D3 between
21:14 SpeakerToMeat joined #git
21:14 tango_ j416: I know
21:14 j416 oh they're empty
21:14 theoceaniscool joined #git
21:14 jccn joined #git
21:14 tango_ j416: they are not, but cherry-picking them from B would produce empty commits
21:14 tango_ rebase skips them automatically, but cherry-pick doesn't
21:15 macivy joined #git
21:15 j416 git checkout D5 && git rebase --onto B5 C3
21:15 tonyj joined #git
21:16 metachr0n joined #git
21:16 j416 then have branch B point to that
21:16 cr34ton joined #git
21:17 timvisher joined #git
21:17 tango_ j416: yeah, looks like the only reasonable solution. annoying though
21:17 j416 how so?
21:17 tango_ I think I'll propose a --skip-empty patch for cherry-pick
21:17 m0viefreak joined #git
21:17 j416 you can also checkout B, reset that, then rebase it
21:17 tango_ j416: I shouldn't be needing branch juggling to do something this simple
21:17 douglascorrea joined #git
21:18 j416 tango_: you can cherry-pick with --allow-empty and then rebase it to remove them
21:18 j416 or is that --keep-redundant-commits, I forget
21:19 tango_ j416: I like that better already, but I think I'll still go with the new option
21:19 bernardio joined #git
21:19 tango_ I can't be the only one with such a need 8-)
21:19 j416 tango_: seems like an odd workflow to begin with ;)
21:19 tango_ eh
21:20 wrkrcoop joined #git
21:21 jantje_ joined #git
21:21 Es0teric joined #git
21:21 dreiss joined #git
21:22 cyan__ joined #git
21:22 j416 but I agree that --skip-empty makes sense as an option for cherry-pick
21:22 anonymuse joined #git
21:22 j416 just that I've never had the need for it
21:23 chipotle joined #git
21:24 Vgr joined #git
21:24 j416 tango_: there's also cherry-pick --continue
21:24 Vgr joined #git
21:25 tango_ j416: doing it for multiple commits gets odl very fast
21:25 j416 ok, I thought it was just two
21:25 j416 ah
21:25 j416 you wrote that in your message
21:26 sea-gull joined #git
21:26 j416 I'd just rebase it then
21:26 j416 if you wanted you could do it in two steps by first removing C from D and then rebasing D on B without --onto
21:28 j416 git checkout B && git branch old-B && git reset --hard D && git rebase --onto M2 C3 && git rebase old-B && git branch -D old-B
21:28 tango_ j416: my point is that there shouldn't be any need for multiple steps
21:28 PettanShouta my branch is behind... if I force push it up, next time someone does a checkout will they pull in my branch?
21:28 PettanShouta or will they pull in my head commit?
21:28 j416 tango_: fair enough :)
21:28 j416 tango_: wait until someone adds --skip-empty :P
21:28 _ikke_ PettanShouta: checkout does not pull anything
21:29 tango_ j416: why wait when I can add it myself
21:29 PettanShouta errr next time someone pulls will they get my branch?
21:29 PettanShouta err... GEEZE... will they get my head... they wont will they
21:29 * j416 off to zzZ o/
21:29 PettanShouta they'll have to hard reset off of origin master
21:30 sword```` joined #git
21:31 denete_ joined #git
21:31 Es0teric joined #git
21:31 NeverDie joined #git
21:33 anonymuse joined #git
21:33 davimore_ joined #git
21:33 rominronin joined #git
21:34 sdothum joined #git
21:37 systemovich joined #git
21:38 mki joined #git
21:39 timvisher joined #git
21:39 davimore joined #git
21:41 stickperson joined #git
21:41 j416 tango_: hf :)
21:42 tango_ j416: thanks, n8
21:44 hasc joined #git
21:44 voldz1tic3n joined #git
21:44 garethdaine joined #git
21:46 dendazen joined #git
21:47 jnavila joined #git
21:53 phos1 left #git
21:54 mda1 joined #git
21:55 s2013 joined #git
21:55 durham_ joined #git
21:56 nickabbey joined #git
21:56 askb joined #git
21:58 jaafar joined #git
21:58 cjohnson PettanShouta: I would try it and see, but I believe they would merely get a ff merge when they pulled
21:58 EricPoe joined #git
21:58 cjohnson assuming your branch is just behind and not deviated or rebased
21:59 durham joined #git
22:01 PettanShouta I went behind and basically nuked away all the commits on top of it
22:01 PettanShouta so it would be diverged
22:03 cjohnson yeah then they will have to rectify messily when they go to pull
22:03 cjohnson the merge will fail
22:03 timvisher joined #git
22:04 krs93__ joined #git
22:08 sangy why do subtrees break when you rebase?
22:09 sword```` joined #git
22:10 thierryp joined #git
22:10 zifnab is there an easy way to move the contents of a folder in one branch to the root of another branch?
22:12 zifnab actually, i'm doing something different, this is stupid
22:12 zifnab nevermind
22:13 mda1 joined #git
22:15 BlessJah zifnab: something like subtree split?
22:15 BlessJah !subtree
22:15 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
22:15 zifnab BlessJah: yeah, that'd work, but i just realized the folder i want to push is in a gitignore
22:15 zifnab so its really not a git problem
22:15 zifnab its a react app, answer is: push build/ to another repo for deploys
22:15 cjohnson I have master, qa, feature/a and feature/b. I have merged feature/b into master, and subsequently deleted it and removed it from github. I want to merge feature/b into feature/a. Can I do this?
22:16 BlessJah oh, so you're storing binaries in git?
22:16 BlessJah zifnab: git annex, lfs or get actual artifact storage
22:16 zifnab nope :P its html and css and js
22:17 zifnab its fine for this use case, webapp gets deployed to prod somewhere, git gives the ability for rollbacks
22:17 zifnab (although i guess that could be considered 'binaries', its not really 'source code', more 'transpiled source code into some other form')
22:18 BlessJah yep, those are build artifacts
22:19 BlessJah keep in mind that git is not deployment tool (you can build one using git though)
22:19 zifnab yup, realize that :P
22:19 zifnab its a shit temporary workaround, git pulling on a crontab for deployments
22:20 zifnab becuase i can get this up in a few minutes vs fucking with ansible/jenkins
22:20 uranellus joined #git
22:20 uranellus joined #git
22:20 Gsham joined #git
22:21 BlessJah "temporary workaround" is label you attach once you have permanent fix
22:21 CheckDavid joined #git
22:22 matsaman joined #git
22:22 Xe left #git
22:22 kazantip joined #git
22:24 Xe joined #git
22:24 bruce_lee joined #git
22:24 bruce_lee joined #git
22:24 gr8kodr joined #git
22:25 stickperson joined #git
22:26 Xe joined #git
22:27 mischat joined #git
22:27 ianmethyst joined #git
22:27 Imga joined #git
22:27 gr8kodr which is the preferred frontend for a self-hosted Git server?
22:28 str joined #git
22:28 Celelibi Hm, hey. So rebase can use a 3-way merge. That's nice.
22:28 Celelibi gr8kodr: ssh? :)
22:31 kadoban gr8kodr: Depends what you really need ... ssh covers 99% of my needs
22:31 gr8kodr SSH needs a login for every user, I'm looking for a way to make git.mydomain.com visible to public so I can push projects to the public server when I need assistance or I'm collaborating on stuff
22:32 kadoban It doesn't need a machine login for every user or anything. I use gitolite and add users there when I need to.
22:32 lvh joined #git
22:32 parasite_ joined #git
22:32 Celelibi gr8kodr: Any specific reason for not using an online service like github?
22:32 gr8kodr also looking for an 'off PC' solution for my projects as insurance against HD crash (or PC rebuilds)
22:33 Tobbi joined #git
22:33 gr8kodr some of my projects will be private and I can't afford the monthly fee :)
22:34 kadoban bitbucket then
22:34 regedit joined #git
22:35 manuelschneid3r joined #git
22:36 cdown joined #git
22:37 timvisher joined #git
22:37 tvw joined #git
22:38 BlessJah gr8kodr: bitbucket and gitlab offer free private repos
22:39 matsaman joined #git
22:41 dreiss joined #git
22:41 WifiBrain joined #git
22:41 tiger0 joined #git
22:42 xissburg is git LFS any good?
22:42 tiger0 joined #git
22:42 anonymuse joined #git
22:42 gr8kodr so basically the answer is "use an online provider"? not helpful when I want to be able to run a (staging) Git server offline as well as on live (public) host
22:43 osse hmm, what's the disagreement
22:44 nobso joined #git
22:45 jeffreylevesque_ joined #git
22:46 gr8kodr osse: not a disagreement as such ... but using online git hosting service kinda defeats the purpose of self-hosting a server - if I lose internet but still have my Intranet Git Server I can still work, if I rely on GitHub/BitBucket/GitLab online then I'm dead in the water while internet is out
22:47 BlessJah gr8kodr: if you loose internet, you relay on local copies, as noone won't see your pushes anyways
22:48 msonntag joined #git
22:48 zluna joined #git
22:48 BlessJah xissburg: it depends on the use case, but yep, both lfs and annex works just fine
22:49 BlessJah s/won't/will/
22:49 douglascorrea joined #git
22:50 * BlessJah wonder's if double or even triple negations are common thing in languages other than english
22:50 nidr0x joined #git
22:50 nwkj86 joined #git
22:51 Noodlewitt joined #git
22:53 gr8kodr BlessJah: I currently have a NAS drive where I am storing my Git projects, am I able to do 'git clone //NASdrive/mygitrepo mygitrepo' to my local machine(s)?
22:53 Sasazuka joined #git
22:54 BlessJah does anyone but you have access to said nas?
22:54 pity joined #git
22:54 gr8kodr .. I was under the impression I had to have an actual server git setup to access network gits
22:54 BlessJah nah, nevermind
22:55 gr8kodr one other person in house has been granted access, but doesn't connect to the drive at all
22:55 cjohnson gr8kodr: git can work via filesystem only, no server needed
22:55 BlessJah gr8kodr: bitbucket or gitlab.com have free private repos, gitlab and gerrit are self-hosted solutions I've seen used in production
22:55 cjohnson ssh for example is enough to do remote git
22:55 BlessJah both are overkill
22:56 mellernoia joined #git
22:56 * BlessJah have even created ~/git-shell-commands/create for new repo creation
22:56 gr8kodr not sure if I have SSH on NAS - is a WD MyCloud
22:57 BSaboia joined #git
22:57 BlessJah gr8kodr: git will work over filesystem (local, nfs, smb) or ssh
22:58 BlessJah some older wd myclouds were debian boxes, I don't know what are they nowadays
22:58 SwiftMatt joined #git
22:59 netj joined #git
23:00 gr8kodr ty - I was looking for a centralised solution where I could access gits from both Windon't and Linux. I didn't realise git was accessible over (local) network devices
23:00 timvisher joined #git
23:01 fmeerkoetter joined #git
23:01 mehola joined #git
23:01 durham joined #git
23:01 gr8kodr I think mine is Ubuntu, but not sure
23:01 cbreak gr8kodr: ssh
23:02 cbreak that's the ultimate protocol
23:02 cbreak don't use smb if your repository is worth anything
23:03 BlessJah ssh is often locked on dumb nas devices
23:03 BlessJah g
23:04 gr8kodr smb is only way I can see WDMyCloud contents from Ubuntu/CentOS boxes - WDMyCloud is definately a "dumb NAS", so I possibly don't have it
23:05 rominronin joined #git
23:06 gr8kodr I know when setting up shares (3 years ago) I had to make them all public because authentication continually failed
23:06 ISmithers joined #git
23:07 gr8kodr ... never was sure if that was a WD problem or a Windows problem
23:07 Dougie187 left #git
23:07 cyphase joined #git
23:08 gr8kodr left #git
23:13 worstadmin How can I rebase FETCH_HEAD onto my current branch? More importantly is this something that makes sense? I prefer this over a merge because I want to squash things I'm pulling in from the code review tool
23:13 worstadmin I am fairly new to git though and I suspect my question has false assumptions
23:13 cjohnson you want to refresh your feature branch from master so your feature branch is up to date but only contains commits relevant to your feature?
23:14 cjohnson master/whatever
23:14 worstadmin cjohnson: Yes
23:14 durham joined #git
23:14 tobiasvl sure you can do that
23:14 worstadmin But I don't want it riddled with merge commits
23:14 cjohnson the way we do that, which is certainly not what everybody does: master and qa branch. qa can never be merged into master. features are based off master and merged into qa
23:14 worstadmin So I can format-patch, cherry pick, checkout, or pull
23:14 stickperson joined #git
23:14 cjohnson occasionally we checkout feature and rebase master
23:14 worstadmin And I just think rebasing from fetch-head would be better
23:14 systemovich joined #git
23:14 cjohnson then PRs only ever show feature-related commits
23:15 denete_ joined #git
23:15 worstadmin Well gerrit is a little different
23:15 cjohnson the PR is for feature -> master, and upon merging, that's how the feature's code goes live. we don't do "builds"
23:15 worstadmin It doesn't actually utilize branches to keep things separate. Instead of is a gatekeeper for what goes into a branch and keeps things in /refs/ until they are signed off on
23:16 wrkrcoop joined #git
23:16 worstadmin But in that time it may be that I need to pull in someones patchsets sitting in remote refs
23:16 cjohnson I'm confused, are you using git?
23:16 worstadmin Git + gerrit
23:16 cjohnson will have to read up on gerrit
23:17 bannakaffalatta joined #git
23:17 worstadmin So with the assumption I only have one branch and then remote refs which I can pull and checkout using FETCH_HEAD
23:17 worstadmin Can I rebase with that?
23:17 tobiasvl yes
23:18 systemovich joined #git
23:19 anonymus_ joined #git
23:19 sxuk joined #git
23:20 durham joined #git
23:20 elsevero joined #git
23:20 astrofog joined #git
23:25 AlineGomes joined #git
23:27 mischat joined #git
23:28 str joined #git
23:28 timvisher joined #git
23:30 systemovich joined #git
23:30 netj joined #git
23:32 anonymuse joined #git
23:32 dsdeiz joined #git
23:32 dsdeiz joined #git
23:33 invisbl_ joined #git
23:33 donught joined #git
23:33 madewokherd joined #git
23:34 donught joined #git
23:34 Kaisyu joined #git
23:34 gugah joined #git
23:37 apotry joined #git
23:37 zivester joined #git
23:39 MrLawrence joined #git
23:40 MrLawrence Hello guys how can I see what the actual master branch points to e.g. it points to git@github.com:username/repo.git
23:40 Gsham joined #git
23:42 ertesx joined #git
23:45 cheater joined #git
23:45 cheater hi
23:45 chachasmooth joined #git
23:46 cheater i have a local branch that tracks a remote branch, call them foo and origin/foo. I checked out a commit that's in the past behind my local foo but ahead of origin/foo, did some more commits. now i'm in detached HEAD state. i'd like to move local foo to foo_old and make HEAD the new local foo. how would i do that?
23:57 denete_ joined #git
23:57 timvisher joined #git
23:58 robattila256 joined #git
23:58 cagedwisdom joined #git
23:59 refried_ joined #git
23:59 wrkrcoop left #git

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