Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-02

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

All times shown according to UTC.

Time Nick Message
00:06 HoierM joined #git
00:11 GavinMagnus left #git
00:12 kpease joined #git
00:14 ochorocho__ joined #git
00:15 jaguarmagenta joined #git
00:15 aznloren joined #git
00:18 SwiftMatt joined #git
00:20 Gsham joined #git
00:23 GavinMagnus joined #git
00:24 Derperperd joined #git
00:26 chardan joined #git
00:27 anonymuse joined #git
00:28 safe joined #git
00:28 texinwien_ joined #git
00:28 mkilivan joined #git
00:31 thebope joined #git
00:32 JamesBaxter joined #git
00:34 ozymandias joined #git
00:42 cqi joined #git
00:48 Gsham joined #git
00:50 GavinMag1us joined #git
00:50 GavinMagnus left #git
00:51 GavinMagnus joined #git
00:52 Rodya_ joined #git
00:52 chris2 joined #git
00:55 GavinMagnus joined #git
00:59 tax joined #git
01:02 cbegin joined #git
01:04 dsantiago joined #git
01:06 foist joined #git
01:06 chardan joined #git
01:07 oaao joined #git
01:08 madewokherd joined #git
01:08 Nilesh_ joined #git
01:09 scarabx joined #git
01:11 jstimm joined #git
01:11 foist I'm creating a chatbot to help merge branches in a consistent manner, using some specific flags. I want the committer to be the bot and the author to be the author of the PR. I also want to include information about the chat user who invoked the bot to merge the branch, but can't find a natural fit for that information. Can anyone suggest a spot for that?
01:14 ochorocho__ joined #git
01:15 kadoban foist: Maybe something like what --signoff does?
01:15 kadoban Or just your own custom line in the commit message really.
01:15 foist kadoban: I dunno, I read the man definition for it and a few threads on SO and it doesn't seem like a good fit.
01:15 kadoban Merged via chatbot by: someasshole
01:16 kadoban foist: Why not?
01:17 kadoban I mean you can use whatever wording you like, I don't think the *actual* --signoff switch will do what you want anyway, since I don't think you can specify text for that, you'd want to just add whatever you like to the commit message, in whatever form you like.
01:18 foist Yeah, I don't have a good reason after reading the comments in reply to the main answer here: http://stackoverflow.com/questions/196209​4/what-is-the-sign-off-feature-in-git-for
01:18 CEnnis91 joined #git
01:18 Gsham joined #git
01:19 foist I think it's probably more appropriate to use the invoking user as the committer and including a "Merged with the help of Mr Errbot." as a last line in the commit message.
01:19 foist Is it possible to arbitrarily set the committer?
01:20 kadoban Ya, you can do it via environment variables I think, there's probably a switch too
01:22 kadoban GIT_COMMITTER or something like that I think it is if you want to search for it, that sohuld help
01:25 foist Looks like `git -c user.email=email@domain.fr -c user.name='Your Name'` might work.
01:25 ResidentBiscuit joined #git
01:26 _Vi joined #git
01:26 _Vi Why Git started to pointing submodule's gitfile to absolute path instead of relative like before?
01:28 xall_ joined #git
01:29 _Vi It makes something like `git submodule foreach --recursive git clean -fxxd` do not what user means on a copied Git project.
01:33 thebope joined #git
01:36 BlueProtoman joined #git
01:36 rchavik joined #git
01:36 Start[m] joined #git
01:36 BlueProtoman When I push to my remote, I'm somehow deleting my teammate's branches?  What's going on?
01:37 _Vi BlueProtoman, What does the push with `--dry-run` option show?
01:39 BlueProtoman _Vi: One sec
01:40 BlueProtoman _Vi:
01:40 BlueProtoman To ssh://scm.cs.stonybrook.edu:130/​scm/cse506git-f16/hw3-cse506p19
01:40 BlueProtoman 1092264..c555ed4  jtg/syscvec-table-init -> jtg/syscvec-table-init
01:40 BlueProtoman _Vi: I have two remotes; origin (the "main" one) and github (one on GitHub)
01:41 dodobrain joined #git
01:41 _Vi If this is complete output, it should not delete any branches.
01:41 _Vi What Git version? Do you use simple `git push` or with arguments?
01:42 _Vi (about absolute submodules) Found answer in release notes for 2.8.3.
01:42 BlueProtoman Git's version 2.10.2.  I use git gui to do the pushing, so I admittedly don't know what the arguments are
01:42 cbegin joined #git
01:43 BlueProtoman Also, the github mirror I created with the --mirror flag
01:44 _Vi BlueProtoman, I don't typically push from git gui. Maybe make commits from `git gui`, but push from console?
01:44 _Vi You can "preview" any push with --dry-run (-n).
01:45 BlueProtoman _Vi: I'll see what happens when my teammate pushes his branch again (he still has it on his machine at least)
01:46 _Vi BlueProtoman, Was "force overwrite existing branch" checkbox checked in git gui?
01:46 BlueProtoman _Vi: No.
01:46 _Vi Are you sure it is your push that caused branches to disappear?
01:47 BlueProtoman _Vi: Yes, this also happens when my teammate pushes his branches (not via git gui, just the command line); when he does, my branches disappear.
01:47 _Vi Are you also sure that branches are really disappear (not just you somehow fail to see them)? Do you see traces of them in `git ls-remote origin` or `git ls-remote github`?
01:48 _Vi BlueProtoman, Are you sure you use word "branch" correctly here?
01:48 Atrumx joined #git
01:49 BlueProtoman _Vi: The branches disappear.  Poof.  Gone.
01:49 BlueProtoman I created the remote with `git remote add --mirror github <the url>`
01:49 BlueProtoman Err, `--mirror=push`
01:49 _Vi BlueProtoman, Maybe post output of `git show-ref; git ls-remote github; git ls-remote origin` into some pastebin?
01:50 BlueProtoman ...okay, I think this might be due to me originally misunderstanding the "mirror" option
01:50 _Vi BlueProtoman, Maybe also post content of `.git/config`. Probably `git push --mirror=push` is a mistake.
01:52 _Vi Looks like --mirror is a drastic, "nuclear" option of `git push`. And it is turned on automatically if remote is added with --mirror=push option.
01:52 _Vi Probably you need to edit Git's config to turn off mirror push mode (and maybe edit refspec to normal one) or just remove and re-add origin and github remotes.
01:52 VoIPConference10 joined #git
01:53 BlueProtoman I thought "git remote add --mirror=push" was about mirroring a repo.  Oops...
01:53 Rodya_ joined #git
01:53 _Vi BlueProtoman, Basically any Git repo is sort of a mirror by default.
01:53 VoIPConference10 left #git
01:53 [0xAA] joined #git
01:53 _Vi BlueProtoman, "--mirror" option tries to make them completely identical.
01:54 afuentes joined #git
01:54 ResidentBiscuit joined #git
01:56 BlueProtoman _Vi: Yeah, I was just looking for a convenient way to do the following: this is a classroom assignment, and we do submission via a Git repo stored on the CS department's servers.  However, we want to use GitHub for its project management facilities (pull requests, issue tracking, etc.) as well.
01:56 jstimm joined #git
01:58 _Vi BlueProtoman, Should the code also be hosted on Github in addition to the server?
01:59 _Vi BlueProtoman, "pull requests" => so yes, it should be hosted. (for issues alone you can just keep empty repository).
02:00 _Vi BlueProtoman, You should do mirror push from github repo to server repo, but not from your development repository.
02:01 nickabbey joined #git
02:01 snufft joined #git
02:01 _Vi BlueProtoman, This way CS server repo will be just a copy of github. You can even do scheduled periodic mirror fetch from github and mirror push to CS server repo.
02:01 _Vi (in a bare repository)
02:03 thiago joined #git
02:03 _Vi You and teammate just work with Github remote only (without --mirror, in a usual way) and all branches from Github automatically transferred to CS server repo.
02:03 BlueProtoman _Vi: Might be a bit late to set that up now.
02:04 Guest43464 left #git
02:04 jaafar joined #git
02:05 ResidentBiscuit joined #git
02:05 _Vi BlueProtoman, For a while you and coworker may stick to using fully specified command line version of pushing like `git push origin master:refs/heads/master`, doing trial run with `--dry-run` first.
02:06 BlueProtoman _Vi: I've just been using the usual git commands except explicitly specifying the remote
02:06 _Vi This format should decrease reliance on (broken) Git configuration file and just do what to tell: "push to remote 'origin' my branch 'master', naming in as 'refs/heads/master' on the other side".
02:07 Vampire0 joined #git
02:07 _Vi BlueProtoman, In addition to specifying the remote, you can also specify what branches from your side shall be pushed to other side (and how to name them there). This should stop auto-deletion by mirror option.
02:08 _Vi Also you and coworker should probably open .git/config in text editor and remove line like "mirror = true" from there.
02:11 _Vi BlueProtoman, If the project is short then this should be enough to finish it relatively sanely. If project's timespan is longer then you can configure Git in more proper way, so usual friendly commands like `git push` or `git pull` won't break things or even set up a bot for keeping github and origin in sync.
02:12 _leb joined #git
02:12 BlueProtoman _Vi: Already did, we just ran git config
02:12 BlueProtoman _Vi: Project's due next Friday
02:15 Domhack_ joined #git
02:15 arescorpio joined #git
02:16 pks joined #git
02:16 rts-sander joined #git
02:17 przemoc joined #git
02:17 rafalcpp joined #git
02:18 mdiehl1 left #git
02:18 cbreak joined #git
02:20 cbegin joined #git
02:20 _Vi BlueProtoman, Diagram of repository management scheme I was proposing: https://gist.github.com/vi/828​724e4db92f3b095737037fe229def
02:21 tnecniv joined #git
02:22 BlueProtoman _Vi: And the bare repository would mirror push to the CS server with a cron job or something?
02:22 _Vi BlueProtoman, Like that or just manually.
02:23 _Vi BlueProtoman, Fetch, then mirror push.
02:23 _Vi This github->cs_repo transfer scheme should be separated from actual development repositories.
02:23 ochorocho__ joined #git
02:24 le_melomane joined #git
02:25 _Vi If you need to switch from github to cs_repo as primary source of truth (e.g. internet connection is gone, no Github anymore, continuing development using local server), then the bot should be stopped and "origin"s in dev repos repointed to local repo instead of github.
02:26 _Vi Pushing to cs_repo when mirroring bot is active is ineffective (the bot will erase new branches or revert changes).
02:26 rafasc joined #git
02:28 chigang joined #git
02:29 d^sh joined #git
02:29 BlueProtoman So what would I have to do to set up all of this?  Tell everybody to only use GitHub and write a cron job for my computer (or, more likely, my home server)?
02:30 BlueProtoman And said cron job would run `git push --mirror origin`?
02:30 ForeignBiscuit joined #git
02:31 Guest55 joined #git
02:32 whitby joined #git
02:34 thebope joined #git
02:34 nettoweb joined #git
02:36 _Vi BlueProtoman, The job should do `git fetch origin && git push --mirror cs_server` in a repository cloned from github with `--mirror` option.
02:37 _Vi BlueProtoman, First priority is to tell everybody to remove this "mirror mode" from Git configuration and ensure all needed branches are backed up somewhere.
02:38 Rodya_ joined #git
02:39 _Vi BlueProtoman, noob way: backup source code, remove git repository and re-clone from github without `--mirror`.
02:39 nettoweb joined #git
02:40 _Vi BlueProtoman, pro way: edit git configuration, removing `mirror` mode, editing `fetch` and `merge` option for branches, accurately pushing needed commits to github.
02:42 jstimm joined #git
02:49 ilbot3 joined #git
02:49 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 rafalcpp joined #git
02:49 serialoverflow joined #git
02:49 rts-sander joined #git
02:50 pks joined #git
02:51 Guest55 joined #git
02:51 qguv joined #git
02:52 BlueProtoman _Vi: First half of the pro way we already did.  What about editing `fetch` and `merge`?
02:52 Dougie187 joined #git
02:54 _Vi BlueProtoman, Making the "[remote]" section and "[branch]" section (if any) looks like in some normal clone.
02:55 mkoskar_ joined #git
02:56 BlueProtoman ??
02:56 jackie joined #git
02:58 jacksonel joined #git
02:58 jacksonel left #git
02:58 ayogi joined #git
02:59 jacksonel joined #git
02:59 AMERICAN_PSYCHO joined #git
03:00 Gsham joined #git
03:00 ResidentBiscuit joined #git
03:03 aavrug joined #git
03:04 _Vi BlueProtoman, For example, "fetch" parameter should probably be "+refs/heads/*:refs/remotes/origin/*".
03:05 _Vi Not like "+refs/*:refs/*" and there should be no "mirror = true"
03:06 mkoskar_ joined #git
03:07 BlueProtoman _Vi: Okay
03:07 jstimm joined #git
03:09 Rodya_ joined #git
03:09 chachasmooth joined #git
03:09 Goplat joined #git
03:10 serialoverflow joined #git
03:11 sunri5e joined #git
03:13 hexagoxel joined #git
03:13 JR042444__ joined #git
03:17 isysd joined #git
03:18 dreiss joined #git
03:22 tnecniv joined #git
03:24 ochorocho__ joined #git
03:25 fission6 joined #git
03:26 _leb joined #git
03:27 mizu_no_oto joined #git
03:27 SwiftMatt joined #git
03:31 ResidentBiscuit joined #git
03:32 eycsigfy joined #git
03:34 durham joined #git
03:34 ForeignBiscuit joined #git
03:34 thebope joined #git
03:35 durham joined #git
03:37 mizu_no_oto joined #git
03:37 durham joined #git
03:38 Andrew_K joined #git
03:39 jbondhus joined #git
03:40 durham joined #git
03:40 Limes_ joined #git
03:41 IncompleteNinny joined #git
03:42 howdoi joined #git
03:43 cagmz joined #git
03:43 a_thakur joined #git
03:45 JR042444__ joined #git
03:45 JR042444__ joined #git
03:45 JR042444__ joined #git
03:46 JR042444__ joined #git
03:46 JR042444__ joined #git
03:47 ismithers joined #git
03:48 ResidentBiscuit joined #git
03:50 lindenle joined #git
03:51 lindenle_ joined #git
03:55 ccolorado joined #git
03:56 meadmoon joined #git
03:58 fling joined #git
03:58 dreiss joined #git
04:02 BlueProtoman joined #git
04:02 nowhere_man joined #git
04:05 tnecniv joined #git
04:05 dermoth joined #git
04:06 jstimm joined #git
04:14 howdoi Github Q: How do delete all your forks from CLI? Tried few node modules, and ruby gems, nothing worked.
04:14 ojacobson Really more of a #github q, but as a github and hub(1) user… I think you'd need to make a list by hand
04:14 Vortex35 joined #git
04:16 meadmoon joined #git
04:17 ojacobson It's possible in principle through github's API, but I'm not at all sure there's an existing CLI that lets you compose that exact set of operations (for less work than writing your own)
04:18 howdoi ojacobson: hub(1) as no flags related to deletion of forks :/
04:18 ojacobson or, as far as I can tell, deletion of any repo
04:19 meadmoon joined #git
04:24 blackwind_123 joined #git
04:27 railssmith joined #git
04:28 gfixler joined #git
04:32 dsantiago joined #git
04:32 fstd_ joined #git
04:33 a_thakur joined #git
04:33 diogenese joined #git
04:35 subhojit777 joined #git
04:35 svm_invictvs joined #git
04:37 Sasazuka joined #git
04:42 sbulage joined #git
04:49 sssilver joined #git
04:50 robotroll joined #git
04:50 snowkidind joined #git
04:51 AfroThundr joined #git
04:54 inflames joined #git
04:58 ashokrajar joined #git
04:59 archaic joined #git
05:03 ayogi joined #git
05:05 jstimm joined #git
05:05 lindenle joined #git
05:05 perlpilot joined #git
05:06 oskarkv joined #git
05:11 GT4066 joined #git
05:16 watabou_ joined #git
05:16 hahuang61 joined #git
05:19 jaafar joined #git
05:20 pks joined #git
05:23 Shentino joined #git
05:24 cyan__ joined #git
05:24 khfeng joined #git
05:25 mseyne joined #git
05:25 ochorocho__ joined #git
05:26 thebope joined #git
05:26 moritz https://github.com/ingydotnet/git-hub can delete repos from the CLI
05:28 scarabx joined #git
05:29 ResidentBiscuit joined #git
05:53 lordjancso joined #git
05:56 PioneerAxon joined #git
05:58 nowhereman joined #git
06:01 Cabanossi joined #git
06:05 strugee joined #git
06:13 mseyne joined #git
06:14 strugee joined #git
06:14 k_sze[work] joined #git
06:15 overlord_tm joined #git
06:18 cheater joined #git
06:21 PioneerAxon joined #git
06:21 dodobrain joined #git
06:26 Dragonbird joined #git
06:31 ochorocho__ joined #git
06:31 dreiss joined #git
06:37 xberg joined #git
06:37 sargas joined #git
06:41 Oatmeal joined #git
06:41 Macaveli joined #git
06:42 bocaneri joined #git
06:42 cheater joined #git
06:45 Peppi joined #git
06:45 Peppi hello
06:45 ThomasLocke joined #git
06:46 Peppi quick question. I'm using TortoiseGit I've cloned a repository. I have a config file I have modified but I don't want to ever commit the file or push it out. How do I ignore the file? Would right clicking the file and selecting "delete and add to ignore list" do it or would that actually delete the config file?
06:47 troulouliou_div2 joined #git
06:48 LucaTM joined #git
06:49 Dragonbird Peppi not sure how to do it with tortoisegit but you can create a new file in your project with name .gitignore and put the name of the files you want to ignore in it. it will take one filename per ile
06:49 Peppi hmmmm
06:50 Peppi ya there is an add to ignore list option but that is only for new files not files that are in the rep
06:50 Peppi repo
06:51 Dragonbird if you have already committed a file and pushed to repo then things will be a little tough
06:51 Macaveli joined #git
06:52 Peppi ya... well here is the thing. The application has a config.js. We leave it blank because it's bad to commit credentials. So the blank config file exists in the repo but I don't ever want to committe the modded config file
06:52 Peppi I can't be the only person with this problem
06:53 Peppi like we want the blank file in the repo we only have the credentials on our local copies
06:53 derk0pf joined #git
06:53 auzty joined #git
06:53 Peppi ohh wtf: "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read the section called “Ignore files which are already versioned” for instructions on how to “unversion” it. "
06:54 Peppi that's stupid
06:54 Peppi what do you people do with the issue I have?
06:57 Peppi damn I have no clue how to even search for this in google... :/
06:57 gchristensen Peppi: config.sample.js in the repo, .gitignore for config.js
06:58 Peppi gchristensen: hmmm interesting
06:58 Peppi is that the "proper" solution for my issue?
06:58 Peppi can anyone else back gchristensen up? Or better yet any nice best practices about this?
06:59 Peppi I need to defend myself tomorrow when I delete / remove config.js lol
06:59 preaction that or put configuration in environment variables
07:00 preaction netrc is also a thing that exists
07:00 Peppi netrc?
07:00 dermoth joined #git
07:00 Peppi preaction: what do you mean the environment variables?
07:00 Raging_Hog joined #git
07:01 Peppi the language we are using is Node
07:01 preaction environment variables. i'm not sure how else to say it
07:01 Peppi preaction: like on the OS?
07:01 preaction and netrc is easily googled
07:01 preaction well, in the shell, but yes. environment variables
07:02 Peppi ya that isn't going to work then. Having them in config.js is proper
07:02 Peppi (for our case)
07:02 sea-gull_ joined #git
07:03 Peppi gchristensen: your solution makes sense to me... how can I find a webpage that supports what you are suggesting? I'm not sure how to google this...
07:05 rorro joined #git
07:06 jknetl joined #git
07:08 potatoes___ joined #git
07:08 potatoes___ left #git
07:08 potatoes_ joined #git
07:09 potatoes_ is Git Squash still useful for grouping a series of commits?
07:09 potatoes_ i like the idea of using single commits as being easier to track
07:09 brent__ joined #git
07:09 potatoes_ is this not best practice?
07:11 _ikke_ potatoes_: I think squashing destroys usefule history
07:11 potatoes_ i agree
07:11 potatoes_ when i was told to Git Squahs i was kinda like why..
07:12 potatoes_ i prefer a clean easy to follow track record
07:12 potatoes_ i like a lot of commits.
07:12 _ikke_ My approach is rebase + non-ff merge
07:12 ngperfex joined #git
07:12 potatoes_ is it similar to git squash?
07:13 sbulage joined #git
07:13 _ikke_ It keeps all commits, but moves them on top of another commit
07:14 potatoes_ oh interesting
07:14 iDanoo joined #git
07:15 iliv joined #git
07:15 potatoes_ is there a good article i can read
07:15 potatoes_ on that?
07:15 Vangelis joined #git
07:17 derk0pf joined #git
07:18 mkoskar_ joined #git
07:18 TSS_ joined #git
07:19 roelmonnens joined #git
07:19 www-bukolay-net joined #git
07:20 _ikke_ Enough articles, but I don't know on the top of my head
07:20 OOPMan joined #git
07:20 freimatz joined #git
07:21 _ikke_ potatoes_: http://gitolite.com/gcs.html#(41) perhaps?
07:21 potatoes_ thanks man
07:23 dan2k3k4 joined #git
07:26 thebope joined #git
07:29 rivarun joined #git
07:31 chele joined #git
07:31 ochorocho__ joined #git
07:39 triad joined #git
07:39 triad greetings to everyone
07:39 m0viefreak joined #git
07:40 triad I want to setup git to my machine (fedora 25 lxde) and I don't undertanding exactly what exactly I need to install to have git as gitlab.com or any other website
07:40 Sceorem joined #git
07:40 PioneerAxon joined #git
07:40 triad as a service git, not using repositories
07:40 triad basically I want to setup my own git server :)
07:41 ribasushi joined #git
07:41 SwiftMatt joined #git
07:43 Derperperd joined #git
07:45 Alienpruts joined #git
07:46 dan2k3k4 joined #git
07:46 kadoban triad: Are you looking for a web frontend? You know you can download the stuff from gitlab, right? https://about.gitlab.com/downloads/
07:47 kadoban There's a few other ones. I usually just use gitolite, which does not have a web interface or anything.
07:52 elsevero joined #git
07:53 texinwien joined #git
07:54 rominronin joined #git
07:55 Phylock joined #git
07:57 cqi joined #git
07:58 Balliad joined #git
07:59 bruce_lee joined #git
08:00 JeroenT joined #git
08:00 PCatinean joined #git
08:03 djb-irc joined #git
08:04 Rodya_ joined #git
08:04 hhee joined #git
08:11 TomyWork joined #git
08:11 djb-irc joined #git
08:11 arnsa joined #git
08:11 arnsa hi
08:12 arnsa if I have accidently pushed changes onto the wrong branch, how can I move them to another branch? I mean these changes can stay on the branch they're on now, but I need to somehow also move them to another branch
08:12 NeverDie joined #git
08:12 mindriot101 joined #git
08:12 lb arnsa merge?
08:12 arnsa lb, can't merge them
08:12 j416 why?
08:13 arnsa one branch (the one where I pushed the changes) has some features that can't be on the master. and the changes I just made now has to be on the master
08:13 lb arnsa in that case, cherry-pick is an option
08:13 j416 cherry-pick
08:13 lb man git cherry-pick
08:13 gitinfo the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
08:13 eduardas_m joined #git
08:13 j416 then rebase the other branch if you care about clea history
08:13 j416 clean*
08:14 a_thakur joined #git
08:14 lb j416 other branch is already pushed
08:14 j416 advice still applies; but be careful then
08:14 lb :)
08:14 arnsa why be careful?
08:14 lb !rewrite
08:14 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
08:15 lb (he was talking about the rebase advise)
08:15 sostenuto joined #git
08:15 lb *(he/she)
08:15 arnsa I don't even know what that means :D
08:15 j416 arnsa: also, if you can merge an early part of the branch, that is better than cherry-pick, history-wise
08:16 djb-irc joined #git
08:16 arnsa lb, j416 the thing is, master and that other branch has the latest changes, but that other branch also has one additional feature that can't be on master
08:16 j416 (otherwise you may end up with duplicate commits)
08:16 j416 arnsa: I understand that
08:16 lb arnsa good, then stay with cherry-picking your commits. you'll get these commits doubled commits if you ever merge your feature branch into master, but it is save. it's just an style issue if you want to avoid such things in the history
08:17 lb bad english, too early for me....
08:17 j416 style and headache issue but it'll "kind of work"
08:17 arnsa j416, lb so all I have to do is git checkout master && git cherry-pick commit_number ?
08:17 j416 yes
08:17 j416 arna
08:17 lb arnsa yes, but cherry-pick only takes one commit at a time
08:18 kasper^ joined #git
08:18 finalbeta joined #git
08:18 lb so repeat cherry-pick for every commit that has to be in master
08:18 arnsa lb, it's okay
08:18 arnsa I think it worked
08:18 arnsa thank you :)
08:18 lb (starting from old to new)
08:18 j416 arnsa: the other noise was about keeping your history nice and readable.
08:18 hussam joined #git
08:18 kasper^ is git storing modified time for files on commits ?
08:18 lb arnsa congrats
08:18 j416 kasper^: no
08:19 j416 kasper^: only executable bit
08:19 kasper^ is there some option to force it to do it ?
08:19 lb no
08:19 arnsa lb, btw, I think it's possible to somehow copy for example 3 commits
08:19 j416 kasper^: no
08:19 kasper^ wow
08:19 lb arnsa i know, but beginner/pro issue applies ;)
08:20 kasper^ nobody cared or it is intended like that ?
08:20 arnsa lb, indeed
08:20 j416 arnsa: you can do a lot of things, but there is only so much that is practical to communicate here. I would recommend reading the guides. !book
08:20 gitinfo arnsa: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
08:21 j416 kasper^: intended, or it would have been added by now
08:21 arnsa j416, yeah, I've heard about this one, but I rarely need some extra things, besides git log, add, commit, push, reset and a few more
08:22 j416 arnsa: if you use git regularly, it pays off to learn
08:22 hahuang61 joined #git
08:23 arnsa j416, most of the things pay of when you learn them :)
08:23 j416 a lot of things cost more to learn than they pay off.
08:24 Hink joined #git
08:24 arnsa j416, can't think of any :D
08:24 maret joined #git
08:26 j416 arnsa: so go read the book then ;)
08:26 arnsa j416, I am afraid learning git isn't my priority #1, because I've a bunch of stuff going on right now
08:27 j416 now you contradict yourself
08:27 j416 ;)
08:27 thebope joined #git
08:27 arnsa j416, how so?
08:28 Hink joined #git
08:28 j416 you just gave an example of something that costs you more to learn than you think it is worth
08:29 j416 hint: mostly everyone has a lot of stuff going on ;)
08:29 arnsa j416, no, I don't think it costs me mroe to learn than it's worth, but like I said, I have higher priorities at the moment
08:29 j416 anyway, I recommend the book if you want to learn more and become faster.
08:30 j416 o/
08:30 arnsa j416, thank you
08:32 nowhereman joined #git
08:35 mkoskar joined #git
08:35 sostenuto joined #git
08:36 djb-irc joined #git
08:40 Mikaela joined #git
08:40 jnavila joined #git
08:41 hyperair kjkj
08:41 Darcidride joined #git
08:41 hyperair oops
08:41 GavinMagnus joined #git
08:49 triad kadoban - yes, i am looking to have exactly all the features as gitlab does for example. a fully functionable git service
08:49 LucaTM joined #git
08:53 encod3 joined #git
08:57 www-bukolay-net joined #git
08:59 solf1re joined #git
09:02 mikecmpbll joined #git
09:04 j416 triad: so just use gitlab
09:04 triad j416 will do! :)
09:06 grift joined #git
09:08 manuel joined #git
09:12 ismithers joined #git
09:14 Learath2 joined #git
09:15 ochorocho__ joined #git
09:16 navidr joined #git
09:19 ahmedelgabri joined #git
09:20 kurkale6ka joined #git
09:20 ki0 joined #git
09:23 realz joined #git
09:23 elect_ joined #git
09:23 mindriot101 joined #git
09:24 clmsy joined #git
09:25 King_Hual joined #git
09:26 ramsub07 joined #git
09:26 rominronin joined #git
09:27 iliv joined #git
09:28 _28_ria joined #git
09:29 PCatinean joined #git
09:34 senaps joined #git
09:35 elect_ joined #git
09:35 ugjka joined #git
09:36 Grum joined #git
09:36 cyphase joined #git
09:38 BlaXpirit_ joined #git
09:38 demize joined #git
09:38 mar77i joined #git
09:38 jailbox joined #git
09:39 Rhonda joined #git
09:39 FilipNortic joined #git
09:39 ndim joined #git
09:39 wget joined #git
09:39 wget joined #git
09:39 Cabanossi joined #git
09:40 laumann joined #git
09:41 mischat joined #git
09:42 Ring0` joined #git
09:47 brillenfux joined #git
09:48 parasite_ joined #git
09:48 LucaTM joined #git
09:50 ketas joined #git
09:50 xberg joined #git
09:55 King_Hual joined #git
09:55 King_Hual joined #git
09:57 phanimahesh joined #git
09:57 thierryp_ joined #git
10:00 Serpent7776 joined #git
10:01 InfoTest joined #git
10:01 muelli joined #git
10:03 chrysaor joined #git
10:04 chll_ joined #git
10:13 ResidentBiscuit joined #git
10:17 cdown joined #git
10:20 rorro joined #git
10:20 Mir4g3 joined #git
10:21 niels_ joined #git
10:22 arnsa joined #git
10:22 ams__ joined #git
10:23 ToBeCloud joined #git
10:23 hahuang61 joined #git
10:23 irqq joined #git
10:26 systemovich joined #git
10:27 rominronin joined #git
10:28 thebope joined #git
10:29 zero85 joined #git
10:31 mindriot101 joined #git
10:31 zero85 joined #git
10:32 zero85 joined #git
10:34 bluepixel joined #git
10:35 zero85 joined #git
10:36 zero85 joined #git
10:38 zero85 joined #git
10:39 zero85 joined #git
10:39 systemovich joined #git
10:41 wizardedit joined #git
10:44 systemovich joined #git
10:46 pypi__ joined #git
10:47 xberg joined #git
10:53 ferr1 joined #git
10:55 rominronin joined #git
10:56 bouncy joined #git
10:57 mar77i joined #git
11:02 lindenle joined #git
11:03 sgfgdf joined #git
11:04 sgfgdf hello, guys! is it possible to delete a remote feature branch with history and everything?
11:05 Puffball joined #git
11:05 chris2_ joined #git
11:06 JeroenT joined #git
11:06 dminuoso sgfgdf: git push origin --delete branch
11:06 dminuoso note that "branch" can also be a tag
11:07 dminuoso sgfgdf: After that all machines need to run a git fetch --all --prune
11:10 sgfgdf dminuoso: if nobody pulled is it possible to get those commits somehow? because there is some garbage collection.
11:10 osse I suggest git fetch origin --prune, just in case they don't want to prune all the others :P
11:10 dminuoso Heh. Good point :)
11:11 tvw joined #git
11:11 osse sgfgdf: No. Currently you can only fetch via refs, not particular commits
11:11 osse sgfgdf: Until garbage collection kicks in the only way for anyone to get them would be via direct shell access
11:12 thierryp joined #git
11:13 ollehar joined #git
11:14 rnsanchez joined #git
11:14 kedare joined #git
11:15 ResidentBiscuit joined #git
11:16 dan2k3k4 joined #git
11:16 ahmedelgabri joined #git
11:16 ollehar hi! I've done a number of commits to master without pushing it. can I push my local repo to a new branch without affecting master?
11:16 alcohol ollehar: git push <remote> <branchname>
11:17 ollehar alcohol: +1 thank you!!
11:17 wrouesnel joined #git
11:17 alcohol ollehar: you might want to reset your local master after that
11:17 cheater hi
11:17 cheater is there a shorthand for HEAD~1..HEAD ?
11:17 ollehar alcohol: reset --hard?
11:17 ollehar or checkout?
11:17 cheater i want to do git log and display only the latest commit.
11:18 seishun joined #git
11:18 alcohol ollehar: to be honest, i forgot. i think you want to reset it to the remote head
11:18 alcohol maybe someone else here can answer that
11:18 cheater ollehar: if you fetch origin/master you can just git checkout origin/master
11:18 chridal joined #git
11:19 paul424 joined #git
11:19 chridal Hello!
11:19 gitinfo chridal: 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.
11:19 cheater haha
11:19 cheater !backup
11:19 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.c​om/GitBestPractices/#backups
11:19 chridal Does anyone know how I can do something like `git push origin $CURRENT_BRANCH`?
11:19 ollehar alcohol: cheater: thanks
11:19 chridal some sort of variable that holds the current branch?
11:19 alcohol ollehar: i dont think that fetch + checkout is what you want..
11:20 alcohol chridal: why? smells like xy problem to me.
11:20 chridal alcohol: because I want to type less, and some of the branches have long version names
11:20 bremner chridal: see man git config, push.default
11:20 gitinfo chridal: the git-config manpage is available at http://jk.gs/git-config.html
11:20 alcohol chridal: then enable autocomplete
11:20 alcohol and yea, look into push defaults
11:21 chridal Thanks!
11:21 chridal alcohol: The thing is that I have an alias; gpod (git push origin development)
11:21 chridal so auto-complete won't help me
11:21 chridal will look into push defaults
11:21 pypi__ joined #git
11:22 breezy_ joined #git
11:23 phanimahesh joined #git
11:24 hahuang61 joined #git
11:25 systemovich joined #git
11:28 mischat_ joined #git
11:29 niels_ joined #git
11:29 freimatz joined #git
11:29 _28_ria joined #git
11:29 Guest1100101 joined #git
11:31 paul424 joined #git
11:33 rominronin joined #git
11:36 bluepixel joined #git
11:37 paladinn joined #git
11:37 paladinn joined #git
11:38 jeffreylevesque joined #git
11:38 davimore joined #git
11:39 jozwior joined #git
11:45 ccolorado left #git
11:45 LucaTM joined #git
11:48 JeroenT joined #git
11:50 jimi_ joined #git
11:54 _Vi joined #git
11:58 bruce_lee joined #git
11:59 InfoTest joined #git
12:03 byte512 joined #git
12:03 _ikke_ chridal: git push origin HEAD
12:04 chridal ah, that will work as well. Currently just using `git config pust.defaults current`
12:04 chridal push **
12:04 jnavila joined #git
12:06 mda1 joined #git
12:08 mischat joined #git
12:08 dreiss joined #git
12:09 mischat joined #git
12:11 phox joined #git
12:16 roelmonn_ joined #git
12:16 ochorocho__ joined #git
12:16 mindriot_ joined #git
12:16 mikecmpbll joined #git
12:19 m___1 joined #git
12:19 ashokrajar joined #git
12:19 aard_ joined #git
12:20 CussBot joined #git
12:21 finalbeta joined #git
12:22 LBV_User joined #git
12:23 kier joined #git
12:24 DolpheenDream joined #git
12:26 ResidentBiscuit joined #git
12:26 fission6 joined #git
12:29 thebope joined #git
12:29 cdown joined #git
12:31 isysd joined #git
12:33 cheater what's the shortest way to tell git log to only display the latest rev?
12:33 jozwior joined #git
12:34 ace_33 joined #git
12:34 ispn joined #git
12:34 InfoTest joined #git
12:35 jcmj joined #git
12:35 geoid_ joined #git
12:36 tobiasvl git log | head -1
12:36 tobiasvl ? :P
12:36 _ikke_ git log -1
12:37 _ikke_ git show
12:38 afuentes joined #git
12:41 re1 joined #git
12:42 osse define "latest", amirite
12:42 nettoweb joined #git
12:42 InfoTest joined #git
12:47 subhojit777 joined #git
12:49 leeN joined #git
12:50 mischat joined #git
12:51 ferr1 joined #git
12:52 rominronin joined #git
12:52 EugenA joined #git
12:53 synthroid joined #git
12:53 watabou_ joined #git
12:53 EugenA need some support. I've dome some commits locally, now I want to share my project, so I've created on my virtual server new bare repo and I'd like to push everything from my local repo to that server
12:54 EugenA do i need to setup remote repo in my local git?
12:56 JeroenT joined #git
12:57 osse EugenA: git remote add myserver {URL HERE}. git push myserver master
12:57 osse or  git push myserver --all  I suppse
12:58 zdexin[m] left #git
13:01 ramsub07 joined #git
13:02 nikivi joined #git
13:02 johnmilton joined #git
13:03 rominronin joined #git
13:03 sgfgdf diogenese, osse: thank you!
13:04 sgfgdf sorry for the delay, guys.
13:04 bluepixel joined #git
13:07 CEnnis91 joined #git
13:07 EugenA osse: thanks, it worked. Now locally if I do git remote -v I see one line for fetch and one line for push
13:08 fmcgeough joined #git
13:08 Rodya_ joined #git
13:08 EugenA but git fetch doesn't work. Can I define my server as default remote repo?
13:08 ollehar joined #git
13:13 EugenA I'd like to change my local repo to the same state as cloned one
13:13 InfoTest joined #git
13:19 ollehar left #git
13:21 roelmonnens joined #git
13:25 hahuang61 joined #git
13:25 serialoverflow joined #git
13:29 anonymuse joined #git
13:29 cdown joined #git
13:30 Vangelis joined #git
13:34 tvw joined #git
13:35 rominronin joined #git
13:35 nettoweb1 joined #git
13:36 osse EugenA: if you write 'git fetch' without any arguments it will try to fetch from the remote corresponding to the current branch's upstream. If the current branch has no upstream then it will try "origin" as a default
13:36 anonymuse joined #git
13:37 lss8 joined #git
13:37 osse EugenA: so do one (or all): assign an upstream to your main branch (presumably master?), or type 'git fetch myserver', or rename your remote to "origin"
13:37 armyriad joined #git
13:37 EugenA alright, thanks!
13:37 osse git branch --set-upstream-to=myserver/master master
13:37 osse (eg.)
13:38 _Cyclone_ joined #git
13:39 tvl joined #git
13:41 nikivi joined #git
13:42 nd_ joined #git
13:43 seishun joined #git
13:44 jeffreylevesque joined #git
13:44 perlpilot joined #git
13:44 jbitdrop joined #git
13:44 texinwien joined #git
13:45 jbitdrop joined #git
13:47 fission6 joined #git
13:50 nikivi joined #git
13:52 mindriot101 joined #git
13:53 pbrewczynski joined #git
13:56 venmx joined #git
13:57 jhasse joined #git
13:58 ahmed_elgabri joined #git
13:58 jhasse Hi! Why isn't there a bug tracker for Git itself (only a mailing list)?
13:58 rominronin joined #git
13:58 grawity that would imply that Git has bugs
13:58 grawity honestly though, ask the list
13:59 jaguarmagenta joined #git
13:59 _ikke_ jhasse: Simply because the mailing list is what works best for the maintainers. This discussion has been held often on the ML
14:00 rnsanchez_ joined #git
14:00 aard_ joined #git
14:01 jhasse _ikke_, I see, thanks. Is there any way to search the mailing list archives? http://dir.gmane.org/gmane.c​omp.version-control.git.user results in 404 on most links for me
14:01 _ikke_ jhasse: https://public-inbox.org/git/
14:01 grawity https://public-inbox.org/git is probably official at the moment
14:01 grawity both are also reachable over NNTP
14:01 jhasse Thanks :)
14:01 noecc joined #git
14:02 mischat joined #git
14:02 jimi_ joined #git
14:05 shinnya joined #git
14:05 mizu_no_oto joined #git
14:05 rchavik joined #git
14:05 Gsham joined #git
14:06 GavinMagnus left #git
14:12 nikivi joined #git
14:18 mischat_ joined #git
14:18 Darcidride joined #git
14:18 cdg joined #git
14:23 nettoweb joined #git
14:24 a_thakur joined #git
14:25 nickabbey joined #git
14:27 nicksloan joined #git
14:27 troulouliou_div2 joined #git
14:27 ResidentBiscuit joined #git
14:29 Gloomy joined #git
14:30 thebope joined #git
14:30 InfoTest joined #git
14:30 ShekharReddy joined #git
14:33 cdown joined #git
14:33 snowkidind joined #git
14:35 InfoTest joined #git
14:36 ejb joined #git
14:37 Vangelis joined #git
14:39 nikivi joined #git
14:39 dreiss joined #git
14:39 derk0pf joined #git
14:41 InfoTest joined #git
14:41 zero1985 joined #git
14:42 ahmedelgabri joined #git
14:42 zero1985 joined #git
14:44 systemovich joined #git
14:44 mkoskar joined #git
14:45 zero1985 joined #git
14:46 Rodya_ joined #git
14:46 nikivi joined #git
14:46 ExoUNX joined #git
14:46 zero1985 joined #git
14:47 Vangelis joined #git
14:47 _Patrick_ joined #git
14:48 AaronMT joined #git
14:49 fmcgeough joined #git
14:49 zero1985 joined #git
14:49 flaguy48 joined #git
14:50 eduardas_m joined #git
14:50 cdg_ joined #git
14:52 Dougie187 joined #git
14:52 zero85 joined #git
14:53 Darren_ joined #git
14:54 cheater joined #git
14:54 nettoweb joined #git
14:55 FinboySlick joined #git
14:55 NeverDie_ joined #git
14:56 cqi joined #git
14:57 cqi joined #git
14:57 Dragonbird joined #git
14:58 ResidentBiscuit joined #git
14:59 fahadash joined #git
15:00 rorro joined #git
15:01 GodGinrai joined #git
15:02 GodGinrai joined #git
15:05 brillenfux joined #git
15:06 hyperair joined #git
15:06 mischat joined #git
15:06 _Patrick_ joined #git
15:06 TomyWork joined #git
15:07 dirtyroshi joined #git
15:09 JeroenT joined #git
15:14 CheckDavid joined #git
15:14 rwb joined #git
15:14 ash_workz joined #git
15:15 jaafar joined #git
15:15 al-damiri joined #git
15:17 eduardas_m joined #git
15:17 refried_ joined #git
15:17 lmat joined #git
15:18 mischat_ joined #git
15:18 ochorocho__ joined #git
15:18 Rodya_ joined #git
15:19 weltall joined #git
15:19 Makita joined #git
15:20 mischat joined #git
15:22 deadnull joined #git
15:23 TomyWork joined #git
15:24 NeverDie joined #git
15:24 ResidentBiscuit joined #git
15:25 jaguarmagenta joined #git
15:25 ResidentBiscuit joined #git
15:25 ResidentBiscuit joined #git
15:26 ResidentBiscuit joined #git
15:26 ResidentBiscuit joined #git
15:27 ResidentBiscuit joined #git
15:27 hahuang61 joined #git
15:28 ashokrajar joined #git
15:31 Dragonbird joined #git
15:32 cheater joined #git
15:33 nicksloan joined #git
15:33 mindriot_ joined #git
15:34 Nikitaw99 joined #git
15:34 thebope joined #git
15:37 boombatower joined #git
15:38 vd joined #git
15:38 Salander27 joined #git
15:40 sangy joined #git
15:40 wfsns joined #git
15:41 lindenle joined #git
15:42 BlessJah OAv
15:43 kadoban joined #git
15:43 TomyWork joined #git
15:44 Darren_ joined #git
15:45 e14 joined #git
15:46 IrishPrime joined #git
15:48 jnavila joined #git
15:50 fission6 joined #git
15:54 ochorocho__ joined #git
15:54 FinboySlick Hello people.  I'm very much of a noob, but if I have a bunch of changed files but I want a commit (and its message) to apply t o just one file, then I want another commit/message for the rest of the file.  do I 'git commit -m "single file message" myfile.c ; git commit -am "message for rest of changes"'  ?
15:54 Ryanar joined #git
15:55 fission6 joined #git
15:55 Guest55 joined #git
15:55 ilmari FinboySlick: you can. or you can 'git add myfile.c' and then 'git commit -m "message"'
15:56 FinboySlick ilmari: myfile.c is already tracked by git though (unless I misunderstand something)
15:56 Darcidride joined #git
15:57 jbeeze_ joined #git
15:57 ilmari FinboySlick: add is used to stage changes to existing files too
15:57 ilmari you can even stage individual hunks, with 'git add -p'
15:58 TomyWork joined #git
15:59 robattila256 joined #git
16:00 nickabbey joined #git
16:00 robotroll joined #git
16:00 aarobc joined #git
16:01 polyrob joined #git
16:06 sgfgdf left #git
16:06 oskarkv joined #git
16:07 FinboySlick ilmari: I'm probably not fully understanding what 'stage' means, hence my ambiguity reading the manpage explanation.
16:09 TomyWork joined #git
16:11 ilmari !index
16:11 gitinfo The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/​Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
16:11 ilmari FinboySlick: ^^
16:11 FinboySlick ilmari: On it.
16:12 TomyWork joined #git
16:12 ojdo joined #git
16:13 Ryanar joined #git
16:15 ShekharReddy joined #git
16:15 tang^ joined #git
16:15 TomyWork joined #git
16:17 aard_ joined #git
16:19 e14 joined #git
16:21 dendazen joined #git
16:22 dreiss joined #git
16:25 flavius joined #git
16:27 LionsMane joined #git
16:27 Nikitaw99 joined #git
16:28 Nikitaw99 joined #git
16:28 mischat joined #git
16:28 robattila256 joined #git
16:28 mbeierl joined #git
16:31 TomyWork joined #git
16:32 fission6 joined #git
16:34 aapaaal joined #git
16:38 rath joined #git
16:42 dan2k3k4 joined #git
16:43 durham joined #git
16:44 _rnsanchez_ joined #git
16:46 cagmz joined #git
16:46 jimi_ joined #git
16:47 sword joined #git
16:47 vuoto joined #git
16:47 mischat_ joined #git
16:48 vuoto joined #git
16:50 nicksloan joined #git
16:50 Ryanar joined #git
16:51 vuoto joined #git
16:51 vuoto joined #git
16:52 tvw joined #git
16:52 vuoto joined #git
16:52 zero85 joined #git
16:53 aapaaal joined #git
16:53 durham joined #git
16:54 Dragonbird joined #git
16:54 zero85 joined #git
16:56 macivy joined #git
16:56 zero85 joined #git
16:57 zero85 joined #git
16:58 deadnull joined #git
16:59 ResidentBiscuit joined #git
17:00 zero85 joined #git
17:02 zero85 joined #git
17:02 TomyWork joined #git
17:04 sargas joined #git
17:04 crayon joined #git
17:06 astrofog joined #git
17:07 Derperperd joined #git
17:07 potatoes_ joined #git
17:08 dviola joined #git
17:09 Ryanar joined #git
17:10 derk0pf joined #git
17:15 JamesBaxter joined #git
17:16 ResidentBiscuit joined #git
17:18 JanC_ joined #git
17:18 uranellus joined #git
17:18 uranellus joined #git
17:19 nikivi joined #git
17:20 madewokherd joined #git
17:22 jimi_ joined #git
17:22 rwb joined #git
17:25 jaguarmagenta joined #git
17:27 ayogi joined #git
17:27 hahuang61 joined #git
17:28 edaught joined #git
17:32 Electrometro joined #git
17:37 svm_invictvs joined #git
17:37 subhojit777 joined #git
17:39 TomyWork joined #git
17:40 howitdo joined #git
17:42 mikecmpbll joined #git
17:43 mseyne joined #git
17:44 deadnull joined #git
17:45 Gsham joined #git
17:45 nicksloan joined #git
17:46 PioneerAxon joined #git
17:46 f0rks joined #git
17:47 aarobc joined #git
17:49 Fissure joined #git
17:51 guampa joined #git
17:53 ToBeCloud joined #git
17:53 TomyLobo joined #git
17:53 manuels joined #git
17:54 jmpp joined #git
17:54 jmpp joined #git
17:54 fling joined #git
17:55 satifant joined #git
17:55 ahmedelgabri joined #git
17:55 publio joined #git
17:55 Gsham joined #git
17:57 ramsub07 joined #git
17:58 fission6 joined #git
17:59 invisbl_ joined #git
17:59 invisbl_ joined #git
18:01 nickabbey joined #git
18:04 Gsham joined #git
18:07 cdown joined #git
18:08 Gsham joined #git
18:08 Gsham joined #git
18:11 PCatinean joined #git
18:14 zivester joined #git
18:15 m0viefreak joined #git
18:17 rishi joined #git
18:17 rishi joined #git
18:17 www-bukolay_net joined #git
18:18 Livecodingtv_Ale joined #git
18:19 govg joined #git
18:19 ki0 joined #git
18:20 _Vi joined #git
18:20 troppie joined #git
18:20 SwiftMatt joined #git
18:20 LucaTM joined #git
18:22 davimore joined #git
18:22 hahuang61 joined #git
18:25 joshszep joined #git
18:27 ejb joined #git
18:27 seishun joined #git
18:28 Serus joined #git
18:28 scarabx joined #git
18:29 Serus hello, I'm running git on windows (7) via msys2, running git rebase suddenly gives me the following error: ': not a valid identifierline 89: export: `branch_name
18:30 spacelord_ joined #git
18:30 Serus Is this a known issue with git on windows? I've never seen this before
18:32 thiago joined #git
18:32 deadnull joined #git
18:36 mablae joined #git
18:37 yohnnyjoe joined #git
18:37 fission6 joined #git
18:40 jimi_sanchez joined #git
18:43 rolha joined #git
18:43 red82 joined #git
18:44 tnecniv joined #git
18:44 sea-gull joined #git
18:44 ferr1 joined #git
18:46 jimi_sanchez joined #git
18:47 Discovery joined #git
18:50 [0xAA] joined #git
18:50 IlNominePatre joined #git
18:52 Limes_ joined #git
18:53 govg joined #git
18:54 chardan joined #git
18:54 jmpp joined #git
18:54 jmpp joined #git
18:56 sargas joined #git
18:58 anonymuse joined #git
18:59 cdown joined #git
19:00 Starky joined #git
19:00 SourTrout joined #git
19:01 rolha joined #git
19:03 cagedwisdom joined #git
19:04 Gsham joined #git
19:06 glebihan_ joined #git
19:06 systeem left #git
19:08 hue joined #git
19:09 Sasazuka joined #git
19:10 dsantiago joined #git
19:11 ferr1 joined #git
19:11 Ahmed90 joined #git
19:12 [cust] joined #git
19:17 ResidentBiscuit joined #git
19:19 blr_ joined #git
19:19 King_Hual joined #git
19:19 King_Hual joined #git
19:19 jeffreylevesque_ joined #git
19:19 jstein_ joined #git
19:20 [cust] joined #git
19:20 nickabbey joined #git
19:21 pbrewczynski joined #git
19:22 tharuin joined #git
19:24 crayon joined #git
19:24 rwb joined #git
19:25 _ikke_ Me neither
19:26 Domhack joined #git
19:26 qguv joined #git
19:26 jaguarmagenta joined #git
19:27 Lowell joined #git
19:30 Jackneill joined #git
19:32 Serus for now I work around it by reverting to git 2.9, apparently it's a gettext issue
19:33 Spec-Chum joined #git
19:34 msonntag joined #git
19:35 ed___ joined #git
19:38 ghostlight joined #git
19:40 janx joined #git
19:41 meth joined #git
19:41 adambrenecki joined #git
19:41 kwmiebach__ joined #git
19:41 lebster joined #git
19:42 stealthii joined #git
19:42 InfoTest joined #git
19:43 huhlig joined #git
19:43 bbhoss joined #git
19:44 pizzaops joined #git
19:45 devhost_ joined #git
19:45 Doginal joined #git
19:46 gyre007 joined #git
19:48 aznloren joined #git
19:48 abc joined #git
19:48 yoyoyo_____ joined #git
19:49 _Ace joined #git
19:50 netj joined #git
19:50 rfv joined #git
19:51 Guest89041 Feature branch A has a submodule B which is on feature branch B. Now, if I want to rebase both A and B onto their respective master branch. how do I do it? I know submodule has a --rebase, but that seems to rebase local change to the latest commit and not onto master
19:51 uranellus joined #git
19:51 uranellus joined #git
19:51 glebihan_ joined #git
19:52 Whisket joined #git
19:52 cstrahan joined #git
19:52 Darcidride joined #git
19:53 ResidentBiscuit joined #git
19:53 Guest89041 is there anyone here?
19:54 _ikke_ No
19:54 tobiasvl Guest89041: I'm not too experienced with submodules, but can't you just enter the submodule directory and do a normal git rebase?
19:54 tobiasvl isn't that how you operate on the submodule
19:54 Lowell joined #git
19:55 pfg joined #git
19:55 Orion3k joined #git
19:55 eshlox joined #git
19:55 sssilver joined #git
19:56 Guest89041 thanks tobiasvl I don't know I am not familar with git.
19:56 BlueProtoman joined #git
19:57 cloudcell_ joined #git
19:57 nettoweb joined #git
19:58 ResidentBiscuit joined #git
19:58 ResidentBiscuit joined #git
19:58 aznloren joined #git
19:59 wizardedit joined #git
19:59 natet joined #git
20:00 Guest89041 tobiasvl: somehow I need to commit the hash of submodule B to feature branch A after rebasing B. But then that commit will be at the latest entry in the feature branch A. As a result, there will be some snapshots in time of feature branch A that uses the "old" submodule B
20:02 invisbl joined #git
20:02 msonntag joined #git
20:02 invisbl joined #git
20:03 natet OK, I've got an odd question that I haven't found the answer to, at least not completely. I work on a project with one other developer. we are using git-flow, and she (for reasons I won't get into here) erroneously started working on a feature directly on develop. Then she attempted to revert some of those commits. The real kicker is that the first thing she did was a merge that wiped out a bunch of changes, but in source tree, there are
20:03 natet I'm trying to back out what she had done.
20:03 natet But I get stuck when I get to that merge.
20:03 _ikke_ natet: Your first message got truncated, "there are n"
20:04 natet There are no differences shown when you select that merge
20:04 fission6 joined #git
20:04 paperziggurat joined #git
20:05 natet _ikke_: Thanks. I knew I was probably getting close to the line limit
20:05 osse reasonable clients split the message up :-)
20:06 natet osse: Using irssi. I have no idea if it's reasonable or not, but I'ved used it for years, mostly because work blocks IRC
20:07 osse hmm... i would expect that to do the right thing. maybe it's configurable
20:07 martin_g joined #git
20:07 natet Yeah, I haven't done a tone of customization.
20:07 _ikke_ natet: So what's the question?
20:07 natet So, how do I get rid of the changes she had made.
20:08 natet The general concensus online is to revert the changes
20:08 _ikke_ natet: Did she push already?
20:08 natet But I can't revert that merge.
20:08 natet Yes.
20:08 natet I may have compounded things by pushing my reverts of her commits.
20:09 barq joined #git
20:10 aznloren joined #git
20:10 ahmedelgabri joined #git
20:10 aendrew joined #git
20:11 _ikke_ It would help to know how history looks like
20:12 ulkesh joined #git
20:12 natet Some more information. She pushed the odd merge, then 7 other commits, then I pushed commits that reverted her 7 commits in reverse order
20:13 _ikke_ !situation
20:13 gitinfo Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)
20:13 irqq joined #git
20:13 BlueProtoman joined #git
20:16 brokensyntax_ left #git
20:17 tharuin joined #git
20:19 brokensyntax joined #git
20:19 sebhoss joined #git
20:20 nettoweb joined #git
20:21 pbrewczynski joined #git
20:21 BlueProtoman joined #git
20:22 unholycrab joined #git
20:22 natet http://pastebin.com/f72dZ2A3
20:23 natet d4e5820 is the offending merge
20:25 nwkj86 joined #git
20:26 milkshoes joined #git
20:26 hussam joined #git
20:26 Ferris_ joined #git
20:30 khfeng_ joined #git
20:31 _ikke_ and e25f6ec ?
20:31 ddavidd joined #git
20:34 BlueProtoman joined #git
20:34 johnmilton joined #git
20:37 dreiss joined #git
20:37 thebope joined #git
20:37 alhariel joined #git
20:38 thebope joined #git
20:38 natet Not sure about that one.
20:38 natet I'm using sourcetree, and if I restrict it to develop, I don't see that merge
20:39 _ikke_ It's part of feature/eus-1018
20:39 natet Yeah.
20:39 natet I see it there.
20:39 _ikke_ But is it relevant?
20:41 natet Not to the problem at hand. My plan is to create a patch from that branch once I fix the develop branch and create a new feature to pull those changes in.
20:42 cdown joined #git
20:44 manuels joined #git
20:44 _ikke_ So the history is linear from that incorrect merge on
20:45 natet On the develop branch, yes
20:45 _ikke_ Are there any commits that need to be kept?
20:45 natet No. all of them are either the bad commits she did or the ones I did trying to back them out.
20:46 ahmed_elgabri joined #git
20:46 _ikke_ Do you think rewriting history is a problem? (for example, do other people then you and her have these commits)?
20:46 natet No
20:46 Serus git rebase interactive is showing ^M at the end of the lines in vim, does this mean these are windows line endings?
20:46 scootergrisen joined #git
20:46 natet A couple of other people have access to the repo, but they likely haven't pulled in months.
20:47 _ikke_ natet: Right
20:47 _ikke_ The easiest way is then to reset develop back to the commit before the merge
20:47 _ikke_ (I think it's 7f1fa88)
20:47 natet _ikke_: Would I push after I reset?
20:47 _ikke_ Yes
20:47 rwb joined #git
20:48 scootergrisen Would someone help me with using git? I need to use squish and keep the commit-id to overwrite a commit with some files i already uploade. But i'm not good at git.
20:49 bremner luckily what you want is impossible
20:49 bremner unless you mean something unusual by "commit-id"
20:50 rolha joined #git
20:51 Learath2 joined #git
20:53 natet _ikke_: Thanks.
20:53 _ikke_ natet: yw\
20:53 sssilver joined #git
20:55 tyreld joined #git
20:55 scootergrisen I mean change-id. Sorry
20:56 Seveas there's no such thing as a change id in git, so you're lucky again :)
20:56 scootergrisen I have uploaded som files to https://codereview.qt-project.org/#/c/170781/ and now i made some changes to the files so i "just" want to upload them again and overwrite the old onces
20:56 scootergrisen Ok i thought it was part of git
20:56 Seveas oh that's gerrit. No clue about that
20:57 noecc joined #git
20:57 mischat joined #git
20:57 Seveas no, gerrit uses git in fun and special ways. change id's is one of those, just as pushing to refs/for/...
20:57 Seveas maybe ask in a gerrit channel if there are no gerrit people awake in here
20:57 scootergrisen Ok thanks i will try
20:58 isysd joined #git
20:58 texinwien joined #git
21:03 ddavidd I just checked out a previous commit into a feature. If I merge this back into the main branch will I loose the log/history from anything past the commit I was working on ?
21:04 cdg joined #git
21:05 oaao joined #git
21:05 vrlx joined #git
21:09 mischat joined #git
21:09 thebope_ joined #git
21:16 thebope joined #git
21:17 mindriot101 joined #git
21:18 crayon joined #git
21:19 Darcidride joined #git
21:20 mseyne joined #git
21:21 mischat joined #git
21:22 sssilver joined #git
21:22 ddavidd left #git
21:23 polyrob joined #git
21:24 cjohnson merging only modifies the branch you are merging into
21:24 cjohnson so your original branch will still retain full history
21:25 HoierM joined #git
21:26 jknetl joined #git
21:26 dan2k3k4 joined #git
21:26 vuoto joined #git
21:27 muelli joined #git
21:27 jaguarmagenta joined #git
21:28 vuoto joined #git
21:29 vuoto joined #git
21:29 vuoto joined #git
21:31 rbern joined #git
21:32 nettoweb joined #git
21:33 ochorocho__ joined #git
21:33 Starky joined #git
21:35 mmlb joined #git
21:35 dan2k3k4 joined #git
21:37 jimi_ joined #git
21:37 ChiLL_SurF joined #git
21:41 qws-user-1229 joined #git
21:42 cagedwisdom joined #git
21:42 Cavallari joined #git
21:43 boombatower joined #git
21:43 xpk joined #git
21:43 xpk_ joined #git
21:44 uranellus joined #git
21:44 uranellus joined #git
21:44 xpk joined #git
21:45 ChiLL_SurF hi there
21:45 gitinfo ChiLL_SurF: 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.
21:45 xpk joined #git
21:45 Darcidride joined #git
21:46 ChiLL_SurF I have decided to start using a repository system for my files
21:46 ChiLL_SurF but i dont know which to choose.
21:47 ChiLL_SurF Could you please help me on choosing the right repository system for my needs?
21:48 ChiLL_SurF I'd prefer the system to be open source (in order to upload it to my own server or use a free online repository system like git or github) but for private files. I'd also need it to be used by two users
21:48 ChiLL_SurF do you know any?
21:53 dsantiago joined #git
21:53 ramsub07 joined #git
21:53 qws-user-1228 joined #git
21:53 railssmith joined #git
21:53 mohan joined #git
21:54 ResidentBiscuit joined #git
21:54 aard_ joined #git
21:55 sargas joined #git
21:55 mohan__ joined #git
21:55 davimore joined #git
21:56 manuels joined #git
21:56 navidr joined #git
21:56 xpk joined #git
22:01 Guest26 joined #git
22:02 troulouliou_div2 joined #git
22:05 SwiftMatt joined #git
22:06 rbern joined #git
22:08 ramsub08 joined #git
22:08 polyrob joined #git
22:08 polyrob joined #git
22:11 ejb joined #git
22:13 astrofog joined #git
22:14 mustmodify joined #git
22:15 mustmodify I'm doing something stupid. I have a PR with several commits, including 8a385. I did `git fetch origin; git checkout -b <<the branch name>>` that worked. I am now on that branch. I did `git log` and it's the log from master.
22:15 mustmodify I did `git show 8a385` and it shows me that commit, so it got pulled down.
22:15 mustmodify so uh...
22:15 ResidentBiscuit joined #git
22:15 mustmodify where is it? :P
22:15 tobiasvl mustmodify: what's <<the branch name>>? the remote tracking branch?
22:15 _Vi joined #git
22:16 mustmodify I see...
22:16 mustmodify git checkout -b new-order-to-follow-up#694
22:16 mustmodify but needed to be
22:16 mustmodify git checkout -b new-order-to-follow-up#694 origin/new-order-to-follow-up#694
22:16 tobiasvl yeah
22:16 mustmodify I was really feeling stupid.
22:17 tobiasvl no worries!
22:19 mindriot101 joined #git
22:21 potatoes_ joined #git
22:22 Guest80925 joined #git
22:22 nettoweb joined #git
22:23 SourTrout joined #git
22:24 ThunderChicken joined #git
22:24 ThunderChicken joined #git
22:25 mustmodify left #git
22:30 refried_ joined #git
22:34 tvw joined #git
22:34 Derperperd joined #git
22:38 Starky joined #git
22:39 Guest80925 joined #git
22:43 Guest80925 left #git
22:43 DrRobotic joined #git
22:46 tissuesamples joined #git
22:48 mizu_no_oto joined #git
22:48 tissuesamples I have a file that is tracked with git but must be manually uploaded to an endpoint. Is there an easy way to come back to said endpoint in the future and determine what revision that file is based on?
22:50 DrRobotic joined #git
22:50 Starky joined #git
22:50 netj joined #git
22:51 timmu joined #git
22:51 tissuesamples2 joined #git
22:52 DrRobotic joined #git
22:52 lb tissuesamples if it's out of git, nope
22:53 cdown joined #git
22:53 tissuesamples lb: There's no way to get a list of sums from the file's past revisions? I've been looking to no success :(
22:54 pothepanda joined #git
22:54 lb tissuesamples there are always ways, but there is no simple "git show me the revision" cmd
22:54 DolphinDream joined #git
22:54 Atm0spher1c joined #git
22:54 spacelord_ joined #git
22:54 tissuesamples lb: I would greatly appreciate a recommendation if you have one off the top of your head.
22:55 DrRobotic joined #git
22:56 mischat joined #git
22:56 lb sorry, i'm not firm in the usage of the plumbing commands, but at least i know you can always generate a list of all commits, that changed the file, from there you can inspect the commit object, get the tree and so on... but it's nasty...
22:57 tissuesamples lb: I appreciate the help in any case :)
22:57 lb tissuesamples would be much simpler to automate the "upload to endpoint" process and save the revision somewhere during the process
22:58 tissuesamples lb: Unfortunately, it's a very manual process that cannot be automated. :(
22:58 tissuesamples or rather, should not be automated :)
22:59 lb tissuesamples if so, then add another step in that manual process that says "save the current git revision into a txt file and put it next ot it.."
22:59 lb or create a tag in the git repo, every time you "upload"
23:00 lb if it's that manual, but important, do the extra step
23:01 fmeerkoetter joined #git
23:01 tissuesamples lb: Hm, that seems prone to failure. I'll illuminate: The tracked files are AWS cloudformation templates that are updated many times a day. The reason I'd like to see the revision is for those times where a week has passed and I'd like to see the state of the current deployment. It's manual because the template updates often require parameter value changes.
23:03 yohnnyjoe joined #git
23:04 nowhereman joined #git
23:04 lb i understand that this is not an ideal solution. but i'm not aware of an easy "git reverse file-to-revision" cmd. so if there is any chance it can be scripted (the export from the git repo e.g.) i would start there. since our setup is managed by jenkins, which does something like that (include revision file in the jar) i didn't think any further...
23:04 lb .
23:05 kadoban joined #git
23:06 lb but there are some script magicians around here. maybe ask again later and wait a while if they pick up on it...
23:06 tissuesamples Right now I'm looking into finding the shasum of a file in a specific revision: I could then just loop through previous revisions until I get a match of the current file.
23:07 lb tissuesamples man git hash-object
23:07 gitinfo the git-hash-object manpage is available at http://jk.gs/git-hash-object.html
23:07 tissuesamples lb: I was looking at that but I don't see any way to specify a revision
23:07 spacelord_ joined #git
23:08 lb ah sorry, you mean you want to see the sha of a blob in an existing commit?
23:09 tissuesamples lb: Yep, just get all the previous sums of a file from older commits so I can compare with the current file.
23:09 tissuesamples lb: That's the best way I can think of solving this problem: The need to view the version is not frequent enough to justify the constant recording of the hash every deploy, but it would be great to have a tool on-hand to be able to verify
23:10 lb tissuesamples https://git-scm.com/book/en/​v2/Git-Internals-Git-Objects
23:10 lb git cat-file is your friend
23:11 timmu joined #git
23:11 lb had a nice talk from scott chacon who explained that stuff .... just a sec
23:11 lb tissuesamples http://cdn.media.ccc.de/events/froscon/​2011/webm/hs1_2_-_2011-08-20_15:15_-_wr​angling_git_-_scott_chacon_-_802.webm there it is
23:12 lb tissuesamples skip to minute 33
23:13 HoierM joined #git
23:14 spacelord_ joined #git
23:14 SwiftMatt joined #git
23:14 lindenle joined #git
23:15 lb ah git ls-tree <tree/commit> show the tree with all the shas
23:16 ResidentBiscuit joined #git
23:18 Ryanar joined #git
23:21 dreiss joined #git
23:21 BlueProtoman joined #git
23:22 polyrob joined #git
23:22 Noldorin joined #git
23:24 tissuesamples lb: There's a lot of information to take in. Thanks very much for the help. I'm sure something good can come out of this
23:24 lb tissuesamples happy hacking :)
23:28 polyrob joined #git
23:28 jaguarmagenta joined #git
23:33 mephistorium joined #git
23:33 ochorocho__ joined #git
23:33 mindriot101 joined #git
23:34 courrier joined #git
23:34 serialoverflow joined #git
23:35 SourTrout joined #git
23:42 YuGiOhJCJ joined #git
23:45 jstimm joined #git
23:47 tvw joined #git
23:48 YuGiOhJCJ joined #git
23:49 VladGh joined #git
23:50 justan0theruser joined #git
23:53 Dougie187 left #git
23:54 ToBeCloud joined #git
23:56 Dougie187 joined #git
23:56 Dougie187 left #git
23:56 Dougie187 joined #git
23:57 mischat joined #git

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