IRCloggy #git 2017-01-18

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-01-18

→ Oatmeal joined00:00
← overlord_tm left00:01
→ mehola joined00:03
← t0by left00:03
← mischat left00:03
← jimi_ left00:04
→ bannakaffalatta joined00:04
← ssitani left00:06
← ReptilianBrain left00:06
← mehola left00:07
← jeffreylevesque left00:07
← mp3 left00:08
→ hahuang65 joined00:08
→ pietv joined00:09
← LeBlaaanc left00:10
← finalbeta left00:10
← Zamyatin left00:10
→ jimi_ joined00:12
← tirej left00:12
← spacelord_ left00:12
← timvisher left00:13
← WaReZ left00:13
→ timvisher joined00:14
← grill_ left00:14
← LionsMane left00:14
← ianmethyst left00:15
← nscott76 left00:15
→ durham_ joined00:16
← ramsub07 left00:18
← Anja left00:18
← msonntag left00:19
← durham left00:19
→ tirej joined00:19
← dersand left00:20
→ Rodya_ joined00:20
← durham_ left00:20
← humoroustwo left00:21
→ msonntag joined00:25
→ dances-with-cats joined00:26
← Eryn_1983_FL left00:26
← cdown left00:27
→ YottaByte joined00:28
YottaByte wondering if there's anyone here who's used bitbucket before who can help me with a pull request00:28
→ chachasmooth joined00:29
→ tay_ joined00:29
← miczac left00:30
→ Anja joined00:31
← tay_ left00:31
adymitruk YottaByte: sure, what's the issue?00:31
→ hahuang61 joined00:32
← donught left00:34
← chachasmooth left00:34
← mentazoom left00:34
← suy left00:34
→ Ryanar joined00:34
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.html00:35
→ FilipNortic joined00:36
← hahuang61 left00:38
← Guest5102 left00:38
→ done joined00:39
done → Guest3481200:40
→ chipotle joined00:40
→ Eryn_1983_FL joined00:41
→ rominronin joined00:43
→ cybersphinx joined00:47
← Oatmeal left00:47
← the_cybersphinx left00:47
→ spacelord_ joined00:48
→ forrestv joined00:49
→ Gsham joined00:50
← Electrometro left00:51
→ mablae joined00:52
← cybersphinx left00:52
← _ng left00:52
← tirej left00:52
← spacelord_ left00: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 more00:53
→ neilthereildeil joined00:54
neilthereildeil hi00:54
when i try to git push via ssh, i get an error that remote: error: refusing to update checked out branch: refs/heads/master00:54
← ericsupreme left00:54
neilthereildeil is there a way to just update the index, but not have remote side checkout the new changes?00:55
← ToBeCloud left00:56
→ madewokherd joined00:57
→ _geoff joined00:59
→ tirej joined00:59
→ the_cybersphinx joined01:01
→ pity joined01:01
← neilthereildeil left01:03
→ durham joined01:03
→ lucasem joined01:03
→ mischat joined01:04
← m4sk1n left01:05
ojacobson !bare01: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
anyways, yes, there's a git-config key for that01:06
← pity left01:07
← al-damiri left01:07
← ispn left01:08
PettanShoutaKun oh my god01:08
these commits are never coming out....01:08
the REPO is TAINTED01:09
← timvisher left01:09
← mischat left01:09
→ timvisher joined01:10
→ Oatmeal joined01:10
→ cqi joined01:12
← cqi left01:13
→ cqi joined01:14
→ Spherical joined01:14
PettanShoutaKun what is the fastest way to "cherry-pick" a group of commits and apply them onto my branch01:15
there's like 8 of them01:15
← matsaman left01:15
→ matsaman joined01:17
← rominronin left01:18
← matsaman left01:18
← Gsham left01:18
← GT4066 left01:18
← fearless_man left01:19
← salamanderrake left01:22
← stench left01:22
→ salamanderrake joined01:23
← jccn left01:23
→ pity joined01:23
→ stench joined01:23
← durham left01:24
→ durham joined01:24
← fahadash left01:25
→ benwbooth joined01:26
← testchat left01:27
→ xaviergmail joined01:27
← forrestv left01:27
← msonntag left01:27
← jimi_ left01:27
← pietv left01:27
← hahuang65 left01:27
← peeps[lappy] left01:27
← WakiMiko left01:27
← moei left01:27
← Atm0spher1c left01:27
← multi_io left01:27
← graingert left01:27
← Noldorin left01:27
← cagmz left01:27
← tristanp left01:27
← sarri left01:27
← ToBeFree left01:27
← snits left01:27
← serialoverflow left01:27
← solution_ left01:27
← TinkerTyper left01:27
← Eugene left01:27
← cyberz left01:27
← slixpk left01:27
← roflin left01:27
← daopu[m] left01:27
← Remramm left01:27
← kineticrootkit[m left01:27
← SpEcHiDe left01:27
← mkoskar left01:27
← habbasi left01:27
← rudi_s left01:27
← uebera|| left01:27
→ kineticrootkit[m joined01:28
→ SpEcHiDe joined01:28
→ graingert joined01:28
← chardan left01:29
→ forrestv joined01:29
→ msonntag joined01:29
→ jimi_ joined01:29
→ pietv joined01:29
→ hahuang65 joined01:29
→ multi_io joined01:29
→ peeps[lappy] joined01:29
→ WakiMiko joined01:29
→ moei joined01:29
→ Atm0spher1c joined01:29
→ Noldorin joined01:29
→ cagmz joined01:29
→ tristanp joined01:29
→ sarri joined01:29
→ ToBeFree joined01:29
→ snits joined01:29
→ serialoverflow joined01:29
→ solution_ joined01:29
→ TinkerTyper joined01:29
→ Eugene joined01:29
→ cyberz joined01:29
→ slixpk joined01:29
→ roflin joined01:29
→ daopu[m] joined01:29
→ Remramm joined01:29
→ mkoskar joined01:29
→ habbasi joined01:29
→ rudi_s joined01:29
→ uebera|| joined01:29
← Karazhan left01:29
← durham left01:29
← snits left01:29
← Atm0spher1c left01:29
→ Karazhan joined01:29
→ snits joined01:30
→ Atm0spher1c joined01:30
→ Darren_ joined01:30
← thiago left01:30
→ thiago joined01:31
→ anonymuse joined01:31
← Rodya_ left01:31
← tirej left01:32
← ikelso_ left01:32
← moei left01:32
→ ikelso joined01:33
→ hahuang61 joined01:33
→ moei joined01:34
→ durham joined01:35
← durham left01:35
→ dirtyroshi joined01:36
← Wulf left01:36
← Cork left01:36
← weltall left01:36
← hyperair left01:36
→ hyperair joined01:36
→ weltall joined01:36
→ Raineer joined01:36
← dreiss left01:36
← ikelso left01:37
→ johnny56 joined01:37
→ anonymus_ joined01:38
← hahuang61 left01:39
→ tirej joined01:39
← anonymuse left01:42
→ GodGinrai joined01:42
← pity left01:42
← hahuang65 left01:42
→ drbean joined01:42
→ ikelso joined01:42
← ikelso left01:42
← salamanderrake left01:43
→ ikelso joined01:43
→ Cork joined01:43
→ salamanderrake joined01:44
→ ikelso_ joined01:45
← ikelso left01:45
← brent__ left01:46
← dsantiag_ left01:46
← jstimm left01:46
← GodGinrai left01:46
← cdg left01:48
← leeN left01:49
→ Rodya_ joined01:50
→ monkeycat joined01:52
PettanShoutaKun 87490c3 is the commit that merged a bunch of crap into our branch that we didn't want...01:52
it's a merge commit... unfortunately I think it has a few other files that we actually need in it as well....01:52
how do I keep the stuff we want from it.... and ditch the stuff we don't?01:52
← anonymus_ left01:52
← jimi_ left01:52
→ pity joined01:54
→ chachasmooth joined01:55
← Raineer left01:55
→ flippo joined01:56
← timvisher left01:57
← YottaByte left01:57
→ timvisher joined01:58
→ jameser joined01:58
← msonntag left02:00
← AlexMax left02:00
← jameser left02:01
→ msonntag joined02:01
kyan Apparently autocrlf is enabled by default!! Is this a known issue?02:02
← str left02: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:03
I'd be interested in backporting a patch into my builds if there's one available yet02:04
I can't find any bugtracker for git...02:04
→ jameser joined02:04
← xaviergmail left02:04
adymitruk It's not considered a bug02:05
→ mischat joined02:05
adymitruk i've been dealing with this default setting for a decade now02:05
→ jimi_ joined02:05
kyan What.02:06
adymitruk yes.. it's so linux, OSX/MacOS and Windows people could edit the same files. I never liked this "feature"02:07
→ fakenerd joined02: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 file02: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 master02:08
how do I do that?02:08
→ finalbeta joined02:08
ojacobson git checkout master -b some-new-name && git cherry-pick source-branch~6..source-branch02:09
review results; if content, git checkout master && git merge --ff --ff-only some-new-nam02:09
→ durham joined02:10
→ xaviergmail joined02:10
← mischat left02:10
→ Gsham joined02:10
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
← fakenerd left02: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:11
PettanShoutaKun erro: Commit dd1bd86a9f73f9ae60811e341a0d42e60a1a350a is a merge but no -m option was given.02:12
→ rchavik joined02:12
PettanShoutaKun what do I do about that? o.O02: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 XP02:12
← tirej left02:12
PettanShoutaKun ojacobson02:12
ojacobson PettanShoutaKun: merges are hard to cherry-pick, you're better off breaking the six commits up into six separat cherry-picks02:13
cherry-pick the non-merge commits, re-do the merges for the merge commits02:13
(this is also why git-rebase drops merges by default)02:13
PettanShoutaKun hmmmm02:13
look at the repo browser I can see that ca419a5 is the exact merge commit that includes all the changes I don't want02:14
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 that02:14
it had noticed that I turned off line ending conversion02:14
→ rominronin joined02:14
kyan How can I commit the real line endings for these files I'd already committed with default settings?02:15
← Vortex34 left02:15
← Gsham left02:16
→ snowkidind joined02:16
← jimi_ left02: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't02:16
← hasc left02:16
← dances-with-cats left02:18
→ Sasazuka joined02:18
→ nebodka joined02:18
→ tirej joined02:19
← nebodka left02:19
→ nevodka joined02:19
adymitruk PettanShoutaKun: you can list all the non-merge commits in the cherry-pick command02:20
where in the series of commits is the merge?02:20
is it the first, the last or somewhere in the middle?02:20
← nowhereman left02: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 muddle02:21
*middle adymitruk02:21
the only real saving grace is most of what it changes is in separate files02:22
← ikelso_ left02:22
adymitruk you have 6 commits in total?02:22
→ ikelso joined02:22
adymitruk what you do is cherry-pick the first batch up to the merge commit02:22
then you git checkout <hash of merge commit> -- files you want02: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 commit02:23
then git cherry02:24
PettanShoutaKun in theory I should be able to rip out this single merge that carries like 29 extra unnecessary commits with it02:24
adymitruk then git cherry-pick the rest02:24
PettanShoutaKun I'd hope02:24
→ Gsham joined02:24
→ jimi_ joined02:24
adymitruk so 1. cherry pick first batch 2. checkout files you want from merge with the -- 3. cherry pick the rest02:25
← timvisher left02:25
adymitruk you should be sorted by then02:25
← chachasmooth left02:25
→ timvisher joined02:26
← ikelso left02:27
→ Wulf joined02:27
← _geoff left02:28
→ nowhereman joined02:28
← xaviergmail left02:28
→ jameser_ joined02:30
← jameser_ left02:31
PettanShoutaKun I feel like no matter what I try.... some commit or another keeps pulling this crap back in02:31
← jameser left02:32
→ donught joined02:32
← donught left02:33
← d^sh left02:34
→ jameser joined02:35
← Noodlewitt left02:36
→ d^sh joined02:36
← voldz1tic3n left02:36
→ zivester joined02:38
← r3c0d3x left02:38
← nowhereman left02:38
→ nowhereman joined02:38
← pks left02:39
← AlineGomes left02:39
← notebox left02:39
← Sasazuka left02:40
→ pks joined02:41
← govg left02:45
adymitruk you need to look at the --stat of each commit.. it will show you what each commit brought in02:46
← ilbot3 left02:46
→ aavrug joined02:46
adymitruk cherry picking only applies patches02:46
PettanShoutaKun okay...02:46
adymitruk so you have to check what you're doing each time02:46
PettanShoutaKun I have everything I need SO FAR02:46
we're on a good track02:46
adymitruk the middle merge is tricky02:46
← Rodya_ left02:46
PettanShoutaKun now I need to get like all but 4 file changes out of this merge commit02:46
WITHOUT bringing in all 29 other commits that I do not want02:47
how do I pick specific file changes out of this commit02:47
that would probably be the easiest way to do this02:47
I'd hope02:47
→ r3c0d3x joined02:47
adymitruk checking out files with "git checkout a566uo -- path/to/some/file" will not do anything like applying a patch. It will clobber that file with exactly what was in that merge commit02:47
because a merge has two parents, you need to specify which parent you want the patch to be made from02:48
→ Rodya_ joined02:48
adymitruk is this the merge commit?02:49
PettanShoutaKun that's fine02:49
this is the mergo commit....02:49
*merge commit02:49
← rominronin left02:49
PettanShoutaKun what if I don't know the "parent" of the merge commit?02:49
or the parent I want...02:49
→ ilbot3 joined02:49
→ fakenerd joined02:49
rewt `git merge --no-commit`, and then just `git reset` or w/e the parts you don't want02:49
adymitruk rewt: no, he's trying to cherrypick a merge commit02:50
PettanShoutaKun I can't just checkout the file without having to specify a parent?02:50
adymitruk with only some changes02: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 master02:50
adymitruk depends on what you are omitting02:51
you will get changes from commits you tried to skip02:51
← minikN left02:51
adymitruk this is probably why you are seeing changes you don't want after checking out the files from that merge commit02:52
they have effects of what you are intending to skip anyway02:52
← tirej left02:52
adymitruk so you need to get only the patches of what you want02:52
← duderonomy left02:52
→ xall_ joined02:52
PettanShoutaKun I think in theory I'm going to pull in master last... which should have all the other changes built on top of these02:53
adymitruk say you have changes A-Z, Z is the merge commit, you want only X and Y changes02:53
PettanShoutaKun and then when I finally push it all back to master hopefully it's fixedi02:53
adymitruk you can't hope this stuff away02:53
← Xandaros left02:54
adymitruk in my example, if you now checkout some files from Z, you may get things that A-W introduced02:54
→ Xandaros joined02:54
adymitruk and you only wanted X and Y02:54
← Spherical left02:55
→ mage__ joined02:56
→ dsantiago joined02:56
← timvisher left02:56
← grilled-cheese left02:57
adymitruk for your merge commit, you need to do "git cherry-pick <sha1> --no-commit -m 1"02:57
← rivarun left02:57
→ rivarun joined02:57
← r3c0d3x left02:57
→ timvisher joined02:57
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:58
now you need to look at git status and perhaps git diff --stat to see what that introduces02:58
git reset -- file/from/which/you/dont/want/changes02:59
repeat for all files02:59
the git commit02:59
← rt left02:59
→ tirej joined02:59
← ketas left02:59
← yanome left02:59
adymitruk then do the remainder of your commits that come in after the merge via simple cherry-picks02:59
PettanShoutaKun: makes sense?03:00
← NeverDie left03:00
→ hide joined03:00
→ r3c0d3x joined03:00
→ rt joined03:00
→ ketas joined03:00
→ Vampire0_ joined03:01
→ NeverDie joined03:01
→ donught joined03:02
→ YuGiOhJCJ joined03:02
→ yanope joined03:02
yanope → yanome03:03
← Vampire0 left03:03
PettanShoutaKun I just pulled them in by hand....03:03
← Kestrel-029 left03:03
adymitruk have to be careful.. ensure no other commits affected those file with git log -- path/to/file03:06
→ Nicmavr joined03:06
→ mischat joined03:06
adymitruk files*03:06
Nicmavr → Guest2606203:06
← gajus left03:08
→ Atemu joined03:09
→ jeffreylevesque joined03:09
← hexagoxel left03:09
→ Noodlewitt joined03:09
← canuk left03:10
← donught left03:10
→ tyng joined03:11
→ nckpz joined03:11
← mischat left03:11
← crayon left03:11
→ donught joined03:12
← thiago left03:14
→ thiago joined03:15
→ hexagoxel joined03:16
← donught left03:17
← tyng left03:17
← aw1 left03:18
← lucasem left03:18
→ donught joined03:18
→ dreiss joined03:19
→ tyngdekraften joined03:20
→ anonymuse joined03:22
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:23
→ s2013 joined03:24
← dreiss left03:26
← sunri5e left03:27
→ sunri5e joined03:28
→ aw1 joined03:30
← tirej left03:32
→ chachasmooth joined03:35
← timvisher left03:35
→ hahuang61 joined03:35
→ timvisher joined03:36
→ cagomez joined03:36
← donught left03:39
→ tirej joined03:40
→ fstd_ joined03:40
→ donught joined03:40
← donught left03:40
← hahuang61 left03:40
→ kyle_ joined03:40
← cagomez left03:40
← kyle_ left03:41
→ donught joined03:41
→ _geoff joined03:42
→ GodGinrai joined03:42
→ duderonomy joined03:43
← fstd left03:44
fstd_ → fstd03:44
→ YourTheBombNow23 joined03:44
← donught left03:44
→ ikelso joined03:45
← Gsham left03:45
→ donught joined03:46
→ rominronin joined03:46
→ Gsham joined03:46
← GodGinrai left03:47
← Gsham left03:47
← s2013 left03:48
→ Gsham joined03:48
→ xall joined03:48
→ durham_ joined03:48
← durham_ left03:50
← Gsham left03:50
← xall_ left03:50
← aidalgol left03:51
← pity left03:51
← durham left03:52
← monkeycat left03:53
adymitruk make a copy of the dir and try doing a fetch?03:53
← tyreld left03:53
→ pity joined03:53
← ikelso left03:53
→ Gsham joined03:53
→ ikelso joined03:54
← Gsham left03:55
← jimi_ left03:56
← pity left03:58
→ a_thakur joined03:58
← ikelso left03:58
← raspado left04:02
→ monkeycat joined04:02
→ mehola joined04:04
→ pity joined04:05
tyngdekraften it redownload everything04:07
→ mischat joined04:07
→ sdothum joined04:08
tyngdekraften when i try `git index-pack' i got `early EOF'04:08
← mehola left04:09
← pity left04:09
← anonymuse left04:10
→ anonymuse joined04:11
← tirej left04:11
← AaronMT left04:12
← mischat left04:12
← PettanShoutaKun left04:13
adymitruk seems like you need to nuke and start again04:14
→ pity joined04:14
← YourTheBombNow23 left04:14
adymitruk consider a shallow clone if you have a gnarly history04:14
← chachasmooth left04:15
← Anja left04:16
tyngdekraften with depth=1 and core.compression=9 it already took several hours.. anything else i can do to reduce transfert size?04:17
← pity left04:19
→ tirej joined04:19
← timvisher left04:20
← rominronin left04:21
→ timvisher joined04:22
→ Raed|Mobile joined04:22
← nevodka left04:23
← _geoff left04:26
← xall left04:27
→ mehola joined04:28
← Ryanar left04:28
→ mischat joined04:28
← lindenle left04:31
← Darren_ left04:31
← mischat left04:32
← msonntag left04:34
→ msonntag joined04:35
← sdothum left04:35
→ sdothum joined04:35
→ hahuang61 joined04:36
← pietv left04:38
← Atemu left04:39
← hahuang61 left04:41
→ _W_ joined04:42
→ Darren_ joined04:43
→ SwiftMatt joined04:44
→ justan0theruser joined04:47
mgoodwin Is it possible to annex various directories outside of a git repo maybe with symlinks?04:48
→ dreiss joined04:48
mgoodwin This is just a very specific unusual ad-hoc use case to track some changes across several directories, not a long term solution04:48
phroa put the directories in your git repo, create symlinks in the outside world pointing in04:48
I think GNU Stow does that, if not a similar thing04:49
mgoodwin I can't do that because the ordinary directories are created via package manager04:49
← justanotheruser left04:49
← Rodya_ left04:49
mgoodwin We're trying to track text changed between a very specific configuration of a service between /etc /var and /usr04:49
phroa try the 'etckeeper' program, I think you can annex other directories into that04:50
(it's git-backed)04:50
ojacobson Can +1 this recommendation04:50
phroa but otherwise I can't help you further :(04:50
→ arnsa joined04:50
← inflames left04:51
← tirej left04:52
→ Rodya_ joined04:55
→ inflames joined04:56
← donught left04:56
→ donught joined04:58
← timvisher left04:58
→ tirej joined04:59
← NwS left04:59
← rchavik left04:59
→ timvisher joined05:00
← dermoth left05:00
← thiago left05:00
→ dermoth joined05:00
→ thiago joined05:00
→ tmcmahon joined05:03
← tmcmahon left05:03
← pks left05:04
← Rodya_ left05:05
← donught left05:05
→ pks joined05:05
← netj left05:06
→ netj joined05:06
→ donught joined05:06
→ ISmithers joined05:07
→ s2013 joined05:09
← donught left05:11
→ chachasmooth joined05:12
→ pennywu joined05:12
← pennywu left05:12
→ donught joined05:14
← sdothum left05:15
← dirtyroshi left05:15
→ sdothum joined05:15
← donught left05:16
→ donught joined05:17
→ rominronin joined05:18
← donught left05:19
← sdothum left05:20
→ donught joined05:21
→ sdothum joined05:22
← sword` left05:23
← rivarun left05:24
→ rivarun joined05:25
← diogenese left05:25
← philipsd6 left05:25
← donught left05:28
→ mischat joined05:29
→ donught joined05:29
← timvisher left05:30
→ timvisher joined05:31
← cqi left05:31
→ diogenese joined05:31
← donught left05:31
→ lindenle joined05:31
→ romerocesar joined05:32
→ donught joined05:32
→ sword`` joined05:32
← tirej left05:32
← robnester left05:32
← donught left05:34
→ donught joined05:34
← YuGiOhJCJ left05:34
← mischat left05:35
← Cabanossi left05:36
→ DrAwesome joined05:36
← lindenle left05:36
← donught left05:36
→ donught joined05:36
← pR0Ps left05:37
→ Cabanossi joined05:37
← byte512 left05:38
→ pR0Ps joined05:39
→ wmm joined05:39
→ tirej joined05:39
← zivester left05:42
→ raspado joined05:42
→ spacelord_ joined05:43
← dave0x6d left05:43
→ GodGinrai joined05:43
→ xall joined05:46
← GodGinrai left05:48
→ Ryanar joined05:48
→ govg joined05:52
→ robnester joined05:52
← rominronin left05:52
← boombatower left05:54
← madewokherd left05:58
← Darren_ left05:59
→ dec0n joined06:01
→ pity joined06:01
→ cdown joined06:03
→ chandu20 joined06:04
→ MineCoins joined06:05
→ dave0x6d joined06:06
← s2013 left06:10
← cagmz left06:11
→ rscata joined06:12
← timvisher left06:12
← dec0n left06:12
→ dec0n joined06:13
→ timvisher joined06:13
← dec0n left06:14
→ brent__ joined06:15
→ dec0n joined06:15
← dec0n left06:16
→ dec0n joined06:16
← snowkidind left06:17
← donught left06:20
→ donught joined06:20
← cdown left06:22
← donught left06:23
→ donught joined06:23
→ Vortex34 joined06:25
→ cyan__ joined06:25
← Guest34812 left06:26
→ Guest34812 joined06:26
← Ryanar left06:27
→ rominronin joined06:28
← xissburg left06:30
← brent__ left06:30
→ mischat joined06:31
← dreiss left06:31
→ regedit joined06:32
→ mobileWolf joined06:33
→ xissburg joined06:33
← sunri5e left06:33
→ ashokrajar joined06:33
→ Endarked joined06:34
→ sunri5e joined06:35
← mischat left06:35
→ hahuang61 joined06:37
← pity left06:39
→ zefferno joined06:39
← romerocesar left06:40
→ qt-x joined06:40
← thiago left06:40
→ romerocesar joined06:40
→ bocaneri joined06:40
← bocaneri left06:41
← qt-x left06:41
→ leeN joined06:41
→ thiago joined06:41
← hahuang61 left06:42
← thierryp left06:44
→ mp3 joined06:45
→ thierryp joined06:45
→ bocaneri joined06:45
← donught left06:45
← romerocesar left06:45
→ miczac joined06:47
gitinfo set mode: +v06:47
→ overlord_tm joined06:47
→ ThomasLocke joined06:48
← ThomasLocke left06:48
→ ThomasLocke joined06:48
← thierryp left06:49
← xissburg left06:51
← mobileWolf left06:52
→ cqi joined06:54
← timvisher left06:55
→ romerocesar joined06:55
→ timvisher joined06:56
→ rajat joined06:56
← govg left06:57
← Noodlewitt left07:04
→ zeroed joined07:05
← zeroed left07:05
→ zeroed joined07:05
← cqi left07:06
→ dreiss joined07:07
← nidr0x left07:07
→ acetakwas joined07:08
← ISmithers left07:11
→ Raging_Hog joined07:12
→ pity joined07:13
→ cqi joined07:15
← zeroed left07:15
← cqi left07:16
→ cqi joined07:16
→ chele joined07:17
← Guest34812 left07:17
← cqi left07:17
→ cqi joined07:18
← kulelu88 left07:19
→ qt-x joined07:21
→ zeroed joined07:22
← zeroed left07:22
→ zeroed joined07:22
→ elect joined07:22
→ Tobbi joined07:26
← gugah left07:28
→ variable joined07:28
→ andrew710 joined07:29
← zeroed left07:30
→ zeroed joined07:30
← zeroed left07:30
→ zeroed joined07:30
→ mischat joined07:31
← nowhereman left07:32
→ jstimm joined07:32
← Tobbi left07:35
← sarri left07:35
→ ihradek joined07:35
← mischat left07:35
← almy left07:37
→ thierryp joined07:37
← jstimm left07:38
→ Sceorem joined07:38
← kyan left07:38
→ jagob joined07:39
→ ramsub07 joined07:39
→ freimatz joined07:40
→ phanimahesh joined07:40
→ JeroenT joined07:40
→ jnavila joined07:41
← romerocesar left07:41
→ romerocesar joined07:42
→ GodGinrai joined07:44
← kadoban left07:45
→ djb-irc joined07:46
→ eduardas_m joined07:46
← timvisher left07:47
← romerocesar left07:47
→ govg joined07:47
← JeroenT left07:47
→ mda1 joined07:48
→ JeroenT joined07:48
→ timvisher joined07:48
← fakenerd left07:49
← GodGinrai left07:49
→ sarri joined07:49
← sarri left07:49
→ sarri joined07:49
→ pietv joined07:50
← Guest36461 left07:50
→ sbulage joined07:51
← phanimahesh left07:51
← bannakaffalatta left07:52
→ benycze joined07:53
← benycze left07:53
→ fakenerd joined07:53
→ pur3eval joined07:54
← ramsub07 left07:55
← dreiss left07:56
→ Tobbi joined07:56
← pity left07:59
← variable left08:00
→ pity joined08:00
→ aidalgol joined08:00
→ jknetl joined08:03
→ phanimahesh joined08:03
← moei left08:05
← xall left08:05
→ bannakaffalatta joined08:06
← djb-irc left08:07
← zeroed left08:08
← overlord_tm left08:09
→ xall joined08:09
← miczac left08:10
← a_thakur left08:10
→ theoceaniscool joined08:10
← laen left08:10
← JeroenT left08:11
→ JeroenT joined08:11
← thiago left08:12
← rajat left08:12
→ XVar joined08:13
→ thiago joined08:13
→ _ng joined08:13
← JeroenT left08:13
→ JeroenT_ joined08:13
→ phanimah1sh joined08:15
→ a_thakur joined08:15
← acetakwas left08:15
← spacelord_ left08:18
← phanimahesh left08:18
→ TomyWork joined08:21
← phanimah1sh left08:22
→ nowhereman joined08:22
→ aax joined08:23
← timvisher left08:26
← Tobbi left08:26
→ timvisher joined08:27
← theoceaniscool left08:27
← Endarked left08:28
→ Tobbi joined08:28
→ phanimahesh joined08:29
← a_thakur left08:29
→ lordjancso joined08:30
→ GodGinrai joined08:31
→ Snugglebash joined08:32
→ mischat joined08:32
← creppe left08:34
← GodGinrai left08:36
← mischat left08:36
← msonntag left08:37
→ hahuang61 joined08:38
→ overlord_tm joined08:38
→ msonntag joined08:39
osse tyngdekraften: i like your nick08:39
← aidalgol left08:40
← chandu20 left08:40
← chipotle left08:40
← nowhereman left08:40
→ nowhere_man joined08:40
← Tobbi left08:41
→ chipotle joined08:41
← Goplat left08:42
→ busta joined08:43
← hahuang61 left08:43
→ Balliad joined08:43
← govg left08:44
← phanimahesh left08:44
→ g105b joined08:45
→ Arban joined08:45
→ nostrora joined08:46
→ phanimahesh joined08:46
← xall left08:46
→ xall_ joined08:47
← mablae left08:49
← pR0Ps left08:50
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:51
→ pR0Ps joined08:52
← rasto left08:52
→ a_thakur joined08:52
← robnester left08:53
→ aard_ joined08:54
→ GavinMagnus joined08:54
← jozwior__ left08:54
← sbulage left08:55
adymitruk .. or you want to make it look like you did it a day earlier ;)08:56
!filter-branch08:57
!filterbranch08:57
!08:57
← SwiftMatt left08:57
← a_thakur left08: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 idea08:57
adymitruk anyway g105b you should look at filterbranch. I'll do what you need08:57
← aard_ left08:58
tobiasvl !man git-filter-branch08: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
the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html08: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 pushed08:59
tobiasvl right. no ! in that instance.08:59
← pity left08:59
→ pity_ joined09:00
→ sbulage joined09:00
g105b It's been pushed, but currently it's only me who has seen anything.09:01
→ garethdaine joined09:01
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 master09:02
→ elect_ joined09:02
→ jozwior__ joined09:02
→ acetakwas joined09:02
← phanimahesh left09:03
→ phanimahesh joined09:03
← pur3eval left09:03
← _ng left09:04
→ robnester joined09:05
← timvisher left09:05
← elect left09:05
→ timvisher joined09:06
→ mindfart joined09:06
← Raed|Mobile left09:06
← acetakwas left09:08
→ mischat joined09:08
← mischat left09:08
→ a_thakur joined09:08
→ Tobbi joined09:09
← todd_dsm left09:09
← a_thakur left09:10
→ a_thakur joined09:10
→ marcogmonteiro joined09:12
g105b cool thanks adymitruk, tobiasvl09:12
adymitruk np, good luck!09:12
→ JeroenT joined09:13
← inflames left09:14
→ Shashikant86 joined09:16
← JeroenT_ left09:17
g105b I think I've sorted it with an --env-filter09:17
← mehola left09:17
→ philipsd6 joined09:20
← Tobbi left09:21
adymitruk excellent09:22
→ ssitani joined09:23
→ inflames joined09:23
→ bongjovi joined09:24
→ ispn joined09:25
← JanC left09:26
← JeroenT left09:26
→ kurkale6ka joined09:26
→ JanC joined09:26
→ tvw joined09:28
→ acetakwas joined09:28
→ theoceaniscool joined09:29
← phanimahesh left09:30
→ doener joined09:32
→ phanimahesh joined09:32
→ aidalgol joined09:32
→ nettoweb joined09:34
← ssitani left09:35
← Shashikant86 left09:35
→ govg joined09:35
→ JeroenT joined09:37
← pietv left09:38
→ holgersson joined09:38
→ kevleyski joined09:39
→ Shashikant86 joined09:40
← kevleyski left09:42
→ pietv joined09:42
← pietv left09:43
← a_thakur left09:43
→ a_thakur joined09:43
→ m4sk1n joined09:43
← xall_ left09:43
← timvisher left09:44
← overlord_tm left09:45
→ timvisher joined09:46
→ mentazoom joined09:46
→ t0by joined09:46
← t0by left09:46
→ t0by joined09:46
→ Gloomy joined09:47
→ Tobbi joined09:48
→ xall_ joined09:48
← wmm left09:49
← sarri left09:52
→ gajus joined09:53
← finalbeta left09:54
→ finalbeta joined09:54
→ chll_ joined09:55
← Balliad left09:56
← sunri5e left09:56
→ dersand joined09:56
→ overlord_tm joined09:57
→ sunri5e joined09:59
← JuliusN left09:59
→ JuliusN joined09:59
→ mischat joined10:00
← andrew710 left10:01
← Tobbi left10:01
→ andrew710 joined10:01
→ rnsanchez joined10:03
← marcogmonteiro left10:07
→ Serpent7776 joined10:07
← mischat left10:08
→ mischat joined10:08
→ cdown joined10:09
→ Tobbi joined10:09
← thiago left10:12
→ thiago joined10:13
← phanimahesh left10:13
← Junior left10:15
→ phanimahesh joined10:15
← mrkake left10:16
← a_thakur left10:17
→ a_thakur joined10:17
→ marcogmonteiro joined10:17
← dsdeiz left10:19
← timvisher left10:19
← aw1 left10:20
→ mrkake joined10:20
→ timvisher joined10:20
→ sawk joined10:21
→ davimore_ joined10:22
→ chandu20 joined10:22
← Tobbi left10:23
← jameser left10:24
← davimore__ left10:24
← mkoskar left10:25
← blackwind_123 left10:28
← msonntag left10:30
→ blackwind_123 joined10:30
← aidalgol left10:31
→ aw1 joined10:33
← Atm0spher1c left10:34
→ msonntag joined10:36
→ nanga joined10:36
→ PCatinean joined10:36
→ hahuang61 joined10:38
← GavinMagnus left10:41
← aax left10:42
← DrSlony left10:43
← hahuang61 left10:43
← a_thakur left10:45
← overlord_tm left10:45
→ GavinMagnus joined10:45
← xall_ left10:46
→ a_thakur joined10:46
→ mablae joined10:46
→ xall joined10:48
← regedit left10:49
→ afuentes joined10:51
← msonntag left10:51
→ King_Hual joined10:51
← King_Hual left10:51
→ King_Hual joined10:51
→ astrofog joined10:53
← busta left10:53
→ rajat joined10:54
→ robotroll joined10:56
← xall left10:56
← JeroenT left10:56
→ dsdeiz joined10:57
← dsdeiz left10:57
→ dsdeiz joined10:57
← timvisher left10:58
→ mischat_ joined10:58
→ minikN joined10:58
← nowhere_man left10:59
→ timvisher joined10:59
→ overlord_tm joined11:00
← Shashikant86 left11:00
← fakenerd left11:01
← King_Hual left11:01
← bongjovi left11:01
← mischat left11:02
← dsdeiz left11:02
→ mkoskar joined11:03
→ msonntag joined11:03
← rajat left11:03
→ Shashikant86 joined11:04
→ ubereber joined11:04
← cyan__ left11:04
← WayToDoor left11:04
gitinfo set mode: +v11:05
ubereber good morning11:05
← HcsOmot left11:05
→ YuGiOhJCJ joined11:06
ubereber [politely lurking not to interupt anyone]11:06
← m0viefreak left11:07
→ King_Hual joined11:07
← Snugglebash left11:07
→ Tobbi joined11:07
g105b How does one politely lurk?11:09
ubereber lol ...was just making sure noone was in a deep conversation11:09
tobiasvl nobody's talking ;)11:10
ubereber ok here is my question11:10
tobiasvl this channel is well trained in keeping many simultaneous conversations anyway11:10
shoot11:10
ubereber User A uses only windows no git11:10
User B gets a copy once per month of User A's directory11:10
→ Snugglebash joined11:10
← Snugglebash left11:10
ubereber this copy is then used to update user Bs folders11:11
I cant seem to find how git handles this situation11:11
will all the files need to be re added to the repo11:11
tobiasvl so far you haven't mentioned how git even enters the equation here11:11
ubereber will the files changed be able to be undone11:11
I am trying to make a case to use git for the entire office11:12
tobiasvl OK… but what situation are you asking how git handles?11:12
← Guest26062 left11:12
ubereber a graphic file is change (autocad) by the windows user11:12
I get the changed graphic file ...git will recognize the change I assume11:12
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
also, is AutoCAD a binary file format? if so, !binary applies11: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 solutions11:13
ubereber git repo is in an identical windows file directory11:13
p53ud0nym !annex11: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-lfs11:15
→ intellix joined11:15
ubereber ty for the urls ...have opened them for reading11:16
also so lets say we are dealing with only text files now11:16
User A only windows User B uses git11:16
User A copies all text files in his directory to user Bs11:17
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 changed11:17
→ sgfgdf joined11:18
tobiasvl there's no copy date, not sure what you mean by that11:18
user A or B will need to add and commit the changed files in the repo11:18
at which point a commit will be created, with a SHA and a date11:18
ubereber file 1 has not changed but was copied over the file 1 tracked by git by user B11:18
→ mehola joined11:19
→ ShalokShalom joined11:19
tobiasvl then it has not changed, from git's perspective11:19
ShalokShalom hi there11:19
i setup a git repo with initial license and readme files11:19
how can i pull an local git repo to it?11:19
which i created localy with git init11:20
← King_Hual left11: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 day11:20
gitinfo ubereber: you're welcome, but please note that I'm a bot. I'm not programmed to care.11:20
ubereber lol11:21
← msonntag left11: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:21
← nckpz left11:22
← mehola left11:23
→ King_Hual joined11:23
tobiasvl sgfgdf: yes. you will need to tell git which parent to use as the base when cherry-picking a merge commit with --mainline11:23
→ dsdeiz joined11:24
← dsdeiz left11:24
→ dsdeiz joined11:24
→ bongjovi joined11:25
← ubereber left11:25
← GavinMagnus left11:26
→ fakenerd joined11:28
→ ramsub07 joined11:28
pity_ → pity11:29
→ brent__ joined11:31
← fakenerd left11:32
→ s2013 joined11:32
← dwmw2_gone left11:32
→ dwmw2_gone joined11:33
→ krs93 joined11:33
dwmw2_gone → dwmw2_DRS11:34
ShalokShalom tobiasvl: nope11:35
why two?11:35
← minikN left11:35
ShalokShalom i created one local git repo with git init11:35
and one on the gitea webserver11:35
← brent__ left11:35
← DrAwesome left11:35
ShalokShalom which contains 2 files and they prevent git from push11:36
→ DrAwesome joined11:36
→ rchavik joined11:36
DrAwesome → Guest3140811:36
_ikke_ ShalokShalom: probably because creating the repo on gitea also comitted something in it?11:36
→ minikN joined11:37
← joki left11:37
tobiasvl ShalokShalom: ah, you never mentioned a web server11:37
→ Balliad joined11:37
← govg left11:38
← intellix left11:38
→ jameser joined11:39
→ GavinMagnus joined11:39
← ShalokShalom left11:39
← ojdo left11:39
→ ShalokShalom joined11:40
→ JeroenT joined11:40
← JeroenT left11:40
→ JeroenT joined11:41
ShalokShalom tobiasvl: yeah, correct11:41
← jameser left11:41
ShalokShalom a git repo is a repo on a webserver to me, my mistake11:42
_ikke_: yes11:42
the question is, how i can merge them now11:42
or call it as you want11:42
i am new to git11:42
→ NwS joined11:42
_ikke_ ShalokShalom: I guess you want to 'overwrite' what the remote repo has?11:42
ShalokShalom remote repo is that one on the server?11:43
_ikke_ yes11:43
→ Snugglebash joined11:43
ShalokShalom nope, i created this readme and license for a reason11:43
both solutions are fine to know11:43
overwrite and merge11:43
← cdown left11:43
ShalokShalom i already run git init, git add . and git commit -am "message"11:44
→ joki joined11:44
← JeroenT left11:44
_ikke_ You want to rebase your local commit on top of the commit created on the remote repo11:45
ShalokShalom hnn11:45
i think git init was needless, or?11:46
→ Anja joined11:46
ShalokShalom i just like to push my local files to the web server11:46
→ jameser joined11:46
← timvisher left11:46
_ikke_ ShalokShalom: I gather you already connected your local repository to the remote one? (git remote add ...)11:47
ShalokShalom nope11:47
→ timvisher joined11:47
← MineCoins left11:49
← Tobbi left11:50
← phanimahesh left11:50
→ JeroenT joined11:50
← s2013 left11:50
← ramsub07 left11:50
→ Impaloo joined11:51
_ikke_ That's the first step then11:51
→ phanimahesh joined11:51
_ikke_ git remote add <name> <clone url>11:51
→ ertesx joined11:52
ShalokShalom dont work11:52
which name?11:52
of local repo or server one?11:52
_ikke_ you can decide yourself11:52
ShalokShalom nope11:52
_ikke_ origin is the default name git uses11:53
→ borkr joined11:53
ShalokShalom might be, that huge letter on the beginning dont work?11:53
because it does now11:53
and now?11:53
← cagedwisdom left11:53
← minikN left11:54
→ MineCoins joined11:54
_ikke_ git fetch <name>11:54
← MineCoins left11:55
→ minikN joined11:55
ShalokShalom yep11:55
done11:55
← ertes left11:55
ertesx → ertes11:55
ShalokShalom push now?11:56
or merge?11:56
_ikke_ how did you call the remote?11:57
ShalokShalom git remote add test https://try.gitea.io/ShalokShalom/Test211:58
_ikke_ try git rebase test/master11:59
→ cdown joined11:59
→ romerocesar joined11:59
→ Laurenceb__ joined12:00
ShalokShalom ok?12:00
worked12:00
all is local now12:00
→ Tobbi joined12:01
→ JeroenT_ joined12:01
→ intellix joined12:01
→ JeroenT__ joined12:02
← JeroenT_ left12:02
→ PinealGlandOptic joined12:03
ShalokShalom yes12:03
git push --set-upstream test master did it12:03
thanks a lot12:03
PinealGlandOptic hi everyone! what is most correct way to disallow non-utf8 files in commits? some kind of hook?12:03
← ashokrajar left12:03
← phanimahesh left12:04
← romerocesar left12:04
← JeroenT left12:05
← qt-x left12:06
← Snugglebash left12:06
→ phanimahesh joined12:06
← mischat_ left12:06
← theoceaniscool left12:06
→ mischat joined12:07
→ cyan__ joined12:07
← jas4711 left12:07
← JeroenT__ left12:07
← Laurenceb__ left12:08
← cqi left12:09
← jameser left12:09
bremner regular beatings.12:10
← drbean left12:10
bremner more seriously, a pre-commit hooks sounds plausible12:11
PinealGlandOptic bremner: is there some popular script? maybe built-in?12:11
← thiago left12:11
bremner no idea. So far the beatings are working for me.12:12
→ thiago joined12:12
→ JeroenT joined12:12
→ msonntag joined12:13
→ jameser joined12:14
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 them12:17
← Tobbi left12:17
PinealGlandOptic git diff shows all lines are different, but visually they are the same12:18
ShalokShalom _ikke_: thanks for your help12:19
i try to reproduce it now12:19
← minikN left12:19
→ Tobbi joined12:19
ShalokShalom and git rebase test2/master give me:12:19
fatal: Needed a single revision12:19
→ str joined12:21
→ Snugglebash joined12:22
→ jas4711 joined12:22
_ikke_ ShalokShalom: It means it does not know test2/master12:23
did you add test2 as a remote, and did you fetch?12:23
← str left12:24
ShalokShalom yep12:27
← dodobrain left12:27
_ikke_ ShalokShalom: what does git branch -r return?12:27
← Shashikant86 left12:28
→ aax joined12:28
ShalokShalom [shalokshalom@elitebook8570p knowthelist-git]$ git branch -r12:28
knowthelist/master12:28
knowthelist = test212:28
← anonymuse left12:28
← Tobbi left12:28
tobiasvl then you did not add test2 as a remote, you added knowthelist as a remote?12:29
→ Squarism joined12:29
ShalokShalom yep12:29
tobiasvl what do you mean by "knowthelist = test2"12:29
ShalokShalom i simply named it test2 here in chat12:29
in order to avoid confusion12:29
*failed :D12:29
tobiasvl ok… then you obviously have to do git rebase knowthelist/master12:29
ShalokShalom yep, exactl12:29
[shalokshalom@elitebook8570p knowthelist-git]$ git rebase knowthelist/master12:30
fatal: Needed a single revision12:30
← rivarun left12:30
→ Tobbi joined12:31
→ rivarun joined12:31
→ notebox joined12:31
← chandu20 left12:32
← timvisher left12:32
ShalokShalom what to do now?12:33
→ timvisher joined12:33
_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 merged12:34
How can I fast forward master to feature?12:34
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 into12:35
consecutive tasks. Kind of messy but easiest from a implementation perspektive - less nice for whoever is Reviewing your pull requests12:35
tobiasvl fuchstronaut: what do you mean "on top of master"? and what did git actually tell you?12:35
→ ShapeShifter499 joined12:35
← phanimahesh left12:36
→ phanimahesh joined12: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
actually I think this is the most simple scenario12:37
since theere is nothing to merge, I think I just have to move that master tip up to the tip of the feature branch12:38
← mage__ left12: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
← aavrug left12:38
ShalokShalom _ikke_: f8fca796a6b92b90e47b94c6a373fcac13992ab612:38
← andrew710 left12:38
tobiasvl fuchstronaut: what happens if you "git checkout feature"?12:39
← JeroenT left12:39
→ hahuang61 joined12:39
→ FilipNortic_ joined12:40
fuchstronaut Im such a fkn tool12:40
→ JeroenT joined12:40
fuchstronaut misstyped feature ... each time12:40
sorry12:40
tobiasvl haha. np12:40
← Tobbi left12:40
← notebox left12:43
← jameser left12:43
← hahuang61 left12:44
jast fuchstronaut: set up Git autocompletion for your shell and it won't happen again :)12:44
← JeroenT left12:46
→ JeroenT joined12:46
→ manuelschneid3r joined12:48
→ joco42 joined12:48
→ notebox joined12:49
→ pabs3 joined12:49
→ noecc joined12:49
→ jameser joined12:50
pabs3 would the git protocol allow one to do something like `git describe` on a remote repo without cloning it?12:50
← Doginal left12:51
→ Doginal joined12:51
→ theoceaniscool joined12:51
selckin ls-remote maybe12:51
← raedah left12:52
jast nothing quite like describe, I think12:52
→ ReptilianBrain joined12:52
→ chandu20 joined12:53
→ strk joined12: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:55
← jameser left12:57
→ Shashikant86 joined12:58
← chandu20 left12:58
strk found http://www.freelancingdigest.com/articles/git-svn-switch-to-a-different-a-svn-url/12:58
→ hhee joined12:59
→ nowhere_man joined12:59
← aw1 left12:59
jast there's another way that involves setting rewriteRoot12:59
← notebox left12:59
← GavinMagnus left13:00
→ ShalokShalom_ joined13:01
→ govg joined13:01
strk yep, rewriteRoot sounds safer13:03
← ShalokShalom left13:04
ShalokShalom_ → ShalokShalom13:04
→ Panacea joined13:04
→ chandu20 joined13:04
Celelibi Is there a shorthand for "git rebase --onto master config modifs" when the modifs is already checked out?13:05
→ mischat_ joined13:05
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
I'm not a big fan of the syntax of rebase.13:07
← UnnamedPlayer left13:07
→ jameser joined13:07
← Snugglebash left13:07
^7heo Celelibi: can't you use the ~/.gitconfig file for that?13:08
← mischat left13:08
^7heo in the [alias] section, you can place aliases.13:08
← Mobutils left13:09
→ notebox joined13:10
→ Mobutils joined13:10
→ aw1 joined13:11
→ GodGinrai joined13:11
← DistantStar left13:12
← chandu20 left13:12
← govg left13:13
→ Tobbi joined13:13
→ chandu20 joined13:13
← timvisher left13:13
→ boombatower joined13:13
→ DistantStar joined13:14
→ timvisher joined13:14
→ synthroid joined13:14
→ jeffreylevesque_ joined13:15
← dsdeiz left13:17
← GodGinrai left13:17
← chandu20 left13:17
strk ok, now it works, rewriteRoot was a perfect solution :)13:18
→ hio joined13:19
→ YourTheBombNow23 joined13:19
← Learath2 left13:19
hio my git isnt working!!! buggy software!13:19
Wulf hio: haha ;P13:19
hio: got details?13:19
hio Wulf, not a joke!! it downloads forever, 80 megabyte already on a 20MB project13:19
← jeffreylevesque left13:20
Wulf hio: git-clone?13:20
→ Learath2 joined13:20
hio yeah13:20
Wulf hio: lots of history to download13:20
hio: be patient13:20
hio what do you mean13:20
i had a video file checked in accidentally but i deleted it already13:20
it shouldnt download it again13:20
Wulf hio: did you rewrite the history?13:21
← jeffreylevesque_ left13:21
hio no13:21
Wulf hio: then it's still there13: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, yes13:22
hio how do i delete the video forever13:22
← JeroenT left13:22
Wulf hio: rewrite the history13:22
!rewrite13: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/waqum13:22
hio i didnt understand any of that13:23
→ JeroenT joined13: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 it13:23
→ achadwick joined13:24
← Nilesh_ left13: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:24
hio: and tell everyone to go along with this.13:25
← serialoverflow left13:25
hio im the only developer, i have only this: AddVideo->RemoveVideo13: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 permanently13:26
hio guys i dont have time for all this stuff omg13:26
← Mobutils left13:26
→ Mobutils_ joined13:26
hio how hard can it be to delete a video from history that i JUST added 5min ago13: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, !bfg13:27
gitinfo hio: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)13:27
← bannakaffalatta left13:28
hio GIT IS BROKEN NOW13:29
→ serialoverflow joined13:29
hio i closed the window when i rebased and now it's all messed up13:29
pabs3, i only have 2 commits and the one with the video has lots of other files13:30
→ fenglei joined13:30
pabs3 first commit is adding all the video, second commit is deleting the video?13:30
personally I would delete .git and start from scratch using git-annex or similar13: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 joined13:31
hio usability of git is a NIGHTMARE13:31
← Tobbi left13:31
pabs3 yeah, sounds like you just want a plain directory, not a version controlled one13:32
← azerus left13:32
→ douglascorrea joined13:32
→ brent__ joined13:32
selckin !reflog13: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:32
→ treia joined13:33
→ Tobbi joined13:33
← rscata left13:34
← hio left13:34
→ Gamecubic joined13:35
→ azerus joined13:35
Celelibi ^7heo: It was more a general question about the pattern of the rebase commands than about those exact commands.13:35
BTW, git stash doesn't seem very good at handling file removal.13:36
→ hio joined13:36
← brent__ left13:36
tobiasvl hio: I recommend you read a !book about git to get a feel for what it actually is13:37
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 !parable13:37
← fenglei left13:37
→ DARSCODE joined13:38
← DARSCODE left13:38
→ lindenle joined13:39
← sdothum left13:39
→ sdothum joined13:41
→ DARSCODE joined13:41
← sbulage left13:41
← DARSCODE left13:42
hio tobiasvl: the problem is git, not me13:42
obviously if i have limitless amounts of time i can figure out how to rebase my history. that really wasnt the point13:43
← lindenle left13:43
tobiasvl OK, not sure what the point was then.13:43
→ jeffreylevesque joined13:44
hio point is that i need some serious porcelain13:44
← JeroenT left13:44
selckin git is not for you, find another tool13:44
← Tobbi left13:45
← hio left13:45
← notebox left13: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 them13:46
we're here to help, but flaming is not necessary.13:46
← YourTheBombNow23 left13:46
tobiasvl or that13:48
canton7 he's a known troll from another channel, btw13:48
not saying he was trolling then, but I've banned him from other channels a few times13:48
tobiasvl aha13:48
← timvisher left13:49
→ unbalanced joined13:49
→ Snugglebash joined13:50
← a_thakur left13:50
→ timvisher joined13:50
→ Ryanar joined13:50
→ notebox joined13: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: !annex13: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-lfs13:52
Arban Oh. Thanks.13:52
← pabs3 left13:53
→ ashokrajar joined13:54
→ Tobbi joined13:55
→ ssitani joined13:56
← ashokrajar left13:57
→ ashokrajar joined13:58
→ GodGinrai joined13:58
→ chandu20 joined13:59
← arnsa left14:03
← pity left14:04
→ suttonwilliamd joined14:04
← notebox left14:05
← nettoweb left14:05
← tvw left14:06
← lordjancso left14:08
→ rafalcpp joined14:09
← thiago left14:09
→ thiago joined14:10
← thiago left14:10
→ thiago joined14:10
← douglascorrea left14:11
→ rasto joined14:11
← pR0Ps left14:11
← Eryn_1983_FL left14:13
→ ramsub07 joined14:14
→ jimi_ joined14:14
← jimi_ left14:14
→ pR0Ps joined14:14
→ jimi_ joined14:16
← zefferno left14:16
← cdown left14:16
← parasite_ left14:17
→ cdown joined14:19
← timvisher left14:20
→ timvisher joined14:21
→ ashokraj_ joined14:22
→ cdg joined14:23
← jameser left14:23
← strk left14:24
← ashokrajar left14:24
→ todd_dsm joined14:26
← ashokraj_ left14:26
→ Eryn_1983_FL joined14:29
→ theonefoo joined14:31
→ ShekharReddy joined14:31
← ShapeShifter499 left14:32
→ canuk joined14:35
→ Dougie187 joined14:35
→ JeroenT joined14:36
← krs93 left14:38
← chipotle left14:38
→ dodobrain joined14:39
→ yehowyada joined14:39
→ hahuang61 joined14:40
← ShekharReddy left14:42
← mostlybadfly left14:44
← mischat_ left14:45
→ ThumbBone joined14:45
→ ShapeShifter499 joined14:45
→ tvw joined14:45
→ mischat joined14:45
← jagob left14:45
← hahuang61 left14:45
gitinfo set mode: +v14: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 commit14:47
← timvisher left14:48
→ nettoweb joined14:48
→ ikelso joined14:48
→ bannakaffalatta joined14:49
→ pity joined14:49
→ timvisher joined14:49
← ShapeShifter499 left14:49
→ nckpz joined14:49
← jknetl left14:49
→ ash_workz joined14:51
← Shashikant86 left14:53
← rafalcpp left14:53
ThumbBone jast: by "going back" you mean checking out and bring the HEAD to that commit?14:54
← jarshvor left14:54
tobiasvl ThumbBone: the more salient questions is what YOU mean :)14:55
→ jarshvor joined14:55
tobiasvl what do you wish to achieve? !revert14: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:55
← yehowyada left14:56
tobiasvl ThumbBone: and to check out and bring the HEAD to a commit, "git checkout $commit" (will detach HEAD)14:56
← joco42 left14:57
→ nickabbey joined14: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 want14:58
→ chipotle joined14:58
← dec0n left14:58
tobiasvl ThumbBone: OK, then you probably want option e) in gitinfo's reply above, then14:59
oh, without deleting history you say14:59
then you don't want option e)15:00
→ Shashikant86 joined15:00
ThumbBone tobiasvl: no but with reset I lose the commits, doing git revert this way keeps all the change history15:00
tobiasvl yep, revert is fine then15:00
ThumbBone tobiasvl: yup15: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 issues15:01
→ MineCoins joined15:01
ThumbBone *I tested15:01
← Shashikant86 left15: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_merge15: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.txt15:02
tobiasvl otherwise it should be fine15:02
→ whitby joined15: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:03
← rominronin left15:04
→ GavinMagnus joined15:04
ThumbBone tobiasvl: great thanks for the link15:04
→ moei joined15: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:05
← finalbeta left15:05
→ finalbeta joined15:06
ThumbBone yes, checkout is not what I want in this case15:06
→ YourTheBombNow23 joined15:08
← sdothum left15:09
← jave left15:09
→ parasite_ joined15:09
← modin left15:10
→ Gsham joined15:10
→ sdothum joined15:10
→ interrobangd joined15:11
→ LeBlaaanc joined15:11
← Sonderblade left15:11
→ Sonderblade joined15:12
→ ResidentBiscuit joined15:12
→ voldz1tic3n joined15:12
→ jave joined15:13
← timvisher left15:14
→ JanC_ joined15:15
→ timvisher joined15:15
→ [0xAA] joined15:15
← saml left15:15
← [0xAA] left15:15
← JanC left15:16
JanC_ → JanC15:16
→ Es0teric joined15:16
→ _nwkj86 joined15:16
→ yanope joined15:16
← tvw left15:16
← suttonwilliamd left15:16
→ tvw joined15:16
→ d10n-work joined15:17
← nostrora left15:17
← cdown left15:17
← nwkj86 left15:17
← rchavik left15:17
← rt left15:17
← berndj left15:17
← d10n-work left15:17
→ d10n-work joined15:17
→ ronskisika joined15:17
← peeps[lappy] left15:17
← rivarun left15:17
→ rivarun joined15:17
→ berndj joined15:18
→ Nugget_ joined15:18
→ ^7heo_ joined15:18
→ _geoff joined15:18
→ Walex2 joined15:18
← finalbeta left15:18
→ TyrfingM1olnir joined15:18
→ cxreg2 joined15:18
→ Jupelius_ joined15:18
← Slush- left15:18
→ Jonno_FT1 joined15:18
→ styx___ joined15:18
→ Slush-_ joined15:18
→ meLon_ joined15:18
→ nevyn_ joined15:18
→ plasticb1y joined15:18
← cxreg left15:18
← styx_ left15:18
← Ratler left15:18
← Jonno_FTW left15:18
← doppo left15:18
← Walex left15:18
← tokkee left15:18
← ketas left15:18
← exounx left15:18
→ avarab joined15:18
← avarab left15:18
→ avarab joined15:18
→ babilen_ joined15:18
→ Knirch_ joined15:18
→ doppo_ joined15:18
→ trondth_ joined15:18
→ souther_ joined15:18
→ PaulePan1er joined15:18
→ colona_ joined15:18
→ mikap joined15:18
→ d1b_ joined15:18
→ ftoulemo1 joined15:18
→ rt joined15:18
→ comps_ joined15:18
→ exounx joined15:18
← nuck left15:18
← tobiasvl left15:18
→ brewmast1r joined15:18
← axisys left15:18
→ finalbeta joined15:18
← yanome left15:18
→ hegge joined15:18
→ tokkee joined15:18
← ^7heo left15:18
← meLon left15:18
← TyrfingMjolnir left15:18
← d1b left15:18
← plasticboy left15:18
→ sunny256_ joined15:18
← brandonw left15:18
→ tier2vil1ain_ joined15:18
→ axisys_ joined15:19
→ rchavik joined15:19
← doener left15:19
→ brandonw joined15:19
→ doener_ joined15:19
doppo_ → doppo15:19
souther_ → souther15:19
→ Ratler joined15:19
← LeBlaaanc left15:19
← bannakaffalatta left15:19
← m4sk1n left15:19
← jozwior__ left15:19
← XVar left15:19
← Raging_Hog left15:19
← ThomasLocke left15:19
← mp3 left15:19
← hide left15:19
← robattila256 left15:19
← jost_ left15:19
← Guest44896 left15:19
← pkiller left15:19
← gigq left15:19
← oaao left15:19
← iamthad left15:19
← MacWinner left15:19
← hallogallo[m] left15:19
← monomon[m] left15:19
← kikijiki[m] left15:19
← UncleCJ left15:19
← Sheogorath[m] left15:19
← unclechu left15:19
← concerti left15:19
← CussBot left15:19
← dhollinger left15:19
← jwest left15:19
← fscala left15:19
← fus left15:19
← bathtub_shark left15:19
← Nevik left15:19
← unbalancedparen left15:19
← boubou left15:19
← prg318 left15:19
← SpeakerToMeat left15:19
← glebihan left15:19
← michael_mbp left15:19
← styx__ left15:19
← da5id left15:19
← Caelum left15:19
← HalfEatenPie left15:19
← bauruine left15:19
← Lowell left15:19
← jgrasser left15:19
← MLM_ left15:19
← Bigcheese left15:19
← fragMental left15:19
← arand__ left15:19
← _cyril_ left15:19
← guardian left15:19
← Random832 left15:19
← Neico left15:19
← Nugget left15:19
← Dazzyp left15:19
← deepy left15:19
← jwmann left15:19
← demize left15:19
← Hogofwar left15:19
← UgJkA left15:19
← hwoarang left15:19
← jor left15:19
← cttttt left15:19
← parliament left15:19
← lolmac_ left15:19
← Zarthus left15:19
← AlHafoudh left15:19
← bsanford_ left15:19
← ninsei left15:19
← Ankhers left15:19
← ulkesh_ left15:19
← pitastrudl left15:19
← Mindi left15:19
← mika left15:19
← ToeSnacks left15:19
← uranellus left15:19
← rideh left15:19
← quite left15:19
← kenansulayman left15:19
← tier2villain_ left15:19
← brewmaster left15:19
← colona left15:19
← PaulePanter left15:19
← drawkula left15:19
← simon816 left15:19
← tabakhase left15:19
← nevyn left15:19
← Knirch left15:19
← nephyrin left15:19
← chigang left15:19
← raatiniemi left15:19
← sim642 left15:19
← CustosLimen left15:19
← prosody left15:19
← uidzer0 left15:19
← MatthewAllan93 left15:19
← RickyB98 left15:19
← sparr left15:19
← saidelike left15:19
← McKraken_zzzzz left15:19
← tjbp left15:19
← davidstrauss left15:19
← pepijndevos left15:19
← kanzure left15:19
← ensign_ left15:19
← linuxmodder left15:19
← maxorator left15:19
← cloudcell_ left15:19
← elmcrest left15:19
← CEnnis91 left15:19
← daxroc left15:19
← unholycrab left15:19
← kutenai left15:19
← Travis-42 left15:19
← phtes left15:19
← DuncanT left15:19
← RiPer left15:19
← filcab left15:19
← CtrlC left15:19
← manveru left15:19
← tharuin left15:19
← wenzowski left15:19
← chrysaor left15:19
← nioncode left15:19
← HedgeMage left15:19
← BackEndCoder left15:19
← nsh left15:19
← bl0m1_ left15:19
← MillerBoss left15:19
← cstrahan left15:19
← thallada left15:19
mikap → mika15:19
→ uidzer0 joined15:19
→ fscala joined15:19
→ Zarthus joined15:19
→ MillerBoss joined15:19
→ dustinm joined15:19
→ hwoarang joined15:19
→ sysanthrope joined15:19
→ trelane joined15:19
← trelane left15:19
→ trelane joined15:19
→ guardian joined15:19
→ Bigcheese joined15:19
→ CussBot joined15:19
→ gigq joined15:19
→ hide joined15:19
→ jor joined15:19
→ nephyrin joined15:19
→ uranellus joined15:19
← uranellus left15:19
→ uranellus joined15:19
→ RickyB98 joined15:19
→ Spydar007 joined15:19
← Spydar007 left15:19
→ Spydar007 joined15:19
← RickyB98 left15:19
→ RickyB98 joined15:19
→ iamthad joined15:19
→ HedgeMage joined15:19
→ pepijndevos joined15:19
→ sim642 joined15:19
→ CustosLimen joined15:19
→ oaao joined15:19
→ concerti joined15:19
→ Mindi joined15:19
→ XVar joined15:19
→ cdown joined15:19
→ jozwior__ joined15:19
→ deepy joined15:19
→ jwest joined15:19
→ nioncode joined15:19
→ glebihan joined15:19
→ pingwindyktator joined15:19
→ bathtub_shark joined15:19
→ tabakhase joined15:19
→ synchronous joined15:19
sunny256_ → sunny25615:19
→ sparr joined15:19
→ Exagone313 joined15:20
→ prg318 joined15:20
→ quite joined15:20
→ fus joined15:20
→ Hogofwar joined15:20
→ Ankhers joined15:20
→ meZee joined15:20
→ robattila256 joined15:20
→ Cathy joined15:20
→ simon816 joined15:20
→ mehola joined15:20
→ BackEndCoder joined15:20
→ boubou joined15:20
gitinfo set mode: +v15:20
→ drawkula joined15:20
→ ulkesh_ joined15:20
→ demize joined15:20
→ thallada joined15:20
→ CtrlC joined15:20
← CtrlC left15:20
→ CtrlC joined15:20
→ nuck joined15:20
→ RiPer joined15:20
→ rideh joined15:20
→ ugjka joined15:20
← ggherdov left15:20
→ Ring0` joined15:20
← parasite_ left15:21
→ pitastrudl joined15:21
Squarism can you rebase a branch onto master(a branch) if you have both staged and unstaged changes?15:21
→ linuxmodder joined15:21
→ unclechu joined15:21
→ kenansulayman joined15:21
→ pkiller joined15:21
→ maxorator joined15:21
→ _cyril_ joined15:21
→ LeBlaaanc joined15:21
← stoopkid left15:21
← zmachine left15:21
← blacksyke left15:21
← dave0x6d left15:21
← johtso left15:21
← milkshoes left15:21
← mehdi___ left15:21
→ AlHafoudh joined15:21
← timwis left15:22
← barq left15:22
→ saidelike joined15:22
← g105b left15:22
← JeroenT left15:22
→ Neico joined15:22
tomaw → 02HAAAAAN15:22
→ da5id joined15:22
→ SpeakerToMeat joined15:22
→ MatthewAllan93 joined15:22
→ ketas joined15:22
→ filcab joined15:22
→ Hedgework joined15:22
→ ThomasLocke joined15:22
→ jost_ joined15:22
→ hallogallo[m] joined15:22
→ UncleCJ joined15:22
→ monomon[m] joined15:22
→ kikijiki[m] joined15:22
→ Sheogorath[m] joined15:22
→ dhollinger joined15:22
→ Nevik joined15:22
→ unbalancedparen joined15:22
→ Caelum joined15:22
→ jgrasser joined15:22
→ fragMental joined15:22
→ Random832 joined15:22
→ Dazzyp joined15:22
→ jwmann joined15:22
→ bsanford_ joined15:22
→ ninsei joined15:22
→ raatiniemi joined15:22
→ ensign_ joined15:22
→ bl0m1_ joined15:22
→ chrysaor joined15:22
→ jgornick_ joined15:22
→ qlkzy_ joined15:22
→ Boniche joined15:22
→ h12o joined15:22
→ tapout joined15:22
→ andres joined15:22
← gyre007 left15:22
← codedmart left15:22
← stealthii left15:22
← da5id left15:22
→ da5id joined15:22
← filcab left15:22
→ filcab joined15:22
← Karazhan left15:22
← Jupelius left15:22
← MatthewAllan93 left15:23
← ketas left15:23
← SpeakerToMeat left15:23
← jgornick_ left15:23
← unbalancedparen left15:23
← Random832 left15:23
← h12o left15:23
← Caelum left15:23
gitinfo set mode: +v15:23
→ HalfEatenPie joined15:23
→ h12o_ joined15:23
→ tjbp joined15:23
→ davidstrauss joined15:23
→ douglascorrea joined15:23
→ DelphicOkami joined15:23
→ cttttt joined15:23
→ jgornick joined15:23
whitby Squarism: --autostash might be what you're looking for15:23
→ bannakaffalatta joined15:23
→ MatthewAllan93 joined15:23
→ unbalancedparen joined15:23
← dwts left15:23
→ Random832 joined15:23
→ bauruine joined15:23
← discopatrick left15:23
← ulkesh left15:23
→ McKraken_zzzzz joined15:23
→ giraffe joined15:23
→ SpeakerToMeat joined15:23
→ styx_ joined15:23
→ Caelum joined15:23
Squarism in feature : git rebase master --autostash ?15:23
McKraken_zzzzz → McKraken15:23
← aw1 left15:23
giraffe → Guest9898615:23
← gajus left15:23
Squarism whitby, ?15:23
whitby Should work, yeah15:23
→ Karazhan joined15:24
yanope → yanome15:24
← chipotle left15:24
→ johnnyfive joined15:24
→ ToeSnacks joined15:24
→ geoid_ joined15:24
← wizonesolutions left15:24
→ LionsMane joined15:24
← angular_mike_ left15:24
← mehola left15:25
→ wenzowski joined15:25
→ michael_mbp joined15:25
→ ketas joined15:25
→ CEnnis91 joined15:25
TomyWork is there a way to atomically create an annotated tag and push it, along with a branch deletion?15:25
→ dwts joined15:25
_ikke_ TomyWork: Sounds like something for an alias15:25
whitby Or a Bash function, yeah15: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 joined15:25
_ikke_ right, but an anotated tag involves more than just creating refs15:26
TomyWork yeah15:26
^7heo_ → ^7heo15:26
TomyWork can i create an annotated tag without tagging it? :)15:26
→ m4sk1n joined15:26
→ snowkidind joined15:26
→ phtes joined15:26
→ daxroc joined15:26
whitby Uhhh I don't think so15:26
→ prosody joined15:26
whitby What would that look like?15:26
_ikke_ probably with plumbing tools15:26
TomyWork i.e. just get the sha1 of the annotated tag object15:26
← timvisher left15:26
→ nsh joined15:27
→ DuncanT joined15:27
_ikke_ you can use git hash-object -w to create them15:27
→ chigang joined15:27
_ikke_ If you know the format15:27
→ parliament joined15:27
Dougie187 Like, create an orphaned tag?15:27
TomyWork yeah15:27
→ Travis-42 joined15:27
→ timvisher joined15:27
→ cloudcell_ joined15:28
→ stoopkid joined15:28
TomyWork _ikke_ that sounds rather fragile :)15:28
→ dave0x6d joined15:28
→ blacksyke joined15:28
_ikke_ http://stackoverflow.com/10986615/15:28
→ Lowell joined15:28
→ suttonwilliamd joined15:28
Dougie187 Well, I doubt many people want to make orphaned tags. :P15:28
→ discopatrick joined15: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 problems15:28
→ kanzure joined15:28
→ lolmac_ joined15:28
→ ggherdov joined15:29
_ikke_ https://stackoverflow.com/questions/1098661515:29
Dougie187: I manually typed it :P15:29
whitby From memory?15:29
Nice15:29
_ikke_ whitby: From another PC :P15:29
Dougie187 _ikke_: That'd do it. :P15:29
→ MLM_ joined15:30
→ elmcrest joined15:30
_ikke_ But to push an annotated tag, it should be referenced anyway15:30
← ggherdov left15:30
_ikke_ TomyWork: Why not just create the tag and delete it afterwards?15:31
→ zmachine joined15:31
TomyWork _ikke_ i could do that...15:31
under a temporary name even15:31
→ codedmart joined15:31
→ johtso joined15:31
→ timwis joined15:31
TomyWork does the annotated tag care how it's named?15:31
_ikke_ No, just regular branch / ref restrictions15:31
TomyWork ah crap, it says "tag <tag-name>"15:32
in the tag15: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 joined15:32
_ikke_ A lightweight tag is just a ref (refs/tags/<name>) pointing to a commit15:32
an annotated tag is a tag object, pointed to by a tag ref15:32
← msonntag left15:33
→ Shashikant86 joined15:33
Dougie187 Sure, but I mean to see how to create them.15:33
Either way they are refs.15:33
← r4nd0m0ne left15:33
_ikke_ annotated tag is an object + ref15:33
Dougie187 Oh, right. ok15:33
So, he's making the object, not the ref (right now at least)15:34
_ikke_ Dougie187: He's making a lightweight tag15:34
→ mehdi___ joined15:34
→ wizonesolutions joined15:34
→ cstrahan joined15:34
→ manveru joined15:35
Dougie187 I'm confused then. He just asked if the annotated tag cares how it's named.15:35
TomyWork Dougie187 and it does15:35
→ angular_mike_ joined15:35
→ arand__ joined15:35
TomyWork git cat-file -p $tag says "tag blah" somewhere15:35
→ al-damiri joined15:35
freimatz Hi, i have a problem, a file obsesses me.15:36
→ aw1 joined15:36
← Tobbi left15:36
→ unholycrab joined15:37
TomyWork meaning what? :)15:37
do you want to get rid of it?15:37
!bfg15: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 joined15:37
→ gugah joined15:37
Seveas Or do you want to stalk it?15:37
Dougie187 Take pictures of it.15:37
→ timini joined15:38
Dougie187 Get it's phone number. :P15: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 unstaged15:38
the file is part of a submodule15:39
→ AaronMT joined15:39
Seveas git never ignores files it tracks, gitignore only applies to untracked files.15:39
freimatz the file is created during the make process15:39
_ikke_ And it also does not apply across submodules15:39
selckin gitignore is also ignored until the gitingore files is committed15:40
freimatz oh i'm wrong - i mean untracked, not unstaged15:40
_ikke_ selckin: false15:40
git reads it from the working tree15:40
freimatz git status: ... modified: src/MeasCtrl/Device/Driver/CAA/Wenzel (new commits, untracked content) ...15:40
selckin my tests say otherwise15:40
→ jgarr joined15:40
← feodaron left15:40
_ikke_ selckin: check you test15:40
→ Tobbi joined15:41
→ lindenle joined15:41
Seveas selckin: your test is faulty.15:41
← interrobangd left15:41
→ g105b joined15:41
Seveas https://dpaste.de/mrEq15:42
→ milkshoes joined15:42
← Mobutils_ left15:42
timini hey I want to get a list of commit which will conflict15: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 version15:43
→ gyre007 joined15:43
→ msonntag joined15:43
→ ulkesh joined15:43
freimatz git shows the file as untracked content, but i want to ignore it15:43
→ barq joined15:43
whitby selckin: I don't think that is the case, even if the file is untracked it will affect Git15:43
← _geoff left15:43
→ zivester joined15:43
→ stealthii joined15:44
Seveas freimatz: is it in the submodule's .gitignore?15:44
freimatz no15:44
Seveas add it there15:44
← netj left15:44
freimatz the submodule don't have a .gitignore15:44
→ fahadash joined15:44
→ ianmethyst joined15:45
→ netj joined15:45
freimatz should i add one?15:45
→ romerocesar joined15:45
Seveas yeah15:45
or, if you don't want to make changes to that submodule, in its .git/info/exclude15:45
→ gajus joined15:46
→ nostrora joined15:46
← lindenle left15:46
← zivester left15:46
→ Atemu joined15:46
freimatz the submodule does noch have a .git folder, only a .git file15:46
→ mischat_ joined15:47
← mischat_ left15:47
→ mischat_ joined15:47
freimatz if i add a .gitignore, does is hide the .gitignore of the supermodule?15:47
_ikke_ No, those two are separated15:47
← jellycode left15:48
_ikke_ have nothing to do with eachother15:48
→ zivester joined15:48
→ _geoff joined15:48
Seveas selckin: just tested with git 1.2.0, no change in behaviour.15:48
→ danielmahon joined15:48
_ikke_ wow, 1.2.015:48
the oldest tagged version, right?15:49
← theonefoo left15:49
Seveas no, but 1.0.0 behaves differently15:49
← Tobbi left15:49
Seveas (as in: can't get status to work :))15:49
1.1.0 works, still respects an untracked .gitignore15:49
_ikke_ So it's broken :P15:50
← mischat left15:50
freimatz hm after a "git submodule update --init" the wc is clean ... i have to do some further tests ...15:50
→ grilled-cheese joined15:50
→ grill_ joined15:51
timini is there any way to test if a cherry-pick will cause a conflict15:51
?15:51
anddam _ikke_: hey there15:51
Seveas timini: yes, by doing the cherry-pick.15:51
mgedmin you can add .gitignore to .gitignore15: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 fork15:52
mgedmin git will parse it, but it won't complain about an untracked .gitignore file15:52
timini arrrg, really I want to check hundreds of commits15:52
→ gabi_ joined15:52
_ikke_ mgedmin: though .gitignore is meant to be tracked15:52
timini so i guess i could run the cherry-pick, then abort it15:52
→ menip joined15:52
_ikke_ mgedmin: (there is .git/info/exclude if you want to have an untracked ignore file)15:52
mgedmin as for .git/info/exclude, when .git is a file instead of a directory15:53
_ikke_ mgedmin: You can add it in the location where the .git link file points to15:53
Seveas timini: so? for commit in $(<commits); do git cherry-pick -n $commit || echo "Cherry pick $commit failed"; git reset --hard; done15:53
← pity left15:53
mgedmin echo file-to-ignore >> $(git rev-parse --git-dir)/info/exclude15:53
I've a git exclude alias which does this15:53
_ikke_ Seveas: wrong highlight15:53
mgedmin best thing ever, highly recommended15: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 output15:53
← timvisher left15:53
→ modin joined15:53
Seveas _ikke_: ?15:54
_ikke_ Seveas: sorry, my bad15: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#L7915:54
← overlord_tm left15:54
← Es0teric left15:55
← ronskisika left15:55
→ timvisher joined15:55
← menip left15: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:55
← MineCoins left15: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
← chele left15:57
→ griffindy joined15:58
→ Es0teric joined15:58
→ pity joined15:58
mgedmin do you know which git version introduced @{push}?15:59
because 1.9.1 doesn't understand it15:59
→ aarobc joined15:59
← PCatinean left16:00
→ davidosomething joined16:00
← thierryp left16:00
→ thierryp joined16:01
← thierryp left16:01
← robattila256 left16:01
mgedmin ah, 2.5.016:01
← elect_ left16:03
→ e14 joined16:03
→ elect__ joined16:03
← _geoff left16:03
osse git tag --contains $(git log --grep='@{push}' --format=%H --reverse | head -1) --sort=version:refname | head -116:03
Unfortunately the first commit to mention it says something about "in a future patch" but it gets it right :P16:03
→ mmazing joined16: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 tags16:04
→ roelmonn_ joined16:04
← pepijndevos left16:05
← Snugglebash left16:05
← snowkidind left16:05
← GodGinrai left16:05
osse mmazing: are they refs/tags/foo ? or somewhere else under refs?16:06
→ HardlySeen joined16:07
← chandu20 left16:07
→ pepijndevos joined16:08
← HardlySeen left16:08
← roelmonnens left16:08
Seveas mmazing: did your tags actually move?16:08
I'm not sure if bfg moves tags. Also, already fetched tags won't be updated unless specifically fetched with git fetch --tags16:09
← roelmonn_ left16:09
→ snowkidind joined16:09
→ crayon joined16:09
← thiago left16:09
→ thiago joined16:09
← cdown left16:09
→ parasite_ joined16:10
osse docs say that it "rewrites your branches and tags" so I guess it should do so by default16:10
hence my question16:10
mmazing sec, looking into where exactly they are16:10
→ BSab joined16:10
← ianmethyst left16:10
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 joined16:11
Seveas mmazing: yes, and everyone who ever fetched from you needs to fetch --tags16:12
→ umpc joined16:12
→ ashokrajar joined16:12
→ anonymuse joined16:12
mmazing error: --mirror and --tags are incompatible16:12
hmmmm16:12
← griffindy left16:13
Jupelius_ → Jupelius16:13
Seveas --mirror pretty much implies --tags, so no need to use --tags16:13
→ nscott76 joined16:14
← BSAlb left16:14
→ Electrometro joined16:15
← gabi_ left16:15
← ThomasLocke left16:15
← Electrometro left16: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 distro16:16
→ Darren_ joined16:17
← mmazing left16:17
TomyWork can i make git for-each-ref skip refs/remotes/origin/HEAD somehow, without external tools?16:17
_ikke_ TomyWork: Not that I can see16:18
→ dreiss joined16:18
→ UnnamedPlayer joined16:19
babilen_ → babilen16:19
TomyWork k16:19
← timvisher left16:20
worstadmin Can I tell mergetool to accept all their changes?16:21
I pop'd a stash and I want to just take all their changes16:21
→ Snugglebash joined16:21
mgedmin googles up http://stackoverflow.com/a/41665589/11015116:21
→ timvisher joined16:21
← Gsham left16:22
← synthroid left16:22
TomyWork that's not mergetool, that's a merge strategy for git merge16:23
→ Gsham joined16:23
← nanga left16:23
TomyWork worstadmin and you're not gaining anything by that. you're trashing changes that were made since the stash was created16:23
← hhee left16:23
← Panacea left16:24
→ nanga joined16:25
← nanga left16:25
→ nanga joined16:25
← e14 left16:25
← Gloomy left16:25
← pity left16:25
← msonntag left16:26
← thiago left16:27
→ thiago joined16:27
→ jknetl joined16:27
→ ianmethyst joined16:28
→ msonntag joined16:29
← ianmethyst left16:29
→ e14 joined16:30
→ l33ch joined16:30
→ a_thakur joined16:32
→ mmazing joined16:32
→ _geoff joined16:33
mgoodwin This might sound strange but can I gitignore sub-repositories (i.e. so they don't show up as untracked folders)16:33
→ Gloomy joined16:34
osse mgoodwin: sure. ignore them like you would ignore a directory16:34
→ s2013 joined16:35
← tvw left16:35
→ tvw joined16:35
→ jozwior_ joined16:36
→ Tobbi joined16:36
← aax left16:36
← jozwior__ left16:37
← Balliad left16:38
timini hey I want to merge just one commit (not the latest) from one branch to another16:38
whitby timini: cherry-pick16:38
← douglascorrea left16:38
mgoodwin osse: ideally but that won't work in this case16:38
← eduardas_m left16:38
timini it seems cherry-pick changes the SHA of the commit16:38
osse mgoodwin: why?16:39
timini: correct. it creates a new commit similar to the original16:39
→ douglascorrea joined16:39
← ihradek left16: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 unmerged16:39
whitby timini: is that an issue? I don't think you'll be able to avoid it unless you can fast forward16:39
worstadmin Is REMOTE the stashed version of the file?16:39
osse timini: also correct16: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:40
← e14 left16:40
→ hahuang61 joined16:41
mgoodwin I need a "ignore all subordinate git repos" option16:41
osse mgoodwin: adding path/to/repo to .gitignore works just fine. I tested it right now16: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:41
osse timini: there is none. but it won't be a problem when you merge later on16:42
→ overlord_tm joined16:42
osse timini: and when you 'git diff branch1 branch2' that whole thing won't be shown16:42
timini: you can use git-cherry to look for "similar" commits16:42
timini OK looking for similar commits might be useful16: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 SHA16:43
← Snugglebash left16:43
timini When I merge will i have 2 commits with the same commit message?16:43
→ PettanShoutaKun joined16:44
PettanShoutaKun yyyyyyoooooooooooooooooooooo16:44
← umpc left16:44
PettanShoutaKun if I have branch A that was merged into master which contains branch A - B - C16:44
timini whitby, ok thanks forthe explination16:44
soif the commit dosn't ahve the same parent it will get a new SHA?16:45
_ikke_ timini: correct16: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 - C16:45
_ikke_ timini: the parent(s) are part of the data where the hash is calculated over16:45
PettanShoutaKun: By 'removing' commit B16: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_ joined16:46
_ikke_ yes16:46
PettanShoutaKun lol... just picking out the single merge commit?16:46
← hahuang61 left16:46
_ikke_ PettanShoutaKun: Sure16:46
→ brent__ joined16:46
_ikke_ That's the only thing that happens when you merge16:46
A new merge commit is created with changes from both sides and both sides are parent16:46
PettanShoutaKun but how do I drop just the merge commit?16:46
← timvisher left16:47
PettanShoutaKun how do I figure out which parent was master and which one isn't16:47
_ikke_ PettanShoutaKun: If you merge into master, then master is always the first parent16:47
PettanShoutaKun but how do I pick apart the actual merge commit?16:47
← bannakaffalatta left16:47
→ timvisher joined16:48
← douglascorrea left16: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 joined16:48
→ kpease_ joined16:49
→ e14 joined16:49
← ssitani left16:49
← ashokrajar left16:50
_ikke_ Right, because the merged in commits will also be part of the todo list\16:50
Not sure if there is an easy solution for that16:51
← Tobbi left16:51
_ikke_ except filtering out the commits that are on the secondary side of the merge16:51
→ Snugglebash joined16:53
← azerus left16:53
→ shinnya joined16:53
← g105b left16:54
← Sceorem left16: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 joined16:56
→ shum joined16:56
→ mp3 joined16:57
← sdothum left16:57
→ GodGinrai joined16:57
_ikke_ PettanShoutaKun: No automatic way16:57
← shum left16:57
_ikke_ They need to do git pull --rebase16:57
→ sdothum joined16:57
_ikke_ on master16:57
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: yes16:58
← Snugglebash left16:59
← rivarun left16:59
→ douglascorrea joined16:59
→ mischat joined16:59
→ rivarun joined17:00
← PettanShoutaKun left17:00
← Shashikant86 left17:00
← e14 left17:00
← douglasc_ left17:00
worstadmin When you have a merge conflict after stash pop'ing and you run `git mergetool` what do REMOTE, BASE, LOCAL represent?17:01
→ PettanShoutaKun joined17:02
← jnavila left17:02
← dreiss left17:02
← mischat_ left17:02
→ bannakaffalatta joined17:03
← sea-gull left17:03
→ ssitani joined17:04
← invisbl left17:05
→ azerus joined17:05
_ikke_ local: changes in the work-tree17:05
remote: changes from the stash17:06
← borkr left17:06
← rchavik left17:06
worstadmin Ah thank you17:06
BASE would be just the index then17:06
← PettanShoutaKun left17:06
→ ashokrajar joined17:07
→ borkr joined17:07
← Serpent7776 left17:08
← ashokrajar left17:09
→ suy joined17:10
→ pur3eval joined17:10
→ ashokrajar joined17:10
→ dreiss joined17:10
→ Cavallari joined17:10
← TomyWork left17:11
← monkeycat left17:12
← Es0teric left17:13
→ jagob joined17:13
← timvisher left17:14
→ Es0teric joined17:14
→ invisbl joined17:15
← GodGinrai left17:15
→ GodGinrai joined17:15
→ timvisher joined17:15
← dreiss left17:15
→ phanimah1sh joined17:15
→ kyan joined17:15
→ aard_ joined17:17
← nanga left17:17
← mentazoom left17:17
→ e14 joined17:18
→ nanga joined17:19
← nanga left17:19
→ nanga joined17:19
← phanimahesh left17:19
→ monkeycat joined17:19
← svm_invictvs left17:19
timini hey so I want to move a bunch of commits from branch1 to dev, whats the best way to do this?17:20
→ mehola joined17:21
j416 timvde: merge or rebase or cherry-pick or reset.17:22
← freimatz left17:23
→ chandu20 joined17:24
← anonymuse left17:24
← shinnya left17:25
→ Guest55 joined17:25
← mehola left17:26
→ anonymuse joined17:26
← crayon left17:26
→ elsevero joined17:27
elsevero its possible to change a commit message of one commit ?17:29
which is already on remote17:29
_ikke_ possible: yes, sensible: it depends17:29
← theoceaniscool left17:29
→ lindenle joined17:32
← a_thakur left17:32
→ durham joined17:32
→ kadoban joined17:32
← doener_ left17:33
← nickabbey left17:33
← fscala left17:34
→ raedah joined17:34
→ fscala joined17:34
← elect__ left17:34
← manuelschneid3r left17:35
← durham left17:35
← raspado left17:35
← s2013 left17:36
→ raspado joined17:36
→ durham joined17:36
← mischat left17:36
→ nickabbey joined17:37
→ mischat joined17:37
← raspado left17:40
→ [0xAA] joined17:41
← msonntag left17:41
→ PettanShoutaKun joined17:41
→ spacelord_ joined17:42
→ msonntag joined17:42
← diogenese left17:42
→ chardan joined17:43
→ setuid joined17:45
← Ryanar left17:45
← achadwick left17: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:46
→ hahuang61 joined17: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 joined17:47
setuid kadoban, Those aren't supported by these repos (git.kernel.org, etc.)17:48
Here's an example of what I get using an ssh tunnel:17:49
$ git clone git://localhost:2000/ubuntu/ubuntu-vivid.git17:49
Cloning into 'ubuntu-vivid'...17:49
fatal: protocol error: bad line length character: SSH-17:49
That's with an ssh tunnel set up to my outside bastion which has access to the git:// style URIs17:49
→ tyreld joined17:49
→ Ryanar joined17: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
As to your direct problem ... no idea.17:50
whitby setuid: git.kernel.org should support https17:50
→ phanimahesh joined17:50
← kurkale6ka left17:51
← Ryanar left17:51
← timvisher left17:51
→ sea-gull joined17:52
← Gsham left17:52
→ doener joined17:52
→ Endarked joined17: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 URIs17:52
I just tried a socks tunnel, also fails17:52
→ timvisher joined17: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 myhostWithAccess17:53
atrus, The *ONLY* port open is 443 behind this network17:53
so I had to open a remote ssh server on port 443, and I can tunnel into/through it17: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:53
← duderonomy left17:54
← phanimah1sh left17:54
← e14 left17: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 way17:54
setuid I could just ssh over there, git clone there, tar it up, then rsync it over, but that's heavy-weight17:54
For example: git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git17:55
No https version of that repo17:55
← anonymuse left17:55
→ svm_invictvs joined17:55
whitby Ah, that's not git.kernel.org :)17:55
→ anonymuse joined17:55
setuid Right, I have a handful of repos I'm going to clone in17:55
← metachr0n left17:55
← dhollinger left17: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 logging17:56
I'm comparing and inspecting commits17:56
→ imachuchu joined17:56
← yanome left17:56
tirej → Guest6103817:56
→ fatalhalt joined17:57
← fatalhalt left17:57
← ashokrajar left17: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:57
← Cavallari left17: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.git17:58
atrus setuid: the one you used before trying socks.17:59
i mean, a socks proxy isn't an http proxy, so that's going to go badly pretty fast17:59
← chardan left17:59
whitby setuid: the simplest way would probably be the "heavy-weight" clone somewhere else and copy over18:00
That would work with any repo on any host with any protocol18:01
→ jstimm joined18:01
← geoid_ left18: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 joined18:02
→ publio joined18:02
→ geoid_ joined18:02
← zivester left18:02
← Es0teric left18:02
← nettoweb left18:02
← cyan__ left18:02
whitby atrus: I had thought the http.proxy setting only applied to http:// repos18:02
similarly with https.proxy18:02
← d10n-work left18:03
→ Gsham joined18:03
← mischat left18:03
whitby Never mind me, https.proxy isn't a thing18:03
setuid core.gitproxy is18:03
→ wizardedit joined18:03
← wizardedit left18:03
→ wizardedit joined18:03
← chandu20 left18:03
setuid whitby, I'll try that, for now18:03
→ zivester joined18:03
setuid it's going tp pull a few hundred gigs over, but ah well18:03
← Kaisyu left18:04
← danielmahon left18:04
→ jccn joined18:04
whitby You could compress them in various ways in addition to tar but, yeah, it will still be a bit18:04
setuid 7z is the tightest, I'll use that18:05
but then I'm stuck because I can't ever update those repos18:05
I'll have to keep the remote repos 'live' and then constantly rsyn... wait, maybe that's easier18:05
whitby You wouldn't be able to push back over git:// anyway?18:05
← elsevero left18:06
whitby You can download it with the git history if that's what you're talking about18:06
setuid Just wanted to keep the local repo current with upstream18:06
← geoid_ left18:06
→ TomyLobo joined18:06
setuid can't do that if I don't have access to the upstream repo, even with a local clone I pulled elsewhere18:06
← borkr left18:06
whitby Yeah, you could instead run a full Git mirror18:07
The logical next step :)18:07
→ e14 joined18:07
← icey left18:08
→ armyriad joined18:09
→ cyan__ joined18:09
← svm_invictvs left18:09
→ borkr joined18:10
→ svm_invictvs joined18:10
← sdothum left18:11
← aarobc left18:11
→ Ryanar joined18:11
→ chardan joined18:12
→ metachr0n joined18:12
setuid I run a pile of public mirrors, I guess I'll add these too18:13
But I think I found an https mirror with these sources18:13
← Ryanar left18:13
→ Bizkit joined18:13
setuid Now I need to figure out these mitm proxies to get out over https18:13
← astrofog left18:13
→ sdothum joined18:13
← lindenle left18:14
→ lindenle joined18:14
← lindenle left18:14
→ lindenle joined18:15
← bongjovi left18:15
← Slush-_ left18:16
→ raspado joined18:16
← ssitani left18:17
→ Slush- joined18:17
→ re1 joined18:18
setuid grr, none of this works18:18
→ monokrome joined18:18
setuid git config --global --add core.gitProxy http://proxy.inet.hostile-network.com:8118:19
Is that not the correct syntax?18:19
← timvisher left18:20
→ AlineGomes joined18:20
→ dreiss joined18:21
← GavinMagnus left18:21
→ timvisher joined18:21
setuid n/m, looks like https://kernel.ubuntu.com is a DOA host18:21
*head -> desk*18:21
timini is there any way to list commits that touch a particular path but not another?18:22
_ikke_ timini: git log --all -- path18:24
→ tang^ joined18:24
→ miczac joined18:24
→ dhollinger joined18:24
gitinfo set mode: +v18:24
← jccn left18:25
→ P4nther joined18:26
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 folder18:27
→ jccn joined18:27
timini then that commit will show up18:27
but I'd like to be able to exclud commits that change anything in a particular path18:27
← invisbl left18:28
← P4nther left18:28
← anonymuse left18:29
← joki left18:29
_ikke_ Don't think log provides that18:30
→ invisbl joined18:30
→ duderonomy joined18:31
→ anonymuse joined18:31
→ Panacea joined18:31
→ howitdo joined18:32
← howitdo left18:32
→ howitdo joined18:32
← cyan__ left18:32
Seveas mgedmin: it was an experiment, superseded by a better heuristic. compactionheuristic code and config option have been yanked18:32
← borkr left18:33
← dodobrain left18:34
← marcogmonteiro left18:34
← mmazing left18:35
← dsantiago left18:36
PettanShoutaKun what is origin/HEAD18:37
← cdown left18:37
setuid pulling upstream repos over http is *PAINFULLY* slow vs. using https or the native git proto18:37
→ cdown joined18:37
PettanShoutaKun is that something I made being an idiot18:37
or something git has18:37
setuid Were you trying to convert a CVS repo to git?18:38
git clone on a git:// style URI provides progress stats, why no stats on http or https URIs?18:38
← LionsMane left18:38
→ matsaman joined18:39
→ notebox joined18:41
← Guest55 left18:42
→ vdv joined18:42
← Guest61038 left18:43
→ dodobrain joined18:44
→ tirej_ joined18:44
← chachasmooth left18:44
→ chachasmooth joined18:45
← l33ch left18:45
← _geoff left18:45
← [0xAA] left18:45
→ Guest55 joined18:45
→ raspado_ joined18:46
→ theoceaniscool joined18:47
Vampire0_ → Vampire018:47
→ jost__ joined18: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:48
→ raspado__ joined18:49
← raspado left18:49
→ pwnz0r joined18: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:50
← jost_ left18:51
← timvisher left18:51
→ diogenese joined18:51
← monkeycat left18:51
← PettanShoutaKun left18:51
→ timvisher joined18:52
← raspado__ left18:53
← raspado_ left18:53
→ raspado joined18:53
← gugah left18:54
→ zzz joined18:55
→ Es0teric joined18:57
→ tvl joined18:57
tvl → tobiasvl18:57
matsaman pwnz0r: think you'd have to contrive a combine user (foo & bar), for the simplest solution18:58
http://stackoverflow.com/questions/7442112/attributing-a-single-commit-to-multiple-developers18:58
combined* user, that is18:58
→ monkeycat joined18:58
→ dsantiago joined18:58
→ l33ch joined18:58
← grill_ left18:59
← finalbeta left18:59
→ finalbeta joined18:59
→ PettanShoutaKun joined19:00
← a3Dman left19:01
→ Tobbi joined19:01
← Panacea left19:02
→ druonysus joined19:02
← kpease_ left19:02
← chachasmooth left19:02
→ chachasmooth joined19:05
← PettanShoutaKun left19:05
← jmpp left19:05
→ Goplat joined19:05
← druonysus left19:06
← UnnamedPlayer left19:06
→ druonysus joined19:08
← zzz left19:08
→ LionsMane joined19:09
→ a3Dman joined19:09
pwnz0r interesting ill take a look thx19:09
→ elsevero joined19:09
→ Balliad joined19:13
→ Panacea joined19:13
← tvw left19:13
→ nevodka joined19:16
→ rgb-one joined19:16
rgb-one Hey gitteroos19:16
← YuGiOhJCJ left19:16
rgb-one giteroos?19:16
matsaman gitties19:16
rgb-one nah19:16
matsaman gits19:17
rgb-one hmm, not bad19:17
gitsters19:17
matsaman =)19:17
the git man, git-o-rama, the gitagitalingdong19:17
=/19:17
rgb-one lol19:17
I say all of em19:17
→ jmpp joined19:18
rgb-one :p Anyway, got an issue with ^M showing up in a git diff19:18
tango_ dos line endings19:18
matsaman that happens if you edit a Windows-sourced text file with CRLF line endings19:19
osse rgb-one: if the file is CRLF and Git is not configured to convert it, ^M will show up on added lines19:19
rgb-one: it might have been there in the removed line too19:19
matsaman rgb-one: open the file in Vim, then run :e +ff=unix, then delete the line endings on the lines you changed19:19
← cliluw left19: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, cool19:19
→ _geoff joined19:19
← jasom left19:20
matsaman excuse me, :e ++ff=unix19:20
rgb-one I actually haven't made a commit yet19:20
matsaman http://vim.wikia.com/wiki/File_format19:20
rgb-one this is to be my first commit19:20
matsaman perfect, then19:20
→ jasom joined19:20
matsaman you can also passively inform your colleagues about which line endings are correct (=P) with an additional dos2unix & commit19:21
→ cliluw joined19:22
→ pity joined19:22
rgb-one so I can use dos2unix recursively on a directory?19:22
→ mehola joined19:22
→ Sasazuka joined19:22
matsaman I believe dos2unix (quite sanely) suggests using find + dos2unix for that19:22
← timvisher left19:23
matsaman you might want to do it on a case-by-case basis, though19:23
there may be rare (if awful) situations where the line endings actually matter19:23
← hahuang61 left19:23
← phanimahesh left19:23
→ GavinMagnus joined19:23
rgb-one I'm gonna have a chat with the boss before I do anything19:23
matsaman no don't do that =P19:23
what is the file in question, some source file? What language?19:24
rgb-one html19:24
well it's a .php file19:24
→ timvisher joined19:24
← GavinMagnus left19:24
← _geoff left19:24
matsaman line endings almost certainly won't matter (other than CRLF being "wrong" =P) for those19:25
rgb-one so just commit then huh?19:25
← bocaneri left19:25
matsaman yes, be assertive =)19:26
← pity left19:26
matsaman but again, make a single commit for the dos2unix, and another or what you were actually originally changing19:26
that way the diffs will remain useful19:26
← mehola left19:26
matsaman and another For*19:26
← setuid left19:27
→ jaafar joined19:28
→ kulelu88 joined19:28
← pwnz0r left19:29
← rgb-one left19:30
← jmpp left19:31
→ jmpp joined19:31
← jmpp left19:31
→ jmpp joined19:31
dwmw2_DRS → dwmw2_gone19:34
→ _geoff joined19:34
← anonymuse left19:36
→ xissburg joined19:38
→ aidalgol joined19:38
← bannakaffalatta left19:38
← ShoaibJahejo left19:40
← romerocesar left19:40
→ bannakaf_ joined19:40
→ b1tchcakes joined19:41
← fscala left19:41
→ romerocesar joined19:41
← dsantiago left19:41
→ djam90 joined19:41
← nickabbey left19: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 joined19:42
→ ShoaibJahejo joined19:43
→ hamster joined19:44
→ nickabbey joined19:45
→ ls43z joined19:45
← cdg left19:45
← romerocesar left19:45
matsaman djam90: believe they call that a fork on github19:46
if you want it to be apparent, on github, in github ways, that that's what you've done19:47
← timvisher left19:47
← raspado left19:47
→ timvisher joined19:48
← chll_ left19:49
→ BSaboia joined19:49
← Balliad left19:50
← jknetl left19:51
→ rgb-one joined19:52
← nevodka left19:52
← tfrangio left19:52
← Guest55 left19:52
← doener left19:52
← BSab left19:53
rgb-one I think ^M line ending has to do with me using Brackets19:54
the text editor19:54
matsaman,19:54
→ hahuang61 joined19:54
← djam90 left19:55
rgb-one No it is unlikely, another file which wasn't edited in Brackets has the same line ending19:55
← netj left19:56
← multi_io left19:56
→ netj joined19:56
matsaman rgb-one: this is what's happening19:56
→ raspado joined19:56
matsaman your project has some files that have "Windows" style CR+LF line endings19:57
already19:57
→ multi_io joined19:57
matsaman and your editor is sanely configured to use only LF line endings19:57
further, git is "configured" (perhaps not explicitly) to use only LF line endings19:57
→ dsantiago joined19:58
matsaman either that, or your editor is configured to respect the file's current line endinges, rather, and is adding a CR19:58
→ anonymuse joined19:58
matsaman so git doesn't care, your editor can do either19:58
→ Guest49439 joined19:58
matsaman and HTML and PHP almost certainly don't care19:58
rgb-one cool19:58
matsaman so the only "problem" is that your diff is cluttered up with a meaningless char (^M)19:58
rgb-one yea19:58
← fscala left19: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
you can fix it forever by dos2unix'ing a file19:59
until some newb colleague undoes it19:59
then you can get progressively more lecture-y at them19:59
→ beneter joined20:00
← e14 left20:00
→ jstein_ joined20:00
→ mischat joined20:01
← mischat left20:01
← beneter left20:01
→ mischat joined20:01
← MatthewAllan93 left20:02
→ MatthewAllan93 joined20:02
← mischat left20:02
← unreal left20:03
jstein_ → jstein20:03
→ geoid_ joined20:04
← mp3 left20:04
← acetakwas left20:04
← Guest31408 left20:08
→ Guest31408 joined20:08
Guest31408 → DrAwesome20:08
← jstein left20:11
→ crayon joined20:11
← rivarun left20:11
→ rivarun joined20:12
→ Balliad joined20:12
→ Rodya_ joined20:13
→ misgit joined20:13
← Es0teric left20:14
← jeffreylevesque left20:14
→ codemann joined20:16
→ Ciy joined20:16
→ bannakaffalatta joined20:17
→ chipotle joined20:18
← timvisher left20:18
← misgit left20:19
← bannakaf_ left20:19
→ timvisher joined20:19
02HAAAAAN → tomaw20:20
→ Es0teric joined20:21
← bcc left20:21
→ yqt joined20:21
→ magellanicloud joined20:22
← Eryn_1983_FL left20:22
→ mischat joined20:22
→ lvh joined20:23
→ e14 joined20:24
← cdown left20:24
→ ssitani joined20:24
← Balliad left20:25
→ Guest55 joined20:29
→ misgit joined20:29
← misgit left20:30
← rnsanchez left20:30
← theoceaniscool left20:31
→ _geoff_ joined20:31
← nostrora left20:32
← canuk left20:34
← _geoff left20:34
← Orion3k left20:34
→ hasc joined20:34
→ aard__ joined20:35
→ Eryn_1983_FL joined20:35
← aard_ left20:37
← druonysus left20:37
→ aard_ joined20:39
→ bcc joined20:40
← bcc left20:40
→ bcc joined20:40
→ cdown joined20:40
← mentazoom left20:40
← aard__ left20:42
← timvisher left20:46
← sea-gull left20:47
← nscott76 left20:47
→ timvisher joined20:47
→ jnavila joined20:48
← douglascorrea left20:49
→ nettoweb joined20:49
dmc → fml20:50
← bcc left20:50
→ crose joined20:50
adymitruk also see smudge/clean scripting rgb-one20:52
← Guest55 left20:52
→ bcc joined20:54
← bcc left20:54
→ bcc joined20:54
→ Guest55 joined20:54
← GodGinrai left20:54
→ cyan__ joined20:55
→ sea-gull joined20:55
← aard_ left20:55
← perlpilot left20:55
→ nostrora joined20:56
→ cdg joined20:57
← bannakaffalatta left20:57
→ EliasH joined20:57
← treia left20:58
← Atemu left20:59
→ bannakaffalatta joined21:00
← e14 left21:00
→ hamster_ joined21:01
← robotroll left21:01
← hamster left21:01
← nostrora left21:02
→ alp82 joined21:02
← salamanderrake left21:03
← hamster_ left21:03
→ salamanderrake joined21:04
← crose left21:04
← todd_dsm left21:05
rivarun → Guest459721:05
← Guest4597 left21:05
→ rivarun joined21:05
→ e14 joined21:06
→ alp82_ joined21:08
← t0by left21:08
→ jm0 joined21:09
← jm0 left21:09
← alp82 left21:10
alp82_ → alp8221:10
← hahuang61 left21:10
→ dsdeiz joined21:11
← dsdeiz left21:11
→ dsdeiz joined21:11
← Guest49439 left21:11
→ borkr joined21:11
← timvisher left21:12
→ nevodka joined21:12
→ timvisher joined21:13
→ tvw joined21:13
→ jaggz joined21:14
→ druonysus joined21: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 made21:15
→ m0viefreak joined21:15
← Rodya_ left21:16
→ Guest49439 joined21: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
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_ joined21:16
← voldz1tic3n left21:17
← geoid_ left21:18
← matsaman left21:18
→ geoid_ joined21:18
adymitruk there won't be a conflict. You are committing changes21:20
it's only a conflict if you have others doing the same21:20
→ perlpilot joined21:20
adymitruk to not make it a nightmare for them, you probably don't want to commit all those changes21:20
← Rodya_ left21:20
jaggz it's just me21:21
→ gugah joined21:21
jaggz I did it on the remote system, out of desperation to get a service back up.. instead of locally on my beta system21:21
so both sides have the same changes to commit21:21
→ pity joined21:22
jaggz with either side possibly having a small number of their own unique changes (which shouldn't conflict)21:22
← cdown left21:22
jaggz but I'm not sure what happens to the mass of same exact changes, uncommitted, from both sides21:22
→ apotry joined21:22
← EliasH left21:23
← geoid_ left21: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 system21:23
→ Rodya_ joined21:23
← Gsham left21:24
→ EliasH joined21:24
→ nostrora joined21:25
→ aard_ joined21:25
← pity left21:26
← sim590 left21:27
→ kaldoran joined21:27
→ geoid_ joined21:27
← sea-gull left21:27
→ sim590 joined21:28
← noecc left21:28
← geoid_ left21:28
adymitruk oh I see21:29
so you have to decipher through all of your uncommitted changes21:29
the best thing to do there if it will work at all is to look at modified dates in the files system itself21:29
if that does work, you can pipe an output to git add or git reset to untagle them into 2 separate commits21:30
jaggz: ^21:30
→ hahuang61 joined21:31
→ aard__ joined21:32
← nostrora left21:32
← rivarun left21:34
→ gunnaro joined21:34
← xissburg left21:34
→ rivarun joined21:34
→ Atm0spher1c joined21:35
← aard_ left21:35
← nevodka left21:36
← cyan__ left21:36
← al-damiri left21:37
← ramsub07 left21:37
→ ramsub07 joined21:38
← Ciy left21:39
← gunnaro left21:41
← hahuang61 left21:41
jaggz adymitruk, reading about git reset :)21:42
adymitruk add/reset.. checkout ... the swiss army knives of git21:43
good to know how they work well21:43
jaggz "In the first and second form, copy entries from <tree-ish> to the index."21:43
tree-ish? is that the on-disk files?21:44
what's the 'index'?21:44
→ ramsub08 joined21: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:44
← ramsub07 left21:44
← rgb-one left21:45
← timvisher left21:45
adymitruk If you don't know that, you need to take the nex t 60 minutes and read the git-scm.org/book21:46
← chipotle left21:46
→ timvisher joined21:46
adymitruk if you don't, you'll probably attain more frustration than productivity21:46
→ manuelschneid3r joined21:46
→ xissburg joined21: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:47
← Sasazuka left21:49
← jimi_ left21:50
→ GodGinrai joined21:50
← enckse left21:50
← storrgie left21:50
← GodGinrai left21:50
→ GodGinrai joined21:50
→ Sasazuka joined21:50
→ enckse joined21:51
→ storrgie joined21:53
← synthroid left21:53
→ chipotle joined21:53
→ roelmonnens joined21:54
← bannakaffalatta left21:54
← cdg left21:54
→ cdg joined21:55
← notebox left21:56
← jccn left21:56
→ ramsub07 joined21:57
← aidalgol left21:58
← ramsub08 left21:58
← jason237 left21:58
← jnavila left21:58
← roelmonnens left21:58
→ XiaoMianTiao joined21:58
→ jason237 joined21:59
← jason237 left21:59
← Panacea left22:00
→ pom joined22:00
→ nostrora joined22:01
← Guest49439 left22:01
→ jason237 joined22:01
→ k5tux joined22:02
→ jason_ joined22:03
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 files22:04
When in conflict, you can do git checkout --theirs ovq.php (assuming you're on test)22:05
← dreiss left22:06
→ notebox joined22:07
k5tux That seems to have done the trick. Thanks _ikke_.22:07
← timvisher left22:07
→ mki_ joined22:07
→ timvisher joined22:08
→ Guest49439 joined22:09
← lindenle left22:10
→ mki joined22:10
→ voldz1tic3n joined22:10
← XiaoMianTiao left22:11
← e14 left22:11
← mki_ left22:12
← Outsider__ left22:12
← nostrora left22:14
← madewokherd left22:14
→ gg_ joined22:14
→ lindenle joined22:14
→ ISmithers joined22:15
← mki left22:15
← nickabbey left22:15
→ hahuang61 joined22:15
← Guest49439 left22:16
← gg_ left22:16
← unbalanced left22:18
→ dreiss joined22:19
→ sea-gull joined22:19
→ todd_dsm joined22:19
→ Gsham joined22:19
← ash_workz left22:22
→ bernardio joined22:22
→ nidr0x joined22:23
← pom left22:26
← zivester left22:27
← PinealGlandOptic left22:28
→ WayToDoor joined22:28
← sea-gull left22:29
← YourTheBombNow23 left22:29
→ DelTree joined22:30
← Sasazuka left22:33
← WayToDoor left22:34
← jmpp left22:35
→ Lto7 joined22:35
← bernardio left22:35
→ thierryp joined22:37
← timvisher left22:37
→ timvisher joined22:38
← ikelso left22:39
→ ikelso joined22:40
→ bannakaffalatta joined22:40
← ikelso left22:41
→ zivester joined22:42
→ ikelso joined22:42
→ jmpp joined22:42
← jmpp left22:42
→ jmpp joined22:42
← magellanicloud left22:42
→ Noodlewitt joined22:42
→ jimi_ joined22:44
← druonysus left22:45
← m4sk1n left22:45
→ cdown joined22:47
← Bizkit left22:47
← nettoweb left22:51
← Endarked left22:52
← tirej_ left22: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:52
→ mki joined22:53
← fstd left22:53
→ eclaesson joined22:54
→ aard_ joined22:54
→ al-damiri joined22: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 repo22:55
→ jccn joined22:55
thiago mgoodwin: no, there isn't.22:55
mgoodwin: but prune doesn't remove local branches. Only remote branches that the remote no longer has.22:56
← ikelso left22:56
thiago b1tchcakes: ok, explain your problem in Git rms.22:56
→ ikelso joined22:56
→ fstd joined22:56
← mischat left22:56
← ispn left22:57
→ Poppa joined22:57
← Dougie187 left22:57
← aard__ left22: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 exist22:57
→ matsaman joined22:59
← Poppabear left22:59
thiago repeating: git remote prune does not remove local branches22:59
it only removes the local copy of a remote branch if that remote branch no longer exists22:59
mgoodwin I think you're trying to tell me it already does what I want is that correct22:59
← ResidentBiscuit left23:00
← dsdeiz left23:00
← LionsMane left23:00
← jagob left23:00
← ikelso left23:00
← fmeerkoetter left23:01
→ fmeerkoetter joined23:01
← chardan left23:01
← Gloomy left23:01
← miczac left23:02
← aard_ left23:02
← vdv left23:02
← Es0teric left23:03
→ s17 joined23:06
→ cdg_ joined23:07
← cdg_ left23:07
→ robattila256 joined23:08
← anonymuse left23:08
← Tsutsukakushi left23:09
fml → fleshbag23:10
← cdg left23:10
← Darren_ left23:11
← jimi_ left23:12
← manuelschneid3r left23:12
← timvisher left23:12
→ chardan joined23:13
→ timvisher joined23:13
→ Ryanar joined23:15
← DrAwesome left23:16
← LeBlaaanc left23:17
← Lto7 left23:19
→ ToBeCloud joined23:20
gitinfo set mode: +v23:20
← mki left23:20
→ deadprez joined23:20
→ Tsutsukakushi joined23:21
→ endiruna joined23:21
← apotry left23:22
→ sea-gull joined23:22
→ pity joined23:22
→ anonymuse joined23:22
→ astrofog joined23:23
← hahuang61 left23:24
← lindenle left23:24
← GodGinrai left23:24
← tvw left23:24
← Eryn_1983_FL left23:24
← jasom left23:24
← finalbeta left23:24
← dhollinger left23:24
← AlineGomes left23:24
← TomyLobo left23:24
← msonntag left23:24
← overlord_tm left23:24
← snowkidind left23:24
← timini left23:24
← cstrahan left23:24
← mehdi___ left23:24
← glebihan left23:24
← thallada left23:24
← tabakhase left23:24
← dustinm left23:24
← uidzer0 left23:24
← brandonw left23:24
← ftoulemo1 left23:24
← colona_ left23:24
← TyrfingM1olnir left23:24
← Learath2 left23:24
← mkoskar left23:24
← _W_ left23:24
← forrestv left23:24
← WakiMiko left23:24
← Noldorin left23:24
← tristanp left23:24
← ToBeFree left23:24
← solution_ left23:24
← TinkerTyper left23:24
← Eugene left23:24
← cyberz left23:24
← slixpk left23:24
← roflin left23:24
← daopu[m] left23:24
← Remramm left23:24
← habbasi left23:24
← rudi_s left23:24
← uebera|| left23:24
→ hahuang61 joined23:25
→ lindenle joined23:25
→ GodGinrai joined23:25
→ tvw joined23:25
→ Eryn_1983_FL joined23:25
→ jasom joined23:25
→ finalbeta joined23:25
→ dhollinger joined23:25
→ AlineGomes joined23:25
→ TomyLobo joined23:25
→ msonntag joined23:25
→ overlord_tm joined23:25
→ snowkidind joined23:25
→ timini joined23:25
→ cstrahan joined23:25
→ mehdi___ joined23:25
→ thallada joined23:25
→ tabakhase joined23:25
→ glebihan joined23:25
→ dustinm joined23:25
→ uidzer0 joined23:25
→ brandonw joined23:25
→ ftoulemo1 joined23:25
→ colona_ joined23:25
→ TyrfingM1olnir joined23:25
→ Learath2 joined23:25
→ mkoskar joined23:25
→ _W_ joined23:25
→ forrestv joined23:25
→ WakiMiko joined23:25
→ Noldorin joined23:25
→ tristanp joined23:25
→ ToBeFree joined23:25
→ solution_ joined23:25
→ TinkerTyper joined23:25
→ Eugene joined23:25
→ cyberz joined23:25
→ slixpk joined23:25
→ roflin joined23:25
→ daopu[m] joined23:25
→ Remramm joined23:25
→ habbasi joined23:25
→ rudi_s joined23:25
→ uebera|| joined23:25
→ ash_workz joined23:25
← Karazhan left23:25
← dhollinger left23:25
← thallada left23:25
← TomyLobo left23:25
← cstrahan left23:25
← AlineGomes left23:25
← mehdi___ left23:25
← astrofog left23:25
→ Karazhan joined23:25
→ Sceorem joined23:25
→ dhollinger joined23:26
← aw1 left23:26
→ thallada joined23:26
→ astrofog joined23:26
→ Qzuw joined23:27
← pity left23:27
→ govg joined23:27
← deadprez left23:27
→ AlineGomes joined23:27
→ cdg joined23:28
← Sceorem left23:28
→ biheho joined23:28
← biheho left23:28
← Arban left23:29
← gugah left23:30
→ Kaisyu joined23:30
→ mehdi___ joined23:30
→ cstrahan joined23:30
→ dsdeiz joined23:31
← dsdeiz left23:31
→ dsdeiz joined23:31
← cdg left23:32
← Guest55 left23:32
← _geoff_ left23:33
← msonntag left23:33
← borkr left23:33
← Qzuw left23:34
← Rodya_ left23:34
→ Rodya_ joined23:35
← sea-gull left23:37
→ hsag joined23:37
← dersand left23:38
→ Guest55 joined23:38
← hsag left23:39
← Ryanar left23:39
← Rodya_ left23:39
→ aw1 joined23:39
→ aidalgol joined23:41
→ msonntag joined23:41
→ gugah joined23:41
← Gsham left23:41
→ romerocesar joined23:42
← AaronMT left23:43
→ cdg joined23:43
→ druonysus joined23:43
← dsantiago left23:43
← oskarkv left23:44
→ Gsham joined23:44
→ dsantiago joined23:45
← msonntag left23:46
← romerocesar left23:47
← timvisher left23:49
← leeN left23:49
→ timvisher joined23:50
→ nettoweb joined23:50
→ msonntag joined23:51
← ssitani left23:51
→ cnujs joined23:51
← Vortex34 left23:55
→ nevodka joined23:55
← fahadash left23:55
→ sammyo joined23:56
→ polyrob_ joined23:56
← polyrob_ left23:56
→ polyrob_ joined23:56
← jarshvor left23:57
→ mischat joined23:58
→ menip joined23:58
← cnujs left23:59

Logs Search ←Prev date Next date→ Channels Documentation