Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-18

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

All times shown according to UTC.

Time Nick Message
00:00 Oatmeal joined #git
00:03 mehola joined #git
00:04 bannakaffalatta joined #git
00:08 hahuang65 joined #git
00:09 pietv joined #git
00:12 jimi_ joined #git
00:14 timvisher joined #git
00:16 durham_ joined #git
00:19 tirej joined #git
00:20 Rodya_ joined #git
00:25 msonntag joined #git
00:26 dances-with-cats joined #git
00:28 YottaByte joined #git
00:28 YottaByte wondering if there's anyone here who's used bitbucket before who can help me with a pull request
00:29 chachasmooth joined #git
00:29 tay_ joined #git
00:31 Anja joined #git
00:31 adymitruk YottaByte: sure, what's the issue?
00:32 hahuang61 joined #git
00:34 Ryanar joined #git
00:35 YottaByte I think I may have figured it out... it was because of a conflict but I think I understand this: https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html
00:36 FilipNortic joined #git
00:39 done joined #git
00:40 chipotle joined #git
00:41 Eryn_1983_FL joined #git
00:43 rominronin joined #git
00:47 cybersphinx joined #git
00:48 spacelord_ joined #git
00:49 forrestv joined #git
00:50 Gsham joined #git
00:52 mablae joined #git
00:53 adymitruk YottaByte: if you want to hand over things on a silver platter to maintainers, you can rebase your branch off of master, resolving all conflicts there and then quickly make a PR of that branch to master. It should not have any conflicts unless someone pushes something that happens to cause more
00:54 neilthereildeil joined #git
00:54 neilthereildeil hi
00:54 neilthereildeil when i try to git push via ssh, i get an error that remote: error: refusing to update checked out branch: refs/heads/master
00:55 neilthereildeil is there a way to just update the index, but not have remote side checkout the new changes?
00:57 madewokherd joined #git
00:59 _geoff joined #git
00:59 tirej joined #git
01:01 the_cybersphinx joined #git
01:01 pity joined #git
01:03 neilthereildeil left #git
01:03 durham joined #git
01:03 lucasem joined #git
01:04 mischat joined #git
01:06 ojacobson !bare
01:06 gitinfo A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
01:06 ojacobson erg. you already know that.
01:06 ojacobson anyways, yes, there's a git-config key for that
01:08 PettanShoutaKun oh my god
01:08 PettanShoutaKun these commits are never coming out....
01:09 PettanShoutaKun the REPO is TAINTED
01:10 timvisher joined #git
01:10 Oatmeal joined #git
01:12 cqi joined #git
01:14 cqi joined #git
01:14 Spherical joined #git
01:15 PettanShoutaKun what is the fastest way to "cherry-pick" a group of commits and apply them onto my branch
01:15 PettanShoutaKun there's like 8 of them
01:17 matsaman joined #git
01:23 salamanderrake joined #git
01:23 pity joined #git
01:23 stench joined #git
01:24 durham joined #git
01:26 benwbooth joined #git
01:27 xaviergmail joined #git
01:28 kineticrootkit[m joined #git
01:28 SpEcHiDe joined #git
01:28 graingert joined #git
01:29 forrestv joined #git
01:29 msonntag joined #git
01:29 jimi_ joined #git
01:29 pietv joined #git
01:29 hahuang65 joined #git
01:29 multi_io joined #git
01:29 peeps[lappy] joined #git
01:29 WakiMiko joined #git
01:29 moei joined #git
01:29 Atm0spher1c joined #git
01:29 Noldorin joined #git
01:29 cagmz joined #git
01:29 tristanp joined #git
01:29 sarri joined #git
01:29 ToBeFree joined #git
01:29 snits joined #git
01:29 serialoverflow joined #git
01:29 solution_ joined #git
01:29 TinkerTyper joined #git
01:29 Eugene joined #git
01:29 cyberz joined #git
01:29 slixpk joined #git
01:29 roflin joined #git
01:29 daopu[m] joined #git
01:29 Remramm joined #git
01:29 mkoskar joined #git
01:29 habbasi joined #git
01:29 rudi_s joined #git
01:29 uebera|| joined #git
01:29 Karazhan joined #git
01:30 snits joined #git
01:30 Atm0spher1c joined #git
01:30 Darren_ joined #git
01:31 thiago joined #git
01:31 anonymuse joined #git
01:33 ikelso joined #git
01:33 hahuang61 joined #git
01:34 moei joined #git
01:34 durham joined #git
01:36 dirtyroshi joined #git
01:36 hyperair joined #git
01:36 weltall joined #git
01:36 Raineer joined #git
01:37 johnny56 joined #git
01:38 anonymus_ joined #git
01:39 tirej joined #git
01:42 GodGinrai joined #git
01:42 drbean joined #git
01:42 ikelso joined #git
01:43 ikelso joined #git
01:43 Cork joined #git
01:44 salamanderrake joined #git
01:45 ikelso_ joined #git
01:50 Rodya_ joined #git
01:52 monkeycat joined #git
01:52 PettanShoutaKun 87490c3 is the commit that merged a bunch of crap into our branch that we didn't want...
01:52 PettanShoutaKun it's a merge commit... unfortunately I think it has a few other files that we actually need in it as well....
01:52 PettanShoutaKun how do I keep the stuff we want from it.... and ditch the stuff we don't?
01:54 pity joined #git
01:55 chachasmooth joined #git
01:55 Raineer left #git
01:56 flippo joined #git
01:57 YottaByte left #git
01:58 timvisher joined #git
01:58 jameser joined #git
02:00 AlexMax left #git
02:01 msonntag joined #git
02:01 kyan Apparently autocrlf is enabled by default!! Is this a known issue?
02:03 adymitruk kyan: yes. I turn off all line ending handling off by default as the first thing after installing.
02:03 kyan Any idea when it'll be fixed?
02:04 kyan I'd be interested in backporting a patch into my builds if there's one available yet
02:04 kyan I can't find any bugtracker for git...
02:04 jameser joined #git
02:05 adymitruk It's not considered a bug
02:05 mischat joined #git
02:05 adymitruk i've been dealing with this default setting for a decade now
02:05 jimi_ joined #git
02:06 kyan What.
02:07 adymitruk yes.. it's so linux, OSX/MacOS and Windows people could edit the same files. I never liked this "feature"
02:08 fakenerd joined #git
02:08 kyan but we *can* edit the same files. That's literally why editors will change what endings they use depending on what's already in the file
02:08 PettanShoutaKun Alright, I'm going to try to elaborate my entire problem and get help one last time. I have a master branch that is perfectly setup the way I want it to be. I have a branch based off a different base of master that has a merge in it that we pushed out of master. now I'm trying to take ONLY the top 6 commits of this branch and basically put them on top of our current master
02:08 PettanShoutaKun how do I do that?
02:08 finalbeta joined #git
02:09 ojacobson git checkout master -b some-new-name && git cherry-pick source-branch~6..source-branch
02:09 ojacobson review results; if content, git checkout master && git merge --ff --ff-only some-new-nam
02:09 durham joined #git
02:10 xaviergmail joined #git
02:10 Gsham joined #git
02:11 ojacobson kyan: if you dislike the default, you can change it either for your entire account or for a single project. The old default, in practice, caused more line ending problems than it fixed.
02:11 ojacobson I'm glad you have sufficient command of your editor to avoid that! You should be proud, and then you should configure git appropriately. :)
02:12 PettanShoutaKun erro: Commit dd1bd86a9f73f9ae60811e341a0d42e60a1a350a is a merge but no -m option was given.
02:12 rchavik joined #git
02:12 PettanShoutaKun what do I do about that? o.O
02:12 kyan ojacobson: I didn't have to do anything... only editor I've recalled that didn't "just work" with everything by default was Notepad in Windows XP
02:12 PettanShoutaKun ojacobson
02:13 ojacobson PettanShoutaKun: merges are hard to cherry-pick, you're better off breaking the six commits up into six separat cherry-picks
02:13 ojacobson cherry-pick the non-merge commits, re-do the merges for the merge commits
02:13 ojacobson (this is also why git-rebase drops merges by default)
02:13 PettanShoutaKun hmmmm
02:14 PettanShoutaKun look at the repo browser I can see that ca419a5 is the exact merge commit that includes all the changes I don't want
02:14 PettanShoutaKun is there some way to drop ONLY that commit?
02:14 kyan Anyway, following https://help.github.com/articles/dealing-with-line-endings/, in the section "Refreshing a repository after changing line endings", I did what they said, but it did the opposite: I added autocrlf=false to my .gitconfig, committed to be able to roll back, did the git rm --cached -r . thing, then git reset --hard. When I got to step 4, though, it didn't seem to have worked, since there weren't any changes shown to indicate that
02:14 kyan it had noticed that I turned off line ending conversion
02:14 rominronin joined #git
02:15 kyan How can I commit the real line endings for these files I'd already committed with default settings?
02:16 snowkidind joined #git
02:16 PettanShoutaKun or worse... it looks like merge commit ca419a5 includes some of the changes  we actually want as well as a lot of the changes we don't
02:18 Sasazuka joined #git
02:18 nebodka joined #git
02:19 tirej joined #git
02:19 nevodka joined #git
02:20 adymitruk PettanShoutaKun: you can list all the non-merge commits in the cherry-pick command
02:20 adymitruk where in the series of commits is the merge?
02:20 adymitruk is it the first, the last or somewhere in the middle?
02:21 Sasazuka I have the same repo checked out in two locations locally A and B (probably shouldn't have done this); in A I branched and pushed; in B instead of checking out said branch, I also created the branch and the push of course failed, what can I do in B to push my changes to remote? create a patch, delete branch, checkout the correct branch, apply patch, and then push?
02:21 PettanShoutaKun it's somewhere WAY in the muddle
02:21 PettanShoutaKun *middle adymitruk
02:22 PettanShoutaKun the only real saving grace is most of what it changes is in separate files
02:22 adymitruk you have 6 commits in total?
02:22 ikelso joined #git
02:22 adymitruk what you do is cherry-pick the first batch up to the merge commit
02:23 adymitruk then you git checkout <hash of merge commit> -- files you want
02:23 PettanShoutaKun I have 15 commits after the merge commit. Almost all of the files affected by that merge are in a separate folder on our repo....
02:23 adymitruk then git add . git commit
02:24 adymitruk then git cherry
02:24 PettanShoutaKun in theory I should be able to rip out this single merge that carries like 29 extra unnecessary commits with it
02:24 adymitruk then git cherry-pick the rest
02:24 PettanShoutaKun I'd hope
02:24 Gsham joined #git
02:24 jimi_ joined #git
02:25 adymitruk so 1. cherry pick first batch 2. checkout files you want from merge with the -- 3. cherry pick the rest
02:25 adymitruk you should be sorted by then
02:26 timvisher joined #git
02:27 Wulf joined #git
02:28 nowhereman joined #git
02:30 jameser_ joined #git
02:31 PettanShoutaKun I feel like no matter what I try.... some commit or another keeps pulling this crap back in
02:32 donught joined #git
02:35 jameser joined #git
02:36 d^sh joined #git
02:38 zivester joined #git
02:38 nowhereman joined #git
02:41 pks joined #git
02:46 adymitruk you need to look at the --stat of each commit.. it will show you what each commit brought in
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:49 fakenerd joined #git
02:49 rewt `git merge --no-commit`, and then just `git reset` or w/e the parts you don't want
02:50 adymitruk rewt: no, he's trying to cherrypick a merge commit
02:50 PettanShoutaKun I can't just checkout the file without having to specify a parent?
02:50 adymitruk with only some changes
02:50 PettanShoutaKun I don't even care if it comes on top of my file as a new commit I feed back into my new master
02:51 adymitruk depends on what you are omitting
02:51 adymitruk you will get changes from commits you tried to skip
02:52 adymitruk this is probably why you are seeing changes you don't want after checking out the files from that merge commit
02:52 adymitruk they have effects of what you are intending to skip anyway
02:52 adymitruk so you need to get only the patches of what you want
02:52 xall_ joined #git
02:53 PettanShoutaKun I think in theory I'm going to pull in master last... which should have all the other changes built on top of these
02:53 adymitruk say you have changes A-Z, Z is the merge commit, you want only X and Y changes
02:53 PettanShoutaKun and then when I finally push it all back to master hopefully it's fixedi
02:53 adymitruk you can't hope this stuff away
02:54 adymitruk in my example, if you now checkout some files from Z, you may get things that A-W introduced
02:54 Xandaros joined #git
02:54 adymitruk and you only wanted X and Y
02:56 mage__ joined #git
02:56 dsantiago joined #git
02:57 adymitruk for your merge commit, you need to do "git cherry-pick <sha1> --no-commit -m 1"
02:58 rivarun joined #git
02:58 timvisher joined #git
02:59 adymitruk this will do "apply the patch of what the merge commit implies by looking at the 1st parent (where I merged to) and don't commit"
02:59 adymitruk now you need to look at git status and perhaps git diff --stat to see what that introduces
03:00 adymitruk git reset -- file/from/which/you/dont/want/changes
03:00 adymitruk repeat for all files
03:00 adymitruk the git commit
03:00 tirej joined #git
03:00 adymitruk then do the remainder of your commits that come in after the merge via simple cherry-picks
03:00 adymitruk PettanShoutaKun: makes sense?
03:00 hide joined #git
03:00 r3c0d3x joined #git
03:00 rt joined #git
03:00 ketas joined #git
03:01 Vampire0_ joined #git
03:01 NeverDie joined #git
03:02 donught joined #git
03:02 YuGiOhJCJ joined #git
03:02 yanope joined #git
03:03 PettanShoutaKun I just pulled them in by hand....
03:06 adymitruk have to be careful.. ensure no other commits affected those file with git log -- path/to/file
03:06 Nicmavr joined #git
03:06 mischat joined #git
03:06 adymitruk files*
03:09 Atemu joined #git
03:09 jeffreylevesque joined #git
03:09 Noodlewitt joined #git
03:11 tyng joined #git
03:11 nckpz joined #git
03:12 donught joined #git
03:15 thiago joined #git
03:16 hexagoxel joined #git
03:17 tyng left #git
03:18 donught joined #git
03:19 dreiss joined #git
03:20 tyngdekraften joined #git
03:22 anonymuse joined #git
03:23 tyngdekraften i just tried to clone a huge repository but the process got stopped during the `resolving deltas` phase (it finished downloading) and now i just got a big pack file, how can i extract the files/resume the process without having to redownload everything?
03:24 s2013 joined #git
03:28 sunri5e joined #git
03:30 aw1 joined #git
03:35 chachasmooth joined #git
03:35 hahuang61 joined #git
03:36 timvisher joined #git
03:36 cagomez joined #git
03:40 tirej joined #git
03:40 fstd_ joined #git
03:40 donught joined #git
03:40 kyle_ joined #git
03:41 donught joined #git
03:42 _geoff joined #git
03:42 GodGinrai joined #git
03:43 duderonomy joined #git
03:44 YourTheBombNow23 joined #git
03:45 ikelso joined #git
03:46 donught joined #git
03:46 rominronin joined #git
03:46 Gsham joined #git
03:48 Gsham joined #git
03:48 xall joined #git
03:48 durham_ joined #git
03:53 adymitruk make a copy of the dir and try doing a fetch?
03:53 pity joined #git
03:53 Gsham joined #git
03:54 ikelso joined #git
03:58 a_thakur joined #git
04:02 monkeycat joined #git
04:04 mehola joined #git
04:05 pity joined #git
04:07 tyngdekraften it redownload everything
04:07 mischat joined #git
04:08 sdothum joined #git
04:08 tyngdekraften when i try `git index-pack' i got `early EOF'
04:11 anonymuse joined #git
04:14 adymitruk seems like you need to nuke and start again
04:14 pity joined #git
04:14 adymitruk consider a shallow clone if you have a gnarly history
04:17 tyngdekraften with depth=1 and core.compression=9 it already took several hours.. anything else i can do to reduce transfert size?
04:19 tirej joined #git
04:22 timvisher joined #git
04:22 Raed|Mobile joined #git
04:28 mehola joined #git
04:28 mischat joined #git
04:35 msonntag joined #git
04:35 sdothum joined #git
04:36 hahuang61 joined #git
04:42 _W_ joined #git
04:43 Darren_ joined #git
04:44 SwiftMatt joined #git
04:47 justan0theruser joined #git
04:48 mgoodwin Is it possible to annex various directories outside of a git repo maybe with symlinks?
04:48 dreiss joined #git
04:48 mgoodwin This is just a very specific unusual ad-hoc use case to track some changes across several directories, not a long term solution
04:48 phroa put the directories in your git repo, create symlinks in the outside world pointing in
04:49 phroa I think GNU Stow does that, if not a similar thing
04:49 mgoodwin I can't do that because the ordinary directories are created via package manager
04:49 mgoodwin We're trying to track text changed between a very specific configuration of a service between /etc /var and /usr
04:50 phroa try the 'etckeeper' program, I think you can annex other directories into that
04:50 phroa (it's git-backed)
04:50 ojacobson Can +1 this recommendation
04:50 phroa but otherwise I can't help you further :(
04:50 arnsa joined #git
04:55 Rodya_ joined #git
04:56 inflames joined #git
04:58 donught joined #git
04:59 tirej joined #git
05:00 timvisher joined #git
05:00 dermoth joined #git
05:00 thiago joined #git
05:03 tmcmahon joined #git
05:05 pks joined #git
05:06 netj joined #git
05:06 donught joined #git
05:07 ISmithers joined #git
05:09 s2013 joined #git
05:12 chachasmooth joined #git
05:12 pennywu joined #git
05:14 donught joined #git
05:15 sdothum joined #git
05:17 donught joined #git
05:18 rominronin joined #git
05:21 donught joined #git
05:22 sdothum joined #git
05:25 rivarun joined #git
05:29 mischat joined #git
05:29 donught joined #git
05:31 timvisher joined #git
05:31 diogenese joined #git
05:31 lindenle joined #git
05:31 romerocesar joined #git
05:32 donught joined #git
05:32 sword`` joined #git
05:34 donught joined #git
05:36 DrAwesome joined #git
05:36 donught joined #git
05:37 Cabanossi joined #git
05:39 pR0Ps joined #git
05:39 wmm joined #git
05:39 tirej joined #git
05:42 raspado joined #git
05:43 spacelord_ joined #git
05:43 GodGinrai joined #git
05:46 xall joined #git
05:48 Ryanar joined #git
05:52 govg joined #git
05:52 robnester joined #git
06:01 dec0n joined #git
06:01 pity joined #git
06:03 cdown joined #git
06:04 chandu20 joined #git
06:05 MineCoins joined #git
06:06 dave0x6d joined #git
06:12 rscata joined #git
06:13 dec0n joined #git
06:13 timvisher joined #git
06:15 brent__ joined #git
06:15 dec0n joined #git
06:16 dec0n joined #git
06:20 donught joined #git
06:23 donught joined #git
06:25 Vortex34 joined #git
06:25 cyan__ joined #git
06:26 Guest34812 joined #git
06:28 rominronin joined #git
06:31 mischat joined #git
06:32 regedit joined #git
06:33 mobileWolf joined #git
06:33 xissburg joined #git
06:33 ashokrajar joined #git
06:34 Endarked joined #git
06:35 sunri5e joined #git
06:37 hahuang61 joined #git
06:39 zefferno joined #git
06:40 qt-x joined #git
06:40 romerocesar joined #git
06:40 bocaneri joined #git
06:41 leeN joined #git
06:41 thiago joined #git
06:45 mp3 joined #git
06:45 thierryp joined #git
06:45 bocaneri joined #git
06:46 miczac joined #git
06:47 overlord_tm joined #git
06:48 ThomasLocke joined #git
06:48 ThomasLocke joined #git
06:52 mobileWolf left #git
06:54 cqi joined #git
06:55 romerocesar joined #git
06:56 timvisher joined #git
06:56 rajat joined #git
07:05 zeroed joined #git
07:07 dminuoso left #git
07:07 dreiss joined #git
07:08 acetakwas joined #git
07:12 Raging_Hog joined #git
07:13 pity joined #git
07:15 cqi joined #git
07:16 cqi joined #git
07:17 chele joined #git
07:18 cqi joined #git
07:21 qt-x joined #git
07:22 zeroed joined #git
07:22 zeroed joined #git
07:22 elect joined #git
07:26 Tobbi joined #git
07:28 variable joined #git
07:29 andrew710 joined #git
07:30 zeroed joined #git
07:30 zeroed joined #git
07:31 mischat joined #git
07:32 jstimm joined #git
07:35 ihradek joined #git
07:37 thierryp joined #git
07:38 Sceorem joined #git
07:39 jagob joined #git
07:39 ramsub07 joined #git
07:40 freimatz joined #git
07:40 phanimahesh joined #git
07:40 JeroenT joined #git
07:41 jnavila joined #git
07:42 romerocesar joined #git
07:44 GodGinrai joined #git
07:46 djb-irc joined #git
07:46 eduardas_m joined #git
07:47 govg joined #git
07:48 mda1 joined #git
07:48 JeroenT joined #git
07:48 timvisher joined #git
07:49 sarri joined #git
07:49 sarri joined #git
07:50 pietv joined #git
07:51 sbulage joined #git
07:53 benycze joined #git
07:53 benycze left #git
07:53 fakenerd joined #git
07:54 pur3eval joined #git
07:56 Tobbi joined #git
08:00 pity joined #git
08:00 aidalgol joined #git
08:03 jknetl joined #git
08:03 phanimahesh joined #git
08:06 bannakaffalatta joined #git
08:09 xall joined #git
08:10 theoceaniscool joined #git
08:10 laen left #git
08:11 JeroenT joined #git
08:13 XVar joined #git
08:13 thiago joined #git
08:13 _ng joined #git
08:13 JeroenT_ joined #git
08:15 phanimah1sh joined #git
08:15 a_thakur joined #git
08:21 TomyWork joined #git
08:22 nowhereman joined #git
08:23 aax joined #git
08:27 timvisher joined #git
08:28 Tobbi joined #git
08:29 phanimahesh joined #git
08:30 lordjancso joined #git
08:31 GodGinrai joined #git
08:32 Snugglebash joined #git
08:32 mischat joined #git
08:38 hahuang61 joined #git
08:38 overlord_tm joined #git
08:39 msonntag joined #git
08:39 osse tyngdekraften: i like your nick
08:40 nowhere_man joined #git
08:41 chipotle joined #git
08:43 busta joined #git
08:43 Balliad joined #git
08:45 g105b joined #git
08:45 Arban joined #git
08:46 nostrora joined #git
08:46 phanimahesh joined #git
08:47 xall_ joined #git
08:51 g105b How do I change the commit date of a range of commits back 1 day relative to the current date? One computer I use has had its clock set wrong for a while and I need to correct the commits.
08:52 pR0Ps joined #git
08:52 a_thakur joined #git
08:54 aard_ joined #git
08:54 GavinMagnus joined #git
08:56 adymitruk .. or you want to make it look like you did it a day earlier ;)
08:57 adymitruk !filter-branch
08:57 adymitruk !filterbranch
08:57 adymitruk !
08:57 sonOfRa g105b: if the commits are already public, you want to think twice about doing that, because you'll be rewriting public history, and that's always a bad idea
08:57 adymitruk anyway g105b you should look at filterbranch. I'll do what you need
08:58 tobiasvl !man git-filter-branch
08:58 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
08:58 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
08:58 adymitruk if they already have been pushed where others have seen it, then you'll need to warn everyone that you'll be force pushing so they can reset their branches and perhaps rebase the work they haven't yet pushed
08:59 tobiasvl right. no ! in that instance.
09:00 pity_ joined #git
09:00 sbulage joined #git
09:01 g105b It's been pushed, but currently it's only me who has seen anything.
09:01 garethdaine joined #git
09:02 adymitruk g105b: so filter-branch to edit to your liking (make sure committer AND author dates match), then force push with git push -f origin master
09:02 elect_ joined #git
09:02 jozwior__ joined #git
09:02 acetakwas joined #git
09:03 phanimahesh joined #git
09:04 robnester joined #git
09:06 timvisher joined #git
09:06 mindfart joined #git
09:08 mischat joined #git
09:08 a_thakur joined #git
09:09 Tobbi joined #git
09:10 a_thakur joined #git
09:12 marcogmonteiro joined #git
09:12 g105b cool thanks adymitruk, tobiasvl
09:12 adymitruk np, good luck!
09:13 JeroenT joined #git
09:16 Shashikant86 joined #git
09:17 g105b I think I've sorted it with an --env-filter
09:20 philipsd6 joined #git
09:22 adymitruk excellent
09:23 ssitani joined #git
09:23 inflames joined #git
09:24 bongjovi joined #git
09:25 ispn joined #git
09:26 kurkale6ka joined #git
09:26 JanC joined #git
09:28 tvw joined #git
09:28 acetakwas joined #git
09:29 theoceaniscool joined #git
09:32 doener joined #git
09:32 phanimahesh joined #git
09:32 aidalgol joined #git
09:34 nettoweb joined #git
09:35 govg joined #git
09:37 JeroenT joined #git
09:38 holgersson joined #git
09:39 kevleyski joined #git
09:40 Shashikant86 joined #git
09:42 pietv joined #git
09:43 a_thakur joined #git
09:43 m4sk1n joined #git
09:46 timvisher joined #git
09:46 mentazoom joined #git
09:46 t0by joined #git
09:46 t0by joined #git
09:47 Gloomy joined #git
09:48 Tobbi joined #git
09:48 xall_ joined #git
09:53 gajus joined #git
09:54 finalbeta joined #git
09:55 chll_ joined #git
09:56 dersand joined #git
09:57 overlord_tm joined #git
09:59 sunri5e joined #git
09:59 JuliusN joined #git
10:00 mischat joined #git
10:01 andrew710 joined #git
10:03 rnsanchez joined #git
10:07 Serpent7776 joined #git
10:08 mischat joined #git
10:09 cdown joined #git
10:09 Tobbi joined #git
10:13 thiago joined #git
10:15 phanimahesh joined #git
10:17 a_thakur joined #git
10:17 marcogmonteiro joined #git
10:20 mrkake joined #git
10:20 timvisher joined #git
10:21 sawk joined #git
10:22 davimore_ joined #git
10:22 chandu20 joined #git
10:30 blackwind_123 joined #git
10:33 aw1 joined #git
10:36 msonntag joined #git
10:36 nanga joined #git
10:36 PCatinean joined #git
10:38 hahuang61 joined #git
10:43 DrSlony left #git
10:45 GavinMagnus joined #git
10:46 a_thakur joined #git
10:46 mablae joined #git
10:48 xall joined #git
10:51 afuentes joined #git
10:51 King_Hual joined #git
10:51 King_Hual joined #git
10:53 astrofog joined #git
10:54 rajat joined #git
10:56 robotroll joined #git
10:57 dsdeiz joined #git
10:57 dsdeiz joined #git
10:58 mischat_ joined #git
10:58 minikN joined #git
10:59 timvisher joined #git
11:00 overlord_tm joined #git
11:03 mkoskar joined #git
11:03 msonntag joined #git
11:04 Shashikant86 joined #git
11:04 ubereber joined #git
11:05 ubereber good morning
11:06 YuGiOhJCJ joined #git
11:06 ubereber [politely lurking not to interupt anyone]
11:07 King_Hual joined #git
11:07 Tobbi joined #git
11:09 g105b How does one politely lurk?
11:09 ubereber lol ...was just making sure noone was in a deep conversation
11:10 tobiasvl nobody's talking ;)
11:10 ubereber ok here is my question
11:10 tobiasvl this channel is well trained in keeping many simultaneous conversations anyway
11:10 tobiasvl shoot
11:10 ubereber User A uses only windows no git
11:10 ubereber User B gets a copy once per month of User A's directory
11:10 Snugglebash joined #git
11:11 ubereber this copy is then used to update user Bs folders
11:11 ubereber I cant seem to find how git handles this situation
11:11 ubereber will all the files need to be re added to the repo
11:11 tobiasvl so far you haven't mentioned how git even enters the equation here
11:11 ubereber will the files changed be able to be undone
11:11 ubereber I am trying to make a case to use git for the entire office
11:12 tobiasvl OK… but what situation are you asking how git handles?
11:12 ubereber a graphic file is change (autocad) by the windows user
11:12 ubereber I get the changed graphic file ...git will recognize the change I assume
11:13 ubereber so i guess I add it back in ...?
11:13 tobiasvl where is the git repo? you haven't mentioned a git repo yet!
11:13 tobiasvl also, is AutoCAD a binary file format? if so, !binary applies
11:13 gitinfo Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions
11:13 ubereber git repo is in an identical windows file directory
11:15 p53ud0nym !annex
11:15 gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
11:15 intellix joined #git
11:16 ubereber ty for the urls ...have opened them for reading
11:16 ubereber also so lets say we are dealing with only text files now
11:16 ubereber User A only windows User B uses git
11:17 ubereber User A copies all text files in his directory to user Bs
11:17 ubereber to git are the files changed ? like is part of the copy date part of the Sha?
11:17 tobiasvl yes, to git the files are changed
11:18 sgfgdf joined #git
11:18 tobiasvl there's no copy date, not sure what you mean by that
11:18 tobiasvl user A or B will need to add and commit the changed files in the repo
11:18 tobiasvl at which point a commit will be created, with a SHA and a date
11:18 ubereber file 1 has not changed but was copied over the file 1 tracked by git by user B
11:18 mehola joined #git
11:19 ShalokShalom joined #git
11:19 tobiasvl then it has not changed, from git's perspective
11:19 ShalokShalom hi there
11:19 ShalokShalom i setup a git repo with initial license and readme files
11:19 ShalokShalom how can i pull an local git repo to it?
11:20 ShalokShalom which i created localy with git init
11:20 tobiasvl ShalokShalom: so you created two local git repos?
11:20 ubereber tobiasv1 thankyou ...and thankyou gitinfo I will go read your articles ...have a great day
11:20 gitinfo ubereber: you're welcome, but please note that I'm a bot. I'm not programmed to care.
11:21 ubereber lol
11:21 sgfgdf hello, guys! i have the following problem. i have a develop (which was the same as master before starting work) branch with some feature branches merged in with --no-ff option. now i need to create a new one with start point master and apply only a set of features on it. is that possible to achieve with cherry-pick, but not manually cherry-picking all commists but instead only the merge commits?
11:23 King_Hual joined #git
11:23 tobiasvl sgfgdf: yes. you will need to tell git which parent to use as the base when cherry-picking a merge commit with --mainline
11:24 dsdeiz joined #git
11:24 dsdeiz joined #git
11:24 bongjovi joined #git
11:28 fakenerd joined #git
11:28 ramsub07 joined #git
11:31 brent__ joined #git
11:32 s2013 joined #git
11:33 dwmw2_gone joined #git
11:33 krs93 joined #git
11:35 ShalokShalom tobiasvl: nope
11:35 ShalokShalom why two?
11:35 ShalokShalom i created one local git repo with git init
11:35 ShalokShalom and one on the gitea webserver
11:35 ShalokShalom which contains 2 files and they prevent git from push
11:36 DrAwesome joined #git
11:36 rchavik joined #git
11:36 _ikke_ ShalokShalom: probably because creating the repo on gitea also comitted something in it?
11:36 minikN joined #git
11:37 tobiasvl ShalokShalom: ah, you never mentioned a web server
11:37 Balliad joined #git
11:39 jameser joined #git
11:39 GavinMagnus joined #git
11:40 ShalokShalom joined #git
11:40 JeroenT joined #git
11:41 JeroenT joined #git
11:41 ShalokShalom tobiasvl: yeah, correct
11:41 ShalokShalom a git repo is a repo on a webserver to me, my mistake
11:42 ShalokShalom _ikke_: yes
11:42 ShalokShalom the question is, how i can merge them now
11:42 ShalokShalom or call it as you want
11:42 ShalokShalom i am new to git
11:42 NwS joined #git
11:42 _ikke_ ShalokShalom: I guess you want to 'overwrite' what the remote repo has?
11:43 ShalokShalom remote repo is that one on the server?
11:43 _ikke_ yes
11:43 Snugglebash joined #git
11:43 ShalokShalom nope, i created this readme and license for a reason
11:43 ShalokShalom both solutions are fine to know
11:43 ShalokShalom overwrite and merge
11:44 ShalokShalom i already run git init, git add . and git commit -am "message"
11:44 joki joined #git
11:45 _ikke_ You want to rebase your local commit on top of the commit created on the remote repo
11:45 ShalokShalom hnn
11:46 ShalokShalom i think git init was needless, or?
11:46 Anja joined #git
11:46 ShalokShalom i just like to push my local files to the web server
11:46 jameser joined #git
11:46 _ikke_ ShalokShalom: I gather you already connected your local repository to the remote one? (git remote add ...)
11:47 ShalokShalom nope
11:47 timvisher joined #git
11:50 JeroenT joined #git
11:51 Impaloo joined #git
11:51 _ikke_ That's the first step then
11:51 phanimahesh joined #git
11:51 _ikke_ git remote add <name> <clone url>
11:52 ertesx joined #git
11:52 ShalokShalom dont work
11:52 ShalokShalom which name?
11:52 ShalokShalom of local repo or server one?
11:52 _ikke_ you can decide yourself
11:52 ShalokShalom nope
11:53 _ikke_ origin is the default name git uses
11:53 borkr joined #git
11:53 ShalokShalom might be, that huge letter on the beginning dont work?
11:53 ShalokShalom because it does now
11:53 ShalokShalom and now?
11:54 MineCoins joined #git
11:54 _ikke_ git fetch <name>
11:55 minikN joined #git
11:55 ShalokShalom yep
11:55 ShalokShalom done
11:56 ShalokShalom push now?
11:56 ShalokShalom or merge?
11:57 _ikke_ how did you call the remote?
11:58 ShalokShalom git remote add test https://try.gitea.io/ShalokShalom/Test2
11:59 _ikke_ try git rebase test/master
11:59 cdown joined #git
11:59 romerocesar joined #git
12:00 Laurenceb__ joined #git
12:00 ShalokShalom ok?
12:00 ShalokShalom worked
12:00 ShalokShalom all is local now
12:01 Tobbi joined #git
12:01 JeroenT_ joined #git
12:01 intellix joined #git
12:02 JeroenT__ joined #git
12:03 PinealGlandOptic joined #git
12:03 ShalokShalom yes
12:03 ShalokShalom git push --set-upstream test master did it
12:03 ShalokShalom thanks a lot
12:03 PinealGlandOptic hi everyone! what is most correct way to disallow non-utf8 files in commits? some kind of hook?
12:06 phanimahesh joined #git
12:07 mischat joined #git
12:07 cyan__ joined #git
12:10 bremner regular beatings.
12:11 bremner more seriously, a pre-commit hooks sounds plausible
12:11 PinealGlandOptic bremner: is there some popular script? maybe built-in?
12:12 bremner no idea. So far the beatings are working for me.
12:12 thiago joined #git
12:12 JeroenT joined #git
12:13 msonntag joined #git
12:14 jameser joined #git
12:16 PinealGlandOptic also: one contributor pushed commit with Latin1 characters (diacritics, etc), and now on my side these changes are still "not staged for commit". why?
12:17 * PinealGlandOptic can't commit them
12:18 PinealGlandOptic git diff shows all lines are different, but visually they are the same
12:19 ShalokShalom _ikke_: thanks for your help
12:19 ShalokShalom i try to reproduce it now
12:19 Tobbi joined #git
12:19 ShalokShalom and git rebase test2/master give me:
12:19 ShalokShalom fatal: Needed a single revision
12:21 str joined #git
12:22 Snugglebash joined #git
12:22 jas4711 joined #git
12:23 _ikke_ ShalokShalom: It means it does not know test2/master
12:23 _ikke_ did you add test2 as a remote, and did you fetch?
12:27 ShalokShalom yep
12:27 _ikke_ ShalokShalom: what does git branch -r return?
12:28 aax joined #git
12:28 ShalokShalom [shalokshalom@elitebook8570p knowthelist-git]$ git branch -r
12:28 ShalokShalom knowthelist/master
12:28 ShalokShalom knowthelist = test2
12:29 tobiasvl then you did not add test2 as a remote, you added knowthelist as a remote?
12:29 Squarism joined #git
12:29 ShalokShalom yep
12:29 tobiasvl what do you mean by "knowthelist = test2"
12:29 ShalokShalom i simply named it test2 here in chat
12:29 ShalokShalom in order to avoid confusion
12:29 ShalokShalom *failed :D
12:29 tobiasvl ok… then you obviously have to do git rebase knowthelist/master
12:29 ShalokShalom yep, exactl
12:30 ShalokShalom [shalokshalom@elitebook8570p knowthelist-git]$ git rebase knowthelist/master
12:30 ShalokShalom fatal: Needed a single revision
12:31 Tobbi joined #git
12:31 rivarun joined #git
12:31 notebox joined #git
12:33 ShalokShalom what to do now?
12:33 timvisher joined #git
12:34 _ikke_ what does git rev-parse knowthelist/master return?
12:34 fuchstronaut I have a branch 'feature' on top of master. Now the feature is completed and I tried to merge the feature branch into master ("git checkout master; git merge feature"). Git tells me, that this is something that can not be merged
12:34 fuchstronaut How can I fast forward master to feature?
12:35 Squarism Say you have tasks 1 to 10. Each having its own pull request. Starting with 1 and continuing in ascending order. On task 2-3 it starts to get apparent that some of the "base" work that yo've done is required in all of the tasks. How would you tackle it? A. Revert the branches you pushed and create a new "base" branch that you then merge into all the rest. B. merge the branches you already pushed into
12:35 Squarism consecutive tasks. Kind of messy but easiest from a implementation perspektive - less nice for whoever is Reviewing your pull requests
12:35 tobiasvl fuchstronaut: what do you mean "on top of master"? and what did git actually tell you?
12:35 ShapeShifter499 joined #git
12:37 phanimahesh joined #git
12:37 fuchstronaut tobiasvl: the feature branch is a couple of commits on top of master. so they are in the same "line". Git tells me "merge: feature - not something we can merge"
12:37 fuchstronaut actually I think this is the most simple scenario
12:38 fuchstronaut since theere is nothing to merge, I think I just have to move that master tip up to the tip of the feature branch
12:38 mage__ left #git
12:38 tobiasvl fuchstronaut: yeah, that should fast-forward without problems… you're sure you're running the exact command "git checkout master; git merge feature"?
12:38 ShalokShalom _ikke_: f8fca796a6b92b90e47b94c6a373fcac13992ab6
12:39 tobiasvl fuchstronaut: what happens if you "git checkout feature"?
12:39 hahuang61 joined #git
12:40 FilipNortic_ joined #git
12:40 fuchstronaut Im such a fkn tool
12:40 JeroenT joined #git
12:40 fuchstronaut misstyped feature ... each time
12:40 fuchstronaut sorry
12:40 tobiasvl haha. np
12:44 jast fuchstronaut: set up Git autocompletion for your shell and it won't happen again :)
12:46 JeroenT joined #git
12:48 manuelschneid3r joined #git
12:48 joco42 joined #git
12:49 notebox joined #git
12:49 pabs3 joined #git
12:49 noecc joined #git
12:50 jameser joined #git
12:50 pabs3 would the git protocol allow one to do something like `git describe` on a remote repo without cloning it?
12:51 Doginal joined #git
12:51 theoceaniscool joined #git
12:51 selckin ls-remote maybe
12:52 jast nothing quite like describe, I think
12:52 ReptilianBrain joined #git
12:53 chandu20 joined #git
12:55 strk joined #git
12:55 strk say I `git svn clone`d from http://, can I later switch to https:// or would that fail to determine common roots due to change in metadata ?
12:58 Shashikant86 joined #git
12:58 * strk found http://www.freelancingdigest.com/articles/git-svn-switch-to-a-different-a-svn-url/
12:59 hhee joined #git
12:59 nowhere_man joined #git
12:59 jast there's another way that involves setting rewriteRoot
13:01 ShalokShalom_ joined #git
13:01 govg joined #git
13:03 strk yep, rewriteRoot sounds safer
13:04 Panacea joined #git
13:04 chandu20 joined #git
13:05 Celelibi Is there a shorthand for "git rebase --onto master config modifs" when the modifs is already checked out?
13:05 mischat_ joined #git
13:06 strk uhm, but adding a rewriteRoot ends up hanging even on `git svn info`
13:06 Celelibi Or a shorthand for "git checkout config; git rebase master"?
13:06 Celelibi I'm not a big fan of the syntax of rebase.
13:07 jameser joined #git
13:08 ^7heo Celelibi: can't you use the ~/.gitconfig file for that?
13:08 ^7heo in the [alias] section, you can place aliases.
13:10 notebox joined #git
13:10 Mobutils joined #git
13:11 aw1 joined #git
13:11 GodGinrai joined #git
13:13 Tobbi joined #git
13:13 chandu20 joined #git
13:13 boombatower joined #git
13:13 DistantStar joined #git
13:14 timvisher joined #git
13:14 synthroid joined #git
13:15 jeffreylevesque_ joined #git
13:18 strk ok, now it works, rewriteRoot was a perfect solution :)
13:18 hio joined #git
13:19 YourTheBombNow23 joined #git
13:19 hio my git isnt working!!! buggy software!
13:19 Wulf hio: haha ;P
13:19 Wulf hio: got details?
13:19 hio Wulf, not a joke!! it downloads forever, 80 megabyte already on a 20MB project
13:20 Wulf hio: git-clone?
13:20 Learath2 joined #git
13:20 hio yeah
13:20 Wulf hio: lots of history to download
13:20 Wulf hio: be patient
13:20 hio what do you mean
13:20 hio i had a video file checked in accidentally but i deleted it already
13:20 hio it shouldnt download it again
13:21 Wulf hio: did you rewrite the history?
13:21 hio no
13:21 Wulf hio: then it's still there
13:21 hio what the hell? why?
13:21 Wulf working as intended.
13:21 hio are you saying that every file i ever committed will be saved forever? wouldnt that make my repos really huge quickly?
13:22 themill that is git's job, yes
13:22 hio how do i delete the video forever
13:22 Wulf hio: rewrite the history
13:22 Wulf !rewrite
13:22 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
13:23 hio i didnt understand any of that
13:23 JeroenT joined #git
13:23 tobiasvl hio: git is a system to keep track of changes to a project. to do that it needs to retain all previous states of the projects.
13:23 hio i deleted the video in a single commit, isnt there a command that just deletes that commit from history?
13:23 tobiasvl so the entire point of git is to keep a file you added to it
13:24 achadwick joined #git
13:24 Wulf hio: if you have commits A -> B -> V -> C -> D -> E -> F  where "V" is your video, you would have to remove everything after B and recreate it. A -> B -> C' -> D' -> E' -> F'
13:25 Wulf hio: and tell everyone to go along with this.
13:26 hio im the only developer, i have only this: AddVideo->RemoveVideo
13:26 pabs3 take a look at git-annex if you want to deal with big data and have it go away when you delete it. with git-annex only the meta-data is stored permanently
13:26 hio guys i dont have time for all this stuff omg
13:26 Mobutils_ joined #git
13:27 hio how hard can it be to delete a video from history that i JUST added 5min ago
13:27 tobiasvl hio: it's hard because you have to rewrite the history of the repo.
13:27 pabs3 easy, just git rebase -i <commit before you added the video>
13:27 canton7 hio, !bfg
13:27 gitinfo hio: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
13:29 hio GIT IS BROKEN NOW
13:29 serialoverflow joined #git
13:29 hio i closed the window when i rebased and now it's all messed up
13:30 hio pabs3, i only have 2 commits and the one with the video has lots of other files
13:30 fenglei joined #git
13:30 pabs3 first commit is adding all the video, second commit is deleting the video?
13:31 pabs3 personally I would delete .git and start from scratch using git-annex or similar
13:31 hio abort: Error occurred while trying to abort a rebase: Could not find 'D:/myproject/.git/rebase-merge/end' to stat: The system cannot find the file specified.
13:31 roelmonnens joined #git
13:31 hio usability of git is a NIGHTMARE
13:32 pabs3 yeah, sounds like you just want a plain directory, not a version controlled one
13:32 douglascorrea joined #git
13:32 brent__ joined #git
13:32 selckin !reflog
13:32 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
13:33 treia joined #git
13:33 Tobbi joined #git
13:35 Gamecubic joined #git
13:35 azerus joined #git
13:35 Celelibi ^7heo: It was more a general question about the pattern of the rebase commands than about those exact commands.
13:36 Celelibi BTW, git stash doesn't seem very good at handling file removal.
13:36 hio joined #git
13:36 tobiasvl hio: I recommend you read a !book about git to get a feel for what it actually is
13:36 gitinfo hio: 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
13:38 DARSCODE joined #git
13:39 lindenle joined #git
13:41 sdothum joined #git
13:41 DARSCODE joined #git
13:42 hio tobiasvl: the problem is git, not me
13:43 hio obviously if i have limitless amounts of time i can figure out how to rebase my history. that really wasnt the point
13:43 tobiasvl OK, not sure what the point was then.
13:44 jeffreylevesque joined #git
13:44 hio point is that i need some serious porcelain
13:44 selckin git is not for you, find another tool
13:46 tobiasvl hio: if you have other questions beyond "why does git not offer a single line command that removes a file from history", feel free to ask them
13:46 tobiasvl we're here to help, but flaming is not necessary.
13:48 tobiasvl or that
13:48 canton7 he's a known troll from another channel, btw
13:48 canton7 not saying he was trolling then, but I've banned him from other channels a few times
13:48 tobiasvl aha
13:49 unbalanced joined #git
13:50 Snugglebash joined #git
13:50 timvisher joined #git
13:50 Ryanar joined #git
13:51 notebox joined #git
13:51 Arban What's a good solution for that kind of stuff anyway? When you have a project consisting of mostly code, but some huge files that don't really need a VCS?
13:52 tobiasvl Arban: !annex
13:52 gitinfo Arban: git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
13:52 Arban Oh. Thanks.
13:53 pabs3 left #git
13:54 ashokrajar joined #git
13:55 Tobbi joined #git
13:56 ssitani joined #git
13:58 ashokrajar joined #git
13:58 GodGinrai joined #git
13:59 chandu20 joined #git
14:04 suttonwilliamd joined #git
14:09 rafalcpp joined #git
14:10 thiago joined #git
14:10 thiago joined #git
14:11 rasto joined #git
14:14 ramsub07 joined #git
14:14 jimi_ joined #git
14:14 pR0Ps joined #git
14:15 jimi_ joined #git
14:19 cdown joined #git
14:21 timvisher joined #git
14:21 ashokraj_ joined #git
14:23 cdg joined #git
14:24 strk left #git
14:26 todd_dsm joined #git
14:29 Eryn_1983_FL joined #git
14:31 theonefoo joined #git
14:31 ShekharReddy joined #git
14:35 canuk joined #git
14:35 Dougie187 joined #git
14:36 JeroenT joined #git
14:39 dodobrain joined #git
14:39 yehowyada joined #git
14:40 hahuang61 joined #git
14:45 ThumbBone joined #git
14:45 ShapeShifter499 joined #git
14:45 tvw joined #git
14:45 mischat joined #git
14:47 ThumbBone anyone ever run into any issues with using "git revert --no-commit <commit-hash>" to bring back your project to a certain snapshot?
14:47 jast revert doesn't actually go back to that version, it undoes the changes made in that one commit
14:48 nettoweb joined #git
14:48 ikelso joined #git
14:49 bannakaffalatta joined #git
14:49 pity joined #git
14:49 timvisher joined #git
14:49 nckpz joined #git
14:51 ash_workz joined #git
14:54 ThumbBone jast: by "going back" you mean checking out and bring the HEAD to that commit?
14:55 tobiasvl ThumbBone: the more salient questions is what YOU mean :)
14:55 jarshvor joined #git
14:55 tobiasvl what do you wish to achieve? !revert
14:55 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
14:56 tobiasvl ThumbBone: and to check out and bring the HEAD to a commit, "git checkout $commit" (will detach HEAD)
14:58 nickabbey joined #git
14:58 ThumbBone The status is everything is commited, nothing in staging, what I want is 'reverting' (as in the english word, not what git revert is supposed to mean) the state of my project back to that commit. If by that it means undoing all the changes passed that commit without deleting the history, then yes that's what I want
14:58 chipotle joined #git
14:59 tobiasvl ThumbBone: OK, then you probably want option e) in gitinfo's reply above, then
14:59 tobiasvl oh, without deleting history you say
15:00 tobiasvl then you don't want option e)
15:00 Shashikant86 joined #git
15:00 ThumbBone tobiasvl: no but with reset I lose the commits, doing git revert this way keeps all the change history
15:00 tobiasvl yep, revert is fine then
15:00 ThumbBone tobiasvl: yup
15:01 tobiasvl then what issues are you encountering with revert?
15:01 ThumbBone tobiasvl: the thing is a tested it in a single branch and it works fine, but I don't know how this would react with a branch with a bunch of merges, would I run into any issues
15:01 MineCoins joined #git
15:01 ThumbBone *I tested
15:02 tobiasvl ThumbBone: if you're reverting merge commits, and you later want to reintroduce the commits merged in by the merges you revert, read !faulty_merge
15:02 gitinfo ThumbBone: 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
15:02 tobiasvl otherwise it should be fine
15:03 whitby joined #git
15:03 mgedmin one way of getting things to be like they were in commint <oldhash>, while keeping full history, is to git checkout <oldhash> . && git commit -am "revert to the way things were in <oldhash>"
15:04 GavinMagnus joined #git
15:04 ThumbBone tobiasvl: great thanks for the link
15:05 moei joined #git
15:05 jast as far as I know, 'git checkout .' doesn't remove files that didn't exist in that old version, so careful with that for restoring old versions :)
15:06 finalbeta joined #git
15:06 ThumbBone yes, checkout is not what I want in this case
15:08 YourTheBombNow23 joined #git
15:09 parasite_ joined #git
15:10 Gsham joined #git
15:10 sdothum joined #git
15:10 interrobangd joined #git
15:11 LeBlaaanc joined #git
15:12 Sonderblade joined #git
15:12 ResidentBiscuit joined #git
15:13 voldz1tic3n joined #git
15:14 jave joined #git
15:16 JanC_ joined #git
15:17 timvisher joined #git
15:17 [0xAA] joined #git
15:18 Es0teric joined #git
15:18 _nwkj86 joined #git
15:18 yanope joined #git
15:18 tvw joined #git
15:18 d10n-work joined #git
15:18 d10n-work joined #git
15:18 ronskisika joined #git
15:18 rivarun joined #git
15:18 berndj joined #git
15:18 Nugget_ joined #git
15:18 ^7heo_ joined #git
15:18 _geoff joined #git
15:18 Walex2 joined #git
15:18 TyrfingM1olnir joined #git
15:18 cxreg2 joined #git
15:18 Jupelius_ joined #git
15:18 Jonno_FT1 joined #git
15:18 styx___ joined #git
15:18 hegge joined #git
15:18 tokkee joined #git
15:18 sunny256_ joined #git
15:18 Slush-_ joined #git
15:18 meLon_ joined #git
15:18 nevyn_ joined #git
15:18 plasticb1y joined #git
15:18 avarab joined #git
15:18 avarab joined #git
15:18 babilen_ joined #git
15:18 Knirch_ joined #git
15:18 trondth_ joined #git
15:18 doppo_ joined #git
15:18 souther_ joined #git
15:18 PaulePan1er joined #git
15:18 colona_ joined #git
15:18 mikap joined #git
15:18 d1b_ joined #git
15:18 ftoulemo1 joined #git
15:18 rt joined #git
15:18 comps_ joined #git
15:18 exounx joined #git
15:18 brewmast1r joined #git
15:18 finalbeta joined #git
15:18 tier2vil1ain_ joined #git
15:19 axisys_ joined #git
15:19 rchavik joined #git
15:19 brandonw joined #git
15:19 doener_ joined #git
15:19 Ratler joined #git
15:19 uidzer0 joined #git
15:19 fscala joined #git
15:19 Zarthus joined #git
15:19 MillerBoss joined #git
15:19 dustinm joined #git
15:19 sysanthrope joined #git
15:19 hwoarang joined #git
15:19 trelane joined #git
15:19 trelane joined #git
15:19 guardian joined #git
15:19 hide joined #git
15:19 Bigcheese joined #git
15:19 CussBot joined #git
15:19 gigq joined #git
15:19 jor joined #git
15:19 uranellus joined #git
15:19 nephyrin joined #git
15:19 Spydar007 joined #git
15:19 uranellus joined #git
15:19 RickyB98 joined #git
15:19 Spydar007 joined #git
15:19 RickyB98 joined #git
15:19 iamthad joined #git
15:19 HedgeMage joined #git
15:19 pepijndevos joined #git
15:19 sim642 joined #git
15:19 CustosLimen joined #git
15:19 oaao joined #git
15:19 concerti joined #git
15:19 Mindi joined #git
15:19 XVar joined #git
15:19 cdown joined #git
15:19 jozwior__ joined #git
15:19 deepy joined #git
15:19 jwest joined #git
15:19 glebihan joined #git
15:19 nioncode joined #git
15:19 pingwindyktator joined #git
15:19 bathtub_shark joined #git
15:19 tabakhase joined #git
15:19 synchronous joined #git
15:19 sparr joined #git
15:20 Exagone313 joined #git
15:20 prg318 joined #git
15:20 quite joined #git
15:20 fus joined #git
15:20 Hogofwar joined #git
15:20 Ankhers joined #git
15:20 meZee joined #git
15:20 robattila256 joined #git
15:20 Cathy joined #git
15:20 simon816 joined #git
15:20 mehola joined #git
15:20 BackEndCoder joined #git
15:20 boubou joined #git
15:20 drawkula joined #git
15:20 ulkesh_ joined #git
15:20 demize joined #git
15:20 thallada joined #git
15:20 CtrlC joined #git
15:20 CtrlC joined #git
15:20 nuck joined #git
15:20 RiPer joined #git
15:20 rideh joined #git
15:20 ugjka joined #git
15:20 Ring0` joined #git
15:21 pitastrudl joined #git
15:21 Squarism can you rebase a branch onto master(a branch) if you have both staged and unstaged changes?
15:21 linuxmodder joined #git
15:21 unclechu joined #git
15:21 kenansulayman joined #git
15:21 pkiller joined #git
15:21 maxorator joined #git
15:21 _cyril_ joined #git
15:21 LeBlaaanc joined #git
15:21 AlHafoudh joined #git
15:22 saidelike joined #git
15:22 Neico joined #git
15:22 da5id joined #git
15:22 SpeakerToMeat joined #git
15:22 MatthewAllan93 joined #git
15:22 ketas joined #git
15:22 filcab joined #git
15:22 Hedgework joined #git
15:22 ThomasLocke joined #git
15:22 jost_ joined #git
15:22 hallogallo[m] joined #git
15:22 UncleCJ joined #git
15:22 monomon[m] joined #git
15:22 kikijiki[m] joined #git
15:22 Sheogorath[m] joined #git
15:22 dhollinger joined #git
15:22 Nevik joined #git
15:22 unbalancedparen joined #git
15:22 Caelum joined #git
15:22 jgrasser joined #git
15:22 fragMental joined #git
15:22 Random832 joined #git
15:22 Dazzyp joined #git
15:22 jwmann joined #git
15:22 bsanford_ joined #git
15:22 ninsei joined #git
15:22 raatiniemi joined #git
15:22 ensign_ joined #git
15:22 bl0m1_ joined #git
15:22 chrysaor joined #git
15:22 jgornick_ joined #git
15:22 qlkzy_ joined #git
15:22 Boniche joined #git
15:22 h12o joined #git
15:22 tapout joined #git
15:22 andres joined #git
15:22 da5id joined #git
15:22 filcab joined #git
15:23 HalfEatenPie joined #git
15:23 h12o_ joined #git
15:23 tjbp joined #git
15:23 davidstrauss joined #git
15:23 douglascorrea joined #git
15:23 DelphicOkami joined #git
15:23 cttttt joined #git
15:23 jgornick joined #git
15:23 whitby Squarism: --autostash might be what you're looking for
15:23 bannakaffalatta joined #git
15:23 MatthewAllan93 joined #git
15:23 unbalancedparen joined #git
15:23 Random832 joined #git
15:23 bauruine joined #git
15:23 McKraken_zzzzz joined #git
15:23 giraffe joined #git
15:23 SpeakerToMeat joined #git
15:23 styx_ joined #git
15:23 Caelum joined #git
15:23 Squarism in feature : git rebase master --autostash ?
15:23 Squarism whitby, ?
15:23 whitby Should work, yeah
15:23 Karazhan joined #git
15:24 johnnyfive joined #git
15:24 ToeSnacks joined #git
15:24 geoid_ joined #git
15:24 LionsMane joined #git
15:25 wenzowski joined #git
15:25 michael_mbp joined #git
15:25 ketas joined #git
15:25 CEnnis91 joined #git
15:25 TomyWork is there a way to atomically create an annotated tag and push it, along with a branch deletion?
15:25 dwts joined #git
15:25 _ikke_ TomyWork: Sounds like something for an alias
15:25 whitby Or a Bash function, yeah
15:25 TomyWork For regular tags, I have this: git push --atomic "$remote" "$remote"/"$branch":refs/tags/"$prefix""$branch""$suffix" :refs/heads/"$branch"
15:25 kutenai joined #git
15:26 _ikke_ right, but an anotated tag involves more than just creating refs
15:26 TomyWork yeah
15:26 TomyWork can i create an annotated tag without tagging it? :)
15:26 m4sk1n joined #git
15:26 snowkidind joined #git
15:26 phtes joined #git
15:26 daxroc joined #git
15:26 whitby Uhhh I don't think so
15:26 prosody joined #git
15:26 whitby What would that look like?
15:26 _ikke_ probably with plumbing tools
15:26 TomyWork i.e. just get the sha1 of the annotated tag object
15:27 nsh joined #git
15:27 DuncanT joined #git
15:27 _ikke_ you can use git hash-object -w to create them
15:27 chigang joined #git
15:27 _ikke_ If you know the format
15:27 parliament joined #git
15:27 Dougie187 Like, create an orphaned tag?
15:27 TomyWork yeah
15:27 Travis-42 joined #git
15:27 timvisher joined #git
15:28 cloudcell_ joined #git
15:28 stoopkid joined #git
15:28 TomyWork _ikke_ that sounds rather fragile :)
15:28 dave0x6d joined #git
15:28 blacksyke joined #git
15:28 _ikke_ http://stackoverflow.com/10986615/
15:28 Lowell joined #git
15:28 suttonwilliamd joined #git
15:28 Dougie187 Well, I doubt many people want to make orphaned tags. :P
15:28 discopatrick joined #git
15:28 Dougie187 _ikke_: link is broken?
15:28 TomyWork _ikke_ the thing is, I want to atomically push that tag to the remote and have git throw it to the garbage collector if there are problems
15:28 kanzure joined #git
15:28 lolmac_ joined #git
15:29 ggherdov joined #git
15:29 _ikke_ https://stackoverflow.com/questions/10986615
15:29 _ikke_ Dougie187: I manually typed it :P
15:29 whitby From memory?
15:29 whitby Nice
15:29 _ikke_ whitby: From another PC :P
15:29 Dougie187 _ikke_: That'd do it. :P
15:30 MLM_ joined #git
15:30 elmcrest joined #git
15:30 _ikke_ But to push an annotated tag, it should be referenced anyway
15:31 _ikke_ TomyWork: Why not just create the tag and delete it afterwards?
15:31 zmachine joined #git
15:31 TomyWork _ikke_ i could do that...
15:31 TomyWork under a temporary name even
15:31 codedmart joined #git
15:31 johtso joined #git
15:31 timwis joined #git
15:31 TomyWork does the annotated tag care how it's named?
15:31 _ikke_ No, just regular branch / ref restrictions
15:32 TomyWork ah crap, it says "tag <tag-name>"
15:32 TomyWork in the tag
15:32 Dougie187 TomyWork: Couldn't you test it, by making an annotated tag, and a lightweight tag, and looking at what is created?
15:32 ggherdov joined #git
15:32 _ikke_ A lightweight tag is just a ref (refs/tags/<name>) pointing to a commit
15:32 _ikke_ an annotated tag is a tag object, pointed to by a tag ref
15:33 Shashikant86 joined #git
15:33 Dougie187 Sure, but I mean to see how to create them.
15:33 Dougie187 Either way they are refs.
15:33 _ikke_ annotated tag is an object + ref
15:33 Dougie187 Oh, right. ok
15:34 Dougie187 So, he's making the object, not the ref (right now at least)
15:34 _ikke_ Dougie187: He's making a lightweight tag
15:34 mehdi___ joined #git
15:34 wizonesolutions joined #git
15:34 cstrahan joined #git
15:34 manveru joined #git
15:34 Dougie187 I'm confused then. He just asked if the annotated tag cares how it's named.
15:35 TomyWork Dougie187 and it does
15:35 angular_mike_ joined #git
15:35 arand__ joined #git
15:35 TomyWork git cat-file -p $tag says "tag blah" somewhere
15:35 al-damiri joined #git
15:36 freimatz Hi, i have a problem, a file obsesses me.
15:36 aw1 joined #git
15:37 unholycrab joined #git
15:37 TomyWork meaning what? :)
15:37 TomyWork do you want to get rid of it?
15:37 TomyWork !bfg
15:37 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
15:37 tharuin joined #git
15:37 gugah joined #git
15:37 Seveas Or do you want to stalk it?
15:37 Dougie187 Take pictures of it.
15:37 timini joined #git
15:38 Dougie187 Get it's phone number. :P
15:38 timini Hey. How can I find all commits in one branch that do not conflict with the tip oof another branch ?
15:38 freimatz the file is named "TestWenzelCaa.res" and part of the project .gitignore as "*.res" and of a global .gitignorefile. sourcetree shows this file as unstaged
15:38 freimatz the file is part of a submodule
15:39 AaronMT joined #git
15:39 Seveas git never ignores files it tracks, gitignore only applies to untracked files.
15:39 freimatz the file is created during the make process
15:39 _ikke_ And it also does not apply across submodules
15:40 selckin gitignore is also ignored until the gitingore files is committed
15:40 freimatz oh i'm wrong  - i mean untracked, not unstaged
15:40 _ikke_ selckin: false
15:40 _ikke_ git reads it from the working tree
15:40 freimatz git status: ... modified:   src/MeasCtrl/Device/Driver/CAA/Wenzel (new commits, untracked content) ...
15:40 selckin my tests say otherwise
15:40 jgarr joined #git
15:40 _ikke_ selckin: check you test
15:41 Tobbi joined #git
15:41 lindenle joined #git
15:41 Seveas selckin: your test is faulty.
15:41 g105b joined #git
15:42 Seveas https://dpaste.de/mrEq
15:42 milkshoes joined #git
15:42 timini hey I want to get a list of commit which will conflict
15:42 Seveas freimatz: so, what's the problem?
15:42 selckin can't reproduce, but i'm really sure i've seen that behavior, maybe old version
15:43 gyre007 joined #git
15:43 msonntag joined #git
15:43 ulkesh joined #git
15:43 freimatz git shows the file as untracked content, but i want to ignore it
15:43 barq joined #git
15:43 whitby selckin: I don't think that is the case, even if the file is untracked it will affect Git
15:43 zivester joined #git
15:44 stealthii joined #git
15:44 Seveas freimatz: is it in the submodule's .gitignore?
15:44 freimatz no
15:44 Seveas add it there
15:44 freimatz the submodule don't have a .gitignore
15:44 fahadash joined #git
15:44 ianmethyst joined #git
15:45 netj joined #git
15:45 freimatz should i add one?
15:45 romerocesar joined #git
15:45 Seveas yeah
15:45 Seveas or, if you don't want to make changes to that submodule, in its .git/info/exclude
15:46 gajus joined #git
15:46 nostrora joined #git
15:46 Atemu joined #git
15:46 freimatz the submodule does noch have a .git folder, only a .git file
15:47 mischat_ joined #git
15:47 mischat_ joined #git
15:47 freimatz if i add a .gitignore, does is hide the .gitignore of the supermodule?
15:47 _ikke_ No, those two are separated
15:48 _ikke_ have nothing to do with eachother
15:48 zivester joined #git
15:48 _geoff joined #git
15:48 Seveas selckin: just tested with git 1.2.0, no change in behaviour.
15:48 danielmahon joined #git
15:48 _ikke_ wow, 1.2.0
15:49 _ikke_ the oldest tagged version, right?
15:49 theonefoo left #git
15:49 Seveas no, but 1.0.0 behaves differently
15:49 Seveas (as in: can't get status to work :))
15:49 Seveas 1.1.0 works, still respects an untracked .gitignore
15:49 _ikke_ So it's broken :P
15:50 freimatz hm after a "git submodule update --init" the wc is clean ... i have to do some further tests ...
15:50 grilled-cheese joined #git
15:51 grill_ joined #git
15:51 timini is there any way to test if a cherry-pick will cause a conflict
15:51 timini ?
15:51 anddam _ikke_: hey there
15:51 Seveas timini: yes, by doing the cherry-pick.
15:52 mgedmin you can add .gitignore to .gitignore
15:52 anddam _ikke_: in the end I messed up my pull/rebase thing yesterday, once again I duplicated lot of commits but this time I was smart enough to push on my own fork
15:52 mgedmin git will parse it, but it won't complain about an untracked .gitignore file
15:52 timini arrrg, really I want to check hundreds of commits
15:52 gabi_ joined #git
15:52 _ikke_ mgedmin: though .gitignore is meant to be tracked
15:52 timini so i guess i could run the cherry-pick, then abort it
15:52 menip joined #git
15:52 _ikke_ mgedmin: (there is .git/info/exclude if you want to have an untracked ignore file)
15:53 mgedmin as for .git/info/exclude, when .git is a file instead of a directory
15:53 _ikke_ mgedmin: You can add it in the location where the .git link file points to
15:53 Seveas timini: so? for commit in $(<commits); do git cherry-pick -n $commit || echo "Cherry pick $commit failed"; git reset --hard; done
15:53 mgedmin echo file-to-ignore >> $(git rev-parse --git-dir)/info/exclude
15:53 mgedmin I've a git exclude alias which does this
15:53 _ikke_ Seveas: wrong highlight
15:53 mgedmin best thing ever, highly recommended
15:53 jgarr anyone know if git clone --shared should create hardlinks on NFS mounted filesystems? From what I can tell it should work but in practice it doesn't create hardlinks (inodes of files are different)
15:53 Seveas timini: and in case git cherry-pick doesn't provide a useful exit code, parse git-status output
15:53 modin joined #git
15:54 Seveas _ikke_: ?
15:54 _ikke_ Seveas: sorry, my bad
15:54 Seveas ah. Thought I had gone crazy. Good to see it was you :)
15:54 mgedmin https://github.com/mgedmin/dotfiles/blob/master/gitconfig#L79
15:55 timvisher joined #git
15:55 _ikke_ Seveas: both your names (mgedmin and yours are green in my client, and it scrolled as I was reading, so I misattibruted what was being said by who)
15:56 Seveas mgedmin: your 'incoming' is broken I think. Should be ..@{u}
15:56 jgarr I know my NFS can create hardlinks (created manually with ln) but it doesn't appear git clone --shared is doing the right thing (having trouble debugging why)
15:56 Seveas mgedmin: and outgoing should use @{push} in triangular workflows :)
15:57 griffindy joined #git
15:58 Es0teric joined #git
15:58 pity joined #git
15:59 mgedmin do you know which git version introduced @{push}?
15:59 mgedmin because 1.9.1 doesn't understand it
15:59 aarobc joined #git
16:00 davidosomething joined #git
16:01 thierryp joined #git
16:01 mgedmin ah, 2.5.0
16:02 e14 joined #git
16:02 elect__ joined #git
16:03 osse git tag --contains $(git log --grep='@{push}' --format=%H --reverse | head -1) --sort=version:refname | head -1
16:03 osse Unfortunately the first commit to mention it says something about "in a future patch" but it gets it right :P
16:04 mmazing joined #git
16:04 mmazing i'm trying to use bfg to remove some sensitive data from a repo, it seems to have removed it from all branches as far as i can tell, but the file is still present in tags
16:04 roelmonn_ joined #git
16:06 osse mmazing: are they refs/tags/foo ? or somewhere else under refs?
16:07 HardlySeen joined #git
16:08 pepijndevos joined #git
16:08 Seveas mmazing: did your tags actually move?
16:09 Seveas I'm not sure if bfg moves tags. Also, already fetched tags won't be updated unless specifically fetched with git fetch --tags
16:09 snowkidind joined #git
16:09 crayon joined #git
16:09 thiago joined #git
16:10 parasite_ joined #git
16:10 osse docs say that it "rewrites your branches and tags" so I guess it should do so by default
16:10 osse hence my question
16:10 mmazing sec, looking into where exactly they are
16:10 BSab joined #git
16:11 Seveas mgedmin: one last thing: diff.compationHeuristic is already dead again in favour of an improved version.
16:11 mmazing oh ... do i need to have done like git push --tags ?
16:11 cdown joined #git
16:11 Seveas mmazing: yes, and everyone who ever fetched from you needs to fetch --tags
16:12 umpc joined #git
16:12 ashokrajar joined #git
16:12 anonymuse joined #git
16:12 mmazing error: --mirror and --tags are incompatible
16:12 mmazing hmmmm
16:13 Seveas --mirror pretty much implies --tags, so no need to use --tags
16:14 nscott76 joined #git
16:14 Electrometro joined #git
16:16 mgedmin Seveas: could you elaborate?  I remember adding that when I read about it being introduced, way before a git version that supports it percolated into my distro
16:17 Darren_ joined #git
16:17 TomyWork can i make git for-each-ref skip refs/remotes/origin/HEAD somehow, without external tools?
16:18 _ikke_ TomyWork: Not that I can see
16:18 dreiss joined #git
16:19 UnnamedPlayer joined #git
16:19 TomyWork k
16:21 worstadmin Can I tell mergetool to accept all their changes?
16:21 worstadmin I pop'd a stash and I want to just take all their changes
16:21 Snugglebash joined #git
16:21 * mgedmin googles up http://stackoverflow.com/a/41665589/110151
16:21 timvisher joined #git
16:23 TomyWork that's not mergetool, that's a merge strategy for git merge
16:23 Gsham joined #git
16:23 TomyWork worstadmin and you're not gaining anything by that. you're trashing changes that were made since the stash was created
16:25 nanga joined #git
16:25 nanga joined #git
16:27 thiago joined #git
16:27 jknetl joined #git
16:28 ianmethyst joined #git
16:29 msonntag joined #git
16:30 e14 joined #git
16:30 l33ch joined #git
16:32 a_thakur joined #git
16:32 mmazing joined #git
16:33 _geoff joined #git
16:33 mgoodwin This might sound strange but can I gitignore sub-repositories (i.e. so they don't show up as untracked folders)
16:34 Gloomy joined #git
16:34 osse mgoodwin: sure. ignore them like you would ignore a directory
16:35 s2013 joined #git
16:35 tvw joined #git
16:36 jozwior_ joined #git
16:36 Tobbi joined #git
16:38 timini hey I want to merge just one commit (not the latest) from one branch to another
16:38 whitby timini: cherry-pick
16:38 mgoodwin osse: ideally but that won't work in this case
16:38 timini it seems cherry-pick changes the SHA of the commit
16:39 osse mgoodwin: why?
16:39 osse timini: correct. it creates a new commit similar to the original
16:39 douglascorrea joined #git
16:39 worstadmin When you have a merge conflict after stash pop'ing and you run `git mergetool` what do REMOTE, BASE, LOCAL represent?
16:39 timini which means the origional commit is still show as unmerged
16:39 whitby timini: is that an issue? I don't think you'll be able to avoid it unless you can fast forward
16:39 worstadmin Is REMOTE the stashed version of the file?
16:39 osse timini: also correct
16:39 mgoodwin For this use case my worktree has to be / and I'm ignoring everything but what I want to track - except various git repos throughout the filesystem show up still and don't seem to be ignored based on normal rules (because they are git repos)
16:41 hahuang61 joined #git
16:41 mgoodwin I need a "ignore all subordinate git repos" option
16:41 osse mgoodwin: adding path/to/repo to .gitignore works just fine. I tested it right now
16:41 timini osse, whitby: so what is the solution to merge a commit from one branch  to another and then not have that commit show as a difference between the two?
16:42 osse timini: there is none. but it won't be a problem when you merge later on
16:42 overlord_tm joined #git
16:42 osse timini: and when you 'git diff branch1 branch2' that whole thing won't be shown
16:42 osse timini: you can use git-cherry to look for "similar" commits
16:43 timini OK looking for similar commits might be useful
16:43 whitby timini: if you have (A -> B -> C) on one branch and (A -> B -> C -> D -> E) on another and you want to merge D, then you can fast forward but if you want to "merge" just E, you will need to get a new SHA
16:43 timini When I merge will i have 2 commits with the same commit message?
16:44 PettanShoutaKun joined #git
16:44 PettanShoutaKun yyyyyyoooooooooooooooooooooo
16:44 PettanShoutaKun if I have branch A that was merged into master which contains branch A - B - C
16:44 timini whitby, ok thanks forthe explination
16:45 timini soif the commit dosn't ahve the same parent it will get a new SHA?
16:45 _ikke_ timini: correct
16:45 PettanShoutaKun or more like... if I have branch B that was merged into master A - B - C is there a way to "easily" remove all commits from B in master A - B - C
16:45 _ikke_ timini: the parent(s) are part of the data where the hash is calculated over
16:46 _ikke_ PettanShoutaKun: By 'removing' commit B
16:46 timini so if i have A -> B -> C and i rebase to A->C->B ..  C and B will get new SHAs ?
16:46 douglasc_ joined #git
16:46 _ikke_ yes
16:46 PettanShoutaKun lol... just picking out the single merge commit?
16:46 _ikke_ PettanShoutaKun: Sure
16:46 brent__ joined #git
16:46 _ikke_ That's the only thing that happens when you merge
16:46 _ikke_ A new merge commit is created with changes from both sides and both sides are parent
16:46 PettanShoutaKun but how do I drop just the merge commit?
16:47 PettanShoutaKun how do I figure out which parent was master and which one isn't
16:47 _ikke_ PettanShoutaKun: If you merge into master, then master is always the first parent
16:47 PettanShoutaKun but how do I pick apart the actual merge commit?
16:48 timvisher joined #git
16:48 PettanShoutaKun when I try to do a rebase and drop it.... I just end up with a list of the commits that the merge commit "tacks on"
16:48 madewokherd joined #git
16:49 kpease_ joined #git
16:49 e14 joined #git
16:50 _ikke_ Right, because the merged in commits will also be part of the todo list\
16:51 _ikke_ Not sure if there is an easy solution for that
16:51 _ikke_ except filtering out the commits that are on the secondary side of the merge
16:53 Snugglebash joined #git
16:53 shinnya joined #git
16:55 PettanShoutaKun is there a way to pull commits out of master and force people who have those commits locally to also drop those commits?
16:55 synthroid joined #git
16:56 shum joined #git
16:57 mp3 joined #git
16:57 GodGinrai joined #git
16:57 _ikke_ PettanShoutaKun: No automatic way
16:57 _ikke_ They need to do git pull --rebase
16:57 sdothum joined #git
16:57 _ikke_ on master
16:58 timini so if i have A -> B -> C and i rebase -i to A->C->B ..  C and B will get new SHAs ?
16:58 _ikke_ timini: 2nd time: yes
16:59 douglascorrea joined #git
16:59 mischat joined #git
16:59 rivarun joined #git
17:01 worstadmin When you have a merge conflict after stash pop'ing and you run `git mergetool` what do REMOTE, BASE, LOCAL represent?
17:02 PettanShoutaKun joined #git
17:03 bannakaffalatta joined #git
17:04 ssitani joined #git
17:05 azerus joined #git
17:05 _ikke_ local: changes in the work-tree
17:06 _ikke_ remote: changes from the stash
17:06 worstadmin Ah thank you
17:06 worstadmin BASE would be just the index then
17:07 ashokrajar joined #git
17:07 borkr joined #git
17:10 suy joined #git
17:10 pur3eval joined #git
17:10 ashokrajar joined #git
17:10 dreiss joined #git
17:10 Cavallari joined #git
17:13 jagob joined #git
17:14 Es0teric joined #git
17:15 invisbl joined #git
17:15 GodGinrai joined #git
17:15 timvisher joined #git
17:15 phanimah1sh joined #git
17:15 kyan joined #git
17:17 aard_ joined #git
17:18 e14 joined #git
17:18 nanga joined #git
17:18 nanga joined #git
17:19 monkeycat joined #git
17:20 timini hey so I want to move a bunch of commits from branch1 to dev, whats the best way to do this?
17:21 mehola joined #git
17:22 j416 timvde: merge or rebase or cherry-pick or reset.
17:24 chandu20 joined #git
17:25 Guest55 joined #git
17:26 anonymuse joined #git
17:27 elsevero joined #git
17:29 elsevero its possible to change a commit message of one commit ?
17:29 elsevero which is already on remote
17:29 _ikke_ possible: yes, sensible: it depends
17:32 lindenle joined #git
17:32 durham joined #git
17:32 kadoban joined #git
17:34 raedah joined #git
17:34 fscala joined #git
17:36 raspado joined #git
17:36 durham joined #git
17:37 nickabbey joined #git
17:37 mischat joined #git
17:41 [0xAA] joined #git
17:41 PettanShoutaKun joined #git
17:42 spacelord_ joined #git
17:42 msonntag joined #git
17:43 chardan joined #git
17:45 setuid joined #git
17:45 setuid I'm trying to pull some upstream source from a public git repo, using the git:// URI, but I'm behind a hostile set of proxies. I can tunnel out to outside hosts, so how do I trampoline my 'git clone' through an outside host?
17:47 hahuang61 joined #git
17:47 kadoban setuid: Can you just use a transport layer more likely to make it through the proxies? HTTPS or SSH perhaps?
17:47 mentazoom joined #git
17:48 setuid kadoban, Those aren't supported by these repos (git.kernel.org, etc.)
17:49 setuid Here's an example of what I get using an ssh tunnel:
17:49 setuid $ git clone git://localhost:2000/ubuntu/ubuntu-vivid.git
17:49 setuid Cloning into 'ubuntu-vivid'...
17:49 setuid fatal: protocol error: bad line length character: SSH-
17:49 setuid That's with an ssh tunnel set up to my outside bastion which has access to the git:// style URIs
17:49 tyreld joined #git
17:49 Ryanar joined #git
17:50 kadoban There's clones of the linux kernel repo and probably most of the others on github and elsewhere, maybe could try that.
17:50 kadoban As to your direct problem ... no idea.
17:50 whitby setuid: git.kernel.org should support https
17:50 phanimahesh joined #git
17:52 sea-gull joined #git
17:52 doener joined #git
17:52 Endarked joined #git
17:52 setuid whitby, I just found a repo on https there, but some other repos don't have https URIs, so I need a way that works with git:// style URIs
17:52 setuid I just tried a socks tunnel, also fails
17:53 timvisher joined #git
17:53 atrus setuid: it seems like you're ssh-tunneling. to an ssh server instead of an http server. may just have the wrong ports on your ssh tunnel line.
17:53 setuid ssh -p 443 -D 1080 -N myhostWithAccess
17:53 setuid atrus, The *ONLY* port open is 443 behind this network
17:53 setuid so I had to open a remote ssh server on port 443, and I can tunnel into/through it
17:53 atrus (ie, that's exactly the error i get when trying to run: git clone git://localhost:22/somethingsomething -> fatal: protocol error: bad line length character: SSH-)
17:53 setuid The question is, how do I pull git:// style URIs through that port, to localhost?
17:54 whitby Odd, I would imagine that if the host supports it (git.kernel.org in this case) that every repo would be available that way
17:54 setuid I could just ssh over there, git clone there, tar it up, then rsync it over, but that's heavy-weight
17:54 setuid For example: git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
17:55 setuid No https version of that repo
17:55 svm_invictvs joined #git
17:55 whitby Ah, that's not git.kernel.org :)
17:55 anonymuse joined #git
17:55 setuid Right, I have a handful of repos I'm going to clone in
17:56 setuid That's why I wanted something that works universal. I found a way to get Linus' kernel source, now I need to pull the Ubuntu source and do some logging
17:56 setuid I'm comparing and inspecting commits
17:56 imachuchu joined #git
17:56 fatalhalt joined #git
17:57 atrus if you can ssh out, you should be able to tunnel port 2000 on the inside to port 9418 on the target server (i think 9418 is the git:// port anyways)
17:58 atrus setuid: what does your tunneling command look like?
17:58 setuid git -c http.proxy=socks5://localhost:1080 clone http://localhost/ubuntu/ubuntu-vivid.git
17:59 atrus setuid: the one you used before trying socks.
17:59 atrus i mean, a socks proxy isn't an http proxy, so that's going to go badly pretty fast
18:00 whitby setuid: the simplest way would probably be the "heavy-weight" clone somewhere else and copy over
18:01 whitby That would work with any repo on any host with any protocol
18:01 jstimm joined #git
18:01 atrus (oh, neat, git does seem to support socks proxys when specified as a http proxy. that's weird. probably doesn't apply to git:// repos though...)
18:01 yanome joined #git
18:02 publio joined #git
18:02 geoid_ joined #git
18:02 whitby atrus: I had thought the http.proxy setting only applied to http:// repos
18:02 whitby similarly with https.proxy
18:03 Gsham joined #git
18:03 whitby Never mind me, https.proxy isn't a thing
18:03 setuid core.gitproxy is
18:03 wizardedit joined #git
18:03 wizardedit joined #git
18:03 setuid whitby, I'll try that, for now
18:03 zivester joined #git
18:03 setuid it's going tp pull a few hundred gigs over, but ah well
18:04 jccn joined #git
18:04 whitby You could compress them in various ways in addition to tar but, yeah, it will still be a bit
18:05 setuid 7z is the tightest, I'll use that
18:05 setuid but then I'm stuck because I can't ever update those repos
18:05 setuid I'll have to keep the remote repos 'live' and then constantly rsyn... wait, maybe that's easier
18:05 whitby You wouldn't be able to push back over git:// anyway?
18:06 whitby You can download it with the git history if that's what you're talking about
18:06 setuid Just wanted to keep the local repo current with upstream
18:06 TomyLobo joined #git
18:06 setuid can't do that if I don't have access to the upstream repo, even with a local clone I pulled elsewhere
18:07 whitby Yeah, you could instead run a full Git mirror
18:07 whitby The logical next step :)
18:07 e14 joined #git
18:09 armyriad joined #git
18:09 cyan__ joined #git
18:10 borkr joined #git
18:10 svm_invictvs joined #git
18:11 Ryanar joined #git
18:12 chardan joined #git
18:12 metachr0n joined #git
18:13 setuid I run a pile of public mirrors, I guess I'll add these too
18:13 setuid But I think I found an https mirror with these sources
18:13 Bizkit joined #git
18:13 setuid Now I need to figure out these mitm proxies to get out over https
18:13 sdothum joined #git
18:14 lindenle joined #git
18:15 lindenle joined #git
18:16 Slush-_ left #git
18:16 raspado joined #git
18:17 Slush- joined #git
18:18 re1 joined #git
18:18 setuid grr, none of this works
18:18 monokrome joined #git
18:19 setuid git config --global --add core.gitProxy http://proxy.inet.hostile-network.com:81
18:19 setuid Is that not the correct syntax?
18:20 AlineGomes joined #git
18:21 dreiss joined #git
18:21 timvisher joined #git
18:21 setuid n/m, looks like https://kernel.ubuntu.com is a DOA host
18:21 setuid *head -> desk*
18:22 timini is there any way to list commits that touch a particular path but not another?
18:24 _ikke_ timini: git log --all -- path
18:24 tang^ joined #git
18:24 miczac joined #git
18:24 dhollinger joined #git
18:26 P4nther joined #git
18:27 timini ok but say i run `git log dev...myfeature src` and i have a commit that modifies files in src as well as another folder
18:27 jccn joined #git
18:27 timini then that commit will show up
18:27 timini but I'd like to be able to exclud commits that change anything in a particular path
18:30 _ikke_ Don't think log provides that
18:30 invisbl joined #git
18:31 duderonomy joined #git
18:31 anonymuse joined #git
18:31 Panacea joined #git
18:32 howitdo joined #git
18:32 howitdo joined #git
18:32 Seveas mgedmin: it was an experiment, superseded by a better heuristic. compactionheuristic code and config option have been yanked
18:37 PettanShoutaKun what is origin/HEAD
18:37 setuid pulling upstream repos over http is *PAINFULLY* slow vs. using https or the native git proto
18:37 cdown joined #git
18:37 PettanShoutaKun is that something I made being an idiot
18:37 PettanShoutaKun or something git has
18:37 setuid Were you trying to convert a CVS repo to git?
18:38 setuid git clone on a git:// style URI provides progress stats, why no stats on http or https URIs?
18:39 matsaman joined #git
18:41 notebox joined #git
18:42 vdv joined #git
18:44 dodobrain joined #git
18:44 tirej_ joined #git
18:45 chachasmooth joined #git
18:45 Guest55 joined #git
18:46 raspado_ joined #git
18:47 theoceaniscool joined #git
18:48 jost__ joined #git
18:48 Vampire0 PettanShoutaKun, it points to the default branch of the remote repository. If you clone this repo, it determines which branch will be checked out locally after the clone. It is what you can configure as "default branch" on the GitHub UI for example.
18:49 raspado__ joined #git
18:50 pwnz0r joined #git
18:50 pwnz0r hello, anyone familiar with github filters? I am trying to see if I can specify more than one author at a time?
18:51 diogenese joined #git
18:52 timvisher joined #git
18:53 raspado joined #git
18:55 zzz joined #git
18:57 Es0teric joined #git
18:57 tvl joined #git
18:58 matsaman pwnz0r: think you'd have to contrive a combine user (foo & bar), for the simplest solution
18:58 matsaman http://stackoverflow.com/questions/7442112/attributing-a-single-commit-to-multiple-developers
18:58 matsaman combined* user, that is
18:58 monkeycat joined #git
18:58 dsantiago joined #git
18:58 l33ch joined #git
18:59 grill_ left #git
18:59 finalbeta joined #git
19:00 PettanShoutaKun joined #git
19:01 Tobbi joined #git
19:02 druonysus joined #git
19:05 chachasmooth joined #git
19:05 Goplat joined #git
19:08 druonysus joined #git
19:09 LionsMane joined #git
19:09 a3Dman joined #git
19:09 pwnz0r interesting ill take a look thx
19:09 elsevero joined #git
19:13 Balliad joined #git
19:13 Panacea joined #git
19:16 nevodka joined #git
19:16 rgb-one joined #git
19:16 rgb-one Hey gitteroos
19:16 rgb-one giteroos?
19:16 matsaman gitties
19:16 rgb-one nah
19:17 matsaman gits
19:17 rgb-one hmm, not bad
19:17 rgb-one gitsters
19:17 matsaman =)
19:17 matsaman the git man, git-o-rama, the gitagitalingdong
19:17 matsaman =/
19:17 rgb-one lol
19:17 rgb-one I say all of em
19:18 jmpp joined #git
19:18 rgb-one :p Anyway, got an issue with ^M showing up in a git diff
19:18 tango_ dos line endings
19:19 matsaman that happens if you edit a Windows-sourced text file with CRLF line endings
19:19 osse rgb-one: if the file is CRLF and Git is not configured to convert it, ^M will show up on added lines
19:19 osse rgb-one: it might have been there in the removed line too
19:19 matsaman rgb-one: open the file in Vim, then run :e +ff=unix, then delete the line endings on the lines you changed
19:19 matsaman alternatively, dos2unix the whole thing (but do this in a separate commit so it's clear wtf is going on)
19:19 rgb-one matsaman, cool
19:19 _geoff joined #git
19:20 matsaman excuse me, :e ++ff=unix
19:20 rgb-one I actually haven't made a commit yet
19:20 matsaman http://vim.wikia.com/wiki/File_format
19:20 rgb-one this is to be my first commit
19:20 matsaman perfect, then
19:20 jasom joined #git
19:20 matsaman you can also passively inform your colleagues about which line endings are correct (=P) with an additional dos2unix & commit
19:21 cliluw joined #git
19:22 pity joined #git
19:22 rgb-one so I can use dos2unix recursively on a directory?
19:22 mehola joined #git
19:22 Sasazuka joined #git
19:22 matsaman I believe dos2unix (quite sanely) suggests using find + dos2unix for that
19:23 matsaman you might want to do it on a case-by-case basis, though
19:23 matsaman there may be rare (if awful) situations where the line endings actually matter
19:23 GavinMagnus joined #git
19:23 rgb-one I'm gonna have a chat with the boss before I do anything
19:23 matsaman no don't do that =P
19:23 matsaman what is the file in question, some source file? What language?
19:24 rgb-one html
19:24 rgb-one well it's a .php file
19:24 timvisher joined #git
19:24 GavinMagnus left #git
19:25 matsaman line endings almost certainly won't matter (other than CRLF being "wrong" =P) for those
19:25 rgb-one so just commit then huh?
19:26 matsaman yes, be assertive =)
19:26 matsaman but again, make a single commit for the dos2unix, and another or what you were actually originally changing
19:26 matsaman that way the diffs will remain useful
19:26 matsaman and another For*
19:27 setuid left #git
19:28 jaafar joined #git
19:28 kulelu88 joined #git
19:31 jmpp joined #git
19:31 jmpp joined #git
19:34 _geoff joined #git
19:38 xissburg joined #git
19:38 aidalgol joined #git
19:40 bannakaf_ joined #git
19:40 b1tchcakes joined #git
19:41 romerocesar joined #git
19:41 djam90 joined #git
19:42 djam90 If I have a sort of "boilerplate" template (for web development) in GitHub, what is the best way to create a new project repo which is just a copy of the boilerplate one?
19:42 fscala joined #git
19:43 ShoaibJahejo joined #git
19:44 hamster joined #git
19:45 nickabbey joined #git
19:45 ls43z joined #git
19:46 matsaman djam90: believe they call that a fork on github
19:47 matsaman if you want it to be apparent, on github, in github ways, that that's what you've done
19:48 timvisher joined #git
19:49 BSaboia joined #git
19:52 rgb-one joined #git
19:54 rgb-one I think ^M line ending has to do with me using Brackets
19:54 rgb-one the text editor
19:54 rgb-one matsaman,
19:54 hahuang61 joined #git
19:55 rgb-one No it is unlikely, another file which wasn't edited in Brackets has the same line ending
19:56 netj joined #git
19:56 matsaman rgb-one: this is what's happening
19:56 raspado joined #git
19:57 matsaman your project has some files that have "Windows" style CR+LF line endings
19:57 matsaman already
19:57 multi_io joined #git
19:57 matsaman and your editor is sanely configured to use only LF line endings
19:57 matsaman further, git is "configured" (perhaps not explicitly) to use only LF line endings
19:58 dsantiago joined #git
19:58 matsaman either that, or your editor is configured to respect the file's current line endinges, rather, and is adding a CR
19:58 anonymuse joined #git
19:58 matsaman so git doesn't care, your editor can do either
19:58 Guest49439 joined #git
19:58 matsaman and HTML and PHP almost certainly don't care
19:58 rgb-one cool
19:58 matsaman so the only "problem" is that your diff is cluttered up with a meaningless char (^M)
19:58 rgb-one yea
19:59 matsaman you can fix this with a single commit by opening a file explicitly in your favored line ending mode and saving it that way (re: vim: :e ++ff=unix)
19:59 matsaman you can fix it forever by dos2unix'ing a file
19:59 matsaman until some newb colleague undoes it
19:59 matsaman then you can get progressively more lecture-y at them
20:00 beneter joined #git
20:00 jstein_ joined #git
20:01 mischat joined #git
20:01 mischat joined #git
20:02 MatthewAllan93 joined #git
20:03 geoid_ joined #git
20:08 Guest31408 joined #git
20:11 crayon joined #git
20:12 rivarun joined #git
20:12 Balliad joined #git
20:13 Rodya_ joined #git
20:13 misgit joined #git
20:16 codemann joined #git
20:16 Ciy joined #git
20:17 bannakaffalatta joined #git
20:18 chipotle joined #git
20:19 misgit left #git
20:19 timvisher joined #git
20:21 Es0teric joined #git
20:21 yqt joined #git
20:22 magellanicloud joined #git
20:22 mischat joined #git
20:23 lvh joined #git
20:24 e14 joined #git
20:24 ssitani joined #git
20:29 Guest55 joined #git
20:29 misgit joined #git
20:30 misgit left #git
20:31 _geoff_ joined #git
20:34 hasc joined #git
20:35 aard__ joined #git
20:35 Eryn_1983_FL joined #git
20:38 aard_ joined #git
20:40 bcc joined #git
20:40 bcc joined #git
20:40 cdown joined #git
20:47 nscott76 left #git
20:47 timvisher joined #git
20:48 jnavila joined #git
20:49 nettoweb joined #git
20:50 crose joined #git
20:52 adymitruk also see smudge/clean scripting rgb-one
20:54 bcc joined #git
20:54 bcc joined #git
20:54 Guest55 joined #git
20:54 cyan__ joined #git
20:55 sea-gull joined #git
20:56 nostrora joined #git
20:57 cdg joined #git
20:57 EliasH joined #git
21:00 bannakaffalatta joined #git
21:01 hamster_ joined #git
21:02 alp82 joined #git
21:04 salamanderrake joined #git
21:05 rivarun joined #git
21:06 e14 joined #git
21:08 alp82_ joined #git
21:09 jm0 joined #git
21:09 jm0 left #git
21:11 dsdeiz joined #git
21:11 dsdeiz joined #git
21:11 borkr joined #git
21:12 nevodka joined #git
21:13 timvisher joined #git
21:13 tvw joined #git
21:14 jaggz joined #git
21:14 druonysus joined #git
21:15 jaggz I accidentally untarred a backup of my /project over my local copy, and have been working on the project.  I didn't think about it at the time, but I now have a repo with a ton of uncommitted changes from the other system, mixed with a handful of new changes I've made
21:15 m0viefreak joined #git
21:16 Guest49439 joined #git
21:16 jaggz if I commit these, even though the changes are 99% the same, aren't they going to conflict with the remote changes?
21:16 jaggz like if two people change "John" to "Joe" in the same file and both commit.. is it going to be a conflict?
21:16 Rodya_ joined #git
21:18 geoid_ joined #git
21:20 adymitruk there won't be a conflict. You are committing changes
21:20 adymitruk it's only a conflict if you have others doing the same
21:20 perlpilot joined #git
21:20 adymitruk to not make it a nightmare for them, you probably don't want to commit all those changes
21:21 jaggz it's just me
21:21 gugah joined #git
21:21 jaggz I did it on the remote system, out of desperation to get a service back up.. instead of locally on my beta system
21:21 jaggz so both sides have the same changes to commit
21:22 pity joined #git
21:22 jaggz with either side possibly having a small number of their own unique changes (which shouldn't conflict)
21:22 jaggz but I'm not sure what happens to the mass of same exact changes, uncommitted, from both sides
21:22 apotry joined #git
21:23 jaggz and how to make sure my newer handful of changes, I just made the past couple days, go in properly when pulled on the live system
21:23 Rodya_ joined #git
21:24 EliasH joined #git
21:25 nostrora joined #git
21:25 aard_ joined #git
21:27 kaldoran joined #git
21:27 geoid_ joined #git
21:28 sim590 joined #git
21:28 noecc left #git
21:29 adymitruk oh I see
21:29 adymitruk so you have to decipher through all of your uncommitted changes
21:29 adymitruk the best thing to do there if it will work at all is to look at modified dates in the files system itself
21:30 adymitruk if that does work, you can pipe an output to git add or git reset to untagle them into 2 separate commits
21:30 adymitruk jaggz: ^
21:31 hahuang61 joined #git
21:32 aard__ joined #git
21:34 gunnaro joined #git
21:34 rivarun joined #git
21:35 Atm0spher1c joined #git
21:38 ramsub07 joined #git
21:42 jaggz adymitruk, reading about git reset :)
21:43 adymitruk add/reset.. checkout ... the swiss army knives of git
21:43 adymitruk good to know how they work well
21:43 jaggz "In the first and second form, copy entries from <tree-ish> to the index."
21:44 jaggz tree-ish?  is that the on-disk files?
21:44 jaggz what's the 'index'?
21:44 ramsub08 joined #git
21:44 jaggz I hate when I'm reading a manpage and they assume I'm going there because I already know what I'm doing :)
21:46 adymitruk If you don't know that, you need to take the nex t 60 minutes and read the git-scm.org/book
21:46 timvisher joined #git
21:46 adymitruk if you don't, you'll probably attain more frustration than productivity
21:46 manuelschneid3r joined #git
21:47 xissburg joined #git
21:47 adymitruk you need to know what the index is, how commits are structured, and a few other fundamentals. Everything will make sense after that.
21:50 GodGinrai joined #git
21:50 GodGinrai joined #git
21:50 Sasazuka joined #git
21:51 enckse joined #git
21:53 storrgie joined #git
21:53 chipotle joined #git
21:53 roelmonnens joined #git
21:55 cdg joined #git
21:57 ramsub07 joined #git
21:58 XiaoMianTiao joined #git
21:59 jason237 joined #git
22:00 pom joined #git
22:01 nostrora joined #git
22:01 jason237 joined #git
22:02 k5tux joined #git
22:03 jason_ joined #git
22:04 k5tux So I'm working in two branchs, 'master' and 'test'. I want to merge the current 'master'/ovq.php into 'test'/ovq.php but they're out of sync and I'm getting a conflict error. How can I just remove ovq.php from the test branch and merge in what's in master?
22:04 _ikke_ Note that git merges entire trees, not single files
22:05 _ikke_ When in conflict, you can do git checkout --theirs ovq.php (assuming you're on test)
22:07 notebox joined #git
22:07 k5tux That seems to have done the trick. Thanks _ikke_.
22:07 mki_ joined #git
22:08 timvisher joined #git
22:09 Guest49439 joined #git
22:10 mki joined #git
22:10 voldz1tic3n joined #git
22:14 gg_ joined #git
22:14 lindenle joined #git
22:15 ISmithers joined #git
22:15 hahuang61 joined #git
22:19 dreiss joined #git
22:19 sea-gull joined #git
22:19 todd_dsm joined #git
22:19 Gsham joined #git
22:22 bernardio joined #git
22:23 nidr0x joined #git
22:28 WayToDoor joined #git
22:30 DelTree joined #git
22:35 Lto7 joined #git
22:37 thierryp joined #git
22:38 timvisher joined #git
22:40 ikelso joined #git
22:40 bannakaffalatta joined #git
22:42 zivester joined #git
22:42 ikelso joined #git
22:42 jmpp joined #git
22:42 Noodlewitt joined #git
22:44 jimi_ joined #git
22:47 cdown joined #git
22:52 b1tchcakes can someone help me with a composer issue?  https://hastebin.com/irizehipob.json << I can't seem to understand how to force a git repo to take priority over the packagist one.  it says on the composer site that this is the default behavior, but it's not appearing to work like that unless I am doing something wrong here.
22:53 mki joined #git
22:54 eclaesson joined #git
22:54 aard_ joined #git
22:54 al-damiri joined #git
22:55 mgoodwin Is there such thing as an interactive prune? I want to be able to prune missing remote branches but I also don't want to blow away new feature branches that aren't up yet (this is a script im writing)
22:55 thiago b1tchcakes: we can only help you with Git here. I don't know how your JSON file applies to Git.
22:55 b1tchcakes it's a git repo
22:55 jccn joined #git
22:55 thiago mgoodwin: no, there isn't.
22:56 thiago mgoodwin: but prune doesn't remove local branches. Only remote branches that the remote no longer has.
22:56 thiago b1tchcakes: ok, explain your problem in Git rms.
22:56 ikelso joined #git
22:56 fstd joined #git
22:57 Poppa joined #git
22:57 Dougie187 left #git
22:57 mgoodwin Valid point, the situation I have is that I'm wring a "sync" kind of script and some of my repos are still checked out to a branch that no longer exists on the remote. Ideally I want to move to master and remove that branch if it doesn't exist on the remote - so the condition would have to be if it's a branch that has an upstream tracking that doesn't exist
22:59 matsaman joined #git
22:59 thiago repeating: git remote prune does not remove local branches
22:59 thiago it only removes the local copy of a remote branch if that remote branch no longer exists
22:59 mgoodwin I think you're trying to tell me it already does what I want is that correct
23:01 fmeerkoetter joined #git
23:06 s17 joined #git
23:07 cdg_ joined #git
23:08 robattila256 joined #git
23:13 chardan joined #git
23:13 timvisher joined #git
23:15 Ryanar joined #git
23:20 ToBeCloud joined #git
23:20 deadprez joined #git
23:21 Tsutsukakushi joined #git
23:21 endiruna joined #git
23:22 sea-gull joined #git
23:22 pity joined #git
23:22 anonymuse joined #git
23:23 astrofog joined #git
23:24 hahuang61 joined #git
23:24 lindenle joined #git
23:24 GodGinrai joined #git
23:24 tvw joined #git
23:24 Eryn_1983_FL joined #git
23:24 jasom joined #git
23:24 finalbeta joined #git
23:24 dhollinger joined #git
23:24 AlineGomes joined #git
23:24 TomyLobo joined #git
23:24 msonntag joined #git
23:24 overlord_tm joined #git
23:24 snowkidind joined #git
23:24 timini joined #git
23:24 cstrahan joined #git
23:24 mehdi___ joined #git
23:24 thallada joined #git
23:24 tabakhase joined #git
23:24 glebihan joined #git
23:24 dustinm joined #git
23:24 uidzer0 joined #git
23:24 brandonw joined #git
23:24 ftoulemo1 joined #git
23:24 colona_ joined #git
23:24 TyrfingM1olnir joined #git
23:24 Learath2 joined #git
23:24 mkoskar joined #git
23:24 _W_ joined #git
23:24 forrestv joined #git
23:24 WakiMiko joined #git
23:24 Noldorin joined #git
23:24 tristanp joined #git
23:24 ToBeFree joined #git
23:24 solution_ joined #git
23:24 TinkerTyper joined #git
23:24 Eugene joined #git
23:24 cyberz joined #git
23:24 slixpk joined #git
23:24 roflin joined #git
23:24 daopu[m] joined #git
23:24 Remramm joined #git
23:24 habbasi joined #git
23:24 rudi_s joined #git
23:24 uebera|| joined #git
23:24 ash_workz joined #git
23:25 Karazhan joined #git
23:25 Sceorem joined #git
23:26 dhollinger joined #git
23:26 thallada joined #git
23:26 astrofog joined #git
23:27 Qzuw joined #git
23:27 govg joined #git
23:27 AlineGomes joined #git
23:27 cdg joined #git
23:28 biheho joined #git
23:28 biheho left #git
23:30 Kaisyu joined #git
23:30 mehdi___ joined #git
23:30 cstrahan joined #git
23:31 dsdeiz joined #git
23:31 dsdeiz joined #git
23:35 Rodya_ joined #git
23:37 hsag joined #git
23:38 Guest55 joined #git
23:39 aw1 joined #git
23:41 aidalgol joined #git
23:41 msonntag joined #git
23:41 gugah joined #git
23:42 romerocesar joined #git
23:43 cdg joined #git
23:43 druonysus joined #git
23:44 Gsham joined #git
23:45 dsantiago joined #git
23:50 timvisher joined #git
23:50 nettoweb joined #git
23:51 msonntag joined #git
23:51 cnujs joined #git
23:55 nevodka joined #git
23:56 sammyo joined #git
23:56 polyrob_ joined #git
23:56 polyrob_ joined #git
23:58 mischat joined #git
23:58 menip joined #git

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