Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-28

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

All times shown according to UTC.

Time Nick Message
00:01 LordRyan oh, it was a typo. can clone again from $HOME/repos but not from $HOME by /repos/<repo>
00:04 tribly joined #git
00:09 Oatmeal joined #git
00:09 Cabanossi joined #git
00:10 cspotcode joined #git
00:10 dreiss joined #git
00:11 Awesomecase joined #git
00:11 thiago joined #git
00:12 snthsnth joined #git
00:15 daurnimator joined #git
00:16 armyriad joined #git
00:17 marianina8 joined #git
00:19 otiose joined #git
00:20 Puffball joined #git
00:21 zivester joined #git
00:22 blackwind_123 joined #git
00:24 hotpancakes joined #git
00:25 daurnimator joined #git
00:29 cahoots joined #git
00:31 malide joined #git
00:31 romin_ joined #git
00:33 dirtyroshi_ joined #git
00:34 cagomez joined #git
00:35 dsdeiz joined #git
00:37 UTAN_dev joined #git
00:38 brent__ joined #git
00:40 fstd joined #git
00:44 serialoverflow joined #git
00:46 jtoy joined #git
00:51 hotpancakes joined #git
00:57 gordonfish joined #git
00:57 scottjl_ joined #git
00:57 tomasm- joined #git
00:59 fatalhalt joined #git
00:59 LordRyan joined #git
00:59 JanC_ joined #git
00:59 PresidentBiscuit joined #git
00:59 sammyo joined #git
01:02 ojdo joined #git
01:03 kenansulayman joined #git
01:06 tomasm- hey if i had some changes i wanted to put aside but not lose, would stashing be best? it's unfortunately not ALL my changes but just some, perhaps even line by line. maybe I need to commit what I want to use long term and stash the rest?
01:08 LordRyan a way to do it could be `git diff > patch.diff` (perhaps with a bit of tweakage), then you can `git apply < patch.diff` whenever later?
01:09 zerow joined #git
01:10 dsdeiz joined #git
01:11 njs126 joined #git
01:12 Kyros joined #git
01:14 livingstn joined #git
01:14 Kyros joined #git
01:16 cahoots joined #git
01:17 telephone joined #git
01:17 telephone joined #git
01:17 finalbeta joined #git
01:19 raijin joined #git
01:24 Cabanossi joined #git
01:26 cam27 joined #git
01:26 Ratler joined #git
01:28 mjuszczak joined #git
01:29 prg3 joined #git
01:29 fatalhalt joined #git
01:31 snthsnth joined #git
01:33 Dougie187 joined #git
01:36 cahoots joined #git
01:36 Gsham joined #git
01:38 Sasazuka joined #git
01:47 nevodka joined #git
01:47 dsdeiz joined #git
01:50 ilbot3 joined #git
01:50 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 sunri5e joined #git
01:50 di0_ joined #git
01:51 [Kid] joined #git
01:55 duderonomy joined #git
01:57 cqi joined #git
01:57 telephone joined #git
01:57 telephone joined #git
02:00 dermoth joined #git
02:02 fatalhalt joined #git
02:03 romin_ joined #git
02:04 hotpancakes joined #git
02:04 pks joined #git
02:06 Goplat joined #git
02:07 shgysk8zer0 joined #git
02:09 Cabanossi joined #git
02:09 Noodlewitt joined #git
02:13 zerow joined #git
02:14 Introoter joined #git
02:14 snthsnth joined #git
02:14 daurnimator tomasm-: 'git stash -p' is probably the right thing for you
02:16 cbreak joined #git
02:16 Vortex35 joined #git
02:16 a_thakur joined #git
02:17 a_thakur joined #git
02:17 FuzzyWuzzyPanda joined #git
02:19 dreiss joined #git
02:19 j416 joined #git
02:19 otiose joined #git
02:20 dsdeiz joined #git
02:22 mjuszczak joined #git
02:27 mjuszczak joined #git
02:28 mjuszczak joined #git
02:30 dsdeiz joined #git
02:30 dsdeiz joined #git
02:32 jameser joined #git
02:34 shgysk8zer0 left #git
02:36 mjuszczak joined #git
02:36 dsdeiz joined #git
02:40 NeverDie joined #git
02:43 gradleh8 joined #git
02:45 onlyanegg joined #git
02:48 chachasmooth joined #git
02:50 hotpancakes joined #git
02:50 hexagoxel joined #git
02:52 aavrug joined #git
02:54 SilentNight joined #git
02:54 SilentNight hello
02:54 gitinfo SilentNight: 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.
02:55 LordRyan "full of helpful gits"
02:55 mjuszczak joined #git
02:55 LordRyan honestly i'm partially insulted
02:55 SilentNight hello
02:56 SilentNight anyone know a good git app for android?
02:56 LordRyan i don't know at all why you'd want to modify a git repository on android
02:56 LordRyan but i have a feeling `git` by itself runs fine on it.
02:57 cdown joined #git
02:57 SilentNight sometimes need to in a pinch
02:58 cahoots joined #git
02:58 SilentNight AIDE or DroidEdit
02:59 SilentNight left #git
02:59 lagothri1 joined #git
03:04 noark9 joined #git
03:10 hashtagstrashtag joined #git
03:10 TbobbyZ joined #git
03:15 roelmonnens joined #git
03:17 sturner joined #git
03:19 beergeekgamer joined #git
03:22 SantaClauze joined #git
03:22 rchavik joined #git
03:24 Cabanossi joined #git
03:25 onlyanegg joined #git
03:26 choki joined #git
03:30 diogenese joined #git
03:34 romin_ joined #git
03:38 Cabanossi joined #git
03:41 UniFreak joined #git
03:42 brent__ joined #git
03:43 tvw joined #git
03:43 UniFreak is there anyway that I can get the current branch's name programatically?
03:43 UniFreak using PHP, such as?
03:44 mmattice cat .git/HEAD
03:44 mmattice that's not the "git" way, but...
03:47 UniFreak mmattice: prompt my No such file or directory
03:47 UniFreak oh, mispelled. sorry
03:47 cdown joined #git
03:48 livingstn joined #git
03:49 cagedwisdom joined #git
04:00 hotpancakes joined #git
04:05 TikityTik joined #git
04:06 livingstn joined #git
04:08 Cabanossi joined #git
04:08 jaziz joined #git
04:12 xall joined #git
04:13 sea-gull joined #git
04:13 rety joined #git
04:13 telephone joined #git
04:13 telephone joined #git
04:15 njbair joined #git
04:16 TikityTik joined #git
04:23 kristofferR joined #git
04:24 kbeflo joined #git
04:25 otiose joined #git
04:31 xall joined #git
04:32 SwiftMatt joined #git
04:33 mekhami left #git
04:34 Bock joined #git
04:34 svm_invictvs joined #git
04:35 xall joined #git
04:37 Bock joined #git
04:37 kbeflo_ joined #git
04:38 tnecniv joined #git
04:39 TikityTik joined #git
04:39 ayogi joined #git
04:41 dsdeiz joined #git
04:42 hotpancakes joined #git
04:43 shgysk8zer0 joined #git
04:44 _ng joined #git
04:47 Levex joined #git
04:54 indistylo joined #git
04:54 dermoth_ joined #git
04:55 fakenerd joined #git
04:55 echosystm joined #git
04:55 echosystm hi guys. someone fucked up our git repo somehow. i need some help getting out of this asap.
04:56 freimatz joined #git
04:56 indistylo joined #git
04:56 darkbit joined #git
04:56 echosystm we had a bunch of changes committed and pushed to origin
04:56 echosystm i think the other guy didn't pull, made some changes, committed, pulled and then merged
04:56 echosystm but when he merged, everything that was on origin got reverted
04:56 echosystm there's an empty merge commit
04:57 echosystm anyone know how to dig out of this?
04:57 echosystm basically i just want the develop branch to ignore all the random shit that bloke did
05:00 echosystm anyone?
05:03 onlyanegg joined #git
05:04 roelmonnens joined #git
05:05 romin_ joined #git
05:08 Endarked joined #git
05:09 bezhermoso joined #git
05:11 snthsnth joined #git
05:11 TheDcoder joined #git
05:12 ti2 joined #git
05:12 TbobbyZ joined #git
05:13 MuffinMedic joined #git
05:14 TheDcoder Hi, I just had a crazy idea and wanted to know if it is possible to do... I have a file on a repository, I want to have the same exact file in another repository but with a different filename... plus if the file is modified in the original repository the changes should be automatically synced to the file in the other repository... possible? :P
05:14 echosystm ok all good i got it fixed thanks anyway
05:16 kbeflo joined #git
05:18 TikityTik joined #git
05:19 aruns joined #git
05:21 njbair joined #git
05:23 Cabanossi joined #git
05:25 choki joined #git
05:26 joshszep joined #git
05:26 fakenerd joined #git
05:27 ogny joined #git
05:33 Ratler joined #git
05:34 hotpancakes joined #git
05:35 cagomez joined #git
05:35 snowkidind joined #git
05:36 marianina8 joined #git
05:37 mSSM joined #git
05:39 Raging_Hog joined #git
05:41 todd_dsm joined #git
05:42 lordjancso joined #git
05:44 Levex joined #git
05:45 TikityTik joined #git
05:46 ronskisika joined #git
05:46 hotpancakes joined #git
05:48 qt-x joined #git
05:50 noark9 joined #git
05:50 aruns joined #git
05:52 aruns joined #git
05:57 brent__ joined #git
06:00 dermoth joined #git
06:01 acetakwas joined #git
06:05 joshszep joined #git
06:05 joshszep joined #git
06:06 MineCoins joined #git
06:06 joshszep joined #git
06:07 joshszep joined #git
06:07 zeroed joined #git
06:07 zeroed joined #git
06:08 chele joined #git
06:08 joshszep joined #git
06:09 joshszep joined #git
06:09 joshszep joined #git
06:10 joshszep joined #git
06:11 joshszep joined #git
06:12 sbulage joined #git
06:12 joshszep joined #git
06:12 rscata joined #git
06:13 joshszep joined #git
06:13 joshszep joined #git
06:14 joshszep joined #git
06:15 joshszep joined #git
06:16 joshszep joined #git
06:16 MineCoins joined #git
06:16 tnecniv joined #git
06:17 joshszep joined #git
06:17 cahoots joined #git
06:17 joshszep joined #git
06:18 joshszep joined #git
06:19 roelmonnens joined #git
06:19 joshszep joined #git
06:19 worstadmin joined #git
06:20 joshszep joined #git
06:20 roelmonnens joined #git
06:24 theoceaniscool joined #git
06:25 finalbeta joined #git
06:25 cqi joined #git
06:29 fakenerd joined #git
06:31 a_thakur joined #git
06:31 freimatz joined #git
06:32 Brski joined #git
06:37 romin_ joined #git
06:39 JeroenT joined #git
06:40 romin_ joined #git
06:40 schleppel joined #git
06:42 rudrab joined #git
06:43 ahrs joined #git
06:46 zeroed joined #git
06:50 aruns joined #git
06:52 tarkus joined #git
06:56 njbair joined #git
06:57 manuelschneid3r joined #git
06:58 d^sh joined #git
06:59 hotpancakes joined #git
07:00 govg joined #git
07:02 tomasm- joined #git
07:03 Tobbi joined #git
07:06 leeN joined #git
07:06 zeroed joined #git
07:06 zeroed joined #git
07:09 kexmex joined #git
07:12 skre4 joined #git
07:14 dosmachko joined #git
07:15 TbobbyZ joined #git
07:16 TomyLobo2 joined #git
07:21 rudrab_ joined #git
07:22 elichai2 joined #git
07:23 Tobbi joined #git
07:23 Cabanossi joined #git
07:23 joeco joined #git
07:24 nickel_dime_look joined #git
07:26 govg joined #git
07:27 dre_ joined #git
07:30 shiriru joined #git
07:30 mda1 joined #git
07:35 choki joined #git
07:35 aielima joined #git
07:37 koneko joined #git
07:40 hotpancakes joined #git
07:41 Tobbi joined #git
07:44 ti2 TheDcoder: should be possible, as long as you sync always just one way.  Just rename the file with 'git mv' in the second repository and try... ;-)
07:44 Silenced joined #git
07:45 aruns__ joined #git
07:45 xaa joined #git
07:45 TheDcoder :P
07:45 dsdeiz joined #git
07:45 dsdeiz joined #git
07:47 fakenerd joined #git
07:50 aruns joined #git
07:57 Random832 joined #git
07:58 Xatenev joined #git
07:59 pbandark joined #git
07:59 joshszep joined #git
08:00 marianina8 joined #git
08:01 mikecmpbll joined #git
08:05 m1dnight_ joined #git
08:08 Tobbi joined #git
08:08 kurkale6ka joined #git
08:09 cstratak joined #git
08:09 chele_ joined #git
08:09 ams__ joined #git
08:10 Murii joined #git
08:11 srcerer_ joined #git
08:12 elect joined #git
08:12 rokups joined #git
08:13 apotry joined #git
08:13 skunkz joined #git
08:13 brent__ joined #git
08:14 rudrab_ joined #git
08:14 sea-gull joined #git
08:14 marcogmonteiro joined #git
08:14 bongjovi joined #git
08:16 Forlorn joined #git
08:18 rudrab_ joined #git
08:18 permalac joined #git
08:21 dsdeiz joined #git
08:21 dsdeiz joined #git
08:22 dersand joined #git
08:22 Jonuz joined #git
08:23 mSSM joined #git
08:23 Cabanossi joined #git
08:25 bket joined #git
08:26 Tobbi joined #git
08:27 Forlorn left #git
08:30 permalac joined #git
08:33 Snugglebash joined #git
08:35 hotpancakes joined #git
08:39 cads2 joined #git
08:42 Acerific joined #git
08:46 holodoc joined #git
08:49 notebox joined #git
08:54 chubek_ joined #git
08:55 theoceaniscool joined #git
08:56 dsdeiz joined #git
08:56 dsdeiz joined #git
08:57 fakenerd joined #git
08:57 redeemed joined #git
08:59 zachary12 joined #git
09:00 gugah joined #git
09:01 JeroenT_ joined #git
09:03 xall joined #git
09:04 manuelschneid3r joined #git
09:04 sarri joined #git
09:04 sarri joined #git
09:04 xall joined #git
09:06 finalbeta joined #git
09:06 manuelschneid3r joined #git
09:06 chll_ joined #git
09:08 Cabanossi joined #git
09:09 my_nick joined #git
09:09 acetakwas joined #git
09:10 Silmarilion joined #git
09:11 my_nick left #git
09:12 xall joined #git
09:15 theoceaniscool joined #git
09:16 navidr joined #git
09:16 schleppel joined #git
09:16 dvaske joined #git
09:17 TbobbyZ joined #git
09:17 zerow joined #git
09:18 zerow_ joined #git
09:20 digidog joined #git
09:21 notebox joined #git
09:21 dhollinger joined #git
09:22 Xatenev left #git
09:23 dvaske_ joined #git
09:24 xall joined #git
09:26 hotpancakes joined #git
09:27 otiose joined #git
09:29 elichai2 left #git
09:31 dsdeiz joined #git
09:31 dsdeiz joined #git
09:32 finalbeta joined #git
09:32 choki joined #git
09:33 MarioBranco joined #git
09:34 routingsparks joined #git
09:35 rivarun joined #git
09:43 fakenerd_ joined #git
09:44 mSSM left #git
09:45 scottjl joined #git
09:48 a_thakur joined #git
09:51 Xatenev joined #git
09:52 Xatenev Hi
09:52 Xatenev How do I remove all files that now have been added to .gitignore
09:52 Xatenev git rm -rf --cached * ?
09:53 Guest55823 joined #git
09:54 osse that just removes everything
09:54 Xatenev Thought so
09:54 Xatenev :p
09:54 Xatenev Because we have really tons of files that are in git right now
09:54 Xatenev I completly rewrote the whole gitignore
09:54 osse git ls-files --cached --ignored --exclude-standard -z | xargs -0 git rm
09:54 Xatenev So I cant just manually write the path of those files.
09:54 Xatenev damn what is that
09:55 Xatenev does that make my pc explode
09:55 osse run  git ls-files --cached --ignored --exclude-standard  and see if it prints what you expect
09:55 osse if it does, add the rest
09:55 osse for fun and profit
09:55 Xatenev okey dokey
09:55 Xatenev 1sec
09:56 Xatenev it does
09:56 mkoskar joined #git
09:56 osse praise gaben
09:56 Xatenev lmao. csgo playe
09:56 Xatenev or is it dota.
09:57 osse all mobas are shit
09:57 Xatenev true dat
09:57 Xatenev osse, it works perfect btw, thank you man
09:57 Xatenev commandline hero
09:57 Xatenev .p
09:58 osse also awp hero
09:58 osse and ak zero
09:58 roflin joined #git
09:59 Xatenev 1k hours max
09:59 osse bruh
09:59 Xatenev see u in esea
09:59 Xatenev :P
09:59 osse i think i'm at 1200.
09:59 Xatenev ^^
09:59 osse but i played a lot of 1.6 before they started tracking
09:59 Xatenev wasted way too much time into CSGO. lol
09:59 Xatenev 4.5k hours csgo. rip
10:00 osse i still don't think I've played as much csgo as I played cs before
10:00 Xatenev cs 1.6 was pretty cool.
10:00 osse isn't esea shit in yurop ?
10:00 Xatenev naaa
10:00 Xatenev its shit in NA because skilllevel is damn low in there
10:01 osse i think MM is enough for me. plus the lack of friendly fire annoys me
10:02 osse i sometimes make linux/programming jokes when I play, but no one ever gets them :(
10:03 i7c I would!
10:03 i7c But we never met in mm I think!
10:03 Xatenev osse, the default player is sadly entirely non IT affine.
10:03 Xatenev lol
10:03 i7c Or have you played against a horribly bad guy?
10:03 osse i7c: i've played will all kinds
10:03 osse also against them :p
10:04 i7c ^^
10:04 dvaske joined #git
10:06 Xatenev osse, Are you playing CS:GO under linux?
10:06 osse Xatenev: no
10:06 dsdeiz joined #git
10:06 dsdeiz joined #git
10:06 Xatenev ok
10:06 i7c yes!
10:06 osse been tempted to try, but i haven't bothered
10:06 Xatenev I was wondering whether it works well
10:06 Xatenev or if huge FPS drops
10:06 i7c It does, most of the time ;)
10:06 i7c I have constant 99 FPS, which is enough for my noobness.
10:07 Xatenev i7c, lol^
10:07 Xatenev Couldnt play like that. :P
10:07 i7c There are some bugs
10:07 i7c but none that keep you from  playing.
10:07 i7c And many of them are on windows too :D
10:07 i7c So I’ve heard. Don’t have windows.
10:08 i7c Xatenev, how many fps do you get?
10:09 dvaske_ joined #git
10:10 Xatenev i7c, 240 I think
10:11 darkbit joined #git
10:12 Milos joined #git
10:12 i7c And you play on regular 64 ticks servers? :)
10:12 earnestly joined #git
10:13 Endarked joined #git
10:13 Xatenev mo
10:13 Xatenev no
10:13 Xatenev 128
10:13 i7c ah yeah
10:14 selckin joined #git
10:14 aard joined #git
10:14 i7c On regular mm servers, the weapon’s accuracy is more like a random generator, so yeah who cares about fps :p
10:15 Achylles joined #git
10:16 cschneid joined #git
10:18 Xatenev osse,
10:19 Xatenev In one repository it tells me about the definition of the command as in if I'd have write something wrong
10:19 holodoc joined #git
10:19 Xatenev the same command worked for all other repositories though. What might be wrong? :|
10:19 Snugglebash joined #git
10:19 osse !repro
10:19 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
10:19 choki joined #git
10:19 osse is this special snowflake repo on a different computer with a different git version?
10:20 Xatenev osse, https://bpaste.net/show/808723314930
10:21 osse that probably happens because there are no files
10:21 Xatenev ah
10:21 Xatenev oh that makes a lot of sense
10:21 Xatenev so stdin is zero
10:21 Xatenev thanks
10:25 Xatenev sorry last question
10:25 Xatenev how do I say: ./resources in gitignore?
10:25 Xatenev (Only match file on root dir of git repo)
10:25 osse like that
10:25 Xatenev It doesnt work
10:26 Xatenev when I do ./resources it tracks a file called resources
10:26 osse /resources
10:26 Xatenev ah
10:26 Xatenev thanks
10:29 brent__ joined #git
10:29 Tobbi joined #git
10:31 ferr joined #git
10:31 oskarkv joined #git
10:32 GT4066 joined #git
10:32 IRQ` joined #git
10:34 Xatenev osse, Halp :(
10:35 Xatenev I created a file ~/.config/git/ignore
10:35 Xatenev and wrote /data/development/project/client/*/resources
10:35 Xatenev but the placeholder "*" doesn't seem to work like that.
10:35 Xatenev basically I have 10 projects in that project/client/ directory
10:35 Xatenev and each of those contains a resources file.
10:36 Xatenev I wanna ignore that file for all of those 10 projects.
10:36 osse have you added ~/.config/git/ignore to your .gitconfig?
10:36 Xatenev no
10:36 Xatenev Do I have to do that?
10:37 Xatenev The SO answer I've read says its the default location
10:37 osse that's news to me
10:37 osse run:  git config --global core.excludesFile ~/.config/git/ignore
10:37 JeroenT joined #git
10:38 Xatenev Done that
10:38 Xatenev still no effect
10:38 Xatenev or I am using the wildcard wrong
10:38 osse how do you determine it has no effect
10:38 Xatenev I type in git status
10:38 Xatenev to a completly untracked file
10:38 rnsanchez joined #git
10:38 Xatenev and it appears in there
10:38 osse to?
10:39 Xatenev to what?
10:39 osse "to a completly untracked file"
10:39 Xatenev ignore that
10:39 osse i don't understand
10:39 Xatenev I created a nmew file
10:39 Xatenev that is completly untracked
10:39 osse what exactly does git status print
10:39 Xatenev and it appears in there.
10:39 Xatenev unversioned file:
10:39 Xatenev my file
10:40 osse my file is different from resources, so...
10:40 Xatenev ...
10:40 Xatenev the name is correct
10:40 Xatenev xD
10:40 Xatenev its no typo
10:40 Xatenev sec
10:40 Xatenev I will prepare a paste
10:41 Xatenev osse, https://bpaste.net/show/300b0b4c102e
10:41 dsdeiz joined #git
10:41 dsdeiz joined #git
10:42 demize manpage says that $XDG_CONFIG_HOME/git/ignore is the default if $XDG_CONFIG_HOME is set, otherwise ~/.config/git/ignore.  (so it does properly implement XDG basedir spec mmmm...)
10:42 osse !repro with the output of git status and the output of git check-ignore -v bla/blah/resources and git check-ignore -v some/file/that/works
10:42 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
10:43 tg joined #git
10:43 chardan joined #git
10:44 Kamilion joined #git
10:45 Xatenev osse, https://bpaste.net/show/7b120b2163ba
10:45 Xatenev no output on git check-ignore at all
10:46 Xatenev I still guess that * doesn't work like thjat.
10:46 Xatenev xd
10:46 osse what abotu a file that works
10:47 YuGiOhJCJ joined #git
10:47 Xatenev you mean i should create .gitignore in that directory?
10:47 Xatenev and give you that output?
10:47 Xatenev (None of the files in the gitignore pasted works)
10:47 osse no, run git-check-ignore -v on a file that is properly ignored
10:47 HoierM joined #git
10:47 Xatenev i dont have one
10:48 osse classic.jsonp isn't ignored either
10:50 osse where is the pattern that ignores that
10:51 aielima joined #git
10:52 masuberu joined #git
10:54 Silenced joined #git
10:55 jimmyrcom joined #git
10:57 darkbit I've removed my submodule using git submodule deinit and git rm my directory but I found that the name of the submodule still exists inside my .git/modules directory. Is there a command to "clean" this up?
10:57 Milos joined #git
10:57 slidercrank joined #git
10:59 finalbeta joined #git
10:59 s17 I want to checkout a file as it was before a certain commit
10:59 Xatenev osse, https://bpaste.net/show/300b0b4c102e
10:59 Xatenev osse, https://bpaste.net/show/300b0b4c102e here
10:59 Xatenev *here /data/development/sharesuite/client/*/classic.jsonp
11:00 Xatenev and the file is located here: /data/development/sharesuite/client/app.workflow/classic.jsonp for example
11:00 cads2 joined #git
11:00 Xatenev Gotta go in 5 minutes if anybody has some genius tip whats going wrong, feel free to share
11:00 Xatenev xd
11:01 marianina8 joined #git
11:01 osse so resources was just an example? the same is true for classic.jsonp too ?
11:01 Xatenev yes
11:02 Xatenev I checked my .gitconfig - it shows the correct path
11:02 Xatenev to the .config/git/ignore
11:02 osse does it work if the ignore file only contains /data/development/sharesuite/client/* ?
11:02 Xatenev sec
11:03 Xatenev no
11:04 osse what if you remove the leading /
11:05 Xatenev doesnt seem to work
11:05 Xatenev I got to go im back in 1 hour
11:05 Xatenev sorry, thanks for the help so far
11:05 Xatenev I will come back :D
11:09 JeroenT joined #git
11:10 jameser joined #git
11:13 dglambert joined #git
11:13 dglambert yo
11:14 dvaske joined #git
11:16 dsdeiz joined #git
11:16 dsdeiz joined #git
11:19 lohfu joined #git
11:21 lknd joined #git
11:23 Cabanossi joined #git
11:26 Snugglebash joined #git
11:27 hotpancakes joined #git
11:27 otiose joined #git
11:30 Tobbi joined #git
11:38 fakenerd joined #git
11:39 Chuguniy joined #git
11:42 ertes joined #git
11:42 dsdeiz joined #git
11:42 dsdeiz joined #git
11:43 HcsOmot joined #git
11:47 Tobbi joined #git
11:49 fakenerd joined #git
11:50 Steven_Darson joined #git
11:50 tsdev joined #git
11:53 dvaske_ joined #git
11:54 thiago joined #git
11:54 koneko joined #git
11:58 zeroed joined #git
11:59 JeroenT joined #git
11:59 dvaske joined #git
12:01 theoceaniscool joined #git
12:01 Cavallari joined #git
12:04 finalbeta joined #git
12:13 cam27 joined #git
12:15 ankit01ojha joined #git
12:15 __builtin joined #git
12:17 zeroed joined #git
12:18 Milos_ joined #git
12:18 weakdan joined #git
12:18 michele joined #git
12:18 michele hi!
12:19 synthroid joined #git
12:19 michele is there a way to launch a git command without reading its config (~/.gitconfig)? a sort of "incognito" mode
12:19 Silenced joined #git
12:19 TbobbyZ joined #git
12:20 LAGonauta joined #git
12:22 livingstn joined #git
12:25 peacememories joined #git
12:26 IRQ` joined #git
12:26 Acerific joined #git
12:26 Acerific joined #git
12:28 hotpancakes joined #git
12:31 gugah joined #git
12:31 thiago michele: yes
12:32 kpease joined #git
12:33 thiago set GIT_CONFIG_NOSYSTEM=1
12:33 thiago sorry, that's just for the systemwide file. I don't see a way to skip the global file
12:33 thiago why do you want htat?
12:35 cebor joined #git
12:35 osse Could manipulate HOME...
12:36 osse Might be a bit much
12:36 logiclord joined #git
12:36 rudrab_ joined #git
12:36 logiclord hello, is it possible to do something like git cherry-pick --ours, but not for the whole file, just for the conflicting areas?
12:37 logiclord i.e. I want all the merged content for non-conflicting places rather than taking only one file for the non-conflicting areas.
12:37 thiago logiclord: no
12:38 thiago use a mergetool to help you fix after the conflict happene
12:38 choki joined #git
12:38 michele thiago: reason is simple: I added fsckobjects = true to my ~/.gitconfig - now I have problems when cloning a repo. I wanted an "incognito" mode to see if the problems was related to that config or not, since the error says: error: object a6727941433ee1c91a20ede6cb381af1d18c566d: missingSpaceBeforeDate: invalid author/committer line - missing space before date
12:38 logiclord that is a shame... would be nice feature to have to avoid manually resolving 50-100 cases at times with one end.
12:38 thiago michele: use -c fsckojects=false
12:39 CussBot joined #git
12:40 marcogmonteiro joined #git
12:40 greeneggsand joined #git
12:40 Xatenev osse, im re
12:40 Xatenev osse, Any hints on the global git thing? :P
12:40 logiclord left #git
12:41 Xatenev global gitignore thing*
12:42 Xatenev Or anybody else any hints on why it might be that the global gitignore isnt loaded?
12:42 Xatenev ~/.config/git/ignore
12:42 thiago Xatenev: where did you read that that file would be loaded?
12:43 jtoy joined #git
12:43 Xatenev on the official git docs and several SO posts
12:43 Xatenev https://git-scm.com/docs/gitignore
12:43 Xatenev aswell ~/.gitconfig says: excludesFile = /home/me/.config/git/ignore
12:44 Xatenev I got a lokt of lines in there that have no effect at all - so I guess its not being loaded
12:44 Xatenev Any way to confirm / debug is appreciated :D
12:44 rwb joined #git
12:48 JeroenT joined #git
12:48 Jynx651_ joined #git
12:49 Xatenev thiago, ok it is loaded
12:49 Xatenev only my rules seems to be wrong
12:50 gradleh8 joined #git
12:50 peacememories joined #git
12:51 Xatenev https://bpaste.net/show/cd3622b0f2c1
12:51 Xatenev does anybody see the problem?
12:51 Cavallari joined #git
12:52 _Stumbler joined #git
12:52 Hello71 man gitignore
12:52 gitinfo the gitignore manpage is available at https://gitirc.eu/gitignore.html
12:52 Xatenev weird
12:54 dhollinger joined #git
12:54 di0_ joined #git
12:54 ExoUNX joined #git
12:56 borkr joined #git
12:56 NeXTSUN joined #git
13:00 Xatenev bump
13:02 hotpancakes joined #git
13:04 bitmod joined #git
13:04 tomasm- joined #git
13:04 M-ou-se joined #git
13:05 Xatenev nobody?
13:08 fire2199 joined #git
13:10 i7c Xatenev, what version of git are you using?
13:11 Xatenev 2.7.4
13:11 i7c mhm
13:12 fire2199 I'm trying to clone a remote repo; on the github website I see a lot of files but when cloning with "git clone https://....git" for which address was copied for the "clone with HTTPS" option on the website, I get only a big .git folder in which there's a file named pack-xxx.pack of almost the size of the total size of the .git folder.
13:13 theoceaniscool joined #git
13:13 Milos joined #git
13:13 de-vri-es joined #git
13:13 tobiasvl fire2199: you're not doing "git clone --bare ..."?
13:14 tobiasvl !repro
13:14 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
13:14 Xatenev tobiasvl, do you have any idea to my problem? :P
13:14 Xatenev tobiasvl, I know your pretty good with git :P
13:16 Starky joined #git
13:17 Xatenev yea idk. I guess thats some git bug
13:17 tobiasvl Xatenev: works for me
13:18 Xatenev tobiasvl, wtf?
13:18 Xatenev tobiasvl, how
13:18 Xatenev tobiasvl, can i see ur testcase?
13:18 jameser joined #git
13:18 Karazhan joined #git
13:18 sturner joined #git
13:18 Xatenev tobiasvl, and are you using linux or windows?
13:19 i7c I think the paths in the "global" gitignore are also relative to the git root.
13:19 i7c Not to your file system root.
13:19 i7c So urdoingitwrong.jpg
13:19 Xatenev i7c, I hope im doing it wrong
13:19 Xatenev lol
13:19 Xatenev So I have to do ../../../?
13:20 Xatenev oh
13:20 Xatenev LMAO
13:20 Xatenev you mean relative to the repo im in then
13:20 i7c Yes.
13:20 Xatenev and its loaded into
13:20 fakenerd joined #git
13:20 * Xatenev tries
13:21 i7c Because if you read man gitignore, you see that a leading / has a different meaning than filesystem root.
13:21 gitinfo the gitignore manpage is available at https://gitirc.eu/gitignore.html
13:21 tobiasvl Xatenev: https://gist.github.com/tobiasvl/2531a1bbbfbb48a773c13239dd424c73
13:21 tobiasvl that's my test case
13:21 tobiasvl but yes, leading / means the repo's root, not filesystem root
13:22 Xatenev your right
13:22 TheSimonator joined #git
13:22 Xatenev thanks
13:22 Xatenev wow.
13:23 de-vri-es joined #git
13:23 i7c [x] helped [x] weekend may begin
13:23 Xatenev another question
13:23 Xatenev :P
13:23 i7c [x] dammit
13:23 Xatenev what was the command again to show what gitignore ignores file X?
13:24 tobiasvl man git-check-ignore
13:24 gitinfo the git-check-ignore manpage is available at https://gitirc.eu/git-check-ignore.html
13:24 Xatenev thanks
13:24 JeroenT joined #git
13:25 Xatenev Woho it works perfect now
13:25 Xatenev thanks a lot
13:25 tsetair joined #git
13:26 tymczenko joined #git
13:26 hotpancakes joined #git
13:26 Ardethian\ joined #git
13:27 otiose joined #git
13:28 relipse__ joined #git
13:29 Tobbi joined #git
13:30 cdg joined #git
13:30 Murii joined #git
13:31 boombatower joined #git
13:32 Stumbler joined #git
13:37 dsdeiz joined #git
13:37 NeXTSUN joined #git
13:38 Cabanossi joined #git
13:44 Xatenev left #git
13:44 raijin joined #git
13:45 robotroll joined #git
13:48 Es0teric joined #git
13:50 nevodka joined #git
13:52 NotKyros joined #git
13:52 MineCoins joined #git
13:52 raijin joined #git
13:52 Nerbrun joined #git
13:56 yqt joined #git
13:57 jameser joined #git
13:58 bsanford joined #git
13:59 Dougie187 joined #git
14:00 Levex joined #git
14:00 nedbat I wanted to find where a line was removed from a file. (git log -S is the way to do this, but:) I heard about git blame --reverse, and tried it. As the help says, it shows the last revision where the line existed. Is there a way to get from that to the next revision, where it was removed? Also, what does the ^ symbol mean in the second output? https://gist.github.com/nedbat/d587eff83743d946b6e47ecbc99a8405
14:00 artgoeshere joined #git
14:01 fire2199 tobiasvl : I just saw your input; I'm now trying with --bare, I'll see and be back
14:05 firef1y joined #git
14:07 ableto joined #git
14:07 peacememories joined #git
14:08 Masber_080 joined #git
14:09 sweatsuit joined #git
14:10 Darcidride joined #git
14:11 qbolt joined #git
14:12 dsdeiz joined #git
14:12 dsdeiz joined #git
14:12 qbolt I'm trying to push to a repository hosted on my EC2 instance. I can push it in git pash, but not conemu (cmder). In cmder, it says `Permission denied(publickey). fatal: could not read from remote repository.'
14:12 qbolt git bash*
14:12 lewis joined #git
14:12 otiose joined #git
14:14 rokups joined #git
14:14 jtoy joined #git
14:14 bariscant joined #git
14:15 Es0teric joined #git
14:15 hotpancakes joined #git
14:15 AaronMT joined #git
14:17 fire2199 joined #git
14:19 synthroid joined #git
14:19 nanga joined #git
14:19 nanga joined #git
14:20 TheSimonator joined #git
14:22 TbobbyZ joined #git
14:22 peacememories joined #git
14:22 ikmy joined #git
14:23 marcogmonteiro joined #git
14:23 SteffanW joined #git
14:23 aielima joined #git
14:24 firef1y joined #git
14:24 jeffreylevesque joined #git
14:25 bezhermoso joined #git
14:25 JeroenT_ joined #git
14:26 fire2199 tobiasvl : https://gist.github.com/anonymous/9d9d794b37ca618bd764f358e180036a
14:26 XenophonF joined #git
14:26 skre4 joined #git
14:28 hotpancakes joined #git
14:28 rkazak joined #git
14:29 achadwick joined #git
14:33 cwillu_at_work joined #git
14:33 Masber_080 joined #git
14:37 snufft joined #git
14:37 Masber_080 joined #git
14:39 nanga joined #git
14:39 nanga joined #git
14:40 navidr joined #git
14:41 blackwind_123 joined #git
14:44 iffraff joined #git
14:45 zivester joined #git
14:47 zivester joined #git
14:47 dsdeiz joined #git
14:48 nanga joined #git
14:48 nanga joined #git
14:48 DammitJim joined #git
14:49 DammitJim I have been asked to give different users permissions to the git server I set up
14:49 roelmonn_ joined #git
14:49 DammitJim permissions are given per repo, right?
14:49 DammitJim I shouldn't just give everyone access to everyone's stuff, right?
14:49 demize It depends on how you have the git repo set up?
14:50 demize Should depends on your needs.
14:50 DammitJim well, #1, there are no defined repos for the devs
14:50 DammitJim so, I guess they need to tell me what repo they want to set up?
14:50 DammitJim they'd have to ask me to create the repo for them, huh?
14:50 demize Again, it depends on how you have things set up.
14:50 DammitJim ok, right now I have 1 repository
14:51 demize There's literally 0 general advice that can be given, because things can be set up completely differently.
14:51 DammitJim and there is a user that has access to it via ssh/certificates
14:51 DammitJim oh
14:51 DammitJim what should I read to get some knowledge on how I should approach this?
14:51 demize Overall I'd recommend you to use something like gitolite or gogs unless you're familiar with SSH/UNIX permissions.
14:52 DammitJim I'm familiar with SSH/UNIX
14:52 Murii joined #git
14:52 DammitJim but I'll read about gitolite
14:53 Cabanossi joined #git
14:55 jast gitolite certainly makes it less painful than if you have to mess around with system groups and stuff
14:56 sunri5e joined #git
14:57 jozwior joined #git
14:57 DammitJim ok
14:59 peterbecich joined #git
15:00 raijin joined #git
15:01 _Vi joined #git
15:01 choki joined #git
15:02 marianina8 joined #git
15:03 nanga joined #git
15:04 njs126 joined #git
15:04 michele left #git
15:05 khfeng joined #git
15:05 shinnya joined #git
15:05 snowkidind joined #git
15:07 nanga joined #git
15:08 Ulrar joined #git
15:08 Tobbi joined #git
15:08 roelmonnens joined #git
15:09 Ulrar Hi, We're trying to setup a repo to hold a debian repositories, and git seems to be screwing with file permissions. How do I tell git to respect file chmod perfectly ?
15:09 hotpancakes joined #git
15:09 selckin git doesn't track file permissions
15:10 i7c git only cares about the executable flag
15:10 hotpancakes git config --global core.autocrlf true
15:10 hotpancakes Sorry...
15:10 i7c Are we posting our favourtie git commands?
15:11 hotpancakes If I set the above on a mac, is the behavior to convert Windows-style line endings to UNIX-style?
15:11 Ulrar That's annoying ..
15:11 hotpancakes The docs aren't particularly clear about this
15:13 cqi joined #git
15:15 MrLawrence joined #git
15:16 guest___ joined #git
15:16 bwo joined #git
15:17 bouncy joined #git
15:18 fire2199 tobiasvl : so have you seen my paste?
15:20 fakenerd joined #git
15:21 uobi joined #git
15:22 dsdeiz joined #git
15:22 dsdeiz joined #git
15:23 publio joined #git
15:23 averell joined #git
15:24 MrLawrencee joined #git
15:25 Xatenev joined #git
15:25 Xatenev hello
15:25 Xatenev Is there a possibility to do git pull --ifConflictStopAndGoBackToBefore
15:26 osse Xatenev: git pull || git merge --abort
15:26 Xatenev damn your saving my day here
15:26 Xatenev :p
15:26 Xatenev thanks
15:26 ResidentBiscuit joined #git
15:27 kise joined #git
15:27 dsdeiz joined #git
15:27 dsdeiz joined #git
15:28 artgoeshere joined #git
15:28 MrLawrencee left #git
15:29 sturner joined #git
15:29 marianina8 joined #git
15:29 kadoban joined #git
15:30 Tobbi joined #git
15:31 YuGiOhJCJ joined #git
15:32 svm_invictvs joined #git
15:32 qqx If you use that while a merge is already in progress it would cause it to be aborted rather than just telling you to complete the merge before pulling.
15:35 al-damiri joined #git
15:36 qalvh joined #git
15:37 zeroed joined #git
15:38 brent__ joined #git
15:39 mcoble joined #git
15:40 brent__ joined #git
15:42 dyyno joined #git
15:45 Walex joined #git
15:45 madewokherd joined #git
15:47 Gsham joined #git
15:49 rkazak joined #git
15:50 choki left #git
15:51 hobodave joined #git
15:53 webdev007 joined #git
15:55 shgysk8zer0 joined #git
15:56 MuffinMedic joined #git
15:57 ertes joined #git
15:58 svm_invictvs joined #git
16:00 synthroid joined #git
16:01 bongjovi joined #git
16:01 guest___ how does one handle open source licences of components and subcomponents in a project? let's say my project is going to be under apache 2.0 licence and i use another component in my project also under apache2.0 that has components under various other licenses. Is it enough to just add an apache licence file in my proj dir or do i have to do more if the licences are compatible?
16:01 King_Hual joined #git
16:01 King_Hual joined #git
16:02 User458764 joined #git
16:02 dsdeiz joined #git
16:02 synthroi_ joined #git
16:03 Jackneill joined #git
16:03 Vampire0 guest___, two things:
16:04 guest___ all ears
16:04 Vampire0 guest___, 1. this depends on the licenses of the individual components, but usually just mentioning the one you embed directly is *not* enough
16:04 Vampire0 guest___, 2. The is #git, not ##lawyers-office
16:05 Vampire0 guest___, your question has nothing to do with Git at all
16:05 guest___ i know its kinda off topic
16:05 geoid joined #git
16:05 guest___ so i would need to add an additional file listen aaaaaaall of the components and sub components?
16:06 guest___ *listing
16:06 livingstn joined #git
16:07 Dougie187 left #git
16:08 onlyanegg joined #git
16:08 Vampire0 guest___, if you want to know it exactly, contact a lawyer that is specialized on licensing. I thought we agreed that your question is off-topic. Please stop asking about it. You will not get a legal relevant answer in here
16:09 davimore joined #git
16:11 dvaske joined #git
16:12 mkoskar joined #git
16:13 blackwind_123 joined #git
16:13 mikecmpbll joined #git
16:15 guest___ left #git
16:15 Gsham joined #git
16:17 kadoban Vampire0: Just for future reference, we don't really police the off-topic stuff in here very strongly. The one time it's supposed to pause/go-away is when it's interferring with actual on-topic conversation.
16:17 dreiss joined #git
16:19 SwiftMatt joined #git
16:20 ahrs joined #git
16:20 synthroid joined #git
16:20 tymczenko joined #git
16:22 jab416171 joined #git
16:22 thiago joined #git
16:23 durham joined #git
16:24 TbobbyZ joined #git
16:24 jeffreylevesque joined #git
16:25 Gustavo6046 joined #git
16:25 fahadash joined #git
16:28 gugah_ joined #git
16:29 OnBrokenWings joined #git
16:29 juvenal joined #git
16:29 Jyox2 joined #git
16:30 tarkus joined #git
16:32 Vampire0 kadoban, yeah, I know. But he expected to get a legal answer that he should ask a lawyer about and didn't get the first hint about it. ;-)
16:36 texasmynsted joined #git
16:37 dsdeiz joined #git
16:37 texasmynsted anybody have a link or otherwise know a quick way to create a patch or something for when I have a bunch of local modifications to files and want to create a patch or something from them all?  I need to rm and re-clone the git repo and would like to apply the local changes as a patch
16:37 texasmynsted The only thing I have come up with is to add the files to a tar ball and then copy them over after re-cloning
16:37 texasmynsted not a great soluion
16:38 tnecniv joined #git
16:38 ojacobson texasmynsted: `git diff` produces patch-friendly output in most cases, just to start, though binaries and mode bits will be lost
16:38 relipse__ left #git
16:38 ojacobson you can tar up the work tree (move .git aside first) - since git's snapshot-based that works fine
16:38 relipse joined #git
16:38 relipse I accidentally committed a file config/application.json that was supposed to be.a floater (just a file that sticks around all the time) how do I git it out of the branch back to a floater?
16:38 texasmynsted ah ok
16:39 ojacobson you likely don't actually need to "rm and re-clone" - that's rarely if ever necessary
16:39 synthroi_ joined #git
16:39 _ikke_ relipse: git rm --cached config/application.json
16:39 texasmynsted In this case I think there are bunch of bad files that are git ignored
16:40 synthroid joined #git
16:40 kfoonamalik joined #git
16:42 marcogmonteiro joined #git
16:44 MineCoins joined #git
16:44 Es0teric joined #git
16:46 darkbit joined #git
16:46 robotroll joined #git
16:47 JurassicJumper joined #git
16:47 JurassicJumper left #git
16:48 relipse _ikke_, thanks
16:48 d10n-work joined #git
16:55 regedit joined #git
16:57 aplghl joined #git
16:57 sz0 joined #git
16:58 cdown joined #git
17:00 aplghl left #git
17:01 dvaske joined #git
17:01 kexmex joined #git
17:01 Chuguniy joined #git
17:01 durham_ joined #git
17:01 shadow-x joined #git
17:02 Levex joined #git
17:03 thiago joined #git
17:04 rkazak joined #git
17:07 Gsham joined #git
17:08 TbobbyZ joined #git
17:08 synthroid joined #git
17:09 tymczenko joined #git
17:10 synthroi_ joined #git
17:11 dsdeiz joined #git
17:12 vls joined #git
17:19 gopar joined #git
17:20 aard joined #git
17:21 cahoots joined #git
17:22 raijin joined #git
17:24 DarsVaeda joined #git
17:24 cdown joined #git
17:25 DarsVaeda hi, I have a file I don't want to commit and push to master so I do -> git status (I see that file to be commited) -> git reset HEAD path/to/file -> git status (I see that file in "changes" not staged for commit) ->  git commit -> git push
17:25 DarsVaeda now my file is still committed and push to master
17:25 DarsVaeda why?
17:26 DarsVaeda why does it commit that file even though it says it does not commit it?
17:26 _ikke_ DarsVaeda: The previous version of that file has been pushed
17:27 DarsVaeda sorry I don't get that, the file was removed from master before
17:28 DarsVaeda I did a git pull before committing and pushing
17:28 jeffreylevesque joined #git
17:28 Ardethian joined #git
17:29 Rodya_ joined #git
17:31 clandestino joined #git
17:31 govg joined #git
17:32 TSS_ joined #git
17:34 justin2 joined #git
17:35 srcerer joined #git
17:36 gopar joined #git
17:37 _ikke_ DarsVaeda: if it says that there are changes that are not staged, it means the file is being tracked
17:38 DarsVaeda I see upon the initial git pull several files were removed but not that file in question...so does it mean it did not remove that file on git pull, then I reset that file but it pushed the version before that cause it did not remove the file upon git pull?
17:38 Cabanossi joined #git
17:39 _ikke_ there are uncomitted changes, git pull would fail when it would need to remove that file
17:39 _ikke_ But I don't think that file has been removed at all
17:39 DarsVaeda git pull did a fast-forward but doesn't mention that file at all
17:39 maarhart joined #git
17:40 DarsVaeda the file was removed, I'm pretty sure
17:40 _ikke_ where / when?
17:41 DarsVaeda in the master before I did the initial git pull
17:42 DarsVaeda my colleague deleted the whole folder, could I check if it was actually removed?
17:42 freimatz joined #git
17:43 Levex joined #git
17:43 porton joined #git
17:43 synthroid joined #git
17:44 _ikke_ git log --name-status
17:44 porton I have a repo A. I fork A to B, then I make some changes in A which should not be copied into B. Any further changes from A should go into B also. Please explain the right way to do this
17:46 lewiz joined #git
17:46 dsdeiz joined #git
17:46 dsdeiz joined #git
17:46 DarsVaeda _ikke_: ah you are right, for some reason just that file wasn't removed
17:46 raijin joined #git
17:51 jeffreylevesque joined #git
17:51 demize porton: You'll have to make the changes that shouldn't be pushed/pulled to B in a different branch then.
17:51 demize Or create a new branch without the changes that should end up in B before pushing/pulling into B.
17:51 jackrandom joined #git
17:51 porton demize: but I need all these changes (both to be pushed to B and not to pushed to B) in master of A
17:52 demize Okay?
17:52 demize I don't see how this changes anything about what I said.
17:52 Junior joined #git
17:53 demize Either you first make the changes that should be in B in a separate branch and merge that into master, or you make them on master and create a second branch and rebase that to not have the changes you don't want in B.
17:53 porton "You'll have to make the changes that shouldn't be pushed/pulled to B in a different branch then." I need both changes to be and not to be in B to be in master of A not a "different branch"
17:53 porton "first make the changes that should be in B in a separate branch and merge that into master" seems OK
17:53 duderonomy joined #git
17:53 demize The merging was sort of implied…
17:54 senaps joined #git
17:55 tymczenko joined #git
17:56 Exagone313 joined #git
17:56 LeBlaaanc joined #git
17:56 peacememories joined #git
17:58 Dougie187 joined #git
18:02 bilal joined #git
18:02 Gsham joined #git
18:05 shgysk8zer0 joined #git
18:07 Rodya_ so i'm trying to push my local commit to origin/master. the push rejected as my tags file was 130MB. i ran `git rm --cached tags; git commit -m 'rm tags file, exceeded upload size';`, then tried again. the push is still failing with the same error message
18:07 Rodya_ i'm not sure why
18:08 rudrab joined #git
18:08 jrm joined #git
18:09 bilal joined #git
18:09 bremner Rodya_: the file is still in your history
18:09 Rodya_ bremner: git filter-branch --index-filter 'git rm --cached tags' ?
18:10 sturner joined #git
18:10 hashtagstrashtag joined #git
18:10 bremner Rodya_: well, you have to be a bit careful see !rewrite
18:10 gitinfo Rodya_: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
18:11 Rodya_ bremner: single person repo, noone else will be pushing to it, ever
18:11 bremner Rodya_: and no-one is pulling either?
18:12 Rodya_ nope, just my portfolio site
18:12 bremner ok. then you're probably OK with filter-branch. Otherwise I'd try to rewrite only the non-pushed part of history
18:13 Rodya_ bremner: when i inevitably make this mistake on a multi-person repo, i should use the !rewrite ?
18:13 gitinfo bremner: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
18:13 qqx I'd probably just use interactive rebase to mark the rm commit as a fixup to the commit that added the file.
18:13 bremner yeah, something like that.
18:14 theoceaniscool joined #git
18:15 Rodya_ something like qqx's idea? i think i understand interactive rebase, but what would the command to do that be?
18:15 ozcanesen joined #git
18:15 darkbit joined #git
18:15 qqx Rodya_: `git rebase -i <commit that added tags>~` (note the trailing tilde).
18:16 senaps joined #git
18:16 qqx Then move the line with the commit that removed the tags file to the second line, and change the "pick" to "fixup" (or "squash")
18:16 qqx Squash if you want to change the commit message for that first commit.
18:17 vrishab joined #git
18:18 Gsham joined #git
18:18 rastos2 joined #git
18:19 Levex joined #git
18:19 Sasazuka joined #git
18:21 dsdeiz joined #git
18:21 TheSimonator joined #git
18:21 InfoTest joined #git
18:21 Bennux joined #git
18:22 Rodya_ qqx: commit A introduced tags, commit B removed it. the rebase edit is showing `pick A \n pick B`. should i delete A and squash B?
18:22 Masber_080 joined #git
18:23 qqx Leave the A line alone, change "pick B" to "squash B".
18:23 juvenal joined #git
18:24 Vasya666 joined #git
18:25 jtoy joined #git
18:26 cagomez joined #git
18:27 Rodya_ huh. i'm still getting the push rejected for the same reason
18:27 dedicated joined #git
18:29 jeffreylevesque joined #git
18:29 lagothri1 joined #git
18:29 juvenal joined #git
18:30 TheSimonator joined #git
18:31 FuzzyWuzzyPanda joined #git
18:32 radens left #git
18:33 caper joined #git
18:33 no_gravity joined #git
18:34 no_gravity I wish git had something like a reverse pull. So you could be in your repo and trigger what would happen if you pull from a remote repo.
18:35 raijin joined #git
18:35 caper i need to read a book on git
18:36 _ikke_ !book
18:36 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:36 caper is progit considered good?
18:36 caper lol
18:36 Snugglebash joined #git
18:36 _ikke_ no_gravity: It's pretty easy to reverse the last pull
18:36 no_gravity _ikke_: I don't want to reverse something. I want a real push.
18:36 _ikke_ (the merge part of it, that is)
18:37 _ikke_ Oh, now I get it
18:37 _ikke_ remote merging is never a good plan
18:37 no_gravity I want to be in /a/ and push to /b/ so that /b/ is in the state of /a/ afterwards.
18:38 Cabanossi joined #git
18:39 _ikke_ If you can push a branch to /b/, then that branch does have the same state as in /a/
18:39 no_gravity _ikke_: But not the working tree or whatever its called.
18:39 _ikke_ It is called the working tree
18:40 no_gravity _ikke_: /a/ is a directory. So is /b/.
18:40 no_gravity _ikke_: I always do "cd /b/; pull /a/; cd /a/". It's tedious.
18:40 _ikke_ Note that if you say push being a reverse pull, then the state might be different afterwards
18:41 _ikke_ no_gravity: what about: git -C /b/ pull?
18:41 _ikke_ no need to cd
18:41 dootele joined #git
18:41 sturner joined #git
18:42 no_gravity _ikke_: Nice! Good to know. Thanks.
18:42 _ikke_ no_gravity: but anyway, if you have a fairly recent version of git, there is also git config receive.denyCurrentBranch updateInstead
18:42 LeBlaaanc joined #git
18:43 _ikke_ and also the push-to-checkout hook
18:43 no_gravity _ikke_: That would stop git complaining, but the push would still not update the working tree.
18:43 jeffreylevesque joined #git
18:43 ojacobson incorrect
18:43 ojacobson that used to be true before updateInstead support
18:43 _ikke_ no_gravity: *updateInstead*
18:44 _ikke_ the value already says that it does somehting different
18:44 no_gravity _ikke_: Not sure what you mean.
18:44 _ikke_ no_gravity: what you said is correct when you set it to false
18:44 _ikke_ but there is a new value: updateInstead
18:45 no_gravity I see.
18:45 no_gravity How do I know if my git has it?
18:45 rwb joined #git
18:45 no_gravity And where is the documentation of it?
18:45 _ikke_ man git config
18:45 gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html
18:46 mehs joined #git
18:46 no_gravity By default, "updateInstead" will refuse the push if the working tree or the index have any difference from the HEAD, but the push-to-checkout hook can be used to customize this.
18:46 no_gravity Hmm...
18:46 no_gravity Sounds complicated.
18:47 meLon joined #git
18:47 _ikke_ no_gravity: it's introduced in v2.3.0
18:47 no_gravity git -C pull seems easier.
18:47 jab416171 joined #git
18:48 _ikke_ :-)
18:49 _ikke_ also considered something like rsync?
18:49 _ikke_ (I use that to syncronize changes remotely)
18:49 no_gravity That does not have all the whistles of git.
18:49 no_gravity Would not notice conflicts etc.
18:50 __main__ joined #git
18:50 no_gravity I think git -C pull is pretty perfect.
18:51 ExoUNX joined #git
18:51 _ikke_ alright
18:52 raijin joined #git
18:54 rastos3 joined #git
18:55 dsdeiz joined #git
18:55 dsdeiz joined #git
18:57 ForeignBiscuit joined #git
18:58 svm_invictvs joined #git
18:59 Es0teric joined #git
19:00 SwiftMatt joined #git
19:01 MattMaker joined #git
19:01 synthroid joined #git
19:04 peacememories joined #git
19:05 senaps joined #git
19:06 digidog joined #git
19:07 peacememories joined #git
19:07 tymczenko joined #git
19:08 hhee joined #git
19:10 fahadash joined #git
19:10 sturner joined #git
19:11 LAGonauta joined #git
19:11 Jimbo77 joined #git
19:13 DammitJim joined #git
19:13 DammitJim if I did a git.init shared=group
19:14 DammitJim that will allow for the git repo to be accessible to users in that group, right?
19:14 LAGonauta left #git
19:14 boubou joined #git
19:15 sturner joined #git
19:18 MarioBranco joined #git
19:21 LordRyan DammitJim: `git init --shared=group` makes files writable
19:22 DammitJim LordRyan, I have been asked to give other users access to the git repository
19:22 DammitJim so, right now, the git repo is used by an app called Looker, which connects to git over ssh with a key for the user git
19:22 peepsalot joined #git
19:23 ronskisika joined #git
19:23 DammitJim apparently I need to give access to developers so that they can connect to git via their IDEs with their own credentials
19:23 ojacobson Read-only, I hope?
19:23 LordRyan if you add an ssh key to the git user for each of the developers that should work.
19:23 ojacobson r/w to a shared repository is a disaster unless everyone involved has a good grasp of umask and file ownership and permissions
19:23 DammitJim ojacobson, it should be read-only, right?
19:24 ronskisika joined #git
19:24 DammitJim they have no idea
19:24 DammitJim they don't even know what they want
19:24 ojacobson if you just want it to be read-only you only need to make sure the files are owned by a group the users are in, and that the files are +r (and directories +rx) for that group
19:24 ojacobson the core.shared property can automate some of that
19:24 ojacobson er core.sharedRepository (which is what git init --shared sets)
19:25 ojacobson --shared=group will make the repo group-writeable, which doesn't sound like what you want
19:25 DammitJim thanks
19:25 DammitJim I gotta read some more on this stuff, but your answer helps
19:25 ojacobson man git-config
19:25 gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html
19:25 ojacobson the docs for core.sharedRepository have an example
19:26 jepler DammitJim: does each developer have their own unix user on this system where you are trying to share a repository?
19:26 DammitJim it's a user via domain account
19:26 DammitJim so, yes
19:26 lewiz joined #git
19:26 jepler and they share a UNIX group?
19:27 DammitJim no
19:27 jepler for core.shared to make sense, they have to share a UNIX group
19:27 DammitJim it's strange, they want me to create 1 repo that is accessible by Looker and 1 user
19:27 DammitJim then another repo accessible by Looker and another user
19:27 DammitJim repeat 3 times
19:27 TbobbyZ_ joined #git
19:28 borkr joined #git
19:28 lewix joined #git
19:29 jepler DammitJim: it sounds unusual, perhaps Looker has some documentation that would be illuminating for why it is that way and how to set it up?
19:29 DammitJim jepler, nah, I think the other team doesn't understand what they want
19:29 DammitJim I'll talk with them again, but I want to say that they want to be able to "browse" the repo they "own" but manage through looker
19:29 DammitJim does that make sense?
19:30 jepler maybe you need something like gitolite which lets you manage access to repositories depending on ssh public keys
19:30 dsdeiz joined #git
19:30 dsdeiz joined #git
19:30 jepler beats me and I'm trying really hard to not learn what "looker" is in the course of talking to you about this
19:30 DammitJim yeah, that was going to be my next question
19:30 DammitJim gitolite... seems like it can do what I want
19:31 DammitJim thanks though... again, just talking about it is very helpful
19:31 jepler disclaimer: I've never used gitolite
19:31 dave0x6d joined #git
19:31 DammitJim geez man, have you used anything? ;)
19:31 matt|home joined #git
19:31 synthroi_ joined #git
19:31 jepler yeah but it's all 90s software
19:31 DammitJim a huge THANKS to jepler ojacobson LordRyan
19:32 ojacobson +1 use gitolite
19:32 feodoran joined #git
19:32 rudrab joined #git
19:32 ojacobson or at least experiment with it
19:32 _ikke_ 6gitolite++
19:33 matt|home hello.. i am very confused regarding git/github and have many questions.. first: repos are basically directories you keep files in right, and the 'master' branch is the main directory like root? i don't quite understand how branches work if that's the case..
19:34 _ikke_ a repository is mostly a history of commits
19:34 matt|home right with the modification ledger or whatever.. but it's equivalent to a directory ?
19:34 jepler matt|home: no, branches are not directories/folders.  A branch like "master" may have many directories inside it containing many files
19:34 _ikke_ github is a commerical company selling hosted git repositories, but is not affiliated with git
19:35 matt|home im just using the free stuff now, i kinda need to know this for work.. but it's confusing
19:36 matt|home jepler - okay .. hang on actually lemme back up..
19:36 _ikke_ !book
19:36 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
19:36 ForeignBiscuit joined #git
19:36 _ikke_ It's probably easier if you'd read that a bit
19:37 Rodya_ joined #git
19:37 matt|home okay..
19:38 _ikke_ a branch is a sideline of history, that later can be merged back in
19:38 _ikke_ branching can happen either explicitly, or implicitly
19:38 jepler matt|home: do you come from a SVN background?  They used directories in an interesting way to implement tags and branches, but git's way of implementing tags and branches is different than SVN.
19:39 matt|home no, this is the first time im doing version control or whatever you call it.. all of my old projects were too small to bother, but im working with other people now and they're all using this
19:39 _ikke_ matt|home: perhaps !parable
19:39 gitinfo matt|home: 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2009/05/19/the-git-parable.html
19:39 matt|home thanks..
19:39 ojacobson in git, a repository is a collection of commits, and a bunch of names for those commits (and, sometimes, also a work tree with copies of the committed files in it)
19:40 _ikke_ It tries to explain version control in general
19:40 ojacobson a commit is a complete snapshot of your project, plus data describing what commits come before it
19:40 Rodya_ joined #git
19:40 ojacobson a branch is a moving label for a commit; master is a branch
19:41 matt|home i think the majority of my confusion stemmed from keeping up to date with changes made in github.. for example if i created a new repo on the site and i ran 'git status' on my computer it would say everything is up to date
19:41 Vampire0_ joined #git
19:41 bongo joined #git
19:41 _ikke_ there is no automatic communication between your pc and github
19:42 matt|home right.. so if i make changes on my computer i have to tell github, and if i make changes on github i have to tell my computer basically ?
19:42 Random832 also, it's per repository, there's no way to "check what repositories exist"
19:42 Random832 so you'd have to clone. for changes within a repository, git fetch before status
19:42 Random832 and i don't think there's any way to have github know about what's on your computer
19:43 matt|home well i mean you 'push' changes to the repos right?
19:43 Random832 yes
19:43 Random832 but then it's on github
19:43 Random832 github knows what's on github
19:43 _ikke_ matt|home: git is distributed
19:43 Raging_Hog joined #git
19:43 matt|home Random832 - okay. aha, yes i did have one specific question i was hoping one of you could help with.. i made a typo earlier, and when i do 'git fetch' it's showing me "github.org" instead of .com , where can i edit this mistake?
19:43 Es0teric joined #git
19:44 Random832 git remote set-url [whatever remote name probably origin] [the new url]
19:44 _ikke_ git remote -v
19:44 matt|home ahh. thank you
19:44 matt|home thanks guys
19:44 Random832 yeah git remote -v to get the list and current one
19:45 zeroed joined #git
19:46 nebodka joined #git
19:47 PaulCapestany joined #git
19:48 ResidentBiscuit joined #git
19:48 nevodka_ joined #git
19:48 senaps joined #git
19:50 synthroid joined #git
19:52 TbobbyZ joined #git
19:52 madewokherd` joined #git
19:52 senaps joined #git
19:53 Cabanossi joined #git
19:55 sonOfRa joined #git
19:59 hobodave_ joined #git
20:01 hobodave_ joined #git
20:02 mkoskar joined #git
20:02 lavenders joined #git
20:03 chipotle joined #git
20:05 dsdeiz joined #git
20:06 Tobbi joined #git
20:09 senaps joined #git
20:10 cdg joined #git
20:12 senaps joined #git
20:15 pfloyd joined #git
20:15 _Vi joined #git
20:15 pfloyd I can't seem to find the command to show where a particular subtree is pointing? is there a way to see where a subtree was pointed with "git subtree add" after the fact?
20:16 ascarter joined #git
20:16 User458764 joined #git
20:21 dreiss joined #git
20:21 gugah joined #git
20:23 jjasinski joined #git
20:25 cust joined #git
20:26 synthroi_ joined #git
20:26 SwiftMatt joined #git
20:26 qbolt left #git
20:27 LeBlaaanc joined #git
20:27 tarkus joined #git
20:28 julia_c pfloyd: not sure what you're looking for, but git submodule add adds some special git-subtree-* trailers in the initial commit message
20:28 cdg joined #git
20:30 pfloyd if I do a "git subtree pull -P foo" how do I figure out where the subtree for the foo prefix comes from? I.e. what path is it pulling from?
20:33 duderono_ joined #git
20:33 lavenders joined #git
20:34 vuoto joined #git
20:38 julia_c I'm confused by the question.
20:38 julia_c What do you mean by: what path it's pulling from?  Do you mean which repository and ref?
20:39 julia_c 'git subtree pull -P foo' isn't a complete command
20:39 dsdeiz joined #git
20:40 gottcha joined #git
20:41 Es0teric joined #git
20:43 jcay left #git
20:44 Atm0spher1c joined #git
20:44 Gustavo6046 joined #git
20:45 Es0teric joined #git
20:45 livingstn joined #git
20:50 adonis joined #git
20:50 Es0teric joined #git
20:50 govg joined #git
20:50 livingstn joined #git
20:50 adonis hi.. all so I wanted to get some details on the rule on never rebasing public remote branches..
20:51 adonis in my case my branch has forks.. but only myself on as the main committer.. is a rebase still a bad thing in this case?
20:51 movesi joined #git
20:51 adonis the branch doesnt have forks.. the main repo has forks.. and other users have commits on top of the branch in their own public repos
20:57 cagomez joined #git
20:58 Random832 other users having commits on top of it is basically the scenario that causes the problem
20:58 satifant joined #git
20:58 Random832 you can't rebase their stuff, so it will still be on top of the original head.
20:59 Random832 i mean it's your repo do what you want, but it will cause annoyances for your users (whether or not their stuff is in public repos)
21:01 adonis Random832: in that case can't they just do a rebase on my newly rebased branch
21:01 adonis ?
21:01 Random832 they can
21:01 Random832 but they might be annoyed that they have to
21:01 adonis :)
21:01 Random832 especially if their stuff is more complex than just a linear series of commits
21:02 todd_dsm joined #git
21:02 Random832 or they could just merge and their history will have both the original and rebased version in it in a diamond-shaped graph
21:02 Random832 which is also annoying
21:03 Random832 ultimately the rule against changing history isn't really about something that will hard-break, it's about something that'll just make everything more complex and annoying sometimes
21:03 adonis hmm ok..
21:03 Random832 (though if you're rebasing to *remove* something, it may not be removed for them)
21:04 Snugglebash joined #git
21:04 griff_ joined #git
21:04 Snugglebash joined #git
21:05 adonis if i have a 2.0.0 develop branch for example that is public then im assuming the general guideline is to do merges with master
21:05 adonis because even if I'm the only dev on the repo.. others can be forking and applying patches in their repos to my 2.0.0
21:05 Snugglebash joined #git
21:05 adonis merges with master when master diverges obviously
21:06 Snugglebash joined #git
21:07 adonis a rebase would require a push force and hence the annoyances :) for the forkers to reapply their commits lol
21:07 Snugglebash joined #git
21:07 borkr joined #git
21:07 disi joined #git
21:08 Snugglebash joined #git
21:08 griff_ joined #git
21:08 brent__ joined #git
21:08 brent__ joined #git
21:09 Snugglebash joined #git
21:09 griff_ left #git
21:09 Snugglebash joined #git
21:10 Snugglebash joined #git
21:12 Acerific joined #git
21:12 Acerific joined #git
21:13 nevodka joined #git
21:14 jtoy joined #git
21:14 shgysk8zer0 joined #git
21:14 dsdeiz joined #git
21:14 dsdeiz joined #git
21:14 Rodya_ joined #git
21:16 NightMonkey joined #git
21:17 cagomez joined #git
21:17 livingst_ joined #git
21:18 jarnos joined #git
21:19 cads2 joined #git
21:20 ahf joined #git
21:21 bdonnahue joined #git
21:21 jarnos Why do I have similar commits 2 times in the list after merging? https://pastebin.ubuntu.com/24475315/
21:22 ojacobson left #git
21:22 ojacobson joined #git
21:22 lavenders joined #git
21:23 Tobbi joined #git
21:23 _ikke_ jarnos: Looks like master already contained these commits before the merge
21:24 jagob joined #git
21:24 mattcen joined #git
21:25 JanC_ joined #git
21:27 askb joined #git
21:27 _ikke_ things like rebase / cherry-picking may cause this
21:27 tyreld joined #git
21:29 jarnos _ikke_, I thougth master was the commit before "Use columns with dialog and apply to whiptail, too.", so I still do not get why the duplicates are shown.
21:30 _ikke_ master was  87eaaa3 Improve checking of interactive selections in run_fix before the merge
21:33 mjuszczak joined #git
21:36 nd_ joined #git
21:36 jarnos _ikke_, actually I already was confused that the merge produced conflicts.
21:38 rkazak joined #git
21:40 lavenders joined #git
21:42 User458764 joined #git
21:42 cagomez joined #git
21:44 lavenders joined #git
21:44 onlyanegg joined #git
21:46 anuxivm joined #git
21:46 mattcen joined #git
21:47 Snugglebash joined #git
21:48 Snugglebash joined #git
21:48 Snugglebash joined #git
21:49 dsdeiz joined #git
21:49 dsdeiz joined #git
21:49 gopar joined #git
21:50 Snugglebash joined #git
21:50 Snugglebash joined #git
21:51 Snugglebash joined #git
21:52 Snugglebash joined #git
21:52 lavenders1 joined #git
21:52 Snugglebash joined #git
21:53 Xenophon1 joined #git
21:53 Cabanossi joined #git
21:53 Snugglebash joined #git
21:54 Snugglebash joined #git
21:55 Snugglebash joined #git
21:55 ascarter joined #git
21:56 Snugglebash joined #git
21:56 Snugglebash joined #git
21:57 Qria left #git
21:57 nowhereman joined #git
21:58 mattcen joined #git
22:02 TheSimonator joined #git
22:02 dreiss joined #git
22:04 kadoban joined #git
22:06 Dougie187 left #git
22:07 chipotle joined #git
22:08 Primer left #git
22:08 Sonderblade joined #git
22:09 pfloyd julia_c: yes, if I have a repo X that contains a subtree to repo Y how do I find what "Y" is from a clone of X?
22:11 sturner joined #git
22:15 MrWoohoo joined #git
22:15 pfloyd julia_c: in other words, when someone ran "git subtree add --prefix foo ......"  how do I find out what the rest of the args were?
22:15 linux-modder_ joined #git
22:17 oprypin joined #git
22:19 dsdeiz joined #git
22:19 dsdeiz joined #git
22:19 safe joined #git
22:21 cjohnson !list
22:21 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
22:21 cjohnson So I'm getting around to submitting my possible bug
22:22 cjohnson what's the format here, is there a standard bug report format?
22:24 YuGiOhJCJ joined #git
22:26 _W_ joined #git
22:30 Achylles joined #git
22:32 FuzzyWuzzyPanda joined #git
22:35 Guest55823 joined #git
22:36 mjuszczak joined #git
22:36 _ng joined #git
22:36 gopar joined #git
22:37 ertes joined #git
22:38 TikityTik joined #git
22:38 gopar joined #git
22:43 XenophonF joined #git
22:43 jast cjohnson: no
22:43 aard joined #git
22:43 cjohnson thanks
22:46 shinnya joined #git
22:46 kristofferR joined #git
22:46 peterbecich joined #git
22:49 Aaei1 joined #git
22:56 peepsalot joined #git
23:02 peterbecich joined #git
23:05 raspado joined #git
23:05 dirtyroshi_ joined #git
23:07 User458764 joined #git
23:10 tnecniv joined #git
23:11 dsdeiz joined #git
23:16 Oatmeal joined #git
23:16 madewokherd joined #git
23:17 wcstok joined #git
23:18 cqi joined #git
23:19 dhollinger joined #git
23:20 druonysus_ joined #git
23:23 nebodka joined #git
23:25 netj joined #git
23:26 peterbecich joined #git
23:28 MarioBranco joined #git
23:29 snthsnth joined #git
23:30 livingstn joined #git
23:31 druonysus_ joined #git
23:31 SReject joined #git
23:32 _rgn joined #git
23:32 _rgn joined #git
23:33 juvenal joined #git
23:35 Es0teric joined #git
23:39 feodoran joined #git
23:40 dsdeiz joined #git
23:40 dsdeiz joined #git
23:42 Es0teric ok i have a question
23:42 Es0teric i am merging two branches but i want the minimal changes from one branch to go to the one thats being merged int
23:42 Es0teric *into
23:44 Vampire0 Es0teric, I didn't really understand what you mean, can you rephrase the question?
23:45 Puffball joined #git
23:46 brent___ joined #git
23:47 ToBeCloud joined #git
23:48 glebihan_ joined #git
23:49 chipotle joined #git
23:49 Es0teric Vampire0 ok so i have two branches... (AMAL-USRL, AMAL-ENG) now... AMAL-USRL has all of the login stuff that i have built and AMAL-ENG has all of the database/controller based stuff that the engine is built on.. right now there are a lot of conflicts that prevent a clean merge... what is the best way to approach this given the fact that one branch was more outdated than the other but upgraded to roughly the same framework version
23:51 Es0teric Vampire0 and the branch in question for being outdated is AMAL-USRL
23:52 dre_ joined #git
23:53 Xenophon1 joined #git
23:53 Vampire0 Es0teric, I still don't know what you meant by "minimal changes"
23:53 TbobbyZ_ joined #git
23:54 Es0teric Vampire0 what is it that you want to know specifically
23:54 Vampire0 Es0teric, if you merge, then all commits that are not yet in the target branch are merged into the target branch
23:54 Es0teric Vampire0 thats the problem
23:54 Es0teric Vampire0 when i branched, i branched both off master so they have the same base
23:54 Es0teric but as i created the..
23:54 Es0teric wait
23:55 Es0teric i think as im talking to you i figured it out.. im just going to redo the damn login on the engine
23:55 Es0teric no choice
23:56 Vampire0 Es0teric, where is the problem? If USRL is based off @~10 and ENG is based off @~5, then merge USRL into ENG and you should get the desired result I think
23:56 FuzzyWuzzyPanda joined #git
23:56 Es0teric Vampire0 no
23:56 Es0teric its worse than that
23:57 Es0teric Vampire0 are you familiar with laravel?
23:57 Vampire0 no
23:57 Vampire0 sounds like candy
23:57 Es0teric ok so laravel had a version change
23:57 Es0teric its a PHP framework
23:58 Vampire0 ok
23:58 Es0teric but USRL was in 4.2 then i upgraded it to 5.1 i think...
23:59 Es0teric Vampire0 so.. because of that there were a lot of things lost in translation.. that was going to be all one commit

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