Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-11

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

All times shown according to UTC.

Time Nick Message
00:01 rominronin joined #git
00:03 ahrs joined #git
00:08 cqi joined #git
00:08 svm_invictvs joined #git
00:13 dtrott joined #git
00:16 cyphase joined #git
00:18 TbobbyZ_ joined #git
00:18 dave0x6d joined #git
00:21 _28_ria joined #git
00:23 wilbert joined #git
00:25 th3ros joined #git
00:27 drodger joined #git
00:28 Cabanossi joined #git
00:29 jmckind joined #git
00:33 m0ltar joined #git
00:34 theiostream joined #git
00:36 cagomez joined #git
00:39 firef1y joined #git
00:40 rubyonrailed joined #git
00:43 jacob123 joined #git
00:44 tnecniv joined #git
00:46 eb0t_ joined #git
00:46 def_jam joined #git
00:53 rubyonrailed joined #git
00:56 duderonomy joined #git
00:56 Cabanossi joined #git
00:57 dodobrain joined #git
00:57 dsdeiz joined #git
00:57 dsdeiz joined #git
00:58 tang^ joined #git
00:58 dstw joined #git
01:01 lavalamp joined #git
01:03 rominronin joined #git
01:05 telephone joined #git
01:05 telephone joined #git
01:08 LeBlaaanc joined #git
01:08 fstd_ joined #git
01:09 firef1y joined #git
01:09 Chiko joined #git
01:10 dstw joined #git
01:10 dstw joined #git
01:15 finalbeta joined #git
01:15 BSaboia joined #git
01:19 livingstn joined #git
01:19 durham joined #git
01:19 Saint_Isadore joined #git
01:22 pks joined #git
01:24 aidalgol What exactly is the difference between a mixed and a soft reset?
01:24 tang^^ joined #git
01:25 aidalgol Or rather, how is it possible to "reset the head to <commit>" but not "not touch the index file or the working tree at all"?
01:25 rewt man git reset explains what each of them do
01:25 gitinfo the git-reset manpage is available at http://jk.gs/git-reset.html
01:25 rewt that's a soft reset
01:26 rewt means your checked out files will stay as they are, but the head (the commit git thinks you last checked out) will be set to <commit>
01:27 rewt so any further commits will be based on that commit
01:27 oaao joined #git
01:28 edgimar joined #git
01:29 aidalgol I'm reading that right now, though
01:30 h12o joined #git
01:32 jmckind joined #git
01:32 aidalgol So both soft and mixed leave changed files alone.  Does mixed checkout files from <commit> that are not changed?
01:33 MattMaker joined #git
01:34 rewt mixed also resets the index; anything you `git add`ed will be undone
01:35 rewt it leaves the checked out files as they were
01:35 jmckind joined #git
01:37 h12o joined #git
01:39 NeverDie joined #git
01:41 jmckind joined #git
01:42 jmckind joined #git
01:46 alexggordon 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 http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:49 SpeakerToMeat joined #git
01:50 Nilesh_ joined #git
01:50 thiago joined #git
01:50 bannakaffalatta joined #git
02:00 dermoth joined #git
02:01 livingstn joined #git
02:02 _28_ria joined #git
02:03 pks joined #git
02:05 Goplat joined #git
02:06 Oatmeal joined #git
02:06 MineCoins joined #git
02:06 madduck joined #git
02:06 MattMaker joined #git
02:11 lagothri1 joined #git
02:11 dsdeiz joined #git
02:11 dsdeiz joined #git
02:12 hexagoxel joined #git
02:17 TbobbyZ joined #git
02:25 Goplat joined #git
02:25 ojdo joined #git
02:26 pks joined #git
02:26 jameser joined #git
02:27 Cabanossi joined #git
02:28 flippo joined #git
02:29 stonerfish joined #git
02:32 menip joined #git
02:33 stoopkid joined #git
02:34 rominronin joined #git
02:35 gugah joined #git
02:36 mmh joined #git
02:43 DolpheenDream joined #git
02:44 lb1c joined #git
02:49 durham joined #git
02:49 Hello71 pierre367: don't worry, you'll forget again
02:49 Hello71 if it's *really* important then get out your photorec
02:49 Hello71 !index
02:49 gitinfo The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
02:53 rchavik joined #git
02:54 Vortex34 joined #git
02:59 lavalamp joined #git
03:00 aavrug joined #git
03:02 inflames joined #git
03:02 chachasmooth joined #git
03:07 porfiriopaiz joined #git
03:09 justanotheruser joined #git
03:11 dreiss joined #git
03:12 madduck joined #git
03:15 Wayne_Shephard joined #git
03:17 jesst joined #git
03:19 wilbert joined #git
03:21 h0bbit joined #git
03:22 xall joined #git
03:25 Andrew_K joined #git
03:25 mizu_no_oto joined #git
03:26 Cabanossi joined #git
03:27 nexemacs joined #git
03:29 mjuszczak joined #git
03:30 mjuszczak joined #git
03:33 mehola joined #git
03:33 Sazhen86 joined #git
03:37 mehola joined #git
03:41 Cabanossi joined #git
03:45 tmcmahon joined #git
03:47 alexggordon joined #git
03:50 nevodka joined #git
03:52 digidog_ joined #git
03:52 Wayne_Shephard joined #git
03:52 carousel joined #git
03:53 Wayne_Shephard joined #git
03:55 tmcmahon joined #git
04:00 cam27 joined #git
04:01 pks joined #git
04:04 drodger joined #git
04:05 spaceraspi joined #git
04:07 rominronin joined #git
04:10 fakenerd joined #git
04:15 cqi joined #git
04:16 nexemacs joined #git
04:16 pks joined #git
04:17 ToxicFrog joined #git
04:20 pietv joined #git
04:25 Cabanossi joined #git
04:26 marianina8 joined #git
04:34 wilbert joined #git
04:34 rubyonrailed joined #git
04:37 pks joined #git
04:44 felixjet joined #git
04:46 Bock joined #git
04:47 ayogi joined #git
04:56 Cabanossi joined #git
04:58 dminuoso left #git
05:02 fakenerd joined #git
05:04 dec0n joined #git
05:07 Mutter joined #git
05:09 MineCoins joined #git
05:12 felixjet joined #git
05:14 dodobrain joined #git
05:15 zerow joined #git
05:17 overlord_tm joined #git
05:18 diogenese joined #git
05:18 Brski joined #git
05:19 dreiss joined #git
05:22 MineCoins joined #git
05:25 Cabanossi joined #git
05:26 jesst joined #git
05:26 Brski joined #git
05:27 dreiss joined #git
05:30 dsdeiz joined #git
05:30 AustinMatherne joined #git
05:31 xall joined #git
05:32 darkbit joined #git
05:33 rubyonrailed joined #git
05:35 dsdeiz joined #git
05:35 dsdeiz joined #git
05:36 cdown joined #git
05:38 rominronin joined #git
05:38 zerow joined #git
05:40 King_Hual joined #git
05:40 dersand joined #git
05:40 Saint_Isadore joined #git
05:44 User458764 joined #git
05:48 Endarked joined #git
05:49 navidr joined #git
05:50 eb0t joined #git
05:51 eblip joined #git
05:55 rubyonrailed joined #git
05:57 Silmarilion joined #git
06:00 safe joined #git
06:00 ThomasLocke joined #git
06:00 ThomasLocke joined #git
06:02 Raging_Hog joined #git
06:02 zeroed joined #git
06:02 zeroed joined #git
06:04 pwnz0r joined #git
06:05 rominronin joined #git
06:09 rscata joined #git
06:17 EmpireWorld joined #git
06:17 _28_ria joined #git
06:18 GingerGeek joined #git
06:18 GingerGeek joined #git
06:18 sea-gull joined #git
06:20 marianina8 joined #git
06:22 govg joined #git
06:22 SantaClauze joined #git
06:23 sbulage joined #git
06:25 inflames joined #git
06:27 JeroenT joined #git
06:28 felixjet joined #git
06:28 Brski joined #git
06:29 Hedgework joined #git
06:30 jgornick joined #git
06:30 freimatz joined #git
06:30 robattila256 joined #git
06:30 zeroed joined #git
06:30 Forkk joined #git
06:31 arooni joined #git
06:31 timthowtdi joined #git
06:31 r3c0d3x joined #git
06:31 batrick joined #git
06:33 dvaske joined #git
06:33 t-mart joined #git
06:33 rokups joined #git
06:34 GGMethos joined #git
06:34 finalbeta joined #git
06:35 forrestv joined #git
06:41 Renter actually just looking for details on getting working copy differences atm
06:41 Renter ḿyself
06:41 User458764 joined #git
06:41 Cabanossi joined #git
06:41 Renter got some unstaged changes and no idea what
06:42 JeroenT joined #git
06:42 Renter ah
06:42 cdown joined #git
06:42 Renter I had created some symlinks
06:42 Renter forgot about that
06:48 acetakwas joined #git
06:48 Brski joined #git
06:51 Silenced joined #git
06:53 jagob joined #git
06:53 sunri5e joined #git
06:53 JeroenT joined #git
06:56 GodEater left #git
06:58 dc5ala joined #git
06:59 mmh joined #git
07:00 oskarkv joined #git
07:01 djb-irc joined #git
07:05 schleppel joined #git
07:07 sea-gull joined #git
07:10 Cabanossi joined #git
07:11 ZyX-I joined #git
07:11 User458764 joined #git
07:18 Brski joined #git
07:19 elect_ joined #git
07:19 jameser_ joined #git
07:23 JeroenT joined #git
07:23 RxMcDonald joined #git
07:24 RxMcDonald Hello, anyone knows how push into a fork that head is 1 commit behind my local clone ?
07:24 blahdodo joined #git
07:24 RxMcDonald just push with -f ?
07:25 alburaq joined #git
07:26 chardan joined #git
07:27 cbreak why do you need -f if it's behind?
07:27 cbreak you only need -f to force a history rewrite
07:27 narendraj9 joined #git
07:28 waveclaw joined #git
07:30 ronator joined #git
07:31 rubyonrailed joined #git
07:32 dreiss joined #git
07:33 sbasso joined #git
07:34 cebor joined #git
07:34 Guest77241 joined #git
07:35 manuelschneid3r joined #git
07:40 mehola joined #git
07:40 User458764 joined #git
07:41 a3Dman joined #git
07:42 dtrott left #git
07:43 sea-gull joined #git
07:43 _ikke_ (--force-with-lease is slightly safer)
07:45 lordjancso joined #git
07:45 Paraxial joined #git
07:45 uogkco joined #git
07:47 mar77i joined #git
07:48 finalbeta joined #git
07:49 rubyonrailed joined #git
07:51 alexggordon joined #git
07:51 tnecniv joined #git
07:56 IRQ` joined #git
07:56 theoceaniscool joined #git
07:57 geek2nerd joined #git
08:01 rorro joined #git
08:01 mikecmpbll joined #git
08:03 fakenerd joined #git
08:03 marcogmonteiro joined #git
08:04 patrickreck joined #git
08:05 jameser joined #git
08:05 Brski joined #git
08:06 a3Dman joined #git
08:07 cr34ton joined #git
08:08 cr34ton_ joined #git
08:10 fieldmapper joined #git
08:11 qswz joined #git
08:11 Cabanossi joined #git
08:12 aivkiv joined #git
08:12 qswz hmm I need help, I want to revert an old commit, I do git revert hash, then there's a conflict so I resolve it then git add . then I do git revert --continue as they say but then nothing has happened
08:13 _28_ria joined #git
08:13 tnecniv joined #git
08:13 tobiasvl qswz: !repro
08:13 gitinfo qswz: [!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
08:13 qswz but git st tells me I'm still reverting commit ..., so it's not finished?
08:13 qswz yea wait
08:13 cbreak qswz: how about you commit? :)
08:14 Kartagis joined #git
08:14 Kartagis ahoy
08:14 Kartagis does git revert <hash> revert /to/ that hash or revert to right before that?
08:15 tmg joined #git
08:15 qswz http://vpaste.net/xQIv0
08:15 qswz this doesn't make sense to me
08:15 qswz I have fixed all conflicts
08:15 qswz and I want to continue revert, but nothing happens
08:15 MineCoins joined #git
08:15 snowalpaca joined #git
08:16 qswz Kartagis: no, I think
08:16 qswz oh sorry it's a quertion, I thouht it was for me
08:16 cwillu_at_work joined #git
08:16 Kartagis no what?
08:16 * selckin finds it suspious notting is staged/changed
08:16 qswz I'm asking about revert too
08:16 Kartagis no seat
08:16 Kartagis sweat*
08:16 selckin Kartagis: it reverts the changes *in* that commit
08:16 tobiasvl Kartagis: it reverts THAT commit
08:17 qswz it should revert it, not for me :)
08:17 Kartagis okay
08:18 _ng joined #git
08:18 RxMcDonald how do you restore a file you deleted?
08:18 RxMcDonald can you git checkout filename if it's not there?
08:18 a3Dman joined #git
08:18 qswz ge back to a commit where it' there
08:18 selckin RxMcDonald: yes, git status tells you
08:20 RxMcDonald 👍
08:22 caliculk joined #git
08:22 pierre367 I'm having issues with git send mail... i tried "git send-email -3 --annotate --cover-letter --thread --chain-reply-to", but my editor only opens once for the cover letter and I can not edit message before individual patch. Does anyone have experienced this please?
08:22 qswz ok done it
08:23 Es0teric_ joined #git
08:28 overlord_tm joined #git
08:30 alzagros joined #git
08:31 tmg pierre367: try format-patch first if you want to edit the patches before sending them
08:32 RxMcDonald left #git
08:32 a3Dman joined #git
08:35 alburaq joined #git
08:35 acetakwas joined #git
08:35 HarvSpec joined #git
08:36 HarvSpec whats the method / command to backup my files on github or other websites using git?
08:36 HarvSpec git push?
08:36 pierre367 tmg: thanks. but git format-patch don't do anythnng? the command just exit and dont do anything?
08:36 grawity pierre367: you still need the "-3" or other commit list
08:38 notebox joined #git
08:39 xall joined #git
08:40 Cabanossi joined #git
08:41 pierre367 grawity: thanks. i see. so after i just do git send-mail and it will fetch those .patch files?
08:42 aidalgol joined #git
08:47 pierre367 huh and format patch make trailing spaces while my code doesn't oO
08:47 earnestly joined #git
08:48 Anja joined #git
08:48 Kartagis btw, thanks selckin and tobiasvl
08:48 Kartagis left #git
08:50 ski7777 joined #git
08:51 darkbit joined #git
08:51 cdown_ joined #git
08:51 leeN joined #git
08:54 mar77i joined #git
08:54 Endarked joined #git
08:55 govg joined #git
08:58 JeroenT_ joined #git
09:07 Anja joined #git
09:08 Dumblez0r joined #git
09:09 Introoter joined #git
09:10 drodger joined #git
09:11 netroxen joined #git
09:11 Cabanossi joined #git
09:12 Chaser joined #git
09:12 oskarkv joined #git
09:16 Murii joined #git
09:19 rosiu joined #git
09:20 tnecniv joined #git
09:20 Murii joined #git
09:22 narendraj9 joined #git
09:26 djh joined #git
09:26 tnecniv joined #git
09:27 sbasso joined #git
09:27 afuentes joined #git
09:28 Tobbi joined #git
09:29 canoon joined #git
09:33 tchan joined #git
09:33 CustosLim3n hi
09:33 gitinfo CustosLim3n: 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.
09:34 HarvSpec is there any best tutorial on git
09:34 CustosLim3n how can I get git to always do submodule update after/with pull ?
09:34 Seveas you can't. But there are patches in progress to add this functionality.
09:36 narendraj9 joined #git
09:36 ferr1 joined #git
09:38 CustosLim3n Seveas, I googled and I see recommendations of using hooks
09:38 sbasso joined #git
09:38 CustosLim3n but doing this for every repo will suck a bit
09:41 nick123 joined #git
09:42 tnecniv joined #git
09:46 rubyonrailed joined #git
09:46 gottcha joined #git
09:46 Eragon joined #git
09:48 peepsalot joined #git
09:52 kent\n joined #git
09:52 alexggordon joined #git
09:53 finalbeta joined #git
09:53 narendraj9 joined #git
09:56 Brski joined #git
09:57 theoceaniscool joined #git
09:57 CustosLim3n best I could come up with is https://bpaste.net/show/fdf91c63216c
09:58 YuGiOhJCJ joined #git
09:58 tnecniv joined #git
10:04 TikityTik joined #git
10:06 Darcidride joined #git
10:09 dhollinger joined #git
10:11 scoobert1on joined #git
10:16 tnecniv joined #git
10:16 ShapeShifter499 joined #git
10:17 star_prone joined #git
10:18 rominronin joined #git
10:22 Taikibansei joined #git
10:22 freimatz joined #git
10:26 bejeb joined #git
10:27 ziombelas joined #git
10:27 tvw joined #git
10:27 kristofferR joined #git
10:30 kristofferR joined #git
10:32 MattMaker joined #git
10:32 h0bbit joined #git
10:32 ssarah joined #git
10:35 JeroenT joined #git
10:37 kristofferR joined #git
10:38 dendazen joined #git
10:38 tcorneli joined #git
10:38 digidog joined #git
10:40 netj joined #git
10:40 Cabanossi joined #git
10:40 Endarked joined #git
10:41 Brski joined #git
10:43 Cabanossi joined #git
10:44 Brski_ joined #git
10:45 Brski__ joined #git
10:46 Cabanossi joined #git
10:46 robotroll joined #git
10:47 rchavik joined #git
10:47 Brski joined #git
10:49 nevodka joined #git
10:49 shinnya joined #git
10:49 kexmex joined #git
10:52 amrits joined #git
10:54 ShapeShifter499 joined #git
10:55 Seveas CustosLim3n: that's not a bad solution :)
10:59 Oatmeal joined #git
11:02 Endarked joined #git
11:07 Brski_ joined #git
11:08 KB_9 joined #git
11:08 ahrs joined #git
11:09 Endarked joined #git
11:10 drodger joined #git
11:11 Cabanossi joined #git
11:12 rominronin joined #git
11:14 naquad joined #git
11:15 ShapeShifter499 joined #git
11:18 Achylles joined #git
11:18 s17 I made a oops.  I started adding a bunch of files to a directory on a branch that I have.  This branch has previous commits from today.  Can I just reset to how it was at the last commit? How?
11:18 z8z joined #git
11:19 naquad left #git
11:19 tobiasvl s17: first of all, you can just checkout the branch you DID mean to add the files to: !float
11:19 gitinfo s17: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
11:19 tvw joined #git
11:19 cbreak s17: git reset HEAD will reset to the current commit...
11:20 s17 ok
11:21 s17 thanks
11:22 pks_ joined #git
11:22 s17 I ended up manually removing all of those files, but accidentally removed some that were in the commit :x, reset HEAD and then check them out again
11:22 s17 I think it's fine now
11:22 Brski joined #git
11:24 re1 joined #git
11:24 tnecniv joined #git
11:26 dodobrain joined #git
11:26 pks joined #git
11:29 masuberu joined #git
11:30 Brski joined #git
11:31 re1_ joined #git
11:33 MattMaker joined #git
11:36 roby10 joined #git
11:37 Brski_ joined #git
11:38 am55 joined #git
11:40 scottjl joined #git
11:40 Cabanossi joined #git
11:43 cdown joined #git
11:44 tcorneli joined #git
11:44 NeverDie_ joined #git
11:44 mrmaveric joined #git
11:46 bongjovi joined #git
11:46 DolpheenDream joined #git
11:46 narendraj9 joined #git
11:48 rominronin joined #git
11:48 delboy1978uk joined #git
11:51 Brski joined #git
11:53 Anja joined #git
11:53 alexggordon joined #git
11:55 Achylles joined #git
11:55 synthroid joined #git
11:55 theoceaniscool joined #git
11:58 synthroi_ joined #git
12:00 pietv joined #git
12:00 narendraj9 joined #git
12:00 am55 joined #git
12:01 dsdeiz joined #git
12:01 ShapeShifter499 joined #git
12:02 Aeterne joined #git
12:05 zeroed joined #git
12:05 zeroed joined #git
12:06 sarri joined #git
12:06 sarri joined #git
12:09 dsdeiz joined #git
12:10 dendazen joined #git
12:11 tvw joined #git
12:11 Cabanossi joined #git
12:15 tmsmith joined #git
12:15 Darcidride joined #git
12:15 pythdasch joined #git
12:15 bongjovi joined #git
12:16 sbasso joined #git
12:18 bl0w3d_0ut joined #git
12:20 jonez joined #git
12:23 finalbeta joined #git
12:26 jmckind joined #git
12:28 snowkidind joined #git
12:31 XenophonF joined #git
12:31 jameser joined #git
12:33 MattMaker joined #git
12:35 anuxivm joined #git
12:36 chris3492 joined #git
12:36 JeroenT joined #git
12:37 dglambert joined #git
12:37 dglambert yo
12:38 z8z joined #git
12:38 krelix joined #git
12:39 dvaske joined #git
12:41 anuxivm left #git
12:43 kristofferR joined #git
12:44 anuxivm joined #git
12:44 ti2 joined #git
12:46 salter joined #git
12:46 HarvSpec joined #git
12:48 ti2 I would like to use gitnamespaces to sync from/to a remote repository; is there an equivalent to ext::'git --namespace=myns %s /local/repo.git' for remote access (ssh)?
12:48 monq joined #git
12:49 gugah joined #git
12:49 gugah joined #git
12:50 gugah joined #git
12:50 phil22 joined #git
12:50 phil22 hello
12:50 Marble68 joined #git
12:50 phil22 let's say I'm working in a branch and I have made some changes, I don't committed anything
12:51 phil22 now I want to switch to a different branch and work on it
12:51 phil22 do I have to commit
12:51 phil22 ?
12:51 tobiasvl phil22: yes, or stash
12:51 Vampire0 phil22, depends on what you want to happen to your uncommitted changes
12:51 Vampire0 phil22, !float
12:51 gitinfo phil22: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
12:52 phil22 stash somewhat scares me: what happen if I make a further stash on another branch?
12:52 Sound joined #git
12:52 tobiasvl nothing?
12:52 phil22 is stash shared between the project?
12:53 tobiasvl yes
12:53 phil22 so if I stash on branch1, than stash on branch2,  return on branch1 --> stash pop, I will get the last changes?
12:53 Sound_ joined #git
12:54 tobiasvl yes, you would get the newest stash, the one you stashed while on branch2.
12:54 tobiasvl stashes, like uncommitted changes, do not belong to any branch
12:54 delboy1978uk left #git
12:55 phil22 so it's quite dangerous, if I stash multiple times, I will lost the first stash changes
12:55 tobiasvl no, you will not
12:55 tobiasvl it will add a new stash
12:56 phil22 mmh ok
12:56 cdown joined #git
12:56 jason237 joined #git
12:56 tobiasvl you can have as many stashes as you want. "stash pop" without any arguments give you the latest stash, but you can pop an earlier stash as well
12:57 Marble68 o/ hi all. Scenario: I am working on a change (branch A) and do a nightly commit over several days. Then I merge into a dev branch (branch D), discover an issue, and fix it back into A, fix it, then commit the fix to Branch A.   The Goal: I’d like Branch A to have the fix in its commit. Do I “re-base” branch D to point prior to my merge? How do I combine the two commits to branch A into a single “branch a” with all my changes?  The reason
12:57 Marble68 this is we have many editions and I have to apply this branch to most of them manually due to customizations.
12:57 Vampire0 phil22, stash multiple times and do `git stash list`
12:57 tobiasvl phil22: and altohugh the stashes don't belong to a branch, you can see what branch you stashed it on with "git stash list"
12:57 phil22 oh ok, that's nice
12:57 phil22 thanks
12:57 HcsOmot joined #git
12:57 salter Hi, I've messed up, can someone who knows what they're doing confirm I'm about to do the right thing to fix this: https://paste.ofcode.org/3b9txVZnzhYA6hLSs7VVg37
12:57 jeffreylevesque joined #git
12:57 Marble68 (Thanks for the info on Stash, btw, I will use that myself)
12:58 Vampire0 phil22, the only thing to keep in mind is, that this is implemented using the reflog. So if a stash that is not the latest is too old (90 days by default), regular repo maintenance will discard the stash
12:58 salter I'm thinking about running: $ git checkout master $ git reflog $ git cherry-pick d8121ff13 and all commits until and including 504190223c
12:58 phil22 ok
12:59 grawity the stash is special in that it never expires
12:59 grawity unless manually configured otherwise
13:00 ti2 I would like to use gitnamespaces to sync from/to a remote repository; is there an equivalent to ext::'git --namespace=myns %s /local/repo.git' for remote access (ssh)?
13:01 cdown joined #git
13:01 grawity ext::'ssh foo@bar git --namespace=foo %s /remote/repo.git'
13:02 HcsOmot hi, I've merged two branches but messed something up. I used --no-commit flag, so nothing got commited yet. I was expecting a merge conflict, but git didn't raise one. How can I undo the merge to confirm that there in fact weren't any differences in a file between two branches?
13:02 grawity just compare them directly, `git diff mybranch otherbranch -- path.c`
13:03 ti2 grawity: thanks.  Do you also know how to get it working with gitolite? (sorry, forgot to mention it)
13:03 j416 gitolite has nothing to do with it
13:04 j416 this is local
13:04 j416 oh wait; wrong question; ignore me
13:04 plasticboy joined #git
13:04 elsevero joined #git
13:08 plasticboy joined #git
13:08 jmckind joined #git
13:09 salter I'm trying to fix this, can someone confirm I'm not about to make things worse? https://paste.ofcode.org/eH3VQu4D943wrMW9cFpMF3
13:09 HcsOmot ok so I confirmed that the file in question actually was different in two branches. I pushed all branches to a remote before attempting to merge. just in case i mess something up.
13:10 HcsOmot so how come git didn't stop the merge if the file was different in these two branches?
13:11 d4rkl0rd joined #git
13:11 salter I suppose I'm concerned that I leave detached HEAD state, and somehow I lose track of the commits. Or that I'm not including all the commits I need to.
13:12 Random832 HcsOmot, what do you think a merge is
13:13 fakenerd joined #git
13:13 HcsOmot Random832: take files from one branch, add them to everything in the other branch, if same file in two branches looks differently, stop and ask user what to do. or am i totally wrong here?
13:13 Random832 well you're missing the fact that git can figure out on its own how to put together the changes from the two branches if they're in different parts of the file
13:14 bwn joined #git
13:15 HcsOmot totally missed that.
13:15 plasticboy joined #git
13:15 i7c salter, just put branches on all tips of commits that are not part of any branch
13:16 xall joined #git
13:16 i7c salter, you’re currently in detached state? Just create a branch and you won’t lose those commits.
13:17 bsanford joined #git
13:17 JeroenT joined #git
13:17 DarkPsydeLord joined #git
13:17 HcsOmot so is there a way to fix the mess i got myself into? b/c it got confusing and inconsistent at one point, so I ended up editing a single file across multiple branches and lost control. was expecting that git will ask me what to do when I started merging, in order to let me pick which parts of the file should be included.
13:17 i7c salter, your proposed solution works also but is utterly complicated (works if you did not change configuration for gits garbage collection and your commits are not old).
13:18 g1itch joined #git
13:18 salter i7c: So for example, $ git checkout -b experimental, and then just carry on as normal; do some work, commit it, problem solved?
13:18 tvw joined #git
13:18 i7c salter, if all you did is commit in detached head state, yes, then problem solved. :)
13:18 g1itch Got a quick question: I push a local repo to a new origin last night and it LOOKS like (somehow) the default branch wasn't set to master. I fixed it remotely, but what command should be run to make sure a fetch or pull fixes it for everyone? (i.e., origin/HEAD wasn't pointing to master)
13:19 i7c salter, if you wanna get those commits into master you can rebase and merge or just merge as usual afterwards.
13:19 salter i7c, Yep, I haven't stashed or anything other than committed. Cool, thanks very much.
13:19 z1haze joined #git
13:19 i7c you’re welcome :)
13:19 z1haze is it possible to save sessions/ssh keys with git bash for windows?
13:19 jameser joined #git
13:20 Brski joined #git
13:20 i7c salter, detached head just means that git will create commits but not update any branch to the new commit.
13:20 dvaske joined #git
13:20 Chiko_ joined #git
13:20 z1haze by default it tries to use the standard id_rsa when sshing to a server but what happens if I have 50 keys for 50 different serers, I have to manually type out the key each time
13:20 i7c salter, so you just tell git now that branch experimental should point to the current HEAD commit and everything is as usual.
13:21 User458764 joined #git
13:21 salter i7c, cool, done :).
13:21 Vampire0 salter, !zomb
13:21 gitinfo salter: [!zombie] Brainzz! More brainzzzz!  For information about detached heads, see !detached
13:21 i7c :)
13:22 dvaske joined #git
13:22 salter Yep, I can see the reference for all those commits is refs/heads/payments now.
13:22 plasticboy joined #git
13:22 NeXTSUN joined #git
13:24 kdfarn joined #git
13:24 Vampire0 z1haze, usually you shouldn't have different keys for different servers, but you should have *your* key that identifies you and have it added to the servers you are allowed to connect to. If you want to use different keys for different targets, you can create an SSH config file that defines which key to use for which host. If you even need different keys for the same host, e. g. accessing GitHub as private
13:24 Vampire0 person or as company person, you also do this in SSH config by creating a host e. g. like `private.github.com`, tell it to connect to `github.com` instead and use the specified key.
13:25 ShapeShifter499 joined #git
13:27 MineCoins joined #git
13:30 g1itch my local git checkout doesn't have origin/HEAD listed in 'git branch -r' how do i fix that?
13:31 Vampire0 g1itch, what do you need it for?
13:31 ti2 If somebody is interested: accessing git namespaces behind a 'gitolite' server seems to require a local wrapper (for remote.xyz.url=ext::local-wrapper %S) which sets GIT_NAMESPACE env variable, a 'SendEnv GIT_NAMESPACE' line in ~/.ssh/config and 'AcceptEnv GIT_NAMESPACE' in the servers /etc/ssh/sshd_config.
13:32 g1itch well just wasn't sure if that was a problem. I pushed a repo to a new origin last night (for work) and the default branch wasn't set to master. i fixed it but i want to make sure everyone gets that change
13:32 hvxgr joined #git
13:32 g1itch would a git fetch --all fix that for everyone?
13:32 Achylles joined #git
13:33 perlpilot g1itch: "git remote set-head" may be your friend.
13:33 marcogmonteiro joined #git
13:33 g1itch perlpilot is that required for everyone to run? or does it not matter?
13:33 nick123 joined #git
13:34 paq joined #git
13:34 MattMaker joined #git
13:35 perlpilot g1itch: *I* don't think it matters.  But then I don't feel weird if there's no origin/HEAD either  :)
13:35 g1itch i guess, what happens if origin/HEAD isn't set in your local checkout?
13:35 Vampire0 g1itch, iirc the default branch is only relevant when cloning the repository. After that it is not really important and existing clones would not even get an update in the default branch on fetch without manually telling Git to re-fetch the default branch from the remote
13:36 dsdeiz joined #git
13:36 Vampire0 g1itch, and it is even only relevant if you don't tell clone which branch to create locally, as then the default branch is used
13:36 perlpilot g1itch: basically, what Vampire0 said.
13:37 g1itch so really nothing to worry about? just have them checkout the master branch and all is good?
13:37 lowercaseman joined #git
13:37 Matsv joined #git
13:37 paq left #git
13:38 perlpilot assuming master is the right branch, sure.
13:38 g1itch cool, thanks guys!
13:38 Vampire0 g1itch, I think if origin/HEAD is not set on clone, "master" is used as conventional default anyway
13:39 krelix joined #git
13:39 dodobrain joined #git
13:40 oleo joined #git
13:40 g1itch Vampire0 so maybe have them remove that origin/HEAD reference to be safe?
13:40 Cabanossi joined #git
13:41 Vampire0 g1itch, why? As I said iirc that reference is not important after cloning at all anyway
13:41 Guest77241 joined #git
13:42 Vampire0 g1itch, if someone cares, make them update that ref like perlpilot told you with `git remote set-head`
13:42 perlpilot g1itch: what are you worried about exactly?  What problem are you trying to prevent?
13:43 manuelschneid3r joined #git
13:43 notebox joined #git
13:44 g1itch perlpilot i took our existing repo and removed a bunch of unnecessary zips and directories with the BFG tool, i just want to make sure that everything runs smoothly with shifting over to this 'new' repo
13:44 g1itch i've archived the old one just in case we run into any issues, but just want to be cautious since the history was rewritten
13:46 Guest77241 joined #git
13:47 JeroenT joined #git
13:47 nanga joined #git
13:47 nanga joined #git
13:48 bannakaffalatta joined #git
13:48 bl0w3d_0ut joined #git
13:49 jesst joined #git
13:50 Matsv joined #git
13:53 Starky joined #git
13:53 rubyonrailed joined #git
13:54 Brski joined #git
13:57 Dougie187 joined #git
13:59 theiostream joined #git
14:00 a3Dman joined #git
14:00 bannakaffalatta joined #git
14:00 Achylles joined #git
14:00 pks joined #git
14:01 stoopkid joined #git
14:02 boombatower joined #git
14:02 tezar joined #git
14:03 zivester joined #git
14:05 pks joined #git
14:09 ExoUNX joined #git
14:11 LeBlaaanc joined #git
14:11 elsevero joined #git
14:11 Cabanossi joined #git
14:13 NeverDie_ joined #git
14:13 YuGiOhJCJ joined #git
14:14 jstimm joined #git
14:15 g1itch left #git
14:16 AaronMT joined #git
14:16 l2y joined #git
14:17 gregc joined #git
14:20 chitopunk joined #git
14:21 gregc joined #git
14:21 Murii joined #git
14:24 bsanford joined #git
14:24 ForeignBiscuit joined #git
14:24 re1 joined #git
14:24 gregc_ joined #git
14:25 jeffreylevesque_ joined #git
14:26 nd_ joined #git
14:27 mmlb joined #git
14:28 theiostream joined #git
14:31 publio joined #git
14:31 drodger joined #git
14:32 Endarked joined #git
14:35 MattMaker joined #git
14:35 VladGh joined #git
14:37 lavalamp joined #git
14:40 LeBlaaanc joined #git
14:41 nick123 joined #git
14:42 HarvSpec joined #git
14:43 war_pigs joined #git
14:45 King_Hual joined #git
14:45 King_Hual joined #git
14:46 crose joined #git
14:49 Khisanth joined #git
14:49 cdg joined #git
14:49 JeroenT_ joined #git
14:50 theoceaniscool joined #git
14:52 Fenikkusu joined #git
14:54 saboun joined #git
14:55 kexmex joined #git
14:55 Fenikkusu At my work, we maintain multiple versions of the code via multiple branches. IE: Version-1.0, Version-1.1, Version-1.2, etc. Typically, as we make changes, we will merge each version into the new version branch (IE: Version-1.0 into Version-1.1). However, I've got an issue where someone merged the newer into the lower (Version-1.2 into Version-1.1). I cannot seem to find where/when this merge
14:55 Fenikkusu occurred. Any advise on how to track it down so I can reset the branch?
14:56 moritz Fenikkusu: I'd use some graphical visualizaton of the branches, like gitk or git cola give you
14:56 moritz or any other good GUI client
14:56 Chiko_ left #git
14:57 Fenikkusu I've tried gitk, but to no avail at this point. Plus, half the people use merge to update their branches from remote so the tree is blown to hell and back, so to speak.
14:59 war_pigs joined #git
15:00 sitaram_ ti2: sorry I just got back to my IRC window.  Could you help me understand this a bit more so I could figure out how to make it easier within gitolite?
15:01 MineCoins joined #git
15:01 felixjet joined #git
15:02 sitaram_ ti2: there is some mostly untested code in the 'namespaces' branch in the gitolite source tree (doc: http://gitolite.com/gitolite/namespaces/ ) but reading what you wrote, I wonder if that is over-engineered
15:03 synthroid joined #git
15:03 sitaram_ ti2: so... if you could briefly pastebin what you did and how you're using it, I could use that to make things simpler, and push it to "master" instead of it bitrotting in a little-known branch
15:07 cha18 joined #git
15:07 cha1800 joined #git
15:09 seni joined #git
15:09 futuristic joined #git
15:10 Puffball joined #git
15:11 mikecmpbll joined #git
15:12 govg joined #git
15:14 dreiss joined #git
15:14 Chiko joined #git
15:16 strull joined #git
15:17 thiago joined #git
15:18 User458764 joined #git
15:20 RxMcDonald joined #git
15:21 RxMcDonald Hello, how do you checkout a whole folder ? i e reset the whole folder to the last commit?
15:21 hashpuppy joined #git
15:22 hashpuppy is there a shortcut for: git push -u origin new_branch
15:22 hashpuppy if i'm already on new_branch
15:23 IRQ` joined #git
15:24 doener joined #git
15:25 Cabanossi joined #git
15:25 NeXTSUN joined #git
15:25 sbasso joined #git
15:25 Hello71 git push -u origin
15:25 Hello71 !next
15:25 gitinfo Another satisfied customer. NEXT!
15:26 Hello71 RxMcDonald: did you try git checkout -- dir
15:27 APic 😎
15:27 g105b joined #git
15:28 nedbat Hello71: when I try that, I'm told: fatal: The current branch nedbat/test has no upstream branch.
15:29 nedbat Hello71: is this where push.default comes into play?  I have it set to simple
15:30 NeverDie joined #git
15:30 jesst joined #git
15:30 Hello71 apparently not then
15:31 ziombelas joined #git
15:34 theiostream joined #git
15:34 MineCoins joined #git
15:35 netj joined #git
15:37 DarkPsydeLord joined #git
15:38 drodger joined #git
15:38 mda1 joined #git
15:38 jagob joined #git
15:39 mindfart joined #git
15:40 MattMaker joined #git
15:41 tyreld joined #git
15:42 cagomez joined #git
15:43 cagomez I have a global git config with work credentials (email). I have a personal repo that I'd like to clone, work on, and push. How do I make sure my commits/pushes use my personal email? will git use the credentials (personal email) that is in repo/.git/?
15:43 a3Dman joined #git
15:43 Gustavo6046 joined #git
15:44 zivester joined #git
15:45 TbobbyZ joined #git
15:46 le_melomane joined #git
15:46 _ikke_ cagomez: yes, repo config overrides global config
15:47 whitby You can set config inside a particular repo for that repo alone
15:47 lowercaseman joined #git
15:47 ki0 joined #git
15:48 whitby I don't know of a way to _ensure_ that commits to that repo use the right email (outside of something setup on the remote).
15:49 HcsOmot could someone please help out a bit with merging? I've got two branches: A(base) and B(made from A). I've made changes to file 1 on branch A, but were working on something totally different (created a bunch of new files) on branch B. I want to pull in all the new files from B into A, but don't want the old version of file 1 from branch B to overwrite the new version that's in branch A
15:50 HcsOmot how do I proceed?
15:50 perlpilot HcsOmot: merge A into B first so that it has the new version of your file.
15:51 Jaggz left #git
15:52 dhollinger joined #git
15:52 HcsOmot perlpilot: is there a way to do a cross-branch diff? i'm not sure that some other files from A haven't been changed in B in a way that I would need to keep the changes from B for some files, but from A for others.
15:53 cdg_ joined #git
15:53 perlpilot "cross-branch diff"?  That's just called a "diff" from where I sit :)
15:53 HcsOmot :)
15:54 elect_ joined #git
15:55 HcsOmot git diff / git diff file doesn't produce anything
15:55 HcsOmot nothing happens
15:57 oleksiyp joined #git
15:58 cagomez joined #git
15:58 Silenced_v2 joined #git
16:00 Sonderblade joined #git
16:00 HcsOmot btw i'm talking about branches with no staged changes. all changes have been commited.
16:00 HcsOmot if that's relevant
16:00 thiago it isn't
16:00 thiago git diff A B
16:01 thiago anyway, I recommend you do: git checkout A; git merge B
16:01 thiago if you did not modify file 1 in B, then B's changes do not contain anything relating to that file
16:01 cdg joined #git
16:01 drodger joined #git
16:02 HcsOmot that much I understood, but believe it or not, it actually hasn't occurred to me until now that I actually need to pass the names of the branches I wanted to compare...
16:02 durham joined #git
16:02 HcsOmot thank you very much.
16:03 aca20031 joined #git
16:04 thiago note that in 'git diff A B', any changes you made to A and not to B will show up as removals
16:04 thiago you may try git diff A...B to see only changes made in B
16:05 todd_dsm joined #git
16:05 HcsOmot great, thank you!
16:06 HcsOmot now, couple of more questions
16:06 jstimm joined #git
16:06 HcsOmot is there a way to just get a list of files that are different between two branches?
16:06 Puffball joined #git
16:07 metachr0n joined #git
16:09 Random832 git diff --stat branch1 branch2
16:09 Random832 that's not just the list of files, but it's closer to just the list than the full diff output
16:11 Fenikkusu So after much digging, I've realized that I managed to rebase Version-1.0 onto Version-1.1. This of course has been pushed to the remote repo. What is the best way to go about 'fixing' this?
16:11 nexemacs joined #git
16:11 NeverDie_ joined #git
16:11 nixjdm joined #git
16:11 HcsOmot Random832: thanks, it's very helpful
16:12 le_melomane joined #git
16:12 marcogmonteiro joined #git
16:12 Random832 Fenikkusu, find the original reference in the reflog?
16:13 futuristic joined #git
16:13 Random832 wait, pushed to version-1.1 or to version-1.0?
16:13 sbasso joined #git
16:13 Fenikkusu Random832, I believe so yes. I see checkout: moving to Version-1.0 followed by commit followed by rebase: checkout origin/Version-1.1
16:13 Fenikkusu 1.0
16:14 __builtin joined #git
16:14 drodger joined #git
16:14 Fenikkusu I'm afraid I'm going to have to do a forced push and then manually update everyones comps...
16:14 Random832 check out Version-1.0, then hard reset to the previous commit id, then force push to the remote, then make sure that everyone else who has a copy of the repo doesn't re-break it
16:15 Random832 yeah no real way around that
16:15 Fenikkusu Figures. Okay, thank you.
16:15 Random832 is this a branch or a tag?
16:16 sbasso joined #git
16:16 rubyonrailed joined #git
16:17 rkfmqf joined #git
16:17 sbasso joined #git
16:18 Fenikkusu branch
16:18 Fenikkusu We maintain multiple versions of the code so we have to do branches.
16:19 madewokherd joined #git
16:21 dave0x6d joined #git
16:22 phase2 joined #git
16:24 nitric joined #git
16:25 drodger joined #git
16:26 Endarked joined #git
16:27 cdg joined #git
16:28 blackwind_123 joined #git
16:28 Silenced_v2 joined #git
16:30 phase3 joined #git
16:31 olbat joined #git
16:31 ash_workz what kind of repo name do you normally choose for a web project... say on some JS framework
16:32 marcogmonteiro joined #git
16:33 JanC_ joined #git
16:33 oleksiyp joined #git
16:34 svm_invictvs joined #git
16:35 NeXTSUN joined #git
16:35 pavwgi joined #git
16:36 sea-gull joined #git
16:38 phase2 joined #git
16:38 drodger joined #git
16:40 __builtin joined #git
16:41 Achylles joined #git
16:42 lewix joined #git
16:42 lewix joined #git
16:44 finalbeta joined #git
16:44 Wayne_Shephard joined #git
16:44 lewix hi all
16:45 sborza joined #git
16:45 lewix what is the diff between git reset --file and git checkout --file
16:46 mjuszczak joined #git
16:46 drodger joined #git
16:47 griff joined #git
16:48 Cavallari joined #git
16:50 ash_workz joined #git
16:50 chachasmooth joined #git
16:50 ToxicFrog There's no such option to either of them, so those are both an error
16:50 ToxicFrog Did you mean `git reset -- file` vs `git checkout -- file`?
16:51 nexemacs joined #git
16:51 ToxicFrog If so, the answer is that `reset` (in this context, it does like four different things) is just the opposite of `add`; it takes a file that was "changes to be committed" and makes it "unstaged changes".
16:51 drodger joined #git
16:52 ToxicFrog Whereas `checkout` (again, in this context) will revert the file to whatever content it had at the last commit, throwing away any uncommitted changes.
16:52 sborza joined #git
16:53 TinkerTyper joined #git
16:54 islesarev[m] left #git
16:55 thiago joined #git
16:55 mjuszczak joined #git
16:56 xpk joined #git
16:56 cagomez joined #git
16:56 xpk joined #git
16:57 chris3492 joined #git
16:57 al-damiri joined #git
16:59 durham_ joined #git
17:00 tnecniv joined #git
17:01 matoro joined #git
17:04 Jaggz joined #git
17:04 joshszep joined #git
17:05 lewix ToxicFrog: thanks
17:06 Jaggz I modified a file, but haven't committed.. can I do something like "git cat unmodified-version.txt > foo" so I can edit the two of them?
17:06 Jaggz (to compare them side by side)
17:07 Jaggz okay, n/m.. I just moved my edited version and checked out the file again.. thanks
17:08 peacememories joined #git
17:08 war_pigs joined #git
17:09 diogenese joined #git
17:10 rivarun joined #git
17:10 war_pigs joined #git
17:10 jast Jaggz: for future reference, git show HEAD:some/file.txt > foo
17:11 Jaggz jast, thank you :)
17:11 ayogi joined #git
17:13 cagomez joined #git
17:14 gopar joined #git
17:16 jstimm joined #git
17:17 re1_ joined #git
17:18 rubyonrailed joined #git
17:18 theiostream joined #git
17:20 durham joined #git
17:20 durham_ joined #git
17:21 Introoter joined #git
17:24 durham_ joined #git
17:24 sea-gull joined #git
17:24 theiostream joined #git
17:24 srcerer joined #git
17:27 pietv joined #git
17:27 eclecticjohny joined #git
17:29 hahuang65 joined #git
17:30 rubyonrailed joined #git
17:30 esc joined #git
17:30 esc joined #git
17:31 sbasso joined #git
17:32 doener joined #git
17:32 MattMaker joined #git
17:36 TSS_ joined #git
17:37 tnecniv joined #git
17:37 govg joined #git
17:41 TikityTik Why do i keep getting merge conflicts when I'm only maintainter of this git repo?
17:41 TikityTik and work from the same machine where I just pushed
17:41 whitby What are you merging?
17:42 TomyLobo joined #git
17:42 Cabanossi joined #git
17:42 TikityTik i changed something like variable = null to variable = "", then it gives a merge conflict when I git add, git commit, then git pull
17:42 sbeller joined #git
17:42 TikityTik the git pull gives a conflict
17:42 whitby Why are you running git pull?
17:42 TikityTik even though I did a git pull before git add
17:43 kadoban TikityTik: If you're the only one pushing there, then it'd likely be because you've changing history at some point.
17:43 TikityTik ok well what are the proper steps to avoid merge conflicts when i'm the sole person on the repo?
17:43 TikityTik over really really dumb conflicts
17:43 kadoban If you just add, commit, pull, push, repeat, there are no merges and no commits. But if you expect no merges, pull itself seems like a fairly werid choice. I'd just do 'git fetch' and check what's up instead of pulling.
17:44 kadoban Avoid changing history I guess?
17:44 kadoban s/no merges and no commits/no merges and no conflicts/
17:45 ThiefMaster also, if your local branch is not up to date you pretty much always want a rebase, not a merge
17:45 Cthalupa joined #git
17:45 whitby pull --rebase might be the simplest option for there
17:45 ThiefMaster "merge remote master into local master" is among the most annoying and useless noise you can add to a repo (and unfortunately there are still maintainers who merge such pull requests on github instead of asking the author to fix their crap ;))
17:47 Silenced joined #git
17:47 Bennux joined #git
17:49 anuxivm left #git
17:55 basiclaser joined #git
17:55 dreiss joined #git
17:58 rorro joined #git
17:59 Cthalupa joined #git
18:00 TikityTik well what i don't get is that the only changes were made through my computer
18:00 TikityTik 10 min apart of eachother
18:00 TikityTik and what would the difference be between git pull and git fetch?
18:00 dvaske joined #git
18:01 madewokherd pull does a merge, fetch just updates the remote tracking branches
18:01 dvaske_ joined #git
18:01 Puffball joined #git
18:02 porfiriopaiz joined #git
18:02 cdg joined #git
18:03 kadoban TikityTik: What exact commands did you run in that 10 minutes? Likely a rebase or a commit --amend or something.
18:03 justin2 joined #git
18:03 macefr joined #git
18:03 TikityTik I was on a master branch, did some changes, did git checkout -b newbranch, git add the new files, git commit, git push with new upstream
18:04 nexemacs joined #git
18:04 TikityTik then git pull, git push, just to be safe from conflicts, did some changes, git add, git commit --amend, then git pull, and merge conflcits
18:04 porfiriopaiz joined #git
18:05 Sasazuka joined #git
18:05 madewokherd sounds like you pushed a commit, then rewrote that commit with --amend after it had been pushed
18:05 whitby commit --amend changes the commit so now you have two different versions, 1 on your computer and a 2nd on the server
18:05 madewokherd so the remote had a different version of it from local
18:05 whitby Running pull is trying to merge those versions
18:05 TikityTik oh i seee
18:05 TikityTik thanks for that guys
18:05 kpease joined #git
18:06 whitby If you're running `git pull` because you can push, you should push --force-with-lease
18:06 cagomez joined #git
18:07 whitby can't*
18:07 whitby (Or run git push --force)
18:08 owlbynight[CAR] joined #git
18:10 TbobbyZ joined #git
18:11 duderonomy joined #git
18:13 Tobbi_ joined #git
18:15 ProbabilityMoon joined #git
18:15 kadoban whitby: Not sure that's great advice in general. If you're working with someone, push -f isn't friendly workflow at all
18:15 tyreld joined #git
18:16 mikecmpbll joined #git
18:16 snowalpaca joined #git
18:16 LionsMane joined #git
18:17 whitby I agree that it depends on the situation. That said, I might disagree that push --force-with-lease isn't friendly. If you know what you're doing then that's probably what you want.
18:17 whitby But 100% agree that it's not general advice
18:17 madewokherd I think it's fine as long as you understand why you need to --force
18:18 kadoban --force-with-lease still modifies (potentially) published history, it's just a less race-conditiony version of --force
18:18 mattp__ joined #git
18:19 marbn joined #git
18:19 t0by joined #git
18:19 t0by joined #git
18:20 war_pigs joined #git
18:21 pzor joined #git
18:21 MineCoins joined #git
18:21 pzor joined #git
18:22 mda1 joined #git
18:23 qqx With --force-with-lease you *can* at least be confident (usually) that you know what you're blowing away, without the lease that's impossible if other people/things can modify the repo.
18:25 blahdodo joined #git
18:26 manuelschneid3r joined #git
18:27 Tobbi joined #git
18:27 lowercaseman joined #git
18:28 mda1 joined #git
18:30 Sonderblade joined #git
18:34 Emperor_Earth joined #git
18:35 jjasinski joined #git
18:36 theiostream joined #git
18:37 lewix joined #git
18:39 fakenerd joined #git
18:42 d5sx43 joined #git
18:43 User458764 joined #git
18:44 sbasso joined #git
18:46 btree joined #git
18:46 ppalotes joined #git
18:49 lewix joined #git
18:50 Dazzyo joined #git
18:51 theiostream joined #git
18:51 jfelchner joined #git
18:52 elsevero joined #git
18:52 YouCallItFar joined #git
18:52 YouCallItFar git submodule update --init -recursive fails with an RPC error, then i do it agian, and it succeeds but leaves my tree in invalid state
18:53 TikityTik I keep getting Warning: Permanently added 'github.com,MyLocalIP' (RSA) to the list of known hosts. everytime i git push and git pull
18:53 nickel_dime_look joined #git
18:54 Bennux joined #git
18:54 nickel_dime_look joined #git
18:54 sea-gull joined #git
18:55 davimore joined #git
18:55 jason237 joined #git
18:55 Cabanossi joined #git
18:57 kadoban joined #git
18:57 Vauff left #git
19:00 finalbeta joined #git
19:00 stef||grue joined #git
19:01 firef1y joined #git
19:02 whitby Same IP every time?
19:02 grawity well, Github has like a dozen IPs
19:02 grawity but the message should go away after a couple of pushes/pulls
19:04 MineCoins joined #git
19:05 Acerific joined #git
19:05 Acerific joined #git
19:06 lewix joined #git
19:08 lowercaseman joined #git
19:11 UTAN_dev joined #git
19:12 Wayne_Shephard joined #git
19:13 Wayne_Shephard joined #git
19:13 likewhoa joined #git
19:14 drodger joined #git
19:15 btree left #git
19:16 sbasso joined #git
19:17 ash_workz joined #git
19:19 cagomez joined #git
19:19 Serus joined #git
19:20 cyberz joined #git
19:23 m0viefreak joined #git
19:24 akaneplop joined #git
19:24 dave0x6d joined #git
19:25 d10n-work joined #git
19:26 saboun joined #git
19:27 upp3r__ joined #git
19:27 upp3r__ left #git
19:27 acetakwas joined #git
19:30 drodger joined #git
19:34 karols146 joined #git
19:34 kus joined #git
19:35 cagomez joined #git
19:35 kus hi i use git bash on windows to ssh into my linux box and 10k lines of scroll back isn't enough. I'm trying to `tree` and output the results. is there a way I can output tree to a text file or something?
19:36 _Patrick_ joined #git
19:36 kus nvm i am an idiot
19:36 kus > output.txt works just fine
19:37 robotroll joined #git
19:37 star_prone joined #git
19:38 adymitruk joined #git
19:39 rwp kus, You might want to try piping to the 'less' pager too.  As that will allow searching and browsing without extra files.  Example: "tree -C | less -r"
19:40 Endarked joined #git
19:40 Zialus joined #git
19:40 carousel joined #git
19:41 sea-gull joined #git
19:42 manuelschneid3r joined #git
19:43 phos1 joined #git
19:43 kus ah I just wanted to show how many files a fresh/new angular 2 project has but apparently 22.5k lines of text will make blogger unresponsive
19:44 phos1 When I run git add ., I am getting unable to index file , but it’s a folder? When I did a pull I got a message that the folder existed so there was a conflict, but I don’t see it here.
19:46 _Patrick_ joined #git
19:47 aspiers joined #git
19:48 hvxgr joined #git
19:49 marianina8 joined #git
19:52 war_pigs joined #git
19:53 phos1 Actually I get error ‘…” appears as both a file and as a directory. I can’t see the file how can I delete
19:53 TikityTik whitby: it's the same IP everytime
19:54 * whitby shrugs
19:54 whitby I don't know, that's weird
19:54 aidalgol joined #git
19:54 whitby Maybe there's an issue with the ability to write to your known_hosts file
19:58 TikityTik is anturk even on this IRC?
19:58 TikityTik ah wrong channel
19:58 TikityTik whitby: I am using windows github shell
20:00 cagomez joined #git
20:00 nexemacs When using Magit, is pulling from “origin/<branch>” the way you pull from remote?
20:01 nexemacs I should say, is pulling from “origin/<branchName>” the same as pulling the remote of that branch
20:01 aswen joined #git
20:04 dglambert joined #git
20:04 dglambert Hey, If someone in another branch has a file that I want, is there an easy way to just grab that file?
20:04 dglambert rather, an easy way to pull just that file into my branch
20:04 whitby git checkout $branch -- $file
20:04 whitby I think
20:05 whitby TikityTik: is the line in your known_hosts file after that message
20:05 dglambert this might be a stupid question, but I can run git commands from inner folder right? I don't have to fully qualify my file do I?
20:05 Atm0spher1c joined #git
20:06 dglambert rahter than, git checkout $branch -- \foo\bar\boo\file
20:06 dglambert I could cd \foo\bar\boo then git checkout $branch file
20:06 TikityTik whitby: entering git checkout $branch -- $file only said my branch is up to date
20:07 whitby Sorry TikityTik, that command was for dglambert
20:07 peacememories joined #git
20:07 Zialus joined #git
20:08 whitby dglambert: you might need a relative path but yes, you can run Git commands from subfolders
20:09 whitby nexemacs: pulling from origin/$branch is pulling from $branch on that remote, yes
20:09 dglambert thanks
20:10 ZyX-I joined #git
20:11 cdg joined #git
20:12 nowhere_man joined #git
20:12 dglambert --myFile?
20:12 dglambert how does it know its a file?
20:12 dglambert ie, git checkout somebranch -- /some/path/to/file.txt
20:13 zeroed joined #git
20:13 zeroed joined #git
20:13 dglambert .git checkout
20:13 dglambert !git checkout
20:13 dglambert ugh
20:13 war_pigs joined #git
20:14 peacememories joined #git
20:16 jstimm joined #git
20:17 ivo_ joined #git
20:19 sbasso joined #git
20:20 sbasso joined #git
20:20 theiostream joined #git
20:21 dglambert http://stackoverflow.com/a/4427783/2446435
20:21 dglambert Why does this answer suggest I have to fetch first, but then also says I need to reference origin?
20:21 dglambert Seems redundant
20:22 saboun hey guys what’s up
20:22 qqx dglambert: Fetch only updates the remote-tracking branches, e.g. the ones under origin/ .
20:23 NeXTSUN joined #git
20:23 r00twrh joined #git
20:23 dglambert ok, so why does he suggest I need to use origin/master in the checkout?
20:24 dglambert wouldn't it just be master at this point?
20:24 qqx dglambert: No master and origin/master can be completely different things. And fetch would only change the latter.
20:25 cagomez joined #git
20:25 dglambert oh is it because fetch doesn't merge, so you need to be able to maintain the origin/master and master
20:26 dglambert ie, if it were git pull, then origin/master == master
20:26 peterbecich joined #git
20:26 ojacobson not even then
20:26 qqx dglambert: No, after a pull they can still be different. If a merge or rebase is done master will be ahead of origin/master until you push that.
20:26 ojacobson merges don't guarantee that two refs are equal
20:27 dglambert ok
20:27 dglambert oh ok
20:27 JimDungo joined #git
20:29 lmatteis joined #git
20:31 dglambert fatal error
20:31 dglambert Does file need to exist in my local branch for this to work?
20:31 davimore joined #git
20:31 _28_ria joined #git
20:31 dglambert It doesn't
20:33 gopar joined #git
20:33 Dougie187 joined #git
20:34 Xgau5 joined #git
20:34 dglambert I didn't actually need the $ did I?
20:35 kexmex joined #git
20:38 jeffreylevesque joined #git
20:38 andschwa_ joined #git
20:39 dglambert I got it, I messed up the path
20:40 gopar joined #git
20:41 nexemacs whitby: Ok, I thought it was the same. For some reason,  in magit when I “F” pull from “origin/dev” to my local “dev” branch, the pull deletes several on my local dev repo that I see exist in the remote repo when I browse it online.
20:42 nexemacs *several files on my local dev repo
20:42 zlig joined #git
20:43 AbleBacon joined #git
20:43 oghamb joined #git
20:44 AbleBacon is there an "opposite" of "git add"? i have a ton of files that i want to stage, so i want to "git add --all" and then subract the ones from staging that i don't want to commit
20:45 oghamb AbleBacon: not afaik. just git add everything, then git reset the ones you want to unstage
20:45 AbleBacon ah--ok. just came across that. thanks.
20:46 AbleBacon is there a way to "git reset HEAD *.bck" or something? like to use a wildcard?
20:46 gopar_ joined #git
20:46 oghamb which OS you using?
20:46 ash_workz I know this is a workflow question and not a git question but humor me; is a CI tool only supposed to listen for merges to master?
20:46 AbleBacon windows via mingw64
20:47 btree joined #git
20:47 ash_workz (for pushing to production)
20:47 oghamb I'm like 90% sure that the wildcard will work :)
20:47 btree left #git
20:48 ash_workz ... so like typically commits will just run tests and if everything passes, notify the integration specialist for a once over before saying "okay, merge with master" ?
20:48 rwp AbleBacon, Are you trying to undo local modifications? If so then 'git checkout ..stuff..' is the command you want.
20:48 AbleBacon so many commands!
20:48 rwp AbleBacon, 'git reset ...stuff...' is for entire branches not files.
20:48 drodger joined #git
20:49 hvxgr_ joined #git
20:49 rwp AbleBacon, Yes on the opposite of git add.  You can add everything and then unstage the things you don't want in a later pass before committing.
20:49 AbleBacon yes--i got that working. thanks
20:49 rwp AbleBacon, git status will suggest a command for it.
20:50 rwp Oh good.
20:50 LionsMane joined #git
20:50 AbleBacon hadn't figured that "reset" would be the command to do it
20:50 oghamb rwp, AbleBacon: argh, sorry, you need to put "--" before the arguments to reset files instead of branches, yeah. I forgot
20:51 nexemacs is there anything that would cause a git pull from remote to delete files locally that are not deleted remotely?
20:51 clickjack joined #git
20:52 oleksiyp joined #git
20:52 oghamb ash_workz: if you're doing continuous deployment, then you'd have your tool 'listen' for merges to the branch or branches that go public
20:53 oghamb but it's also a good idea to run tests on other branches, even if you don't automatically deploy the resulting code anywhere
20:53 rwp nexemacs, Not normally, no.
20:53 rwp I am assuming you don't want that to happen. People do sometimes want that to happen with !deploy but that is a special case.
20:53 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
20:54 YouCallItFar left #git
20:54 g105b joined #git
20:55 Puffball joined #git
20:55 nexemacs rwp: yeah, I’m trying to avoid it, but I’m also using magit, which may be doing things behind the scenes that I don’t want it too. I’ve looked at the command/process history and I see “git … pull origin dev”. Unless the “…” mean something, I don’t think it’s a magit issue.
20:55 jstimm joined #git
20:56 ash_workz so then I guess I have to do research on how jenkins listens to different branches
20:56 Cabanossi joined #git
20:56 Panacea joined #git
20:57 rwp Although I am a long time emacs user I haven't started using magit yet. I still do everything from the command line. (Usually inside an emacs shell buffer.)
20:58 nowhere_man joined #git
20:58 anuxivm joined #git
21:00 Anja joined #git
21:01 ash_workz_ joined #git
21:02 sbasso joined #git
21:02 war_pigs joined #git
21:03 gnixev joined #git
21:05 tnecniv joined #git
21:05 cdown joined #git
21:08 sbasso joined #git
21:10 gopar joined #git
21:13 Ruum joined #git
21:13 zulutango joined #git
21:17 jost_ joined #git
21:17 Anja joined #git
21:17 dsdeiz joined #git
21:18 gunnaro joined #git
21:18 ash_workz joined #git
21:23 dvaske joined #git
21:26 mda1 joined #git
21:31 nexemacs joined #git
21:31 mattcen joined #git
21:32 nexemacs rwp: I deleted the branch and re-pulled it, that worked for some reason, appreciate the input.
21:32 Ruum hey guys, I am having this error:
21:32 Ruum https://pastebin.com/LTvy57tE
21:33 saboun hey guys !
21:34 saboun I am a very beginner in git, set up a local repositeory and a remote one on github, but couldn’t  « push »
21:34 cam27 joined #git
21:34 carousel joined #git
21:38 qqx saboun: !transcript
21:38 gitinfo saboun: 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
21:38 cdown_ joined #git
21:40 Cabanossi joined #git
21:42 saboun https://gist.github.com/jaffedev/84492cc9d709c5ff9d6d9cd07e9989f6
21:43 fakenerd joined #git
21:44 dendazen joined #git
21:46 qqx saboun: You cloned your github repo as a new subfolder rather than associating it with your existing local repo.
21:46 qqx Use: `git remote add origin <URL>` to add the github repo as a remote.
21:47 saboun qqx:thank you
21:47 qqx You'll also likely want to remote the "git_folder" directory.
21:47 saboun qqx: I sensed that something went wrong when I saw the git_folder again in my « monPremierRepo » Repo
21:47 saboun I don’t understand
21:49 tmg joined #git
21:49 qqx The folder that you saw that made you think something was wrong, was indeed an indication of that. You will probably want to remove it.
21:50 saboun let me try and I’ll get bak to you.
21:51 d5sx43 joined #git
21:51 Dougie187 left #git
21:51 war_pigs joined #git
21:52 Gustavo6046_ joined #git
21:52 tvw joined #git
21:53 safe joined #git
21:53 bejeb joined #git
21:55 brent__ joined #git
21:56 mar77i joined #git
21:56 digidog joined #git
21:57 durham joined #git
21:59 drodger joined #git
21:59 saboun qqx: can i use the rmdir command to delete that folder ?
21:59 saboun so far doesn’t let me do it saying that the folder is not empyt
22:00 FilipNortic joined #git
22:00 qqx It will have a .git directory
22:01 qqx You'd need to use `rm -r` to remove it. Might need the -f option as well, not sure for an empty repo.
22:04 saboun ok BRB
22:06 de-vri-es joined #git
22:07 BSaboia joined #git
22:09 saboun qqx: I think I screwed up....
22:10 saboun i did the sudo rm -r on the what I thought was the second git
22:10 saboun ( the nested one) and everything got deleted…
22:12 kfoonamalik joined #git
22:12 askb joined #git
22:12 hahuang65 joined #git
22:13 m0j0 joined #git
22:15 saboun qqx: ok i recreated the local repository. It’s not bad if I initialize an empty repository no?
22:17 nivag Latest git gui's copyright notice goes up to 2010, but it's now 2017
22:18 nivag Latest gitk's copyright notice goes up to 2016, but it's now 2017
22:20 nivag as at commit:  cf11a679 Eleventh batch for 2.13
22:20 Gustavo6046 joined #git
22:23 dvaske joined #git
22:24 preaction nivag: if you're reporting bugs, i'd report them to the mailing list
22:24 cagomez joined #git
22:25 Rodya_ joined #git
22:25 sbasso joined #git
22:26 star_prone joined #git
22:27 cagomez joined #git
22:27 a3Dman joined #git
22:27 Rodya_ so i wanted to contribute to open source, but i didn't fork the repo; just cloned and set the upstream server. should i create a repo on my github page and push the project to that before opening a pull request on the initial project?
22:28 Ruum left #git
22:29 kadoban Rodya_: That's the usual thing to do, yes.
22:29 preaction Rodya_: unless you have push permissions to that repo, you will need to do what you said
22:29 raspado joined #git
22:29 bronson joined #git
22:30 Rodya_ second dumb q: so if the project is webpack, i should go on gh and create a webpack repo on my profile, then set that as origin? i'm not seeing any way to create a remote repo from the terminal
22:31 preaction you fork the repo. you update your local settings to have your fork as the "origin" remote, and their original as the "upstream" remote. then you push to your "origin" remote and then you can make the PR
22:31 cagomez joined #git
22:31 saboun qqx:I think it works now. https://gist.github.com/jaffedev/b0772a1064a6a5e719e7968fc04af615
22:31 Rodya_ preaction: thanks
22:31 kadoban Rodya_: You'd have to use github's specific command-line stuff to create a repo via the terminal, you usually do it via the website. What you name your remotes is up to you, but ya that's common ^
22:33 kadoban Rodya_: By the way, it's usually best to do all of your changes in feature branches, and keep the "master" or whatever default branch as an exact copy of upstream's, both in your fork and in your local clone.
22:33 kadoban Just to hopefully save you some pain
22:34 Rodya_ kadoban: i did create a branch for my code... if i'm reading you correctly i shouldn't merge my feature branch back into master, rather i should open the pull request from that branch
22:34 kadoban Yes, exactly
22:36 saboun hey guys, once i pushed the code from my local repo to my remote repo
22:36 saboun I should be able to see me code on the remote repo right ? meaning through github ?
22:36 cam27 joined #git
22:38 alexandre9099 joined #git
22:40 Rodya_ last set of dumb questions: so the upstream master changed while i was developing. since i just created my remote origin, that repo is current. i should run `git rebase origin/master` on my local master to update it, then merge the new local master into my feature branch, then i'll be able to open my pull request?
22:42 kadoban Your master has no changes at all from you, right?
22:43 Rodya_ kadoban: nope.
22:43 cam27 joined #git
22:44 kadoban So usually to update your master to upstream's you'd do a 'git pull --ff-only' or even a git reset. As to if you should update your branch, you can if you want. A rebase onto recent master would be the more usual way, in this context. Often that's a later step of a pull request though, like the last one before it's merged. So you might have to do it again later anyway. But it depends on the project.
22:45 cagomez joined #git
22:45 Rodya_ gotcha. thank you
22:47 telephone joined #git
22:47 telephone joined #git
22:49 sea-gull joined #git
22:53 stef||grue what would be the preferred place to make suggestions for gitk improvements? here? mailinglist?
22:53 sbasso joined #git
22:54 war_pigs joined #git
22:55 kadoban I'd assume mailing list. Very little dev discussion goes on here.
22:55 kadoban I think there is a dev-specific channel, but it's tiny last I looked.
22:56 stef||grue is there a gitk-specific list or only the main one git@vger?
22:56 Cabanossi joined #git
22:59 stoopkid joined #git
22:59 nick123 joined #git
23:02 jeffreylevesque joined #git
23:02 cagomez joined #git
23:02 DolpheenDream joined #git
23:04 jmckind joined #git
23:07 tnecniv joined #git
23:07 ariver joined #git
23:08 drodger joined #git
23:08 durham joined #git
23:09 kevr joined #git
23:12 TbobbyZ_ joined #git
23:15 nivag joined #git
23:18 clickjac_ joined #git
23:22 prg3 joined #git
23:24 cam27 joined #git
23:26 weakdan joined #git
23:28 jmckind left #git
23:30 cagomez joined #git
23:30 menip joined #git
23:31 cagomez joined #git
23:31 [Brain] joined #git
23:33 jeffreylevesque joined #git
23:34 re1 joined #git
23:36 war_pigs joined #git
23:38 bkeys joined #git
23:38 bkeys So lets say I want to have a clone of my blog on my web server; and I want to auto update that clone whenever I push to the repo; how would I accomplish that?
23:40 war_pigs joined #git
23:40 kadoban !deploy
23:40 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
23:40 TikityTik can i make a local branch and push to a remote branch at the same time?
23:40 TikityTik or at least set the upstream automatically?
23:41 bkeys Well I just have a jekyll based blog and I would like it to update when I do a push
23:41 kadoban bkeys: IMO: don't. Just have a separate command for that. That's not what git is for. But if you insist, the link above will give you ideas probably.
23:42 bkeys I am reading through the link you posted
23:43 dendazen joined #git
23:43 bkeys I do not see where it talks about auto pulling
23:43 jstimm joined #git
23:44 drodger joined #git
23:45 dave0x6d joined #git
23:52 dvaske joined #git
23:53 TikityTik which push.default pushes automatically to a remote branch with the same name as the local branch?
23:55 pietv joined #git
23:56 cagomez joined #git
23:56 kyan joined #git
23:57 Eqkv joined #git
23:57 t-mart joined #git
23:58 kegster joined #git
23:58 telephone joined #git
23:58 telephone joined #git
23:58 rubyonrailed joined #git
23:59 diogenese joined #git
23:59 snowkidind joined #git

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