Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-24

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

All times shown according to UTC.

Time Nick Message
00:02 SReject with .gitignore how do I ignore all files and directories in a specific sub folder except .md files
00:02 dsdeiz joined #git
00:02 SReject I have a /media/ directory that I want to ignore all files/directories in except .md files
00:06 TheSimonator joined #git
00:08 Doros joined #git
00:14 austechie joined #git
00:14 thiago_ joined #git
00:22 marianina8 joined #git
00:22 jameser joined #git
00:22 tnecniv joined #git
00:23 webdev007 joined #git
00:24 jeffreylevesque joined #git
00:26 sunrunner20 joined #git
00:28 durham joined #git
00:29 TbobbyZ joined #git
00:29 jameser joined #git
00:31 dreiss joined #git
00:31 bdonnahue joined #git
00:32 bdonnahue hey guys. I just reset hard and for some reason my most recent commits are missing
00:32 bdonnahue im not sure how or why this happened
00:32 sturner joined #git
00:32 bdonnahue can anyone help me out. Im not sure how to check if they still exist
00:35 bdonnahue i checked my gitlab server and there are a lot of commits on the server not showing in the local repo
00:37 sturner joined #git
00:37 mentazoom joined #git
00:41 sturner_ joined #git
00:41 LeBlaaanc joined #git
00:43 bdonnahue i can see the old commits are in a dangling state
00:43 bdonnahue looks like i did a rebase instead of revert
00:43 cr1tic joined #git
00:43 bdonnahue actually nvm
00:44 Doros joined #git
00:48 fstd_ joined #git
00:48 bdonnahue fixed it
00:54 joeco joined #git
00:54 dsdeiz joined #git
00:59 Doros_ joined #git
00:59 TheSimonator joined #git
01:00 dsdeiz joined #git
01:00 dsdeiz joined #git
01:02 TikityTik joined #git
01:04 sturner joined #git
01:09 HoierM joined #git
01:09 Gsham joined #git
01:11 sturner joined #git
01:11 TheSimonator joined #git
01:11 smeredith joined #git
01:13 justanotheruser joined #git
01:21 marianina8 joined #git
01:24 raynold joined #git
01:25 TheSimonator joined #git
01:26 bronson joined #git
01:26 sunrunner20 joined #git
01:27 finalbeta joined #git
01:30 rmesta joined #git
01:31 simbalion joined #git
01:31 jeffreylevesque joined #git
01:31 simbalion Hi, I changed the root folder name of a project and now git says it is in a detached head state, how can I fix this?
01:33 marianina8 joined #git
01:34 TheSimonator joined #git
01:37 robattila256 joined #git
01:38 cam27 left #git
01:47 TheSimonator joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 rmesta joined #git
01:51 rmesta joined #git
01:51 rmesta joined #git
01:52 rmesta joined #git
01:55 sctskw joined #git
01:56 Eryn_1983_FL joined #git
01:57 cqi_ joined #git
01:59 Cabanossi joined #git
02:00 leeN joined #git
02:01 sunri5e joined #git
02:01 bongo joined #git
02:04 bongo_ joined #git
02:06 dsdeiz joined #git
02:06 dsdeiz joined #git
02:07 Ncie joined #git
02:09 brent__ joined #git
02:10 Nilesh_ joined #git
02:11 BenderRodriguez joined #git
02:11 FuzzyWuzzyPanda joined #git
02:16 dsdeiz joined #git
02:16 dsdeiz joined #git
02:18 telephone joined #git
02:18 telephone joined #git
02:18 marianina8 joined #git
02:24 NotKyros joined #git
02:25 bertschneider joined #git
02:25 sunrunner20 joined #git
02:27 jameser joined #git
02:29 Cabanossi joined #git
02:34 TbobbyZ joined #git
02:38 fbwnd joined #git
02:44 Vortex34 joined #git
02:44 boombatower joined #git
02:45 CussBot joined #git
02:48 DolphinDream joined #git
02:48 cagedwisdom joined #git
02:49 chachasmooth joined #git
02:50 Introoter joined #git
02:54 hexagoxel joined #git
02:57 aavrug joined #git
02:58 a_thakur joined #git
02:58 aavrug joined #git
02:59 webdev007 joined #git
03:03 sunrunner20 joined #git
03:03 a_thakur joined #git
03:07 xall joined #git
03:14 FuzzyWuzzyPanda joined #git
03:15 miczac joined #git
03:16 cybermancer joined #git
03:16 drodger joined #git
03:21 SwiftMatt joined #git
03:21 sunrunner20 joined #git
03:27 robotroll joined #git
03:28 rmbeer joined #git
03:28 rmbeer hello
03:28 Cabanossi joined #git
03:29 brent__ joined #git
03:30 rmbeer i have a several folders with binaries files that .gitignore discard. But where i use 'git push/pull' and next 'git clone', this folders is losts... exist any method for take in different space of datas?
03:30 rmbeer or any method for copy all binary files
03:31 rmbeer if best if any selected directory from .gitignore can take only 1 copy and not more in the repository
03:33 rmbeer something like .gitonecopy or .gitonelog
03:33 peepsalot joined #git
03:34 rmbeer ok, this is a feature for post in the web site like sugerence...
03:43 Cabanossi joined #git
03:45 rmbeer "550 5.7.1 Content-Policy reject msg: The message contains HTML subpart, therefore we consider it SPAM or Outlook Virus. TEXT/PLAIN is accepted.!" WHAT???
03:45 rmbeer the git@vger.kernel.org reject me...
03:46 rmbeer i'm a virus... :(
03:46 imack joined #git
03:46 PioneerAxon joined #git
03:46 bremner rmbeer: send plain text mail
03:46 Muzer joined #git
03:47 dreiss joined #git
03:49 Cathy joined #git
03:51 kexmex joined #git
03:51 northfurr joined #git
03:52 fakenerd joined #git
03:54 cam27 joined #git
03:58 sunrunner20 joined #git
04:00 northfurr joined #git
04:04 sunrunner20 joined #git
04:05 northfurr joined #git
04:05 northfurr joined #git
04:06 snowalpaca joined #git
04:11 navidr joined #git
04:13 justan0theruser joined #git
04:28 Cabanossi joined #git
04:32 cdown joined #git
04:34 Noodlewitt joined #git
04:38 brent__ joined #git
04:39 robattila256 joined #git
04:40 northfurr joined #git
04:41 ayogi joined #git
04:43 brent__ joined #git
04:44 fakenerd joined #git
04:48 diogenese joined #git
04:53 jaziz joined #git
04:53 drodger joined #git
04:54 TbobbyZ joined #git
04:59 darkbit joined #git
05:00 marianina8 joined #git
05:02 bannakaffalatta joined #git
05:03 freimatz joined #git
05:03 govg joined #git
05:06 tbridge joined #git
05:06 tbridge left #git
05:08 fbwnd joined #git
05:09 ToBeCloud joined #git
05:10 marianina8 joined #git
05:12 rmbeer left #git
05:13 Cabanossi joined #git
05:13 lordjancso joined #git
05:14 brent__ joined #git
05:18 northfurr joined #git
05:18 dersand joined #git
05:25 Taikibansei joined #git
05:26 brent__ joined #git
05:28 jozwior joined #git
05:31 zefferno joined #git
05:32 aruns joined #git
05:33 overlord_tm joined #git
05:35 fakenerd joined #git
05:42 Levex joined #git
05:42 imack joined #git
05:43 auv5 joined #git
05:47 Raging_Hog joined #git
05:47 _ng joined #git
05:53 ThomasLocke joined #git
05:54 aax joined #git
05:57 marianina8 joined #git
06:02 cdown joined #git
06:04 rscata joined #git
06:06 Silenced joined #git
06:06 xall joined #git
06:07 chele joined #git
06:09 JeroenT joined #git
06:14 bodkan joined #git
06:15 freimatz joined #git
06:19 ogny joined #git
06:19 sbulage joined #git
06:19 xall_ joined #git
06:22 qt-x joined #git
06:22 schleppel joined #git
06:23 fakenerd joined #git
06:24 bertschneider joined #git
06:25 ShapeShifter499 joined #git
06:27 fakenerd_ joined #git
06:28 acetakwas joined #git
06:32 slidercrank joined #git
06:32 theiostream joined #git
06:35 fakenerd joined #git
06:36 sbulage joined #git
06:37 MattMaker joined #git
06:38 zeroed joined #git
06:38 zeroed joined #git
06:44 senaps joined #git
06:45 senaps joined #git
06:46 senaps joined #git
06:48 tarkus joined #git
06:50 jagob joined #git
06:53 senaps joined #git
06:54 armyriad joined #git
06:58 ronskisika joined #git
06:58 gareppa joined #git
06:59 manuelschneid3r joined #git
07:01 MineCoins joined #git
07:02 sevenever joined #git
07:03 JeroenT joined #git
07:04 blahdodo joined #git
07:04 Murii joined #git
07:07 King_Hual joined #git
07:07 sevenever joined #git
07:11 pks joined #git
07:12 JeroenT joined #git
07:13 Cabanossi joined #git
07:15 JeroenT joined #git
07:18 zerow joined #git
07:18 elect joined #git
07:20 robattila256 joined #git
07:21 munkinut joined #git
07:21 Junior joined #git
07:24 rokups joined #git
07:26 Vortex34 joined #git
07:26 no_gravity joined #git
07:26 no_gravity Good Morning
07:27 no_gravity Do you guys use any web interface for git?
07:27 marianina8 joined #git
07:28 Vortex35 joined #git
07:34 bytefire joined #git
07:35 ti2 no_gravity: I have to use cgit at work; but it is not very helpful with complex branch hierarchies...
07:35 bytefire hi, i want to make a code change in HEAD~1 commit. is it possible?
07:37 pbandark joined #git
07:38 fbwnd joined #git
07:38 i7c !rewrite
07:38 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
07:38 i7c But yes, it is possible.
07:41 i7c You can make a commit and then reorder the commits with rebase -i, marking the new commit with "fixup" and it will be squashed into the previous commit. Or you can do rebase -i HEAD~2 directly and put "edit" in front of the commit in question. Rebase will stop at this commit, you can make the change, commit --amend and then rebase --continue
07:45 JeroenT_ joined #git
07:50 djb-irc joined #git
07:51 JeroenT joined #git
07:51 bytefire i7c: thanks
07:52 bytefire i see what you mean by rewrite history being bad
07:52 i7c Depends really
07:52 i7c If the history is shared amongst developers already, yes, bad.
07:52 i7c If it is your own private history (not pushed/merged yet) or you’re the only one developing on that repo so far: doesn’t matter.
07:53 bytefire i7c: it's own private history. want to keep it clean before pushing :)
07:53 i7c Then no problem, I rewrite my own branches all the time before I sent them to be reviewed
07:54 bytefire cool
07:54 i7c You understood how to do it technically?
07:56 bytefire i7c: not quite. actually i don't fully understand rebase. so what does git rebase -i HEAD~2 do? also why is it HEAD~2 when the changes i want are in HEAD~1?
07:56 osse bytefire: it rebases all commits in the range HEAD~2..HEAD onto HEAD~2.
07:56 osse bytefire: because HEAD~2 is the new (or same in this case) base for the commits.
07:57 ogny joined #git
07:57 i7c rebase usually takes a bunch of commits and applies them on top of some other commit. It’s often abused with the interactive -i flag to go through a series of commits step by step.
07:58 bytefire right
07:58 i7c bytefire, when you run rebase -i git will open your editor and show you the "recipe", which is the series of commits.
07:59 i7c You can do stuff with them, like reorder them (reorder the lines), remove commits from the history (delete the line)
07:59 choki joined #git
07:59 bytefire i see
08:00 i7c And you can put "edit" in front of a commit, then git will stop at this commit and give you the chance to commit --amend as often as you like, for example.
08:00 bytefire right, i understand editing etc during rebase -i
08:01 bytefire regarding rebase itself, when doing git rebase master, it takes commits in my local branch and bases them on top of master branch
08:01 mikecmpbll joined #git
08:01 bytefire how is the behaviour same when doing git rebase HEAD~2?
08:02 i7c Because the commits are already based on HEAD~2 anyways
08:02 fakenerd joined #git
08:02 i7c it does not move them to another branch, just "go through them" again
08:02 bytefire riight..
08:02 bytefire think i get it now
08:04 osse just as if you ran 'git rebase master' from your example twice
08:04 osse the second time it doesn't really do anything.
08:04 osse but if you add -i you can do stuff
08:05 dvaske joined #git
08:08 a_thakur joined #git
08:08 bytefire osse: right
08:08 bytefire thanks for explaining guys
08:08 ArchNoob joined #git
08:08 clmsy joined #git
08:08 osse I didn't explain guys. I explained rebase.
08:08 osse trolololol
08:08 bytefire hehe
08:09 i7c :p
08:09 i7c The power of the comma.
08:09 i7c And lack thereof.
08:09 elect joined #git
08:09 bytefire one thing i haven't figured out is what does git fetch actually do? as in what does it fetch (commits?) and where does it store them?
08:10 i7c "git-fetch - Download objects and refs from another repository
08:10 i7c Says man git-fetch
08:10 gitinfo the git-fetch manpage is available at https://gitirc.eu/git-fetch.html
08:11 osse bytefire: it's all in .git
08:11 bytefire ah i see
08:11 osse bytefire: it updates refs in .git/refs with new data which is stored in .git/objects
08:11 bytefire okkay
08:12 bytefire and it's from .git/refs that it works out that remote is n commits ahead etc
08:12 osse yes
08:14 ronskisika joined #git
08:15 bytefire cool. one day it will all fall into place for me :)
08:15 IRQ` joined #git
08:16 fakenerd joined #git
08:17 fbwnd joined #git
08:18 Snugglebash joined #git
08:21 elect joined #git
08:23 gareppa joined #git
08:25 YuGiOhJCJ joined #git
08:27 Cabanossi joined #git
08:28 notebox joined #git
08:28 skunkz joined #git
08:29 stfn joined #git
08:29 telephone joined #git
08:29 telephone joined #git
08:31 no_gravity left #git
08:31 a_thakur joined #git
08:32 elect joined #git
08:32 SlashLife joined #git
08:34 marianina8 joined #git
08:36 cstratak joined #git
08:38 ki0 joined #git
08:41 xall_ joined #git
08:43 cstratak joined #git
08:46 seni joined #git
08:47 fbwnd joined #git
08:48 Somelauw joined #git
08:49 Acerific joined #git
08:49 Somelauw Is there a way to pull without stashing, just pull and generate diff conflicts with local changes if any? Otherwise a one-liner that does something like "git stash; git pull --rebase; git stash pop"
08:52 redeemed joined #git
08:54 _ikke_ Somelauw: git pull --autostash
08:58 sarri joined #git
08:58 sarri joined #git
09:05 fakenerd_ joined #git
09:06 armin is there something like a self hostable gist (notice the "s"!) service i can use? should be super minimalistic and non-bloated.
09:06 ferr joined #git
09:07 jast if there is, I haven't heard of it
09:10 alexandre9099 joined #git
09:11 cbreak a pastebin?
09:12 fakenerd joined #git
09:13 zulutango joined #git
09:13 sunri5e joined #git
09:14 dre_ joined #git
09:16 fakenerd joined #git
09:17 _ikke_ gist creates git repos in the background which you can clone
09:17 griff joined #git
09:17 _ikke_ and also update
09:20 no_gravity joined #git
09:20 no_gravity Can I merge a single commit by doing "git merge <hashofthecommit>"?
09:20 _ikke_ no, that will merge all history up to that commit
09:21 _ikke_ perhaps you want man git cherry-pick
09:21 gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html
09:21 no_gravity Ok, but not the commits after it?
09:21 no_gravity That would be fine with me.
09:21 _ikke_ no
09:21 no_gravity I just want to avoid merging newer commits.
09:21 xall joined #git
09:21 Ezzy joined #git
09:22 flaviodesousa joined #git
09:22 fakenerd_ joined #git
09:23 Tobbi joined #git
09:25 dxl joined #git
09:25 Somelauw _ikke_: thank you
09:28 ZyX-I joined #git
09:33 fakenerd joined #git
09:34 Anja_ joined #git
09:42 alexandre9099 joined #git
09:43 JeroenT_ joined #git
09:43 tango_ joined #git
09:44 chardan joined #git
09:44 alexandre9099 joined #git
09:45 ArchNoob joined #git
09:46 theoceaniscool joined #git
09:46 alexandre9099 joined #git
09:48 Guest8952 joined #git
09:50 govg joined #git
09:51 chardan joined #git
09:51 aw1 joined #git
09:53 Olipro joined #git
09:54 MattMaker joined #git
10:00 sz0 joined #git
10:00 fakenerd_ joined #git
10:02 aard joined #git
10:06 ronskisika joined #git
10:08 earnestly joined #git
10:08 a_thakur joined #git
10:09 kharloss joined #git
10:12 Cabanossi joined #git
10:13 fakenerd joined #git
10:14 a_thakur joined #git
10:15 bilal joined #git
10:17 mkoskar joined #git
10:17 a_thakur joined #git
10:20 a3Dman joined #git
10:20 fakenerd_ joined #git
10:22 Martian joined #git
10:22 govg joined #git
10:22 borkr joined #git
10:23 reactormonk[m] How can I show any files changed - even if ignored by gitignore?
10:23 reactormonk[m] ah -u
10:23 reactormonk[m] ... no
10:24 reactormonk[m] --ignored
10:24 _ikke_ reactormonk[m]: ignored files are nog tracked
10:24 HoierM joined #git
10:24 _ikke_ so git cannot say if they have been changed
10:24 masuberu joined #git
10:25 reactormonk[m] ikke: I wanna compare if any additional files exist on another machine - debugging "works for me"
10:26 _ikke_ ok
10:28 Ueyac joined #git
10:29 achadwick joined #git
10:29 chll_ joined #git
10:29 SlashLife joined #git
10:31 _ng joined #git
10:31 Endarked joined #git
10:33 Guw joined #git
10:34 sunri5e joined #git
10:34 marianina8 joined #git
10:36 mikkel- joined #git
10:37 vuoto joined #git
10:38 JeroenT joined #git
10:43 Anja__ joined #git
10:45 thinkpad joined #git
10:46 theoceaniscool joined #git
10:46 darkbit joined #git
10:48 JeroenT joined #git
10:49 Anja_ joined #git
10:51 JJjack joined #git
10:51 JJjack I renamed a file how do I commit that and push it?
10:51 _ikke_ git rm --cached <old_name>; git add <new_name>; git commit + push
10:52 JJjack thanks
10:53 aw1 joined #git
10:54 spacemud joined #git
10:54 qt-x joined #git
10:55 lordjancso joined #git
10:59 gareppa joined #git
11:00 vuoto joined #git
11:00 sturner_ joined #git
11:04 bomb-on joined #git
11:06 EisNerd joined #git
11:06 xall joined #git
11:07 tymczenko joined #git
11:07 ali1234 joined #git
11:08 netroxen joined #git
11:11 EisNerd joined #git
11:11 vuoto joined #git
11:12 buffal0 joined #git
11:13 Cabanossi joined #git
11:14 Anja_ joined #git
11:15 oskarkv joined #git
11:15 bsanford joined #git
11:15 EisNerd_ joined #git
11:20 Tobbi joined #git
11:20 EisNerd joined #git
11:22 tvw joined #git
11:25 IntruderSRB joined #git
11:27 leah2 what's the best way for a script to check whether any submodules are not cloned?
11:28 King_Hual joined #git
11:28 King_Hual joined #git
11:32 Godfather_ joined #git
11:32 Godfather_ hi
11:35 EisNerd_ joined #git
11:35 dave0x6d joined #git
11:37 tvw joined #git
11:41 Cavallari joined #git
11:44 Muzer joined #git
11:46 EisNerd joined #git
11:48 jameser joined #git
11:50 justin3 joined #git
11:52 chipotle joined #git
11:52 guzzlefry joined #git
11:53 guzzlefry Is it possible to find the commit immediately before a `git pull --ff-only` was performed?
11:54 EisNerd joined #git
11:55 dglambert joined #git
11:55 dglambert yo
11:55 osse not after the fact
11:56 gnixev joined #git
11:57 JJjack joined #git
11:57 _ikke_ reflog?
11:58 YuGiOhJCJ joined #git
11:59 EisNerd_ joined #git
11:59 lb1c joined #git
12:02 synthroid joined #git
12:03 EDAKIRI joined #git
12:04 fakenerd joined #git
12:04 guzzlefry Ah, Gitlab had it. :)
12:04 guzzlefry Well, enough to approximate anyway.
12:05 rjack2 joined #git
12:05 Drzacek joined #git
12:06 bsanford joined #git
12:06 rjack2 left #git
12:06 EisNerd joined #git
12:08 felGru joined #git
12:08 fahadash joined #git
12:08 Darcidride joined #git
12:10 JeroenT joined #git
12:11 EisNerd_ joined #git
12:12 dvaske joined #git
12:13 Cabanossi joined #git
12:19 Drzacek left #git
12:20 gugah joined #git
12:20 EisNerd joined #git
12:20 gugah joined #git
12:21 Godfather_ i did a merge with was unsuccessful i want i to revert it. I did a git revert -m 1 sha-commit, and it worked. But now the index is on top of it and i can't retry the merge cause its already merged
12:21 Godfather_ what can i do in this situation?
12:23 guzzlefry left #git
12:25 Somelauw left #git
12:25 ogny joined #git
12:26 ankit01ojha joined #git
12:26 EisNerd joined #git
12:27 osse !revert-merge
12:27 osse !revert_merge
12:27 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
12:27 osse Godfather_: see above
12:29 ArchNoob joined #git
12:29 cousteau` joined #git
12:30 Godfather_ ok
12:30 cousteau` joined #git
12:30 cousteau` joined #git
12:30 cousteau` My project has several subdirectories /foo, /bar...  I want to ignore everything on the project except files inside /*/dev/src and /*/dev/header
12:32 cousteau` is this the correct syntax for .gitignore?   /*  !/*/dev/src  !/*/dev/header
12:33 jimi_sanchez joined #git
12:33 ysh joined #git
12:33 EisNerd joined #git
12:33 MineCoins joined #git
12:34 dsdeiz joined #git
12:34 dsdeiz joined #git
12:34 jameser joined #git
12:35 rjack2 joined #git
12:35 alcohol looks alright to me
12:35 marianina8 joined #git
12:35 perlpilot joined #git
12:36 leeN joined #git
12:37 cousteau` well, I'm afraid it's not working
12:37 * cousteau` googles a bit more before crying for help
12:37 alcohol you know
12:37 alcohol it helps if you define what "not working" means
12:38 osse !doesn'twork
12:38 gitinfo [!doesntwork] Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...
12:40 theoceaniscool joined #git
12:42 EisNerd_ joined #git
12:44 ysh joined #git
12:45 aruns joined #git
12:46 seni joined #git
12:47 Logico joined #git
12:47 rominronin joined #git
12:47 cousteau` alcohol: that was part of the "googles a bit more before crying for help"; if I didn't solve it by myself I'd start with the details
12:48 cousteau` fortunately I think I solved it: http://codepad.org/oejmdba3
12:48 alcohol alright
12:48 EisNerd joined #git
12:49 cousteau` apparently I have to go level by level, ignoring .../* and unignoring .../foo -- is this correct?
12:50 alcohol hrm
12:50 alcohol i dont think so
12:51 jast cousteau`: yeah, that's the way it works
12:51 alcohol what about https://paste.robbast.nl/b56a3b0f ?
12:51 jast because git doesn't even look in directories that are ignored
12:52 alcohol so then any wildcard directory can never be unignored?
12:52 ki0_ joined #git
12:52 jast well if you ignore foo/*, you can unignore foo/bar and then it will descend into foo/bar
12:52 alcohol yes
12:53 alcohol but if you ignore ** and then want to unignore */dev/**
12:53 alcohol you're fucked i guess?
12:53 jeffreylevesque joined #git
12:54 Silox| joined #git
12:57 Vampire0 alcohol, !whited
12:57 gitinfo alcohol: [!gitignore_whitedir] A global/directory .gitignore blacklist with a (potentially) subdirectory whitelist is not easy to specify in git. However, something like `echo -e '/*\n!/a/\n/a/*\n!/a/b/\n/a/b/*\n!/a/b/c/' > .gitignore` (ignore everything but a/b/c directory) or `echo -e '*\n!*/\n!*.c' > .gitignore` (ignore everything but *.txt files) may do what you want.
12:58 MineCoins joined #git
12:59 selckin joined #git
13:01 alcohol i see
13:02 jast ** by itself isn't actually a valid pattern
13:02 jast but if you ignore * (which does cover everything), you can simply unignore /dev and /dev/*
13:03 telephone joined #git
13:03 telephone joined #git
13:03 alcohol ah, i guess ** can only be used in certain contexts
13:03 alcohol would just "/**" be valid?
13:05 Vampire0 alcohol, ** just means an arbitrary amount of directories. So /** doesn't make too much sense.
13:05 jast I don't think so. it has to be **/... or .../**/...
13:05 jast or /**/...
13:08 EisNerd_ joined #git
13:09 mSSM joined #git
13:10 kadoban joined #git
13:12 rmesta joined #git
13:13 Vampire0 alcohol, you are not fucked, what you are after is `echo -e '/*\n!/*/\n/*/*\n!/*/dev/' >.gitignore`, or at least is that what you asked for
13:13 ExoUNX joined #git
13:13 mSSM I want to git add -p a file, where I have a - line, followed by two + lines. I want to keep the - and the first + line, but delete the last + line. The result: error: src/lib.rs: patch does not apply. This gist documents the issue: https://gist.github.com/SuperFluffy/a948769f9cb47e2ae0551e81405aba0f
13:14 mSSM hunk shows what I want to change; pre_edit shows the editor git opens for me, after_edit shows my change, error the result
13:14 Vampire0 alcohol, it ignores everything in root, then unignores every directory in root, then ignores everything in the subdirectories in root and then unignores every "dev" subdirectory in the directories of root
13:14 Xenophon1 joined #git
13:14 mSSM (the gist is not in the right chronological order; sorry about that)
13:14 EisNerd joined #git
13:16 jast mSSM: that's strange, your edit looks fine
13:16 mSSM jast: I have a suspicion that I need to change the ranges
13:16 Vampire0 mSSM, I'd say you did it correctly, but did you maybe change line endings somehow in the hunk editing? I had such effects sometimes when e. g. the file had windows endings and the hunk editing in vim made unix line endings out of it, which then caused the patch to fail
13:16 Vampire0 mSSM, the ranges should not be significant
13:16 TheSimonator joined #git
13:17 mSSM It's unix all the way, at least that's what vim tells me. Never opened this file on anything but my trusty linux
13:17 relipse joined #git
13:17 mSSM utf-8[unix], to be precise
13:17 XenophonF joined #git
13:18 mSSM This here suggests that changing the ranges might do the trick.... http://stackoverflow.com/a/3270837/1889530
13:18 Vampire0 mSSM, Hm, then it really seems strange
13:18 mSSM I am going to check if it really does the trick... right after I understand that notation
13:19 Vampire0 mSSM, the notation is easy.
13:19 mSSM Vampire0: Hit me :D
13:19 zefferno joined #git
13:20 Vampire0 mSSM, @@ -<start line before>,<amount of lines before> +<start line after>,<amount of lines after> @@
13:20 Vampire0 mSSM, what version of Git is it you are working with? I always happily edit the hunks without the need of changing the ranges
13:20 Vampire0 mSSM, maybe this is an old bug probably if it fixes the problem in your case
13:20 mSSM git version 2.12.2
13:21 Kaisyu joined #git
13:21 mSSM So very recent, actually. First time this kinda thing bites me.
13:21 Vampire0 mSSM, hm, no, then probably not. So try it and tell us whether it helped
13:21 mSSM Vampire0: I am still not actually sure what “start line before” means - before what, exactly?
13:22 bitmod joined #git
13:22 Vampire0 mSSM, before = before the patch is applied, after = after the patch is applied
13:23 Vampire0 mSSM, actually I wonder that your start line is 1 before and 4 after, that looks strange to me
13:23 mSSM In that file, I perform a split and reject the very first hunk. Might that be a problem? My problem actually reads quite similar to the one described in the SO link above
13:23 mSSM ^ Vampire0
13:24 navidr joined #git
13:24 Vampire0 mSSM, ah, ok, if you discarded a hunk before, that might explain the thing about the start line, yes
13:25 Vampire0 mSSM, I still think it shouldn't matter, but try with `@@ -1,13 +1,13 @@` then
13:26 ysh joined #git
13:26 choki joined #git
13:26 Vampire0 mSSM, if this still does not work, you could try it from behind through the back in the eye. Add the hunk without editing, then use 'git reset -p'  with editing to partially unstage that hunk, maybe that works instead
13:28 kexmex joined #git
13:29 mSSM Vampire0: Ok, doesn't work. the - doesn't refer to a negative line, it refers to the old (-) file; the + to the new file.
13:29 Xenophon1 joined #git
13:29 mSSM I have accounted for the first hunk and for the rest, but that didn't cut it. I am going to try the reset -p route now.
13:29 MineCoins joined #git
13:30 theoceaniscool joined #git
13:31 mSSM Vampire0: Well, this git reset -p is tricky. It says "unstage this hunk", which means I need to somehow remove the second +... but I am not sure what to do with the first part.
13:33 ysh joined #git
13:33 govg joined #git
13:33 BSAlb joined #git
13:34 mSSM Ah, I am just going to reset the file.
13:34 mSSM This is getting too weird :D
13:35 Dougie187 joined #git
13:35 EisNerd joined #git
13:35 lewix joined #git
13:36 darkbit joined #git
13:36 EugenA joined #git
13:36 Vampire0 mSSM, I never said it refers to a negative line. I always said - means before and + means after
13:37 Vampire0 mSSM, git reset -p is identical to git add -p, just that you define what gets unstaged, instead of staged
13:37 mSSM Vampire0: Oh right, I misread.
13:38 EugenA every time I start phpstorm it says: Ignored files found that are tracked
13:38 zefferno joined #git
13:38 MarioBranco joined #git
13:38 maryo joined #git
13:38 ki0 joined #git
13:39 EugenA but I cannot find out which files
13:39 Vampire0 EugenA, so?
13:39 EugenA maybe it is possible to find this out on command line?
13:39 ki0 joined #git
13:41 Vampire0 EugenA, actually it is not a notice of Phpstorm, but of the .ignore plugin, but what exactly do you want to do / know?
13:41 osse Vampire0: try  g ls-files --ignored --exclude-standard --cached
13:42 osse ehh git ls-files ...
13:42 notebox joined #git
13:42 EisNerd joined #git
13:42 rominronin joined #git
13:43 EugenA thanks, I'm getting few files from git ls-files
13:43 EugenA I'll check them
13:43 Gsham joined #git
13:43 Cabanossi joined #git
13:43 Vampire0 osse,  I don't want to ;-)
13:43 osse oh
13:43 osse EugenA: that was for you, yep
13:43 rominronin joined #git
13:44 Vampire0 EugenA, btw. actually this is not a message of Phpstorm, but from the .ignore plugin that you installed
13:44 EugenA Vampire0: you are right
13:45 andai joined #git
13:45 Vampire0 EugenA, at least it is the one that gives me those notices if I add force .ignored files or try to ignore tracked files
13:46 thiago joined #git
13:47 al-damiri joined #git
13:48 EisNerd joined #git
13:49 sonOfRa joined #git
13:53 EisNerd_ joined #git
13:54 virtual__ joined #git
13:55 Es0teric joined #git
13:55 re1 joined #git
13:56 jnewt joined #git
13:57 sevenever joined #git
13:57 kpease joined #git
13:58 EisNerd joined #git
13:59 bannakaffalatta joined #git
14:00 bsanford joined #git
14:04 EisNerd joined #git
14:04 AaronMT joined #git
14:04 drodger joined #git
14:07 felixjet joined #git
14:09 MineCoins joined #git
14:11 EisNerd_ joined #git
14:14 dermoth joined #git
14:15 courrier joined #git
14:15 khfeng joined #git
14:15 felixjet joined #git
14:16 guampa joined #git
14:16 tristanp joined #git
14:16 EisNerd joined #git
14:18 lknd joined #git
14:18 lknd hello pals
14:18 lknd I'm curious about the following: if I am pushing commits into my fork, after creating a pull request, will all of the following commits until the PR is accepted also be included?
14:19 kadoban lknd: If it's in the same branch you did a pull request from, yes.
14:19 lknd awesome, it is indeed on the same branch!
14:19 lknd (I meant branch, not fork in my initial question!)
14:20 Vampire0 lknd, and you are probably talking about GitHub?
14:20 lknd thank you kadoban
14:20 lknd yeah
14:20 Vampire0 lknd, because for other hosting providers it could be different
14:20 lknd GitHub indeed sir
14:20 Vampire0 lknd,  but yeah, on GitHub it is part of the flow, so that the reviewer can tell you to modify your PR and you can simply push or force-push to the PR branch to update the PR
14:21 lknd thank you, I wanted to make sure since I am adding new changes that aren't really directly related to our feature
14:21 lknd but I keep getting a reminder to push it on the same PR
14:21 TikityTik joined #git
14:22 lknd what I had in mind is that if its all being done on the same branch and I pushed further commits to it and the PR hasn't been accepted
14:22 maryo_ joined #git
14:22 lknd that it will all be added once that PR is accepted
14:22 lknd but the way it was reminded made me think perhaps I needed to be aware of something else
14:24 Logico left #git
14:27 TbobbyZ joined #git
14:28 JanC_ joined #git
14:29 Vampire0 lknd, as long as the PR is open, any pushes to the PR branch end up in the PR. After the PR was closed, the branch is detached and you also can create a new PR from the same branch. But I usually create a new branch for each change I want to open a PR for. This way you have a clear distinction and you can also open multiple PRs at the same time easily
14:29 seni joined #git
14:29 ssarah joined #git
14:29 Godfather_ joined #git
14:30 davimore joined #git
14:30 lknd thanks for the detailed info Vampire0
14:33 EisNerd joined #git
14:33 xall joined #git
14:34 chardan joined #git
14:34 Levex joined #git
14:36 finalbeta joined #git
14:38 jameser joined #git
14:38 PioneerAxon joined #git
14:38 Vampire0 EugenA, btw. isn't there a "Show Details" link that shows you which lines .ignore means?
14:39 tymczenko joined #git
14:39 chardan joined #git
14:39 EugenA Vampire0: yes, but it shows me ony one directory, no files
14:40 Vampire0 EugenA, ah, ok
14:41 Vampire0 EugenA, maybe then something to report to .ignore :-)
14:42 aax joined #git
14:43 feodoran joined #git
14:43 Cabanossi joined #git
14:43 maryo__ joined #git
14:44 rominronin joined #git
14:44 smaudet joined #git
14:45 masuberu joined #git
14:46 maryo_ joined #git
14:46 r3b311i0n joined #git
14:47 zivester joined #git
14:47 feodoran Hi guys, I forgot to remove a comment (with someones email address) from my code before adding it to a repo. Is there a way to remove this from all commits?
14:48 selckin !sensitive
14:48 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
14:50 Vampire0 feodaron, but be aware of !rewrite
14:50 gitinfo feodaron: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
14:50 EisNerd_ joined #git
14:51 r3b311i0n left #git
14:52 feodoran so far I did not push it somewhere, so there is only 1 local copy of it
14:52 publio joined #git
14:52 MineCoins joined #git
14:53 a_thakur joined #git
14:53 feodoran the link is all about how to remove an entire file. But I just need to remove a single line from a file ...
14:54 thiago read the documentation and find out how to edit a file on the fly
14:54 thiago or to replace it
14:54 thiago it's more difficult and much slower
14:55 feodoran what do you mean by "edit on the fly"?
14:55 mkalfon_ joined #git
14:55 thiago edit the file without opening a text editor and waiting for you
14:55 feodoran ???
14:56 thiago open the file, modify a line or suppress it, save
14:56 thiago without user interaction
14:56 cdg joined #git
14:56 thiago there's a tool designed to do that. A stream editor that takes the same commands as vi: sed.
14:56 thiago it literally stands for "stream editor"
14:56 feodoran and this is useful for my case because?
14:57 thiago because you need to edit the file in each and every commit
15:02 feodoran so I need to do an interactive rebase for each commit?
15:02 thiago no
15:02 thiago you need to use git filter-branch
15:04 Gustavo6046 joined #git
15:04 bremner well. maybe exec in rebase -i could work for short history
15:04 mentazoom joined #git
15:04 zeroed joined #git
15:04 zeroed joined #git
15:05 bremner no particular reason to use rebase here, but in theory it might work.
15:05 theoceaniscool joined #git
15:05 osse for short history you could even do 'edit'
15:05 EisNerd joined #git
15:08 feodoran so I need something like "git filter-branch --tree-filter <sed-command>" ?
15:08 osse correct!
15:08 Murii joined #git
15:08 Es0teric joined #git
15:09 osse generally speaking: you need to write a script that edits the file automatically how you want it (in your case, finding a particular line and deleting it). Once that is done you do git filter-branch ... --tree-filter {script here} ...
15:09 feodoran and by default this will be applied to the whole history?
15:09 tsetair joined #git
15:10 a_thakur joined #git
15:11 osse i don't think there is a default: you have to write --all or somesuch
15:11 feodoran ok, thx
15:13 Hko joined #git
15:14 Puffball joined #git
15:14 boombatower joined #git
15:16 aaagkgk joined #git
15:16 ij joined #git
15:17 SR3ject joined #git
15:18 ij When I fetch from a local repo, «git fetc» fetches only HEAD to FETCH_HEAD, but I'd like all branches to be updated.
15:19 _ikke_ ij: What command are you running exactly?
15:19 osse ij: what does 'git config remote.{name}.fetch' say ?
15:20 ij "git fetch"
15:21 _ikke_ then what osse said
15:21 osse \o/
15:21 Darren_ joined #git
15:21 bannakaf_ joined #git
15:21 ij Nothing. I'm guessing it should show something with a wildcard.
15:22 _ikke_ yes
15:22 _ikke_ +refs/heads/*:refs/remotes/{name}/*
15:22 osse _ikke_: git config remote.{name}.fetch 'refs/heads/*:refs/remote/{name}/*'
15:22 osse oops
15:22 ij :P
15:22 osse wrong dude (or dudette)
15:22 osse wrong HUMANOI`D
15:23 ij Why was this not get set? I cloned it from local directory too. (with --bare)
15:24 _ikke_ because it's not setup for bare repositories
15:24 ij Okay and this is git's internal default value?
15:25 osse oui. da. si. yes. ja.
15:25 marianina8 joined #git
15:25 ij
15:25 osse i don't know any more
15:25 dootele joined #git
15:27 yaelvaya joined #git
15:27 ij How does git know the default branch upon clone?
15:28 ij Answer: the remote has a HEAD.
15:28 _ikke_ correct
15:28 feodoran the git filter-branch command worked, but only for the current branch. is this supposed to happen?
15:28 shinnya joined #git
15:29 bremner yes. that's why there is --all
15:29 feodoran because if I now removed this line in some parent commit, how come it still shows up in other branches?
15:29 perlpilot joined #git
15:29 feodoran the --all option caused git to print the filter-branch usage help
15:30 osse try -- --all
15:30 bremner which explains the option...
15:30 bremner orly.
15:31 _ikke_ yes, --all is an option for git rev-list, which you need to separate with --
15:31 bremner I see, that's in the man page
15:31 _ikke_ git filter-branch <filter-branch-option> -- <rev-list-options>
15:32 feodoran ok, seems to work
15:32 feodoran but the additional -- seperator does not show up in the usage help, only in the link from above
15:34 brent__ joined #git
15:34 bremner yes, you have to read the full docs sometimes.
15:35 osse that's a bad typo
15:35 brent__ joined #git
15:35 osse feodoran: that's a low-hanging fruit if you want to get your name forever inscribed in the eternal history of Git !
15:36 bremner ah, I thought it was just hidden in <rev-list-args>. reading is hard.
15:36 maarhart joined #git
15:40 feodoran just for double checking: is there a way to grep in all files of all commits/branches?
15:40 elichai2 joined #git
15:40 _Mica_ joined #git
15:40 bremner change your sed command
15:41 _Mica_ left #git
15:41 bremner oh, or is this a new question, unrelated to filter-branch?
15:41 telephone joined #git
15:41 telephone joined #git
15:41 feodoran no, this should be it
15:41 _ikke_ feodoran: git log -S "text" --all
15:41 Hello71 joined #git
15:41 _ikke_ this looks for commits that add or remove "text"
15:42 Cabanossi joined #git
15:43 Acerific joined #git
15:43 Acerific joined #git
15:44 feodoran It seems, that git filter-branch copied everything, so the line I wanted to delete is still there, altough kind of hidden ...
15:44 nevodka joined #git
15:44 bremner yes, you need to get rid of the old commits
15:44 osse i think it's time you showed us what command you actually run
15:44 osse ran
15:44 nevodka joined #git
15:45 nevodka joined #git
15:45 bremner feodoran: simplest thing is to make a local clone, and check that.
15:45 jagob joined #git
15:45 feodoran git filter-branch --tree-filter "sed -i '/mail@example.com/d' filename" -- --all
15:45 ZyX-I joined #git
15:48 mbrzuzy joined #git
15:49 felixjet joined #git
15:50 overlord_tm joined #git
15:51 bremner feodoran: see the discussion of "refs/original" in the man page; the original commits are there as a backup
15:52 svm_invictvs joined #git
15:52 Levex joined #git
15:53 feodoran bremner: local clone seems to do the trick, thx
15:53 doener joined #git
15:55 MineCoins joined #git
15:55 Vampire0 feodaron, you simply need to delete the original refs after you are sure filter-branch did what exactly what you wanted
15:56 dreiss joined #git
15:56 robotroll joined #git
15:58 humboldt joined #git
16:00 ahrs joined #git
16:01 cstratak joined #git
16:02 orbyt_ joined #git
16:05 miczac joined #git
16:06 nexemacs joined #git
16:06 Achylles joined #git
16:09 bitmod how do i indent on an indent for .md files?
16:10 bitmod (i.e. an indent shows a codeblock, but i don't know how to indent on this codeblock)
16:10 BlaXpirit bitmod, indent more
16:10 bitmod BlaXpirit: doesn't seem to work
16:11 BlaXpirit show example in a paste bin
16:11 bitmod BlaXpirit: i'm using Markdown Viewer (chrome extension) btw
16:11 BlaXpirit oh, that would explain it >_>
16:11 bitmod thought that might be the issue. is there a way to view .md files locally like it would appear on github?
16:12 BlaXpirit cant you just paste it to  gist.github.com  and name the file something.md
16:12 Cabanossi joined #git
16:13 bitmod BlaXpirit: it's not github related per se (i.e. it's not for a particular project, just to take notes on development books that i read)
16:14 bitmod i'd prefer to keep it local
16:14 rominronin joined #git
16:14 BlaXpirit bitmod, > Support GitHub flavored markdown
16:15 BlaXpirit dont use indentation code blocks,  use   ```\ncode blocks\n```
16:15 robattila256 joined #git
16:16 bitmod thanks
16:17 gitinfo bitmod: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
16:17 Dougie187 .topkarma
16:17 gitinfo top karmic beings of past 30 days ('all' arg to see totals): o‍sse: 3,  _‍ikke_: 2,  v‍ampire0: 2,  j‍ast: 1,  g‍rawity: 1
16:17 bitmod .topkarma BlaXpirit
16:17 gitinfo top karmic beings of past 30 days ('all' arg to see totals): o‍sse: 3,  _‍ikke_: 2,  v‍ampire0: 2,  j‍ast: 1,  g‍rawity: 1
16:17 Snugglebash joined #git
16:17 bitmod heh cool
16:18 bitmod thanks BlaXpirit
16:21 ki0_ joined #git
16:24 PaulCapestany joined #git
16:25 peacememories joined #git
16:26 chipotle joined #git
16:27 durham joined #git
16:28 telephone joined #git
16:28 telephone joined #git
16:29 sgrover joined #git
16:32 sgrover Branch issue.  Our flow is feature branch -> develop branch -> staging branch, and master branch.  "staging" branch had a snafu and does not currently match our "master" branch but should.  I need to merge the current code on the develop branch to staging, but first must ensure the staging branch is correct.  How best to resolve this?
16:32 sgrover Just remove the staging branch, and then re-create it from the master branch?
16:32 irqq joined #git
16:33 sgrover "fixing" the staging branch will be a lot of work as there were some messed up commits/merges over time with regards to a specific feature branch.
16:35 svm_invictvs joined #git
16:37 sgrover So I'm thinking either just force staging to match the current master (which it should anyways) either by recreating it, or some other method.
16:38 TheSimonator joined #git
16:42 EisNerd_ joined #git
16:42 Cabanossi joined #git
16:44 pbrewczynski_c joined #git
16:44 Es0teric joined #git
16:47 EisNerd joined #git
16:47 madewokherd joined #git
16:48 MineCoins joined #git
16:53 ter0 joined #git
16:54 diogenese joined #git
16:57 bitmod_ joined #git
16:58 kexmex joined #git
17:00 gopar joined #git
17:02 cdown joined #git
17:07 felixjet joined #git
17:10 sbeller_ joined #git
17:10 Achylles joined #git
17:10 felixjet_ joined #git
17:11 tnecniv joined #git
17:12 Harzilein joined #git
17:12 Harzilein hi
17:12 marianina8 joined #git
17:12 Vampire0 sgrover, you can of course delte and recreate it (or simply use `-f` to `branch` to repoint the branch label to another commit), but you have to be aware of !rewrite
17:12 gitinfo sgrover: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
17:12 Harzilein did anyone ever work on having sparse checkouts configurable per branch?
17:12 Cabanossi joined #git
17:13 Harzilein this feels like a rough edge :/
17:13 Vampire0 sgrover, alternatively you can simply overwrite all your files with the files as they are in master and make a commit that brings the files in the correct state if that is more feasible
17:15 peacememories joined #git
17:17 flavius joined #git
17:17 Orbitrix joined #git
17:18 Orbitrix joined #git
17:18 Levex joined #git
17:18 theiostream joined #git
17:20 neunon joined #git
17:20 cdown joined #git
17:22 dave_uy joined #git
17:23 pwnz0r joined #git
17:24 sgrover Vampire0: thanks.  Looks like the master branch isn't quite right either - merging develop branch is showing conflicts on files that should not be conflicting.  So a large "correcting" commit seems to be the better option here.
17:24 fahadash joined #git
17:25 ki0 joined #git
17:25 joshszep joined #git
17:25 felixjet joined #git
17:26 shgysk8zer0 joined #git
17:26 ki0 joined #git
17:28 davimore joined #git
17:30 cahoots joined #git
17:31 freimatz joined #git
17:35 sgrover odd file behavior.  File X exists on my feature-branch.  That branch was merged to the develop branch.  Some changes were made on the develop branch.  Now when merging to the staging branch, File X is NOT being merged.  The resulting file still looks like the old file, even though checking out the develop branch shows the correct version of the file.
17:36 sgrover could this just be a date thing?  The staging branch received some changes to sort out other problems AFTER the File X was committed...
17:36 cbreak sgrover: no
17:36 cbreak sgrover: it's a merge thing
17:36 cbreak who ever merged the branch decided to not merge the changes to that file
17:36 cbreak talk to that person
17:37 sgrover k. thanks.  Thought the date thing was a stretch.
17:37 cbreak dates are irrelevant with respect to merging, only the state of the participating heads and their merge-base matters
17:37 sgrover I'm the guy that has to fix it.  So I'll just do two commits - one to "merge --squash" the develop branch, and then another to merge the desired feature branch... In this case File X is part of that feature branch.
17:38 MineCoins joined #git
17:38 sgrover I'm just worried about what else might be missing...
17:38 nowhereman joined #git
17:39 Es0teric joined #git
17:39 bilal joined #git
17:40 Vampire0 sgrover, a merge, no matter whether it is a --squash merge or no, just merges the commits that are in the source branch, but not yet in the target branch
17:40 Vampire0 sgrover, a merge does not compare the files of two heads
17:40 Vampire0 sgrover, iirc
17:41 Doros joined #git
17:42 NeXTSUN joined #git
17:44 lewix joined #git
17:45 pwnz0r joined #git
17:45 PettanShoutaKun joined #git
17:46 rominronin joined #git
17:46 PettanShoutaKun is there a way to merge master into every single branch on a remote?
17:47 qqx PettanShoutaKun: There isn't a way to do any merge on a remote, let alone on multiple branches.
17:48 NeXTSUN joined #git
17:48 SlashLife joined #git
17:48 bilal joined #git
17:49 _ikke_ Merging always happens locally
17:50 felixjet_ joined #git
17:50 mSSM joined #git
17:51 joshszep joined #git
17:51 sgrover Vampire0: thanks.  Understood.  the final solution was a "git checkout develop <file>" for each of the changed files ("git diff --name-status staging..develop" gave me that file list).  That was on the staging branch, then a simple commit and staging now looks like it should.
17:53 tymczenko joined #git
17:53 cbreak sgrover: you should abandon the merge and redo it properly
17:53 cbreak sgrover: chances are you fucked up conflict resolution
17:55 cahoots_ joined #git
17:56 PettanShoutaKun right....
17:56 maroloccio joined #git
17:56 PettanShoutaKun is there a way to easily checkout all remote branches, merge master into them, and then push them up to a different remote?
17:57 _ikke_ PettanShoutaKun: Just by doing it, merging can cause conflicts, you should not want to automate that
17:59 aruns joined #git
17:59 lektrik joined #git
18:00 avar What's the simplest & lowest level thing to just see if a refname matches a glob? for-each-ref?
18:00 dreiss joined #git
18:00 nturaga1 joined #git
18:00 avar rev-list -1 <pat> maybe..
18:00 PettanShoutaKun I don't want to automate it
18:00 PioneerAxon joined #git
18:01 PettanShoutaKun I'm just wondering if there's a command to be like do this for all the repos
18:01 aruns joined #git
18:01 PettanShoutaKun basically I have a fork with about 10 branches on it and I want to merge that fork upstream but also push the branchhes upstream as well
18:02 _ikke_ You'd have to do that for all 10 branches
18:02 _ikke_ well
18:02 _ikke_ git checkout master, git merge <branch>; git merge <branch2>. ..
18:02 griff joined #git
18:03 Sasazuka joined #git
18:03 doMynation joined #git
18:03 pwnz0r joined #git
18:06 rastos2 joined #git
18:08 cads2 joined #git
18:09 nturaga1 left #git
18:09 nturaga1 joined #git
18:10 djb-irc joined #git
18:11 nturaga1 left #git
18:11 nturaga1 joined #git
18:11 nturaga1 left #git
18:12 nturaga joined #git
18:13 duderonomy joined #git
18:14 Vampire0 _ikke_, master into them, not them into master
18:15 joshszep joined #git
18:16 ProLoser joined #git
18:18 bilal_ joined #git
18:18 foreal joined #git
18:19 warthog9 joined #git
18:19 Sasazuka__ joined #git
18:19 andai joined #git
18:20 karols146 joined #git
18:21 _ikke_ Then they have to do it the other way around
18:21 _ikke_ git checkout branch, git merge master
18:23 Introoter joined #git
18:23 dvaske joined #git
18:23 nilg joined #git
18:23 irqq joined #git
18:24 nixjdm joined #git
18:25 maryo joined #git
18:27 vuoto joined #git
18:28 vuoto joined #git
18:31 felixjet joined #git
18:32 mSSM joined #git
18:32 math-alpha joined #git
18:33 kyan joined #git
18:33 govg joined #git
18:33 bilal joined #git
18:34 palimondo joined #git
18:35 zerow joined #git
18:35 MarioBranco joined #git
18:36 g00s joined #git
18:36 nickabbey joined #git
18:37 g00s git-osx-installer hasn't been updated in about 6mos ... anybody know the status? its at version 2.10 https://sourceforge.net/projects/git-osx-installer/files/?source=navbar
18:37 dvaske_ joined #git
18:37 aw1 joined #git
18:38 palimondo Hello! I have a open WIP PR on github. There were some changes to master my fork was based on and now my PR has conflicts. What do I need to do with my local branch that pushes to my fork, in order to resolve this?
18:38 whitby g00s: it's on GitHub IIRC
18:39 g00s whitby yeah, seems stalled there too https://github.com/timcharper/git_osx_installer/issues/89
18:39 palimondo I have tried doing rebase on my branch from the fork, but this strangely results in conflicts in files that I have not touched at a… Help?
18:39 palimondo a… = at all
18:40 whitby g00s: yikes, yeah, that's rough
18:40 whitby Ya know things are rough when the version of Git Apple ships is newer :)
18:41 g00s lol i haven't checked that. even sourcetree ships with the timcharper version
18:41 dave0x6d joined #git
18:41 bilal joined #git
18:41 whitby macOS "ships with" Git 2.11
18:42 whitby (By "ships with" I mean via the cli install"
18:42 TheSimonator joined #git
18:42 Es0teric joined #git
18:42 g00s yeah i'm still on OSX 10.10.5. i wonder if if the cli packages are recent for yosemite
18:42 whitby palimondo: do you have a remote setup for the original repo?
18:43 whitby g00s: shoot, you still have OpenSSL then yeah? If you should be able to compile Git yourself without too much issue.
18:43 whitby (Or use Brew, but meh)
18:44 marianina8 joined #git
18:44 bilal joined #git
18:44 ron3 joined #git
18:44 palimondo whitby: not sure what that means exactly. I guess, I do? git remote -v has origin and mine, where mine is my fork
18:45 palimondo both are configured for fetch and push
18:45 marianina8 joined #git
18:45 whitby Cool, then I think you want to 1) `git fetch origin` and 2) `git rebase origin/master name-of-branch-on-fork`
18:45 marianina8 joined #git
18:45 whitby Or is that the rebase that gave you issues before?
18:45 Levex joined #git
18:46 palimondo rebase… after I messed similar thing on command line before, I have used git Tower this time. When it did the rebase and reported conflicts in unrelated files, it did hit abort
18:47 palimondo it = I
18:47 bilal joined #git
18:47 whitby Hmm, ok
18:47 whitby Did you get it to work in Tower then?
18:48 palimondo Nope, I aborted.
18:48 palimondo I think I’m misunderstanding how it works
18:48 palimondo should I be rebasing against mine or origin?
18:49 palimondo against/from - uncler in correct terminology here
18:49 whitby I would recommend trying again form the command line. If the changes are to master on the original repo (i.e. the repo from which you forked) then you want to rebase your branch on the master branch of origin.
18:50 todd_dsm joined #git
18:50 palimondo Is github fetching changes from origin to mine automatically?
18:51 whitby To show what files are conflicting? If we're talking about the same thing, then yes.
18:51 whitby To show you the list of files that are conflicting it would merge the two branches and report back
18:52 SlashLife joined #git
18:54 YuGiOhJCJ joined #git
18:55 Darren_ joined #git
18:57 LeBlaaanc joined #git
18:57 indistylo joined #git
18:58 TheSimonator joined #git
19:01 Levex joined #git
19:03 notebox joined #git
19:03 aruns__ joined #git
19:03 zeroed joined #git
19:06 indistylo joined #git
19:07 palimondo whitby: OH! Maybe I get it now… lets see…
19:07 aw1 joined #git
19:08 mentazoom joined #git
19:08 lewix joined #git
19:10 NeXTSUN joined #git
19:10 palimondo whitby: Before I tried to rebase from mine, that had conflicts in unrelated file. Now I did fetch and pull on master. I’m doing rebase on my branch against the master.
19:10 g00s left #git
19:11 palimondo whitby: There was a change on origin-master to the file I’m working on. I did a massive refactor, so basically I touched all the lines. And the rebase is now doing merge of my commits agains this changed base and I have a conflict - I can modify all my commits on top of this?
19:13 Ryanar joined #git
19:13 TbobbyZ joined #git
19:15 durham_ joined #git
19:16 tnecniv joined #git
19:17 aboccia joined #git
19:17 rominronin joined #git
19:17 peacememories joined #git
19:18 palimondo whitby: OK. I think it all worked out.
19:18 nd_ joined #git
19:18 MrWoohoo joined #git
19:18 MineCoins joined #git
19:19 Snugglebash joined #git
19:19 Vns joined #git
19:20 tymczenko joined #git
19:22 Dewin|znc joined #git
19:24 whitby palimondo: did you get to work?
19:24 palimondo Yep.
19:24 paws_ joined #git
19:24 pwnz0r joined #git
19:25 palimondo So the answer was to checkout master, pull, checkout my-branch, rebase master, and then go through the conflict resolutions, as it applied my changes on top of that new base…
19:25 tarkus joined #git
19:25 Levex joined #git
19:26 palimondo I think I got that now. So if github reports conflicts on my PR, even though I’m pushing to my fork, I don’t rebase against that.
19:26 palimondo I rebase against what I branched from originally.
19:29 nexemacs joined #git
19:30 Cabanossi joined #git
19:33 gugah joined #git
19:33 joelthepirate joined #git
19:36 apotry joined #git
19:38 peacememories joined #git
19:39 ali1234 joined #git
19:41 Arbeiter joined #git
19:44 Kyros joined #git
19:45 muehle joined #git
19:46 muehle joined #git
19:49 muehle1 joined #git
19:52 tyreld joined #git
19:53 treehug88 joined #git
19:54 felixjet_ joined #git
19:54 muehle joined #git
19:55 muehle joined #git
19:55 cstratak joined #git
19:55 TheSimonator joined #git
19:56 Atm0spher1c joined #git
19:57 MineCoins joined #git
19:58 Arbeiter joined #git
20:01 Levex joined #git
20:03 durham joined #git
20:03 plouj joined #git
20:04 plouj Hi, I'm trying to use the subtree merge strategy, but I can' figure out how to actually view history of the *individual* imported files. Eg: 'git log subdir/some/file' just show me the "Imported subdir repo." merge commit. Any suggestions?
20:05 kyan joined #git
20:06 thiago that doesn't look like a merge commit
20:06 _ikke_ plouj: try git log --follow
20:06 plouj thiago: ok, I made that up on the spot, but I'm doing exactly these steps: https://help.github.com/articles/about-git-subtree-merges/
20:06 marianina8 joined #git
20:07 plouj neither 'git log --follow subdir/some/file' nor 'git log -- subdir/some/file' help.
20:08 karols146 joined #git
20:09 a3Dman joined #git
20:09 a3Dman joined #git
20:09 andai joined #git
20:12 nowhereman joined #git
20:12 relipse How do I show the diff for a specific commit
20:13 cdg joined #git
20:13 tang^ man git show
20:13 gitinfo the git-show manpage is available at https://gitirc.eu/git-show.html
20:15 andai_ joined #git
20:17 Atm0sphe1 joined #git
20:17 netj joined #git
20:18 cdown joined #git
20:19 TheSimonator joined #git
20:20 monokrome joined #git
20:21 EisNerd_ joined #git
20:21 ToBeCloud joined #git
20:23 safe joined #git
20:24 m0viefreak joined #git
20:24 ki0 joined #git
20:28 hahuang65 joined #git
20:28 andai joined #git
20:30 Cabanossi joined #git
20:30 re1_ joined #git
20:31 Atm0sphe1 joined #git
20:32 Rodya_ joined #git
20:32 tnecniv joined #git
20:33 plasticle joined #git
20:38 LaptopBrain joined #git
20:38 andai_ joined #git
20:38 rodarmor joined #git
20:39 ali1234 joined #git
20:41 bilal joined #git
20:44 monokrome joined #git
20:48 jstimm joined #git
20:48 rominronin joined #git
20:52 askb joined #git
20:52 jaziz joined #git
20:55 Random832 joined #git
20:56 bilal_ joined #git
20:58 ertesx joined #git
20:58 a3Dman joined #git
20:59 durham_ joined #git
21:00 LeBlaaanc joined #git
21:01 durham__ joined #git
21:02 tnecniv joined #git
21:05 grayjoc joined #git
21:09 Atm0spher1c joined #git
21:10 i7c joined #git
21:11 tanuki_ joined #git
21:11 cyberz joined #git
21:14 aw1 joined #git
21:15 Cabanossi joined #git
21:15 Tobbi joined #git
21:16 dyu joined #git
21:18 __rgn joined #git
21:20 fuzzmz joined #git
21:20 Levex joined #git
21:23 avar $ (time (rm -rf test; git init -q test && (cd test && touch $(perl -e 'print "a" x 100').t && git add a* && git commit -q -m"test" && git ls-files 'a*a*a*a*a*a*a*b'))) 2>&1|grep ^real
21:23 avar real    0m40.043s
21:24 MarioBranco joined #git
21:27 zeroed joined #git
21:27 zeroed joined #git
21:28 durham joined #git
21:29 ki0 joined #git
21:31 druonysus_ joined #git
21:31 durham_ joined #git
21:33 TheSimonator joined #git
21:38 _cyril_ joined #git
21:39 pks joined #git
21:41 doMynation joined #git
21:41 Gsham joined #git
21:43 a3Dman joined #git
21:43 TheSimonator joined #git
21:43 gunnaro joined #git
21:49 kristofferR joined #git
21:51 druonysus_ joined #git
21:53 kristofferR joined #git
21:54 gopar joined #git
21:58 Rodya_ joined #git
21:59 __rgn joined #git
22:01 Dougie187 left #git
22:04 ki0 joined #git
22:06 anuxivm joined #git
22:06 felixjet joined #git
22:06 kyan joined #git
22:07 mel00010 joined #git
22:08 NeverDie joined #git
22:10 dsdeiz joined #git
22:10 dsdeiz joined #git
22:11 aidalgol joined #git
22:11 YuGiOhJCJ joined #git
22:12 brent__ joined #git
22:15 doMynation joined #git
22:15 Cabanossi joined #git
22:17 sammyo joined #git
22:18 Karazhan joined #git
22:18 NeXTSUN joined #git
22:20 a3Dman joined #git
22:20 TbobbyZ joined #git
22:21 rominronin joined #git
22:21 TbobbyZ joined #git
22:22 madewokherd joined #git
22:22 mizu_no_oto joined #git
22:22 TbobbyZ joined #git
22:23 MACscr joined #git
22:31 cahoots joined #git
22:38 gopar joined #git
22:38 dave0x6d joined #git
22:40 gusnan joined #git
22:40 gusnan joined #git
22:43 telephone joined #git
22:43 telephone joined #git
22:46 Noldorin joined #git
22:47 dirtyroshi joined #git
22:49 KP580BM1 joined #git
22:51 aw1 joined #git
22:54 mikecmpbll joined #git
22:57 salamanderrake joined #git
23:00 kexmex joined #git
23:04 Ranhir joined #git
23:05 salamanderrake joined #git
23:07 telephone joined #git
23:07 telephone joined #git
23:14 _Bin4ry joined #git
23:15 lucido joined #git
23:15 porch_ joined #git
23:16 Es0teric_ joined #git
23:17 cam27 joined #git
23:17 clickjack joined #git
23:18 fakenerd_ joined #git
23:18 telephone joined #git
23:18 telephone joined #git
23:18 TheSimonator joined #git
23:19 porch__ joined #git
23:19 zivester joined #git
23:23 TikityTik joined #git
23:24 TbobbyZ joined #git
23:24 sim590 joined #git
23:24 Vangelis joined #git
23:25 kaldoran joined #git
23:25 _Bin4ry joined #git
23:27 metalraiden34 joined #git
23:28 MattMaker joined #git
23:28 metalrai_ joined #git
23:28 doppo joined #git
23:28 enckse joined #git
23:28 Ahmed90 joined #git
23:29 storrgie joined #git
23:31 bannakaffalatta joined #git
23:31 a3Dman joined #git
23:31 telephone joined #git
23:31 telephone joined #git
23:32 ProLoser joined #git
23:33 Rodya_ joined #git
23:33 garyserj joined #git
23:33 adgtl joined #git
23:37 zulutango joined #git
23:37 orbyt_ joined #git
23:37 Gustavo6046_ joined #git
23:38 kanzure joined #git
23:39 PioneerAxon joined #git
23:39 nexemacs joined #git
23:39 bdonnahue joined #git
23:42 cagomez joined #git
23:42 NeXTSUN joined #git
23:46 telephone joined #git
23:46 telephone joined #git
23:46 Gustavo6046 joined #git
23:48 sunri5e joined #git
23:48 mel00010 joined #git
23:49 a3Dman_ joined #git
23:52 Lyqyd joined #git
23:53 rominronin joined #git
23:54 cagomez joined #git
23:54 Kaisyu joined #git
23:56 kanzure joined #git
23:59 quotemstr joined #git
23:59 feodoran joined #git
23:59 quotemstr What's the git-y way to do something like this? $EDITOR foo.c; git add foo.c; git diff --staged | patch -p0?

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