Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-17

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

All times shown according to UTC.

Time Nick Message
00:03 invisbl joined #git
00:08 thiago joined #git
00:12 howitdo joined #git
00:12 shgysk8zer0 joined #git
00:14 bronson joined #git
00:14 Dougie187 left #git
00:16 safe joined #git
00:17 howitdo joined #git
00:19 tang^ joined #git
00:19 SpeakerToMeat joined #git
00:19 ResidentBiscuit joined #git
00:19 jccn joined #git
00:19 madewokherd joined #git
00:19 mizu_no_oto joined #git
00:20 holodoc joined #git
00:23 moestevens joined #git
00:25 robattila256 joined #git
00:25 jstimm joined #git
00:26 diogenese joined #git
00:28 King_Hual joined #git
00:36 ResidentBiscuit joined #git
00:38 romerocesar joined #git
00:40 arescorpio joined #git
00:45 griffindy joined #git
00:51 Derderderd joined #git
00:51 buffal0 joined #git
00:52 Lyqyd joined #git
00:52 _main_ joined #git
00:52 nivag joined #git
00:53 _main_ joined #git
00:54 converge__ joined #git
00:55 __main__ joined #git
00:58 d0nn1e joined #git
00:58 hahuang61 joined #git
00:59 pwnz0r joined #git
00:59 buffffal00 joined #git
00:59 snowkidind joined #git
01:05 jccn joined #git
01:06 WaReZ joined #git
01:07 porsche944 joined #git
01:08 _main_ joined #git
01:09 [Saint] joined #git
01:11 _main_ joined #git
01:15 converge__ left #git
01:22 armyriad joined #git
01:23 ki0 joined #git
01:27 __main__ joined #git
01:29 robnester left #git
01:30 _main_ joined #git
01:31 thiago joined #git
01:33 jottr joined #git
01:35 durham joined #git
01:35 inflames joined #git
01:42 jw4242 joined #git
01:44 buffal0 joined #git
01:45 __main__ joined #git
01:46 _main_ joined #git
01:46 venmx joined #git
01:48 _main_ joined #git
01:53 _main_ joined #git
01:54 pbrewczynski joined #git
01:55 pbrewczynski Why I'm not as bright as you guys?
01:55 pbrewczynski I'm just the mediocre programmer.
01:55 pbrewczynski And I will never be good as you guys.
01:57 cagedwisdom joined #git
01:59 Siegfried joined #git
02:03 nowhere_man joined #git
02:03 Amanas joined #git
02:04 SwiftMatt joined #git
02:06 mizu_no_oto joined #git
02:07 __main__ joined #git
02:10 svm_invictvs joined #git
02:10 generic_ joined #git
02:12 d^sh joined #git
02:13 _main_ joined #git
02:13 HedgeMage pbrewczynski: Practice and mentorship with a side of reading are the most effective recipe I've found for getting better.
02:14 bronson joined #git
02:17 invisbl joined #git
02:21 dsdeiz joined #git
02:22 ResidentBiscuit joined #git
02:24 Poppa joined #git
02:24 Mekkis joined #git
02:26 AlexMax got a question
02:26 AlexMax i am working on a long running feature branch
02:27 AlexMax in the process of working on said feature branch, I realized that there is a particular commit that would be good in the original master branch
02:27 AlexMax I don't want to merge my entire branch in yet though
02:27 AlexMax is this what cherry pick is for?
02:27 HedgeMage yes
02:29 finalbeta joined #git
02:29 ResidentBiscuit joined #git
02:30 diogenese joined #git
02:31 diogenese joined #git
02:33 kadoban joined #git
02:36 SwiftMatt joined #git
02:36 Goplat joined #git
02:37 garethdaine joined #git
02:38 WhiskerBiscuit joined #git
02:38 AlexMax okay
02:38 AlexMax I actually have a related question
02:39 AlexMax let's say that I have a branch where all commits EXCEPT ONE are good to merge
02:39 AlexMax Should I just merge, revert the problematic commit in the merged-into branch, but not on the branch I was working on
02:40 invisbl joined #git
02:41 mizu_no_oto joined #git
02:42 pks_ joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and serious business | 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 | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:49 shgysk8zer0 joined #git
02:49 kyan joined #git
02:52 Vampire0_ joined #git
02:52 nowhere_man joined #git
02:58 [0xAA] joined #git
02:58 dsantiago joined #git
02:59 hahuang61 joined #git
02:59 pwnz0r joined #git
03:06 sunri5e joined #git
03:16 aw1 joined #git
03:17 kfc joined #git
03:17 Sample joined #git
03:19 chachasmooth joined #git
03:28 duderonomy joined #git
03:29 pks joined #git
03:30 dreiss joined #git
03:30 fuchsi joined #git
03:31 Sample joined #git
03:35 krillr joined #git
03:38 Emperor_Earth joined #git
03:40 zivester joined #git
03:40 Learath2 joined #git
03:42 Siegfried joined #git
03:47 malavv joined #git
03:48 durham joined #git
03:54 hexagoxel joined #git
03:55 venmx joined #git
03:57 ki0 joined #git
03:59 SwiftMatt joined #git
03:59 invisbl joined #git
04:00 SpeakerToMeat joined #git
04:04 sunri5e joined #git
04:04 upenox joined #git
04:05 bdonnahue joined #git
04:05 bdonnahue hey how can i clone a specivie revision from github?
04:06 thiago bdonnahue: you cannot
04:07 __main__ joined #git
04:07 thiago AlexMax: if this branch is not public, drop that commit from the branch so you can merge it
04:07 thiago AlexMax: if not, make that commit ready to be merged, then merge it.
04:08 fstd_ joined #git
04:09 a_thakur joined #git
04:14 fuchsi_ joined #git
04:14 Vortex35 joined #git
04:15 bronson joined #git
04:16 shgysk8zer0 joined #git
04:16 gfixler joined #git
04:19 cqi joined #git
04:23 phroa bdonnahue: a feature of github, however, is being able to download a .zip of a repo for a given ref
04:23 phroa copy the "Clone or download -> Download ZIP" link and change 'master' (or the default branch name) to what you want
04:27 Sample joined #git
04:29 NeverDie How do I force a merge with another branch? Like if I want to force merge my branch into the `development` branch?
04:29 kadoban NeverDie: Where "force" means what?
04:29 kadoban How is it different from a normal merge?
04:29 NeverDie kadoban: To overwrite it, basically.
04:30 kadoban NeverDie: ... explain non-basically. (since I have no idea what that means)
04:30 NeverDie kadoban: I want to overwrite the `development` branch with my branch.
04:31 phroa I believe you want the 'ours' merge option.  man git-merge for details, see if it matches your use case
04:31 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
04:31 NeverDie And avoid the merge conflicts that will arise from this instance
04:31 kadoban NeverDie: The history? The current state of files? Something else?
04:31 phroa though you might want to see if there's another thing besides merge to use, since a full overwrite isn't really a... merge
04:31 NeverDie phroa: Oh, then how to immediately overwrite it?
04:31 NeverDie In this case, it wouldn't be a `git merge` then after all?
04:32 romerocesar joined #git
04:32 phroa well you can do what you want (what I think you want) with 'git merge', but conceptually, that's not a /merge/, that's more of a hard `man git-reset`
04:32 gitinfo the git-reset manpage is available at http://jk.gs/git-reset.html
04:33 kadoban NeverDie: Skipping the part where you clarify what you want doesn't typically go well, even if someone else is willing to guess more strongly what you want. Just throwing that out there.
04:33 phroa perhaps kadoban can give you some other ideas, if you answer his questions :)
04:33 NeverDie kadoban: I just want to overwrite the current state of the files with my state.
04:34 NeverDie So to overwrite the file state of the `development` branch with my file state from the `migration` branch in this case.
04:34 kadoban NeverDie: Do you want the history to show just the existing history and then a commit that's like "overwrite all files" with all the changes?
04:34 NeverDie kadoban: I don't see why not, but it'd be mostly redundant I think.
04:35 NeverDie Especially if it's any extra hassle, then I wouldn't care about the history state being overwritten.
04:35 ResidentBiscuit joined #git
04:35 kadoban If you're fine with changing history, then yeah that's easier, that's 'git checkout branchtonuke && git reset --hard branchilike'
04:36 kadoban Where branchilike has the history/state you want
04:36 phroa obligatory !rewriet
04:36 phroa !rewrite
04:36 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
04:36 NeverDie kadoban: Awesome, one sec.
04:36 NeverDie phroa: Yeah, that part I'm aware.
04:41 NeverDie kadoban: I did it, but it won't let me push it to origin.
04:41 NeverDie `git push origin development` gets rejected.
04:42 romerocesar joined #git
04:42 kadoban NeverDie: Yes, that's because history has changed presumably.
04:43 kadoban NeverDie: The last message from gitinfo shows the command line switch you must use if you really want to do that.
04:43 NeverDie kadoban: Yeah someone did some database work with the previous database which was redundant since we're migrating to a new database.
04:43 NeverDie That's the work I'm looking to overwrite currently.
04:43 NeverDie kadoban: git push --force-with-lease origin development ?
04:43 kadoban Sounds right
04:44 aidalgol joined #git
04:45 NeverDie kadoban: Awesome, thanks a lot!
04:45 kadoban 'welcome
04:45 NeverDie phroa: Thank you as well!
04:50 a_thakur joined #git
04:55 jasondockers joined #git
04:56 venmx joined #git
04:57 Sample joined #git
04:57 ki0 joined #git
04:59 eizua joined #git
05:05 pks joined #git
05:07 moei joined #git
05:10 invisbl joined #git
05:11 Atm0spher1c joined #git
05:16 bocaneri joined #git
05:19 pks joined #git
05:21 Sample joined #git
05:21 watabou joined #git
05:21 upenox joined #git
05:25 SwingShock joined #git
05:27 SwingShock One of my friends got an older version that he is developing. I just started using git and got a more updated master branch. What to do next ?
05:28 PaulCapestany joined #git
05:28 thiago continue developing
05:28 subhojit777 joined #git
05:30 Mowgli joined #git
05:32 romerocesar joined #git
05:34 Darren_ joined #git
05:37 howitdo joined #git
05:37 PaulCapestany joined #git
05:37 raspado joined #git
05:38 Siegfried joined #git
05:41 Limes_ joined #git
05:41 frobnic joined #git
05:42 bannakaffalatta joined #git
05:43 romerocesar joined #git
05:45 Cabanossi joined #git
05:53 romerocesar joined #git
05:54 HanClinto joined #git
05:55 Lyqyd joined #git
05:57 venmx joined #git
05:58 ki0 joined #git
05:58 anonymuse joined #git
05:59 jaguarmagenta joined #git
06:06 jaguarmagenta joined #git
06:07 dendazen joined #git
06:11 SwingShock What is the difference between 'git add .' and 'git add --all' ?
06:13 dendazen joined #git
06:14 phroa if you were in a subfolder, git add . would just add the contents of that subfolder
06:14 pks joined #git
06:15 SwingShock Thanks. Now i understand. Since i just work only from the root for now it might not make any difference. But i will start using add --all from now.
06:16 Masber joined #git
06:16 holodoc joined #git
06:16 phroa me too, and I use . because it's shorter :)
06:16 bronson joined #git
06:16 bremner best practice is not to use either, but to construct meaningful commits
06:17 Anthaas joined #git
06:18 romerocesar_ joined #git
06:18 dreiss joined #git
06:25 kadoban bremner: Commiting often enough means that 'git add .' rarely conflicts with that goal.
06:25 bremner *shrug* like most things in git, it's fine if you know what you are doing
06:26 freimatz joined #git
06:26 bremner in the long run, learning to use the index will cause less problems than avoiding it.
06:28 romerocesar joined #git
06:29 QuestionTime joined #git
06:29 bluezone joined #git
06:31 cyan__ joined #git
06:32 Siegfried joined #git
06:35 invisbl joined #git
06:38 jaguarmagenta joined #git
06:38 SwingShock joined #git
06:40 jaguarmagenta joined #git
06:43 jaguarmagenta joined #git
06:44 jaguarmagenta joined #git
06:47 diogenese joined #git
06:48 hhee joined #git
06:48 jaguarmagenta joined #git
06:49 meLon joined #git
06:49 jaguarmagenta joined #git
06:50 jaguarmagenta joined #git
06:52 judson__ joined #git
06:54 jaguarmagenta joined #git
06:55 svm_invictvs joined #git
06:58 kazantip joined #git
06:58 romerocesar_ joined #git
06:58 venmx joined #git
06:59 ki0 joined #git
07:02 hahuang61 joined #git
07:02 jaguarmagenta joined #git
07:03 jaguarmagenta joined #git
07:03 diogenese joined #git
07:08 romerocesar joined #git
07:14 jaguarmagenta joined #git
07:16 Random832 what about 'git add :'
07:16 Random832 vs --all
07:17 Random832 or :/ maybe
07:17 * bremner looks blank
07:18 Random832 :/ is a pathspec for the root of the repository
07:18 blackwind_123 joined #git
07:20 pks joined #git
07:20 jaguarmagenta joined #git
07:20 Lauven joined #git
07:22 jaguarmagenta joined #git
07:24 jaguarmagenta joined #git
07:26 ShapeShifter499 joined #git
07:28 jaguarmagenta joined #git
07:29 Macaveli joined #git
07:29 jaguarmagenta joined #git
07:31 jaguarmagenta joined #git
07:31 hanthings joined #git
07:33 deepclear joined #git
07:38 pks joined #git
07:38 romerocesar_ joined #git
07:39 jaguarmagenta joined #git
07:42 Derderderd joined #git
07:43 _28_ria joined #git
07:52 pks joined #git
08:01 blackwind_123 joined #git
08:01 gtristan joined #git
08:02 fuchsi_ joined #git
08:03 venmx joined #git
08:03 invisbl joined #git
08:04 SwiftMatt joined #git
08:06 dersand joined #git
08:07 gtristan Hi, so I'm writing a build tool which works with various ways to obtain sources, of course including git. What I'd like to do is to only ever fetch the minimum possible things from the upstream repo and mirror those locally
08:08 gtristan it's possible that more than one branch or ref be needed from a given upstream
08:08 gtristan so I'm unsure if --single-branch is appropriate, the same repo should be able to mirror/fetch selected commits/branches
08:08 gtristan (multiple ones)
08:09 gtristan Any pointers on how I should do this ?
08:09 gtristan operations I need include A.) Fetch a specific commit sha   and B.) Fetch a specific tag-or-branch, at any given time
08:09 gtristan from upstream into my local mirror
08:10 inflames joined #git
08:12 slappymcfry joined #git
08:15 gtristan hmmm, seems I'm thinking the wrong way, I should not be cloning at all
08:15 gtristan instead I should git init and set the remote origin, and then only fetch
08:17 bronson joined #git
08:18 Jackneill joined #git
08:20 hanthings joined #git
08:20 gtristan err, that doesnt seem to work
08:22 lightstalker joined #git
08:24 venmx joined #git
08:25 invisbl joined #git
08:29 ahmedelgabri joined #git
08:33 knot joined #git
08:33 subhojit777 joined #git
08:34 diogenese joined #git
08:38 oskarkv joined #git
08:38 romerocesar joined #git
08:39 floatingman joined #git
08:42 mda1 joined #git
08:43 slappymcfry joined #git
08:45 slappymcfry joined #git
08:47 cdesai joined #git
08:49 gtristan Ok I see, git has not yet learned this trick
08:49 gtristan although there are patches in moderately recent git which allow this... but _only_ if the remote (not in the user's control) repository has configured itself to allow it
08:50 gtristan we'll get there, for now I live with hours of cloning irrelevant data to achieve a build
08:52 theoceaniscool joined #git
08:53 oskarkv joined #git
08:54 GavinMagnus joined #git
08:55 GavinMagnus left #git
08:56 dsdeiz joined #git
08:58 overlord_tm joined #git
08:58 CuriousMind joined #git
08:58 phanimah1sh joined #git
08:58 CuriousMind Hi, how do I undo my commit?
08:59 j416 CuriousMind: there are a few ways depending on what you want to achieve
08:59 j416 CuriousMind: have you shared the commit with others?
09:00 CuriousMind j416: I have not shared the commit with others. I am currently doing this command "git rebase -i <id>"
09:01 ki0 joined #git
09:01 j416 CuriousMind: two options: you can keep the commit and record a new one that reverts it, or you can choose to pretend you never did the commit. The former would use git revert, the latter would use git reset
09:01 j416 CuriousMind: git rebase -i works as well, eys
09:01 j416 yes*
09:01 CuriousMind Hmmm I see j416. Give me one second please
09:03 hahuang61 joined #git
09:03 CuriousMind Ugh I cant
09:03 CuriousMind I messed up
09:03 CuriousMind j416: Help me please :(
09:04 j416 CuriousMind: !repro
09:04 gitinfo CuriousMind: [!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
09:04 j416 also, !backup
09:04 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
09:04 CuriousMind j416: Can I show you my github?
09:04 j416 sure
09:04 CuriousMind j416: https://github.com/Osagiede/Motherland/commits/master
09:05 j416 CuriousMind: and what is the issue?
09:05 CuriousMind I want to remove the first two commits in December 17 j416. I was trying to remove the first one but that failed
09:06 CuriousMind Can you help me remove the 2 commits on github?
09:06 j416 you want to obliterate d40a5976c484 and cf2de6c63502 ?
09:06 CuriousMind Yes sir j416
09:07 j416 do you have any uncommitted changes? (what does git status say?)
09:07 CuriousMind j416: I did something bad there too in terminal. It says "On branch master nothing to commit, working directory clean"
09:07 everlife_ joined #git
09:07 j416 (it doesn't really matter in this case, but it's a good idea to always have things comitted when juggling things around)
09:07 CuriousMind I had created a bunch of models and stuff and I guess because I revert and stuff, all my migrations and stuff is gone j416
09:08 j416 app/models/dashiki_pant.rb
09:08 j416 app/models/dashiki_shirt.rb
09:08 j416 app/models/kufi_hat.rb
09:08 j416 that?
09:08 CuriousMind Yes j416
09:08 j416 it is possible to keep whatever you want from it.
09:08 ki0 joined #git
09:08 j416 it's not gone
09:08 CuriousMind j416: Oh I see
09:09 j416 it's still in your history https://github.com/Osagiede/Motherland/commit/d40a5976c4840db69958e0ea011acd85bc0ed805
09:09 CuriousMind Ok, it is probably gone on my local machine but not on github. Ok I understand j416
09:09 CuriousMind Yes I see j416
09:09 j416 it's on your local machine as well, just only in your history
09:09 j416 so I take it you want the commits gone, and then you want some of the changes back
09:10 j416 so that you can create a new commit?
09:10 slappymcfry CuriousMind: When I find myself in this pickle. I do `git reset HEAD~2` this will undo the commits but leave files in tact. `git reset --hard HEAD~2` will undo commits and changes
09:10 j416 slappymcfry: please let him answer the question
09:10 j416 slappymcfry: if you want to take over, please do :)
09:10 j416 I'll let you
09:10 CuriousMind No please
09:10 CuriousMind slappymcfry: One second please and thank you
09:10 CuriousMind j416: Yes I want to make a new commit and stuff
09:10 slappymcfry sorry. just adding my two cents :)
09:11 j416 CuriousMind: alright
09:11 CuriousMind j416: I want to keep the app/models/dashiki_pant.rb, shirt, and hat
09:11 CuriousMind j416: I want that code on my local machine so I will have to pull it down I think?
09:12 j416 no you already have it
09:12 CuriousMind j416: Ok sorry. I keep on misunderstanding cause I revery
09:12 CuriousMind revert*
09:12 j416 ok, let's do this
09:12 CuriousMind Yay
09:13 j416 trying to figure out how to explain best
09:13 j416 https://github.com/Osagiede/Motherland/commits/master
09:13 j416 you want the state of your things to be like at 52af8b9a0db3 and then you want part of the changes from d40a597
09:13 j416 so let's start by resetting to 52af8b9a0db3: "git reset 52af8b9a0db3"
09:14 j416 that'll get rid of the last two commits
09:14 CuriousMind j416: Yes sir
09:14 j416 there should be no change to your files.
09:14 CuriousMind The commits are gone!
09:15 j416 yeah
09:15 CuriousMind I did git log and I don't see them
09:15 CuriousMind :O
09:15 j416 correct
09:15 j416 that's what you wanted, right?
09:15 CuriousMind Yes, that is right
09:15 j416 now you want some of the changes from d40a5976c484
09:15 CuriousMind Yes j416  :)
09:16 CuriousMind Wait hold on j416
09:16 j416 that commit still exists, it hasn't been garbage collected yet (you've at least 2 weeks before that happens)
09:16 CuriousMind I want to remove the commits on github too
09:16 j416 CuriousMind: yes, we'll get to that
09:16 CuriousMind Ok sorry j416
09:16 j416 let's keep them there for now, in case you mess up and remove your repo or something
09:16 j416 :)
09:16 CuriousMind haha ok
09:16 j416 git checkout d40a5976c484 -- .
09:17 CuriousMind I entered it in
09:17 CuriousMind Ok what happened
09:17 j416 you had only additions and changes (no deletions) so the above way (git checkout) was fine; if you had had deletions, it would have been different
09:17 j416 CuriousMind: git reset
09:18 CuriousMind git reset again?
09:18 j416 yeah just "git reset"
09:18 TomyLobo joined #git
09:18 CuriousMind "Unstaged changes after reset: Mconfig/routes.rb"
09:18 j416 CuriousMind: the last "git reset" unstaged your files that were staged before
09:19 j416 CuriousMind: you should have one modified file and 11 untracked files now.
09:19 CuriousMind Holy moly j416 This looks like it I think
09:19 CuriousMind Let me see hold on, I gotta look in my editor
09:19 j416 "git status" will tell you
09:20 glebihan joined #git
09:20 CuriousMind Whooaa I see LOL!!!
09:20 CuriousMind Yes you did it j416 wow
09:20 CuriousMind Everything came back wow
09:20 j416 CuriousMind: so, now just commit whatever changes you want to keep, and throw away the ones you don't care about
09:20 CuriousMind Thank you so much j416 wow
09:21 CuriousMind Yes will do, ok the github commits
09:21 CuriousMind I want to remove that
09:21 j416 yeah, go ahead and commit the changes first, I would recommend
09:21 CuriousMind Ok one second j416
09:21 j416 because if you remove those commits from github, and somehow obliterate your local repo, there's no way to get the changes back.
09:21 romerocesar joined #git
09:21 j416 (unless github support can help you, but that's unnecessary)
09:22 raatiniemi joined #git
09:23 CuriousMind im in trouble j416
09:23 CuriousMind "To git@github.com:Osagiede/Motherland.git  ! [rejected]        master -> master (non-fast-forward) error: failed to push some refs to 'git@github.com:Osagiede/Motherland.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
09:23 j416 yeah.
09:23 j416 did you do the commit?
09:23 CuriousMind Yes sir j416
09:23 j416 you altered history, so you cannot simply 'git push'
09:24 j416 you'll need to do (and think twice before you do this always) git push --force
09:24 CuriousMind Ok will do that j416
09:24 j416 that'll overwrite whatever is at the remote site.
09:24 CuriousMind I gotta see this, one second
09:25 CuriousMind j416: Look we did it!!! It's not there anymore right? https://github.com/Osagiede/Motherland/commits/master
09:25 CuriousMind That is the commit I wanted
09:25 j416 CuriousMind: except it isn't
09:26 j416 CuriousMind: you just added all the files again
09:26 j416 CuriousMind: you're back at where you started
09:26 cdown joined #git
09:26 invisbl joined #git
09:26 CuriousMind j416: To be honest j416 , I just wanted to change the commit title
09:26 CuriousMind so no worries lol
09:26 j416 CuriousMind: if you had said that to begin with, this all would have been much easier.
09:27 j416 :)
09:27 CuriousMind j416: I am so sorry
09:27 CuriousMind LOL!!!! I am such a noob but this was very interesting
09:27 j416 I hope you learnt something!
09:27 CuriousMind Yes I did, "git push --force"
09:27 CuriousMind Thank you so much j416
09:28 j416 "git push --force-with-lease" is a safer version that won't force push in case there are new changes on the remote that you don't have
09:28 j416 I always prefer that one if I'm unsure.
09:28 CuriousMind Yes I see j416
09:28 j416 ;) happy committing
09:28 CuriousMind You too, thank you j416
09:29 CuriousMind You are awesome
09:29 j416 m__m
09:29 j416 happy to help
09:29 jaguarmagenta joined #git
09:30 davimore_ joined #git
09:31 jmd joined #git
09:31 j416 slappymcfry: sorry if I sounded like a jerk above; it'll just make the process more tangled if the person being helped types all kinds of commands that people throw in, because you end up having no idea what state he is in
09:32 j416 slappymcfry: so that's why.
09:32 j416 slappymcfry: I've learnt that taking things super slow usually pays off; people don't always reveal the whole truth about their repo state :)
09:32 jaguarma_ joined #git
09:32 _Vi joined #git
09:33 ShapeShifter499 joined #git
09:34 phanimahesh joined #git
09:35 ochorocho__ joined #git
09:36 ResidentBiscuit joined #git
09:37 howdoi joined #git
09:38 Sample joined #git
09:38 slappymcfry +1 j416 I usually lurk and learn. I jumped when I saw, "ooh, I think I know this one!" But I would've just given the quick fix. I enjoy seeing someone learn something the thorough way.
09:38 ismithers joined #git
09:38 j416 slappymcfry: :) thank you.
09:39 phanimah1sh joined #git
09:39 tmg j416: I have a repo with less than 10 commits; is there a way to email it to someone using format-patch --root && send-email, while also having the "--root" commit sent as a bunch of file attachments instead of a patch?
09:39 j416 tmg: file attachments? no, it'll be a patch
09:40 tmg the recipient doesn't have `git` but does have `patch`
09:40 tmg that's a shame.
09:40 j416 tmg: you could either just zip the whole thing and send it, or you could send a link to someplace where the repo could be cloned from, or you could use git-bundle to send the thing
09:40 j416 oh.
09:41 j416 maybe the recipient could just.. get git
09:42 TheOrangeOne joined #git
09:43 invisbl joined #git
09:44 j416 tmg: if there's no way they can use git, perhaps send the files from the root commit, then the set of patches along with that?
09:44 dodobrain joined #git
09:45 _Vi joined #git
09:46 cagedwisdom joined #git
09:48 publio joined #git
09:49 ochorocho__ joined #git
09:51 mkoskar joined #git
09:54 ochorocho__ joined #git
09:55 Limes_ joined #git
09:56 ochorocho__ joined #git
09:59 tmg j416: I did that already. I just inferred you were a wizard who might know if git can do it all for me. Thanks
10:00 ochorocho__ joined #git
10:01 j416 tmg: haha. Sorry, not that I'm aware of.
10:02 ki0 joined #git
10:03 fuchsi_ joined #git
10:03 ki0 joined #git
10:04 ochorocho__ joined #git
10:04 aapaaal joined #git
10:04 sdlnv joined #git
10:05 _Vi joined #git
10:06 Surfer2010 joined #git
10:06 romerocesar_ joined #git
10:07 King_Hual joined #git
10:08 nettoweb joined #git
10:08 YuGiOhJCJ joined #git
10:09 dreampwnzor joined #git
10:09 SwiftMatt joined #git
10:15 aapaaal joined #git
10:15 a_thakur joined #git
10:17 aapaaal joined #git
10:18 bronson joined #git
10:20 freimatz joined #git
10:20 spacelord_ joined #git
10:22 Sample joined #git
10:29 hahuang61 joined #git
10:29 cdown joined #git
10:29 hhee joined #git
10:30 diogenese joined #git
10:30 aapaaal joined #git
10:33 oskarkv joined #git
10:34 finalbeta joined #git
10:37 nettoweb joined #git
10:37 cyan__ joined #git
10:41 PioneerAxon joined #git
10:53 rchavik joined #git
10:56 Sample joined #git
11:00 romerocesar joined #git
11:02 elsevero joined #git
11:05 theoceaniscool joined #git
11:09 jstein_ joined #git
11:10 phanimahesh joined #git
11:13 mda1 joined #git
11:16 aw1 joined #git
11:16 _nwkj86 joined #git
11:23 robotroll joined #git
11:24 SwiftMatt joined #git
11:25 pks joined #git
11:27 Nilesh_ joined #git
11:28 CheckDavid joined #git
11:30 blackwind_123 joined #git
11:31 byte512 joined #git
11:32 ShapeShifter499 joined #git
11:38 nidr0x joined #git
11:39 nikivi joined #git
11:39 mda joined #git
11:42 phanimah1sh joined #git
11:44 romerocesar joined #git
11:44 pks joined #git
11:45 nettoweb1 joined #git
11:46 bruce_lee joined #git
11:46 bruce_lee joined #git
11:47 Balliad joined #git
11:53 vdv joined #git
11:55 afuentes joined #git
11:57 jaguarmagenta joined #git
11:57 mikecmpbll joined #git
11:58 FSadino joined #git
12:00 FSadino joined #git
12:00 ajsantos joined #git
12:01 FSadino joined #git
12:01 FSadino I need help to cherry-pick some commits to my custom android rom
12:02 FSadino I successful pick commit but when I "git status" it says that my working dir is empty...
12:03 Glooomy joined #git
12:04 ajsantos Hello, I am trying to update some software with "git pull", but I get  the following error message "error: Your local changes to the following files would be overwritten by merge" The changed file is a config file with login details. I want to keep the details on my local copy. Should I "commit" or "stash" the local changes to update the software and keep the config file the same?
12:05 leeN joined #git
12:07 courrier joined #git
12:09 howitdo joined #git
12:12 ThomasTang joined #git
12:13 theoceaniscool joined #git
12:13 FSadino joined #git
12:14 FSadino joined #git
12:16 dar123 joined #git
12:16 Macaveli joined #git
12:18 miklcct_ joined #git
12:18 ajsantos joined #git
12:19 bronson joined #git
12:19 GT4066 joined #git
12:22 ThomasTang joined #git
12:23 shinnya joined #git
12:29 ispn joined #git
12:29 hahuang61 joined #git
12:30 elsevero joined #git
12:40 Derderderd joined #git
12:41 buffal0 joined #git
12:43 zeroed joined #git
12:43 zeroed joined #git
12:43 Macaveli joined #git
12:46 cdown joined #git
12:47 mentazoom joined #git
12:48 irco joined #git
12:49 m0viefreak joined #git
12:51 paramourne joined #git
12:51 PioneerAxon joined #git
12:51 courrier_ joined #git
12:52 ThomasTang joined #git
12:54 sdothum joined #git
12:55 KnightsOfNi joined #git
12:55 AlecTaylor joined #git
12:55 AlecTaylor hi
12:56 KnightsOfNi How do I stop git from consuming command prompt in linux? Whenever I go in a git project, the prompt looks like this "Project git:(master)"
12:56 KnightsOfNi don't need that at the prompt
12:56 ojdo joined #git
12:56 AlecTaylor branch1 was created from branch0. Now branch0 has updated. How do I merge the changes across to branch1?
12:57 AlecTaylor KnightsOfNi: Probably in your bashrc or whatever Terminal you're using. I don't have that.
12:57 AlecTaylor (though TBH consider keeping it; it would be useful)
12:58 KnightsOfNi I have the impression it is slowing things down
12:58 KnightsOfNi just CDing into a dir takes 4-5 seconds
12:58 KnightsOfNi And only in git folder
12:59 AlecTaylor lol that's silly, someone coded it badly
12:59 KnightsOfNi What do you mean?
12:59 AlecTaylor Which Terminal emulator are you using?
12:59 KnightsOfNi "Cmder"
12:59 KnightsOfNi built on conemu
12:59 AlecTaylor Windows?
12:59 KnightsOfNi yeah
12:59 KnightsOfNi Ubuntu server running apache
12:59 KnightsOfNi and logging in there with Cmder
13:00 AlecTaylor https://github.com/cmderdev/cmder/blob/master/vendor/git-prompt.sh
13:00 particleGolem joined #git
13:01 KnightsOfNi sjiiet
13:01 KnightsOfNi Now what?
13:01 AlecTaylor So that's the file. Find where it's sourced, or just replace the whole file with a blank if you're in a rush
13:02 KnightsOfNi ok
13:04 mahendratech joined #git
13:06 Macaveli joined #git
13:09 nwkj86 joined #git
13:09 synthroid joined #git
13:11 jstein__ joined #git
13:12 nikivi joined #git
13:13 invisbl joined #git
13:15 hussam joined #git
13:18 elsevero joined #git
13:20 hahuang65 joined #git
13:27 mentazoom joined #git
13:27 invisbl joined #git
13:30 invisbl_ joined #git
13:30 pijiu joined #git
13:31 pijiu joined #git
13:31 ShapeShifter499 joined #git
13:32 pijiu joined #git
13:32 invisbl joined #git
13:33 pijiu joined #git
13:34 pijiu joined #git
13:36 pijiu joined #git
13:37 ResidentBiscuit joined #git
13:37 pijiu joined #git
13:40 Derderderd joined #git
13:44 rorro joined #git
13:48 Eha joined #git
13:50 pbrewczynski joined #git
13:52 zeroed joined #git
13:52 zeroed joined #git
13:53 m___ joined #git
13:57 miklcct joined #git
13:58 jaguarmagenta joined #git
14:02 Anja joined #git
14:09 cdg joined #git
14:09 synthroi_ joined #git
14:09 manuel_ joined #git
14:09 relect joined #git
14:11 a3Dman_ joined #git
14:19 SwingShock joined #git
14:20 bronson joined #git
14:22 ki0_ joined #git
14:25 xall joined #git
14:27 SwingShock Is it possible to fork using bash script ?
14:27 SwingShock I am using bitbucket.
14:29 cdown joined #git
14:30 Derderderd joined #git
14:30 hahuang61 joined #git
14:31 Orbitrix joined #git
14:31 grawity fork a repository?
14:31 grawity there are tools; I think git-spindle had a subcommand for that
14:32 grawity then again, this is #git; technically any clone is a fork >_>
14:32 jmd SwingShock: Yes.  Every time you run a command from bash, it calls
14:32 jmd fork().
14:33 SwingShock So there is no need to fork with git bash
14:33 SwingShock If it's possible.
14:33 grawity SwingShock: fork what exactly
14:33 SwingShock master in bitbucket.
14:34 kazantip joined #git
14:35 invisbl joined #git
14:36 nettoweb joined #git
14:37 SwingShock Yes. Now i get it. I will keep using fork button in the bitbucket website.
14:37 HanClinto joined #git
14:37 zeroed joined #git
14:37 jnavila joined #git
14:37 jmd SwingShock: So far as I'm aware there is not a "fork" command in git.  The nearest is "clone".
14:37 elastix joined #git
14:38 SwingShock Ok. Thanks.
14:38 ochorocho__ joined #git
14:38 denisMone joined #git
14:39 JanC_ joined #git
14:41 romerocesar joined #git
14:42 DrRobotic joined #git
14:43 cbo joined #git
14:43 ThomasTa1g joined #git
14:44 King_Hual joined #git
14:47 zivester joined #git
14:49 kjsaihs joined #git
14:54 invisbl joined #git
14:55 mda1 joined #git
14:55 giraffe joined #git
14:58 giraffe joined #git
15:00 xall joined #git
15:00 ThomasTang joined #git
15:00 giraffe joined #git
15:01 Vampire0 SwingShock, as grawity already said, there are tools besides Git that can talk to the APIs of some sites. git-spindle is a great one that adds some git subcommands like "git hub ..." for GitHub and "git bb ..." for BitBucket. With that you can create a fork and pull requests and easily clone and merge others pull requests and so on from the commandline. But yes, you can also simply use the button on the we
15:01 Vampire0 bsite and then clone your fork, adding the upstream as remote manually, ...
15:02 Glooomy Hi :)
15:02 gitinfo Glooomy: 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.
15:02 Glooomy why does:  git checkout -- .  discard all changes?
15:03 Glooomy found it on SO but I don't understand what it does
15:03 Vampire0 Glooomy, because that is its purpose
15:04 Glooomy I mean I understand what it does obviously  (discard all changes) but not how.why it works?
15:04 Vampire0 Glooomy, a checkout with path ("." in your case which means current directory), takes the state of the given commit-ish (or the state of the index if not given like in your case) and makes the working copy look like it.
15:05 Vampire0 Glooomy, so the command does not discard all changes, it discards all changes that are not yet added to the index
15:05 Vampire0 Glooomy, why it works? Because the developers of Git did a great job? o_O
15:05 Glooomy Ok I understand better :-)
15:06 fuchsi_ joined #git
15:08 Vampire0 Glooomy, for more information look at man git checkout :-)
15:08 gitinfo Glooomy: the git-checkout manpage is available at http://jk.gs/git-checkout.html
15:08 gitinfo Glooomy: 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.
15:10 joki joined #git
15:11 BenderRodriguez joined #git
15:11 [gmi] joined #git
15:14 rominronin joined #git
15:15 ahmedelgabri joined #git
15:15 Macaveli joined #git
15:15 diogenese joined #git
15:15 parasite_ joined #git
15:17 xall joined #git
15:19 [0xAA] joined #git
15:21 ThomasTa1g joined #git
15:21 romerocesar joined #git
15:21 ochorocho__ joined #git
15:25 steeze joined #git
15:25 shgysk8zer0 joined #git
15:30 ShapeShifter499 joined #git
15:31 Derderderd joined #git
15:33 phanimahesh joined #git
15:33 tchan joined #git
15:34 synthroid joined #git
15:34 DolpheenDream joined #git
15:34 upenox joined #git
15:36 jaguarmagenta joined #git
15:38 HanClinto joined #git
15:39 jstein_ joined #git
15:39 kadoban joined #git
15:41 nikivi joined #git
15:42 steeze joined #git
15:46 zeroed joined #git
15:46 zeroed joined #git
15:54 SuperSeriousCat joined #git
15:59 invisbl joined #git
15:59 mda joined #git
16:04 snowkidind joined #git
16:04 invisbl joined #git
16:08 invisbl joined #git
16:09 dave0x6d joined #git
16:10 webdev007 joined #git
16:10 invisbl_ joined #git
16:12 dviola joined #git
16:15 invisbl joined #git
16:15 rominronin joined #git
16:16 Endarked joined #git
16:16 Piwde joined #git
16:17 mda1 joined #git
16:18 d0nn1e joined #git
16:19 zeroed joined #git
16:19 zeroed joined #git
16:21 bronson joined #git
16:21 sweatsuit joined #git
16:24 sdlnv_ joined #git
16:25 madewokherd joined #git
16:28 zeroed joined #git
16:31 hahuang61 joined #git
16:33 Derderderd joined #git
16:33 jstein_ joined #git
16:33 sdlnv__ joined #git
16:38 safe joined #git
16:38 menip joined #git
16:38 anonymuse joined #git
16:40 SteffanW joined #git
16:48 marlinc joined #git
16:50 ahmedelgabri left #git
16:53 FSadino joined #git
16:55 svm_invictvs joined #git
16:55 anonymuse joined #git
16:56 dreiss joined #git
16:56 dendazen joined #git
16:58 dzho .karma gitinfo
16:58 gitinfo the Genuine Real Life Karma™ REST API results are back! g‍itinfo: 30 (0 in past 30 days)
17:01 jw4242 joined #git
17:03 freimatz joined #git
17:04 tango_ joined #git
17:04 Limes_ joined #git
17:04 WizJin joined #git
17:06 arand__ joined #git
17:06 rominronin joined #git
17:09 dar123 joined #git
17:11 howitdo joined #git
17:12 breezy_ joined #git
17:13 fuzzmz joined #git
17:14 anonymuse joined #git
17:15 archaic joined #git
17:17 howitdo joined #git
17:17 Limes_ joined #git
17:17 Derderderd joined #git
17:20 re1 joined #git
17:21 invisbl joined #git
17:24 rominronin joined #git
17:24 Gloomy joined #git
17:26 ki0 joined #git
17:26 ki0 joined #git
17:26 romerocesar joined #git
17:27 ki0 joined #git
17:27 Limes_ joined #git
17:29 ki0_ joined #git
17:29 nunchuck joined #git
17:30 HanClinto joined #git
17:30 ShapeShifter499 joined #git
17:31 invisbl_ joined #git
17:31 nwkj86 joined #git
17:31 syg_ joined #git
17:31 syg__ joined #git
17:32 ki0_ joined #git
17:37 Panacea joined #git
17:37 Panacea joined #git
17:37 Urbany joined #git
17:39 cagedwisdom joined #git
17:41 zeroed joined #git
17:42 durham joined #git
17:42 nmschulte joined #git
17:42 pbrewczynski joined #git
17:42 ThomasTa1g joined #git
17:43 diego1 joined #git
17:43 diego1 joined #git
17:44 nmschulte I'm looking for a PR/code-review tool suggestion; I've used Gerrit a long time ago.  Currently, I'm in a situation where we use multiple git repositories to split "modules" across; this makes development difficult, but has some nice benefits: we use Stash (Bitbucket) for PR, and separate repositories gives us separate channels of communication.
17:44 nmschulte I want to find a code-review tool that solves this communication problem, but allows a single git repository.  Can you recommend a tool?
17:45 nmschulte (e.g. this user wants notified about PRs/changes to this part of the working-tree.)
17:45 gtristan joined #git
17:46 nmschulte (and likely some sort of gate-keeping in the mix, but that might be best served by using a separate repo for staging/golden and process enforcement; I think this is how Gerrit can/commonly works)
17:46 mischat joined #git
17:47 nicoulaj joined #git
17:52 svm_invictvs joined #git
17:54 SwingShock I am working with a friend to build a game now. So he should fork the game repository, clone it to local directory, create a branch, push it and then create a pull request which i accept to merge the current original master to his changes ?
17:54 SwingShock Is this how git is used to work with ?
17:55 _ikke_ A fork is not required if you trust your friend
17:57 SwingShock I was thinking of it like a safety mechanism. This is my first time to use git with a friend. So the rest of the steps are correct and how it is normally done ?
17:58 mns joined #git
17:58 mda joined #git
17:59 riceandbeans joined #git
17:59 riceandbeans > git commit -m "Initial commit"
17:59 riceandbeans error: gpg failed to sign the data
17:59 riceandbeans fatal: failed to write commit object
17:59 riceandbeans what might cause that?
18:00 riceandbeans I sign emails daily with the same key
18:00 riceandbeans I've been signing commits for over a year with that key
18:00 moritz riceandbeans: no secret key available for the committer name/email address that's configured in that repo?
18:00 riceandbeans I recently extended the expiration of the key
18:02 hahuang65 joined #git
18:02 SwingShock My friend is also working with a previous version of the project into which he is implementing the new feature. So he needs to redo it to the latest version. Then i need to merge into it ?
18:04 SwingShock Also if there are multiple branches with different features, the merging is done one by one by the master into each of the branch ?
18:04 SwingShock Sorry, if i ask noob questions. Only learning git for 2-3 days.
18:04 SwingShock learned*
18:05 riceandbeans you can merge multiple things at once
18:06 riceandbeans your friend might want to rebase before the merge
18:06 dendazen joined #git
18:07 GavinMagnus joined #git
18:08 SwingShock Why and what is rebasing and what is the advantage of it ? I did a quick search on it but couldn't understand it. It seems like it is something useful.
18:11 riceandbeans Rebasing is taking your set of commits and placing them at the end of a series of other commits
18:11 riceandbeans you're more or less rewriting history
18:12 SwingShock I kinda understand it now.
18:12 riceandbeans in doing so though, you reduce differences between code bases and if there would be a conflict along the way prior to the merge you'll deal with it then before trying to merge
18:13 riceandbeans I still don't get why gpg is flipping out though
18:14 OOPMan joined #git
18:14 SwingShock What's the command for rebasing ? With parameters if what they are called.
18:14 OOPMan joined #git
18:14 SwingShock https://git-scm.com/docs/git-rebase This looks a bit complex.
18:15 riceandbeans git rebase source target
18:16 riceandbeans or if you're on the branch
18:16 riceandbeans git rebase source
18:16 Gloomy joined #git
18:16 zeroed joined #git
18:16 riceandbeans so let's say you have a bunch of commits in master branch and you want to catch up the history of your branch foo, you could git checkout master && git pull && git checkout foo && git rebase master
18:17 riceandbeans or instead of the last two steps you could just say git rebase master foo
18:17 riceandbeans I think I figured out my gpg problem, upgraded to gpg2 and I think the gpg.program needs to be updated
18:18 riceandbeans shit, actually no gpg is a symlink to gpg2 now
18:18 riceandbeans hmm
18:18 SwingShock lol. The rebase idea is really cool.
18:19 riceandbeans the keys are definitely good because I definitely email with them daily
18:21 rominronin joined #git
18:21 riceandbeans so do I read correctly that git does not work with gpg2 only gpg1 as of git 2.0?
18:22 riceandbeans err 2.10
18:22 bronson joined #git
18:22 riceandbeans that's what I'm seeing on stack overflow
18:22 everlife_ joined #git
18:25 netj joined #git
18:27 CEnnis91 joined #git
18:31 diogenese joined #git
18:32 hahuang61 joined #git
18:32 mda1 joined #git
18:36 alex1a joined #git
18:37 robotroll joined #git
18:39 upenox joined #git
18:39 Siegfried joined #git
18:43 dreiss joined #git
18:44 invisbl joined #git
18:48 invisbl_ joined #git
18:51 astrofog joined #git
18:54 timothy joined #git
18:56 SwiftMatt joined #git
18:57 YuGiOhJCJ joined #git
19:00 salamanderrake joined #git
19:00 __main__ joined #git
19:02 dirtyroshi joined #git
19:07 marlinc joined #git
19:11 dreiss joined #git
19:11 kyan joined #git
19:11 ochorocho__ joined #git
19:13 sea-gull joined #git
19:14 troyt joined #git
19:15 aw1 joined #git
19:16 alex1a joined #git
19:17 QuestionTime joined #git
19:20 dirtyroshi joined #git
19:20 ajsantos joined #git
19:20 ajsantos left #git
19:22 mda joined #git
19:24 dendazen joined #git
19:24 DolpheenDream joined #git
19:28 alex1a_ joined #git
19:29 jnavila joined #git
19:31 upenox joined #git
19:32 _jan_ joined #git
19:37 Ramen joined #git
19:37 hariel joined #git
19:37 alhariel joined #git
19:39 alhariel joined #git
19:39 neonKow joined #git
19:39 svm_invictvs joined #git
19:42 steeze joined #git
19:43 Gianormagantrous joined #git
19:43 upenox joined #git
19:44 perrier-jouet joined #git
19:45 alhariel joined #git
19:47 kier joined #git
19:48 davimore joined #git
19:49 vrlx joined #git
19:52 multi_io joined #git
19:54 JanC joined #git
19:55 romerocesar joined #git
19:57 [0xAA] joined #git
19:59 kanyeezy joined #git
20:07 elsevero joined #git
20:08 Vortex34 joined #git
20:08 buffal0 joined #git
20:10 eagle_mike joined #git
20:10 jeffreylevesque joined #git
20:11 zeroed joined #git
20:13 ochorocho__ joined #git
20:20 mischat joined #git
20:20 fatalhalt joined #git
20:21 nebg joined #git
20:23 bronson joined #git
20:29 nwkj86 joined #git
20:32 Derderderd joined #git
20:32 hahuang61 joined #git
20:34 tmsmith joined #git
20:34 dstolfa joined #git
20:35 dstolfa Hello, how could I cherry-pick one file from another repository and push it into my repository, while retaining the original author? Both repositories are forks of the same repository
20:35 dstolfa So, repository A has been forked twice into B and C from different branches. I want to pick one file from repository B into my repository C while retaining the original commit author
20:36 dstolfa I tried using cherry-pick, and while I got the change, the commit message set my name to it.
20:36 preaction git format-patch might work best
20:36 Goplat joined #git
20:37 nikivi joined #git
20:39 dstolfa preaction: Would that allow me to avoid conflicts when I upstream my changes to repo B?
20:40 preaction not if there were conflicts to begin with. how could it? but also then cherry-pick would show conflicts
20:40 preaction those are two different problems: one is trying to make a commit, the other is trying to merge the commit
20:41 HM joined #git
20:42 dstolfa preaction: So, to summarize. I git cherry-pick -n commit_id from repo B. Changes get applied to repo C. I want to push them, so I commit them -> new commit gets created. I push the changes and attempt to create a pull-request to repo C with my changes using the cherry picked changes in B. Will anything conflict?
20:42 dstolfa And also, will there be an issue with the cherry-picked commit being applied as my commit, as opposed to the original author?
20:43 preaction i can't say if anything will conflict. how could i?
20:43 dstolfa preaction: Well, outside of merge conflicts in other files, assuming that the changed file remains the same. Will that particular file conflict in a sense of authorship?
20:43 cagedwisdom joined #git
20:43 dstolfa I haven't really phrased my question correctly
20:44 preaction cherry-pick will keep the author but you will be the committer
20:45 dstolfa preaction: So when the pull request gets merged in B, it's going to be my name on that commit?
20:45 preaction there are multiple "names" on a commit. the Author is one name. the Committer is another name. the Author's name will be the same as the other repo you cherry-picked from. the Committer's name will be yours
20:46 mda1 joined #git
20:46 dstolfa preaction: Alright. Thanks
20:48 Siegfried joined #git
20:49 Vortex34 joined #git
20:51 nettoweb joined #git
20:57 buffal0 joined #git
20:58 salamanderrake joined #git
21:00 timmu joined #git
21:00 askb joined #git
21:04 Rodya_ joined #git
21:06 SwingShock Can someone spot what's wrong with this ? Appeared while trying to push a branch.
21:06 SwingShock http://imgur.com/a/bthZt
21:07 boombatower joined #git
21:07 mar77i joined #git
21:07 quesker joined #git
21:08 quesker how do you add new repos if the server git user shell is git-shell?
21:08 preaction why not just use plain ssh? or gitolite?
21:08 preaction !gitolite
21:08 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
21:10 quesker I don't need anything fancy and I guess I will just change the shell back to bash.  I am using ssh
21:10 howitdo joined #git
21:11 Sample joined #git
21:12 quesker I'm the only dev that will be using this so bash is fine.  I was just wondering what people do if they follow this:  https://git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server
21:20 tmsmith joined #git
21:21 preaction for my own personal git server, i use gitolite, because it's easy
21:22 anuxivm joined #git
21:23 marlinc joined #git
21:29 mitzip joined #git
21:30 dsdeiz joined #git
21:30 jnavila joined #git
21:33 diego1 joined #git
21:34 diego1 joined #git
21:40 marlinc joined #git
21:41 nd joined #git
21:43 netj joined #git
21:47 wcpan joined #git
21:49 nesia joined #git
21:51 tmg joined #git
21:57 sea-gull joined #git
21:58 diogenese joined #git
21:58 bmahe joined #git
22:00 pks joined #git
22:01 mischat joined #git
22:04 Shentino joined #git
22:06 Rodya_ joined #git
22:10 ratdeptrai joined #git
22:11 mentazoom joined #git
22:11 synchronous joined #git
22:13 ochorocho__ joined #git
22:14 diogenese joined #git
22:15 trobotham joined #git
22:16 nickabbey joined #git
22:16 tmsmith_ joined #git
22:17 nickabbey joined #git
22:19 justanotheruser joined #git
22:20 tmsmith_ joined #git
22:20 flavius Is there any git internals guru around? I am profficient with normal git usage and quite good with some plumbing commands also. However what I want to do requires more understanding of the internals.
22:20 flavius I want to iterate all commits having notes in ref/notes/foo and while doing so, to get both the commit with its meta data, and the content of each note as a "string" (I guess it's blob in git parlance). I am doing this with libgit2, or more precisely, with its rust binding. What are the concepts involved and in which order do I have to loop over what? Just in git terms, so it is easier for me to map the approach
22:20 flavius you say to the rust and libgit2-specific documentation
22:22 codebam joined #git
22:23 tmsmith joined #git
22:24 Ploppz joined #git
22:26 fatalhalt joined #git
22:26 Ploppz I can't push to master because I'm behind, but `pull origin master` says it's already up-to-date... https://bpaste.net/show/47109409d95f
22:26 yohnnyjoe joined #git
22:26 TheWild joined #git
22:27 flavius Ploppz: make a screenshot of gitk
22:27 invisbl joined #git
22:28 flavius Ploppz: and set up your ssh agent properly
22:28 romerocesar_ joined #git
22:28 selckin what does git status say
22:29 Ploppz status is clean
22:29 Ploppz gitk blob:http://imgur.com/dd43d8da-7432-43a1-936e-6538c8e5b53f
22:29 selckin does it say on branch master
22:29 Ploppz wah... I'm on another branch. ok thanks
22:30 flavius Ploppz: and the image cannot be viewed
22:30 Ploppz fair enough
22:30 grumble joined #git
22:32 Singmyr joined #git
22:33 invisbl_ joined #git
22:33 hahuang61 joined #git
22:37 buffal0 joined #git
22:38 invisbl joined #git
22:38 romerocesar joined #git
22:39 PtxDK joined #git
22:54 mar77i joined #git
22:57 Amanas left #git
22:58 krillr joined #git
23:01 fmeerkoetter joined #git
23:03 netj joined #git
23:05 davimore joined #git
23:05 rorro joined #git
23:10 DrRobotic joined #git
23:10 [0xAA] joined #git
23:19 Siegfried joined #git
23:20 inflames joined #git
23:21 quesker left #git
23:21 mischat joined #git
23:29 GavinMagnus left #git
23:35 yohnnyjoe joined #git
23:37 salamanderrake joined #git
23:40 Noldorin joined #git
23:40 ToBeCloud joined #git
23:41 arescorpio joined #git
23:41 afuentes joined #git
23:45 ToBeCloud joined #git
23:47 anonymuse joined #git
23:50 tmsmith joined #git
23:50 moei joined #git
23:51 bdonnahue joined #git
23:53 Gsham joined #git
23:56 jaguarmagenta joined #git

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