Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-04

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

All times shown according to UTC.

Time Nick Message
00:02 rominronin joined #git
00:10 CheckDavid joined #git
00:12 cdown joined #git
00:20 Pseudocrat joined #git
00:20 Pseudocrat joined #git
00:27 ertes joined #git
00:31 jimi_ joined #git
00:32 gtristan joined #git
00:35 Cwolf3D joined #git
00:43 yehowyada joined #git
00:45 Learath2 joined #git
00:51 anonymuse joined #git
00:51 dsdeiz joined #git
00:51 dsdeiz joined #git
00:52 YuGiOhJCJ joined #git
00:54 cdg joined #git
00:55 hahuang61 joined #git
00:55 anuxivm left #git
00:56 imachuchu j416: if you're still here, what I decided to do was rebase the branch, squash to one commit, make a merge branch with ours strategy, cherry pick the squashed commit with no commit, then amend the merge commit with the new changes. I was a bit leary of touching filter-branch, but I'll definitely look more into useing replace. Thanks!
00:57 Khisanth joined #git
01:03 buffal0 joined #git
01:05 cdown_ joined #git
01:06 dave0x6d joined #git
01:08 cdg joined #git
01:11 DolpheenDream joined #git
01:14 romerocesar joined #git
01:15 bremner git fsck reports "error in commit 62c6bb99d1297712e821eb13f617dfa52bd25e7a: invalid format - expected 'committer' line", but git cat-file -p shows a commiter line. Any idea what's up with that?
01:17 thiago maybe there's another copy of that object and git fsck sees it
01:17 thiago try repacking and pruning (git repack -d)
01:18 bremner Nothing new to repack
01:18 bremner it seems there is just one pack
01:21 MuffinMedic Hey guys, trying to wrap me head around an idea I don't quite understand. Someone said I can "create a local branch from upstream master and push to origin" - I'm good with the local branch from the upstream master, I think - What is my origin though that I pust ot?
01:22 MuffinMedic (upstream master from a repo i forked)
01:23 elh9_ joined #git
01:24 aeontech joined #git
01:25 treehug88 joined #git
01:25 Peetz0r joined #git
01:25 elh9__ joined #git
01:25 Zarthus MuffinMedic, the origin is the repository you had write access to (your fork)
01:26 MuffinMedic OH hi Zarthus ...
01:26 Zarthus the upstream is the upstream of the fork, the place you were pulling updates and syncing from/with
01:27 peepsalot joined #git
01:27 MuffinMedic So I think I get this workflow now. (1) fork project (2) create branch (3) make changes (4) push to my branch (5) submit PR (6) when PR is approved, update my origin/master from the updated upstream/master ?
01:27 Ekho joined #git
01:27 Zarthus the last step is unnecessary
01:28 Zarthus submitting the PR is the last step you need to do (other than fixing any problems it may have)
01:28 peepsalot joined #git
01:28 MuffinMedic Yea, but if I want my master to be in sync with the upstream, i would do the update, right?
01:28 Zarthus yeah, although nothing stops you from syncing a new branch with upstream
01:29 Zarthus keeping the origin/master up to date is convienient
01:30 mikeric joined #git
01:30 PtxDK joined #git
01:32 courrier joined #git
01:32 MuffinMedic So the last step is really just for personal convenience but not required, got it
01:35 rominronin joined #git
01:36 mizu_no_oto joined #git
01:38 cagedwisdom joined #git
01:41 Pseudocrat joined #git
01:41 Pseudocrat joined #git
01:45 durham joined #git
01:57 cdg joined #git
01:57 jbu joined #git
01:58 cdg_ joined #git
01:59 almy joined #git
02:00 jbu Hi all: I have a local branch "master2" that diverged from the remote master.  I want to set up a demonstration scenario in which I try to push but I get an error stating that I need to merge or rebase before I push.  Therefore, I want to push master2 to master to see the error.  However, in doing so I realized some other understanding wasn't correct.  Seems like I cannot set my upstream to master.  "git push --set-upstream origin master" prints "Branch master set
02:00 jbu up to track remote branch master from origin" and doesn't mention master2 at all.  Anyone know why?
02:00 jbu I am running that command from my local master2 branch
02:01 jbu Let me clarify: I *want* to see the error stating that I need to rebase or merge.
02:09 pks joined #git
02:10 Sasazuka joined #git
02:10 arescorpio joined #git
02:11 Fissure joined #git
02:16 aeon joined #git
02:19 gtristan joined #git
02:21 finalbeta joined #git
02:21 cqi joined #git
02:22 howdoi joined #git
02:24 aw1 joined #git
02:31 ResidentBiscuit joined #git
02:32 Nilesh_ joined #git
02:34 b1tchcakes joined #git
02:35 rewt jbu, why not just set up your branch for that instead of mixing branches?
02:35 cdown joined #git
02:35 rewt git commit ; git push ; git reset --hard @^ ; git commit ; git push (error)
02:36 jbu rewt, oh :)
02:38 jbu rewt, thanks
02:39 jbu rewt, actually the problem I encountered seems to possibly be unrelated.  I am on a branchB, but trying to push to a remote branchA.  When I do git push origin branchA, it says "Everything up to date" even though I can go to my remote branch A and see that my branchB changes were not applied...any idea why this is?
02:39 jbu I would have expected the "git push origin branchA" to have failed
02:40 rewt i believe that pushes your local branchA to its upstream
02:40 jbu branch B has (X - Y) and remote branch A has log of (X - W - Z)
02:40 jbu after "git push origin branchA" both branches aren't modified
02:41 rewt does your local branchA match origin/branchA ?
02:41 jbu yes
02:41 rewt that's why nothing changed
02:41 rewt you're pushing your local branchA to remote branchA
02:46 jbu Well I even did a "git push --set-upstream origin branchA" from branch B
02:46 jbu rewt, what you said would make sense if I had my upstream of branchA set to remote branchA
02:46 jbu make sense to me*
02:46 cdown_ joined #git
02:46 Vampire0_ joined #git
02:46 rewt is this after your earlier attempt at mixing branches with the error about no mention of branchB?
02:46 jbu rewt, yes, I am mixing branches now
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:49 shpew12 joined #git
02:50 mehola joined #git
02:50 d^sh joined #git
02:50 jbu when in branchB, git status says it is up-to-date with origin/<branchB> even though I've done "git push --set-upstream origin <branchA>"
02:51 rewt try  git branch --set-upstream-to=origin/branchA
02:52 rewt and don't forget that / between the remote name (origin) and the branch name (branchA)
02:53 aavrug joined #git
02:54 jbu rewt, that fixes "git status" showing the wrong upstream on origin, however, a "git push origin branchA" doesnt actually push to origin branch A
02:55 rewt "git push origin branchA" pushes your local branchA to its upstream branch on the origin remote, regardless of what branch you have checked out
02:57 rewt you can try "git push origin :origin/branchA" or something like that to push your currently checked out branch (branchB) to origin/branchA
02:57 jbu "git push origin master
02:57 jbu Find a ref that matches master in the source repository (most likely, it would find refs/heads/master), and update the same ref (e.g. refs/heads/master) in origin repository with it. If master did not exist remotely, it would be created."
02:58 jbu --from git documentation
02:58 jbu seems you're right about that
02:58 fatalhalt joined #git
02:58 jbu rewt, ok I think my problem was that before, I always named a branch to its corresponding name on origin. so my command always did what i expected
02:59 batrick joined #git
02:59 jbu and git push origin master actually finds the local refspec master and pushes to origin...it's not that it pushes curr branch to origin <branch>
02:59 rewt right
03:01 dsantiago joined #git
03:02 jbu rewt, you were right about the colon syntax to specify dest too...git push origin branchB:branchA failed as I expected it to
03:02 jbu rewt, thanks for all your help
03:02 jbu your name also seems familiar, i bet you've helped me here before too
03:04 [0xAA] joined #git
03:06 rominronin joined #git
03:07 Lyqyd joined #git
03:11 chachasmooth joined #git
03:11 madewokherd joined #git
03:15 brent__ joined #git
03:19 g__k__ joined #git
03:21 elh9 joined #git
03:22 dweelie joined #git
03:24 sbulage joined #git
03:24 elh9 joined #git
03:28 peeps[lappy] joined #git
03:29 hexagoxel joined #git
03:35 thiago joined #git
03:38 Goplat joined #git
03:39 Siegfried joined #git
03:41 bronson joined #git
03:44 sunri5e joined #git
03:45 thiago joined #git
03:49 aeontech joined #git
03:50 a_thakur joined #git
03:50 a_thakur joined #git
03:53 orzo joined #git
03:54 Vortex35 joined #git
03:54 orzo I screwed up and need help.  I lost a lot of work using reset --hard
03:54 orzo the work that was lost was not committed, but it was just recently stashed
03:54 orzo and then i ran "stash pop" before the reset
03:55 orzo is there any chance the popped stash data is still in my .git folder?
03:59 rudi_s orzo: Yes. First, make a !backup.
03:59 gitinfo orzo: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
03:59 justanotheruser joined #git
04:00 Oatmeal joined #git
04:03 subhojit777 joined #git
04:04 orzo done
04:04 orzo i think i found the data already
04:04 rudi_s Then work on the copy so you can't make it any worse. - Then run git fsck --unreachable | grep commit
04:04 fstd_ joined #git
04:04 orzo googling clued me to check for a git hash in my console scroll back printed by the stash pop command
04:04 rudi_s orzo: Then run git show on each of those commit ids and look for the stash.
04:05 rudi_s Or that, that's much easier.
04:05 orzo man
04:06 orzo looks like there's going to be no problem
04:06 orzo i had screamed and beat on things
04:06 rudi_s Btw. the man page for git-stash has a short example how to "recover" dropped stashes.
04:06 rudi_s ;-) - once you git add something, git won't loose it (unless you destroy .git).
04:09 Peetz0r joined #git
04:11 Atrumx joined #git
04:15 xall_ joined #git
04:15 digidog__ joined #git
04:15 digidog_1 joined #git
04:17 mikeric joined #git
04:17 aavrug joined #git
04:25 altendky joined #git
04:29 diogenese joined #git
04:30 mizu_no_oto joined #git
04:31 Limes_ joined #git
04:33 cagmz joined #git
04:35 Darren_ joined #git
04:37 rominron_ joined #git
04:42 mizu_no_oto joined #git
04:47 leftriver88 joined #git
04:49 dreiss joined #git
04:51 leftriver88 Why would a rebase operation abort *after applying 4 commits* stating that "local changes will be overwritten"?
04:53 kadoban Maybe it doesn't check in advance? Dunno
04:58 Atm0spher1c joined #git
05:03 leftriver88 kadoban: The funny thing is that the issue only happens in my linux virtual machine, but it works in my macos host machine.
05:03 kadoban Well, do you have local changes in both?
05:04 leftriver88 kadoban: in macos, git is 2.6.4 and in virutal machine it is 2.10
05:04 kadoban Also could be different behavior on different git versions.
05:04 leftriver88 kadoban: There are no localchanges at all....
05:04 kadoban 's weird
05:05 leftriver88 I even cloned the whole repo to a different folder and tried the rebase from there...same result.
05:05 ayogi joined #git
05:05 kadoban Maybe a bug. How new is 2.10? I have no idea what version I'm on right now.
05:05 leftriver88 2.11 is the current stable, I think
05:06 netj joined #git
05:07 acetakwas joined #git
05:08 brent__ joined #git
05:09 justanotheruser joined #git
05:17 skypuke joined #git
05:18 jgrasser joined #git
05:21 skypuke joined #git
05:24 subhojit777 joined #git
05:25 inflames joined #git
05:35 dan2k3k4 joined #git
05:35 vdv joined #git
05:37 Atm0spher1c joined #git
05:41 ghostlight joined #git
05:51 brent__ joined #git
05:51 kugel joined #git
05:51 kugel joined #git
05:52 plos joined #git
05:53 Cabanossi joined #git
05:54 Sheogorath[m] joined #git
05:57 dodobrain joined #git
05:58 freimatz joined #git
06:00 hahuang61 joined #git
06:02 acetakwas joined #git
06:07 svm_invictvs joined #git
06:10 rominronin joined #git
06:10 bocaneri joined #git
06:11 rscata joined #git
06:19 GodGinrai joined #git
06:20 star_prone joined #git
06:26 scorphus joined #git
06:33 ogny joined #git
06:36 dan2k3k4 joined #git
06:38 M-shine joined #git
06:38 mtso[m] joined #git
06:38 kineticrootkit[m joined #git
06:38 saintaquinas[m] joined #git
06:38 Mher[m] joined #git
06:38 kikijiki[m] joined #git
06:38 am2on joined #git
06:38 M-nated joined #git
06:38 enjunear[m] joined #git
06:38 Dhanya[m] joined #git
06:38 samwise[m] joined #git
06:38 M-meznak joined #git
06:38 Tiaan[m] joined #git
06:38 unclechu joined #git
06:38 alaeri[m] joined #git
06:38 M-mistake joined #git
06:38 Remramm joined #git
06:38 Ineentho[m] joined #git
06:38 musicmatze[m] joined #git
06:38 aviraldg joined #git
06:38 srkrishna[m] joined #git
06:38 WillianPaiva[m] joined #git
06:38 Start[m] joined #git
06:38 SpEcHiDeR joined #git
06:38 monomon[m] joined #git
06:38 mei[m] joined #git
06:38 malo[m] joined #git
06:38 UncleCJ joined #git
06:38 patrickr[m] joined #git
06:38 davix[matrix] joined #git
06:38 Carlos[m] joined #git
06:38 unilovelight[m] joined #git
06:38 scrambo[m] joined #git
06:38 eltopo[m] joined #git
06:38 timlyo[m] joined #git
06:38 Salander27 joined #git
06:38 daopu[m] joined #git
06:38 M64137[m] joined #git
06:38 hallogallo[m] joined #git
06:38 kjsage[m] joined #git
06:38 Bloo[m] joined #git
06:42 xall_ joined #git
06:45 ki0 joined #git
06:47 Junior joined #git
06:47 Junior yello! :)
06:50 Junior If possible please tell me what to do in the following situation: I have a git project named "project_a" for "customer_a". I would like to offer a "peak preview" for "customer_b" so i would like to "clone" the "project_a" into "project_b" , do some changes so that project_a contains some client details, pictures etc. After he previews this i will continue work on "project_a" untill i consider that it's stable and then move this changes to "project_b". How c
06:50 Junior Bottom line, the question is how can i apply the changes from "project_a" to "project_b" at a later date
06:51 grawity have two branches and `git merge`
06:52 bremner or cherry-pick. Those are pretty much the options.
06:53 ThomasLocke joined #git
06:53 ThomasLocke joined #git
06:57 tterrag joined #git
07:00 dan2k3k4 joined #git
07:00 JeroenT joined #git
07:00 dermoth joined #git
07:00 Raging_Hog joined #git
07:00 hahuang61 joined #git
07:00 abab joined #git
07:01 Siegfried joined #git
07:03 dan2k3k4 left #git
07:06 CountryNerd joined #git
07:09 dan2k3k4 joined #git
07:09 rominronin joined #git
07:09 JeroenT joined #git
07:13 chele joined #git
07:14 dan2k3k4 joined #git
07:15 systemovich joined #git
07:15 CountryNerd joined #git
07:16 nd_ joined #git
07:19 star_prone joined #git
07:21 qt-x joined #git
07:21 Junior grawity and/or bremner can't i make a different git project?
07:21 Electrometro joined #git
07:22 Junior i am asking this because i am using gitlab and have som CI scripts so i sent to some hosts the changes after succesfull build.
07:22 grawity it doesn't matter to git really
07:23 Junior ok, so bottom line is that i can't have two separated projects, i need to have branches
07:24 kadoban You can move branches between repos essentially at will, git doesn't care.
07:25 kadoban That's what push and fetch do
07:25 Junior to better understand i am talking about a website that has different between those two clients just css and images. Theoretically i could overwrite files from project_b with those from project_a but it beats the purpose of git
07:25 Junior kadoban i would like developers to know that those are two distinct projects and not branches
07:25 Junior but if i can
07:25 kadoban So tell them that I guess?
07:26 Junior but if i can't, i can't :)
07:26 Junior kadoban of course they will know, but it cleaner, it's more correct to have distinct projects
07:26 Junior Sorry for bothering, don't want to waste your time
07:26 mikeric joined #git
07:27 zefferno joined #git
07:27 kadoban Well, they can be distinct repos
07:28 Junior kadoban, how can that be done?
07:28 Junior threoreticall now i would have to copy project_a to project_b folder, remove the git directory and do a "git init" then change remote
07:29 aavrug joined #git
07:29 kadoban I'd probably clone the repo for the customer_b stuff, and then create a branch in there for customer-b-specific stuff and use that
07:30 kadoban Later, you can fetch again from the original and either merge those changes into your customer-b-specific stuff, or rebase the b-specific stuff onto the new stuff, whatever.
07:31 timvisher joined #git
07:33 Junior Ok, to see if i understand i will clone proiect_a from gitlab into project_b folder. I will create a new branch inside the project_b repo name "customer_b" and do there the changes. When i am done with changes in project_a will pull into project_b the changes and see how i can merge my changes there
07:33 Junior Correct?
07:33 Junior Pretty much that's what you said, but need to be 100% sure :)
07:34 kadoban Junior: Sounds correct, though I'd fetch instead of pull and then see what you want to do from there.
07:34 PCatinean joined #git
07:35 Tobbi joined #git
07:35 Junior kadoban i see, haven't though of doing so, thank you! :)
07:35 kadoban Anytime
07:38 Sadeukko joined #git
07:38 dan2k3k4 joined #git
07:38 xall joined #git
07:42 overlord_tm joined #git
07:46 [0xAA] joined #git
07:47 freimatz joined #git
07:48 pks joined #git
07:48 freimatz joined #git
07:49 zeroed joined #git
07:49 zeroed joined #git
07:49 Remramm joined #git
07:49 Remramm joined #git
07:50 TomyWork joined #git
07:56 xpk joined #git
07:56 [0xAA] joined #git
07:57 rchavik joined #git
07:57 dreiss joined #git
07:58 ayjay_t joined #git
07:59 xpk joined #git
08:01 [0xAA] joined #git
08:01 Singmyr joined #git
08:05 JeroenT_ joined #git
08:06 Derperperd joined #git
08:15 jnavila joined #git
08:16 troulouliou_div2 joined #git
08:17 eduardas_m joined #git
08:17 danslo joined #git
08:21 BadSnappa joined #git
08:22 lb1c joined #git
08:23 byte512 joined #git
08:24 FreakySneaky joined #git
08:24 mehola joined #git
08:26 eduardas_m joined #git
08:31 chele hi there i got a local git repo which syncs with an svn one. i have a branch in that git. meanwhile svn got replaced with git and i got another local git repo. the question is is there a way to copy my branch from the old to the new git repo or I gotta do it manually?
08:32 elsevero joined #git
08:33 Snugglebash joined #git
08:34 star_prone joined #git
08:34 jast chele: you can add a local repo using 'git remote add', and then you can fetch from it
08:35 jast in fact you can even fetch directly from a repo path without adding a remote, but then you have to mess around with FETCH_HEAD
08:35 jast just to warn you, the history in the new repo might be completely different, in that case merging or rebasing won't do anything extremely helpful. you may end up cherry-picking your changes.
08:37 acetakwas joined #git
08:38 chele jast: thing is that the remote is not really remote . so what's the url to a local git, path in the fs?
08:39 jast yep
08:39 chele ok
08:39 JeroenT joined #git
08:41 gargola joined #git
08:41 BadSnappa joined #git
08:42 Balliad joined #git
08:46 ki0 joined #git
08:46 _ng joined #git
08:47 a_thakur joined #git
08:47 JeroenT joined #git
08:47 Tobbi joined #git
08:49 buzzLightBeer joined #git
08:49 encod3 joined #git
08:49 jknetl joined #git
08:50 kid_ joined #git
08:52 kid_ left #git
08:57 xall joined #git
08:58 tvw joined #git
09:01 zzz joined #git
09:02 hahuang61 joined #git
09:06 aax joined #git
09:09 manuelschneid3r joined #git
09:10 kurkale6ka joined #git
09:10 NwS joined #git
09:12 zeroed joined #git
09:12 zeroed joined #git
09:12 pks joined #git
09:14 jagob joined #git
09:14 marcogmonteiro joined #git
09:15 cyan__ joined #git
09:17 bongjovi joined #git
09:18 cqi joined #git
09:19 Blaguvest joined #git
09:24 JeroenT joined #git
09:25 almy joined #git
09:26 GT4066 joined #git
09:29 JeroenT joined #git
09:29 almy joined #git
09:31 Siegfried joined #git
09:33 theoceaniscool joined #git
09:36 ams__ joined #git
09:37 MafiaInc joined #git
09:39 almy joined #git
09:41 xall joined #git
09:42 King_Hual joined #git
09:44 afuentes joined #git
09:48 dsdeiz joined #git
09:53 chll_ joined #git
09:56 Serpent7776 joined #git
09:57 ronskisika joined #git
09:57 xkr47 joined #git
09:59 armin joined #git
10:01 mda1 joined #git
10:03 acetakwas joined #git
10:08 a_thakur_ joined #git
10:09 a_thakur joined #git
10:10 troulouliou_div2 joined #git
10:13 rnsanchez joined #git
10:13 neanderslob joined #git
10:18 Snugglebash joined #git
10:23 Limes_ joined #git
10:25 aw1 joined #git
10:26 leeN joined #git
10:33 a_thakur joined #git
10:35 mischat joined #git
10:37 nowhereman joined #git
10:38 wgrant joined #git
10:38 pbrewczynski joined #git
10:42 garethdaine joined #git
10:46 fbwnd joined #git
10:48 robotroll joined #git
10:50 hhee joined #git
10:54 ronskisika joined #git
10:54 mindfart joined #git
10:54 cyphase joined #git
10:59 Tobbi joined #git
10:59 pcre joined #git
11:01 cdown joined #git
11:03 hahuang61 joined #git
11:03 CountryNerd joined #git
11:04 johnnyfive joined #git
11:07 Jackneill joined #git
11:08 dimi1947 joined #git
11:09 nikivi joined #git
11:15 shubhnik joined #git
11:17 spacelord_ joined #git
11:20 YuGiOhJCJ joined #git
11:22 pcre joined #git
11:24 Snugglebash joined #git
11:25 maskeraid joined #git
11:33 DaveTabo_ joined #git
11:35 Cwolf3D joined #git
11:35 JeroenT joined #git
11:37 joki joined #git
11:38 Singmyr joined #git
11:38 Walex joined #git
11:39 xterm joined #git
11:39 xterm Hello, hope everyone is doing well today, I would appreciate some advice on the following: https://hastebin.com/utoxepuwes
11:41 cdown_ joined #git
11:42 romerocesar joined #git
11:43 cdown_ joined #git
11:43 davimore__ joined #git
11:45 Limes_ joined #git
11:45 BSaboia joined #git
11:49 Moult joined #git
11:51 ertesx joined #git
11:52 cdown joined #git
11:56 visual joined #git
11:56 visual well hello there #git peops
11:58 johnnyfive joined #git
11:59 masuberu joined #git
11:59 inovas joined #git
12:01 finalbeta joined #git
12:01 BlessJah xterm: !submodule !subtree
12:01 gitinfo xterm: git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
12:01 gitinfo xterm: The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
12:03 oskarkv joined #git
12:03 DaveTaboola joined #git
12:03 cdown_ joined #git
12:08 visual fellow git peops, i have a question
12:09 visual does switching to a new branch revert the local changes that you did on another branch?
12:10 cdown joined #git
12:10 visual like in this scenario: git clone repo; git branch 2; git push origin 2; git branch 3
12:10 visual will branch 3 have branch 2's changes?
12:11 canton7 you didn't commit in your example: was that intentional?
12:11 canton7 and no, switching to a new branch will not touch local uncommitted changes
12:11 visual no, just forgot to write commit here, i did commit irl
12:11 canton7 if git cannot switch to the other branch without removing uncommitted changes, it will fail instead
12:11 canton7 ... but in your example, you don't have any uncommitted changes
12:12 visual in human words -
12:12 visual "develop all the tasks they work on in a new branch based off the master branch, and named according to the basecamp task, and once done push that new branch remote"
12:12 canton7 in your example, you created a new branch, '3', based on the branch '2'
12:12 canton7 so '3' will contain everything that '2' contains
12:13 visual good eye, so how do i create a new branch based on master?
12:13 canton7 git branch 3 master
12:13 canton7 (or checkout master, then git branch 3)
12:13 clmsy joined #git
12:14 visual awesome possum, worked like a charm
12:14 visual thanks m8
12:14 visual btw are you the guy from c#
12:14 visual :^)
12:14 canton7 :)
12:14 encod3 joined #git
12:14 visual oh you sneaky pete, made it invite-only eh
12:15 visual but how are new peops supposed to connect to it?
12:15 canton7 no, you're just banned
12:15 visual oh
12:15 visual LD
12:15 visual :D
12:15 visual Cannot join to channel #c# (You must be invited)
12:15 visual is this done to confuse peops into thinking they need an invite?
12:19 gitinfo visual: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
12:20 * canton7 wonders when gitinfo started caring about karma
12:22 visual .karma canton7
12:22 gitinfo the Genuine Real Life Karma™ REST API results are back! c‍anton7: 108 (1 in past 30 days) (3 given out)
12:22 BlessJah it does for as long as I remember
12:22 visual canton7: thanks mate
12:22 WayToDoor joined #git
12:22 visual .karma canton7
12:22 gitinfo the Genuine Real Life Karma™ REST API results are back! c‍anton7: 108 (1 in past 30 days) (3 given out)
12:22 visual hey it didnt work :U
12:22 visual thx canton7
12:22 canton7 yeah, but someone's poking it prompt people to leave karma :P
12:22 visual .karma canton7
12:22 gitinfo the Genuine Real Life Karma™ REST API results are back! c‍anton7: 108 (1 in past 30 days) (3 given out)
12:23 visual sorry m8, i tried
12:23 jimi_ joined #git
12:24 canton7 thanks gitinfo
12:24 gitinfo canton7: you're welcome, but please note that I'm a bot. I'm not programmed to care.
12:24 canton7 ok, that worked
12:24 wootehfoot joined #git
12:24 Guest14887 joined #git
12:25 tobiasvl .karma tobie
12:25 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
12:25 tobiasvl oops
12:25 tobiasvl .karma tobiasvl
12:25 gitinfo the Genuine Real Life Karma™ REST API results are back! t‍obiasvl: 41 (1 in past 30 days) (1 given out)
12:25 Vampire0 canton7, it does work, you just don't earn karma that easily. I think you need 10 occurences for on karma point or something like that
12:25 Vampire0 .karma
12:25 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 25 (0 in past 30 days) (3 given out)
12:26 tobie tobiasvl: ty :)
12:26 canton7 ah yeah you're right, it's a 10th
12:26 davimore_ joined #git
12:26 canton7 https://github.com/jast/gitinfo/b​lob/master/plugins/thanks.pm#L40
12:26 gitinfo canton7: you're welcome, but please note that I'm a bot. I'm not programmed to care.
12:26 canton7 hah!
12:26 Vampire0 lol
12:26 tlaxkit joined #git
12:26 gitinfo [!botsnack] Om nom nom
12:27 visual man i love when programmers add a bit of humour to the code
12:28 visual like the "is lost in the mists of uncertainty" or the "genuin real life karma (tm)" thning
12:28 xterm joined #git
12:29 cagedwisdom joined #git
12:31 Vampire0 !zomibe
12:31 Vampire0 !zombie
12:31 gitinfo Brainzz! More brainzzzz!  For information about detached heads, see !detached
12:32 xall joined #git
12:32 TomyWork !zombo
12:33 * gitinfo bites off TomyWork's head
12:33 TomyWork that was suspiciously slow
12:33 canton7 lag :P
12:34 encod3 joined #git
12:34 Vampire0 o_O
12:34 Vampire0 That one is new
12:35 Vampire0 Ah, no, it was manual :-D
12:35 canton7 sssh
12:35 * Vampire0 didn't say anything, did someone hear anything?
12:35 Vampire0 :-D
12:38 sdothum joined #git
12:39 Vampire0 Lol, !wat is nice
12:39 gitinfo Wat: https://www.destroyallsoftware.com/talks/wat
12:39 canton7 yeah, that's a classic
12:40 Vampire0 Didn't knew it yet
12:40 Vampire0 Oh, its over :-(
12:40 Vampire0 I want more
12:41 visual :U
12:41 visual !zombo
12:41 visual oh man
12:41 visual !zombie
12:41 gitinfo Brainzz! More brainzzzz!  For information about detached heads, see !detached
12:41 visual !detached
12:41 gitinfo A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
12:41 canton7 visual, !msg
12:41 gitinfo visual: [!privmsg] You can get gitinfo keyword expansion (e.g. !doc or this one) sent directly to you by sending a private message to me: /msg gitinfo !doc. This avoids spamming the channel. Also see http://jk.gs/git/bot/trigger.php
12:41 visual alright i get it :I
12:43 Tobbi joined #git
12:45 freimatz joined #git
12:47 scorphus joined #git
12:48 JeroenT joined #git
12:49 nettoweb joined #git
12:51 Darcidride joined #git
12:52 pcre joined #git
12:54 dhollinger joined #git
12:56 jknetl joined #git
12:57 cdown joined #git
13:02 danslo joined #git
13:02 synthroid joined #git
13:04 noecc joined #git
13:04 synthroi_ joined #git
13:04 hahuang61 joined #git
13:05 rnsanchez joined #git
13:05 eduardas_m joined #git
13:10 SteffanW joined #git
13:12 skypuke joined #git
13:12 johnnyfive joined #git
13:13 boombatower joined #git
13:14 PCatinean joined #git
13:14 diogenese joined #git
13:16 BSAlb joined #git
13:18 shpew12 joined #git
13:22 acetakwas joined #git
13:24 __q joined #git
13:24 visual mfw banned on c# :')
13:27 __q hey folks
13:27 gitinfo __q: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
13:29 __q I'm looking for a way to refresh the index (a-la git update-index --refresh) without it having to read any file content, and that even if the ctime/mtime have changed.  I know about --skip-worktree or --assume-unchanged, but these don't really refresh the timestamps in the index
13:30 johnnyfive joined #git
13:30 Ryanar joined #git
13:31 __q My use case is that we have thousands of checkouts of the same git repository (check'ed out on different branches) locally, and we use a 'cp --reflink -a orig_repo_with_worktree new_repo_with_worktree' (somehow similar to having multiple worktrees) to create one such checkout, after which point all of the source files have newer [cm]time, which causes the next command needing to compare index/worktree to read
13:31 rivarun joined #git
13:31 __q all of the sources files
13:32 synthroid joined #git
13:32 __q that's on a linux.git repo, so that's a lot, and it takes a while, and we potentially have hundred of processes doing this operation in parallel
13:33 __q So basically my use case is that I know the worktree matches exactly the index, but the index timestamp metadata is out of date, and I want to "refresh" it without causing git to _open_ any of the source file (it obviously will have to stat them)
13:34 jeffreylevesque joined #git
13:36 Vampire0 __q, if you don't get an answer here (I cannot) maybe you should ask on the Git mailing list where also the Git developers hang out. This question is probably too deep-level to get an answer here. I might be wrong though
13:36 visual what's the git mailing list?
13:36 tobiasvl visual: !mail
13:36 gitinfo visual: [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
13:37 __q Vampire0: Thanks for the heads up, I'll wait for a bit before reaching out to the mailing list in case someone in here knows the answer :)
13:37 HardlySeen joined #git
13:37 HardlySeen joined #git
13:39 Nilesh_ joined #git
13:41 mario_ joined #git
13:42 tlaxkit joined #git
13:43 altendky joined #git
13:43 Snugglebash joined #git
13:43 romerocesar joined #git
13:45 nicksloan joined #git
13:46 acetakwas joined #git
13:47 m1dnight_ joined #git
13:49 xall joined #git
13:50 mikecmpbll joined #git
13:51 boubou joined #git
13:56 ferr1 joined #git
13:56 up_the_irons joined #git
13:57 Cavallari joined #git
13:58 gmeir11 joined #git
13:59 siddart joined #git
13:59 Tobbi joined #git
13:59 aavrug joined #git
13:59 gargola joined #git
14:00 mischat_ joined #git
14:01 anonymuse joined #git
14:01 cdown joined #git
14:02 thiago joined #git
14:03 marijnfs joined #git
14:04 danslo joined #git
14:05 hariel joined #git
14:06 Ryanar joined #git
14:06 rnsanchez_ joined #git
14:06 Gsham joined #git
14:07 mikecmpbll joined #git
14:08 Guest70417 joined #git
14:10 shinnya joined #git
14:10 jimi_ joined #git
14:12 Spydar007 joined #git
14:12 Spydar007 joined #git
14:12 Tobbi joined #git
14:14 canton7 joined #git
14:14 ExoUNX joined #git
14:15 m1dnight_ joined #git
14:15 Snugglebash joined #git
14:15 aavrug joined #git
14:15 CheckDavid joined #git
14:16 CountryNerd joined #git
14:16 m1dnight2 joined #git
14:18 JuliusN if i haven't done any commits to the master, is it still possible to get conflicts upon merging with remote?
14:19 tobiasvl JuliusN: perhaps the remote's history has been rewritten
14:20 hwoarang joined #git
14:20 JuliusN tobiasvl: in such case should i do a hard reset?
14:20 ams__ joined #git
14:21 tobiasvl JuliusN: only you can decide that. if you want to throw away your local history and overwrite it with the remote's history, then sure.
14:21 JuliusN but there's no way to fast-forward?
14:22 tobiasvl no, because the histories have diverged
14:22 thiago a fast-forward never conflicts
14:22 JuliusN tight
14:22 JuliusN *right :D
14:22 thiago if you have conflicts, it's not a fast-forward
14:23 thiago so if you're getting conflicts when you haven't done any changes, then it's one of two:
14:23 al-damiri joined #git
14:23 thiago a) you're wrong and you have done changes
14:23 thiago or b) your upstream rewrote history
14:23 JuliusN ok thanks
14:23 thiago from Git's perspective, they're the same situation, so it's impossible fo rus to tell what it is
14:23 thiago you have to ask your upstream if they've rewritten history
14:24 Raging_Hog joined #git
14:24 nanga joined #git
14:24 cqi joined #git
14:24 tobiasvl (this is why we always say that pushing rewritten history is bad)
14:25 cqi joined #git
14:26 nanga joined #git
14:28 noecc joined #git
14:28 BlessJah it is possible to tell - git fetch will list branch as force updated (only once though), and git reflog will list commits made on master
14:29 Ahiiru joined #git
14:29 Ahiiru hello there
14:30 Ahiiru I needed to change my password for my push and pulls, I'm using bitbucket
14:30 canton7 and looking at the history visually is a bit of a giveaway - same commits, same ordered, different hashes
14:30 BlessJah human eye should be also pretty accurate when inspecting commits (log and cat-file) of both branches
14:30 Ahiiru I changed it on the website, but that didnt change the password used for the pushes and pulls
14:30 tobiasvl Ahiiru: and how have you stored it? credential helper?
14:31 Ahiiru I dont remember
14:31 Ahiiru do you mean to store the pasword so I dont need to write it everytime?
14:31 thiago joined #git
14:31 tobiasvl Ahiiru: yes, wasn't that what you meant?
14:32 Ahiiru if that's the case, i didnt store it, I'm writing it
14:32 Ahiiru but I wanted to change the password it asks me
14:32 tobiasvl what is it asking you?
14:32 tobiasvl password or SSH passphrase?
14:33 Ahiiru Password for 'https://myuser@bitbucket.org':
14:34 Ahiiru that's what the command says
14:34 Ahiiru so I guess its the passphrase?
14:34 qsx Ahiiru: that's your user's password, change it somewhere in the web interface
14:34 tobiasvl that should be the password you changed on bitbucket... not SSH passphrase
14:34 Ahiiru qsx: I changed it via web browser, didnt do anything
14:34 cqi joined #git
14:35 Ahiiru maybe I didnt look at the settings correcty
14:35 Ahiiru I looked everywhere.. oh well
14:35 tobiasvl must be something like that, or a problem on bitbucket's side
14:35 tobiasvl not git related at least
14:35 tobiasvl maybe ask in #bitbucket
14:35 Ahiiru ok
14:35 shinnya joined #git
14:35 Ahiiru that's not the channel for git
14:35 BSaboia joined #git
14:36 Ahiiru its for the cloud service
14:36 tobiasvl this is the channel for git, but your problem seems to be on bitbucket's side
14:36 belak That sounds like an issue with something misconfigured on your end
14:36 belak What does your remote look like?
14:37 Ahiiru my remote?
14:37 belak git remote -v
14:38 ShekharReddy joined #git
14:38 xterm joined #git
14:38 nickabbey joined #git
14:39 gzhang joined #git
14:40 garethdaine joined #git
14:40 GodGinrai joined #git
14:41 belak If you're using ssh, it should ask you for a passphrase and not that... Considering we don't have password auth enabled for ssh, that's most likely from https
14:41 ronskisika joined #git
14:41 belak Which sometimes caches things but shouldn't be doing it that aggressively
14:42 tobiasvl belak: <Ahiiru> Password for 'https://myuser@bitbucket.org':
14:42 tobiasvl so yes, https
14:42 Ediz joined #git
14:42 belak Ah I misread earlier
14:43 belak If you can use an old password our background task service may be having problems
14:44 Ahiiru yes, its still my older password
14:44 belak It should be the same password to log in
14:45 traxo-xx joined #git
14:45 Snugglebash joined #git
14:45 Ahiiru now, to log at my bitbucket account via web interface is one password, and to do pushes and pulls is another password
14:45 Ahiiru weird
14:45 belak Uh... They hit the same database so I'm not sure how that's possible
14:46 Es0teric joined #git
14:46 nettoweb joined #git
14:46 belak Is your account linked to an Atlassian Account?
14:46 Ahiiru yes
14:47 Ahiiru thats where I change the password
14:47 Ahiiru didnt find any other place
14:47 belak Ugh, I'll ping the team responsible for that bridge. It goes down more often than it should.
14:48 up_the_irons joined #git
14:49 belak If you're still having trouble later today, emailing support@bitbucket.org would be your best bet
14:49 Ahiiru hm thanks
14:50 belak I'm going to get my last 2 hours of sleep now :/
14:50 dimi1947 joined #git
14:50 e14_ joined #git
14:50 belak Good night
14:50 gmh joined #git
14:51 dendazen joined #git
14:51 jason237 joined #git
14:51 ash_workz joined #git
14:51 ikelso joined #git
14:52 Dougie187 joined #git
14:52 eduardas_m joined #git
14:52 rwb joined #git
14:54 elh9 joined #git
14:54 eduardas_m joined #git
14:55 elh9 hello
14:55 gitinfo elh9: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
14:55 Es0teric joined #git
14:55 elh9 i've run into a problem with git,  i've been working a project for a while with no troubles, recently started a new branch, and did a few commits without pushing
14:56 GodGinrai joined #git
14:56 GodGinrai sounds fine so far
14:57 elh9_ joined #git
14:57 elh9_ git add . -A does nothing
14:58 GodGinrai elh9_: CLI rule no. 1: flags before parameters
14:59 xterm_ joined #git
15:00 kpease_ joined #git
15:00 nettoweb joined #git
15:00 Raging_Hog joined #git
15:01 zivester joined #git
15:02 xall joined #git
15:03 aavrug joined #git
15:04 jast .man_update
15:04 gitinfo jast: Manpage index updating. Please allow a few seconds before using again.
15:04 * Aleric disguises as elh9: Ah! Of course, thanks!
15:04 r00twrh joined #git
15:05 crose joined #git
15:05 hahuang61 joined #git
15:05 dsdeiz joined #git
15:06 jast FWIW, if anyone is seeing outdated manpages on jk.gs, feel free to use that command to update them, and let me know if there are any issues with that
15:07 gmac joined #git
15:07 GT4066 joined #git
15:08 elh9 joined #git
15:08 nickabbey joined #git
15:09 ikelso joined #git
15:09 elh9 hi, I have a git repo that was working fine 3 days ago with no changes.  It is aware of the remote repo (on github), it is commited (everything up to date) but no matter  what changes are made, they wil not sync to the github remote repo
15:09 elh9 anyone know what could be the cause?
15:09 sharpy joined #git
15:10 xterm joined #git
15:10 canton7 "will not sync to the github remote repo"
15:10 canton7 we're gonna need more than that to do on :P
15:10 canton7 *to go on
15:10 gmacisme joined #git
15:11 GodGinra1 joined #git
15:12 Vampire0 elh9, or in other words !www and !repro
15:12 gitinfo elh9: What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?
15:12 gitinfo elh9: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:13 Silox| joined #git
15:13 gargola joined #git
15:13 Ecbg joined #git
15:13 shinnya joined #git
15:14 sunri5e joined #git
15:14 * Aleric would be way more sarcastic.
15:14 looper joined #git
15:14 noecc joined #git
15:15 traxo-xx joined #git
15:16 xterm_ joined #git
15:16 elh9 lol
15:16 Aleric After staring at this for 6 minutes... I think he MIGHT not know that he needs to push?
15:16 elh9 sorry
15:16 elh9 aleric, i mentioned that ive been using git fine for months
15:17 elh9 multiple repos and branches
15:17 altendky joined #git
15:17 elh9 might not have been using it a complex way
15:17 elh9 but its been working fine
15:17 Aleric Well, you say everything is update... and then "no matter what changes I make" .. I can't compute that.
15:17 elh9 and then stopped randomly
15:17 Aleric up to date*
15:17 canton7 elh9, please give the information that Vampire0 asked for
15:17 elh9 if you do a commit
15:17 elh9 and there are no changes since last commit
15:18 elh9 !www
15:18 gitinfo What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?
15:18 elh9 !repro
15:18 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:18 elh9 i already listed the commands
15:18 elh9 git add . -A
15:18 Aleric lol
15:18 elh9 git commit -m "sdlfk"
15:18 canton7 elh9, in a pastebin, please
15:18 canton7 and show git's output
15:18 elh9 git push <url> branch
15:18 Aleric You were pointed out immdediately that that is an error.
15:19 Aleric <GodGinrai> elh9_: CLI rule no. 1: flags before parameters
15:19 Aleric aka, git add -A
15:19 elh9 Aleric, was i ?
15:19 elh9 didnt see it
15:20 elh9 i've always used git add . -A without issue
15:20 elh9 for the last 2 years
15:20 elh9 all projects always sync fine
15:21 roelmonnens joined #git
15:21 xterm_ joined #git
15:21 Aleric It might work, I never used that.
15:22 Aleric If you're not in the root of the project, then it's: git add -A .
15:22 canton7 it's redundant - 'git add -A' will do the same thing
15:22 Endarked joined #git
15:22 canton7 anyway, you still haven't given us a pastebin with your commands and git's responses in
15:24 nicksloan joined #git
15:24 Vampire0 elh9, and while you are at it, add the output of `git status`
15:25 StuartMI joined #git
15:27 nowhereman joined #git
15:27 buckowski joined #git
15:27 [0xAA] joined #git
15:27 nopf joined #git
15:28 dunk joined #git
15:28 dviola joined #git
15:29 apeiros joined #git
15:30 elh9_ joined #git
15:31 thoros joined #git
15:31 utrack joined #git
15:31 nickabbey joined #git
15:31 xterm_ joined #git
15:31 diego2 joined #git
15:32 elh9 hmm
15:32 diego2 joined #git
15:32 skirk joined #git
15:32 elh9 http://pastebin.com/BkhWPtXd
15:32 elh9 there's that pastie
15:32 elh9 its failry consistent with what i already said tho
15:33 Aleric You didn't make any changes.
15:33 fbwnd joined #git
15:33 aarobc joined #git
15:33 elh9 I've made many changes
15:33 Aleric "working tree clean" == git add -A  won't add anything
15:33 elh9 and with what you said before, i am in the root dir
15:33 elh9 Aleric
15:33 elh9 the problem is not with git add
15:33 elh9 but with git push
15:33 elh9 as i have said quite a few times now
15:33 Aleric whatever
15:34 canton7 yeah, but the evidence you've given suggests that you're wrong
15:34 elh9 Sure, thats why im here asking for help...
15:34 canton7 your pastebin shows add not doing anything, because there's nothing to add. Therefore commit does nothing, and there's nothing for push to push
15:34 elh9 i get that
15:34 elh9 but the branch im pushing to is not in sync with my local branch
15:34 canton7 line 4: "nothing to commit, working tree clean". line 9: "nothing to commit, working tree clean"
15:34 elh9 yes i get that
15:34 elh9 because i have done a few commits
15:34 elh9 with no succesfull pushes
15:34 canton7 output of !lol, please
15:34 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:35 elh9 so redoing commit is obviously going to show up to date
15:35 canton7 (pastebin it)
15:35 elh9 basically you guys got no clue :P
15:35 canton7 right, then the pastebin doesn't represent your problem :P
15:35 canton7 if you want help, 1) describe your problem well, 2) provide the information we ask for, 3) don't insult us, please
15:36 elh9 haha you guys have had quite a strange attitude since i started asking here
15:36 elh9 can't expect me not to give you some back ;) especially whenm you seen like you're clueless
15:36 canton7 do you want help or not?
15:36 elh9 yes
15:36 elh9 i have answered all questions
15:36 canton7 great, let's work together then
15:36 elh9 followed instructions
15:36 canton7 no, I asked for the output of !lol
15:36 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:36 Aleric elh9: You're full of yourself, you know it all, but fail to give hardcore git guru's the info they ask for while completely voluntary TRYING to help you for 40 minutes.
15:36 elh9 Aleric, im not here to fight
15:36 elh9 please if you ahve nothing constructive to add..
15:37 Aleric You said we're clueless, which is definitely not true I can assure you.
15:37 elh9 Aleric, please
15:37 canton7 elh9, this is the first time that you've indicated that you have unpushed commits. Everything before then indicated that there was nothing to push because add didn't add anything
15:37 dviola joined #git
15:37 elh9 ok
15:37 elh9 so now that we get what the issue is
15:37 elh9 what could i try
15:37 canton7 elh9, now I'm asking to see the output of !lol
15:37 gitinfo elh9: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:37 elh9 to get some output that would be useful from terminal
15:37 canton7 for the third freaking time
15:37 elh9 !lol
15:38 elh9 canton7, didnt realise that was a real thing
15:38 canton7 (git log --oneline --graph --decorate --all)
15:38 elh9 thought you were laughing out loud
15:38 Aleric (I think he's missing  fetch = +refs/heads/*:refs/remotes/github/*  for the remote he's using, in .git/config)
15:38 canton7 and you ignored the command that gitinfo gave you twice?
15:38 Bombe Contextual awareness is not for everyone.
15:38 Aleric s/github/origin/
15:38 elh9 i'm having three convos here, hard to pay attention to a bot
15:39 canton7 this is a very frustrating conversation - we ask you many times to do something and you ignore us, instead complaining that we're clueless ><
15:39 elh9 ok im sorry
15:39 weiyang joined #git
15:39 elh9 ur not clueless, but you were talking to me like im clueless, asking if i've pushed
15:39 Limes_ joined #git
15:40 jast well, it's something that can make a difference to the next steps that need to be taken
15:40 elh9 http://pastebin.com/kbcDSRzn
15:40 ResidentBiscuit joined #git
15:40 canton7 elh9, if you try and do support over IRC, you'll quickly learn that you can't make assumptions about things. You have to take baby steps and confirm each one, otherwise you end up dashing off in the wrong direction. ESPECIALLY if you're getting imperfect / patchy / wrong information, as we are here
15:40 elh9 canton7, i agree it is frustrating, not used to this kind of convo
15:40 elh9 canton7, sure
15:41 BlessJah a.k.a. users lie, all the time
15:41 canton7 elh9, there's no indication there that you have a remote configured? there are no remote-tracking branches (starting with e.g. origin/)
15:41 jast I wouldn't say "lie"
15:41 Aleric I know how that feels.. I also get upset when I'm treated like a noob when I go to an IRC channel to report a bug in -binutils- .. because it's tiresome to prove your expertise every time. Ppl start with "did you run this or that", while, when I report a bug in binutils, there IS a bug in binutils.
15:41 jast it's easy to not remember every last detail correctly
15:41 Aleric Nevertheless, you have to give every piece of detailed info, or we can't help.
15:41 elh9 u guys are all good
15:41 jast anyway, does the branch "restructure1" exist in the remote repo yet?
15:42 elh9 yes
15:42 elh9 it does jast
15:42 Aleric -say- bintutils *
15:42 BlessJah jast: they don't know they're lying, yet they do
15:42 canton7 that was my first though, but there's no remote-tracking branch for master either
15:42 Aleric I can't type
15:42 elh9 and it has contents from an older commit from 3 days ago
15:42 jast BlessJah: then it's hardly a lie
15:42 canton7 elh9, 'git branch -a' and 'git remote -v', please
15:42 pry0cc joined #git
15:42 * canton7 suspects that Aleric might actually have been right. We'll get to that though after this
15:43 jast elh9: okay. so there are two possibilities: either git thinks everything has already been pushed (unlikely if you're seeing commits in the log that are not on the remote) or git doesn't know what you want it to push because the config is incorrect for some reason
15:43 canton7 it's more than that - git doesn't think there are any remote branches at all
15:43 jast so, what does this say: git config remote.restructure1.fetch
15:43 canton7 wait, something else: you can't have both restructure1 and restructure1/restructure1, unless the remote's called restructure1?
15:44 canton7 yeah, that must be the name of the remote
15:44 elh9 canton7, http://pastebin.com/m1LxGuZY
15:44 jast yep, sure looks like it
15:44 canton7 yep
15:44 elh9 true
15:44 elh9 so i've just incorrectly named the remote repo?
15:44 canton7 elh9, ok, so there really is nothing to push: the restructure1 branch is up to date with the restructure1 remote
15:44 canton7 (and having a branch called the same thing as a remote is just confusing)
15:44 romerocesar joined #git
15:44 Limes__ joined #git
15:45 jast elh9: nah, it's just potentially confusing
15:45 hashpuppy joined #git
15:45 bannakaffalatta joined #git
15:45 elh9 jast yeh it is
15:45 elh9 canton7, so... haha
15:45 Vampire0 elh9, it is not, why do you think so?
15:45 jast elh9: anyway, what does 'git config remote.restructure1.fetch' say? we'll want to make sure it's not a config issue
15:45 rnsanchez joined #git
15:45 canton7 elh9, just triple-check: git ls-remote restructure1
15:45 canton7 and yeah, jast's suggestion as well
15:45 elh9 Vampire0, he said its confusing, i agreed.
15:46 Vampire0 elh9,  I meant what you said to jast, that there is somethign to push
15:46 HanClinto joined #git
15:46 jast see, all of that is more examples of how stuff on IRC is prone to misunderstandings :}
15:46 Vampire0 elh9, the first line of lol shows taht your local branch and your remote branch point to the same commit
15:46 mischat joined #git
15:47 jast hmm, that's true
15:47 elh9 http://pastebin.com/Szg6FUxx
15:47 elh9 jast, yes, all text based convo is :S
15:48 elh9 irc has the added confusion of 500 ppl in the channel ahah
15:48 jast okay, according to all of that output, the commits have already been pushed
15:48 canton7 yeah, the remote's definitely up to date
15:48 snowkidind joined #git
15:48 acetakwas joined #git
15:48 elh9 hmmm
15:48 jast (side note, commit logs become a LOT easier to read if you have actual commit messages ;))
15:49 elh9 Kate (the text editor) syncs with  .git to open all files in my project
15:49 elh9 it correctly shows all the files created in the last 3 days :P
15:49 elh9 so how come it thinks there are all these new files and git doesn't
15:50 jast I don't really know Kate, so I can't tell you why it thinks what it thinks
15:50 elh9 it just looks at the git folder and sees all the files that are being tracked
15:50 elh9 and opens them
15:50 jast all of git is consistent in what it thinks, so that bit makes sense at least
15:50 Vampire0 elh9, are you sure you are looking at the correct branch on the remote where you see the new commits? To restructure1, not to restructure or restruct1?
15:50 elh9 no im not :P
15:50 canton7 elh9, what exactly is Kate saying?
15:50 elh9 Vampire0 how would i check that
15:50 treia joined #git
15:50 canton7 since we don't know it, it's kinda hard to understand what *exactly* "think there are all these new files" means :P
15:51 elh9 canton7, Kate shows my project completely, all files
15:51 Vampire0 elh9 Where do you see that the remote has only commits from 3 days ago?
15:51 canton7 new compared to what?
15:51 cagedwisdom joined #git
15:51 elh9 Vampire0, on github.com
15:51 Vampire0 elh9, In the web interface of GitHub?
15:51 elh9 yeah
15:51 elh9 and i can see the files there
15:51 canton7 what branch are you looking at?
15:51 Vampire0 elh9, look at the branch combobox, what does it say?
15:52 jast and Kate shows more files than Git? basically what I don't understand is what exactly is implying that there are "new files"
15:52 elh9 restructure, restructure1 was created 30 mins ago trying to fix this issue :P
15:52 Vampire0 elh9, and why do you see you see the files in the web interface, I thought you have the files locally, but on on GitHub
15:52 canton7 right, but we've been talking about restructure1, because that's what you talked about. We've no idea what 'restructure' looks like
15:52 elh9 the last 3 days of files are local but not on github
15:52 elh9 before that theres 6 months of files from this project
15:52 elh9 with daily commits and pushes
15:52 canton7 look at 'restructure1', since we've actually talked about that
15:53 Vampire0 elh9, if you look at restructure in GitHub of course you do not see what is on restructure1 o_O
15:53 elh9 its lol starting to feel like im taking up too much time of too many ppl :P
15:53 Es0teric joined #git
15:53 Vampire0 elh9, Is it that you want to push your local restructure1 branch to the remote restructure branch? Then you have to tell Git to do so
15:53 elh9 Vampire0, im not that dumb :p
15:53 Raging_Frog joined #git
15:54 Vampire0 elh9, are you sure (sorry, had to give some pun back ;-) )
15:54 elh9 haha no im not :p
15:54 elh9 Vampire0, i was pushing to restructure before (restruct1 was never used, made and forgotten about). restructure1 i created *just* before i started asking for help, it was my attempte to get things working
15:55 Vampire0 elh9, so what's your problem then exactly? You have a local restructure1 branch and you have pushed it and it is up-to-date
15:55 canton7 elh9, the logs you've given don't indicate what's going on with 'restructure'
15:55 canton7 but yeah, the problem isn't clear at this point
15:55 elh9 yeh its getting lost
15:55 Vampire0 elh9, what is getting lost? What is your actual problem?
15:55 elh9 Vampire0, the problem is that the last 3 days of new files arent pushing
15:55 elh9 so i made a new branch to try to fix it, and still not pushing
15:56 canton7 right, but the new branch *is* pushing fine
15:56 elh9 nup
15:56 Vampire0 elh9, switch in the GitHub interface to the branch you pushed and they will be there
15:56 canton7 just select it in the branch combobox in github
15:56 Vampire0 elh9, namely restructure1
15:56 hhee joined #git
15:56 LeBlaaanc joined #git
15:56 xterm_ joined #git
15:56 Vampire0 !shots
15:56 gitinfo SHOTS SHOT SHOTS SHOTS SHOTS! Then !beer
15:57 canton7 elh9, visit https://github.com/******/f​loortech/tree/restructure1
15:57 elh9 Vampire0, get this, 'restructure1', created 1 hour ago, has the same contents as 'restructure', even though it says it was updated an hour ago, and 'restructure' says it was updated 3 days ago
15:57 canton7 no, it doesn't have the same contents
15:57 canton7 nothing suggests that it does
15:58 rnsanchez_ joined #git
15:58 elh9 guys, I really do appreciate your help, despite the rocky start
15:58 elh9 gonna leave it for tonight and approach with a fresh mind tomorrow
15:59 YuGiOhJCJ joined #git
15:59 canton7 cool. It's probably worth learning how to use gitk / how to use git log --graph
15:59 canton7 they show your history in a graphical way, which is pretty much the only way to figure out issues like this
15:59 elh9 canton7, yeah i've planned on learning, but i;'ve managed to get by so far with basically just knowing add, commit and push comands :P
15:59 jast something that may be useful to look at is 'git log -p' locally, to see a series of diffs for each commit made against the branch, and check if those changes match up with what you think should have been changed in the past 3 days
15:59 elh9 but looks like its time to find more :p
15:59 Vampire0 !beer
15:59 gitinfo Beer! It's what's for dinner!
16:00 elh9 jast, ok will do
16:00 elh9 thanks again Vampire0, jast, canton7, Aleric
16:00 jast because to me it looks like either kate is not saving your edits to the right files or the edits were accidentally undone and the change committed, but at this point I'm reduced to wild speculation
16:00 elh9 espcially canton7  :P
16:00 jast it's usually something simple but not before you find it ;)
16:00 elh9 jast, yeh probably
16:01 elh9 i bet ill see it straight away tomorrow and feel bad i wasted ur time :p
16:01 canton7 my betting is that he's correct in that 'restructure' hasn't been pushed (for some sensible reason), Kate wasn't happy because of that. Then 'restructure1' came along, whcih doesn't contain what he thinks it contains
16:01 elh9 anywa
16:01 elh9 y
16:01 Aleric elh9: git config remote.$(git config branch.restructure.remote).fetch
16:01 mischat_ joined #git
16:01 nicksloan joined #git
16:01 elh9 thanks,going to save this whole convo :p
16:01 xterm joined #git
16:01 Aleric or paste the output of that
16:02 jast no worries, everyone here can decide for themselves how much time they want to spend talking to someone. we're really grown up and stuff. :)
16:02 gitinfo lies! they're all children!
16:03 shpew12 joined #git
16:03 treia joined #git
16:04 Tobbi joined #git
16:04 Aleric children can also decide for themselves how much time the spend talking to someone, no?
16:04 Aleric they*
16:05 Vampire0 Not really :-D
16:05 Vampire0 !snack
16:05 gitinfo [!botsnack] Om nom nom
16:05 Aleric Well, maybe not when younger than 10, or so.
16:05 subhojit777 joined #git
16:05 Achylles joined #git
16:05 Vampire0 Aleric, where you ever 16 and at your girlfriends when your parents came to pick you up? ;-)
16:06 rivarun joined #git
16:06 Aleric no
16:06 Junior` joined #git
16:06 Vampire0 Then imagine the situation and you will see that you are wrong :-D
16:07 LionsMane joined #git
16:07 Aleric You mean, a 16 y/o would not want to come with his parents?
16:08 dreiss joined #git
16:08 e14 joined #git
16:08 xterm joined #git
16:09 Aleric The problem is not age, but power difference. In this case the imbalance is between parents and kid. If a 16 y/o boy would want to stop talking with his girl friend he's just do that. Refusing to come with parents actually proves my point that they can think for themselves :p
16:11 perlpilot joined #git
16:11 Aleric I had a conversation over whatsapp with 13 y/o earlier, that went like "*I show a video clip*, he says "I'm going to watch it", then "Aahhrr vvs", I ask if vvs means "vor vucks sake", he says "Yup" me "lol", he: "Ok, I'm going again".  And he doesn't even read the next two messages that I sent.
16:12 spacelord_ joined #git
16:12 Aleric QED :p
16:12 hashpuppy let's say i have feature1 branched from upstream/develop.  i've made several commits to feature1, which i've pushed to my repos.  how should I (1) rebase my changes on top of the latest upstream/develop and (2) squash all my commits and then repush w/ a force?  i assume this is normal procedure before doing a PR, right?
16:12 hashpuppy should i squash before i rebase from upstream/develop so that I know where the squash should start?
16:12 star_prone joined #git
16:13 star_prone joined #git
16:14 hashpuppy or is just easiest to git fetch upstream && git rebase upstream/develop && git co -b final_feature1 upstream/develop && git merge --squash feature1
16:14 Aleric Why not do the squashing and rebasing in one go?
16:14 hashpuppy safer
16:14 hashpuppy that probably makes sense
16:14 hashpuppy i'm looking for the safest and most foolproof way to do this
16:16 Aleric Don't you want: git rebase -i --onto develop feature1
16:16 Aleric ?
16:16 brent__ joined #git
16:16 Aleric or, git checkout develop; git rebase -i feature1
16:16 hashpuppy probably.  i have no idea what i'm doing.  i've never used rebase before.  i always merge and squash commit
16:16 hashpuppy via merge
16:17 Aleric ok, lemme think then...
16:19 xterm joined #git
16:19 Dougie187 hashpuppy: First, that's not necessarily a normal practice before a PR.
16:19 Dougie187 It largely depends on your project's workflow.
16:19 Dougie187 Some people squash their commits, some people don't.
16:19 Dougie187 Personally, I only squash commits that aren't "useful" based on my own definition.
16:19 Aleric hashpuppy: Do you have a local branch called 'develop' that is up to date with the remote?
16:20 hashpuppy i just really like the simplicity and saftey of git co develop (which i have set to upstream/develop) && git pull && git co -b final_feature1 && git merge --squash final_feature1
16:20 aeontech joined #git
16:20 hashpuppy Dougie187: that's most of my commits
16:20 hashpuppy when i work on feature branches
16:20 Dougie187 hashpuppy: :P We'll I'd suggest rebase then. something like `git co feature1; git rebase -i upstream/develop`
16:21 Dougie187 Then, choose which of your commits to squash.
16:21 Dougie187 Then you'd do `git push <remote> +feature1`
16:21 hashpuppy git merge --squash does all that automatically
16:21 Dougie187 Then you could just do that if you want.
16:21 hashpuppy i'm just wondering if i could do that w/ rebase
16:21 Dougie187 I personally prefer rebase, because it helps me know what's going on.
16:21 hashpuppy i see
16:22 Aleric ok, then yes: git co develop && git pull && git rebase -i develop final_feature1   is what I'd use.. and then manually change the picks into squash for all but the first.
16:22 Dougie187 There are a bunch of ways to accomplish what you're trying to do, it's just a matter of what you want to do.
16:22 jast there's really no need to rebase at all if you're going to squash things at the end, anyway
16:22 jast just make sure develop is up-to-date and do a merge --squash, done
16:23 hashpuppy jast: thanks.  the only thing that bothers me about that is that i'm creating two branches
16:23 jast that said, I never use squash merges because I fix my history on the feature branch before I even think about merging
16:23 hashpuppy feature1 and final_feature1 or whatever i want to name them
16:23 Aleric I suppose you're right,.. It just feels scary, so I'm with Dougie187 that I like rebase -i to see what is going on before doing it.
16:23 elh9 joined #git
16:23 elh9 im back :P
16:23 elh9 just had a look around and it looks like all the work in the last 3 days got deleted while i tried to push
16:23 Dougie187 jast: I never do squash merges either, because I like the merge commits.
16:24 elh9 is that stuff all gone if i never did a push?
16:24 elh9 please say no
16:24 jast well, I actually need to leave to get home before the day is even more over. take care, everyone!
16:24 _ikke_ elh9: unlikely (as long as it's comitted)
16:24 elh9 _ikke_, thank god
16:24 elh9 woulda topped myself otherwise haha
16:25 _ikke_ elh9: man git reflog
16:25 gitinfo elh9: the git-reflog manpage is available at http://jk.gs/git-reflog.html
16:26 canton7 from the conversation earlier, it might just be on another branch (local or remote)
16:26 canton7 so let's check those first
16:26 elh9 canton7, i did a reset before i came to you gys for help
16:26 elh9 i think thats what did it
16:26 canton7 what did you reset to what?
16:26 Snugglebash joined #git
16:26 canton7 again, !repro. Post from your shell's history
16:26 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
16:26 elh9 i dont know, just following ppls reccomendations on stackoverflow n such
16:26 canton7 let's see *exactly* what you did
16:26 elh9 randomly typing in commands :P
16:27 Dougie187 You could just look at the reflog, and that should tell everyone the reset you did.
16:27 elh9 yeah ill do that now
16:27 Dougie187 If you don't have the terminal output anymore.
16:27 cagmz joined #git
16:27 canton7 it'll be in his history
16:27 canton7 (the commands that he typed, that is)
16:27 canton7 we tried to help him earlier. From that experience, I say definitely find out exactly what happened, then take it from there
16:27 Dougie187 Unless his history is short, but sure that's another place he could look to see it.
16:27 nicksloan joined #git
16:29 elh9 reflog just shows a whole bunch of commits and a few checkouts at the end
16:29 elh9 followed by a final commit
16:29 Dougie187 You'd need to share both your history and your reflog for people to help you.
16:29 canton7 let's see your shell history *first*
16:31 elh9 ahh im across so many shells
16:31 elh9 ill try to concatenate the histories together
16:31 DolphinDream joined #git
16:31 DolphinDream howdy
16:31 elh9 ahoy
16:32 DolphinDream how do i list what remote branch is tracking a given local branch ?
16:32 spacelord_ joined #git
16:32 DolphinDream or maybe the other way around.. what remote branch is a local branch currently tracking
16:32 Dougie187 DolphinDream: remote branches don't track local branches
16:32 Dougie187 DolphinDream: But you can do `git branch -vv` to see what remote your locals are tracking
16:32 jost_ joined #git
16:32 Dougie187 I think at least.
16:32 Dougie187 Yeah, `git branch -vv`
16:33 Dougie187 It's in brackets after the hash
16:34 gtristan joined #git
16:34 DolphinDream yeah.. kewl. i thought i can specify just one branch instead of listing them all
16:35 Aleric Can anything think of a reason why someone would NOT want to do 'git config push.recurseSubmodules on-demand', aka when that would be bad?
16:35 DolphinDream grepping helps.
16:35 Aleric err, Can anyone*
16:35 matthiaskrgr how would I get the first commit that featured a certain object blob hash ?
16:36 _ikke_ matthiaskrgr: Don't think there is a built-in command that can make such a query
16:36 matthiaskrgr :/ ok
16:37 JanC_ joined #git
16:38 Achylles joined #git
16:42 GodGinra1 joined #git
16:42 GodGinrai 11:26 < elh9> canton7, i did a reset before i came to you gys for help <-- isn't this exactly the reason he was not seeing the commits on his branch when he pushed...?
16:42 canton7 maybe!
16:42 nickabbey joined #git
16:43 kpease joined #git
16:43 mischat joined #git
16:44 durham joined #git
16:44 qpqp joined #git
16:45 grawity matthiaskrgr: https://github.com/grawity/hacks​/blob/master/devel/git-find-blob
16:45 mloy anybody want a lobste.rs invite?
16:45 GodGinrai what is that?
16:45 durham joined #git
16:45 mloy https://lobste.rs/
16:45 mloy it's like a smaller news.ycombinator
16:45 matthiaskrgr grawity: oh neat, thanks!
16:46 synthroid joined #git
16:50 TomyLobo joined #git
16:51 Snugglebash joined #git
16:52 madewokherd joined #git
16:53 b00jum joined #git
16:53 crayon joined #git
16:53 elh9 joined #git
16:53 elh9 weeeeeeeeeeew got it all sorted
16:54 elh9 thanks again
16:54 elh9 left #git
16:56 freimatz3 joined #git
16:56 jaeckel joined #git
16:58 raedah error: Failed to merge in the changes.
16:58 raedah Patch failed at 0001 ...
16:58 raedah The copy of the patch that failed is found in: .git/rebase-apply/patch
16:59 raedah how do I resolve this?
16:59 intellix joined #git
17:00 jccn joined #git
17:01 ams__ joined #git
17:01 nidr0x joined #git
17:02 Aleric So, I'm writing an "autogen.sh" (which is usually the name to bootstrap a autotools driven configuration) that, besides supporting the autotools, also inherently supports git submodules.
17:02 sbeller \o/
17:02 Aleric I am wondering if the following 'ERROR' would be too annoying, or even wrong: http://pasted.co/360f4a69
17:03 Aleric note that I deliberately forgot the --recursive with the clone, .. autogen.sh fixes that automatically.
17:03 sbeller <Aleric> Can anything think of a reason why someone would NOT want to do 'git config push.recurseSubmodules on-demand', aka when that would be bad?
17:03 sbeller when you (ab)use submodules to store private information such as data base keys. (I do not endorse such a use of submodules, but apparently some people do)
17:04 raedah oh, looks like I just have to edit the changed file as usual.
17:04 Aleric sbeller: I just changed it already to only demand that you set it to on-demand OR to check... If someone would abuse submodules like that then I guess they need to set it to no (that would work too)
17:05 Aleric Now at least... before I demanded it to be always on-demand ;).
17:05 sbeller I recently proposed to have push.recurseSubmodules = check, but here is the outcome: https://public-inbox.org/git/CA+55aFyos78qODyw57​V=w13Ux5-8SvBqObJFAq22K+XKPWVbAA@mail.gmail.com/
17:06 sbeller so newer versions of Git are optimized to be faster for checking, but older Gits are very slow to check for submodule pushes
17:06 peeps[lappy] joined #git
17:06 Noldorin joined #git
17:06 Aleric That doesn't seem the right link?
17:07 sbeller It's Linus yelling at Junio and me for a commit that broke his workflow, because submodule stuff is slow
17:07 Aleric Oh
17:07 dfas joined #git
17:07 kpease joined #git
17:07 Aleric So, by default it is no, and you tried to make it check by default?
17:07 MasterKrain joined #git
17:08 sbeller yes
17:08 MissionCritical joined #git
17:08 mkoskar joined #git
17:08 Aleric Well, then I guess you agree with my 'ERROR' ;).
17:08 sbeller so we fixed the slowness in newer versions
17:08 sbeller yes
17:08 Aleric thx
17:09 MasterKrain Can someone explain to me why "git merge --no-ff" still just makes all the commits of my other branch show up in the commit history of the branch im merging into?
17:10 MasterKrain i dont get it D:
17:10 endiruna joined #git
17:10 TomyLobo that's what a merge usually does
17:10 MasterKrain i thought --no-ff was supposed to result in one single merge commit
17:10 TomyLobo no
17:10 TomyLobo it forces git merge to create a merge commit even if it isnt necessary
17:11 TomyLobo everything else stays the same
17:11 MasterKrain oh
17:11 MasterKrain but thats so weird
17:11 TomyLobo git merge creates a commit that has both ends of the merge as its parents
17:11 TomyLobo one commit with two parents
17:11 MasterKrain cause how am i supposed to only have release commits on my master branch then??
17:12 TomyLobo who says you're supposed to?
17:12 MasterKrain well, i thought that was the idea
17:12 MasterKrain only merge commits that represent releases
17:12 meLon joined #git
17:12 MasterKrain not the entire commit history of my develop branch
17:13 TomyLobo you're confusing this with svn
17:13 TomyLobo in git, merges are entirely symmetric
17:13 brent__ joined #git
17:13 mikeric joined #git
17:13 shubhnik joined #git
17:14 MasterKrain how am i confusing it with svn when ive never used svn though xd
17:14 TomyLobo the structure used to represent each side of a merge is the same
17:14 MasterKrain what i mean is i thought it wouldve looked like this http://nvie.com/img/merge-without-ff@2x.png
17:14 synthroi_ joined #git
17:14 brent__ joined #git
17:15 TomyLobo MasterKrain, type "git cat-file -p your_commit_id"
17:15 ojacobson MasterKrain: in the diagram on the left, the merge commit (at the bottom) has two parents, meaning that both the prior commits on develop and the commits on the feature branch will be in the history of develop from that point onwards
17:15 ojacobson The point of the merge commit in that situation is to mark the point at which the feature was integrated, and by whom
17:15 TomyLobo MasterKrain, that diagram has the arrows backwards
17:16 ojacobson It's fairly common for projects to adopt the convention that features are merged like that even if they don't use git-flow, and to have the convention that the first-parent of a merge is the previous branch tip
17:16 ojacobson (so you'd check out master or develop or whatever, then merge --no-ff the feature in)
17:17 romerocesar joined #git
17:17 TomyLobo MasterKrain, you see, a git commit is an object with some metadata and a bunch of pointers to other objects
17:18 MasterKrain yes
17:18 TomyLobo "git cat-file -p your_commit_id" should show you lines starting with tree and parent
17:18 TomyLobo the tree is the current state of the tree at that commit
17:19 TomyLobo the parent is a previous commit that you based that commit on
17:19 TomyLobo there can be multiple parents and then it's called a merge commit
17:20 donught joined #git
17:20 TomyLobo most tools that show a flat history don't discriminate between the parents
17:20 Rapture joined #git
17:20 donught joined #git
17:20 MasterKrain i see
17:21 MasterKrain well, im just looking on gitlab
17:21 moei joined #git
17:21 MasterKrain the commit history of my master branch
17:21 TomyLobo click repository and then netowkr
17:21 TomyLobo network*
17:21 qqx And even with merge commits on the master branch, you can somewhat get the view of only having the release commits there with `git log --first-parent`, while still having the more detailed history available.
17:22 TomyLobo oh, didnt know that
17:22 MasterKrain oh wow, never noticed that network tab before xD
17:22 MasterKrain helps a lot
17:23 ojacobson !lol is also useful
17:23 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
17:24 star_prone joined #git
17:24 roelmonnens joined #git
17:25 TomyLobo but probably harder to use :)
17:25 Silnar joined #git
17:25 MasterKrain that one looks a bit more cluttered haha
17:26 ojacobson I should write a hermeneutics-of-git-log article explaining how to read meaning out of them
17:26 roelmonn_ joined #git
17:26 ojacobson (and how to author logs - not just commit messages, the whole bit - to deliver the message you want)
17:26 svm_invictvs joined #git
17:26 MasterKrain alright, thanks guys. Now i get it. I was afraid i didnt do it the right way xD But now i know its supposed to be like this
17:27 AlgorithmWizard joined #git
17:28 aavrug_ joined #git
17:29 roelmonnens joined #git
17:29 johnmilton joined #git
17:29 roelmonnens joined #git
17:30 Silnar Hi, today I encountered a merge of two branches which seemed to took everything from one branch and totally ignored changes in the other one. I don't have it at hand, but gitk was showing empty patch on this merge commit. Is that possible? If yes, then how can I make a merge that totally ignores changes from other branch ?
17:30 kadoban joined #git
17:30 roelmonnens joined #git
17:31 Dougie187 Silnar: Yes, that is possible.
17:31 Dougie187 I want to say it's something like `git merge --theirs <branch>`
17:31 Dougie187 or `git merge --ours <branch>`
17:32 Aleric Silnar: http://stackoverflow.com/a/10697551/1487069
17:32 Aleric But, that seems to only ignore conflicting hunks, no?
17:32 Silnar Dougie187, Aleric: Yeah, but isn't it only for auto resolving conflicts ?
17:33 Aleric Hmm, yes
17:34 Dougie187 Well, a more wordy way of doing it is:
17:34 ojacobson Silnar: in principle, you can make any commit look any way you want. You can have an eight-parent merge whose result is not like any of the parents in any way, if you work at it.
17:34 roelmonnens joined #git
17:34 Dougie187 `git merge --no-commit <branch>; git checkout <hash>; git commit`
17:34 ojacobson _Generally_ you want to combine changes using 3-way diff, which is what `git merge` usually does
17:34 t0by joined #git
17:34 t0by joined #git
17:34 ojacobson Dougie187: `git merge --no-commit <br> && git rm -rf :/ && git checkout -- <commitish> && git commit` probably
17:34 emg joined #git
17:35 ojacobson clear the work tree & staging area, reconstruct both from <commitish>, commit as merge result
17:35 Dougie187 Yeah, that's true.
17:35 Silnar But, shouldn't I see, at least, some diff showing me that those files from the second branch were removed ?
17:35 ojacobson The "diff" of a merge commit is usually the changes made to resolve conflicts
17:36 ojacobson to get the thing you're probably thinking of, you want the diff between the merge commit and its first parent
17:36 Dougie187 Yeah
17:36 Dougie187 Or the diff of the merge and it's second parent.
17:36 Aleric tired... going to play Royal Clash ;)
17:37 LBV_User joined #git
17:38 Silnar hehe :D  so what i see in gitk is the stuff that the second branch introduced during merge? Because, it sometimes show files added/removed, not only conflicts ?
17:38 Silnar Should I treat a merge with no changes in gitk as a warning sign ?
17:38 Silnar that someone, perhaps, ignored something ?
17:39 encod3 joined #git
17:39 ejb joined #git
17:41 Silnar Aahh, maybe I'm getting mislead, because I still think in terms of patches, but git treats each commit as a separate version. So, that's why showing diff between merge and second branch head should show me what was deleted.. Hmm interesting :)
17:41 fbwnd joined #git
17:41 Silnar No I wonder what gitk is showing me on merge commits... diff between what ?
17:43 imachuchu joined #git
17:43 ojacobson I've never found a good way to articulate that one
17:43 _TWS joined #git
17:44 ojacobson it's something like "the difference between the committed tree and the natural merge result" but that's muddy
17:44 Silnar natural means a reasult of normal 3-way merge ?
17:47 salamanderrake joined #git
17:48 chardan joined #git
17:48 ojacobson yeah. (I'm doing this from memory; this is also what `git show` on a merge commit does, roughly)
17:48 rominronin joined #git
17:48 ojacobson (but, take with salt, etc)
17:48 ojacobson Generally when i'm inspecting diffs I end up inspecting the diff between C^1 and C, or the diff between C^2 and C
17:50 Silnar Ok, I'm searching over the manual, it seems they call it a combined diff... Apart from that, thanks for pointing me out that it is kind of predefined diff - I forgot that git is not about patches, but about commits/versions - that make sense right now :)
17:52 Electrometro joined #git
17:54 GodGinrai Silnar: git can *create* patches
17:54 kpease joined #git
17:55 shubhnik joined #git
17:55 Silnar GodGinrai: Yeah, but AFAIK the idea is to treat every commit as a separate project version; patches, diffs and how to store it in optimal way is secondary.
17:56 gtristan So last time I discovered the git env vars for creating commits with predictable shas
17:56 gtristan for the purpose of running tests of some software which uses git
17:56 boubou joined #git
17:57 gtristan Now it seems to be broken, and have a feeling it has to do with timezone
17:57 tang^ joined #git
17:58 gtristan although, I'm using values of "1320966000 +0200" for GIT_[COMMITER,AUTHOR]_DATE
17:58 gtristan so I suppose the timezone is explicit already ?
17:58 donught joined #git
17:58 gtristan or am I expressing the time wrong maybe ?
17:59 gtristan right now, I seem to get the wrong sha on a gitlab instance, or a different one than the one I get on my laptop
17:59 tnecniv joined #git
17:59 Es0teric joined #git
17:59 romerocesar joined #git
18:00 cjohnson I've got a change in one of my branches where, as part of some other changes in that commit, I modified .gitignore
18:00 Electrometro joined #git
18:00 cjohnson whenever I change to master or another non-dev branch my ignored files show up. is there an easy way to cherry-pick only part of the commit to master?
18:01 cjohnson Or should I just manually copy the changes as a new commit and merge will intelligently detect the same change in both branches?
18:01 nowhereman joined #git
18:02 kadoban cjohnson: You could cherry-pick with --no-commit and then edit the index to dump the changes you don't want I guess, but AFAIK git won't care between the two in terms of merge resolution.
18:02 cjohnson ok thanks it's just 2 added lines
18:02 nickabbey joined #git
18:03 Random832 joined #git
18:03 kadoban If you manually make the changes, I'd try to make them exactly the same, including order and whitespace and whatever, but it shouldn't be a problem even if you don't, it'd be a pretty simple conflict anyway.
18:03 mehola joined #git
18:06 jtlq joined #git
18:11 vdv joined #git
18:12 donught joined #git
18:12 mikecmpbll joined #git
18:13 fbwnd joined #git
18:15 hahuang61 joined #git
18:17 donught joined #git
18:18 tvw joined #git
18:19 jnavila joined #git
18:19 svm_invictvs joined #git
18:22 dreiss joined #git
18:23 matsaman joined #git
18:23 zoraj_ joined #git
18:27 ki0 joined #git
18:28 siddart joined #git
18:30 finalbeta joined #git
18:34 mischat_ joined #git
18:34 finalbeta joined #git
18:37 Siegfried joined #git
18:41 brent__ joined #git
18:42 minikN joined #git
18:42 brent__ joined #git
18:43 aw1 joined #git
18:43 kyan joined #git
18:44 elsevero joined #git
18:45 Silnar ojacobson, Dougie187: After some searching I found that 'git merge -s ours BRANCH' totally discards changes in the other branch (on the other hand 'git merge -s recursive -X ours BRANCH' auto resolves conflicts to ours). Moreover, I think 'git show -p MERGE_COMMIT' is the same as 'git diff MERGE_COMMIT^1 MERGE_COMMIT' and what I was looking for is 'git show -m MERGE_COMMIT' which I don't know how to generate using 'git diff'. Only why gitk
18:45 Silnar doesn't use 'git show -m' by default on merge commits? Huh :)
18:45 ejb joined #git
18:47 tyreld joined #git
18:49 joshszep joined #git
18:50 robattila256 joined #git
18:50 ExoUNX joined #git
18:50 jnavila joined #git
18:50 gtristan Ok so I figured out my conundrum but still dont have a solution... submodules strike back
18:51 gtristan So I'm generating gits for which I can predict the shas, but this is breaking down with submodules
18:51 alhariel joined #git
18:52 gtristan my tests run fine on my own computer, as long as I dont change the directory from whence I wrote the patch :)
18:52 gtristan So, I guess the question is how do I get by testing for git shas in repos that have submodules ?
18:53 shgysk8zer0_ joined #git
18:53 gtristan or, is there a way to use an alias of sorts in git modules, so that the full uri of the submodule is not recorded in history ?
18:54 dsantiago joined #git
18:55 sbeller <gtristan> I have a bare repository, and I want to know the submodules and commit refs for each respective submodule *for a given commit* of the bare/mirror repository
18:55 sbeller I don't think there is a way currently (from outside git), internally the data structures are just there :)
18:55 sbeller you could add a helper function to the builtin/submodule--helper.c
18:55 gtristan sbeller, oh that one I solved yesterday
18:55 sbeller how so?
18:56 manuelschneid3r joined #git
18:56 jaeckel joined #git
18:56 gtristan sbeller, A.) list submodules for a commit with `git show <commit>:.submodules` ... parse that
18:57 gtristan B.) Use `git ls-tree <commit> <submodule-path>` and parse that
18:57 gtristan (B) gives you the commit in the submodule which you want to use for the owning repo at <commit>
18:57 inflames joined #git
18:57 gtristan for each submodule you parse from (A)
18:58 sbeller Oh, yeah that makes sense
18:58 sunri5e joined #git
18:58 gtristan This at least lets you know if you need to git fetch your submodule mirrors to build a commit in the owning/referring repo :)
18:59 gtristan I think I have to work around this test though, I dont think I can add a submodule in a test case without giving it a full path
19:01 polyrob_ joined #git
19:04 brent__ joined #git
19:05 _Cyclone_ joined #git
19:07 jimi_ joined #git
19:08 ki0 joined #git
19:09 tnecniv joined #git
19:09 rnsanchez joined #git
19:10 flavius joined #git
19:12 jccn joined #git
19:13 ejb joined #git
19:15 jason237 joined #git
19:17 Unode joined #git
19:17 Unode Hi everyone.
19:18 ResidentBiscuit joined #git
19:19 leeN joined #git
19:19 Unode I've sent a couple of git patches to a collaborator but he's having problems applying them (with git am). He always gets the error: "Patch is empty.  Was it split wrong?". The patches were generated on Linux and I believe he's on MacOS. Git has been updated to the latest but error persists.
19:19 Sasazuka joined #git
19:19 Unode Is there any other reason that could cause this? Google doesn't help either.
19:20 _ikke_ patch is empty seems to imply it does not introduce any new changes
19:21 rnsanchez_ joined #git
19:21 Unode _ikke_: really? I'd never guess that... Plus I know it's not the case as I've merged it on my end to confirm.
19:23 _TWS_ joined #git
19:24 govg joined #git
19:24 salamanderrake joined #git
19:25 robattila256 joined #git
19:25 Es0teric joined #git
19:26 Unode I mean the patches were rebased on the remote HEAD. So I'm pretty sure they have some content.
19:26 t0by joined #git
19:26 aeontech joined #git
19:26 judson_ joined #git
19:27 Puffball joined #git
19:27 judson_ Is there a way to get git to print to the console when it's waiting on a signing agent (e.g. {ssh,gpg}-agent)?
19:28 Balliad joined #git
19:28 polyrob joined #git
19:28 Unode I don't think git talks with the agents directly. Most likely git calls ssh/gpg and they in turn trigger the agent behavior.
19:29 Unode So at most you may be able to get a message stating that git is waiting on ssh/gpg.
19:29 judson_ I'd be more than happy with that.
19:31 judson_ Any idea how to do that, though?
19:31 judson_ Git runs ssh and gpg off-console, so a wrapper doesn't work.
19:31 kexmex joined #git
19:33 wget joined #git
19:34 vuoto joined #git
19:35 cyan__ joined #git
19:36 ndim joined #git
19:36 laumann_ joined #git
19:36 masak_ joined #git
19:36 Davey joined #git
19:36 Davey joined #git
19:36 tazle_ joined #git
19:36 cite joined #git
19:36 MajorPayne joined #git
19:36 nemesit|znc joined #git
19:36 Vauff joined #git
19:36 du_ joined #git
19:36 rasto joined #git
19:36 blr joined #git
19:36 grekkos joined #git
19:36 sunny256 joined #git
19:36 trondth joined #git
19:36 Dyonisos joined #git
19:36 ahammond joined #git
19:36 diget joined #git
19:36 Hink joined #git
19:36 uidzer0 joined #git
19:36 h12o joined #git
19:36 ayjay_t_ joined #git
19:36 Zarthus joined #git
19:36 ianp joined #git
19:36 lus joined #git
19:36 RichiH joined #git
19:36 cebor joined #git
19:36 pR0Ps joined #git
19:36 Hedgework joined #git
19:36 fk joined #git
19:36 djh joined #git
19:36 seitensei joined #git
19:36 justinmrkva joined #git
19:36 cruxeternus joined #git
19:36 Xarodon joined #git
19:36 lmat joined #git
19:36 adamm joined #git
19:36 d1b joined #git
19:36 grantrules joined #git
19:36 Impaloo joined #git
19:36 loglaunch joined #git
19:36 f0rks joined #git
19:36 adamm joined #git
19:36 meZee joined #git
19:36 ljubak joined #git
19:36 Dyonisos joined #git
19:36 Kehet joined #git
19:36 vmiklos joined #git
19:36 invisbl joined #git
19:36 pingwindyktator joined #git
19:36 leonarth joined #git
19:36 RichiH joined #git
19:36 HandheldPenguin joined #git
19:36 Aaeriele joined #git
19:36 caffeinatedcode joined #git
19:36 hide joined #git
19:36 hplar joined #git
19:36 mrkake joined #git
19:36 alcohol joined #git
19:36 fold4 joined #git
19:36 Serus joined #git
19:36 spinningarrow joined #git
19:36 lucz joined #git
19:36 compeman joined #git
19:36 relrod_ joined #git
19:37 Karazhan joined #git
19:37 relrod_ joined #git
19:37 sea-gull_ joined #git
19:37 sangy joined #git
19:37 sfix joined #git
19:37 sarbs joined #git
19:37 sword joined #git
19:37 chrisml joined #git
19:37 MrC joined #git
19:37 RiPer joined #git
19:37 pkiller joined #git
19:37 g5pw joined #git
19:37 weltall joined #git
19:37 thekingofbandit joined #git
19:37 mattcen joined #git
19:37 Ring0` joined #git
19:37 Afforess joined #git
19:37 Kamilion joined #git
19:37 eycsigfy joined #git
19:37 stux|RC-only joined #git
19:37 twisted` joined #git
19:38 brendyn joined #git
19:38 DelphicOkami joined #git
19:38 pelegreno joined #git
19:38 Cthalupa joined #git
19:38 Guest61236 left #git
19:39 ToeSnacks joined #git
19:40 nickabbey joined #git
19:40 dave0x6d joined #git
19:41 jantje joined #git
19:41 discopatrick joined #git
19:41 wizonesolutions joined #git
19:41 mehola joined #git
19:41 milkshoes joined #git
19:41 ulkesh joined #git
19:42 pizzaops joined #git
19:42 ggherdov joined #git
19:42 angular_mike_ joined #git
19:43 huhlig joined #git
19:44 sunri5e joined #git
19:44 ggherdov joined #git
19:44 wget joined #git
19:44 wget joined #git
19:45 mehola joined #git
19:46 shpew12 joined #git
19:46 nicksloan joined #git
19:51 judson_ I might be able to wrap ssh, on review, but I've tried wrapping gpg and that didn't help
19:55 Boniche joined #git
19:56 _Cyclone_ joined #git
19:57 ribasushi joined #git
19:58 ghostlight joined #git
19:59 anli joined #git
19:59 meLon joined #git
19:59 anli Is a gitignore rule looking like /*/[Tt]emp/ ignoring a all temp directories one level down?
19:59 tvl joined #git
20:00 SwiftMatt joined #git
20:00 _ikke_ as far as I know, [Tt] does not work in gitignore rules
20:00 _ikke_ but other than that, it should work
20:01 nikivi joined #git
20:03 crayon joined #git
20:04 anli It does, however, it is silly to have a rule like that if you know the directory name
20:04 Gianormagantrous joined #git
20:04 Gianormagantrous joined #git
20:05 _ikke_ Ah, it's part of the fnmatch spec of course
20:06 anli ah
20:06 anli Never heard about fnmatch
20:06 [cust] joined #git
20:06 anli Now i have
20:06 _ikke_ It's refered to in the gitignore man page
20:10 hplar joined #git
20:11 hplar joined #git
20:11 UTAN_dev joined #git
20:14 Sasazuka joined #git
20:16 m0viefreak joined #git
20:20 Gsham joined #git
20:21 theaj42 joined #git
20:22 star_prone joined #git
20:24 ki0_ joined #git
20:27 Snugglebash joined #git
20:28 courrier joined #git
20:29 Qcm joined #git
20:29 HoierM joined #git
20:31 icey joined #git
20:31 icey joined #git
20:34 ejb joined #git
20:36 jnavila joined #git
20:37 mehola joined #git
20:38 matsaman joined #git
20:38 NeverDie joined #git
20:38 Balliad joined #git
20:40 Sasazuka_ joined #git
20:42 Vgr joined #git
20:42 Vgr joined #git
20:42 Vgr joined #git
20:47 durham joined #git
20:51 ShekharReddy joined #git
20:53 aidalgol joined #git
20:53 dsdeiz joined #git
20:53 dsdeiz joined #git
20:53 vdv_ joined #git
20:57 jccn joined #git
20:58 relipse joined #git
20:58 relipse if i am in a repository and it says "Not currently on any branch" what is the best way to proceed?
20:58 relipse should I create a new branch and then commit the modified files?
20:58 pbrewczynski joined #git
21:01 invisbl_ joined #git
21:01 HanClinto_ joined #git
21:01 invisbl_ joined #git
21:03 brent__ joined #git
21:04 brent__ joined #git
21:04 rominronin joined #git
21:04 Atm0spher1c joined #git
21:04 ki0 joined #git
21:05 mischat joined #git
21:06 mischat joined #git
21:07 l2y joined #git
21:08 theskillwithin joined #git
21:10 HanClinto__ joined #git
21:11 cdg joined #git
21:12 Silenced joined #git
21:13 Silenced joined #git
21:14 lindenle joined #git
21:14 _ikke_ for example
21:15 hhee joined #git
21:16 LionsMane joined #git
21:16 askb joined #git
21:18 l2y so i made a mistake today. i wanted to contribute on github, so i made a fork. i made the changes directly to master and opened a pull request. but at the same time i wanted to work on another thing, so i created a branch and started making changes to files (but not to those already changed in master). the branch was created based on already changed files in
21:18 l2y master. now i want to make a second pull request but with the changes introduced only by that branch. the problem is, because it was created based on master, it already contains the changes that i want to leave for the first pull request. an important thing to mention is that these commits i want to separate do not share any files so no merge conflicts
21:18 l2y expected. question: how can i separate these commits? for example, to make master be based on the original fork and have two own branches, each one for each pull request? is it possible to solve in any way without dirty history loss?
21:19 matthiaskrgr try to
21:19 matthiaskrgr ah
21:19 thebope joined #git
21:19 matthiaskrgr well, if you have a branch without your first changes
21:19 matthiaskrgr make a new branch from that one
21:19 l2y no, i do not
21:19 gargola joined #git
21:20 matthiaskrgr can you git log master and see the last original commit?
21:20 l2y i commited everything directly to master in the beginning
21:20 matthiaskrgr you can check that one out and create a new branch from this commit
21:20 l2y aha
21:21 matthiaskrgr then, check out this new branch and cherry-pick the commit of the second branch (the changes you did on top of the master-branch-changes) onto the new "clean" branch
21:21 l2y git checkout *hash* && git ???
21:21 matthiaskrgr git checkout *hash ; git branch master_clean
21:21 matthiaskrgr then   git checkout master_clean
21:21 matthiaskrgr and you can git cherry-pick the commit(s) of the second branch onto this branch
21:21 matthiaskrgr at least this is what I would do :)
21:22 matthiaskrgr (and hope there are no merge conflicts :) )
21:22 l2y one-by-one?
21:22 matthiaskrgr is it a lot?
21:22 l2y no, just a few
21:22 matthiaskrgr there might be a better way, but one by one shoud work
21:22 matthiaskrgr if you don't mess up the order
21:23 l2y thanks a lot, going to try
21:23 matthiaskrgr just have one terminal with git log at the right and another one for cherry-picking at the left
21:23 matthiaskrgr np :)
21:28 hahuang65 joined #git
21:28 durham joined #git
21:30 Siegfried joined #git
21:31 jeffreylevesque joined #git
21:32 shpew12 joined #git
21:37 Tobbi joined #git
21:40 garethdaine joined #git
21:40 cagedwisdom joined #git
21:40 fahadash joined #git
21:41 elsevero joined #git
21:42 Hobbyboy joined #git
21:42 Cassiopaya joined #git
21:45 atomicb0mb joined #git
21:47 silicong joined #git
21:47 IlNominePatre joined #git
21:47 altendky joined #git
21:48 stick-shift joined #git
21:48 WayToDoor joined #git
21:49 MarkFletcher joined #git
21:50 Endarked joined #git
21:52 barteks2x joined #git
21:53 nwkj86 joined #git
21:56 l2y great, everything is good
21:56 relipse how do i find a file that doesn't exist in the current working dir but did exist at some point
21:57 cdown joined #git
21:58 relipse i tried git rev-list -n 1 HEAD -- <file> but that didnt' give me anything
21:58 moritz git log --name-only --diff-filter=D
21:59 moritz and then grep through the file names spit out by the command
21:59 invisbl joined #git
21:59 moritz or if you know the exact file name, git log -- <file> to find the commits that touched it
21:59 moritz ^^ for relipse
22:00 relipse is there a way to search across all branches
22:00 l2y if i made git reset --hard %hash% how can i push my changes to a remote repository?
22:01 moritz relipse: add --all to the git log commands
22:02 moritz l2y: with --force, but be carefuly with that
22:02 kadoban l2y: By pushing them? You might need --force-with-lease, but be careful you actually know what you're doing.
22:02 Gsham joined #git
22:02 l2y moritz: thanks that's what i wanted
22:02 kadoban You have to be careful, because modifying published history isn't very friendly to your peers.
22:03 l2y i know, but i will merge from the branches afterwards
22:03 l2y this is a fork
22:07 aarobc joined #git
22:07 garethdaine joined #git
22:17 dsdeiz joined #git
22:20 denisMone joined #git
22:20 hahuang61 joined #git
22:22 netj joined #git
22:22 Puffball joined #git
22:24 Darren_ joined #git
22:24 fatalhalt joined #git
22:25 MacWinner joined #git
22:26 LaptopBrain joined #git
22:27 emim joined #git
22:28 MasterKrain joined #git
22:28 Anja_ joined #git
22:29 MasterKrain im having some merge conflicts (Unity) but this is new to me and i dont know what to do https://www.upload.ee/image/6522802/Capture.PNG
22:29 MasterKrain can someone tell me what to do? maybe?
22:31 ikelso joined #git
22:32 sea-gull_ joined #git
22:33 angelsl joined #git
22:37 Endarked joined #git
22:38 jimi_ joined #git
22:39 kadoban MasterKrain: !eek
22:39 gitinfo MasterKrain: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
22:39 kadoban Unfortunately, merging binary files usually means something not great is happening, so you might be in for some fun.
22:40 MasterKrain D:
22:44 YuGiOhJCJ joined #git
22:45 WaReZ joined #git
22:48 nickabbey joined #git
22:51 dwmw2_gone joined #git
22:51 ejb joined #git
22:52 mario__ joined #git
22:53 ertes joined #git
22:56 sunri5e joined #git
22:56 elsevero joined #git
22:58 archaic joined #git
22:58 archaic joined #git
22:58 thebope joined #git
22:58 Anja_ joined #git
23:00 shgysk8zer0_ joined #git
23:01 fmeerkoetter joined #git
23:01 aax joined #git
23:03 d0nn1e joined #git
23:04 snowkidind joined #git
23:06 Dougie187 left #git
23:07 SwiftMatt joined #git
23:07 dreiss joined #git
23:13 BSAlb joined #git
23:16 jccn joined #git
23:19 sbeller joined #git
23:20 dendazen joined #git
23:21 BSAlb joined #git
23:23 dhollinger joined #git
23:26 ejb joined #git
23:30 anonymuse joined #git
23:31 LeBlaaanc joined #git
23:31 stick-shift joined #git
23:31 danslo joined #git
23:33 cjohnson I'm having trouble figuring out the best way to do this
23:33 cjohnson I have a branch called qa which has multiple testing features merged in
23:33 cjohnson in feature a, I have renamed a library, and along with it all library calls in the codebase
23:34 HenriettaSalt joined #git
23:34 cjohnson in feature b, I have added a new call to this library. I believe in feature b, I should call it by its original name since it hasn't been renamed there
23:34 sunri5e joined #git
23:34 cjohnson however, how can I successfully merge both into qa in a way that I have working code and not a broken call?
23:34 cjohnson should I add an extra commit to qa that renames this one call?
23:36 hahuang61 joined #git
23:36 cjohnson then if I change that line again in feature b, next tim I merge feature b into qa I will get a merge conflict and I can manually change the name there
23:36 cjohnson I never merge qa to master fwiw
23:37 garethdaine joined #git
23:40 cagomez joined #git
23:40 rwb joined #git
23:45 Sasazuka joined #git
23:45 arescorpio joined #git
23:46 dreiss joined #git
23:47 ShekharReddy joined #git
23:51 rivarun joined #git
23:52 VladGh joined #git
23:54 AfroThundr joined #git
23:54 alex1a joined #git
23:55 AfroThundr joined #git
23:56 jccn joined #git

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