Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-25

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

All times shown according to UTC.

Time Nick Message
00:00 quotemstr That is, I want to edit a file, then make the index contain my edited version and the working directory to contain the un-edited version
00:00 Cabanossi joined #git
00:00 palimondo left #git
00:00 quotemstr "git add foo.c; git checkout HEAD foo.c" seems to reset the index too
00:00 quotemstr Err, patch -R
00:03 joshszep joined #git
00:04 Lyqyd_ joined #git
00:07 raspado joined #git
00:08 __rgn joined #git
00:09 raspado joined #git
00:10 masuberu joined #git
00:10 Eugene quotemstr - `git show HEAD:path/to/file.txt` will give you file.txt as it exists in the last commit. Use your shell's redirection(typically >/path/to/file.txt) to suit.
00:11 snowkidind joined #git
00:12 Achylles joined #git
00:13 ki0_ joined #git
00:15 NeverDie joined #git
00:18 cahoots joined #git
00:21 qassim joined #git
00:23 durham joined #git
00:24 Rodya_ joined #git
00:25 c^ joined #git
00:27 thiago joined #git
00:28 telephone joined #git
00:28 telephone joined #git
00:35 a3Dman joined #git
00:36 telephone joined #git
00:36 telephone joined #git
00:36 cliluw Will "git checkout HEAD@{1}" undo a "git stash pop"?
00:36 Lunatrius joined #git
00:36 quotemstr Eugene: Fair enoguh
00:37 thiago joined #git
00:37 dmc cliluw, may not allow it with uncommitted changes
00:38 PioneerAxon joined #git
00:38 XenophonF joined #git
00:39 brent__ joined #git
00:40 ZeroZeroZeroZero joined #git
00:41 masuberu joined #git
00:43 rmesta joined #git
00:44 rmesta joined #git
00:45 rmesta joined #git
00:45 duderonomy joined #git
00:46 krillr joined #git
00:46 rmesta joined #git
00:46 HoierM_ joined #git
00:46 fstd_ joined #git
00:46 rmesta joined #git
00:47 rmesta joined #git
00:48 thiago joined #git
00:50 dreiss joined #git
00:52 smccully joined #git
00:57 telephone joined #git
00:57 telephone joined #git
00:58 grift joined #git
00:59 ttal joined #git
01:00 dreiss joined #git
01:00 ttal i am using a laptop and a desktop. Is there a way to switch between them using Dropbox, or another technique, without committing incomplete features?
01:02 bremner probably, but you can also make WIP commits and change them later
01:03 alexandre9099 joined #git
01:05 cam27 joined #git
01:07 ttal bremner: thanks for that, is there a way to do that on github desktop?
01:07 xall joined #git
01:08 bremner I've never used it, but a WIP commit is nothing special from git's point of view.
01:08 Rodya_ joined #git
01:10 ttal bremner: is a WIP commit a different type of commit, or just a regular commit you describe as a WIP and amend the commit on the other pc later?
01:10 bremner ttal: the later
01:10 bremner s/later/latter/
01:12 cqi joined #git
01:12 ttal ok got it, i think. So just commit and sync, pull on the other pc, and amend the wip commit when you have completed the feature you were working on.
01:13 defewit joined #git
01:15 Cabanossi joined #git
01:20 dsdeiz joined #git
01:22 bremner ttal: right. But but this works best if you push to a private branch (I don't really know what "sync" means here, precisely)
01:22 mizu_no_oto joined #git
01:24 bronson joined #git
01:24 rominronin joined #git
01:26 Gsham joined #git
01:29 svm_invictvs joined #git
01:30 telephone joined #git
01:30 telephone joined #git
01:31 h12o joined #git
01:35 cam27 joined #git
01:35 sunri5e joined #git
01:35 Xenophon1 joined #git
01:35 ttal bremner: ok thank you. on github desktop there is a sync button. I think it just pushes.
01:36 bremner whoever thought renaming things was a good idea should be taken out back
01:36 finalbeta joined #git
01:37 doppo joined #git
01:38 brent__ joined #git
01:41 telephone joined #git
01:41 telephone joined #git
01:41 adgtl joined #git
01:46 cqi joined #git
01:46 jason237 joined #git
01:46 gordonfish joined #git
01:48 gordonfish Ok, I just build 2.9.3 from tarball (previous had 2.6.3) and now when I try something like `git clone https://github.com/foo/bar.git` I get "fatal: Unable to find remote helper for 'https'"
01:49 gordonfish To configure I've previous given --with-iconv --with-curl --with-expat and I've even tried rebuilding adding --with-openssl as well to no avail.
01:50 gordonfish This wasn't a problem previously (it seems --with-curl= was enough then)
01:50 gordonfish I've googled to no avail.
01:51 gordonfish `./configure --help | grep http` shows
01:51 gordonfish --with-curl             support http(s):// transports (default is YES)
01:51 gordonfish --with-expat            support git-push using http:// and https://
01:52 gordonfish So I'd think those would be enough
01:52 gordonfish (and it was for 2.6 and earlier for me)
01:52 gordonfish This is under Linux btw
01:54 dre_ joined #git
01:56 pwnz0r joined #git
01:57 watabou joined #git
01:58 Goplat joined #git
02:00 sunri5e joined #git
02:00 fatalhalt joined #git
02:00 Cabanossi joined #git
02:00 dermoth joined #git
02:01 scottjl_ joined #git
02:02 nexemacs joined #git
02:04 re1 joined #git
02:05 pks joined #git
02:05 scottjl joined #git
02:07 yehowyada joined #git
02:07 yehowyada joined #git
02:09 mizu_no_oto joined #git
02:14 Eugene !package
02:14 gitinfo [!packaged] Unless you have a specific technical need for the "latest and greatest" you should go with a packaged version. Compiling and installing your own is not something that we will walk you through or troubleshoot (though it *is* fairly easy for developers with GNU/Linux experience).
02:14 pumafied joined #git
02:15 telephone joined #git
02:15 telephone joined #git
02:15 Eugene My 2c: look up your $DISTRIBUTION's build source, see what it uses
02:16 re1_ joined #git
02:19 pumafied joined #git
02:20 telephone joined #git
02:20 telephone joined #git
02:20 Vortex34 joined #git
02:22 gordonfish Eugene: Thanks but this on a custom linux machine I'm currently doing work on (this isn't my home machine)
02:28 bannakaffalatta joined #git
02:28 TikityTik joined #git
02:29 auzty joined #git
02:30 MattMaker joined #git
02:30 Cabanossi joined #git
02:31 cqi joined #git
02:32 Masber joined #git
02:35 cam27 joined #git
02:44 Adi joined #git
02:44 jameser joined #git
02:45 dermoth_ joined #git
02:48 chachasmooth joined #git
02:49 cyphase joined #git
02:53 Masber joined #git
02:53 hexagoxel joined #git
02:54 Adi left #git
02:56 rominronin joined #git
02:58 Darren_ joined #git
03:01 aavrug joined #git
03:01 a_thakur joined #git
03:02 telephone joined #git
03:02 telephone joined #git
03:02 wagle joined #git
03:05 ki0 joined #git
03:07 LordRyan joined #git
03:07 telephone joined #git
03:07 telephone joined #git
03:07 cam27 joined #git
03:09 TbobbyZ joined #git
03:15 xall joined #git
03:15 Cabanossi joined #git
03:16 fbwnd joined #git
03:17 ZexaronS joined #git
03:17 ZexaronS hello
03:18 ZexaronS I updated git and I don't have GitBash anymore, I left the settings same as default installer, I don't think I used different settings when I installed first time
03:18 Emperor_Earth joined #git
03:18 ZexaronS a guide also said it's okay to install onto an already installed version, the installer seemed to also not have a problem with it
03:18 scoobert1on joined #git
03:19 ZexaronS that's not that of a big deal since im a new user completely (windows) - i kinda didn't use it for 3 months, trying to get back into it, need to update a repository
03:20 Rodya_ joined #git
03:22 TbobbyZ joined #git
03:24 jiangpeng joined #git
03:25 theiostream joined #git
03:28 basiclaser joined #git
03:32 Masber joined #git
03:35 adgtl joined #git
03:36 armyriad joined #git
03:41 Cabanossi joined #git
03:43 nexemacs joined #git
03:48 telephone joined #git
03:48 telephone joined #git
03:53 brent__ joined #git
03:57 pwnz0r joined #git
03:57 telephone joined #git
03:57 telephone joined #git
03:59 Test joined #git
04:03 Darren_ joined #git
04:04 telephone joined #git
04:04 telephone joined #git
04:10 SwiftMatt joined #git
04:11 Cabanossi joined #git
04:15 h12o joined #git
04:15 raspado joined #git
04:15 tsetair_ joined #git
04:17 kyan joined #git
04:20 beautifulmind joined #git
04:21 Rodya_ joined #git
04:25 fakenerd joined #git
04:27 jeffreylevesque joined #git
04:28 rominronin joined #git
04:29 menip joined #git
04:30 a3Dman joined #git
04:30 _ikke_ ZexaronS: The latest version should still contain git bash
04:31 ZexaronS maybe it only forgot the shortcut
04:31 MattMaker joined #git
04:31 ZexaronS Oh lol, now i see it
04:47 fbwnd joined #git
04:48 ayogi joined #git
04:48 stepho joined #git
04:49 stepho joined #git
04:50 Levex joined #git
04:51 brent__ joined #git
04:53 lassemaster joined #git
04:54 Levex joined #git
04:55 theiostream joined #git
04:57 ki0_ joined #git
04:57 telephone joined #git
04:57 telephone joined #git
04:57 Bock joined #git
05:01 freimatz joined #git
05:05 freddy_ joined #git
05:07 a3Dman joined #git
05:08 dave0x6d joined #git
05:08 jiangpeng joined #git
05:09 maryo joined #git
05:10 muehle joined #git
05:10 muehle joined #git
05:10 muehle joined #git
05:11 muehle joined #git
05:11 muehle joined #git
05:11 muehle joined #git
05:16 MineCoins joined #git
05:16 freddy_ joined #git
05:18 brent__ joined #git
05:19 fbwnd joined #git
05:20 Darren_ joined #git
05:23 Rodya_ joined #git
05:24 rchavik joined #git
05:24 mentazoom joined #git
05:27 theiostream joined #git
05:27 oskarkv joined #git
05:28 ploop joined #git
05:32 rscata joined #git
05:33 ivo_ joined #git
05:34 fakenerd joined #git
05:35 indistylo joined #git
05:36 a3Dman joined #git
05:39 albel727 joined #git
05:39 todd_dsm_ joined #git
05:40 Raging_Hog joined #git
05:41 fakenerd_ joined #git
05:42 Cabanossi joined #git
05:42 TheSimonator joined #git
05:42 Levex joined #git
05:43 fbwnd joined #git
05:44 dersand joined #git
05:44 qt-x joined #git
05:45 telephone joined #git
05:45 telephone joined #git
05:46 Doginal joined #git
05:51 fakenerd joined #git
05:52 schleppel joined #git
05:53 telephone joined #git
05:53 telephone joined #git
05:54 NotKyros joined #git
05:54 rokups joined #git
05:55 ThomasLocke joined #git
05:56 bertschneider joined #git
05:56 overlord_tm joined #git
05:57 theiostream joined #git
05:57 pwnz0r joined #git
05:59 kbeflo joined #git
06:00 rominronin joined #git
06:01 kbeflo joined #git
06:02 kbeflo joined #git
06:02 zhuyue_ joined #git
06:03 h12o joined #git
06:06 zhuyue_ left #git
06:06 kbeflo joined #git
06:06 zhuyue_ joined #git
06:06 mSSM joined #git
06:11 Cabanossi joined #git
06:12 zhuyue__ joined #git
06:14 freddy_ joined #git
06:14 fhackdroid joined #git
06:14 zhuyue joined #git
06:15 freddy___ joined #git
06:15 osse Did you shit bricks?
06:16 ploop joined #git
06:17 Doginal joined #git
06:21 zhuyue_ joined #git
06:21 acetakwas joined #git
06:23 sbulage joined #git
06:23 zhuyue_ joined #git
06:24 zhuyue__ joined #git
06:25 freimatz joined #git
06:26 jagob joined #git
06:27 telephone joined #git
06:27 telephone joined #git
06:27 freddy_ joined #git
06:27 a3Dman joined #git
06:27 a3Dman joined #git
06:28 freddy___ joined #git
06:30 freddy___ joined #git
06:31 Silmarilion joined #git
06:32 MattMaker joined #git
06:32 Guest32186 joined #git
06:36 JeroenT joined #git
06:36 Murii joined #git
06:38 ksmth joined #git
06:38 ksmth hey everyone
06:38 gitinfo ksmth: 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.
06:39 ksmth I am looking for a way to run a script for a list of git commits - that is, something that checks out a revision, runs the script (which will generate files), then checks out the next revision in the list and runs the command etc.
06:40 zhuyue_ joined #git
06:40 kadoban Is one of the filter-branches appropriate?
06:40 ksmth I've tried using my google chops, but ... well, I haven't found anything too useful, but I can't be the first one to need something like this. Any ideas / pointers?
06:41 netj joined #git
06:41 a3Dman joined #git
06:41 ksmth And I don't want to modify the repository / history at all, I want to collect data based on the git history - i.e. number linter errors at a specific point in time
06:42 axisys joined #git
06:42 telephone joined #git
06:42 telephone joined #git
06:43 _ikke_ ksmth: for commit in $(git rev-list); do git checkout $commit; {collect stats}; done
06:45 zedhach joined #git
06:46 lipepengo joined #git
06:47 lipepengo joined #git
06:47 zhuyue__ joined #git
06:50 cebor joined #git
06:50 govg joined #git
06:51 ploop joined #git
06:54 chele joined #git
06:55 rasto joined #git
06:56 rominronin joined #git
06:56 ronskisika joined #git
06:56 tarkus joined #git
06:58 tnecniv joined #git
06:58 zhuyue_ joined #git
07:01 zeroed joined #git
07:01 zeroed joined #git
07:01 fakenerd joined #git
07:03 BorkStick joined #git
07:04 JeroenT joined #git
07:07 chigang joined #git
07:07 miczac joined #git
07:07 cdown joined #git
07:08 trudko joined #git
07:08 sz0 joined #git
07:08 trudko hi everyone I am in middle of the conflict and I would like to see their version of file to know how it look like
07:09 osse trudko: git show :3:full/path
07:09 flaviodesousa joined #git
07:10 a3Dman joined #git
07:10 a3Dman joined #git
07:11 zhuyue joined #git
07:11 ogny joined #git
07:11 sunri5e joined #git
07:12 ksmth _ikke_: thanks. need to improve my bash :)
07:12 zhuyue_ joined #git
07:13 alcohol joined #git
07:13 a_thakur joined #git
07:14 zerow joined #git
07:15 zhuyue_ joined #git
07:16 zhuyue_ joined #git
07:16 manuelschneid3r joined #git
07:16 Godfather_ joined #git
07:17 miczac_ joined #git
07:18 zhuyue_ joined #git
07:19 fakenerd joined #git
07:21 _flow_ joined #git
07:21 kutenai Ack. I've been trying to read up and understand a problem with CRLF and LF for about an hour and a half. I can't figure out why git is checking out files with CRLF on my mac.
07:21 zhuyue__ joined #git
07:22 kutenai I've checked all of the settings I now about... git config --global core.autocrlf is set to input.
07:22 AlkindiX joined #git
07:22 zefferno joined #git
07:22 _ikke_ kutenai: any .gitattribute file?
07:23 osse kutenai: what if you drop the "--global"
07:23 a3Dman joined #git
07:23 fakenerd_ joined #git
07:23 osse and maybe the files actually are CRLF in the repo
07:23 kutenai With and without global it is input.
07:23 kutenai I have a .gitattributes also
07:23 _ikke_ what's in there?
07:24 kutenai I've been messing with that, to try and make it work
07:24 elect joined #git
07:24 freddy_ joined #git
07:24 kutenai https://pastebin.com/gwgF4hWq
07:25 Rodya_ joined #git
07:25 kutenai That is it now. I removed the "* text=auto" line
07:25 beautifulmind joined #git
07:26 noark9 joined #git
07:26 kutenai Hmm. Maybe I've finally got it..
07:26 kutenai I have to addmit it's quite confusing.
07:27 kutenai It's causing build issues on circleci, because the repo was getting checkout out dirty, wanting to update some files.
07:27 kutenai I think that some files somehow got checked in with CRLF...
07:28 govg joined #git
07:29 manuelschneid3r joined #git
07:30 osse kutenai: git show :/full/path | file   will tell you
07:30 theoceaniscool joined #git
07:31 osse file -
07:33 zhuyue_ joined #git
07:33 MACscr joined #git
07:33 kutenai Yes, finally it's working. And the circleci build worked also.. Yeah
07:34 XenophonF joined #git
07:34 beautifulmind joined #git
07:34 Masber joined #git
07:37 TheKyros joined #git
07:38 Vinnie_win_t joined #git
07:38 Lunatrius` joined #git
07:38 shawn joined #git
07:39 Sein joined #git
07:39 Xenophon2 joined #git
07:39 berndj-blackout joined #git
07:39 wcpan_ joined #git
07:40 BinGOs_ joined #git
07:40 robogoat_ joined #git
07:40 deltab_ joined #git
07:40 BeerSerc_ joined #git
07:40 heroux_ joined #git
07:40 salamanderrake_ joined #git
07:41 chovy__ joined #git
07:41 _builtin joined #git
07:41 ejnahc_ joined #git
07:41 gusnan joined #git
07:41 gusnan joined #git
07:41 PasiFist joined #git
07:41 Celelibi joined #git
07:41 doppo joined #git
07:42 ploop_ joined #git
07:42 puff joined #git
07:42 telephone joined #git
07:42 telephone joined #git
07:42 netroxen joined #git
07:43 LordRyan joined #git
07:44 zhuyue__ joined #git
07:45 manuelschneid3r joined #git
07:45 tg joined #git
07:47 King_Hual joined #git
07:49 a3Dman joined #git
07:49 prg3 joined #git
07:50 dvaske joined #git
07:51 h12o joined #git
07:58 MineCoins joined #git
07:58 lordjancso joined #git
07:58 zhuyue joined #git
07:59 jiangpeng joined #git
08:00 zeroed joined #git
08:00 zeroed joined #git
08:01 ferr joined #git
08:01 theiostream joined #git
08:02 GT4066 joined #git
08:05 mikecmpbll joined #git
08:06 pbandark joined #git
08:06 skunkz joined #git
08:07 zhuyue_ joined #git
08:09 amrits joined #git
08:09 redeemed joined #git
08:09 pbandark joined #git
08:09 a_thakur joined #git
08:11 ArchNoob joined #git
08:11 a3Dman joined #git
08:12 aax joined #git
08:12 darkbit joined #git
08:13 zhuyue joined #git
08:17 gunnaro joined #git
08:18 oskarkv joined #git
08:21 XenophonF joined #git
08:22 zhuyue joined #git
08:23 zhuyue left #git
08:23 ki0 joined #git
08:26 Rodya_ joined #git
08:27 slidercrank joined #git
08:27 a3Dman joined #git
08:27 fakenerd joined #git
08:27 zhuyue joined #git
08:29 BinGOs_ left #git
08:29 dsdeiz joined #git
08:30 BinGOs joined #git
08:31 przemoc joined #git
08:32 govg joined #git
08:32 zhuyue1 joined #git
08:32 re1 joined #git
08:33 Acerific joined #git
08:33 Acerific joined #git
08:35 finalbeta joined #git
08:36 a_thakur joined #git
08:37 basy joined #git
08:37 dre_ joined #git
08:39 basy joined #git
08:39 MrMojit0 joined #git
08:40 fakenerd joined #git
08:41 ronskisika joined #git
08:42 chll_ joined #git
08:44 bvtton joined #git
08:44 felixjet joined #git
08:45 seni joined #git
08:47 cstratak joined #git
08:48 a3Dman joined #git
08:55 imack joined #git
08:55 fhackdroid joined #git
08:58 freddy_ joined #git
08:59 sarri joined #git
08:59 sarri joined #git
09:01 a_thakur joined #git
09:02 TbobbyZ joined #git
09:03 achadwick joined #git
09:03 steven joined #git
09:07 leeN joined #git
09:07 Dev0n joined #git
09:10 bomb-on joined #git
09:11 Cabanossi joined #git
09:11 a3Dman joined #git
09:12 Tuor joined #git
09:12 Tuor joined #git
09:12 peacememories joined #git
09:16 PCatinean joined #git
09:17 PCatinean after doing reset --hard
09:17 PCatinean how do I get back to my previous commit form local git history?
09:17 osse PCatinean: Reset --hard with no other args?
09:17 kadoban PCatinean: Are you talking about the reflog? 'git reflog' should show it to you, or if that's messy, 'git reflog thebranch'
09:17 PCatinean osse, with a commit hash
09:18 PCatinean aha yes reflog, then I checkout hash from reflog?
09:18 PCatinean or reset to it?
09:18 osse PCatinean: reset --hard HEAD@{1}
09:18 osse yes
09:18 kadoban Whichever you like
09:19 Tobbi joined #git
09:21 PCatinean pfu thanks guys :D
09:21 TbobbyZ joined #git
09:21 PCatinean I really have to remember that reflog
09:22 * PCatinean takes a respectful bow
09:22 PCatinean Got me out of this one :))
09:23 aard joined #git
09:24 a3Dman joined #git
09:26 fakenerd_ joined #git
09:27 Rodya_ joined #git
09:29 sonOfRa joined #git
09:30 ArchNoob joined #git
09:31 netroxen joined #git
09:31 felixjet joined #git
09:32 fakenerd joined #git
09:33 Tykling joined #git
09:34 indistylo joined #git
09:35 fakenerd_ joined #git
09:38 a3Dman joined #git
09:39 h12o joined #git
09:41 govg joined #git
09:41 Cabanossi joined #git
09:42 Endarked joined #git
09:49 navidr joined #git
09:50 a3Dman joined #git
09:51 leeN joined #git
09:51 ams__ joined #git
09:57 holodoc joined #git
10:00 borkr joined #git
10:01 marianina8 joined #git
10:01 seni joined #git
10:04 ki0_ joined #git
10:05 finalbeta joined #git
10:05 theoceaniscool joined #git
10:06 a3Dman joined #git
10:06 a3Dman joined #git
10:11 fakenerd joined #git
10:11 Cabanossi joined #git
10:13 felGru joined #git
10:14 bathtub_shark joined #git
10:14 Tykling joined #git
10:18 MattMaker joined #git
10:21 a3Dman joined #git
10:24 cstratak joined #git
10:25 fakenerd joined #git
10:26 warthog9 joined #git
10:26 snowalpaca joined #git
10:26 snowalpa_ joined #git
10:27 Rodya_ joined #git
10:29 Guest62473 joined #git
10:30 HoierM_ joined #git
10:31 seni joined #git
10:31 ivanruizmonjo_ joined #git
10:31 YuGiOhJCJ joined #git
10:32 a_thakur joined #git
10:33 cstratak joined #git
10:34 alexggordon joined #git
10:35 Tobbi_ joined #git
10:41 Snugglebash joined #git
10:42 xtpeeps joined #git
10:42 rominronin joined #git
10:43 a_thakur joined #git
10:44 cousteau joined #git
10:44 cousteau Hi.  Two questions:
10:45 fakenerd joined #git
10:45 cousteau (1) Are git repositories self-contained?  e.g. if I copy my repository from C:\Users\Cousteau\data\my_project to D:\stuff\my_project, will it still work?
10:45 _ikke_ yes
10:46 cousteau (or even worse, to /home/cousteau/work/projects/my_project)
10:46 cousteau good :)
10:46 _ikke_ Well, there are other aspects when moving projects from windows to linux and visa versa
10:46 _ikke_ (configuration mainly)
10:49 cousteau (2) I am using an esoteric operating system whose designers thought it would be an amusing idea to make the standard newline character be CR-LF instead of just LF
10:50 rafalcpp joined #git
10:50 cousteau however when I installed git, I was asked what the default behavior should be, and I went "NL everywhere!"
10:50 osse "esoteric"
10:50 _ikke_ Who would ever do that?!
10:50 cousteau so I guess git is treating CR as just a regular character that appears at the end of each line
10:51 Endarked joined #git
10:51 Xorg joined #git
10:51 Xorg how can i remove ==== from git ?
10:51 cousteau but... what if I share my project with someone who has git, but doesn't have this option?  Is such option saved in the project configuration, or am I mostly screwed?
10:51 _ikke_ cousteau: It has more to do with normalization
10:51 _ikke_ Xorg: !eek
10:51 gitinfo Xorg: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
10:51 cstratak joined #git
10:52 Xenophon1 joined #git
10:52 andai_ joined #git
10:54 osse cousteau: the usual and recommended case: in the git repo all files are LF. In each clone git converts to the native style on checkout and converts back of checkin
10:54 osse *on
10:54 cousteau ah
10:54 cousteau ...well, the git repo is local, so I guess I made the right choice
10:55 cousteau (there were 3 options which I don't remember; I chose the "read NL as is, write NL as is" one iirc)
10:55 osse that's a global default. it can be overriden per repo
10:55 osse I mean a global setting
10:56 freddy_ joined #git
11:01 bvtton joined #git
11:02 cousteau btw, anyone got a time machine I can borrow to go back in time and slap whoever thought this CRLF thing was a good idea until they change their mind?
11:04 theiostream joined #git
11:04 Darcidride joined #git
11:04 osse but the typewrite needs to be fed a new line + the carriage needs to return to the starting position so the typewrite starts writing on the correct position on the paper
11:05 telephone joined #git
11:05 telephone joined #git
11:07 Endarked joined #git
11:09 eb0t joined #git
11:11 ckckck joined #git
11:11 a_thakur joined #git
11:12 Cerise joined #git
11:12 cousteau osse: could put a spring or something
11:12 Cerise joined #git
11:12 dsdeiz_ joined #git
11:13 cousteau hm, I wonder where's ~/.gitconfig on Windows
11:13 cousteau ah, ~ is C:\Users\me
11:15 osse aka ~
11:16 osse cd ~; pwd -W
11:16 tvw joined #git
11:22 a_thakur joined #git
11:23 Guest57538 joined #git
11:24 CussBot joined #git
11:26 sivas joined #git
11:28 jay-m joined #git
11:28 Rodya_ joined #git
11:28 Shock_ joined #git
11:29 telephone joined #git
11:29 telephone joined #git
11:32 XenophonF joined #git
11:33 JeroenT joined #git
11:34 sbulage joined #git
11:35 ronskisika joined #git
11:38 jeffreylevesque_ joined #git
11:38 theoceaniscool joined #git
11:40 Acerific joined #git
11:40 Acerific joined #git
11:41 Cabanossi joined #git
11:41 Starky joined #git
11:47 jameser joined #git
11:47 finalbeta joined #git
11:50 maroloccio joined #git
11:50 cam27 joined #git
11:52 fakenerd joined #git
11:53 scoobertron joined #git
11:55 telephone joined #git
11:55 telephone joined #git
11:56 Achylles joined #git
11:57 Levex joined #git
11:59 synthroid joined #git
12:00 a_thakur joined #git
12:01 Tobbi joined #git
12:03 alexandre9099 joined #git
12:04 _ng joined #git
12:07 seni joined #git
12:11 Shock_ joined #git
12:12 thiago joined #git
12:13 a_thakur joined #git
12:14 govg joined #git
12:15 earnestly joined #git
12:20 MattMaker joined #git
12:20 xtpeeps joined #git
12:22 ziombelas joined #git
12:23 alexggordon joined #git
12:24 dave0x6d joined #git
12:24 aruns joined #git
12:27 jameser joined #git
12:27 h12o joined #git
12:29 Rodya_ joined #git
12:29 snowalpaca joined #git
12:29 ki0 joined #git
12:29 gingitsune joined #git
12:30 ki0 joined #git
12:31 JanC_ joined #git
12:32 Whiskey joined #git
12:33 ankit01ojha joined #git
12:35 notebox joined #git
12:40 telephone joined #git
12:40 telephone joined #git
12:40 perlpilot joined #git
12:43 Starky joined #git
12:43 Nilesh_ joined #git
12:49 ntnn joined #git
12:52 peacememories joined #git
12:53 tymczenko joined #git
12:55 telephone joined #git
12:55 telephone joined #git
12:57 HoierM joined #git
12:57 Levex joined #git
12:57 TinkerTyper joined #git
12:57 Doros joined #git
12:58 brent__ joined #git
12:59 TobiX joined #git
12:59 TobiX Hi!
13:00 dsdeiz joined #git
13:00 dsdeiz joined #git
13:01 ToBeCloud joined #git
13:02 TheSimonator joined #git
13:03 tkore joined #git
13:03 tkore joined #git
13:03 TobiX I have a problem with rebase.autoStash. At least I think it's a problem with autoStash: I have set rebase.autoStash=true and pull.rebase=true and for some releases this did an autostash on a plain "git pull". I recently updated git (to 2.12.2) and now "git pull" doesn't autoStash anymore...
13:04 karols146 joined #git
13:06 UrsoBranco joined #git
13:07 Gsham joined #git
13:13 am55 joined #git
13:14 jackrandom joined #git
13:14 jeffreylevesque joined #git
13:15 jimmyrcom joined #git
13:15 ivanruizmonjo__ joined #git
13:17 Otg joined #git
13:18 h12o joined #git
13:18 telephone joined #git
13:18 telephone joined #git
13:19 freddy_ joined #git
13:19 fakenerd joined #git
13:21 geoid joined #git
13:22 Ryanar joined #git
13:23 relipse joined #git
13:24 Impaloo joined #git
13:28 telephone joined #git
13:28 telephone joined #git
13:28 khfeng joined #git
13:29 TheMontyChrist joined #git
13:29 TheMontyChrist joined #git
13:29 TheMontyChrist joined #git
13:29 Rodya_ joined #git
13:30 TheMontyChrist suppose I do a commit and it's revision 0xdeadbeefcafebabe
13:30 TheMontyChrist I'd like to see the who repor @ that version
13:30 TheMontyChrist who to do this?
13:30 TheMontyChrist is there a tool?
13:30 TheMontyChrist w/o having to check it out.
13:31 osse Who committed it?
13:31 TheMontyChrist git-cola or gitk do this?
13:31 TheMontyChrist me
13:31 osse Whst do you want to see?
13:31 TheMontyChrist I deleted some files and I want them back
13:31 TheMontyChrist already commited the delete a 4-5 commits back
13:31 TheMontyChrist a -> about
13:32 osse git checkout 0xdeadbeefcafebabe -- files here
13:32 TheMontyChrist shoot
13:32 TheMontyChrist okay
13:32 ExoUNX joined #git
13:32 osse Or if that's the commit you deleted them in:
13:32 TheMontyChrist in tortoise mercurcial I could view the entire tree @ a revsion and just cherry pick the files.
13:32 osse git checkout 0xdeadbeefcafebabe~1 -- files here
13:33 TheMontyChrist well, I"m not talking git cherry pick - I don't know what that even is.
13:33 osse Whyte do you menr cherry pick
13:34 osse Why
13:34 osse Jesus. Why do you mention
13:34 TheMontyChrist imagine you had a file explorer for your project, and you just can just pick the revision you want.  I can just select the file and save
13:34 TheMontyChrist I forgot git has this "cherry pick" functionality
13:35 Rodya_ joined #git
13:35 TheMontyChrist I was using cherry pick, "select that you want w/o having to checkout the entire thing.."
13:35 osse Ahh, cherry pick us for copying changes, not contents as a whole
13:35 lewix joined #git
13:36 TheMontyChrist in tortoise mercurcial I could view the entire tree @ a revsion and just cherry pick the files. -> in tortoise mercurcial I could view the entire tree @ a revsion and just pick the files that I want.
13:36 tmsmith joined #git
13:39 Zialus joined #git
13:40 arooni joined #git
13:41 freddy_ joined #git
13:41 Cabanossi joined #git
13:42 finalbeta joined #git
13:42 marianina8 joined #git
13:43 ZexaronS is there a command in CMD that let's me see info on current things/repos
13:43 ZexaronS what forks and clones are setup, etc
13:43 ExoUNX joined #git
13:44 hashpuppy joined #git
13:47 cousteau should .gitignore be ignored, or not?
13:47 selckin no
13:47 cousteau ok, whew
13:48 AaronMT joined #git
13:52 gnixev joined #git
13:52 basiclaser joined #git
13:54 h12o joined #git
13:54 rmesta joined #git
13:55 Gsham joined #git
13:56 gnixev joined #git
13:56 dglambert joined #git
13:56 dglambert yo
13:57 Endarked joined #git
13:58 Dougie187 joined #git
13:58 xFacTioNx joined #git
13:58 xFacTioNx left #git
13:59 noark9 joined #git
13:59 cousteau so I made a branch (to which I intended to commit stuff), but then realized my project should include extra files, so I went back to master and made a commit that made those changes
14:00 cousteau then made some branches from master
14:00 cousteau so right now I have   (first commit) <-- branch1 <-- master <-- other branches
14:00 cdg joined #git
14:01 cousteau is there an easy way to move branch1 to master?  I could delete the branch and recreate it, but if that could be avoided...
14:01 doMynation joined #git
14:01 Endarked joined #git
14:03 ZexaronS Is there a way to set default path for Git CMD ?
14:04 * cousteau decided to delete the branch and create it again
14:05 lb1c joined #git
14:06 theiostream joined #git
14:07 VladGh joined #git
14:09 LeBlaaanc joined #git
14:11 ResidentBiscuit joined #git
14:11 theoceaniscool joined #git
14:11 tribly joined #git
14:12 copypasteque joined #git
14:12 bvtton joined #git
14:12 Ryanar joined #git
14:17 dedicated joined #git
14:18 VladGh_ joined #git
14:18 telephone joined #git
14:18 telephone joined #git
14:18 jagob joined #git
14:18 griff joined #git
14:19 ExpiredDev joined #git
14:20 MattMaker joined #git
14:21 zeroed joined #git
14:21 zeroed joined #git
14:21 boombatower joined #git
14:22 NeXTSUN joined #git
14:24 ExoUNX joined #git
14:25 telephone joined #git
14:25 telephone joined #git
14:25 khfeng joined #git
14:26 h12o joined #git
14:26 Hko ZexaronS: Not sure if it is what you're looking for but try: export GIT_DIR=/path/to/your/project/.git
14:26 MarioBranco joined #git
14:26 notebox joined #git
14:26 Cabanossi joined #git
14:27 ZexaronS What will it do?
14:27 ZexaronS I meant, when I start CMD, it starts in the directory of the project
14:28 snowkidind joined #git
14:28 Hko Whe you're in your project directory git will look in ./.git/ directory for its data. After " export GIT_DIR=/path/to/your/project/.git" it will use data from there not matter what your working directoy is
14:30 Hko Not genrally recommended though. What is it that you want to solve exacly?
14:30 miczac joined #git
14:32 jameser joined #git
14:32 mikecmpbll joined #git
14:32 hvxgr joined #git
14:33 re1_ joined #git
14:34 Khisanth joined #git
14:35 felixjet joined #git
14:35 tymczenko joined #git
14:36 perlpilot joined #git
14:37 Brski joined #git
14:38 rominronin joined #git
14:39 adac joined #git
14:40 adac git fetch; git reset --hard origin/master
14:40 adac is there a way to do --hard for all branches, no matter in which branch I currently am?
14:41 DocWinter joined #git
14:42 moritz adac: are you trying to build a mirror?
14:42 osse adac: no, but you can fake it with  'git push -f . origin/foo:foo'
14:42 Gsham joined #git
14:43 adac moritz, osse actually what I do with this  git reset --hard origin/master is to overwrite all local changes
14:43 adac and this should be beste for all branches
14:43 adac *best
14:44 noark9 joined #git
14:46 moritz adac: but why?
14:46 al-damiri joined #git
14:47 menip joined #git
14:47 adac moritz, becuase sometimes I make some manual changes on my server config git repos, and then on a re-deploy these changes should be overwritten
14:47 publio joined #git
14:47 muehle joined #git
14:48 TomyLobo3 joined #git
14:48 * moritz points to !deploy
14:48 moritz !deploy
14:48 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:49 moritz but I really recommend to build proper packages from your software or configuration instead of using git as a deployment tool
14:49 Kyros joined #git
14:50 NeXTSUN joined #git
14:51 yanome joined #git
14:51 adac moritz, actually I have some scripts in my server repo which I need for an ansible deployment
14:51 dreiss joined #git
14:51 adac it works just fine like that for my use case atm
14:51 jagob joined #git
14:52 StephenS joined #git
14:52 StephenS is there any webhook or whatever when new commits occurs under the branch <master>?
14:52 StephenS I am aware I could utilize git log, but that won't be efficient
14:53 mikecmpbll joined #git
14:54 moritz StephenS: depends on the server software you're using
14:54 moritz StephenS: gitlab, github and bitbucket all support webhooks
14:54 StephenS I'm talking about git protocol itself
14:54 StephenS I'm not using any server software, I have my own git repo on a self-hosted server.
14:55 BrownBear joined #git
14:55 moritz then you probably have a git repo on that server
14:55 StephenS ?
14:55 StephenS yes I do have a git repo on a self-hosted server and I think this is what I need https://git-scm.com/book/gr/v2/Customizing-Git-Git-Hooks
14:56 moritz and can use the .git/hooks (or just hooks/) dir
14:56 matsaman joined #git
14:57 _ng joined #git
14:57 Tobbi joined #git
14:58 a_thakur joined #git
14:58 StephenS yap guess thats it
14:58 XenophonF joined #git
14:58 Guest48456 joined #git
15:05 ahrs joined #git
15:05 zivester joined #git
15:06 jedahan joined #git
15:06 seni joined #git
15:06 Starky joined #git
15:07 cdown joined #git
15:08 felixjet_ joined #git
15:10 __rgn joined #git
15:10 zivester joined #git
15:11 jay-m joined #git
15:13 reactormonk[m] joined #git
15:15 _flow_ joined #git
15:17 a_thakur joined #git
15:20 Snugglebash joined #git
15:21 zivester joined #git
15:22 ExpiredDev joined #git
15:22 Darren_ joined #git
15:27 theoceaniscool joined #git
15:33 Gustavo6046 joined #git
15:34 _Mica_ joined #git
15:34 cdown joined #git
15:35 _Mica1 joined #git
15:36 aviraldg joined #git
15:36 heftig joined #git
15:36 ajeremias joined #git
15:36 spinningarrow[m] joined #git
15:36 saintaquinas[m] joined #git
15:36 elwan7[m] joined #git
15:36 monomon[m] joined #git
15:36 am2on joined #git
15:36 dikiaap joined #git
15:36 Elliott[m]1 joined #git
15:36 jascot[m] joined #git
15:36 KevinMGranger joined #git
15:36 unclechu joined #git
15:36 dyce[m] joined #git
15:36 anolir joined #git
15:36 flo[m] joined #git
15:36 M-meznak joined #git
15:36 hiq[m] joined #git
15:36 musicmatze[m] joined #git
15:36 SpEcHiDe joined #git
15:36 UncleCJ joined #git
15:36 Remramm joined #git
15:36 swalladge[m] joined #git
15:36 logos[m] joined #git
15:36 timlyo[m] joined #git
15:36 patrickr[m] joined #git
15:36 _Mica1 left #git
15:36 Retropikzel[m] joined #git
15:36 svm_invictvs joined #git
15:37 grill joined #git
15:37 grill hey. i just did a rebase and lost some of my (uncommited) code from before the rebase. how can i get it back?
15:38 Murii joined #git
15:38 shinnya joined #git
15:39 rominronin joined #git
15:39 grill it looks like git simply ignored all my local changes and removed them
15:40 _ikke_ grill: git does not even let you rebase when you have local changes
15:40 grill ah there we go
15:40 grill i had my changes stashed.
15:40 _ikke_ :-)
15:41 Starky joined #git
15:43 doener joined #git
15:44 gordonfish Hmm. I can build git 2.12.2 from source tarball (the system I'm doing this for needs this) and even though I'm giving --with-curl=/path/to/curl-prefix to ./cofigure, no git-remote-{http,https,ftp,ftps} are produced.
15:44 grill left #git
15:45 gordonfish Anyone know why this would happen when they were produced in the same system, using the same curl (7.40.0) and everything else, when building earlier git versions (like 2.6.3) ?
15:45 gordonfish curl itself can fetch urls using those protocols just fine.
15:46 ivanruizmonjo__ joined #git
15:46 Jackneillll hey
15:46 gitinfo Jackneillll: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
15:48 _Mica_ joined #git
15:50 brent__ joined #git
15:50 synthroi_ joined #git
15:50 gordonfish Any idea?
15:51 Tobbi joined #git
15:52 _Mica_ left #git
15:52 zacts joined #git
15:56 telephone joined #git
15:56 telephone joined #git
15:56 Gsham joined #git
15:56 maarhart joined #git
15:58 raspado joined #git
15:58 gordonfish Oh bloody hell. I think I found the culprit in config.log, lines like /path/to/curl/lib/libcurl.so: undefined reference to `RTMP_Init', looks like I need to prefix ./configure with LDFLAGS=-lrtmp
16:01 * gordonfish feels like a real git for not checking config.log earlier, in addition to having checked config.status already...
16:02 MarioBranco joined #git
16:02 madewokherd joined #git
16:03 tsetair__ joined #git
16:03 CountryNerd joined #git
16:03 dvaske_ joined #git
16:04 nexemacs joined #git
16:04 Tuor joined #git
16:05 physicalist joined #git
16:07 kfoonamalik joined #git
16:08 telephone joined #git
16:08 telephone joined #git
16:10 fahadash joined #git
16:12 PioneerAxon joined #git
16:13 tlaxkit joined #git
16:16 sandroqz joined #git
16:17 pumafied joined #git
16:17 kpease joined #git
16:19 harha_ joined #git
16:20 harha_ Hey, I need to migrate some svn trunk repos to git. I got git svn init, clone etc kinda working with MSYS2 but now I need to specify ssh credentials. Tortoiseplink doesn't work with msys2. :S How can I input username & password into the command for fetch, etc..? svn+ssh://username:password@domain.com/path/to/svn/trunk doesn't work, only the username part works, password is not parsed.
16:21 mel00010 joined #git
16:21 MattMaker joined #git
16:21 harha_ I was able to start fetchin the svn repo's trunk but it kept asking for password all the time, I could not complete the process...
16:24 dvaske joined #git
16:25 a_thakur joined #git
16:25 dvaske_ joined #git
16:25 pumafied joined #git
16:26 Cabanossi joined #git
16:27 tnecniv joined #git
16:27 miczac joined #git
16:27 svm_invictvs joined #git
16:28 jesst joined #git
16:30 durham joined #git
16:30 PettanShoutaKun joined #git
16:30 PettanShoutaKun git config --add core.longpaths true  fatal: not in a git directory
16:30 pifon joined #git
16:30 PettanShoutaKun why do I have to be in a git directory to change this option?
16:30 nixjdm joined #git
16:31 imack joined #git
16:31 selckin --global
16:31 imack joined #git
16:32 TikityTik joined #git
16:32 tarkus joined #git
16:33 PettanShoutaKun I'm sure nothing bad can happen by adding this manually to all my jenkins jobs... "git config --global --add core.longpaths true"
16:34 Orbitrix joined #git
16:35 Orbitrix joined #git
16:35 harha_ I think I got this git svn thing working using sshpass MSYS2 package..
16:35 Introoter joined #git
16:36 foreal joined #git
16:38 basy_ joined #git
16:41 souther joined #git
16:41 s1scha joined #git
16:41 PettanShoutaKun thank you for that fix by the way
16:42 kpease joined #git
16:45 jozwior joined #git
16:45 zhodge joined #git
16:45 cdg_ joined #git
16:46 TikityTik joined #git
16:47 Tuor joined #git
16:47 Tuor joined #git
16:52 cdg joined #git
16:55 theoceaniscool joined #git
16:57 souther joined #git
16:59 matsaman there's not a better way to change line endings than with a single dedicated commit, right?
17:00 mikecmpbll joined #git
17:01 ilikeme5 joined #git
17:02 synthroid joined #git
17:02 zhodge matsaman: I'm reading up on line endings as well
17:02 zhodge and I assume you want to change CRLF -> LF
17:03 ilikeme5 left #git
17:03 doMynation joined #git
17:03 mjuszczak joined #git
17:04 telephone joined #git
17:04 telephone joined #git
17:05 Ryanar joined #git
17:05 souther joined #git
17:06 matsaman zhodge: yes indeed, I want proper line endings =P
17:07 matsaman I'm on the fence about it, because they obviously can matter
17:07 matsaman but I also don't really want to have a single commit just for changing line endings if I can help it =P
17:07 matsaman and I know you can tell git to presume or auto convert or something
17:07 matsaman maybe I can do that as a one-off
17:08 theiostream joined #git
17:08 robattila256 joined #git
17:10 zhodge my thought would be to make the line endings fix commit
17:11 cdg joined #git
17:11 rominronin joined #git
17:11 Random832 matsaman, if it helps, you can make diff and blame ignore line ending changes.
17:11 Random832 and merge etc
17:11 Random832 so having the line ending changes in there won't mess things up
17:11 zhodge and ensure that core.autocrlf is set properly on systems that have access to your repo
17:12 zhodge then there's the 'new system' as described by http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
17:12 ExoUNX_ joined #git
17:12 zhodge where you define the paths that get the CRLF -> LF treatment
17:13 zhodge in .gitattributes
17:13 MarioBranco joined #git
17:14 matsaman yeah core.autocrlf is the opposite of what I want, I think
17:14 matsaman I definitely want the line endings to be LF in the repo
17:14 matsaman I'd just like to avoid boring commits
17:15 YuGiOhJCJ joined #git
17:16 Random832 matsaman, well, you could use filter-branch to fix all the line endings from the beginning. at the cost of invalidating all of your commit hashes, anyone who has clones of your repo, etc
17:16 zhodge as far as I know, core.autocrlf is exactly what you want
17:17 zhodge i.e. set it to true on Windows systems so that CRLF nevers makes it in the repo
17:17 matsaman my reading of core.autocrlf is that your local git will pretend that you're already using line endings you prefer
17:17 matsaman rather than the line endings _actually being that way, always_
17:17 Doginal joined #git
17:17 Random832 well if you have CRLF in your repository *now*
17:17 Random832 then you have three options
17:17 Random832 1. change it all with one commit (boring commit)
17:17 NeXTSUN joined #git
17:17 * matsaman smiles in anticipation
17:18 matsaman 1 scares me, because line endings unfortunately do occasionally matter
17:18 Random832 2. change it with filter-branch or something like (as mentioned, cost of changing history)
17:18 matsaman yeah, can't do that, that's anti-VCS =)
17:18 Random832 3. change it with each file whenever you make a commit touching that file
17:18 matsaman that's what I'm staring at, yeah
17:19 Random832 the main downside with 3 is that the boundary across which you've got to pass special options to diff/blame/merge/etc for them to work right is less clear
17:19 zhodge seems like 1 is the best, no?
17:19 matsaman zhodge: I would say so _if_ line endings never mattered
17:19 matsaman or if you had exhaustive testing
17:19 Random832 i *think* there's an option you can pass to autocrlf which will fix the line endings whenever you touch a file
17:19 matsaman we don't have exhaustive testing, and I don't have time to ensure every last line ending change won't break something
17:20 mrkake joined #git
17:20 matsaman well I'm willing to make a single commit, separate from my actual meaningful changes, for swapping out line endings
17:20 matsaman that should be safe, but just make an ugly boring commit =P
17:20 orbyt_ joined #git
17:20 netj joined #git
17:21 barteks2x joined #git
17:21 matsaman and maybe I'll ask Windows users to config against CRLF
17:21 s1scha joined #git
17:21 matsaman thanks all =)
17:21 Hobbyboy joined #git
17:21 Ryanar joined #git
17:21 zhodge matsaman: :)
17:22 ki0_ joined #git
17:22 zhodge it does make sense to be cautious
17:22 matsaman or, hum, maybe just .gitattributes for them, for going forward
17:23 zhodge well a .gitattributes for your repo
17:23 zhodge so that you don't need to depend on their config
17:24 johannish joined #git
17:24 finalbeta joined #git
17:26 johannish This may be a git issue, or a git-for-windows issue: has anyone ever seen `git add .` discard all changes to the working directory?
17:26 johannish I'm suspecting a bug in core.fscache, but I have no leads yet.
17:27 PettanShoutaKun Try --always, or create some tags.
17:27 PettanShoutaKun what does that mean?
17:27 gingitsune joined #git
17:28 PettanShoutaKun I guess I should mention.... git describe --tag
17:30 robert45 joined #git
17:31 clickjack joined #git
17:34 synthroi_ joined #git
17:34 miczac joined #git
17:36 Impaloo joined #git
17:36 acln joined #git
17:37 TheSimonator joined #git
17:38 jargonjunkie joined #git
17:38 physicalist joined #git
17:41 synthroid joined #git
17:42 tyreld joined #git
17:43 gugah joined #git
17:43 relipse joined #git
17:43 dreiss joined #git
17:44 maarhart joined #git
17:44 matsaman zhodge: do you know of a way to do a .gitattributes so new files are forced as LF, but existing files are left alone until edited?
17:44 matsaman or is that how it works by defualt?
17:44 matsaman default*
17:45 jast it is
17:45 jast the conversion happens when you stage a new version of a file
17:45 jast all you need to do is use .gitattributes to tell git which files to convert
17:45 jast !crlf
17:45 gitinfo to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/
17:46 brent__ joined #git
17:46 PioneerAxon joined #git
17:46 xtpeeps joined #git
17:48 bertschneider joined #git
17:50 matsaman so I could just have '* text'?
17:51 matsaman or would that b0rk binary files
17:51 ExoUNX joined #git
17:51 matsaman in which case I'd need to take account of all the usual filename extensions in the repo, and list them individually, explicitly
17:53 johannish I'll reframe my earlier question, as if someone had seen `git add .` obliterate their changes, my google search probably would have turned something up...
17:54 johannish Assuming that `git add .` correctly added my files to the index, then something did a reset, are those changes still available in an object file somewhere?
17:54 johannish If so, how would I go about finding items previously stored in the index?
17:55 Cavallari joined #git
17:55 jast matsaman: there's text=auto if you're lazy. the auto-detection can fail in some corner cases, so if you want to be sure, use a proper list of extensions
17:56 marianina8 joined #git
17:57 atomi joined #git
17:58 matsaman thanks =)
17:59 tymczenko joined #git
18:00 cagomez joined #git
18:00 MineCoins joined #git
18:00 Cassiopaya joined #git
18:01 m0viefreak joined #git
18:01 Sasazuka joined #git
18:02 zzz joined #git
18:06 MattMaker joined #git
18:08 joshszep joined #git
18:08 ki0 joined #git
18:09 ki0 joined #git
18:10 theiostream joined #git
18:10 perlpilot joined #git
18:10 Alvin_ joined #git
18:11 andai_ joined #git
18:11 MarioBranco joined #git
18:12 Alvin_ Hi All
18:12 gitinfo Alvin_: 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.
18:12 cdown joined #git
18:12 Alvin_ i have a newbie question about git
18:12 Gsham joined #git
18:13 Alvin_ I want to create a private repository
18:13 Alvin_ with links to other public repositories
18:14 Alvin_ and some code that i don't want to public disclosure due to its very early stage
18:15 rastos2 joined #git
18:16 bitmod_ How much of git would you recommend knowing before starting a project?
18:16 Alvin_ my primary goal is to clone all repository and have always an updated version (including all code present in the public linked repos)
18:16 Alvin_ is it possible?
18:17 bitmod_ i have an idea i want to develop, but i want to make sure i'm using git correctly so that i won't have any issues down the road
18:17 bitmod_ or should i just start the project using the basic git i know and then learn as i progress?
18:18 aielima joined #git
18:18 brent__ joined #git
18:19 tmsmith_ joined #git
18:19 robattila256 joined #git
18:20 snowkidind joined #git
18:20 PioneerAxon joined #git
18:24 rebrec joined #git
18:25 JanC_ joined #git
18:26 ZyX-I joined #git
18:28 overlord_tm joined #git
18:28 Qav joined #git
18:30 synthroi_ joined #git
18:30 brent__ joined #git
18:30 cdg_ joined #git
18:31 FuzzyWuz_ joined #git
18:31 sparr Alvin_: look into git submodules
18:32 Zlatibor28 joined #git
18:32 TheSimonator joined #git
18:32 kadoban bitmod_: I'd read at least the basics, not worry about the details, you learn those by experience and experimentation anyway.
18:32 sparr Alvin_: also, be aware, this channel is about git, the command line server/client version control tool. this channel is not about github, the website that uses git and a bunch of other stuff on top of git. you might want to ask at least some of your questions in #github
18:32 kadoban You definitely need to know how to stage, commit, and ideally it'd be nice if you know how to branch and merge soon.
18:33 sparr bitmod_: git add and git commit are all you really need to get started. commit early, commit often, with good commit comments. you only need branching when you start wanting to work on different things independently at the same time.
18:33 synthro__ joined #git
18:33 diogenese joined #git
18:35 Levex joined #git
18:40 bitmod_ kadoban, sparr: thanks
18:40 TheMontyChrist joined #git
18:41 relipse__ joined #git
18:42 nickel_dime_look joined #git
18:42 rominronin joined #git
18:42 brent__ joined #git
18:44 Levex joined #git
18:47 aruns joined #git
18:49 mjuszczak joined #git
18:49 flavius joined #git
18:49 NeverDie_ joined #git
18:49 PioneerAxon_ joined #git
18:49 jackrandom joined #git
18:50 d10n-work joined #git
18:51 lewix joined #git
18:51 bertschneider joined #git
18:55 TikityTik joined #git
18:56 HurricaneHarry joined #git
18:56 Ryanar joined #git
18:57 TbobbyZ joined #git
18:57 zzz joined #git
18:58 Muzer joined #git
18:59 clickjack joined #git
18:59 NeXTSUN joined #git
19:02 telephone joined #git
19:02 telephone joined #git
19:03 ali1234 joined #git
19:04 zeroed joined #git
19:08 CheckDavid joined #git
19:09 bomb-on joined #git
19:09 synthroid joined #git
19:14 Acerific joined #git
19:14 Acerific joined #git
19:16 miczac joined #git
19:19 jcay joined #git
19:21 djb-irc joined #git
19:21 mjuhl joined #git
19:21 sunri5e joined #git
19:22 lmat I'm using git rebase --interactive; and not quite getting the "edit" subcommand.
19:22 andai_ joined #git
19:22 lmat I chose edit on a commit, and when git gets to that commit, I type git status; and see nothing edited.
19:23 lmat Based on reading the manual, I expected git to apply the commit like  cherry-pick -n; : apply to working copy and index, but don't commit yet, and let me edit at that point.
19:23 lmat It looks like, instead, git didn't do anything with that commit, and is letting me do what I want there. When I git rebase --continue;, will it apply the edited commit on top of my changes?
19:23 lmat osse: ever use --interactive   "edit" subcommand?
19:24 ski7777 joined #git
19:25 osse lmat: erry day bruh
19:25 lmat osse: ^_^ What does git do when it gets to the edited commit? It doesn't even begin applying it?
19:25 lmat perhaps I should     git rebase -i ...;  git cherry-pick -n <edited commit hash>;    then get to work?
19:28 andai_ joined #git
19:29 lmat well crap... I did the git cherry-pick -n; and the status didn't change. Where is that commit?
19:29 lmat Does git apply the to-be-edited commit *then* stop and let me change things?
19:32 lmat Then I would do something like    git rm whatever; vim else; git add else; git commit -C HEAD --amend; ?
19:32 osse lmat: It finishes apply it then gives you the well
19:32 osse Wheel
19:33 mcflynto joined #git
19:34 dvaske joined #git
19:35 lmat osse: Gotcha. Makes enough sense...wish it was in the man pages!
19:35 pumafied joined #git
19:35 miczac_ joined #git
19:35 ZeroZeroZeroZero joined #git
19:35 dvaske_ joined #git
19:36 lmat osse: Thanks!
19:36 AstralStorm joined #git
19:37 rmesta left #git
19:38 telephone joined #git
19:38 telephone joined #git
19:39 adac joined #git
19:39 Ryanar joined #git
19:39 osse It is in the message you get when rebase stops
19:40 ali1234 joined #git
19:43 durham_ joined #git
19:45 winny joined #git
19:48 kpease joined #git
19:49 King_Hual joined #git
19:49 King_Hual joined #git
19:51 dhollinger joined #git
19:53 TobiX left #git
19:54 ribasushi joined #git
19:56 nd joined #git
19:56 Cabanossi joined #git
19:57 robattila256 joined #git
20:00 cousteau joined #git
20:01 gugah joined #git
20:02 MrLawrence joined #git
20:04 Gsham joined #git
20:04 juvenal joined #git
20:05 D092M joined #git
20:08 mjuszczak joined #git
20:08 Levex joined #git
20:09 durham joined #git
20:11 Tobbi joined #git
20:13 borkr joined #git
20:14 rominronin joined #git
20:14 cagedwisdom joined #git
20:16 askb joined #git
20:16 synthroi_ joined #git
20:18 Domhack joined #git
20:19 osse lmat: Actually it *is* in the man page \o/
20:19 osse Praise gaben
20:20 mSSM joined #git
20:21 lmat osse: donde esta?
20:22 lmat osse: Where in the manual? I searched "edit" and found the SPLITTING COMMITS section which was helpful, but not explicit about what happens before an edit.
20:23 osse lmat: search for "By replacing"
20:24 lmat osse: yup, perfect!
20:24 * lmat bows to osse  then kisses him
20:24 osse My feet, yes.
20:26 leeN joined #git
20:27 aidalgol joined #git
20:27 mjuszczak joined #git
20:29 cdg joined #git
20:32 synthroid joined #git
20:32 dhollinger joined #git
20:33 LBV_User joined #git
20:35 freimatz joined #git
20:35 mentazoom joined #git
20:35 kpease joined #git
20:36 Random832 joined #git
20:36 bilal joined #git
20:37 NeXTSUN joined #git
20:37 Ryanar joined #git
20:41 digidog joined #git
20:41 prg3 joined #git
20:42 Atm0spher1c joined #git
20:42 salamanderrake joined #git
20:42 holdsworth joined #git
20:43 bariscant joined #git
20:45 Efyh joined #git
20:50 Doginal joined #git
20:50 MarioBranco joined #git
20:50 maroloccio joined #git
20:51 ali1234 joined #git
20:52 Zoxc joined #git
20:53 kpease joined #git
20:54 Doginal joined #git
20:55 Fallen0223 joined #git
20:59 joshszep joined #git
20:59 ertesx joined #git
21:00 joshszep joined #git
21:00 todd_dsm joined #git
21:02 tnecniv joined #git
21:02 unbalancedparen joined #git
21:02 bilal joined #git
21:03 Gsham joined #git
21:04 NeverDie joined #git
21:05 njs126 joined #git
21:07 cagomez joined #git
21:08 duderonomy joined #git
21:08 acetakwas joined #git
21:11 cam27 joined #git
21:11 lagothrix joined #git
21:11 Gsham joined #git
21:12 Cabanossi joined #git
21:12 telephone joined #git
21:12 telephone joined #git
21:13 otiose joined #git
21:13 otiose I've got branch A merged into branch B, and now I've got branch C coming off of B that I am working on
21:14 otiose is there an easy way to change a commit in A so it will be also reflected in B and C? Kind of like rebasing, but I'd like to keep the merge commits as merge commits
21:14 Jackneillll joined #git
21:14 bernd27 joined #git
21:15 otiose There were a bunch of merge conflicts to create B (a few branches merged together), but none with the commit I want to add a few lines to
21:15 cjohnson you want to copy the commit from A to B and C?
21:15 cjohnson cherry pick
21:15 gunnaro joined #git
21:16 otiose no, I just want to add a few lines to a commit in A, which has already been merged into B (and C by extension)
21:16 cjohnson Just make a second commit with the additions
21:16 cjohnson and merge or cherry pick the additions commit
21:17 otiose yeah thats the easy way
21:17 pdgwien joined #git
21:17 cjohnson seems like the right way too, rewriting history is an emergency procedure for monumental screw ups
21:17 cjohnson "I don't like how the commit history looks with 2 commits vs 1" is not a valid justification for rewriting imo
21:18 otiose I've got 3 branches awaiting review to be merged into master
21:18 otiose one of those is branch A
21:18 otiose Branch B is all of those after being merged into master
21:19 otiose Branch C is a branch that I am rebasing on top of B, to do work on top of the 'new master'
21:19 zhodge joined #git
21:19 otiose Now I want to change (adding a commit is fine too) to A
21:19 otiose but that will mean having to redo the merge to recreate B, and redoing the rebase for C
21:19 Rodya_ joined #git
21:21 matsaman if one uses --allow-unrelated-histories on a merge, will the same operation in the future still require that option?
21:22 julia_c otiose: rebase has a "preserve merges" option, but I'm not sure I would recommend it
21:23 onmeac joined #git
21:23 otiose julia_c: that sounds kind of like what i'm looking for, what's wrong with it?
21:25 matsaman probably because exceptional git options is a rabbit hole you'll never escape from =P
21:25 julia_c there are caveats listed in the man page
21:26 julia_c when I've been in similar situations, I just manually do the rebase/recreate the merges
21:26 bernd9000 joined #git
21:26 otiose The merges I'm making into branch B are all temporary; they are just there so I can actually work on branch C before A and friends are merged
21:26 julia_c having git rerere enabled helps so you don't need to redo the conflict resolution
21:27 chipotle joined #git
21:27 julia_c matsaman: I would expect that the first merge would _create_ a "related history" for subsequent merges, right?
21:27 otiose "Merge conflict resolutions or manual amendments to merge commits are not preserved"
21:27 otiose yeah thats not gonna work
21:27 otiose :(
21:27 otiose oh well
21:27 otiose I'll recreate the merges
21:28 otiose oh i know
21:28 otiose it should be easy to rebase --onto the new branch
21:28 otiose ie, rebase C onto B', which is B but with A' merged in
21:28 TikityTik joined #git
21:28 cjohnson julia_c: thanks for the tip about rerere
21:28 otiose yeah nevermind this isnt hard
21:29 jeffreylevesque joined #git
21:29 LaptopBrain joined #git
21:31 ProLoser joined #git
21:31 matsaman julia_c: I don't expect things from git anymore, I ask or test =)
21:31 oleksiyp joined #git
21:32 bdonnahue joined #git
21:32 julia_c matsaman: well, I tested it for you.  I was right :)
21:32 matsaman julia_c: okay I'll try that, thanks =)
21:33 pdgwien joined #git
21:33 onlyanegg joined #git
21:35 onlyanegg I'm having trouble excluding a directory from git diff. Am I doing this right? git diff --name-status master...branch -- . ':!directory/to/exclude'
21:35 jstein joined #git
21:37 Dougie187 left #git
21:43 cbreak onlyanegg: why do you want to exclude it from a diff?
21:44 cbreak I'm not aware of some negative pattern
21:44 otiose yep; added a new commit to A, merged that into B, and then rebased C on top of the new B. No problems.
21:46 l2y what would happen if I have had, say, `master` branch with a latest commit tagged as an annotated tag 0.0.1 and another branch `dev` that contains the latest commit tagged as a lightweight tag 0.0.2 and I merge `dev` into `master`? I'm curious about the tags
21:46 rominronin joined #git
21:47 ZeroZeroZeroZero joined #git
21:48 onlyanegg cbreak: I'm doing a diff of a configuration management repo and the directory in question contains a python library that shouldn't have been in there in the first place. It's large and contains many files, so removing it from the diff would make the changes more readble to my coworkers.
21:48 onlyanegg I'm referencing this: http://stackoverflow.com/questions/4380945/exclude-a-directory-from-git-diff
21:50 cbreak I'd make a commit that removes that directory
21:50 cbreak and just diff to that
21:50 dirtyroshi joined #git
21:50 mjuszczak joined #git
21:50 cbreak onlyanegg: what you can do is to list everything else
21:50 cbreak the answer does that with that extglob thing
21:51 cbreak but really, that's just hacking around
21:51 cbreak the proper solution is to make a proper commit to compare against
21:52 m0viefreak using globs is not a very good idea, because those work in the *current working dir*
21:52 m0viefreak so you might miss out things, if you compare branches that are not checked out
21:53 m0viefreak . ':!exclude' works fine for me by the way
21:53 cbreak maybe it's new
21:53 cbreak newer than 2.11 I hvae
21:53 Smarticles101 joined #git
21:53 m0viefreak should be in 1.9
21:54 Smarticles101 Hey, I was wondering how I should go about resolving conflicts that were brought to my attention when reviewing a pull request I made on github?
21:55 cbreak nothing in git-diff man page about exclude
21:55 onlyanegg m0viefreak: is 'exclude' a pattern or does it have to match from the current directory or full path?
21:55 Smarticles101 I'm still fairly a noob with git
21:55 onlyanegg cbreak: yeah, I'm referencing the second answer to that stackoverflow post
21:56 cbreak Smarticles101: resolve conflicts when merging
21:56 kadoban Smarticles101: Usually either by rebasing your pull-request stuff on top of the upstream branch, or merging the upstream branch into your pull-request changes.
21:56 cbreak by fixing the files that are conflicting
21:56 cbreak or by rebasing I guess, if you prefer that
21:56 kadoban Smarticles101: Either one will give you a chance to fix the conflicts in the usual ways !eek may help
21:56 gitinfo Smarticles101: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
21:56 m0viefreak onlyanegg: relative literal path, from what i can tell
21:56 satifant joined #git
21:57 Smarticles101 Thanks :)
21:57 onlyanegg ah, thank you! I must have been mistyping!
21:57 m0viefreak oh, hold on, i think pattern work
21:58 onlyanegg well, I couldn't get pattern to work, but I relative path worked for me
22:03 Doginal joined #git
22:05 mjuszcza_ joined #git
22:05 Doginal joined #git
22:05 mjuszcza_ joined #git
22:06 Doginal left #git
22:06 brent__ joined #git
22:07 tvw joined #git
22:09 sparr is there a good workflow for making changes to two branches of the same repo at the same time (ish)?
22:09 Atm0spher1c joined #git
22:10 cjohnson git checkout -
22:10 cjohnson a lot
22:10 cjohnson :D
22:10 cjohnson and tell your editor to auto reload when files change
22:11 Orion3k joined #git
22:13 sparr I'm probably gonna just maintain two working directories
22:14 brent__ joined #git
22:15 cjohnson six of one half dozen of the other
22:15 cjohnson the downside to that one is remembering to pull/push all the time
22:23 TikityTik joined #git
22:23 mjuszczak joined #git
22:25 svm_invictvs joined #git
22:26 Cabanossi joined #git
22:27 bannakaffalatta joined #git
22:27 Guest80585 joined #git
22:27 theoceaniscool joined #git
22:30 dsdeiz joined #git
22:32 mjuszczak joined #git
22:37 rmesta joined #git
22:38 rmesta joined #git
22:39 rmesta joined #git
22:39 rmesta joined #git
22:40 rmesta joined #git
22:41 rmesta joined #git
22:42 Darren_ joined #git
22:42 cebula joined #git
22:43 nivag joined #git
22:44 l2y guys, should I tag the code when I start working towards the version tagged or when I finished working on that version and I'm ready to make a release?
22:46 l2y for example, if I'm working on 0.0.2, should I tag the code before the work has started or should I tag it when everything is ready to be released for 0.0.2? similarly, when do I put inside 0.0.2-rcX tags? it should be like 0.0.2-rc1 -> 0.0.2-rc2 -> 0.0.2 or somehow else?
22:47 NeXTSUN joined #git
22:48 YuGiOhJCJ joined #git
22:48 TheSimonator joined #git
22:50 bronson joined #git
22:50 dermoth joined #git
22:55 EisNerd joined #git
22:56 Cabanossi joined #git
22:59 DolphinDream joined #git
23:00 joshszep joined #git
23:03 pypypypypy joined #git
23:04 arand joined #git
23:04 hanneso joined #git
23:06 nedbat l2y: the tag is created to mark a particular version of the code, so you should tag it when you are done.
23:06 l2y alright, thanks
23:06 nedbat l2y: tags don't move
23:08 todd_dsm joined #git
23:08 dsdeiz joined #git
23:14 gtmanfred joined #git
23:15 gtmanfred I am running into an issue with git-http-backend that is created by this commit https://github.com/git/git/commit/6bc0cb5176a5e42ca4a74e3558e8f0790ed09bb1
23:15 gtmanfred uwsgi does not close stdin http://lists.unbit.it/pipermail/uwsgi/2016-May/008462.html
23:15 gtmanfred and this causes git upload-pack to hang forever, and nginx to timeout
23:17 gtmanfred https://gist.github.com/gtmanfred/8b2e26b07db3c75094d0607048b2c828
23:18 gtmanfred it does work with the uwsgi >= 2.0.13, but i am not sure if this is a bug in git or not
23:18 gtmanfred thanks
23:18 brent__ joined #git
23:19 gtmanfred sorry, here is the unbit link where they talk about the rfc http://lists.unbit.it/pipermail/uwsgi/2016-May/008462.html
23:19 gtmanfred Here is the original post where someone did all the debugging that I was running into earlier http://lists.unbit.it/pipermail/uwsgi/2016-April/008440.html
23:21 sz0 joined #git
23:22 kadoban gtmanfred: You should probably post to the mailing list or something if you haven't already. This channel is largely for user support, not a lot of git dev work goes on here.
23:23 mjuszczak joined #git
23:24 mjuszczak joined #git
23:24 rominronin joined #git
23:25 ki0 joined #git
23:26 Cabanossi joined #git
23:26 gtmanfred ok cool, thanks!
23:27 zhodge joined #git
23:29 griff joined #git
23:31 svm_invictvs joined #git
23:32 nowhereman joined #git
23:35 onlyanegg joined #git
23:38 Noodlewitt joined #git
23:43 dsdeiz joined #git
23:44 ToBeCloud joined #git
23:44 Kaisyu joined #git
23:44 jarred_ joined #git
23:48 Hobbyboy joined #git
23:49 Ryanar joined #git
23:49 Achylles joined #git
23:51 jccn joined #git
23:51 thiago joined #git
23:51 barteks2x joined #git
23:51 telephone joined #git
23:51 telephone joined #git
23:51 svm_invictvs joined #git
23:54 gtmanfred and sent, thank
23:54 gtmanfred left #git
23:54 fstd joined #git
23:56 cagomez joined #git
23:57 cagomez joined #git
23:58 cagomez joined #git
23:58 feodoran joined #git

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