Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-12

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

All times shown according to UTC.

Time Nick Message
00:02 govg joined #git
00:03 exotime joined #git
00:03 miha_S7_ joined #git
00:04 polyrob_ joined #git
00:06 thebope joined #git
00:07 cliluw Is there any revision notation to specify the latest revision that starts with the given hash?
00:08 cliluw Here's my use case. I usually want to inspect a commit. Being lazy, I usually just type the first few characters like "git show 9d88". However, I nearly always get "error: short 9d88 is ambiguous".
00:08 jim you mean like if the hash were 123456789, you want a notation that specifies all hashes (including that one) that starts with 123?
00:09 cliluw jim: No, I want to get the commit that's latest.
00:09 rchavik joined #git
00:09 jim so, of all commits that start with 123, you want the one with the latest timestamp?
00:09 cliluw There's several other commits in my repo that start with "9d88" but they were all made years ago. I don't care about those.
00:09 cliluw jim: Yes!
00:10 jim ok, I dunno how to do that, but at least I know exactly what you want :)
00:11 jim (and so do others whose clients are here)
00:11 cliluw jim: Haha, no big deal. I'm sure somebody will come along with some arcane notation that will do what I want.
00:11 SkyPatrol joined #git
00:12 fstd_ joined #git
00:16 scoobertron joined #git
00:19 njbair joined #git
00:29 valhala_22 joined #git
00:30 dermoth joined #git
00:31 valhala_22 joined #git
00:31 cliluw joined #git
00:34 Kaisyu joined #git
00:37 exotime joined #git
00:38 b0nn joined #git
00:38 b0nn hrm, I've been reading the pro-git book; and I'm EXTREMELY pleased that I have done so
00:39 b0nn I want to somehow show my appreciation (in the form of money) but I don't want to buy a dead tree, and I cannot find a donate button on the site
00:39 b0nn any ideas?
00:40 ribasushi joined #git
00:40 acidvegas joined #git
00:40 acidvegas [08:16] < acidvegas> if i change my git config emil to @users.noreply.github.com
00:40 acidvegas [08:16] < acidvegas> do i have to make a new pgp key that uses that email instead
00:40 acidvegas [08:16] < acidvegas> im trying to keep my email private and my last pgp key was using my account email and not the user.noreply
00:40 acidvegas [08:16] < acidvegas> email
00:42 livingstn joined #git
00:43 h12o joined #git
00:44 valhala__ joined #git
00:46 cam27 joined #git
00:50 ozcanesen joined #git
00:50 grock_ joined #git
00:50 valhala_22 joined #git
00:55 kadoban_ acidvegas: You're using this PGP for what? Signed commits?
00:55 kyan joined #git
00:55 fatalhalt joined #git
00:56 dstw joined #git
00:56 dstw joined #git
00:57 Marumarsu joined #git
00:58 acidvegas kadoban_: yeah
00:59 kadoban_ acidvegas: And have you published this PGP key in any of the usual places? I think you usually associate it with an email address
00:59 simon816 joined #git
01:00 bronson joined #git
01:00 thebope joined #git
01:00 dsdeiz joined #git
01:00 dsdeiz joined #git
01:01 acidvegas [08:56] < kadoban_> acidvegas: And have you published this PGP key in any of the usual places? I think you usually associate it with an email address
01:01 bremner b0nn: you could donate to https://sfconservancy.org/projects/current/ ; at least sfc is mentioned on the pro git page
01:01 acidvegas the key has my real email on it
01:01 acidvegas and its attached to my github account
01:01 acidvegas its what i used to sign all my commits
01:01 acidvegas i just changed the email with git config tot he noreply github email
01:01 acidvegas but its giving me
01:01 acidvegas [08:47] < acidvegas> remote: error: GH007: Your push would publish a private email address.
01:01 acidvegas [08:47] < acidvegas> remote: You can make your email public or disable this protection by visiting:
01:01 acidvegas [08:47] < acidvegas> remote: http://github.com/settings/emails
01:01 acidvegas this
01:01 acidvegas still
01:02 kadoban_ I don't think you attach PGP keys to github accounts any way I've ever seen. But I guess you'd need to.
01:02 b0nn bremner: thanks, yeah I don't mind if they were to say "Donate to foo in our name", so in the abscence of any other recommendations I'll probably send something to sfc
01:02 kadoban_ It's helpful if you use a pastebin, like gist.github.com to paste multiple lines by the way. That github error sounds like it tells you what you need to do, though I can't say I've ever tried to hide my email on github so I don't know how successful you'll be.
01:03 finalbeta joined #git
01:07 Uneliasmarsu joined #git
01:08 watabou joined #git
01:09 acidvegas [08:59] < kadoban_> I don't think you attach PGP keys to github accounts any way I've ever seen. But I guess you'd need to.
01:09 acidvegas yes you do
01:09 acidvegas its for
01:09 telephone joined #git
01:09 telephone joined #git
01:09 acidvegas singing commits
01:09 acidvegas signing*
01:10 valhala_22 joined #git
01:10 acidvegas you dont have to sign commits but it offers insurance to people knowing the commit came from you
01:10 kadoban_ Fairly obviously I know of that possibility, since I mentioned it above. I wouldn't call that attached to a github account.
01:12 acidvegas I mean you store your pgp key inside the github account
01:12 acidvegas so it kind of is
01:13 kadoban Anyway, yes I'd say if you really want to hide your email address, you'll probably need a new PGP key. I would imagine you'll have to remove the signatures from any commits you're still publishing as well, or resign them.
01:14 acidvegas yeah gonna try that now
01:15 Wulf4 joined #git
01:16 Masber joined #git
01:18 qlkzy joined #git
01:18 brent__ joined #git
01:22 rominronin joined #git
01:24 cliluw joined #git
01:25 NeverDie joined #git
01:33 miha_S7_ joined #git
01:33 thiago joined #git
01:33 sunri5e joined #git
01:37 hashtagstrashtag joined #git
01:38 ekinmur joined #git
01:40 TbobbyZ joined #git
01:41 gugah joined #git
01:41 durham joined #git
01:49 ilbot3 joined #git
01:49 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.13.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:49 cqi joined #git
01:50 duderonomy joined #git
01:51 patarr joined #git
01:54 thebope joined #git
01:57 TheSimonator joined #git
01:59 roelmonnens joined #git
02:00 d^sh joined #git
02:01 marianina8 joined #git
02:02 marianina8 joined #git
02:03 VGfreak4 joined #git
02:04 sarri joined #git
02:04 sarri joined #git
02:10 xall_ joined #git
02:10 durham joined #git
02:11 lagothri1 joined #git
02:15 dendazen joined #git
02:19 aw1 joined #git
02:21 juvenal joined #git
02:23 Cabanossi joined #git
02:25 ojdo joined #git
02:27 menip joined #git
02:28 cyphase joined #git
02:32 a_thakur joined #git
02:33 telephone joined #git
02:33 telephone joined #git
02:34 hexagoxel joined #git
02:36 Bhootrk_ joined #git
02:37 Vortex34 joined #git
02:38 safe joined #git
02:40 ekinmur joined #git
02:40 TikityTik joined #git
02:43 om_henners joined #git
02:48 thebope joined #git
02:50 jameser joined #git
02:51 TikityTik joined #git
02:54 QwertyDragon joined #git
02:55 Goplat joined #git
02:56 dreiss joined #git
02:57 cyphase joined #git
02:58 chachasmooth joined #git
02:58 navidr joined #git
03:00 marianina8 joined #git
03:01 bronson joined #git
03:02 miha_S7_ joined #git
03:04 dsdeiz joined #git
03:07 caper joined #git
03:09 Hunter1_ joined #git
03:12 netj joined #git
03:12 Bhootrk_ joined #git
03:21 amrits joined #git
03:21 aavrug joined #git
03:29 netj joined #git
03:30 FuzzyWuzzyPanda joined #git
03:31 basdb joined #git
03:36 Cabanossi joined #git
03:37 juvenal joined #git
03:37 Rodya_ joined #git
03:42 thebope joined #git
03:43 TbobbyZ joined #git
03:44 a_thakur joined #git
03:45 finalbeta joined #git
03:46 a_thakur_ joined #git
03:46 ZyX-I joined #git
03:48 roelmonnens joined #git
03:49 xall_ joined #git
03:51 hanthings_ joined #git
03:51 finalbeta joined #git
03:54 rominronin joined #git
04:01 karols146 joined #git
04:01 cyphase joined #git
04:02 Bhootrk_ joined #git
04:02 nandi_ge___ joined #git
04:04 cahoots joined #git
04:06 durham joined #git
04:06 valhala_22 joined #git
04:08 watabou joined #git
04:10 darkbit joined #git
04:11 Bhootrk_ joined #git
04:11 Andrew_K joined #git
04:13 Raging_Hog joined #git
04:21 nd joined #git
04:31 patarr joined #git
04:33 miha_S7_ joined #git
04:36 Cabanossi joined #git
04:36 thebope joined #git
04:42 _ikke_ acidvegas: You can add a new uid to the key
04:42 _ikke_ and remove the old one
04:44 ayogi joined #git
04:46 valhala_22 joined #git
04:48 sea-gull joined #git
04:54 tarkus joined #git
04:55 freimatz joined #git
04:55 fluffystub joined #git
04:57 rominronin joined #git
04:57 Mutter joined #git
04:58 m4sk1n joined #git
04:58 Macaveli joined #git
04:59 govg joined #git
04:59 Guest54446 joined #git
05:00 User458764 joined #git
05:00 h12o joined #git
05:00 User458764 joined #git
05:01 Guest54446 * branch            HEAD       -> FETCH_HEAD fatal: refusing to merge unrelated histories
05:01 Guest54446 What to do?
05:02 bronson joined #git
05:02 Guest54446 $ git merge https://github.com/mozilla-mobile/focus-android --allow-unrelated-histories
05:02 Guest54446 merge: https://github.com/mozilla-mobile/focus-android - not something we can merge
05:04 nomad101 joined #git
05:06 dec0n joined #git
05:06 valhala_22 joined #git
05:09 xall_ joined #git
05:09 _ikke_ Guest54446: You need to add it as a remote
05:09 _ikke_ and then fetch
05:09 watabou joined #git
05:09 davidomanfredo joined #git
05:10 _ikke_ why are you trying to merge that
05:10 _ikke_ ?
05:10 valhala_22 joined #git
05:11 valhala__ joined #git
05:11 Guest54446 I was trying to update the clone
05:12 brent__ joined #git
05:13 schleppel joined #git
05:13 acidvegas [12:39] < _ikke_> acidvegas: You can add a new uid to the key
05:13 acidvegas [12:39] < _ikke_> and remove the old one
05:14 acidvegas fixed the problem by making a new key and added it to my github
05:14 acidvegas using the new email on the key
05:14 D630 joined #git
05:15 valhala__ joined #git
05:16 d^sh joined #git
05:19 tunekey joined #git
05:24 xall_ joined #git
05:25 Guest54446 $ git pull https://github.com/mozilla-mobile/focus-android --allow-unrelated-histories
05:25 Guest54446 From https://github.com/mozilla-mobile/focus-android
05:25 Guest54446 * branch            HEAD       -> FETCH_HEAD
05:25 Guest54446 Auto-merging README.md
05:25 Guest54446 CONFLICT (add/add): Merge conflict in README.md
05:25 Guest54446 Automatic merge failed; fix conflicts and then commit the result.
05:28 mohabaks joined #git
05:29 Guest54446 $ git checkout
05:29 Guest54446 README.md: needs merge
05:29 Guest54446 error: you need to resolve your current index first
05:30 dsdeiz joined #git
05:30 dsdeiz joined #git
05:30 thebope joined #git
05:32 stana joined #git
05:34 lordjancso joined #git
05:34 valhala_22 joined #git
05:34 boombatower joined #git
05:36 Cabanossi joined #git
05:36 roelmonnens joined #git
05:36 sbulage joined #git
05:37 valhala_22 joined #git
05:38 overlord_tm joined #git
05:40 acetakwas joined #git
05:41 diogenese joined #git
05:47 kharloss joined #git
05:47 xall_ joined #git
05:51 GGMethos joined #git
05:54 Karazhan joined #git
05:55 Rodya_ joined #git
05:57 dhollinger joined #git
05:58 pharma_joe joined #git
06:00 valhala_22 joined #git
06:00 dermoth joined #git
06:00 sea-gull joined #git
06:03 xall joined #git
06:03 miha_S7_ joined #git
06:03 valhala_22 joined #git
06:04 j08nY joined #git
06:04 User458764 joined #git
06:04 imack joined #git
06:05 Raging_Hog joined #git
06:10 xall_ joined #git
06:10 watabou joined #git
06:10 rscata joined #git
06:11 rkazak joined #git
06:12 lindenle joined #git
06:12 indistylo joined #git
06:13 dreiss joined #git
06:13 tvw joined #git
06:14 davidomanfredo joined #git
06:16 kurdzman joined #git
06:17 JeroenT joined #git
06:22 valhala_22 joined #git
06:22 visual >tfw
06:22 visual >git
06:23 ppang joined #git
06:23 chele joined #git
06:24 theoceaniscool joined #git
06:24 roelmonnens joined #git
06:24 thebope joined #git
06:25 roelmonnens joined #git
06:26 Hunter1_ joined #git
06:27 JeroenT joined #git
06:29 JeroenT joined #git
06:29 rominronin joined #git
06:31 freimatz joined #git
06:32 patarr joined #git
06:35 albel727 joined #git
06:37 Silmarilion joined #git
06:39 valhala_22 joined #git
06:39 pierre365 joined #git
06:39 pierre365 hi!
06:40 rominronin joined #git
06:41 pierre365 i have a simple git question. Let's say I work with some people on a git repository which tracks the .gitignore file. I modified this file and another file A. I would like than whenever I push something to the server, this change to .gitignore and to A (not other changes for the same file) be ignored. Is this possible in a **simple** way please?
06:41 cdown joined #git
06:42 patarr joined #git
06:48 h12o joined #git
06:48 dermoth joined #git
06:52 elect joined #git
06:54 JeroenT joined #git
06:55 om_henners joined #git
06:56 Rodya_ joined #git
06:56 flaviodesousa joined #git
06:57 Vampire0 pierre365, no, this is not possible at all. A tracked file is a tracked file is a tracked file. you cannot ignore changes to it. For the .gitignore, you can use .git/info/exclude instead though, or ~/.gitignore
06:57 tarkus joined #git
07:00 cdown_ joined #git
07:03 bronson joined #git
07:04 roelmonn_ joined #git
07:05 Tobbi joined #git
07:10 pierre365 Vampire0: thanks for the help. kind of bad though :/ let's say i change some software to make it easier to run with my environment, but i don't want to have those changes upstreams... what is the proper way to deal witht that please?
07:11 watabou joined #git
07:13 lb1c joined #git
07:13 TomyWork joined #git
07:16 dsdeiz joined #git
07:16 dsdeiz joined #git
07:17 lindenle joined #git
07:18 netroxen joined #git
07:19 thebope joined #git
07:21 acidvegas joined #git
07:21 dersand joined #git
07:23 murii_ joined #git
07:23 JeroenT joined #git
07:24 djb-irc joined #git
07:25 jzeus joined #git
07:27 bronson joined #git
07:27 lb1c joined #git
07:28 brent__ joined #git
07:28 adac joined #git
07:28 adac If I checked out a commit
07:28 adac how can i go back to the HEAD again?
07:29 adac currently it says: HEAD detached at 2e3644d
07:29 adac but i want simply to go back to my master last commit
07:29 grawity git checkout master
07:30 Ramunas joined #git
07:30 adac grawity, ah ok simply that :)
07:30 adac thanks
07:32 sea-gull joined #git
07:32 roelmonnens joined #git
07:32 qt-x joined #git
07:33 bfig joined #git
07:33 miha_S7_ joined #git
07:33 kharloss joined #git
07:33 _ikke_ adac: You can also use git checkout - to go back to the previous branch/commit you checked out
07:33 MineCoins joined #git
07:35 manuelschneid3r joined #git
07:35 osse adac: btw, you cannot go "back to the HEAD" because HEAD is by definition where you are
07:35 indistylo joined #git
07:35 djb-irc joined #git
07:35 adac Ok I see. Thanks _ikke_ and osse ! :)
07:36 psofa joined #git
07:36 adac Guys out of curiosity which one of you is Linus Torvalds?
07:36 adac :)
07:36 osse I am
07:36 kelvah joined #git
07:36 satifant joined #git
07:37 visual osse: i bet you real name isnt even osse
07:37 watabou joined #git
07:37 tobiasvl I know osse's real name
07:37 visual is it Juan
07:37 Murii joined #git
07:37 tobiasvl no. keep guessing
07:37 visual and he just says "osse" like the mexicans say "ey esse"
07:38 adac osse, I knew it! :)
07:38 visual we're through the looking glass people
07:38 visual tobiasvl: is it LinusTechTips (r)
07:39 osse i even know tobiasvl's name.
07:39 osse at least his first one
07:39 ppang_ joined #git
07:39 visual vl probably
07:39 osse Vlad
07:39 visual the implier
07:39 visual https://pbs.twimg.com/profile_images/2904180822/dec2bbf342137e799977fc9f254a8472_400x400.jpeg
07:40 scoobertron joined #git
07:41 valhala_22 joined #git
07:42 tobiasvl osse: it's time we connected on linkedin
07:42 tobiasvl the most important social network
07:43 psofa I have moved a file with plain mv and changed it significantly.How do i tell git that?or is it not possible at all?
07:44 telephone joined #git
07:44 telephone joined #git
07:46 kurkale61 joined #git
07:46 Li joined #git
07:46 osse psofa: git rm oldname; git add newname
07:46 osse tobiasvl: go for it
07:47 Li how to fix this command to work .. git log --oneline | grep Bug && wc -l
07:47 osse i think you want to pipe to wc -l
07:48 Li git log --oneline grep Bug | wc -l .. will not show the lines which I want to do both at once
07:48 TbobbyZ joined #git
07:48 psofa osse, but will git know that its a rename , thus follow its history across the rename etc?
07:48 Masber_080 joined #git
07:49 osse psofa: if the files are similar enough
07:49 psofa but as i said i changed it significantly
07:49 psofa so how do i explicitely tell git to treat it as a move
07:49 osse psofa: regardless, renames aren't stored as renames. they're detected in later executions of diff/log etc.
07:49 osse there is no way to do that
07:50 _ikke_ git doesn't do that on purpose
07:51 Tobbi joined #git
07:51 Cabanossi joined #git
07:53 osse psofa: check the docts on '--find-renames' in e.g. man git-log
07:53 gitinfo psofa: the git-log manpage is available at https://gitirc.eu/git-log.html
07:53 kurkale61 joined #git
07:53 osse *docs
07:56 JeroenT joined #git
07:56 dec0n joined #git
07:58 haxx0r joined #git
07:58 Rodya_ joined #git
07:58 pbandark joined #git
07:59 kharloss joined #git
07:59 Gurkenglas joined #git
08:00 mikecmpbll joined #git
08:00 marcogmonteiro joined #git
08:02 User458764 joined #git
08:02 theoceaniscool joined #git
08:03 sbulage joined #git
08:03 zzz joined #git
08:03 aw1 joined #git
08:04 cstratak joined #git
08:04 psofa osse, okay i get how it works, but now that i have significantly altered the file in my working dir what would be the best way to fix it? stash,reset,move,commit,stash pop?
08:05 osse psofa: honestly, I wouldn't care
08:06 osse psofa: but what most people do, including myself, is to make renames separately from the rest
08:06 osse psofa: rename the file, and change whatever needs to changing to take the renaming into account, but nothing else. Whether you do this before or after the other large changes is up to you
08:08 kexmex joined #git
08:09 osse but as long as the commit you end up with makes sense I wouldn't bother with out. In the future when people look at it they can fiddle with the threshold.
08:10 osse Make sure to mention in the commit message that there's a rename in there, and then saul goodman
08:10 ertes-w joined #git
08:13 xanadu_ joined #git
08:13 thebope joined #git
08:13 diogenese joined #git
08:14 Vampire0 pierre365, I'd say heavily depends on the situation. Maybe make a separate branch with your modifications but don't push that one
08:15 Tobbi joined #git
08:15 psofa osse, well i wont bother with it either, but its good to get it right the next time thanks a lot:)
08:16 toogy joined #git
08:16 MuffinMedic joined #git
08:17 toogy quick question about submodules, when i add a submodule locally i get this new extra submodule section in .git/config but when i push it to a remote and then clone from the remote somwhere else, my .git/config doesn't contain the submodule section, so i add it manually. i feel like i'm not doing it the proper way. what is the proper way to do it?
08:18 xall_ joined #git
08:19 osse tgy: the proper way for other people is to run 'git clone --recursive' or clone followed by 'git submodule init'
08:19 osse tgy: that will copy information from .gitmodules to .git/config
08:19 tgy oh i see :) thanks
08:23 pycer joined #git
08:25 zulutango joined #git
08:25 chrisM_1 joined #git
08:26 schleppel joined #git
08:27 dust_ joined #git
08:28 tgy left #git
08:34 clmsy joined #git
08:35 wrouesnel joined #git
08:37 notebox joined #git
08:37 tvw joined #git
08:38 schleppel joined #git
08:42 cdown_ joined #git
08:43 patarr joined #git
08:44 ogny joined #git
08:44 ogny joined #git
08:44 Silox| joined #git
08:47 _ADN_ joined #git
08:48 MuffinMedic joined #git
08:49 nutron joined #git
08:49 Li joined #git
08:50 xall_ joined #git
08:51 Cabanossi joined #git
08:54 slidercrank joined #git
08:54 Tobbi joined #git
08:56 kurkale6ka joined #git
08:57 goTAN joined #git
08:58 valhala_22 joined #git
08:59 JimDungo joined #git
08:59 Rodya_ joined #git
09:01 drawkula joined #git
09:03 miha_S7_ joined #git
09:06 adac joined #git
09:06 Kulrak joined #git
09:06 Kulrak joined #git
09:07 thebope joined #git
09:08 tarkus joined #git
09:09 thiago joined #git
09:09 tvw joined #git
09:11 valkyr2e joined #git
09:20 CheckDavid joined #git
09:21 dust_ joined #git
09:24 bket joined #git
09:26 darkbit joined #git
09:28 valhala_22 joined #git
09:28 SlashLife^m joined #git
09:29 FilipNortic joined #git
09:29 SlashLife^m Morning :)
09:32 dhollinger joined #git
09:32 SlashLife^m I'm wondering when commits count as orphaned (and are eligible for cleanup); or more precisely: I use a separate category of refs to keep track of begin and end of old feature branches. Will these refs, which are neither tags nor branches suffice to keep their associated commits and history alive?
09:32 _ikke_ yes
09:32 Tobbi joined #git
09:32 SlashLife^m Great, thanks!
09:32 _ikke_ Any ref + reflog will count
09:34 earnestly joined #git
09:36 User458764 joined #git
09:40 telephone joined #git
09:40 telephone joined #git
09:45 xall_ joined #git
09:45 blackwind_123 joined #git
09:46 sbasso joined #git
09:46 netj joined #git
09:47 valhala_22 joined #git
09:49 cdown joined #git
09:51 IRQ` joined #git
09:52 TbobbyZ joined #git
09:57 cdown joined #git
09:59 Rodya_ joined #git
10:00 kelvah joined #git
10:01 thebope joined #git
10:01 Altiare joined #git
10:05 treaki joined #git
10:06 Cabanossi joined #git
10:06 GT4066 joined #git
10:08 leeN joined #git
10:08 Tobbi joined #git
10:09 kurkale6ka joined #git
10:11 Snugglebash joined #git
10:14 cyphase joined #git
10:19 aard_ joined #git
10:19 rivarun joined #git
10:20 avar ...but note that reflogs expire
10:21 ferr joined #git
10:21 cqi joined #git
10:23 Tobbi joined #git
10:27 nowhereman joined #git
10:27 treaki joined #git
10:27 Marumarsu joined #git
10:30 Darcidride joined #git
10:31 m4sk1n joined #git
10:33 miha_S7_ joined #git
10:35 dsdeiz joined #git
10:35 dsdeiz joined #git
10:37 Introoter joined #git
10:39 alexandre9099 joined #git
10:42 nenonen joined #git
10:43 patarr joined #git
10:45 valhala_22 joined #git
10:46 JeroenT joined #git
10:46 netj joined #git
10:46 tymczenko joined #git
10:46 nenonen Hi there. I have a noobish question, I wonder if you can help me easily.
10:47 nenonen I'm learning git by working on two windows systems, probably Win7 both but another is 32 and the other 64 bit. On the first system I understood that having the system specific Code Blocks project file on the repo is silly, so I removed it and pushed (to Bitbucket). Had to have the file as a backup for a while.
10:47 nenonen Now I started modifying from another spot on system 2, and now pulling I see git has removed the file for me. This version is ofc not backupped (nor followed by git). Any easy way to retrieve it?
10:47 grawity if you successfully used `git pull`, that sort of implies you did that in a directory that's "followed by git"
10:48 grawity and if it removed a file without complaints, then that specific file was also git-tracked
10:48 grawity try `git checkout @{1} myfile.c`
10:49 grawity well, the @{1} is a guess (for "the previous commit")
10:49 nenonen Earlier yes. What I meant to do was have git stop following it, because the file by the same name grew differences on the two systems. There was a file by that name, but the contents were useful only for system 1.
10:50 grawity if you still have that file, `git rm --cached myfile.c && git commit`
10:50 grawity if you don't, then it won't be tracked anymore when recreated
10:50 dglambert joined #git
10:50 dglambert yo
10:50 rominronin joined #git
10:51 nenonen I'll work out what you meant, thanks for now. :)
10:51 Cabanossi joined #git
10:55 thebope joined #git
10:55 tcorneli joined #git
10:55 chubek_ joined #git
10:58 marcogmonteiro joined #git
11:00 Rodya_ joined #git
11:02 alexandre9099 joined #git
11:05 sarri joined #git
11:05 sarri joined #git
11:08 arecaceae joined #git
11:08 om_henners joined #git
11:10 R1cochet joined #git
11:10 navidr joined #git
11:10 Snugglebash joined #git
11:13 R1cochet Hello, im trying to clone a repo offline. I dl'd the repo in a zipand transfered to my offline pc. How can i add the repo to my offline pc as if i had ran `git clone`
11:13 bremner R1cochet: unzip it and clone from the local directory
11:14 bremner you'll likely want to update the URL for the remote origin later, but, one step at a time
11:16 kurkale61 joined #git
11:17 HoierM joined #git
11:17 kurkale62 joined #git
11:18 oprypin hi, I'm reading some recommendations on how to split a commit into two - the only workflow i see is reset and partially add and commit and then add the rest
11:18 R1cochet Bremner i unzipped it then ran git clone path/to/repo but git says i cloned empty repo
11:19 oprypin i would like a different workflow where no matter what i do to the files for the first half, the 2nd half will automatically reset to the state that was there after the original un-split commit
11:20 tymczenko joined #git
11:20 inovas joined #git
11:20 oprypin how can I achieve this, rather than sometimes needing to manually reconstruct the state and not being sure whether my split introduced inadvertent changes?
11:21 tymczenko joined #git
11:22 oprypin looking at stackoverflow.com/a/43138338 - this guy seems to get it
11:24 davidomanfredo joined #git
11:24 tymczenko joined #git
11:28 brent__ joined #git
11:32 patarr joined #git
11:36 Cabanossi joined #git
11:38 SlashLife^m left #git
11:41 R1cochet left #git
11:42 gnixev joined #git
11:44 TheCycoONE joined #git
11:45 cads joined #git
11:47 scottjl_ joined #git
11:49 thebope joined #git
11:50 ppang_ joined #git
11:52 juvenal joined #git
11:53 sunri5e joined #git
11:54 TbobbyZ joined #git
11:59 alexandre9099 joined #git
12:03 miha_S7_ joined #git
12:03 scottjl joined #git
12:04 cahoots joined #git
12:07 Silox| joined #git
12:10 uebera|| joined #git
12:10 uebera|| joined #git
12:12 clmsy- joined #git
12:13 sbulage joined #git
12:13 synthroid joined #git
12:13 HoierM joined #git
12:15 dendazen joined #git
12:16 ssarah joined #git
12:17 synthroi_ joined #git
12:21 Acerific joined #git
12:23 h12o joined #git
12:23 synthroid joined #git
12:23 xall_ joined #git
12:24 borkr joined #git
12:24 LTRand joined #git
12:28 rnsanchez joined #git
12:30 synthroi_ joined #git
12:35 TheSimonator joined #git
12:36 Cabanossi joined #git
12:38 thebope joined #git
12:38 gugah joined #git
12:39 thebope joined #git
12:39 QwertyDragon joined #git
12:41 nenonen grawity: Thanks a lot, that helped me out.
12:41 Tobbi joined #git
12:41 Stumbler joined #git
12:42 HoierM joined #git
12:43 jfr joined #git
12:44 kelvah joined #git
12:46 livingstn joined #git
12:46 kwayne_ joined #git
12:48 jeffreylevesque joined #git
12:48 kwayne_ Hello everyone! I've just had linux crash on me, and after I rebooted, git claims that "Not a git repository (or any of the parent directories): .git". I don't know what to expect from the contents in that directory (it does exist), but I suspect that HEAD should not be a zero-length file.
12:48 guardianx joined #git
12:49 kwayne_ Also, index and ORIG_HEAD have length zero. What is there I can do to restore my git repo?
12:49 kwayne_ I do have a backup from yesterday, but I've done some work since then and I'd like to avoid losing any commits I've made since then. Any help is greatly appreciated!
12:51 pratch joined #git
12:51 synthroid joined #git
12:52 kwayne_ Well, I just made HEAD contain the text "ref: refs/heads/master", and now git status says: "fatal: index file smaller than expected"
12:53 kwayne_ Is there a way to rebuild that file?
12:53 alcohol maybe an obvious suggestion, but, did you start with making a backup of your current directory?
12:53 alcohol before you change anything or run any git commands
12:54 kwayne_ Yes, but thank you for the suggestion. :)
12:54 tymczenko joined #git
12:56 sbulage joined #git
12:56 j416 kwayne_: is there anything that is not empty in .git/, then?
12:56 pratch joined #git
12:56 kwayne_ j416: Yes, the remainer of the files that are there are non-empty
12:56 kwayne_ It's just HEAD (not anymore, see above), ORIG_HEAD, and index
12:56 kwayne_ Just these files are empty, I meant to say.
12:57 manuelschneid3r joined #git
12:57 j416 ORIG_HEAD shouldn't matter, ignore that
12:57 j416 index shouldn't matter either afaik
12:57 dviola joined #git
12:57 rebrec joined #git
12:57 kwayne_ j416: Well, git complains about index specifically, so I guess I'll have to do something about that?
12:57 j416 maybe it uses that to check something then
12:58 j416 try restoring index from the backup?
12:58 tarkus joined #git
12:58 j416 to my knowledge, index just holds the index state, so it should not be important in that sense
12:58 j416 data-wise
12:59 j416 disclaimer: I'm also in the dark here
12:59 j416 don't take my words as facts
12:59 kwayne_ Oh dear lord. I've tried copying the old index, and status now shows (correctly, I fear) that a lot of source files are zero-length now.
13:00 kwayne_ Seems like my filesystem did take quite a hit. Damn.
13:00 j416 don't worry about what git-status says
13:00 j416 it will just compare index to other stuff
13:00 j416 it recognises it as a git repo now, then?
13:00 kwayne_ But some source files really are empty. :)
13:01 j416 what does 'git log' say?
13:01 j416 (does it work?)
13:01 kwayne_ Yes, the git repo is recognized now, thanks. I guess I'll have to figure out what else got deleted because of the crash.
13:01 ExoUNX joined #git
13:01 j416 run: git fsck --full
13:02 kwayne_ git log does show all commits I would expect it to show, i.e. including the one I made most recently
13:02 j416 cool
13:02 j416 keep fingers crossed for fsck to work out fine
13:02 kwayne_ git fsck --full says: "error: object file .git/objects/0a/56ff56d1982fa0e2f5f20168dfc88829c7103c is empty" (twice), and "fatal: loose object 0a56ff56d1982fa0e2f5f20168dfc88829c7103c (stored in .git/objects/0a/56ff56d1982fa0e2f5f20168dfc88829c7103c) is corrupt"
13:03 j416 try restoring broken objects from your backup
13:03 j416 objects are immutable so copying them in doesn't alter anything besides hopefully making them unbroken
13:03 notebox joined #git
13:03 theoceaniscool joined #git
13:04 kwayne_ Unfortunately, that object isn't part of the backup.
13:04 j416 do you have the source someplace else?
13:05 j416 you can create objects from files if you have them
13:05 kwayne_ I believe I might have git-pushed before the crash. I'll try to see whether I can get the file that way. (The reason I don't just git-clone is that I have some git-config settings that I'd like to preserve.)
13:05 j416 only that?
13:05 j416 why don't you just clone and then add that configuration then >.>
13:06 j416 you'd probably want to re-clone it anyway to make sure everything is proper
13:06 j416 (well, that's what I'd do at least)
13:07 kwayne_ Because I wouldn't know what the configurations are. :) Can I just clone the repo, and the copy my entire configuration somehow?
13:07 cam27 joined #git
13:07 kwayne_ I've set the configuration over the course of a long period of time, and can't make a list of all the options I've set off the top of my head.
13:07 j416 yes
13:07 j416 .git/config
13:07 j416 or $HOME/.gitconfig
13:08 j416 (both are read)
13:09 j416 if you have hooks, also copy .git/hooks
13:09 kwayne_ I'll try that, thanks. I figured I'd run xfs_check and xfs_repair beforehand, though. Maybe that solves it anyway.
13:09 j416 gl
13:10 fmcgeough joined #git
13:10 kwayne_ Thank you so much for the help! I'll need to boot into a rescue system for xfs_check. Bye!
13:12 fission6 joined #git
13:12 SkyPatrol_ joined #git
13:14 sbasso joined #git
13:17 cdg joined #git
13:18 cbreak zfs :P
13:22 govg joined #git
13:23 Tobbi joined #git
13:23 Rodya_ joined #git
13:25 icy joined #git
13:28 livingstn joined #git
13:28 xanadu_ joined #git
13:28 marcogmonteiro joined #git
13:31 ghostdog joined #git
13:33 boombatower joined #git
13:34 miha_S7_ joined #git
13:34 a3Dman joined #git
13:36 roelmonn_ joined #git
13:43 Hunter1_ joined #git
13:47 synthroi_ joined #git
13:48 askb joined #git
13:48 MineCoins joined #git
13:50 concerti joined #git
13:50 a3Dman joined #git
13:50 tcorneli joined #git
13:52 HardlySeen joined #git
13:52 patarr joined #git
13:53 kexmex joined #git
13:54 ssarah joined #git
13:55 tcorneli joined #git
13:55 roelmonnens joined #git
13:56 alexandre9099 joined #git
13:57 crose joined #git
13:58 cahoots joined #git
13:59 AaronMT joined #git
14:01 wrouesnel1 joined #git
14:01 telephone joined #git
14:01 telephone joined #git
14:01 Gsham joined #git
14:02 lindenle joined #git
14:02 TbobbyZ joined #git
14:03 dave0x6d joined #git
14:03 a3Dman joined #git
14:04 Muzer joined #git
14:05 Aljone joined #git
14:05 borkr joined #git
14:05 netj joined #git
14:06 synthroid joined #git
14:06 kexmex joined #git
14:08 synthroi_ joined #git
14:09 synthroi_ joined #git
14:10 Es0teric joined #git
14:11 mizu_no_oto joined #git
14:14 JimDungo joined #git
14:14 pakcjo joined #git
14:15 pakcjo hello, is it possible to merge a single file of one branch into another branch? it seems that git checkout --patch should do it, the problem is that the files are in different paths :(
14:15 sbasso joined #git
14:15 tourdownunder joined #git
14:19 SporkWitch pakcjo: should be able to check out the single file from the other branch, then just move it where you need it
14:19 pakcjo SporkWitch: thanks, I'd do that
14:20 SporkWitch (i don't know if there's a more "right" solution, but that's the simplest, and usually the simplest is right)
14:22 bauruine joined #git
14:25 LTRand joined #git
14:25 JustMozzy joined #git
14:26 plos joined #git
14:26 JustMozzy hello everyone. I am running into this issue now and then. When I clone a repository I am unable to checkout any branch. I did a git fetch --all and a git checkout after that but it still tells me that it could not find the branch. when I type git branch, only one branch is shown
14:27 canton7 JustMozzy, output of 'git branch -a'?
14:27 mkoskar joined #git
14:27 Vampire0 pakcjo, `git show other-branch:path/to/file/in/that/branch >new/file`
14:27 Vampire0 pakcjo, then add and commit the file
14:28 canton7 ^ note that that's not a merge
14:28 publio joined #git
14:28 canton7 it will replace whatever file was there previously
14:28 JustMozzy canton7: show's me all remote branches in the form remotes/origin/develop etc.
14:28 pakcjo canton7: yes, but it's ok, I can use diff or similar to merge
14:28 Vampire0 JustMozzy, !where
14:28 gitinfo JustMozzy: [!wherearemybranches] Git clones all branches, but initially makes only the main branch (usually 'master') available as a normal local branch. To work on another branch, simply 'git checkout <branch>' (or, in versions older than 1.6.6, git checkout -b <branch> origin/<branch>). This works even if the branch doesn't show up in the normal list of branches. For technical details, see !rtb
14:28 canton7 JustMozzy, ok, so what's the issue? Git will create one local branch by default - the rest are fetched as remote-tracking branches
14:28 pakcjo but it would be nice to have git done it for me :)
14:29 canton7 ah, nice trigger. Hadn't seen that one
14:29 Rodya_ joined #git
14:29 JustMozzy canton7: as I said. a git checkout feature/my-branch does not work. git doesn't find the branch
14:29 canton7 JustMozzy, !repro
14:29 gitinfo JustMozzy: [!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
14:29 canton7 (and did you do what the trigger suggested - 'git checkout -b feature/my-branch origin/feature/my-branch'? 'git checkout feature/my-branch' should do it in any git version from the last 10 years, though...
14:30 canton7 but let's see an actual repro, see if we can spot the issue
14:30 Vampire0 canton7, maybe if you add `git add -p new/file` then?
14:30 canton7 Vampire0, true
14:30 qqx JustMozzy: What version of git are you using?
14:31 a3Dman joined #git
14:32 JustMozzy here it is https://gist.github.com/khusseini/612955fcf9e719253ee5a00700e06d0f using version 2.7.4
14:32 kelvah joined #git
14:32 Vampire0 canton7, actually it is 7.5 years. *g*
14:32 canton7 JustMozzy, it's 'infolox/feature/shop-bundle'
14:32 Vampire0 canton7, 1.6.6 was tagged 23.12.2009
14:32 canton7 oh, no it isn't
14:32 canton7 ignore that
14:32 canton7 JustMozzy, git 'git checkout feature/shop-bundle' magic only works for the 'origin' remote
14:32 canton7 JustMozzy, use the form that gitinfo gave you above
14:32 canton7 also, !local_branch_from_remote
14:32 gitinfo The following commands are all equivalent, assuming <branch> doesn't yet exist: 'git checkout -b <branch> <remote>/<branch>', 'git checkout -t <remote>/<branch>', 'git checkout <branch>'. The latter invokes some magic.
14:33 Vampire0 canton7, but feature/shop-bundle **id** in origin
14:33 Vampire0 s/id/is/
14:33 canton7 oh, I am blind
14:33 JustMozzy canton7: this will result in a detached head
14:33 canton7 then the magic doesn't work because there are two feature/shop-bundle branches
14:33 canton7 specify which, by using the command gitinfo gave you above
14:33 Vampire0 JustMozzy, what version of git are you using?
14:33 canton7 JustMozzy, see my "<canton7> ignore that" comment just after I said that
14:33 JustMozzy Vampire0: 2.7.4
14:34 Vampire0 canton7, ah, yes, that could be, same branch in different remotes -> magic does not work and explicit -b syntax is needed
14:34 Vampire0 JustMozzy, use the pre-1.6.6 version of !where
14:34 gitinfo JustMozzy: [!wherearemybranches] Git clones all branches, but initially makes only the main branch (usually 'master') available as a normal local branch. To work on another branch, simply 'git checkout <branch>' (or, in versions older than 1.6.6, git checkout -b <branch> origin/<branch>). This works even if the branch doesn't show up in the normal list of branches. For technical details, see !rtb
14:34 canton7 'git checkout -b feature/shop-bundle origin/feature/shop-bundle' if you want origin's version, or substitute infolox for origin if you want infolox's version
14:34 TbobbyZ_ joined #git
14:35 kexmex joined #git
14:36 JustMozzy canton7: that one worked... upside also, I think I can understand to as why this is happening :)
14:36 JustMozzy thank you all for your help :)
14:36 Cabanossi joined #git
14:36 TbobbyZ_ joined #git
14:37 Vampire0 JustMozzy, you're welcome
14:37 gitinfo JustMozzy: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.
14:38 TbobbyZ joined #git
14:38 telephone joined #git
14:38 telephone joined #git
14:38 JustMozzy thank you Vampire0 canton7 :)
14:38 JustMozzy did I forget anyone?
14:39 JustMozzy oh and thank you gitinfo hehe
14:39 gitinfo JustMozzy: you're welcome, but please note that I'm a bot. I'm not programmed to care.
14:39 Vampire0 !botsnack
14:39 gitinfo Om nom nom
14:40 shinnya joined #git
14:40 atomi joined #git
14:42 duderonomy joined #git
14:43 jzeus joined #git
14:44 malmalmal joined #git
14:45 star_prone joined #git
14:46 TbobbyZ joined #git
14:49 thebope_ joined #git
14:50 Gtacer joined #git
14:52 ronator joined #git
14:54 telephone joined #git
14:54 telephone joined #git
14:55 ash_workz joined #git
14:56 blackwind_123 joined #git
14:56 dsdeiz joined #git
14:57 TbobbyZ joined #git
14:59 star_prone joined #git
15:01 MineCoins joined #git
15:01 TbobbyZ joined #git
15:01 phinxy joined #git
15:03 miha_S7_ joined #git
15:05 telephone joined #git
15:05 telephone joined #git
15:06 Gtacer left #git
15:09 cam27 joined #git
15:11 bauruine joined #git
15:12 Guest41951 joined #git
15:13 al-damiri joined #git
15:13 ZyX-I joined #git
15:13 hobodave joined #git
15:13 gugah_ joined #git
15:13 davidomanfredo joined #git
15:15 lb1c joined #git
15:16 Guest41951 left #git
15:16 dreiss joined #git
15:20 njbair joined #git
15:21 rivarun joined #git
15:21 Gurkenglas joined #git
15:21 om_henners joined #git
15:25 TheCycoONE joined #git
15:28 davidomanfredo joined #git
15:30 cebula joined #git
15:31 raspado joined #git
15:31 brent__ joined #git
15:32 cam27 joined #git
15:33 Starky joined #git
15:34 xall_ joined #git
15:35 orbyt_ joined #git
15:35 livingstn joined #git
15:36 NeverDie joined #git
15:36 Cabanossi joined #git
15:39 thebope_ joined #git
15:40 pratch joined #git
15:40 scoobert1on joined #git
15:40 finalbeta joined #git
15:41 m4sk1n joined #git
15:41 f0ster joined #git
15:41 telephone joined #git
15:41 telephone joined #git
15:43 red82 joined #git
15:45 theoceaniscool joined #git
15:45 pratch joined #git
15:48 test_znc_8845 joined #git
15:48 Darren_ joined #git
15:50 Groscheri joined #git
15:51 RxMcDonald joined #git
15:52 RxMcDonald why git merge branchname shows Already up to date if it's 20 commits behind my current branch?
15:52 mel00010 joined #git
15:52 durham joined #git
15:53 sbasso joined #git
15:53 TbobbyZ joined #git
15:53 moldy left #git
15:54 grawity that's exactly why – merge goes in the opposite direction
15:54 macrover joined #git
15:56 Starky joined #git
16:00 netj joined #git
16:03 netroxen joined #git
16:05 madewokherd joined #git
16:08 Snugglebash joined #git
16:08 overlord_tm joined #git
16:11 Eugene In git, operatings like commit and merge change the CURRENT branch, not the one being named. The convention is backwards if you are coming from some other systems
16:11 Eugene operations*
16:11 ertes joined #git
16:12 meLon joined #git
16:12 peepsalot joined #git
16:12 rvgate joined #git
16:13 TomyLobo joined #git
16:14 rkazak joined #git
16:14 thebope joined #git
16:16 orbyt_ joined #git
16:16 hobodave joined #git
16:17 roelmonnens joined #git
16:21 thebope_ joined #git
16:22 hobodave_ joined #git
16:26 livingstn joined #git
16:27 Rodya_ joined #git
16:27 Hunter1_ joined #git
16:28 LionsMane joined #git
16:30 King_Hual joined #git
16:32 Gsham joined #git
16:33 miha_S7_ joined #git
16:33 Sound joined #git
16:33 Altiare joined #git
16:34 telephone joined #git
16:34 telephone joined #git
16:34 nitric joined #git
16:36 Cabanossi joined #git
16:37 pks joined #git
16:38 jrnieder joined #git
16:38 Vampire0 Eugene, in which systems do you merge the other way around? In SVN and CVS at least it was the same. Merge "that" into this workspace so that I can commit to my current branch
16:40 Eugene General CLI convention is `<command> <file1> <file2>`, eg in rsync or cp. You expect that file1 will be changed. `git merge foo` does not change foo, it instead changes your current branch Bar which was not mentioned.
16:41 Eugene (Both are bad examples of course; they would change file2)
16:42 Gustavo6046 joined #git
16:44 duderonomy joined #git
16:44 L72g5sSq joined #git
16:46 Starky joined #git
16:47 felixsanz joined #git
16:48 L72g5sSq Need a tool for managing multiple, separate git repositories. I want to, for example, see in a nice format the status of all my repositories, perform a fetch on all of them, etc. Any recommendations on something that already exists out there? It can be a CLI, GUI, whatever.
16:48 kfoonamalik joined #git
16:49 bremner !myrepos
16:49 bremner !mr
16:49 gitinfo a tool to manage Multiple Repositories, see http://joeyh.name/code/mr/
16:49 xall_ joined #git
16:50 Eugene !repo
16:50 gitinfo Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html
16:51 Eugene I don't like repo, and have never heard of mr before. I can't make any recommendations, but there are options out there - I think they're junk. Sorry.
16:51 Eugene The "normal" approach to this problem I have seen involves submodules or related
16:51 bremner mr is low tech, but works for me (TM)
16:51 Eugene IE, a Meta-repo to glue everything together
16:52 SteffanW joined #git
16:54 telephone joined #git
16:54 telephone joined #git
16:55 Raed|Mobile joined #git
16:56 stana joined #git
16:56 livingstn joined #git
16:56 mkoskar joined #git
16:58 kfoonamalik joined #git
17:01 L72g5sSq bremner: Eugene I tried mr before, didn't like it :/
17:01 L72g5sSq Yeah it's a simple for doing simple things
17:01 Vampire0 Eugene, I still don't get it. Your command just proves that both behave the same. "ln -s source target", the same, .... And even if it would be different, I think this is like comparing apples with pears. You cannot compare a VCS command with copy or link or rsync command, but only with other VCS commands in that regards I think. :-)
17:02 vuoto joined #git
17:02 _Alex-N_ joined #git
17:02 osse at least you're not comparing apples and oranges
17:03 Vampire0 L72g5sSq, !gitslave
17:03 gitinfo L72g5sSq: gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.
17:03 tarkus joined #git
17:05 orbyt_ joined #git
17:08 freimatz joined #git
17:08 thebope joined #git
17:10 indistylo joined #git
17:11 orbyt_ joined #git
17:11 aw1 joined #git
17:12 Tobbi joined #git
17:12 MineCoins joined #git
17:13 Hunter1_ joined #git
17:13 Es0teric joined #git
17:15 Starky joined #git
17:15 Raedism joined #git
17:18 APic joined #git
17:20 orbyt_ joined #git
17:22 k0nichiwa joined #git
17:22 Peuc joined #git
17:22 kexmex joined #git
17:23 cdown joined #git
17:23 Gustavo6046 joined #git
17:24 MattMaker joined #git
17:25 nod joined #git
17:26 _flow_ joined #git
17:28 hashtagstrashtag joined #git
17:28 StuartMI joined #git
17:29 Rodya_ joined #git
17:30 avar joined #git
17:30 avar joined #git
17:32 Guest1_ joined #git
17:32 Bucciarati joined #git
17:33 arecaceae joined #git
17:34 orbyt_ joined #git
17:36 adac joined #git
17:39 valhala_22 joined #git
17:40 Eugene Vampire0 - I want a banana
17:40 pakcjo left #git
17:40 Eugene Vampire0 - the point is: different people make different assumptions about what a command Ought to do.
17:40 Eugene That's it
17:41 caper joined #git
17:41 LionsMane joined #git
17:43 groverdill joined #git
17:43 orbyt_ joined #git
17:46 gopar joined #git
17:51 mohabaks joined #git
17:53 bmahe joined #git
17:55 sea-gull joined #git
17:57 Seveas Eugene: https://s-media-cache-ak0.pinimg.com/736x/c8/2d/c5/c82dc5b8af71b32a56c692cb09d161e2.jpg
17:57 pietv joined #git
17:58 livingstn joined #git
17:59 nixjdm joined #git
18:00 thiago joined #git
18:02 thebope joined #git
18:03 miha_S7_ joined #git
18:03 lafleurdubien joined #git
18:04 Eugene Yaaaay!
18:05 simon816 joined #git
18:07 TSS_ joined #git
18:08 brent__ joined #git
18:09 overlord_tm joined #git
18:12 mostlybadfly joined #git
18:13 robotroll joined #git
18:14 dsteplight__ joined #git
18:14 VladGh joined #git
18:15 lil__ joined #git
18:15 mizu_no_oto joined #git
18:16 orbyt_ joined #git
18:17 Sasazuka joined #git
18:17 lil__ Hi there, I unthinkingly included my build directory in a commit, and now pushing to remote won't happen without the large file system. Since this wasn't what I meant to do in the first place, is a git reset in order?
18:18 IanLiu_ joined #git
18:19 imack joined #git
18:20 bremner lil__: yeah, if it's the last commit, otherwise rebase -i
18:20 lil__ bremner, yup, looks like this was the way to go thanks!
18:20 King_Hual joined #git
18:20 King_Hual joined #git
18:21 lil__ bremner, and now I follow up with a new commit that has a message relating to why i've reset right?
18:22 causasui joined #git
18:23 Es0teric joined #git
18:23 bremner lil__: no, the reset doesn't need a commit. You can just commit the commit parts (non-build) in a new commit
18:23 bremner reset can be your little secret since it was never pushed
18:24 lil__ bremner, haha well I sent a message to my manager already, so no secrets there, haha but i understand that I can just do whatever changes I wanted to and move forward
18:25 bremner yep
18:27 tunekey joined #git
18:32 rmesta joined #git
18:33 VladGh joined #git
18:33 Altiare joined #git
18:36 valhala_22 joined #git
18:36 Cabanossi joined #git
18:38 finalbeta joined #git
18:39 bittyx joined #git
18:44 Altiare joined #git
18:45 Atm0spher1c joined #git
18:46 hobodave joined #git
18:46 ghostdog joined #git
18:47 Es0teric joined #git
18:48 YuGiOhJCJ joined #git
18:48 theoceaniscool joined #git
18:50 dreiss joined #git
18:51 m4sk1n joined #git
18:54 jstein_ joined #git
18:56 thebope joined #git
18:58 orbyt_ joined #git
19:05 mizu_no_oto joined #git
19:05 mikecmpbll joined #git
19:06 f3r70rr35f joined #git
19:08 TikityTik joined #git
19:09 star_prone joined #git
19:09 lil__ bremner, hey I've made my new changes, and done a local commit, but the push is getting rejected. The actual message is "current branch is behind its remote counterpart. integrate the remote changes before pushing again"
19:09 cjohnson you just need to pull first
19:09 cjohnson assuming you for sure never pushed that big commit
19:09 cjohnson in which case pulling is just going to try to merge your big one with the one you have locally which duplicates teh changes
19:10 cjohnson + build
19:10 bremner I'd "git fetch" then git log origin/master
19:10 cjohnson yeah sorry bad habit, shouldn't say pull
19:10 juvenal joined #git
19:10 valhala_22 joined #git
19:11 hobodave joined #git
19:11 lil__ cjohnson, oh hey! um I can see changes on my git page from what I tried last night? does that mean that the push was partially successful? haha ok, I'll try a fetch. But just to make sure, I'm not going to lose my most recent changes in the commit I did this morning right?
19:12 lil__ cjohnson, oh also, its recommending I do pull: ""git pull" to merge the remote branch with yours"
19:13 cjohnson yes, if you see the chnages on github, your push was successful
19:13 cjohnson I don't think there is a partial successful
19:13 cjohnson So now you've got that large commit + your local commit which duplicates the work, and if you pull, you're going to pull down that big commit
19:13 cjohnson Is this branch something only you are working on? or is this a shared branch
19:14 nixjdm joined #git
19:15 Achylles joined #git
19:16 lil__ cjohnson, its an existing project that I'm contributing to, so I forked it a few days ago, and yester day I tried to commit my first changes, but accidentally included the build folder... haha
19:17 cjohnson So nobody is using your fork? you can probably fix this with a force push to overwrite the remote which includes teh build commit
19:17 TheMontyChrist joined #git
19:17 cjohnson git fetch && git log origin/master   (or whatever branch you are operating on here)
19:17 TheMontyChrist joined #git
19:17 TheMontyChrist joined #git
19:18 cjohnson check the commits there and see if htere's anything in origin that you don't have locally
19:18 TheMontyChrist when should you branch vs tag?
19:18 lil__ cjohnson, they will inspect my changes and review my pull requests, but otherwise its just me
19:18 cjohnson lil__: right just making sure nobody else has cloned your repo yet and is working in it. sounds like not
19:18 TheMontyChrist I'm working off of "master", I want to release a "1.0" do I tag it or branch it?
19:18 cjohnson if they had, force pushing would require you to coordinate with them
19:18 cjohnson rewriting history screws everybody else up
19:19 cjohnson TheMontyChrist: a tag is a snapshot in time
19:19 lil__ cjohnson, I see, ok I'll do the fetch, and log to compare
19:19 cjohnson TheMontyChrist: a branch is a running deviation
19:19 cjohnson when you get a bug fix ticket or a feature request, you start a new branch to work on those things. once you QA and merge the branch, you can delete the branch. Then once you hit X version, and want to call it a build, you might tag
19:20 TheMontyChrist yeah.  what happens if I release 1.0 and foud a bug, so it's 1.0.0.01, yet I'm off to 2.0.  how do I make micro changes to 1.0 - other than putting it into it's own branch?
19:20 TheMontyChrist I'm not sure how to handle that situation.
19:20 cjohnson lil__: git log origin/master...master    should tell you commits in origin that aren't in local fyi
19:20 cjohnson TheMontyChrist: You found a bug in 1.9 but you didn't release it until 2.0?
19:20 lil__ cjohnson, so I did git fetch origin, but no major downloads followed, did I leave something out also?
19:20 cjohnson the version only happens at release time. so at the time of release, you just tag it as 2.0.1
19:21 cjohnson until you release the bug, it would just be a branch called bugfix/my-issue
19:21 TheMontyChrist suppose I release 1.0, people work with it for a month, I'm well into writing 2.0 and it won't be released for a while.  I basically want 1.0.1 that's just 1.0 w/ the small change
19:21 cjohnson Oh you want multiple release branches
19:21 TheMontyChrist and I'll fold in the 0.1 stuff into 2.0 when I release it months later
19:21 TheMontyChrist yeah, because I'm sure I"ll be making small maitenance hacks while I'm working on the new version
19:22 cjohnson you might maintain a 1.x branch and 2.x branch
19:22 cjohnson then you can tag off of each independently
19:22 cjohnson and cherry pick other branches up
19:22 TheMontyChrist I
19:22 m0viefreak joined #git
19:22 TheMontyChrist I'll need to read about git cherry picking
19:22 lil__ cjohnson, git log origin/master...master only shows my commit from the morning, sounds like I'm safe to do the force push right?
19:23 cjohnson lil__: yep, that will list commits you will be overwriting with a force push and that's the commit you're ok to lose, so that sounds right to me
19:23 tyreld joined #git
19:24 cjohnson TheMontyChrist: it really just depends on how big of a change 2.x will be. In some cases you'll just have to do the same work twice, one in each branch
19:24 cjohnson no easy way to pick the bugfix branch from one to the other in every case
19:25 efco joined #git
19:25 cjohnson If 2.x isn't going to be that huge of a change then you could just keep 1.x as "master" and 2.x as "dev" and then rebase master onto dev regularly to keep all your 1.x changes in your 2.x branch
19:26 cjohnson then it'll just be a simple case of merging dev back into master when 2.x gets released
19:26 NeXTSUN joined #git
19:27 crypt0kraken joined #git
19:28 Gsham joined #git
19:31 Rodya_ joined #git
19:31 finalbeta joined #git
19:33 miha_S7_ joined #git
19:34 om_henners joined #git
19:34 roelmonnens joined #git
19:34 tijensse joined #git
19:35 bfig_ joined #git
19:37 lil__ I have a silly question. My manager sent me a message through the notifications@git .. and I replied, will he get that reply?
19:37 _ikke_ lil__: you mean github?
19:38 lil__ _ikke_, yea, the notifications@github.com
19:38 lil__ had his user id in front of it in my email.
19:41 Rodya_ joined #git
19:41 Hunter1_ joined #git
19:41 sweatsuit_ joined #git
19:41 ahrs joined #git
19:41 _ikke_ Yeah, should work
19:41 _ikke_ each e-mail says "Reply to this email directly, view it on GitHub, or mute the thread."
19:46 JimDungo joined #git
19:47 karols146 joined #git
19:47 Es0teric joined #git
19:50 diogenese joined #git
19:50 Gurkenglas joined #git
19:54 cahoots_ joined #git
19:55 Dougie187 joined #git
19:56 lil__ joined #git
20:01 King_Hual` joined #git
20:01 Tobbi joined #git
20:05 jzeus joined #git
20:06 Cabanossi joined #git
20:07 misosoup joined #git
20:07 Acerific joined #git
20:07 Acerific joined #git
20:07 finalbeta joined #git
20:10 Emperor_Earth_ joined #git
20:12 rivarun joined #git
20:12 unipe joined #git
20:14 orbyt_ joined #git
20:14 nixjdm joined #git
20:14 thiago joined #git
20:15 cdg joined #git
20:16 unipe joined #git
20:16 Emperor_Earth__ joined #git
20:18 dreiss joined #git
20:20 valhala_22 joined #git
20:20 d5sx43 joined #git
20:22 BR5C003Y_D00 joined #git
20:23 gopar joined #git
20:24 dax joined #git
20:24 zivester joined #git
20:25 valhala_22 joined #git
20:25 gopar_ joined #git
20:26 Starkythefox joined #git
20:26 rmesta left #git
20:26 Xandaros joined #git
20:27 aw1 joined #git
20:29 diogenese joined #git
20:29 valhala_22 joined #git
20:30 tvw joined #git
20:32 overlord_tm joined #git
20:33 valhala_22 joined #git
20:34 jaziz joined #git
20:34 harukomoto joined #git
20:34 harukomoto left #git
20:35 preyalone joined #git
20:36 njbair joined #git
20:36 Cabanossi joined #git
20:36 Starkythefox joined #git
20:38 fission6 joined #git
20:39 kfoonamalik joined #git
20:40 unipe left #git
20:41 mel00010 joined #git
20:41 Starky_the_fox joined #git
20:45 tymczenko joined #git
20:45 orbyt_ joined #git
20:47 f3r70rr35f joined #git
20:49 xbob joined #git
20:50 dave0x6d joined #git
20:52 hhee joined #git
20:53 malmalmal joined #git
20:54 BR5C003Y_D00 joined #git
20:54 paul424 joined #git
20:57 kexmex__ joined #git
20:58 chubek_ joined #git
21:01 exotime joined #git
21:02 Es0teric joined #git
21:02 Lunatrius joined #git
21:03 tourdownunder joined #git
21:03 ServChan joined #git
21:03 miha_S7_ joined #git
21:05 xbob joined #git
21:08 JanC_ joined #git
21:09 bfig_ left #git
21:09 Anja_ joined #git
21:10 LTRand joined #git
21:12 Gsham joined #git
21:12 justan0theruser joined #git
21:12 dreiss joined #git
21:14 miha_S7_ joined #git
21:14 xanadu_ joined #git
21:14 Starky joined #git
21:15 ghostdog joined #git
21:16 Altiare joined #git
21:17 orbyt_ joined #git
21:21 valhala_22 joined #git
21:22 jzeus joined #git
21:22 roelmonnens joined #git
21:22 fission6 joined #git
21:22 k0nichiwa joined #git
21:27 Anja_ joined #git
21:29 Starkythefox joined #git
21:30 Starky joined #git
21:32 fuzzmz joined #git
21:34 sbasso joined #git
21:37 jzeus joined #git
21:40 theoceaniscool joined #git
21:40 gopar joined #git
21:41 askb joined #git
21:42 Rodya_ joined #git
21:42 HoierM joined #git
21:43 valhala_22 joined #git
21:44 Achylles joined #git
21:47 jzeus joined #git
21:48 valhala_22 joined #git
21:49 rkazak joined #git
21:49 gopar joined #git
21:57 d5sx43 joined #git
21:58 rv joined #git
22:00 tourdownunder joined #git
22:01 vdv joined #git
22:04 vdv joined #git
22:05 valhala_22 joined #git
22:06 Snugglebash joined #git
22:07 TbobbyZ_ joined #git
22:11 jzeus joined #git
22:15 alhariel joined #git
22:20 dendazen joined #git
22:21 nkouevda joined #git
22:22 tymczenko joined #git
22:33 pwnz0r joined #git
22:34 red82 joined #git
22:34 TbobbyZ joined #git
22:36 Cabanossi joined #git
22:38 gopar joined #git
22:39 jstimm joined #git
22:42 safe joined #git
22:43 Rodya_ joined #git
22:43 Gsham joined #git
22:45 valhala_22 joined #git
22:46 star_prone joined #git
22:47 red82 joined #git
22:50 oskarkv joined #git
22:53 jzeus joined #git
22:53 valhala__ joined #git
22:58 valhala_22 joined #git
22:59 bronson joined #git
23:01 fmcgeough joined #git
23:02 valhala__ joined #git
23:05 valhala_22 joined #git
23:06 Cabanossi joined #git
23:08 valhala__ joined #git
23:08 Marumarsu joined #git
23:08 Uneliasmarsu joined #git
23:09 valhala_22 joined #git
23:11 roelmonnens joined #git
23:11 Guiri joined #git
23:12 valhala_22 joined #git
23:12 TbobbyZ_ joined #git
23:12 Guiri I'm trying to untrack a file from 3 series of commits that haven't been pushed.  It's a large CSV by accident. Should I git reset --soft HEAD~3 and then git reset each file?
23:13 SporkWitch untrack or revert?
23:14 Guiri SporkWitch: They haven't been pushed to remote.  So I'm not sure of the difference to be honest in the terminology
23:14 nowhereman joined #git
23:15 SporkWitch https://www.atlassian.com/git/tutorials/resetting-checking-out-and-reverting
23:15 dendazen joined #git
23:16 Guiri Thanks, looking at it now
23:16 jimmyrcom joined #git
23:16 SporkWitch Guiri: and depending on how much you changed in the intermediary commits, it might be easiest to rebase.  I can't think of how you'd remove it from the previous commits otherwise, but i'm also not a git guru.
23:16 telephone joined #git
23:16 telephone joined #git
23:18 valhala_22 joined #git
23:19 PaulCape_ joined #git
23:21 zulutango joined #git
23:23 orbyt_ joined #git
23:23 diogenese joined #git
23:26 bgerber joined #git
23:30 Vampire0 Guiri, !perfect
23:30 gitinfo Guiri: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
23:30 SkyPatrol joined #git
23:31 miha_S7_ joined #git
23:31 Guiri Thanks
23:31 telephone joined #git
23:31 telephone joined #git
23:31 jzeus joined #git
23:38 juvenal joined #git
23:38 kyan joined #git
23:39 telephone joined #git
23:39 telephone joined #git
23:40 watabou joined #git
23:40 sunri5e joined #git
23:41 shinnya joined #git
23:42 rmesta joined #git
23:43 rmesta joined #git
23:44 rmesta joined #git
23:45 rmesta joined #git
23:46 Rodya_ joined #git
23:47 om_henners joined #git
23:48 madewokherd joined #git
23:48 arecaceae joined #git
23:49 YuGiOhJCJ joined #git
23:49 rivarun joined #git
23:52 Vampire0 Guiri, you're welcome
23:52 gitinfo Guiri: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Ten thanks make up one karma point.
23:52 k0nichiwa joined #git
23:53 telephone joined #git
23:53 telephone joined #git
23:57 SporkWitch what?! i demand karmic backpay!
23:58 SporkWitch .karma SporkWitch
23:58 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
23:58 * SporkWitch glares
23:58 boombatower joined #git
23:59 bronson joined #git

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