Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-10

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

All times shown according to UTC.

Time Nick Message
00:00 sin3t joined #git
00:00 osse Then you want git stash. This is what it's meant for
00:00 Electrometro joined #git
00:00 haaaay The go back to old file part isn't working despite the fact that i appear to have have made the switch via checkout <hash>...but the working directory still shows the 'current contents i.e. with modifications'
00:01 haaaay I appreciate the help by the way
00:01 osse If it had worked the way you wanted, how would you get back?
00:02 osse In current git there would be no way to get back. Hence git will leave the file untouched if it can
00:02 rik316 joined #git
00:03 haaaay Good point. As i read more it seemed like a poor plan and stash would have been more appropriate. The part i don't understand is why it let me checkout with the modifications.
00:03 haaaay Or has it?
00:03 haaaay I'm in a detached state...so I thought something would have changed...
00:04 haaaay But it seems like I'm staring at the same files ...just in a detached state with no sign of the old one
00:04 osse It lets you for a couple of reasons: so it doesn't have to obliterate your changes, and because it's actually useful sometimes
00:04 osse Like when you start making changes, but have the wrong branch checked out
00:05 rik316 joined #git
00:05 osse Yes, you'll want to go back to the branch: git checkout master (or whatever your branch os called)
00:05 tesuji_ joined #git
00:06 osse haaaay: !detached
00:06 gitinfo haaaay: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
00:06 osse If your experience with git is what I think it is I'd wait and try to understand that part in a week or two :P
00:07 osse (not offense)
00:08 starkhalo joined #git
00:08 osse Long story short: there's a difference between having a branch checked out and a commit checked out, even when the tip of the branch is the very same commit
00:08 haaaay None taken. So, what's the rule on this then? (Or can i read about this particular case) Takeaway: If you have modifications and checkout a commit, it will sometimes let you do so but without showing you your old files
00:09 haaaay What's the criteria for "sometimes"
00:09 sin3t joined #git
00:09 haaaay I've read about the cases where it won't let you checkout but this idea where you checkout...but still have your current file despite an apparent conflict is what I'm trying to understand.
00:10 osse haaaay: It will let you do it if the file is identical in the commit you're checking out compared to the one you're on
00:10 haaaay If x,y,z you'll get this behavior. The "easier" case of conflicts is all I seem to stumble across on Google...where obliteration happens
00:10 haaaay Even if the one i'm working on has modifications?
00:11 osse This all makes more sense when you have multiple branches, or at least multiple commits
00:11 osse haaaay: Yes. Modifications don't "belong" to a particular branch or commit
00:11 haaaay If file in past is the same as file in your current commit, you'll be shown the modified file (uncommitted unstaged)?
00:11 osse Yep
00:12 haaaay Thank you. Is there a particular term I can google or a place i could read more about that particular case?
00:12 [Brain] joined #git
00:13 haaaay Ok if not off the top of your head
00:13 haaaay Sometimes i've got to do my own legwork...
00:13 whatevsz joined #git
00:14 osse If it is NOT the same between the commits then Git has to modify it to make it reflect the state of the commit you're checking out. But you have modifications, which would be lost, so git will stop and give you a warning
00:14 osse I can't think of anything, sorry.
00:14 osse !video
00:15 gitinfo [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)
00:15 haaaay No problem. Off to google it is. Thank you for your help
00:15 osse But I do recommend no. 2 and 4 in particular
00:15 haaaay I'll check those out then
00:15 osse The latter quite succinctly explains the whole detached thing with sticky notes!
00:16 Raed|Laptop joined #git
00:16 haaaay Can't find sticky note based lectures anywhere.  Thanks again
00:17 osse What do you mean?
00:18 Electrom_ joined #git
00:18 haaaay It was a joke. Sticky-note based lectures are pretty unusual (I think)
00:18 haaaay Poor joke
00:18 osse Oooh
00:19 Electro__ joined #git
00:19 haaaay Boo is more like it
00:19 haaaay Thank you. Gonna run
00:19 sin3t joined #git
00:19 osse I've actually had great success using whiteboards and markers and indeed sticky notes to explain various Git concepts
00:19 osse Inspired by that lecture
00:21 dunpeal left #git
00:21 Electrometro joined #git
00:22 rkazak joined #git
00:23 nettoweb joined #git
00:27 hahuang61 joined #git
00:27 Rodya_ joined #git
00:27 LeBlaaanc joined #git
00:27 PabloR joined #git
00:28 zmachine joined #git
00:29 sin3t joined #git
00:32 PabloR I use git reset --hard to reset to an earlier version. But when I try to push to my github remote so the remote also match the earlier version it does not allow me. "Updates were rejected because the tip of your current branch is behind its remote counterpart..." How do I reset the github to an older version to match my local repo?
00:33 Shentino joined #git
00:34 starkhalo PabloR: you can --force the push I guess
00:34 bremner PabloR: be aware of the caveats in !rewrite
00:34 gitinfo PabloR: 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
00:36 PabloR It's only a test for myself to see how to interact with github. starkhalo is there anything like git push --force so the github remote would match the local repo then?
00:36 NeXTSUN joined #git
00:36 bremner sure, as documented in man git push
00:36 gitinfo the git-push manpage is available at http://jk.gs/git-push.html
00:37 PabloR ok, I'll play with it. Thanks
00:38 dsdeiz_ joined #git
00:38 Shentino joined #git
00:39 sin3t joined #git
00:40 fuchstronaut joined #git
00:42 star_prone joined #git
00:43 lugzer joined #git
00:44 lalilulelo joined #git
00:44 netj joined #git
00:44 mellernoia joined #git
00:46 lalilulelo joined #git
00:48 romerocesar joined #git
00:49 sin3t joined #git
00:50 dsantiago joined #git
00:50 ResidentBiscuit joined #git
00:51 PabloR starkhalo bremner For what I needed, the --force flag worked great. Thanks
00:52 mrpackethead joined #git
00:58 Shentino joined #git
00:59 wxg joined #git
00:59 sin3t joined #git
01:02 aidalgol joined #git
01:02 johnny56_ joined #git
01:05 Lyqyd joined #git
01:05 rbern joined #git
01:06 vassagus joined #git
01:08 case39 joined #git
01:09 sin3t joined #git
01:13 rivarun joined #git
01:14 case39 joined #git
01:15 AustinMatherne joined #git
01:19 stephanie joined #git
01:20 pwnz0r joined #git
01:21 Electrometro joined #git
01:21 d^sh joined #git
01:24 Electrometro joined #git
01:24 pks joined #git
01:25 wxg joined #git
01:27 hahuang61 joined #git
01:29 Faylite joined #git
01:29 sin3t joined #git
01:30 kanyeezy joined #git
01:30 kanyeezy joined #git
01:35 boombatower joined #git
01:35 spudowiar joined #git
01:36 Manuel15 joined #git
01:36 Manuel15 joined #git
01:36 johnny56 joined #git
01:37 Guest55 joined #git
01:38 lugzer joined #git
01:39 sin3t joined #git
01:39 arescorpio joined #git
01:41 fuchstronaut joined #git
01:46 tgunr joined #git
01:46 rossome joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
01:48 ytl joined #git
01:49 sin3t joined #git
01:50 rkazak joined #git
01:53 Dougie187 joined #git
01:55 liuzhen joined #git
01:56 rossome joined #git
01:59 sin3t joined #git
01:59 rbern joined #git
02:02 romerocesar joined #git
02:03 Rodya_ joined #git
02:04 ack_inc joined #git
02:04 EvilPeng1 joined #git
02:06 stuartrexking joined #git
02:07 vassagus joined #git
02:08 stuartrexking left #git
02:09 sin3t joined #git
02:12 stuartrexking joined #git
02:13 xlegoman joined #git
02:14 SwiftMatt joined #git
02:19 romerocesar joined #git
02:19 sin3t joined #git
02:22 Goplat joined #git
02:24 stuartrexking left #git
02:26 frivol joined #git
02:27 harish joined #git
02:28 johnny56 joined #git
02:28 hahuang61 joined #git
02:28 stuartrexking joined #git
02:28 nettoweb joined #git
02:31 Brain joined #git
02:32 lugzer joined #git
02:37 daynaskully joined #git
02:37 romerocesar joined #git
02:39 Mannn Whenever my team and I have conflicts and we cant automatically sync, we just backup everything and re-clone, but surely theres a better way.
02:39 Mannn What is the usual process to merge changes from one branch to another? Because when you checkout a branch, your file is replaced with that branch's file.
02:40 Mannn Which makes it difficult to compare 2 files at once
02:40 interne7y joined #git
02:41 star_prone joined #git
02:42 fuchstronaut joined #git
02:43 tgunr joined #git
02:44 hexagoxel joined #git
02:44 lagothri1 joined #git
02:44 pwnz0r joined #git
02:45 zivester joined #git
02:45 gravitation joined #git
02:45 ytl_ joined #git
02:46 gravitation I’m learning about git-reset. Here’s the first one I tried:
02:46 gravitation http://codepad.org/yO8K37yZ
02:46 gravitation why did it touch more files than I asked it to?
02:48 daynaskully joined #git
02:49 sin3t joined #git
02:49 sangy joined #git
02:50 Kulrak joined #git
02:50 Kulrak joined #git
02:51 SwiftMatt joined #git
02:51 tinajohnson___ joined #git
02:53 ericsupreme joined #git
02:54 romerocesar joined #git
02:54 stuartrexking joined #git
02:56 Dougie187 left #git
02:56 chachasmooth joined #git
02:59 sin3t joined #git
03:02 daynaskully joined #git
03:02 aavrug joined #git
03:03 hellyeah joined #git
03:03 aavrug joined #git
03:09 sin3t joined #git
03:12 tjone270 joined #git
03:15 Rodya_ joined #git
03:18 fstd joined #git
03:19 sin3t joined #git
03:20 tgunr joined #git
03:21 bjpenn_ joined #git
03:21 Rodya_ joined #git
03:24 alansaul joined #git
03:24 tjone270_ joined #git
03:27 lugzer joined #git
03:28 sin3t joined #git
03:30 hahuang61 joined #git
03:32 durham joined #git
03:32 Limes__ joined #git
03:33 durham joined #git
03:37 howdoi joined #git
03:38 sin3t joined #git
03:39 ShekharReddy joined #git
03:41 red_ joined #git
03:42 fuchstronaut joined #git
03:44 satbyy joined #git
03:48 sin3t joined #git
03:48 ytl joined #git
03:51 [Brain] joined #git
03:58 sin3t joined #git
04:00 thecomedian joined #git
04:04 tlolczyk joined #git
04:05 blackwind_123 joined #git
04:06 starkhalo joined #git
04:08 sin3t joined #git
04:08 mischat joined #git
04:09 TheodoreBe joined #git
04:11 gravitation joined #git
04:11 TheodoreBe joined #git
04:11 Urbany joined #git
04:14 dreiss joined #git
04:14 dhollinger joined #git
04:15 Eugene gravitation - that isn't saying that reset changed them; that says that those are "unstaged changes" now. See `git status`
04:15 yitz joined #git
04:16 yitz Heya. I've got a repo that has a commit done in a feature branch then merged into the master. On master, the log shows commits: old, change, merge. I'm trying to programatically get the change commit. HEAD shows the merge and HEAD^ shows the old...
04:16 yitz ... Am I missing something that should give me the change?
04:18 sin3t joined #git
04:19 Rodya_ joined #git
04:20 yitz I guess I can look at the parents of the merge and get the newer one
04:21 interne7y joined #git
04:22 lugzer joined #git
04:24 gfixler joined #git
04:28 sin3t joined #git
04:29 jstimm joined #git
04:30 Cabanossi joined #git
04:31 hahuang61 joined #git
04:31 tlolczyk I've got a problem with a git repo in a samba share. The problem is this: I have read write access to the sahre. I create a directory and subdirectory in the share. I have read/write access to those too. I have to specify a 0777 mask to make those writable because the share is mounted as root.root . The problem is a git init in that subdir fails because of Permission denied for ref/head. Is there a standard way to fix this?
04:31 johnny56_ joined #git
04:36 cd-rum joined #git
04:41 dennispaulsen joined #git
04:41 romerocesar joined #git
04:42 zivester joined #git
04:42 phanimahesh joined #git
04:43 fuchstronaut joined #git
04:43 jstimm joined #git
04:47 gravitation Eugene: Ohh, I see. That makes a lot more sense. The wording in the message from git is a bit ambiguous there. It read it as “Hi, I’m git. After I did the reset these these changes are now unstaged”
04:48 sin3t joined #git
04:50 nilg joined #git
04:51 Raed|Mobile joined #git
04:57 subhojit777 joined #git
04:58 sin3t joined #git
05:02 Raging_Hog joined #git
05:03 martinium joined #git
05:06 thiago joined #git
05:07 ShekharReddy joined #git
05:07 Kaisyu joined #git
05:07 watabou joined #git
05:08 sin3t joined #git
05:12 timmu joined #git
05:16 Doginal joined #git
05:18 sin3t joined #git
05:20 martinium joined #git
05:22 bjpenn joined #git
05:25 jaafar joined #git
05:26 barq joined #git
05:28 sin3t joined #git
05:29 jceb joined #git
05:32 hahuang61 joined #git
05:32 dsdeiz_ left #git
05:32 nbdy joined #git
05:32 dsdeiz joined #git
05:35 Electrometro joined #git
05:37 zeroed joined #git
05:38 sin3t joined #git
05:41 ljc joined #git
05:44 fuchstronaut joined #git
05:45 nydel07 joined #git
05:49 Manuel15 joined #git
05:49 Manuel15 joined #git
05:54 jesk joined #git
05:58 sin3t joined #git
05:58 eivarv joined #git
05:59 zeemz joined #git
06:00 polyzen joined #git
06:00 Rodya_ joined #git
06:01 alansaul joined #git
06:01 rscata joined #git
06:02 wxg joined #git
06:04 satya4ever joined #git
06:05 Macaveli joined #git
06:06 PCatinean joined #git
06:06 shinnya joined #git
06:11 phanimahesh joined #git
06:11 csd_ joined #git
06:18 sin3t joined #git
06:18 seishun joined #git
06:19 Rodya_ joined #git
06:20 roelmonnens joined #git
06:20 Repox joined #git
06:21 StarWarsFan left #git
06:25 rubyonrailed joined #git
06:27 Oog joined #git
06:27 Seveas tlolczyk: don't use samba to share repos, just push and pull.
06:27 LeMike joined #git
06:28 sin3t joined #git
06:28 freimatz joined #git
06:31 Softeisbieger joined #git
06:32 Repox joined #git
06:32 hahuang61 joined #git
06:32 bocaneri joined #git
06:34 tlolczyk What is a good way to print branch history on the commandline?
06:35 jaequery joined #git
06:35 eivarv joined #git
06:36 romerocesar joined #git
06:36 ki0 joined #git
06:36 kadoban tlolczyk: !lol
06:36 gitinfo tlolczyk: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
06:36 midgetspy left #git
06:38 sin3t joined #git
06:38 ack_inc joined #git
06:41 Sceorem joined #git
06:44 tinajohnson___ joined #git
06:45 fuchstronaut joined #git
06:48 star_pro_ joined #git
06:48 sin3t joined #git
06:50 garethdaine joined #git
06:51 Repox joined #git
06:51 star_prone joined #git
06:52 submitnine joined #git
06:57 eivarv joined #git
06:58 mariuscc joined #git
07:00 zmachine joined #git
07:00 Anderson69s_Pi joined #git
07:01 dreiss joined #git
07:01 netj joined #git
07:03 zarubin joined #git
07:04 jguillen joined #git
07:07 Raed|Laptop joined #git
07:07 sin3t joined #git
07:08 Darcidride joined #git
07:10 lordjancso joined #git
07:10 ytl joined #git
07:11 TomyWork joined #git
07:13 gravitation joined #git
07:16 linuxmint joined #git
07:17 ahmedelgabri joined #git
07:17 star_prone joined #git
07:17 sin3t joined #git
07:18 DevAntoine joined #git
07:19 inflames joined #git
07:20 rivarun joined #git
07:21 tesuji joined #git
07:23 zacts joined #git
07:24 ki0 joined #git
07:24 jkt joined #git
07:24 ki0 joined #git
07:24 zacts joined #git
07:26 Balliad joined #git
07:27 sin3t joined #git
07:28 rivarun joined #git
07:32 ronskisika joined #git
07:32 mithenks joined #git
07:33 hahuang61 joined #git
07:37 sin3t joined #git
07:38 cqi joined #git
07:39 LiohAu joined #git
07:45 fuchstronaut joined #git
07:47 sin3t joined #git
07:47 star_prone joined #git
07:51 djb-irc joined #git
07:52 ack_inc joined #git
07:54 Raging_Hog joined #git
07:55 encod3 joined #git
07:55 nuc joined #git
07:56 xaa joined #git
07:56 indistylo joined #git
07:57 sin3t joined #git
07:57 adante joined #git
07:58 blockzombie joined #git
08:00 bongjovi joined #git
08:01 sulky joined #git
08:02 jleclanche joined #git
08:02 souther joined #git
08:02 elijah joined #git
08:03 t0by joined #git
08:04 fuchstronaut joined #git
08:04 fuchstronaut joined #git
08:04 chid joined #git
08:05 ki0 joined #git
08:06 ELLIOTTCABLE joined #git
08:07 p4trix joined #git
08:08 mibr0 joined #git
08:09 marcogmonteiro joined #git
08:10 ljc joined #git
08:12 LeMike joined #git
08:13 tomog999_ joined #git
08:14 fuchstronaut joined #git
08:14 harish_ joined #git
08:15 eivarv joined #git
08:16 chll_ joined #git
08:21 nilg joined #git
08:21 lugzer joined #git
08:22 despoil joined #git
08:29 jsears_ joined #git
08:29 SoRoot joined #git
08:31 delboy1978uk joined #git
08:31 iota_pi joined #git
08:32 UncleCJ joined #git
08:32 delboy1978uk Hi guys, I'm busy hacking around the corporate proxy, as i cant even ping from the command line. I now have a SOCKS5 proxy using putty connecting to my linux dev server, which can access everything. So my browsers and IRC are now unblocked. However I cant git clone, connection refused from CLI (Cygwin). Is there a git config for proxy settings?
08:34 hahuang61 joined #git
08:34 osse delboy1978uk: core.gitProxy
08:35 heftig delboy1978uk: https://wiki.archlinux.org/index.php/VPN_over_SSH
08:35 delboy1978uk thanks guys!
08:35 heftig ssh has some options to actually create a vpn connection instead of a socks proxy
08:35 * delboy1978uk clicks
08:43 tgunr joined #git
08:45 nikitasius joined #git
08:45 beyertech joined #git
08:55 Anticom joined #git
08:56 mohabaks joined #git
08:58 cyan__ joined #git
09:00 abyx joined #git
09:00 abhinav joined #git
09:00 abhinav hi
09:01 abhinav i have done lots of changet to current file. for the time being i only want to commit few specific changes only. i want to commit remaining changes to another future commit later on. how do i do that?
09:02 spb git add --patch filename
09:02 spb or git add -i if you prefer more menu-y options
09:03 abhinav ok.
09:03 heftig there's also git commit -p if you want to ignore the index, too
09:06 abhinav i was using -p. but i thougth if i said it to not include other remaining changes now, it will ignore it forever. i want to add those changes in future commit. only not for this commit.
09:06 abhinav will -p do that? heftig
09:08 romerocesar joined #git
09:09 Rish joined #git
09:11 heftig no, any hunks you reject during a add -p or commit -p will be left as they are and not marked "ignored" or something
09:12 abhinav ok.
09:13 govg joined #git
09:14 eivarv_ joined #git
09:14 alansaul joined #git
09:17 mgsjon joined #git
09:20 delboy1978uk osse heftig: thanks a lot guys, i am happily git cloning away now :-D
09:23 Rish joined #git
09:25 mikecmpbll joined #git
09:26 HanClinto joined #git
09:26 Darcidride joined #git
09:27 sin3t joined #git
09:32 leeN joined #git
09:33 delboy1978uk left #git
09:35 hahuang61 joined #git
09:39 cyan__ joined #git
09:39 SoRoot joined #git
09:39 stuartrexking joined #git
09:41 star_pro_ joined #git
09:42 kedare joined #git
09:43 sullyj3 joined #git
09:43 sullyj3 How do I undo an rm in a git repo? Not `git rm`, just the normal delete command.
09:48 fuchstronaut joined #git
09:48 noteness joined #git
09:49 satifant joined #git
09:51 sulky_ joined #git
09:52 kadoban sullyj3: 'git checkout -- the_file' will bring the version from the index into the working directory.
09:56 Guest29537 joined #git
09:58 Impaloo joined #git
09:58 sullyj3 But doesn't the index in a sense contain the *absence* of the file?
09:58 satya4ever joined #git
09:58 Anticom Hi all. Is it possible to kind of "take out" a "delete file x" from a commit back in my history? (FYI yes it is pushed already to a remote and i know about the risks of rewriting history that has been pushed to remotes already. Thing is i'm developing in a seperate branch nobody uses yet or even has a working copy of it)
09:59 Anticom I would have just reset my head to an earlier state and force pushed from there but my problem is, that i've deleted some files in the first commit that branches into my branch
10:00 kadoban sullyj3: Only if you staged that removal, which it doesn't sound like you did.
10:00 Anticom And now i realized that i shouldn't have deleted that file
10:03 sullyj3 Oh shit, sorry, I forgot to mention I did a `git add .` before I realised. Will the command you mentioned work if I `git reset [FILE]` first?
10:04 Manuel15 joined #git
10:04 Manuel15 joined #git
10:04 rahtgaz joined #git
10:06 zonedigital joined #git
10:07 ShapeShifter499 joined #git
10:08 ericsupreme joined #git
10:11 csd_ joined #git
10:14 Anticom i tried `git reset <sha-before-commit-file-was-deleted> path/to/file` and i get "Unstaged changes after reset: \\ D path/to/file". However if i do ls the file is not in my working copy. What am i missing?
10:14 jceb joined #git
10:18 noteness joined #git
10:18 ki0_ joined #git
10:19 ki0_ joined #git
10:21 UncleCJ joined #git
10:23 sulky_ joined #git
10:24 UncleCJ joined #git
10:27 sin3t joined #git
10:29 ilmari Anticom: git checkout -- path/to/file
10:29 ahmedelgabri joined #git
10:30 Anticom ilmari: But that doesn't remove it from the commit does it?
10:30 Anticom I don't just want to re-add the file to avoid any trouble when merging the branch
10:30 fuchstronaut joined #git
10:30 fuchstronaut joined #git
10:31 ldlework joined #git
10:31 ldlework in git, if I want to make an integration branch with the commits of branch A played ontop of the commits in branch B how do I do that?
10:32 dsdeiz joined #git
10:32 grawity `git rebase`
10:32 ilmari ldlework: git checkout A; git checkout -b integration; git rebase B
10:33 ilmari Anticom: if you want to !rewrite history, don't use reset
10:33 gitinfo Anticom: 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
10:33 ldlework ilmari: so if I want B ontop I just reverse it?
10:33 Guest29537 joined #git
10:33 ilmari ldlework: yes
10:33 fuchstronaut Im in the middle of rebasing a branch and I have conflicts to solve. Can I simply switch to another branch to fix something (not related) and come back to rebasing later?
10:34 ldlework ilmari: thanks
10:34 Anticom ilmari: i know about the downsides of force pushing. However i still haven't figured out how to take out a certain file of a commit in the past
10:34 Anticom i basically want to undo the rm
10:35 hahuang61 joined #git
10:36 musl joined #git
10:37 ki0 joined #git
10:37 jost joined #git
10:38 zifnab joined #git
10:38 abhinav left #git
10:39 lordjancso joined #git
10:39 ilmari Anticom: git rebase --interactive, mark the commit as 'e'dit, then 'git reset HEAD^ path/to/file; git checkout path/to/file; git commit --amend; git rebase --continue'
10:40 ilmari git rebase --interactive <commit before the delete>
10:40 Anticom ilmari: Okay i'll give that a try
10:42 eivarv_ joined #git
10:43 zifnab joined #git
10:43 seishun joined #git
10:46 choki joined #git
10:54 liuzhen joined #git
10:55 a3Dman joined #git
11:05 mohabaks joined #git
11:08 inflames joined #git
11:09 Finnoloid joined #git
11:09 satya4ever joined #git
11:10 roelmonnens joined #git
11:10 flaguy48 joined #git
11:12 codeman joined #git
11:13 nettoweb joined #git
11:18 ojdo joined #git
11:22 nikitasius joined #git
11:22 docnvk joined #git
11:28 rivarun joined #git
11:28 nitin joined #git
11:30 ahmedelgabri joined #git
11:32 Brain joined #git
11:32 rorro joined #git
11:36 hahuang61 joined #git
11:38 rivarun joined #git
11:39 gravitation joined #git
11:39 HappyLoa- joined #git
11:41 sdothum joined #git
11:44 stamina joined #git
11:47 ahmedelgabri joined #git
11:48 ki0 joined #git
11:49 ki0 joined #git
11:49 fuchstronaut joined #git
11:52 nilg joined #git
11:54 HappyLoa- joined #git
11:55 slayerjain joined #git
11:55 MrMojito joined #git
11:56 johnmilton joined #git
11:56 kablaaam joined #git
11:56 kablaaam Is a pull request a feature of github or git?
11:57 kadoban Both, kinda
11:57 notebox joined #git
11:57 kablaaam there’s a different right?
11:57 fmcgeough joined #git
11:57 kablaaam difference*
11:57 grawity in Git, a "pull request" is anything that asks someone to pull branch X from your repo Y
11:57 grawity e.g. by email
11:58 grawity in Github, there's a fancy web UI around it (with comments and such)
11:58 kadoban github's is a web UI thing, git's is a fairly loose protocol, yeah based on whatever. There's 'git request-pull', but it just sends an email.
11:58 kablaaam so the only difference for pull requests on git/github is the UI? But it’s still the same concept, no?
11:58 Sceorem joined #git
11:59 kadoban Yeah
12:00 fahadash joined #git
12:01 kablaaam thank you :)
12:02 eivarv_ joined #git
12:03 WayToDoor joined #git
12:05 qpdb joined #git
12:05 ksolv joined #git
12:06 synthroid joined #git
12:07 i7c Difference is that you need your own place to host a git repo so it can be accessed by the receiver of the pull request.
12:07 rikardwi joined #git
12:07 i7c If that’s not given, sending patches might be more appropriate.
12:07 arnas joined #git
12:07 arnas hello
12:07 i7c Ohai
12:08 arnas I'm trying to do git pull but there are merge conflicts. Is there a way to ignore the files that are making these conflicts and not to merge them?
12:08 mischat joined #git
12:09 grawity what do you want it to do with them instead? there's -X ours / -X theirs to automatically choose one version or the other
12:09 i7c Which state should they end up in?
12:09 grawity but it has to choose *something*
12:09 i7c ^
12:10 grawity (there's no option to make it keep both, though it would be useful...)
12:10 arnas Well, I added some code to a few files and now when I do git pull it says that there are conflicts with the files I changed. I want my changed files to stay as they are right now
12:10 i7c That would effectively overwrite the changes that were made upstream.
12:10 grawity sounds like -X ours, but either way that's something to be careful about
12:10 synthroi_ joined #git
12:11 grawity if the commits you're trying to pull actually changed those files, then at least review those changes
12:11 i7c grawity, -X ours only applies to conflicts or to all merges?
12:12 i7c I.e. all files that are modified in both branches will be exactly like they are in my branch?
12:12 PCatinean joined #git
12:13 BlackMaria_netsp joined #git
12:13 grawity i7c: -X only applies to conflicts
12:13 arnas so git pull -X or what?
12:13 grawity i7c: assuming the default 'recursive' merge strategy
12:13 Maple__ joined #git
12:13 i7c Okay, that way it’s useful.
12:13 grawity i7c: don't confuse it with -s ours, which doesn't merge anything at all, and keeps *everything* from your side
12:13 grawity i7c: (which is also useful, but in special cases)
12:13 i7c ah
12:14 i7c yeah makes sense
12:14 arnas grawity, so -s would be what I want, no?
12:14 grawity no
12:14 arnas oh, right, it won't merge other files
12:14 grawity I mean, you want to pull in all changes *except* for this one file, yes?
12:15 arnas 3 files, actually
12:15 arnas but yes
12:15 grawity that's "-X ours" then
12:15 arnas grawity, so git pull -X ours?
12:17 eivarv_ joined #git
12:18 csd_ joined #git
12:18 star_pro_ joined #git
12:18 PCatinean joined #git
12:19 Ranhir joined #git
12:22 rwb joined #git
12:23 cqi joined #git
12:23 wantutri joined #git
12:24 sigma__ joined #git
12:25 sigma__ If I need to apply a small change to a commit that is not my most recent commit, I typically make the change and then immediately rebase, squashing the new commit after the one I want to change from my history. Is there a quicker way to do this?
12:26 danslo joined #git
12:27 daniel_rose joined #git
12:27 moritz sigma__: you can do a fixup instead of a squash. Then you don't have to edit the commit message
12:28 sigma__ git commit --fixup=[commit_hash]
12:28 sigma__ Like that?
12:29 moritz sigma__: yes, and then an interactive rebase with --autosquash
12:30 perlpilot joined #git
12:30 sigma__ I see. So that's the same thing with a little less work.
12:30 sigma__ It still makes a new commit and requires a rebase with (essentially) a squash.
12:30 grawity there aren't many other history-rewriting tools other than a rebase, really
12:31 grawity and editing a past commit *requires* a history rewrite
12:31 bjpenn joined #git
12:31 sigma__ grawity: Sure. I was just looking for a shortcut for this common problem of mine.
12:31 grawity you could of course go the other way around – use 'edit' via rebase, then make the change
12:31 sigma__ Fixup is probably the right tool, with the subsequent rebase.
12:31 grawity or you could batch those --fixup commits, and do a rebase once later
12:31 sigma__ grawity: That's the plan. Thanks!
12:32 sigma__ Thanks moritz
12:32 rkazak joined #git
12:32 bongjovi joined #git
12:32 EisNerd joined #git
12:32 gravitation joined #git
12:33 sigma__ left #git
12:33 EisNerd hi, could someone tell me if it is possible to force all text-files to have lf line endings even on windows by something that could be added to the repo?
12:33 grawity I'm sure there's a gitattribute for that
12:34 harish_ joined #git
12:34 EisNerd so far I failed to find it
12:34 grawity or was it a gitconfig setting? might actually be either
12:34 EisNerd but git config wouldn't affect arbitrary fresh working copies
12:36 LBV_User joined #git
12:37 perlpilot EisNerd: https://help.github.com/articles/dealing-with-line-endings/
12:37 hahuang61 joined #git
12:39 EisNerd perlpilot: yes but I would prefer to enumerate every file extension
12:39 EisNerd to not
12:39 grawity you don't have to, do you?
12:39 grawity anything that accepts a "*.c" also accepts a "*"
12:40 grawity though, you *should* be careful about not applying CRLF conversion on actually binary files >_>
12:41 settermjd joined #git
12:41 eivarv_ joined #git
12:42 nuc joined #git
12:43 sbeller_ joined #git
12:43 Anticom Hey ilmari that rebasing thing worked great for restoring files
12:43 UncleCJ joined #git
12:44 Anticom However i'm having one problem with one last repository where i'm trying to do the same thing but when i run `git rebase --continue` git is complaining with "Could not apply 8ebd3769cc65184df77ed1e23bb86306a26510c0... Squashed 'cmake/' content from commit 1bcc0d6"
12:44 ilmari Anticom: interactive rebase is awesome for cleaning up history
12:44 Anticom It is. I just have to get used to it :)
12:45 ilmari resolve the conflicts and stage the result, then rebase --continue again
12:46 Anticom Well the conflict comes from my README.md which i edited in that commit aswell. But i did not change it during my edit hence i'm kind of puzzled why there is a merge conflict
12:48 rorro joined #git
12:49 zivester joined #git
12:49 veilig2000 joined #git
12:51 piattino joined #git
12:52 M-shine joined #git
12:53 dsdeiz joined #git
12:53 dsdeiz joined #git
12:54 fuchstronaut joined #git
12:54 sanketdg joined #git
12:56 chimay joined #git
12:56 shaggycat joined #git
12:57 Cata|Work joined #git
12:57 SwiftMatt joined #git
12:58 TooLmaN joined #git
12:58 alansaul joined #git
12:58 tvw joined #git
12:59 stasmakarov joined #git
13:01 jimi_ joined #git
13:02 str joined #git
13:04 p4trick joined #git
13:06 NeXTSUN joined #git
13:07 lss8 joined #git
13:09 inflames joined #git
13:11 dreamyspell_ joined #git
13:12 fuchstronaut Im in the middle of rebasing a branch and I have conflicts to solve. Can I simply switch to another branch to fix something (not related) and come back to rebasing later?
13:13 venmx joined #git
13:13 kyan joined #git
13:19 kedare joined #git
13:19 satifant joined #git
13:19 ExoUNX joined #git
13:21 cjohnson left #git
13:21 cdg joined #git
13:22 cdg joined #git
13:29 uri_ joined #git
13:30 ajf- joined #git
13:30 Guest29474 joined #git
13:30 romerocesar joined #git
13:31 cbreak no
13:31 fuchstronaut joined #git
13:31 csd_ joined #git
13:33 TomyWork is it possible to specify a default regex for --color-words in a config somewhere?
13:34 TomyWork fuchstronaut you could create an alternate worktree
13:34 TomyWork git worktree --help
13:34 fuchstronaut is there an easy waay
13:34 TomyWork that is an easy way
13:35 osse TomyWork: git config diff.wordRegex
13:35 TomyWork fuchstronaut https://git-scm.com/docs/git-worktree see "examples"
13:36 TomyWork it happens to be almost exactly your use case :)
13:36 TomyWork osse ah, thanks :)
13:36 byteflame joined #git
13:36 TomyWork i found '[[:alnum:]]+|.' to be the best regex for that, so far
13:36 troulouliou_div2 joined #git
13:37 rahtgaz joined #git
13:37 alansaul Hey guys, I have clones of multiple forks on my computer, I wrote some code a while ago but can't remember which fork I wrote it in, or which branch it is in
13:37 airdisa joined #git
13:37 alansaul Is there anyway to grep everything, inculding all .git folders in subfolders?
13:38 hahuang61 joined #git
13:38 alansaul Maybe I should ask ##unix?
13:38 osse alansaul: git log -Ssomething --all is probably your best best
13:38 osse best bet
13:38 osse do that in each repo
13:38 alansaul thanks I'll give that a shot
13:39 fuchstronaut but as I am rebasing onto master and have merge conflicts, wouldn't a worktree based on master have the same conflicts?
13:39 TomyWork alansaul you know that you can just add the other forks as extra remotes to your original clone, right?
13:39 phanimahesh joined #git
13:39 alansaul Think i've found the hash :)
13:39 TomyWork fuchstronaut branches dont have conflicts
13:39 b1tchcakes joined #git
13:39 TomyWork your worktree/index has the conflict
13:39 alansaul TomyWork: ummm hadnt thought about that
13:40 alansaul TomyWork: and then have one branch per fork?
13:40 TomyWork alansaul well, not really... you have your remote tracking branches and if you need to push a local branch somewhere, you just do it
13:41 notebox joined #git
13:41 TomyWork fuchstronaut that said, you cannot have two worktrees with the same branch checked out
13:41 fuchstronaut I am on branch A and I am rebasing it onto master
13:41 TomyWork so you'd have to create a temporary branch first
13:41 fuchstronaut So it should be possible to create a new worktree and checkout master?
13:41 alansaul TomyWork: So do you mean I would treat my own clone as a "merged" version of all the forks?
13:41 TomyWork yes
13:41 TomyWork fuchstronaut  yes
13:41 TomyWork alansaul hold on
13:42 alansaul And proceed to merge everything anything gets committed to any fork?
13:42 fuchstronaut next step would be to create a branch "hotfix" on my new worktree, do some changes, commit and push and than leave that worktree and I am back to where  I was?
13:42 TomyWork alansaul git is distributed. there is no difference between any of those github forks and your local repository
13:42 lorz joined #git
13:43 TomyWork fuchstronaut you could do that, yes
13:43 fuchstronaut would it be an option to just stash away the merging process?
13:43 TomyWork alansaul apart from the fact that those github forks are bare and your local repo is not
13:44 TomyWork fuchstronaut i dont think that's possible
13:44 TomyWork but worktrees are easy
13:44 TomyWork (if your git supports it)
13:44 alansaul TomyWork: I'm not sure I'm following, if there are two forks of projectA, Bfork, Cfork, and people are pushing things to Bfork, Cfork and projectA, how are you suggesting I treat my personalFork?
13:44 ionelmc joined #git
13:44 Dougie187 joined #git
13:45 alansaul If I don't have a branch for each of Bfork, Cfork and projectA, I need to do the fetching and merging into my own thing right?
13:45 alansaul (I'm probably being stupid :)
13:46 fuchstronaut TomyWork: thank you, I will try it with worktrees (though I am scared to do so)=
13:46 lorz I have an issue with git svn. I try to convert a remote svn repo to git. I access it over ssh+svn and it fails during "git svn fetch". The exit status of git svn fetch is 1. Does any of you know what the 1 means in this case?
13:46 TomyWork fuchstronaut no need to be scared, unless you're on cygwin or something :D
13:47 TomyWork and even then, the only problem i know of is with git-lfs and worktrees on cygwin
13:47 choki joined #git
13:47 cYmen is there a simple way to instead of adding a merge commit rebase my local changes on the last repo version when I'm pulling and there are no conflicts?
13:47 Guest29474 left #git
13:48 cYmen I am creating a lot of merge commits although me and my colleague are working on completely different files
13:48 cYmen (docs and code not even remotely related)
13:48 fuchstronaut No, I am on git 2.4.5 (OSX) - it is just that I am not firm with command line git, because I used to work with SourceTree and others took care of complicated stuff
13:48 intellix joined #git
13:49 phaleth joined #git
13:50 AaronMT joined #git
13:53 fuchstronaut TomyWork:
13:53 fuchstronaut 'git worktree' is not a valid comand
13:53 TomyWork fuchstronaut your git is too old then :/
13:53 fuchstronaut oh
13:53 fuchstronaut can I break something dating it up?
13:53 TomyWork just make a 2nd clone then
14:00 magicTurtle joined #git
14:01 f0rblaze joined #git
14:02 madewokherd joined #git
14:02 alansaul joined #git
14:04 phanimahesh joined #git
14:06 al-damiri joined #git
14:07 star_prone joined #git
14:11 gargola joined #git
14:11 GodGinrai joined #git
14:15 eivarv_ joined #git
14:16 kablaaam left #git
14:17 axl_ joined #git
14:17 Manuel15 joined #git
14:17 Manuel15 joined #git
14:18 kaldoran joined #git
14:18 kyan joined #git
14:18 ResidentBiscuit joined #git
14:20 lorz I have an issue with git svn. I try to convert a remote svn repo to git. I access it over ssh+svn and it fails during "git svn fetch". The exit status of git svn fetch is 1. The fetch is triggered by svn2git.
14:20 harish_ joined #git
14:20 selckin and error message?
14:21 selckin you can just try to resume with git svn fetch --all
14:21 lorz it fails immediatly
14:21 lorz there is no further error message
14:21 lorz is there an exitcode table?
14:21 selckin you can svn checkout the url?
14:21 lorz yes
14:22 jceb joined #git
14:23 troulouliou_div2 joined #git
14:23 crose joined #git
14:26 zmachine joined #git
14:26 LionsMane joined #git
14:27 SergioArmal joined #git
14:27 rubyonrailed joined #git
14:28 SergioArmal hola
14:29 jaafar joined #git
14:31 bjpenn joined #git
14:32 spudowiar joined #git
14:32 le_melomane joined #git
14:33 Remram[m] joined #git
14:33 Ineentho[m] joined #git
14:33 M-mistake joined #git
14:33 M-meznak joined #git
14:33 uri joined #git
14:34 l4v2 joined #git
14:34 phanimahesh joined #git
14:35 lorz it was an authentications problem... Have a great day everybody :D
14:36 sangy joined #git
14:37 Jupelius joined #git
14:38 hahuang61 joined #git
14:39 UrsoBranco joined #git
14:41 csd_ joined #git
14:41 dreiss joined #git
14:42 qasaur joined #git
14:42 mohabaks joined #git
14:43 jeffreylevesque joined #git
14:45 thiago_ joined #git
14:45 kyan joined #git
14:47 gabc joined #git
14:48 mischat joined #git
14:49 clemf joined #git
14:49 Darcidride joined #git
14:50 roelmonnens joined #git
14:50 dmto joined #git
14:52 ice9 joined #git
14:52 jknetl joined #git
14:53 CheckDavid joined #git
14:53 zivester joined #git
14:53 ice9 for some reason i lost the git repo info, is it possible to re-define the repo again using the existing files?
14:53 moritz ice9: you can create a new git repo, add all the files and commit
14:53 moritz ice9: but of course then you won't have any history
14:54 ice9 moritz, i don't wanna to commit i just want to pull, the repo size is about 8 GB and i don't wanna checkout all that again
14:55 docmur joined #git
14:55 Darren_ joined #git
14:55 ferr joined #git
14:55 moritz ice9: clone with --depth=1?
14:56 ice9 moritz, maybe, ok
14:56 docmur How do I see what the changes are between my local files in and the remote branch?  My branch is called working-c and I tried git diff working-c origin/working-c and it showed nothing.  If I try to change branches, I get a message about a file being different from the branch and it wanting me to stash it
14:56 fahadash joined #git
14:57 chid joined #git
14:57 chid_ joined #git
14:57 cdg_ joined #git
14:58 N3ss__ joined #git
14:59 eivarv joined #git
15:00 moritz docmur: git diff origin/working-c
15:00 thebloggu joined #git
15:01 N3ss__ joined #git
15:02 le_melomane joined #git
15:02 N3ss__ Hello, i tried to add a git hook put it can't be add. Can someone tell me how to do ?
15:02 starkhalo joined #git
15:02 crayon joined #git
15:03 osse N3ss__: you cannot
15:04 osse N3ss__: you can add a file the regular way, and make the hook a symlink to it
15:04 gabc left #git
15:04 N3ss__ So other contributors have to do the same symlink ?
15:04 osse yes
15:05 N3ss__ ok, thank's
15:06 N3ss__ Btw, why can't I ? It's cause it's in the .git repository ?
15:06 rubyonrailed joined #git
15:08 osse yes
15:08 kaladin joined #git
15:08 osse technically that's the reason
15:08 osse But also, it's not possible because that would make you able to run code on someone else's computer
15:08 osse like if you made a hook that deleted your $HOME
15:09 rubyonra_ joined #git
15:11 N3ss__ Thanks
15:12 ash_workz joined #git
15:13 dreamyspell joined #git
15:14 ELFrederich joined #git
15:14 eight58 joined #git
15:14 ELFrederich I'm attempting to write my own LFS backend server.  If I create a dummy repo, how can I point LFS at this server I'm running?
15:15 harleyyyyymayes joined #git
15:15 netcarver joined #git
15:16 finnnnnnnnnnn joined #git
15:17 finnnnnnnnnnn I’ve just updated to git 2.9.2 and interactive rebasing is not squasing correcly. Has anything changed that I may be unaware of?
15:18 abyx joined #git
15:22 jceb joined #git
15:24 danslo joined #git
15:25 InfoTest joined #git
15:25 lolmac joined #git
15:26 zacts joined #git
15:27 tyreld joined #git
15:27 vassagus joined #git
15:29 gravitation joined #git
15:31 yitz joined #git
15:31 madewokherd joined #git
15:31 _ikke_ finnnnnnnnnnn: Not aware of any changes, can you explain what's going on?
15:32 finnnnnnnnnnn _ikke_: I’ve just figured it out, when I’m presented with the interactive rebase options in my editor, I have to use the full word ‘squash’, rather than the abbreviation ’s’.
15:33 finnnnnnnnnnn perhaps a bug with my setup, v odd
15:33 axisys I think I asked this question in the past, so sorry about the repeat... should I use git or svn to modify TACACS+ config files.. we cannot have two user modifyin the config file same time. otherwise deleting an account from config might reappear
15:33 axisys s/two user/two users/
15:33 daxroc joined #git
15:34 mohabaks joined #git
15:35 _ikke_ finnnnnnnnnnn: s should work
15:35 _ikke_ If it does not work, it's a bug
15:36 gravitation joined #git
15:37 psprint_ joined #git
15:37 lugzer joined #git
15:37 finnnnnnnnnnn _ikke_: thanks ’s’ is still not working. I’v eno idea why, I can use squach for now. I’ll try nuking all my git settings and reinstalling if it bugs me
15:38 TomyLobo joined #git
15:38 jagob joined #git
15:38 psprint_ Hello. In libgit2 there is merge_analysis() function that takes multiple to-merge sha tips. How can one merge with multiple tips?
15:38 romerocesar joined #git
15:39 hahuang61 joined #git
15:40 canton7 psprint_, I don't know about libgit2 specifically, but merge can take multiple tips - google "octopus merge"
15:40 synthroid joined #git
15:40 osse finnnnnnnnnnn: works fine here. are you sure you put the s as the first char?
15:41 osse finnnnnnnnnnn: and it's not enough to change just the p so it says sick
15:41 gravitation joined #git
15:42 psprint_ canton7: thanks
15:42 osse finnnnnnnnnnn: and what's the precise error?
15:45 finnnnnnnnnnn osse: let me just try again, one mo
15:46 eight58 joined #git
15:48 govg joined #git
15:50 Electrometro joined #git
15:50 rorro joined #git
15:51 notebox joined #git
15:52 daynaskully joined #git
15:54 finnnnnnnnnnn osse: looks like it’s a problem with my editor, Atom, it’s not autosaving on loss of focus. I wasn’t hitting save before closing.
15:54 finnnnnnnnnnn Atom can be very buggy
15:54 _ikke_ aha
15:54 kpease joined #git
15:58 The_Phoenix joined #git
16:00 BlackMaria joined #git
16:00 The_Phoenix joined #git
16:02 The_Phoenix joined #git
16:02 clemf joined #git
16:03 eivarv joined #git
16:03 sangy joined #git
16:03 danimal2 joined #git
16:03 The_Phoenix joined #git
16:03 foist joined #git
16:07 livingstn joined #git
16:07 clemf joined #git
16:08 fuchstronaut joined #git
16:08 thiago joined #git
16:08 seishun joined #git
16:09 vassagus joined #git
16:11 subhojit777 joined #git
16:13 fuchstronaut joined #git
16:14 EvilPeng1 joined #git
16:15 cyphase joined #git
16:15 sagerdearia joined #git
16:15 SteffanW joined #git
16:17 lugzer joined #git
16:20 DTekk joined #git
16:20 govg joined #git
16:21 robotroll joined #git
16:25 danslo joined #git
16:28 fuchstronaut joined #git
16:29 jaequery joined #git
16:30 shaggycat joined #git
16:31 PCatinean joined #git
16:31 nitin joined #git
16:31 bjpenn joined #git
16:33 tgunr joined #git
16:34 ResidentBiscuit I feel like VS Code very quickly overtook atom
16:38 durham joined #git
16:38 cyphase joined #git
16:39 govg joined #git
16:41 fuchstronaut joined #git
16:43 HappyLoa- joined #git
16:43 lss8 joined #git
16:47 choki joined #git
16:50 MattMaker joined #git
16:52 cyan__ joined #git
16:52 Darren_ joined #git
16:52 cdg joined #git
16:53 theresajayne joined #git
16:54 epic joined #git
16:54 InfoTest joined #git
16:54 teadrop_ joined #git
16:54 ChristopheT joined #git
16:55 Fr0Master joined #git
16:55 ChristopheT left #git
16:55 GavinMagnus joined #git
16:55 mikecmpbll joined #git
16:55 durham joined #git
16:55 wallydrag joined #git
16:56 trig-ger joined #git
16:57 govg joined #git
16:57 molgrum joined #git
16:58 roelmonnens joined #git
16:59 Doginal joined #git
17:00 paws_ joined #git
17:00 l4v2 I just lost all of yesterdays work unless someone can help me out here. I ran the command ‘git reset —hard HEAD’ how do I get back to where I was
17:04 eight58 joined #git
17:05 molgrum left #git
17:08 splud joined #git
17:08 nitric joined #git
17:09 BSaboia joined #git
17:10 l4v2 Anyone know how to revert back to where I was before a —hard HEAD reset?
17:10 GodGinrai l4v2: track down the old commit and reset to it
17:11 l4v2 I went too long without commiting
17:11 osse l4v2: did you ever git-add the stuff?
17:11 gravitation joined #git
17:11 l4v2 no, I was just about to add all of my work
17:11 i7c You’re doomed.
17:11 l4v2 yup
17:11 osse then you're fucked
17:12 osse l4v2: maybe your editor/IDE has the files still open
17:12 i7c No git add -> git never even saw your changes, git don’t give a damn.
17:12 l4v2 the one day I didn’t add my stuff every 8 minutes
17:12 lugzer joined #git
17:14 i7c Well if it is the only good thing you can get from this: make it your habit to integrate git directly in your workflow.
17:15 govg joined #git
17:15 LionsMane1 joined #git
17:15 robotroll joined #git
17:16 InfoTest1 joined #git
17:16 python9031 joined #git
17:16 beyertech_ joined #git
17:16 jimi_ joined #git
17:18 aard_ joined #git
17:18 l4v2 I fucjking hate git
17:18 l4v2 it’s so fucking confusing and annoying
17:19 osse !refund
17:19 gitinfo If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.
17:19 osse :P
17:19 hrnz joined #git
17:19 yushyin joined #git
17:19 HedgeWork <3 osse
17:19 GodGinrai l4v2: it really isn't.  What were you expecting it to do, coddle you?
17:19 MattMaker joined #git
17:19 HedgeWork especially, how obvious is it that "reset --hard" might do something drastic?
17:20 osse So I guess you didn't have them open?
17:20 GodGinrai HedgeWork: hell, even "reset" should send off alarms in your head
17:20 HedgeWork GodGinrai: I'd think so.
17:20 HedgeWork I mean, even when I hadn't used git before, I never would type anything like "--hard" without looking it up.
17:20 * HedgeWork shrugs
17:20 HedgeWork I'm also skeptical, though.
17:21 osse nah, I've several times pressed Up in my shell one time too many then pressed Enter
17:21 * HedgeWork was raised right.
17:21 osse ... and it's gone
17:21 HedgeWork osse: I've done that, too, but I recognized it as human error rather than a tools failure.
17:21 diegoviola joined #git
17:21 l4v2 I’m pissed, becasue I lost a whole day of work and looked up how to undo something and it said reset
17:21 l4v2 I didn’t want to run reset, but what the fuck do I know
17:21 l4v2 bye
17:22 i7c Yeah well.
17:22 GodGinrai If you didn't want to run it, then why did you/
17:22 GodGinrai * ?
17:22 i7c Spending 30 seconds on reading would have saved you hours. :)
17:22 osse I'll take that as a "no" on the "files still open in the editor" thing.
17:22 i7c osse haha
17:22 osse that has saved me many a time
17:22 l4v2 Hey, I’m not happy right now, so lets just stop
17:22 belak PCatinean: hey, saw your comments in #github and #bitbucket earlier. Sorry about missing the responses... We're in US Pacific time, so that was super early for us
17:23 osse I'm just trying to help
17:23 l4v2 now, to get to my last commit what command do I run before I hit enter on this
17:23 marc_v92 joined #git
17:23 mozzarella joined #git
17:23 l4v2 I don’t need lessons at the moment
17:23 HedgeWork l4v2: I'm sorry we couldn't fix it...it's not a fixable thing.  I realize you don't know why we're riled...but we get a lot of people in here who run destructive commands and then demand we magically un-destroy things
17:23 BlackMaria joined #git
17:24 belak PCatinean: long story short, adding PR refs is on our TODO list, but not a super high priority. A very large majority of our users make PRs from branches in the same repo so we haven't prioritized that yet. PR refs are extremely complicated and it would take a huge effort to get them into bitbucket, especially when compared to the number of users that would be useful for.
17:24 osse l4v2: what do you mean by last commit? The latest one?
17:24 govg joined #git
17:24 l4v2 yes
17:25 BlackMaria joined #git
17:25 uri joined #git
17:25 osse l4v2: usually 'git checkout branchname', where branchname is for example master
17:25 GodGinrai osse: he's trying to find the most recent commit before his reset command
17:26 osse but if you've been developing like normal up until this happen I would think you're already on the last commit. What does git status say?
17:26 abyx joined #git
17:26 l4v2 On branch product-model
17:26 l4v2 nothing to commit, working tree clean
17:26 osse GodGinrai: if he did git reset --hard HEAD then he hasn't switched commits
17:26 GodGinrai oh wait, he reset HEAD, so he should already be at the most recent commit
17:26 osse yes
17:27 osse l4v2: if the name "product-model" is familiar to you then you probably are where you want to be
17:27 bronson joined #git
17:28 inflames joined #git
17:28 l4v2 SO the reason I did the reset, was because I added a bucnh of images and removed 3. So I added all the untracked images, but then ran git rm the three that were deleted that were still not staged, thinking I just wanted them gone. idk, but git rm app/assets/images/* removed all of my images, so then I did git —hard reset head
17:28 cdown joined #git
17:29 BlackMaria joined #git
17:29 p0pzi3lc joined #git
17:30 l4v2 what am I supposed to do with the files that say D next to them?
17:30 p0pzi3lc any chance someone knows how to clone a repo (fresh) and ignore the submodules?
17:30 l4v2 just add the fact that they are deleted?
17:30 p0pzi3lc l4v2, yes
17:30 GodGinrai l4v2: so what you should have done was to check those files back in individually.  `git checkout HEAD -- app/assets/images/*`, assuming they had previously been committed.
17:30 p0pzi3lc git rm <thefile>
17:30 osse l4v2: green or red D ?
17:30 p0pzi3lc if you don't want them
17:30 cdown_ joined #git
17:30 GenZai joined #git
17:30 l4v2 red
17:31 sbeller_ p0pzi3lc: just clone the repo with no additional arguments and the submodules will be empty
17:31 GodGinrai that's for recovering from the "I deleted all of my images" part
17:31 p0pzi3lc sbeller_, ah shit, then it's ansible that's screwing me - my bad. I avoid submodules
17:31 osse l4v2: do you want to undo this, or commit the fact that you deleted them?
17:31 osse consider using the full git status, not git status -s. it has tips and whatnot
17:31 l4v2 I guess I’m supposed to just commit that they were deleted huh
17:32 osse that's completely up to you.
17:32 GodGinrai p0pzi3lc: IIRC, cloning a repo fresh ignores the submodules anyway.  You have to manually init them if you want to pull the submodules in
17:32 BlackMaria- joined #git
17:32 p0pzi3lc GodGinrai, yeah, unfortunately it appears the ansible git module does a submodule pull too
17:33 l4v2 After this project I am reading the git book, because it always costs me work
17:33 l4v2 ALWAYS!
17:33 l4v2 I did the tutorial, which was pointless
17:34 GodGinrai p0pzi3lc: then you probably need support for that module rather than git
17:34 p0pzi3lc or better yet default on recursive is yes... maybe my bad ;)
17:34 cyphase joined #git
17:34 p0pzi3lc totally
17:34 l4v2 later - thank you
17:35 BlackMaria joined #git
17:35 yoan_ joined #git
17:36 veilig2000 joined #git
17:41 hahuang61 joined #git
17:42 fuchstronaut joined #git
17:42 gravitation joined #git
17:44 splud I4v2: you know, you could always copy your git tree and do dangerous stuff on the copy to experiment (with commands NOT involving forced pushing) without risking screwing yourself.
17:44 splud as it that helps you right now.
17:45 roelmonnens joined #git
17:46 lmat I'm using git-filter-branch ... --index-filter 'git rm -rf --cached **/*.jar'
17:46 lmat It doesn't look like it's getting all my jar files. I think that's because git isn't expanding globs, or it doesn't understand "**".
17:47 splud There’s an intern at my office that’s writing a tool and doing design iteration over it.  I suggested she use git to track her changes during the day as a way to protect herself against ref*ckoring problems, but also to gain some familiarity with git (even if not in the typical use case).
17:47 lmat How do I remove all jars recursively from the index?
17:47 terminal_echo joined #git
17:48 bjpenn joined #git
17:49 dreiss joined #git
17:51 hashpuppy joined #git
17:51 jeffreylevesque joined #git
17:52 lmat I ask how to remove all jar files from the index, not from the history, because I think I have the history part figured out :-)
17:52 lmat osse: Were you talking about this the other day?
17:53 lmat canton7: Or was it canton7 with whom I was talking about this? ^_^
17:53 piling joined #git
17:54 sarbs joined #git
17:56 ELFrederich need some help here with LFS.  From the docs: 'The client automatically detects if the server does not implement the API yet, and falls back to the legacy API'.  But it doesn't explain how it does this "detection" (https://github.com/github/git-lfs/blob/master/docs/api/v1/http-v1-batch.md)
17:56 lmat ELFrederich: You can't handle a little mystery? ;-)
18:01 LionsMane joined #git
18:01 gravitation joined #git
18:01 ELFrederich lmat: I feel like if it were detecting somehow through http I'd see it in my log as an unhandled endpoint or something
18:02 zacts joined #git
18:02 davisonio joined #git
18:02 romerocesar joined #git
18:02 seishun joined #git
18:03 playfullyExist joined #git
18:03 nebg joined #git
18:03 nebg hello everyone i download often applications from github using "git clone <link>"
18:03 nebg now my question is... is there a way to update information of my cloned directory ?
18:03 perlpilot nebg: git pull
18:03 nebg what if the author released new versions of the software
18:03 Sasazuka joined #git
18:03 nebg ok thanks
18:03 starkhalo joined #git
18:04 dlam joined #git
18:04 osse lmat: not me. but the command you have in the index filter does the trick. the -r is unnecessary though
18:04 lmat osse: git expands ** like bash globstar?
18:04 osse yep
18:04 perlpilot nebg: consider reading !progit
18:04 lmat ELFrederich: LFS = linux from scratch?
18:04 gitinfo nebg: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:04 lmat osse: Thanks!
18:04 nebg !progit
18:04 dlam anyone know the best way to delete a specific commit from the git history
18:04 joki joined #git
18:04 _ikke_ dlam: recent or older commit?
18:05 nebg perlpilot, yeah but it's like 700 pages correct me if i'm wronf
18:05 osse lmat: actually you should quote that. otherwise the shell expands it
18:05 nebg *wrong
18:05 osse --index-filter 'git rm -f --cached "**/*.jar"'
18:05 perlpilot nebg: I don't know how long it is, but it's full of useful info, including the basic question you just asked.
18:05 lmat osse: Just how necessary are those quotes?
18:06 lmat osse: Bash separates "correctly"...
18:06 nebg ok thanks
18:06 dlam _ikke_; the original first commit
18:06 osse lmat: git has to expand them, so that it can find jar files that aren't necessarily on disk
18:06 t0by joined #git
18:07 lugzer joined #git
18:07 lmat osse: Ahh, so passing **/*.jar may be expanded by bash rather than git?
18:07 osse it will definitely be expanded by bash
18:07 osse or actually maybe sh
18:07 lmat osse: sh doesn't know about them?
18:07 lmat osse: Doesn't have globstar is what I mean :-)
18:07 osse it doesn't know about **
18:08 bjpenn joined #git
18:08 osse but I think bash allows it even in "sh mode"
18:08 osse but anyway, quote it.
18:08 lmat osse: Next is, how can I tell if it did the right thing?
18:08 lmat osse: I guess I can just checkout a rev...silly me.
18:08 osse otherwise, if you have foo.jar and bar.jar on disk, and some other commit had baz.jar then that won't be removed
18:08 osse lmat: git log -- '**/*.jar'
18:09 lmat osse: That gets the log message for any jar file in the working copy?
18:09 fuchstronaut joined #git
18:09 lmat s/message/messages/
18:09 osse no
18:09 osse same principle, I quoted it
18:09 osse it'll get any jar file ever
18:09 osse even if it doesn't currently exist
18:09 lmat osse: Oh, okay. So git is aggressive on its glob expansions!
18:10 lmat osse: Where is git's glob expansion documented?
18:10 osse i suppose you could say that. it doesn't expand relating it to the file system, but each tree
18:10 osse man gitglossary for some reason
18:10 gitinfo the gitglossary manpage is available at http://jk.gs/gitglossary.html
18:10 osse under "pathspec"
18:10 lmat osse: Thanks!
18:12 axl_ joined #git
18:12 mikecmpbll joined #git
18:12 * lmat kisses osse
18:12 johnny56_ joined #git
18:13 Guest5 joined #git
18:13 roentgen joined #git
18:14 gravitation joined #git
18:14 lmat osse: I ran    git rm -rf --cached "**/*.jar" tst/performance        (as the --index-filter).
18:14 axl_ joined #git
18:14 lmat osse: Now, I checked out HEAD^, and tst/performance/test has lots of stuff in it.
18:14 lmat osse: This is unexpected?
18:15 osse it's unexpected to me at least
18:15 lmat osse: okay, just making sure :-)
18:15 lmat osse: Oh, and of course, I passed --all to git filter-branch.
18:16 osse is tst in a subdirectory or directly at the root?
18:16 looper_ joined #git
18:16 lmat osse: root.
18:16 yitz Heya. I've got a repo that has a commit done in a feature branch then merged into the master. On master, the log shows commits: old, change, merge. I'm trying to programatically get the change commit. HEAD shows the merge and HEAD^ shows the old...
18:17 yitz ... Am I missing something that should give me the change?
18:17 SwiftMatt joined #git
18:17 yellowfin joined #git
18:18 kadoban yitz: HEAD^2 probably
18:19 yitz ...oh. That works. Why? What's that mean vs HEAD~2?
18:19 osse yitz: second parent vs. grandparent
18:19 kadoban HEAD~2 would be the grandparent, ^2 is the second parent
18:19 yitz I see
18:19 yitz Thanks!
18:19 lmat yitz: I think HEAD^2 means the second parent (merge commits have at least two parents), and HEAD~2 means two generations before HEAD.
18:20 Faylite joined #git
18:21 yitz I ended up doing: if len(commit.parents) == 1: return commit; else return commit.parent with highest commit_date
18:21 GodGinrai "second parent" meaning the other parent of a merge commit?
18:21 yitz That's more what I actually want
18:21 yitz Yeah. It seems merge commits got two parents
18:21 yitz git's confusing
18:23 lmat yitz: They can have more than two parents ;-)
18:23 GodGinrai lmat: what scenario would that happen in?
18:24 yitz GodGinrai: If you got two branches that you merge together, the merge has both branch tips as a parent
18:25 sagerdearia joined #git
18:25 ki0 joined #git
18:27 danslo_ joined #git
18:29 zacts_pi joined #git
18:33 Dyonisos joined #git
18:36 ghoti joined #git
18:39 PCatinean belak, thank you for your reply. I assume you read the question on another channel and posted it here. There is no workaround is there?
18:39 _ikke_ Find the branch on the other rpeo
18:41 hahuang61 joined #git
18:42 Sasazuka joined #git
18:42 Kulrak joined #git
18:42 Kulrak joined #git
18:43 lugzer joined #git
18:43 anonnumberanon Hi, my dev folder is the following and I'm about to start using Git, would these files and folders be okay? I assume the executables should not be included.. https://i.imgur.com/kn4GRE0.png
18:45 lolmac joined #git
18:45 eivarv joined #git
18:45 Rodya_ joined #git
18:45 kadoban anonnumberanon: git doesn't care at all how you structure your files/folders inside the repo.
18:45 kadoban And yes you should avoid tracking the executables that are generated from your code.
18:47 hong joined #git
18:47 anonnumberanon kadoban, I see that makes sense. So now I just commit all the source files and then push? And everytime I make a new source I commit and push it?
18:47 choki joined #git
18:47 belak PCatinean: Yeah, I saw you in the #bitbucket channel asking about it. The only current workaround is to have the other person give you access to their repository.
18:47 _ikke_ anonnumberanon: !workflow
18:47 gitinfo anonnumberanon: Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
18:47 belak Which is a pretty awful workaround
18:48 kadoban anonnumberanon: Basically, yeah. You should likely create a .gitignore file to ignore the executables and any other files you don't want to track, so you don't accidentally do it later.
18:48 ahmedelgabri joined #git
18:48 gravitation joined #git
18:49 anonnumberanon Thanks for that linku.
18:49 jeffreylevesque joined #git
18:52 p4trick joined #git
18:53 sin3t joined #git
18:54 GavinMagnus left #git
18:55 rik316 joined #git
18:55 PeterRabbit joined #git
18:56 PeterRabbit I'm using Git for Windows and I recently upgraded from Git 2.8 to Git 2.9
18:57 PeterRabbit I have [commit] gpgsign = true in my gitconfig and with the old version of git, when using git gui, it would automatically gpg sign my commits
18:57 PeterRabbit Now with the new version of git, git gui no longer gpg signs my commits, although invoking git from the command line still gpg signs my commits
18:58 p1k so why does git status not list submodule ref changes ?
18:58 p1k it's weird that I have to use --verbose for an essential thing
18:59 p1k and even after I git add a submodule it doesn't show up on staging without --verbose
18:59 _ikke_ p1k: What version of git?
19:00 p1k _ikke_: sorry nevermind, dumb git user that aliases gst with --ignore-submodules last year and forgets about it
19:00 _ikke_ :-)
19:00 UncleCJ joined #git
19:00 Derperperd joined #git
19:01 p1k I'm sure there was a good reason for it at the time -_-
19:05 lugzer joined #git
19:07 beastd joined #git
19:07 MattMaker joined #git
19:07 Mannn joined #git
19:07 beastd left #git
19:09 al-damiri how can I add specific changes in a specific file from one branch to my current active branch?
19:09 paul424 joined #git
19:10 PeterRabbit due to the lack of response I have decided to open an issue https://github.com/git-for-windows/git/issues/850
19:11 ki0 joined #git
19:12 _kfpratt joined #git
19:12 tm512 joined #git
19:14 fuchstronaut joined #git
19:14 gunmuc joined #git
19:17 Seveas PeterRabbit: that's a known issue, fixed in either the latest git (2.9.3) or development version.
19:17 veilig2000 joined #git
19:18 Guest5 joined #git
19:19 PeterRabbit Seveas: ah okay, at least now there's an issue so other people with the same issue don't have to wonder about it
19:20 izabera joined #git
19:20 nilg joined #git
19:21 izabera hi i messed up by force pushing on github
19:21 izabera i can still access my old data via https://github.com/izabera/toybox/commit/ae27779e6242158b7d3d1e05bd94cd745fad4315
19:21 patarr when i do a rebase on the git cli, or through IntelliJ (my IDE), is that a local operation until I do a git push? Or will that synchronously modify the origin as well?
19:21 izabera is there any way to recover it?
19:21 Munt joined #git
19:22 Munt Im a GIT noob here ... if I merged a branch 3 commits ago on my master branch.  Can I keep the changes made in the recent commits while removing the changes made from the branch merge 3 commits ago ?
19:22 johnmilton joined #git
19:23 joki joined #git
19:25 Kev joined #git
19:25 Kev left #git
19:25 moritz Munt: you can, with git rebase -i, but that will rewrite history (!rewrite)
19:25 gitinfo Munt: 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
19:25 EvilPeng1 joined #git
19:25 Munt So just manually edit out the changes ?
19:26 marscher joined #git
19:27 Munt Im the only person on this git
19:28 osse Munt: do you want to pretend the merge was never done?
19:28 moritz Munt: you can drop the merge commit
19:28 Munt I want the changes I've made since the branch merge to stay but all the changes from that merged branch to go away
19:28 moritz (might need --preserve-merge)
19:29 Munt can I backup my git incase i screw it up ?
19:29 LiohAu joined #git
19:29 osse moritz: yes, that's fine, but you do still want to have the merge in the history?
19:29 osse oops, that was for Munt
19:29 moritz Munt: !backup
19:29 gitinfo Munt: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
19:29 Munt i can back it up easy then great
19:30 nwkj86 joined #git
19:30 clemf_ joined #git
19:30 Munt osse : I dont mind if its erased from the history
19:30 osse Munt: git rebase --onto=mergecommit~1 mergecommit
19:30 osse Munt: or: git reset --hard mergecommit~1; git cherry-pick commit1 commit2 commit3
19:31 Munt I've never ued the command line git successfully before ... Im using atlassian sourcetree
19:32 MattMaker joined #git
19:32 patarr would merging the the master branch into a feature branch, and then later trying to do a rebase on that branch from master, cause issues?
19:32 osse there's a first for everything
19:32 osse i've never used sourcetree before, so I can't help you there
19:32 Noldorin joined #git
19:33 Munt lordy
19:33 Munt thanks for your help
19:33 Munt i'll go do some stufying based off what youve told me
19:33 Seveas izabera: does 'git show ae27779e6242158b7d3d1e05bd94cd745fad4315' work?
19:33 izabera no :( i don't have the original local repo
19:33 Seveas how many commits did you lose?
19:33 hi joined #git
19:34 izabera 5
19:34 Seveas https://github.com/izabera/toybox/commit/ae27779e6242158b7d3d1e05bd94cd745fad4315.patch gives you the patch for that commit
19:34 izabera :o
19:34 Seveas download, apply with git am or git apply, repeat for the other 4
19:34 izabera noice
19:34 Seveas start with the oldest of the 5 :)
19:35 izabera thank you
19:35 osse .karma Seveas
19:35 gitinfo the Genuine Real Life Karma™ REST API results are back! s‍eveas: 107 (1 in past 30 days) (3 given out)
19:35 alansaul joined #git
19:35 osse oh, right
19:35 Seveas .karma chameleon
19:35 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
19:35 osse on behalf etc. thank you, Seveas
19:36 osse .karma Seveas
19:36 gitinfo the Genuine Real Life Karma™ REST API results are back! s‍eveas: 107 (1 in past 30 days) (3 given out)
19:36 osse hmm
19:36 osse shouldn't it be 108 now?
19:36 Seveas it's not linear
19:36 _ikke_ it is linear
19:36 Seveas it's not 1-on-1 then
19:36 _ikke_ 0.1
19:36 Seveas I keep forgetting what it actually is :)
19:37 _ikke_ floor(thanks*0.1)
19:37 gravitation joined #git
19:37 m0viefreak joined #git
19:39 zacts joined #git
19:39 Munt osse :  Here's what I got from running that git command http://hastebin.com/upuqezamag.vbs
19:39 star_prone joined #git
19:40 johnmilton joined #git
19:43 Seveas Munt: so you';ll need to manually merge that binary file. Why on earth is there a zipfile in your git tree in the first place?
19:43 Munt Seveas : I will have to stree my noobishness
19:43 Munt stress
19:43 ToBeCloud joined #git
19:44 Seveas Munt: noob or not, you'll still need to merge that file.
19:44 Munt my source code is full of ================== HEAD >>>>>>>>>>> COMMIT type stuff now
19:45 Seveas yeah, those are all the conflicts you need to resolve
19:45 mohabaks joined #git
19:46 Seveas git status will tell you which files have conflicts, you'll need to resolve them.
19:46 Munt I guess I'm just plainly out of my depth
19:46 chachasmooth joined #git
19:47 IWishIKnew joined #git
19:48 Seveas https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
19:49 paul424 joined #git
19:49 Munt thanks for the insight
19:52 fission6 joined #git
19:52 fission6 i just merged a branch into another branch, i did not push it up or anything, how can i undo this merge
19:53 fission6 i want the upstream version if that helps
19:53 fission6 i gues si could delete locally
19:53 skapunker joined #git
19:55 kulelu88 joined #git
19:55 osse fission6: You can do git reset --hard @{1} assuming you're on the branch you did the git merge command in
19:55 Seveas fission6: git reset --hard commit-sha1-of-branch~
19:56 axl_ joined #git
19:56 fission6 osse: Seveas thanks
19:58 despoil joined #git
19:59 lugzer joined #git
20:06 MattMaker joined #git
20:08 aca20031 joined #git
20:09 EvilPeng1 joined #git
20:11 star_prone joined #git
20:12 clemf joined #git
20:14 star_prone joined #git
20:15 fuchstronaut joined #git
20:15 bongjovi joined #git
20:17 EvilPeng1 joined #git
20:17 eivarv joined #git
20:24 sebascar joined #git
20:27 carif joined #git
20:29 ksolv joined #git
20:29 holodoc joined #git
20:30 vuoto joined #git
20:30 fish3485 joined #git
20:30 SwiftMatt joined #git
20:31 Rodya_ joined #git
20:34 cdg_ joined #git
20:35 Manuel15 joined #git
20:35 Manuel15 joined #git
20:35 FuzzySockets joined #git
20:36 blackwind_123 joined #git
20:36 MattMaker joined #git
20:37 retake joined #git
20:38 skapunker joined #git
20:38 Munt The creator of the library I am using was nice enough to give me a line of coed tht means I dont have to rebase my git .... gotta love charitable developers (thanks to you guys too)
20:39 retake left #git
20:39 netj joined #git
20:41 vuoto joined #git
20:41 NeXTSUN joined #git
20:42 hahuang61 joined #git
20:43 LionsMane joined #git
20:45 ELFrederich with LFS it seems I have two copies of the same file.  One in my workspace and the other in .git/lfs/objects.  What if one of these files is 10GiB?  I need 20GiB to get it?
20:47 qasaur joined #git
20:47 sargas joined #git
20:50 whomp joined #git
20:50 lmat I have a repo, and I run   git rm -rf --cached tst/performance; I get "fatal: pathspec 'tst/performance/' did not match any files"
20:50 lmat Then I   ls /tst/performance; and see lots of stuff.
20:51 lmat the working copy is clean.
20:51 lmat git status returns no changes.
20:51 uri joined #git
20:51 whomp i've made a bunch of changes, and now i want to group these changes under separate branches to make separate prs for my reviewer. is there an easy way to go through each chunk of line changes and move it to the correct branch/
20:51 whomp ?
20:51 Somelauw joined #git
20:52 nickthetait you want to read up on 'git add -p' whomp
20:52 Anoia lmat: /tst is very different to tst
20:52 Anoia and it also depends on yoru current working directory
20:52 lmat Anoia: My mistake.
20:52 lmat Anoia: I meant   ls tst/performance; :-)
20:53 Somelauw I try to switch branch, so I do 'git checkout de', but I get error: pathspec 'dev' did not match any file(s) known to git.
20:53 lmat whomp: I would get each change in its own commit (git add --patch like nickthetait said) Then put them on separate branches.
20:53 whomp i thought if i did a git add, it added by file
20:53 whomp i can just add specific line changes?
20:53 lmat whomp:  git add --patch; does it by patch sets.
20:53 whomp cool! thanks guys
20:54 hahuang61 joined #git
20:54 realz__ joined #git
20:54 lugzer joined #git
20:56 kus joined #git
20:57 enleeten joined #git
20:57 enleeten_ joined #git
20:57 lmat osse: I have a repo, and I run   git rm -rf --cached tst/performance; I get "fatal: pathspec 'tst/performance/' did not match any files"
20:57 lmat Then I   ls /tst/performance; and see lots of stuff.
20:58 lmat Then I   ls tst/performance; and see lots of stuff.
20:58 lmat S)
20:58 osse lmat: --cached removes it from the index, but not from disk
20:58 Jon28 joined #git
20:58 Raed|Mobile joined #git
20:58 osse iow: it's untracked
20:58 lmat osse: git status said "nothing to commit, working directory cleaned"
20:59 osse !repro
20:59 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
20:59 vuoto joined #git
20:59 lmat osse: This is a very clean repo :-) Just created from a svn repo.
20:59 sangy joined #git
20:59 nitric lmat: is the "tst" directory being git-ignored?
20:59 lmat there is no .gitignore, and I didn't do anything else :-)
21:01 jason237 joined #git
21:03 stiwar joined #git
21:06 osse lmat: can you show us
21:06 osse like gitinfo says
21:06 lmat sorry, missed that.
21:06 Fr0Master left #git
21:07 stiwar left #git
21:07 MattMaker joined #git
21:07 FroMaster joined #git
21:08 lmat http://paste.ubuntu.com/22955899/
21:08 lmat osse: That's all I could think of...
21:08 EvilPeng1 joined #git
21:09 osse lmat: is tst/performance/test empty?
21:09 osse specifically an empty directory
21:10 alansaul joined #git
21:10 kbs joined #git
21:11 Lunatrius joined #git
21:12 cyan__ joined #git
21:12 brandonw joined #git
21:14 vuoto joined #git
21:15 Puffball joined #git
21:16 cd-rum joined #git
21:17 localtoast joined #git
21:17 beyertech joined #git
21:20 n-st joined #git
21:20 Sasazuka joined #git
21:21 ahmedelgabri joined #git
21:21 ItSANgo joined #git
21:23 cd-rum_ joined #git
21:25 mellernoia joined #git
21:25 Sasazuka__ joined #git
21:26 bronson joined #git
21:27 whomp ok so i did a `git diff ... | git apply`, then i added a few bits, then i started all over and did another diff/apply, and now it's saying for each file "already exists in working directory"
21:27 whomp any ideas?
21:29 ash_workz how come when I pull I don't see my partner's commit?
21:30 Lunatrius joined #git
21:30 ruskie joined #git
21:31 Rodya_ joined #git
21:31 cjbrambo joined #git
21:34 ash_workz nvm
21:36 star_prone joined #git
21:36 jaafar joined #git
21:36 Ravana joined #git
21:37 Repox joined #git
21:37 Rodya_ joined #git
21:38 Lunatrius joined #git
21:38 MattMaker joined #git
21:39 Somelauw ash_workz: did your partner push?
21:40 cd-rum joined #git
21:40 osse it's a boy!
21:40 osse i'll show myself out
21:40 kadoban xD
21:40 shinnya joined #git
21:41 dhollinger joined #git
21:44 cdg joined #git
21:46 IWishIKnew left #git
21:47 starkhalo joined #git
21:47 HappyLoa- joined #git
21:48 ariver joined #git
21:49 lugzer joined #git
21:49 terminal_echo joined #git
21:51 a3Dman joined #git
21:51 aidalgol joined #git
21:52 Dougie187 left #git
21:52 M4GNV5 joined #git
21:54 gunmuc left #git
21:54 M4GNV5 so im looking for a specific email for the git mailing list, it was previousely available on gmane under http://thread.gmane.org/gmane.comp.version-control.git/57643/focus=57918 however now that gmane is dead i cant access it anymore. Are there any other pages like gmane that log all emails in mailing lists?
21:56 dsantiago joined #git
21:57 Tentacled joined #git
21:58 CheckDavid joined #git
21:59 Sasazuka__ joined #git
21:59 LeBlaaanc joined #git
21:59 cdg joined #git
21:59 jeffreylevesque joined #git
21:59 Rodya_ joined #git
22:00 gravitation joined #git
22:01 MattMaker joined #git
22:02 Munt joined #git
22:02 qsx M4GNV5: marc.info
22:03 EvilPeng1 joined #git
22:05 whomp nickthetait, how can i undo my last decision for a chunk?
22:05 whomp i accidentally added something i don't want to add
22:08 therealGent joined #git
22:08 whomp lmat, ^
22:08 lmat whomp: yo
22:08 Somelauw left #git
22:09 lmat whomp: I have no idea what you're talking about, but if you want a commit (that you haven't pushed) to go away, use git reset --hard HEAD^;
22:09 lmat whomp: If you're not careful, this can mess up your repo.
22:10 HappyLoa- joined #git
22:10 whomp lmat, so i'm in the middle of a very long session with "git add -p", and i accidentally write "y" for a chunk that i didn't want to add
22:10 lmat osse: You know... tst/performance/test is not empty, but I think it's only filled with directories that may contain directories that cont.... in short, no f iles.
22:10 whomp i want to go back to that chunk
22:10 lmat osse: thanks!
22:10 lmat whomp: whoa!
22:11 whomp it tells me to write "K" to go back, but then it says "no previous chunk"
22:11 whomp crazy, right?
22:11 lmat whomp: I'm not very well-versed in git add --patch (never used it)
22:11 M4GNV5 left #git
22:11 lmat whomp: crazy.
22:11 lmat whomp: Maybe just leave it and go back and edit it by hand? Sounds like a pickle.
22:11 whomp lmat, yeah i'll prob do that, thx
22:11 lmat whomp: Of course, the canonical version is git reset HEAD file; git add -p ...; (which is: start over), but I understand the long session bit...
22:12 reim joined #git
22:14 axl_ joined #git
22:16 fuchstronaut joined #git
22:17 nickthetait whomp you can do git reset -p to unstage just a portion, it is the reverse of git add -p basically
22:17 nickthetait well, I gotta scram. good luck
22:17 whomp np ty
22:19 sulky joined #git
22:19 noteness joined #git
22:20 HappyLoa- joined #git
22:23 madewokherd joined #git
22:24 Guest29537 joined #git
22:24 spudowiar joined #git
22:26 rkazak joined #git
22:27 Sasazuka joined #git
22:29 StuartMI joined #git
22:29 stuartrexking joined #git
22:30 kbs joined #git
22:34 drkhsh joined #git
22:38 LeBlaaanc joined #git
22:44 lugzer joined #git
22:45 jaafar joined #git
22:45 aidalgol joined #git
22:46 danimal2 joined #git
22:46 red_ joined #git
22:47 dreiss joined #git
22:48 robsco joined #git
22:48 dlam any good ways to shrink a gynormous .git/  folder?   i think its cuz one of my commits accidently  checked in an entire ./env/lib/python2.7 folder  X_X
22:50 stuartrexking joined #git
22:50 j416 dlam: make sure nothing references the commit (i.e. it's not on a branch, or referenced by a tag or so), then wait it out. it'll be garbage collected after some time.
22:50 j416 dlam: you can spend time trying to nuke it yourself, but in my experience it's a bit of tinkering and not really worth the time it takes to figure it out each time :)
22:50 robsco i've used git at my last 5 companies, that were never "distributed", usually 5-10 dev's per team, and wonder if git really does suit every environment?
22:51 j416 robsco: you can create whatever workflow fits. central repo style works too.
22:52 MattMaker joined #git
22:52 robsco j416, that's what I'm used to, but have used git in several previous roles, it's worked fine, i'm interested in the (possible) cut off point in regards to size?
22:53 j416 robsco: if you have a lot of binary stuff, git won't cope very well
22:53 robsco not so much, mainly text
22:53 j416 robsco: text compresses well, git should have no problem if it is mostly text.
22:53 j416 robsco: look at other projects for reference. Linux, for instance.
22:54 robsco but why to convert from svn to git, for such mall teams
22:54 j416 because it's better.
22:54 j416 google to find differences
22:54 robsco my teams are 5 devs total, 1 dev per "project"
22:54 j416 I don't see how the number of devs is an argument for or against any VCS.
22:55 robsco 1-3 days per "project"
22:55 j416 I am one, and I use Git, even for "projects" that take 2 hours to do.
22:55 robsco neither do I to be honest, I'm looking for what I nay be missing
22:55 blockzombie joined #git
22:55 robsco :)
22:55 j416 just move to git already.
22:55 j416 :)
22:55 j416 it'll be a little hurdle to get over, but once you're over the grass is green.
22:55 fahadash joined #git
22:56 piling_ joined #git
22:56 robsco there's a commercial "spend" to do so, so how do I sell it.  very small startup
22:56 j416 robsco: if you're already using svn, you can start using git-svn, works pretty well
22:57 robsco yeah true
22:57 j416 robsco: you get all of the benefits from git locally, but you lose some info when you commit your things back to svn. But, it's a way in. You'll learn what git can do that svn can't. :)
22:57 t-mart joined #git
22:58 robsco j416, thanks, i've used both, and got "commercial" people shouting we should use git cos that's what the cool kids use  :)
22:59 j416 robsco: I would use whatever your team prefers.
22:59 j416 that's not really a reason :P
22:59 alansaul joined #git
22:59 robsco yeah true
22:59 stuartre1king joined #git
22:59 robsco "commercial" got too much time on their hands  :)
22:59 j416 so, use git, stop worrying :)
22:59 robsco bah, migration
23:00 robsco :)
23:00 robsco we're not a distributed team, and svn "just works"
23:00 j416 I'd advise you and your team to spend a good two or three full days to learn it; you'll get that time back very fast by less day-to-day headache.
23:00 robsco tho still using git for my own stuff
23:01 j416 I don't agree with "svn just works", but each to their own
23:01 robsco I know what you mean
23:01 j416 distributed team or not is not an argument for or against git
23:01 l4v2 joined #git
23:02 robsco our dev team is 4 dev's each working on completely diff areas
23:02 robsco no conflicts
23:02 j416 point being?
23:02 robsco just painting the picture
23:02 piling joined #git
23:02 robsco I know git is better at handling conflicts
23:07 danimal2 joined #git
23:08 LeBlaaanc joined #git
23:11 adzm joined #git
23:16 _sjs joined #git
23:16 blockzombie joined #git
23:17 fuchstronaut joined #git
23:17 fuchstronaut joined #git
23:17 alansaul joined #git
23:21 ffabi joined #git
23:21 whitby joined #git
23:23 Gitzilla joined #git
23:24 jimi_ joined #git
23:25 MattMaker joined #git
23:26 aidalgol joined #git
23:30 blockzombie joined #git
23:31 danimal2 joined #git
23:33 gravitation joined #git
23:34 axl__ joined #git
23:36 leprechau joined #git
23:38 lugzer joined #git
23:39 RedneckDonut joined #git
23:41 dsdeiz joined #git
23:41 dsdeiz joined #git
23:46 meloc joined #git
23:47 Kaisyu joined #git
23:52 docnvk joined #git
23:52 sargas joined #git
23:56 BSAlb joined #git

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