Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-04

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

All times shown according to UTC.

Time Nick Message
00:00 rbr joined #git
00:01 ojacobson lanox: none of those directories start with /User relative to the root of the project.
00:02 ojacobson You likely wanted /go/pkg/ and /go/bin/
00:04 snthsnth joined #git
00:06 lanox joined #git
00:07 nd joined #git
00:07 lanox sorry I keep getting D/
00:07 lanox C
00:08 ^7heo try to get \r\n
00:08 nilg joined #git
00:09 lanox ugh I see my mistale
00:09 lanox mistake
00:09 lanox slap in the face
00:10 dsantiago joined #git
00:10 lanox I really dont know why I did that
00:13 einnjo joined #git
00:14 hahuang62 joined #git
00:17 anuxivm left #git
00:18 fmcgeough joined #git
00:18 nettoweb joined #git
00:19 mattcen joined #git
00:21 pasky joined #git
00:23 mar77i joined #git
00:23 faux___ joined #git
00:23 LBV_User joined #git
00:24 rafalcpp joined #git
00:25 johnmilton joined #git
00:26 Kaisyu joined #git
00:31 mar77i joined #git
00:32 tabakhase ancient build box here, git 1.5 has no support for --ff-only merge? =(
00:33 converge joined #git
00:33 ahr3n joined #git
00:33 atomicb0mb joined #git
00:34 al-damiri joined #git
00:36 cbreak joined #git
00:39 dodobrain joined #git
00:44 jimi_ joined #git
00:44 fahadash joined #git
00:44 raijin joined #git
00:45 nckpz joined #git
00:45 stupidystupid joined #git
00:48 stupidystupid joined #git
00:50 cyphase joined #git
00:50 mingrammer joined #git
00:52 jpleau left #git
00:52 ruby_ joined #git
00:53 fuchstronaut joined #git
00:54 romerocesar joined #git
00:56 stupidystupid joined #git
00:56 snthsnth joined #git
00:57 danslo joined #git
00:59 perrier-jouet joined #git
01:04 cyphase joined #git
01:04 macivy joined #git
01:05 LBV_User joined #git
01:07 dsdeiz joined #git
01:07 dsdeiz joined #git
01:10 stupidystupid joined #git
01:13 rnsanchez_ joined #git
01:15 fmcgeough joined #git
01:15 CussBot joined #git
01:16 Kitty- joined #git
01:16 d^sh joined #git
01:17 ruby_ joined #git
01:17 mizu_no_oto joined #git
01:19 tgunr joined #git
01:21 star_prone joined #git
01:22 Noldorin joined #git
01:22 sunri5e joined #git
01:23 hagebake joined #git
01:25 mellernoia joined #git
01:29 emptynine joined #git
01:29 pandeiro joined #git
01:30 Vampire0_ joined #git
01:30 fstd_ joined #git
01:35 pks joined #git
01:39 jez joined #git
01:39 dreiss joined #git
01:41 mischat joined #git
01:46 Dougie187 joined #git
01:46 _tgunr joined #git
01:46 mingrammer joined #git
01:47 Rodya_ joined #git
01:48 ruby_ joined #git
01:49 Darren_ joined #git
01:52 star_prone joined #git
01:54 fuchstronaut joined #git
01:56 einnjo joined #git
01:58 danslo joined #git
02:01 z8z joined #git
02:02 harish joined #git
02:04 jez joined #git
02:06 theskillwithin export GIT_DIR=$PWD/.git && cd dist && GIT_WORK_TREE=$PWD GIT_INDEX=/tmp/lol && git add . && git push origin -f $(git write-tree):refs/heads/gh-pages && unset GIT_DIR GIT_WORK_TREE GIT_INDEX
02:08 ahr3n joined #git
02:11 tgunr joined #git
02:13 theskillwithin trying to figure out how to make my  dist folder which is in gitignore to be the root level of my gh-pages branch
02:14 hahuang62 joined #git
02:14 anonymuse joined #git
02:18 DolpheenDream joined #git
02:27 Hink_ joined #git
02:27 raspado joined #git
02:30 lagothrix joined #git
02:34 theskillwithin http://kopy.io/BlHuo
02:34 rchavik joined #git
02:37 perrier-jouet joined #git
02:39 mingrammer joined #git
02:39 Dougie187 left #git
02:40 auzty joined #git
02:40 duderonomy joined #git
02:41 e14 joined #git
02:42 mischat joined #git
02:42 arescorpio joined #git
02:43 Hink joined #git
02:43 Hink joined #git
02:44 gfixler joined #git
02:45 hexagoxel joined #git
02:45 Hink joined #git
02:45 Hink joined #git
02:46 RustyShackleford so I have a feature branch in my fork that needs to be fixed
02:46 RustyShackleford I had to git reset --hard upstream/master on my master branch
02:47 RustyShackleford now I want to git checkout feature1; git rebase master
02:47 dreiss joined #git
02:47 vassagus joined #git
02:47 RustyShackleford there are a lot of merge conflicts unfortunately. Do I have any options besides resolving them all manuall?
02:50 theskillwithin trying to figure out how to make my  dist folder which is in gitignore to be the root level of my gh-pages branch http://kopy.io/BlHuo
02:50 cjohnson RustyShackleford: instead of rebase, try merging master
02:50 cjohnson or, make a copy of your feature and cherry pick teh changes over maybe
02:51 RustyShackleford I have never tried a cherry pick. Reading about the differences
02:53 RustyShackleford I PR'ed a branch which was the parent of this feature branch. My own fault for not working on separate branches to begin with
02:53 JanC_ joined #git
02:53 RustyShackleford anyway, seems like when PR is accepted, it's squashed down to one commit
02:54 SwiftMatt joined #git
02:55 fuchstronaut joined #git
02:55 theskillwithin https://youtu.be/JPKOESR1k04
02:57 RustyShackleford hah hopefully I'm beyond noob. Sometimes you mess up
02:58 snthsnth joined #git
02:59 danslo joined #git
03:01 chachasmooth joined #git
03:10 BadSnappa joined #git
03:14 Vortex35 joined #git
03:19 rwb joined #git
03:21 jason237 joined #git
03:21 nckpz joined #git
03:21 harish joined #git
03:28 theskillwithin trying to figure out how to make my  dist folder which is in gitignore to be the root level of my gh-pages branch http://kopy.io/BlHuo
03:28 flavius joined #git
03:31 Andrew_K joined #git
03:33 robotroll joined #git
03:33 mingrammer joined #git
03:35 snthsnth joined #git
03:35 cxreg2 left #git
03:35 cxreg joined #git
03:37 einnjo joined #git
03:38 tgunr joined #git
03:38 Darren_ joined #git
03:39 nivag_ joined #git
03:40 mizu_no_oto joined #git
03:42 a_thakur joined #git
03:43 mischat joined #git
03:48 vassagus joined #git
03:49 safe joined #git
03:51 mehola joined #git
03:52 fedepad_ joined #git
03:53 star_prone joined #git
03:54 ahr3n_ joined #git
03:55 Goplat joined #git
03:56 fuchstronaut joined #git
03:56 lindenle joined #git
03:57 brokensyntax joined #git
03:59 mingrammer joined #git
04:00 strugee joined #git
04:05 daey_ joined #git
04:09 phanimahesh joined #git
04:11 RustyShackleford okay this worked
04:11 diogenese joined #git
04:11 RustyShackleford after a failed rebase, I decided to squash the 8 commits I needed
04:11 RustyShackleford then cherrypicked it to a new branch
04:13 romerocesar joined #git
04:14 djh joined #git
04:15 hahuang62 joined #git
04:18 cagedwisdom joined #git
04:18 justan0theruser joined #git
04:18 einnjo joined #git
04:19 theskillwithin trying to figure out how to make my  dist folder which is in gitignore to be the root level of my gh-pages branch http://kopy.io/BlHuo
04:25 eizua joined #git
04:28 LeBlaaanc joined #git
04:28 dan2k3k4 joined #git
04:30 eizua joined #git
04:31 khmarbaise joined #git
04:33 sl33k joined #git
04:34 sl33k_ joined #git
04:36 RustyShackleford is there a book you'd recommend for becoming a git power user?
04:37 snthsnth joined #git
04:39 Limes_ joined #git
04:41 t4nk105 joined #git
04:41 Andrew_K|2 joined #git
04:43 Guest22_ joined #git
04:44 mischat joined #git
04:49 eshlox joined #git
04:50 freimatz joined #git
04:52 ploop joined #git
04:52 Andrew_K joined #git
04:53 subhojit777 joined #git
04:54 Guest22_ joined #git
04:55 star_prone joined #git
04:56 Cabanossi joined #git
04:56 fuchstronaut joined #git
04:57 Guest22_ left #git
05:02 overlord_tm joined #git
05:03 littleforest joined #git
05:03 cyan__ joined #git
05:09 qt-x joined #git
05:11 einnjo joined #git
05:12 Anja joined #git
05:14 alex1a joined #git
05:16 mingrammer joined #git
05:17 Mowgli joined #git
05:19 xameada joined #git
05:23 texasmynsted joined #git
05:23 einnjo joined #git
05:24 thiago joined #git
05:27 gfixler joined #git
05:31 sargas joined #git
05:33 Anja joined #git
05:35 noyb joined #git
05:36 phanimahesh joined #git
05:39 bluepixel joined #git
05:40 laumann joined #git
05:42 ewet joined #git
05:43 lordjancso joined #git
05:46 texasmynsted joined #git
05:47 stuh84 joined #git
05:49 EvanDotPro joined #git
05:56 zeroed joined #git
05:56 zeroed joined #git
05:56 LucaTM joined #git
05:57 rbr joined #git
05:59 Raging_Hog joined #git
06:03 bocaneri joined #git
06:04 bittyx Hi, need a bit of advice! I often checkout new branches and push them to the origin (for creating PRs). However, if I'm on a branch `foo`, and I do `git push`, I get a message that there is no matching upstream branch and that I should do `git push --set-upstream origin foo` - is there any shorter way to do this? My branch names are sometimes long, and it's just a tiny bit annoying when I'm pushing a lot of branches.
06:04 satya4ever joined #git
06:04 bittyx Thanks in advance for any tips.
06:04 ojacobson git push -u <remote> <branch1> <branch2> …<branchN>…
06:05 ojacobson Also, if you're using bash or zsh, there are contrib scripts for adding tab completion for git commands and branch names
06:05 theskillwithin trying to figure out how to make my  dist folder which is in gitignore to be the root level of my gh-pages branch http://kopy.io/BlHuo
06:05 bittyx That pushes all of those branches at once and sets all of their upstreams to be <remote>?
06:05 ojacobson to be the corresponding branches on <remote>, specifically
06:05 bittyx I'm using oh-my-zsh but tab completion is sometimes buggy for me.
06:05 jaguarmagenta joined #git
06:05 theskillwithin oh my zsh ftw
06:05 bittyx Thanks, that's helpful!
06:05 freimatz joined #git
06:06 watersoul joined #git
06:08 bocaneri joined #git
06:08 satya4ever o/
06:08 satya4ever My network is quite good but github.com is taking too much time to open
06:08 ojacobson Github is super super down
06:08 ojacobson https://status.github.com
06:08 satya4ever after some time it shows error 500
06:08 ojacobson Ignore the green header, read the graphs
06:10 lb1c joined #git
06:10 satya4ever I am getting
06:10 satya4ever 11:39 IST
06:10 satya4ever Major service outage.
06:10 ojacobson There you go, then
06:10 snthsnth joined #git
06:10 satya4ever how much time it will require to up ..?
06:10 satya4ever just curious
06:11 j416 satya4ever: this channel is not github; I'm not sure people know
06:11 j416 unless a github employee is lurking in the shadows
06:11 satya4ever ok
06:12 j416 satya4ever: perhaps #github knows more. maybe.
06:12 satya4ever ok j416 I will ask there :)
06:12 satya4ever thanks a lot
06:12 j416 satya4ever: it'll be up asap, rest assured
06:12 satya4ever yes hope so
06:15 rscata joined #git
06:16 JeroenT joined #git
06:16 hahuang62 joined #git
06:16 WayToDoor joined #git
06:16 theskillwithin https://i.imgur.com/cg4Pi4h.png  github down?
06:17 djb-irc joined #git
06:17 thiago yes
06:17 patrick99e99 joined #git
06:17 theskillwithin just... yes.
06:17 theskillwithin ok thx
06:17 patrick99e99 Hey git friends.. I've got a problem.. Git somehow thinks something is a submodule when it is not... and I can't get it to add the files to the project...
06:18 patrick99e99 It was a submodule long long long ago, but I thought I took all the necessary steps to remove it
06:18 thiago patrick99e99: does the directory have a .git dir inside?
06:18 patrick99e99 yes
06:18 patrick99e99 should I just trash that?
06:19 thiago as long as you know what you're doing, yes
06:19 patrick99e99 ok cool.. thanks
06:19 thiago you'll still need to do a "git rm --cached dirname" so that the parent module knows you deleted the submodule
06:19 testild joined #git
06:19 star_prone joined #git
06:20 daishan joined #git
06:20 dan2k3k4 joined #git
06:21 patrick99e99 thanks thiago, that worked indeed
06:25 d^sh joined #git
06:25 star_prone joined #git
06:25 rbr joined #git
06:29 masuberu joined #git
06:34 cdown_ joined #git
06:34 mischat joined #git
06:36 djb-irc joined #git
06:38 dreiss joined #git
06:38 cdown joined #git
06:41 Duikb00t joined #git
06:42 Duikb00t joined #git
06:42 Duikb00t o/
06:43 Duikb00t Im a beginner with bitbcuket and git. So I made a repo on bitbucket and started working on it.
06:43 buzzLightBeer joined #git
06:43 Duikb00t Now I would like to work on the same project with my laptop as well. so I added my ssh key (public) to the repo
06:43 Duikb00t but I try to git push but it's not possible
06:43 star_prone joined #git
06:44 Duikb00t http://kopy.io/5tuoN  IS the message I receive when I try to git push.
06:44 Duikb00t I tried adding the SSH key asewl instead of the deployment key... but I got a message that is' already there.
06:45 star_prone joined #git
06:45 stnly joined #git
06:47 daishan joined #git
06:48 cdown_ joined #git
06:49 armyriad joined #git
06:50 Duikb00t I fixed it
06:50 Duikb00t I haved to add the SSH key to bitbucket not the deployment key
06:50 Duikb00t >> party
06:51 cdown joined #git
06:53 hahuang62 joined #git
06:53 mingrammer joined #git
06:53 cdown__ joined #git
06:56 King_Hual joined #git
06:56 King_Hual joined #git
06:57 star_prone joined #git
06:58 fuchstronaut joined #git
07:00 blackwind_123 joined #git
07:00 ahr3n joined #git
07:01 jknetl joined #git
07:01 dunaeth joined #git
07:01 strk joined #git
07:01 strk how can I ask "git show" to also show trailing blanks?
07:02 Fissure joined #git
07:03 JeroenT joined #git
07:04 Mowgli joined #git
07:05 jozwior_ joined #git
07:06 Jameser joined #git
07:07 eduardas_m joined #git
07:07 submitnine joined #git
07:08 Sceorem joined #git
07:09 thiago joined #git
07:10 Darcidride joined #git
07:11 osse strk: it does that by default on added lines
07:12 danslo joined #git
07:13 star_prone joined #git
07:13 osse man git-config, see core.whitespace
07:13 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
07:13 Seveas strk: git config --global color.diff.whitespace red reverse
07:13 Seveas "red reverse" that is
07:14 star_prone joined #git
07:14 aidalgol joined #git
07:17 Kartagis joined #git
07:17 Kartagis ehlo
07:17 ShekharReddy joined #git
07:17 elastix joined #git
07:17 ogny joined #git
07:19 Kartagis if I have a {name:"b"} in package.json in my repo called a, it should clone to b, right?
07:22 chele joined #git
07:23 waruqi joined #git
07:24 strk Seveas: "red reverse" doesn't seem to work, lines removed are still shown in red fg over white bg
07:25 dcpc007 hi, i only used git basically with linux command line. A group of windows dev ask me if there is some good gui solutions to use git without using command line, i quickly tryied git bash (bof bof) and babun (better but command line)
07:25 strk maybe my terminal doesn't support reverse
07:25 dcpc007 tortoisegit works but seems very limited (only look tutorial, not tested it)
07:26 osse dcpc007: tortoisegit is confusing as hell. i have heard good thigns about sourcetree
07:27 Jameser joined #git
07:27 dcpc007 a see msysgit too but look old ?
07:27 SwiftMatt joined #git
07:28 osse dcpc007: msysgit is just the old name for what is now Git for Windows
07:28 osse dcpc007: aka. git itself, git bash, etc.
07:28 osse strk: does it work for added lines?
07:29 dcpc007 osse: i look a video tuto on sourctree
07:29 dcpc007 note that it's svn dev team :o)
07:30 strk osse: it does work for added lines, yes
07:30 Balliad joined #git
07:30 strk but not for removed lines
07:30 Kartagis if I have a {name:"b"} in package.json in my repo called a, it should clone to b, right?
07:31 |prawnzy joined #git
07:31 grawity Kartagis: depends on what's doing the cloning
07:31 noidea joined #git
07:31 noidea joined #git
07:31 strk as I'm _removing_ traling slashes, I'd like to have an evidence about it, while the + and the - lines look exactly the same, except for the red vs. green colors
07:31 grawity Kartagis: this is #git and Git does not care about package.json
07:31 star_prone joined #git
07:32 dcpc007 osse: sourcetree need an atlassian account ?
07:32 apotry joined #git
07:32 Kartagis grawity: depends on what's doing the cloning? what do you refer to by "what?"
07:32 Kartagis ?
07:33 marvi joined #git
07:33 grawity from confused to hopeless in 1 line ¯\_(ツ)_/¯
07:33 stupidystupid joined #git
07:34 osse strk: I can't find a way to enable it... But since git shows a diff at all there is a change, and since the added line looks good the removed lines must be bad :)
07:34 Kartagis who me?
07:35 strk osse: git show -R # found on http://stackoverflow.com/questions​/5257553/coloring-white-space-in-g​it-diffs-output/11509388#11509388
07:35 theskillwithin joined #git
07:35 strk basically asks git to "reverse" the patch, so that removed lines look like added lines
07:36 strk a trick, but is effective (and makes me belive removed lines are indeed broken)
07:37 osse Kartagis: git itself doesn't care if a repo has a file named package.json in it. so if you just do 'git clone ...' nothing special will happen
07:37 osse Kartagis: => we suppose you don't do just "git clone", so what do you do?
07:37 overlord_tm joined #git
07:38 osse ie. what's doing the cloning?
07:38 Kartagis osse: I do git clone only
07:39 jnavila joined #git
07:42 Anja_ joined #git
07:42 jozwior_ joined #git
07:42 thiago joined #git
07:43 Jameser joined #git
07:46 freimatz_ joined #git
07:47 wogi joined #git
07:47 ochorocho__ joined #git
07:47 xameada joined #git
07:47 wogi_ joined #git
07:47 PCatinean joined #git
07:47 codebam joined #git
07:47 acetakwas joined #git
07:48 osse Kartagis: then you need reformulate the question.
07:49 Kartagis osse: maybe I should ask in #github, it's about a github repo
07:49 laumann joined #git
07:50 osse Kartagis: are you asking whether clone will figure out the directory should be named b or whether you should name it b yourself?
07:50 Alienpruts joined #git
07:51 vassagus joined #git
07:51 Jameser joined #git
07:53 Kartagis osse: if I do git clone a.git b, it does what I explained but I didn't have to do that before
07:54 greendo joined #git
07:54 cagedwisdom joined #git
07:54 Kartagis I just clone OpenSignal-Cordova-SDK and it cloned to opensignal-cordova-plugin
07:54 Kartagis *had cloned
07:55 msonntag joined #git
07:56 _dunaeth joined #git
07:56 Jameser_ joined #git
07:58 Dazzyp joined #git
07:58 encod3 joined #git
07:59 fuchstronaut joined #git
08:00 tvw joined #git
08:03 bongjovi joined #git
08:03 mischat joined #git
08:03 jbitdrop joined #git
08:04 ocbtec joined #git
08:05 ahmedelgabri joined #git
08:05 vdv joined #git
08:06 garethdaine joined #git
08:07 chll_ joined #git
08:07 strk osse: so, is it a known bug with "git diff" to not use core.diff.whitespace for removed lines ?
08:07 strk and git show, for that matter
08:07 osse it is known, but whether it's a bug I don't know
08:10 durham joined #git
08:10 Jameser joined #git
08:10 tcsc joined #git
08:13 harish joined #git
08:14 strk asked on the mailing list
08:14 skyres joined #git
08:14 JeroenT_ joined #git
08:15 daishan joined #git
08:16 thiago it's not a bug
08:17 jozwior__ joined #git
08:17 mingrammer joined #git
08:17 strk thiago: how so ? why "diff.color" is only applied to one side of the diff and not to the other ?
08:18 timvisher joined #git
08:18 dcpc007 osse: i found this link too : https://git-scm.com/download/gui/linux
08:18 serialoverflow joined #git
08:20 a_thakur joined #git
08:22 jimi_ joined #git
08:22 jimi_ joined #git
08:22 thiago strk: because it's applied only to one side, intentionally
08:22 thiago you want to know if you're introducing whitespace errors
08:22 thiago if you've fixed them, great, but that's not useful information
08:22 manuel joined #git
08:23 JeroenT joined #git
08:24 JeroenT joined #git
08:24 marcogmonteiro joined #git
08:24 manuel joined #git
08:25 JeroenT_ joined #git
08:25 timini joined #git
08:25 manuel joined #git
08:25 xshuiniu joined #git
08:27 strk thiago: when you're looking to know what you've done, it _is_ useful
08:27 strk or what others did
08:27 kurkale6ka joined #git
08:27 strk could be a configuration option too, if there are different tastes
08:28 thiago in most projects, fixing whitespace errors only happens in either: a) a massive whitespace-cleaning commit, possibly also converting from tabs to spaces throughout; or b) when the line was getting changed anyway
08:28 manuel joined #git
08:29 mingrammer joined #git
08:29 xall joined #git
08:31 acetakwas joined #git
08:31 JeroenT joined #git
08:31 jez joined #git
08:32 JeroenT_ joined #git
08:32 mingramm_ joined #git
08:34 Masber_080 joined #git
08:34 blackwind_123 joined #git
08:35 strk thiago: my point is, how does it help _not_ applying it to removed lines ?
08:35 mar77i joined #git
08:36 thiago strk: because it doesn't help in the two scenarios I mentioned
08:36 strk is it a big performance gain ?
08:36 thiago if it'sa massive whitespace-fixing commit, you know the removed lines had errors
08:36 strk it helps in the massive whitespace-cleaning (I'm doing that, just whitespace cleaning, although not massive)
08:36 thiago if you're not fixing whitespaces, you don't care if there were errors. Only that there aren't any new
08:36 strk I know it had errors, but I dunno if my cleaning was correct or not
08:36 strk example: i might have removed just one of
08:36 strk of multiple whitespaces
08:36 thiago if you want to review a whitespace-fixing commit, do a git diff -w. You should see no changes.
08:36 strk or I could have converted it to a tab, or whatever
08:37 strk I don't see how respecting a specific configuration request is more useful
08:37 strk how *non* respecting it (diff.color.whitespace)
08:38 hurikhan|Work joined #git
08:38 JeroenT joined #git
08:39 JeroenT_ joined #git
08:39 thiago my point is that it is not a bug
08:39 thiago it's intentional
08:40 thiago now, manybe we can have a color.diff.removedwhitespace so those can be shown in your case
08:41 strk if the downside of always showing it for removed whitespace is so high, sure
08:41 mingrammer joined #git
08:43 xshuiniu joined #git
08:43 osse strk: if you had removed just one of the whitespacs then the rest would be highlighted
08:43 rffleaie joined #git
08:44 strk osse: good point, I hadn't thought about it
08:45 harish joined #git
08:45 strk still I don't understand the cost of being consistent and applying diff.color.whitespace to both sides of the diff
08:46 mingramm_ joined #git
08:46 rffleaie Hi , I am in a Trap. I have converted a svn project in 2 git repo. First project has revision from the first to N and second repo have the revision from N+1 to head. I don't know how do it because I can't lose the history
08:47 osse strk: there is no cost
08:47 grawity rffleaie: how to do what exactly?
08:48 osse rffleaie: I have seen you ask this question many times, but you never told me what as the problem with my suggestion when you ask the first time
08:49 m0viefreak joined #git
08:49 strk osse: so you also dont see the need for a "color.diff.removedwhitespace" ?
08:49 osse strk: I think it would be nice to have that option
08:50 osse strk: i'm just saying it's a choice they made. not that they skipped it because it had a cost
08:51 rffleaie I have tried many strategies. What was your suggest? I have write here all the errors
08:51 Futurial joined #git
08:52 osse rffleaie: fetch the second repo into the first, then use git replace to say that the N+1 commit has a parent and that parent is N
08:52 joko joined #git
08:53 rffleaie When I push the result inside a new repo, I found only the last N commit. The commit of the second project.
08:53 joko Hello, I was thinking of automating a rebase process: I have forked a repository and I would like to update my branch automatically whenever the master branch of the official repo gets updated. Are you aware of any tutorial on that?
08:54 danslo how would you handle conflicts?
08:54 strk joko: "automatically" ? you'd need support from the server side
08:55 rffleaie @osse are there some tools ?
08:55 strk or you would need to check for changes periodically
08:55 joko strk: I was thinking of a Jenkins task
08:55 joko Exactly, polling would be ok
08:55 osse rffleaie: show me what you did
08:55 strk joko: pull --rebase && push || complain-there-are-conflicts ?
08:57 hahuang62 joined #git
08:58 jaequery joined #git
09:00 phanimah1sh joined #git
09:00 fuchstronaut joined #git
09:00 lindenle joined #git
09:00 rffleaie when I push the result in my repo, I have only the second repo commit
09:02 lvns joined #git
09:03 rffleaie first repo has fisrt:N second repo has N+1:HEAD, I make the fetch of the second inside the first and I have used the replace. When I push the result I find only N+1:HEAD commits
09:03 joko strk: you are right, it should work like that...
09:04 bruce_lee joined #git
09:04 bruce_lee joined #git
09:05 TomyWork joined #git
09:05 mischat_ joined #git
09:06 osse rffleaie: after replace you must use git filter-branch -- --all to make it permanent
09:06 cdown_ joined #git
09:06 Jameser joined #git
09:07 rffleaie thanks, I am going to try
09:07 yaewa joined #git
09:13 Akimb joined #git
09:13 timvisher joined #git
09:16 cyphase joined #git
09:21 EY joined #git
09:24 neurodrone_ joined #git
09:24 xall joined #git
09:25 d^sh joined #git
09:27 JeroenT joined #git
09:28 thiago joined #git
09:30 DistantStar joined #git
09:33 rffleaie joined #git
09:36 xaa joined #git
09:39 sl33k joined #git
09:39 ThomasLocke_ joined #git
09:39 ThomasLocke_ joined #git
09:43 _W_ joined #git
09:43 nettoweb joined #git
09:46 mintux joined #git
09:47 mintux there is a folder it doesn't add to stage what should i do?
09:47 thiago git add a file inside that directory
09:47 thiago does it work?
09:48 mintux see http://codepad.org/j4REQdr7
09:48 thiago access denied
09:48 thiago corporate firewall blocking codepad.org
09:49 thiago yes or no: does it work when you git add a file inside the dir?
09:49 mintux http://pastebin.com/iqPm6znr
09:49 mintux i get this error: fatal: Pathspec '../bash/Files/Script/Untitled Folder/source/user.sh' is in submodule 'bash/Files/Script/Untitled Folder/source'
09:49 mintux git add ../bash/Files/Script/Untitled\ Folder/source/user.sh
09:50 thiago that's a submodule
09:50 mintux it means there is another git inside it?
09:50 thiago right, a .git dir makes it a submodule
09:51 mintux solved
09:52 vassagus joined #git
09:52 mintux left #git
09:55 phanimahesh joined #git
09:56 chid joined #git
10:00 fuchstronaut joined #git
10:04 wibrt joined #git
10:04 prawnzy joined #git
10:07 wibrt left #git
10:07 wibrt joined #git
10:09 lvns joined #git
10:10 roelmonnens joined #git
10:11 timvisher joined #git
10:12 jozwior__ joined #git
10:13 moei joined #git
10:14 sl33k_ joined #git
10:14 stamina joined #git
10:17 timini joined #git
10:21 phanimahesh joined #git
10:22 rominronin joined #git
10:22 Ravana joined #git
10:23 ajunior joined #git
10:26 sdothum joined #git
10:29 topcat joined #git
10:30 mischat joined #git
10:31 topcat morning, I've got the branches master#323 and production#44b, but those commits are the same change, only the message is different. How do I just move production to #323 discarding #44b?
10:31 topcat both have the same previous commit #ae8
10:32 enso joined #git
10:33 EY joined #git
10:33 re1 joined #git
10:34 Snugglebash joined #git
10:34 moritz topcat: something with git branch --move --force
10:34 moritz topcat: note that from the perspective of a consumer of the master branch, that's rewriting history (!rewrite)
10:34 gitinfo topcat: 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
10:35 moritz or easier, on the master branch, git reset --hard 323
10:35 enso What's a good course of action to completely remove a file from repository history? I have a huge file that github won't let me upload.
10:36 mingrammer joined #git
10:36 topcat moritz: cool I'll get reading. in this case I'm the only one on it starting out with my own hosted gitlab so we're ok with the history. what's a history save way, rebase?
10:36 moritz enso: !bfg
10:36 gitinfo enso: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
10:36 enso gitinfo: thanks :)
10:36 gitinfo enso: you're welcome, but please note that I'm a bot. I'm not programmed to care.
10:36 topcat gitinfo: I still care.
10:36 enso gitinfo: <3
10:37 maret joined #git
10:37 * gitinfo secretly cares <3
10:37 gitinfo (to be honest I have no idea what "care" means)
10:38 tlaxkit joined #git
10:38 star_prone joined #git
10:42 lvns joined #git
10:43 fuchstronaut joined #git
10:44 colo-work joined #git
10:44 rffleaie joined #git
10:44 colo-work hi!
10:44 gitinfo colo-work: 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.
10:44 jaafar joined #git
10:44 enso !backup
10:44 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
10:45 elsevero__ joined #git
10:45 colo-work when `git commit` invokes my editor, can I somehow make it "pre-seed" the temporary file it creates and opens with a text of my own choice (ideally, the output of another command) as the commit message, that I can then edit afterwards?
10:46 colo-work (something like "-m <message>" on steroids, I suppose)
10:46 osse colo-work: several ways. you can give commit a file then edit it
10:46 JeroenT joined #git
10:47 osse git commit --file /tmp/lol --edit
10:48 colo-work osse, interesting; thanks! :)
10:48 _rnsanchez_ joined #git
10:48 bvtton joined #git
10:49 fedepad joined #git
10:49 osse colo-work:  another command | git commit -F - -e
10:49 colo-work yup, it's what I got now :) still need to test if it actually does what I want
10:50 osse colo-work: what do you want ?
10:51 wogi joined #git
10:51 wogi joined #git
10:52 osse colo-work: there is also a prepare-commit-msg hook
10:52 osse probably the better way to do whatever you want to do, in case you want this for a plain 'git commit' and not having to make aliases/wrappers
10:53 timini joined #git
10:53 flaviodesousa joined #git
10:54 PioneerAxon joined #git
10:54 colo-work osse, everything being done from a pre-existing wrapper for that particular purpose anyway
10:55 colo-work I just tested your suggestion, and like it very much. thanks again, you just solved the problem for me 8)
10:55 cdown_ joined #git
10:58 Phylock joined #git
11:00 courrier joined #git
11:00 timvisher joined #git
11:01 mkopriva joined #git
11:07 dodobrain joined #git
11:09 wrouesnel1 joined #git
11:09 nilg joined #git
11:09 phanimahesh joined #git
11:10 ferr joined #git
11:10 Kitty- joined #git
11:12 trondth joined #git
11:16 rjack2_ joined #git
11:18 jozwior__ joined #git
11:21 a3pq51 joined #git
11:22 cdown_ joined #git
11:26 rcz left #git
11:27 rbern joined #git
11:29 ojdo joined #git
11:30 PCatinean joined #git
11:33 rominronin joined #git
11:34 star_prone joined #git
11:35 c0rnel joined #git
11:35 c0rnel hello
11:35 nuck joined #git
11:35 c0rnel how can i find out when was a commit merged?
11:35 c0rnel i was unable to find this info anywhere
11:37 Phylock joined #git
11:37 Sceorem joined #git
11:41 osse c0rnel: git branch --contains=a_commit
11:41 osse hmm, or maybe I don't understand the question
11:42 cdown_ joined #git
11:42 rominronin joined #git
11:43 c0rnel osse, let me check
11:43 c0rnel osse, by default git log shows when a commit was created and by who
11:43 c0rnel does not say when it was merged and by who
11:43 osse do git show <branch>
11:43 osse hmm no
11:44 osse so you want to find the merge commit itself, right?
11:46 Jameser joined #git
11:47 c0rnel i want to know when it was merged
11:47 cdown_ joined #git
11:48 Seveas so you need to find the commit that merged it
11:48 Seveas commits don't get merged, branches get merged, using merge commits
11:48 nfk joined #git
11:48 osse hmm, not realyl sure how to do that
11:49 osse i think I'd do  git log thatcommit..HEAD, scroll to the bottom and find the merge commit
11:50 brokensyntax joined #git
11:50 JeroenT joined #git
11:51 Limes_ joined #git
11:51 a_thakur joined #git
11:52 tobiasvl --merges
11:53 rominronin joined #git
11:54 lvns joined #git
11:54 johnmilton joined #git
11:55 t0n1c joined #git
11:55 johnmilton joined #git
11:55 c0rnel tobiasvl, git log --merges shows nothing
11:55 c0rnel so maybe i still don't understand anything :)
11:56 a_thakur joined #git
11:56 tobiasvl ok, so you don't use merge commits?
11:56 tobiasvl how do you merge stuff
11:56 c0rnel gerrit ....
11:56 eka joined #git
11:57 EY he'd have to be looking in the correct branch first?
11:58 tobiasvl sure, I'm assuming c0rnel is checking the history of the branch which contains the merge he desires
11:58 ribasushi joined #git
11:59 timvisher joined #git
11:59 mischat joined #git
12:00 mischat joined #git
12:00 mischat joined #git
12:00 Takiito joined #git
12:00 _Vi joined #git
12:00 Snugglebash joined #git
12:01 c0rnel indeed
12:01 sea-gull joined #git
12:02 rominronin joined #git
12:02 synthroid joined #git
12:04 dsdeiz joined #git
12:04 dsdeiz joined #git
12:05 colo-work left #git
12:05 prawnzy joined #git
12:08 phanimahesh joined #git
12:10 leeN joined #git
12:11 _dunaeth joined #git
12:11 DeltaHeavy joined #git
12:11 DeltaHeavy Will removing my piles of local references speed up git bash? I'm using git-for-windows SDK
12:12 mingrammer joined #git
12:12 ^7heo when git is slow, in my experience, it's because the index is too big
12:12 ^7heo i.e. containing files too big.
12:13 DeltaHeavy ^7heo That's a much more difficult problem to fix =/
12:13 DeltaHeavy Removing local references won't do mcuh of anything?
12:13 brokensyntax joined #git
12:15 Jameser joined #git
12:17 wagle joined #git
12:17 bruce_lee joined #git
12:17 bruce_lee joined #git
12:19 mizu_no_oto joined #git
12:20 ^7heo DeltaHeavy: by local references you mean .git/refs/?
12:20 sigjuice joined #git
12:21 grawity if your tools enumerate all refs frequently, then yeah, that might help
12:21 ollehar joined #git
12:21 jost joined #git
12:21 ollehar using `git checkout HEAD^`, will it stay on the same branch? master, in this case.]
12:21 grawity or at least `git pack-refs --all --prune`, given how Windows doesn't like lots of tiny files much
12:22 grawity as for the index, there's `git update-index --index-version 4` but I'm not sure how well non-`git` tools support it
12:22 grawity ollehar: no
12:22 ^7heo grawity: I am assuming the problem with the "slowness" is "git push" and "git pull"
12:22 DeltaHeavy ^7heo Local references of branches.
12:22 ^7heo but maybe I'm wrong.
12:22 grawity ollehar: if you check out anything that's not a branch head, you're not on any branch anymore
12:22 grawity ollehar: (see "detached head")
12:22 wibrt left #git
12:22 ^7heo DeltaHeavy: if you're having a slow git when you just use your IDE or whatever tool you use on it, then yes it might help.
12:22 mattcen joined #git
12:22 tobiasvl ollehar: !detached_head
12:22 gitinfo ollehar: [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
12:22 ^7heo DeltaHeavy: but I wouldn't do that.
12:23 rns joined #git
12:23 ollehar thanks
12:23 DeltaHeavy ^7heo I just use it from msys on Windows
12:23 ^7heo ah right
12:24 ^7heo but so you're using the git binary?
12:24 ^7heo nothing else?
12:24 DeltaHeavy ^7heo git-for-windows SDK
12:24 DeltaHeavy Cause I wanted to use pacman and all that fancy stuff. I wonder if that's slowing it down but my co-workers who just use normal git-bash have this issue too.
12:24 DeltaHeavy I'm using zsh
12:24 ollehar grawity: so is there a way I can checkout a release tag, and then go to the previous commit in that branch?
12:24 tobiasvl ollehar: you can check it out?
12:25 tobiasvl being on a detached HEAD is completely possible
12:25 ollehar tobiasvl: sure
12:25 tobiasvl as long as you're aware of what it means
12:25 grawity ollehar: branch as in a history line, not actual branch? yeah, sure
12:25 crameth joined #git
12:25 grawity ollehar: HEAD^ will do that
12:25 grawity ollehar: or even just tag^
12:25 ^7heo DeltaHeavy: what is slow exactly?
12:25 ollehar grawity: but if I checkout HEAD^ multiple times, it won't stay on master branch?
12:26 grawity I repeat: if you check out anything that's not a branch name, you're not on *any* branch anymore.
12:26 tobiasvl ollehar: do you know what a branch is?
12:26 osse ollehar: you are only actually on a branch when you're on the tip of that branch. it's a technical thing
12:26 DeltaHeavy ^7heo The shell just hangs a lot of the time. It's inconsistent. It'll be fast for a bit then just constantly hang for a good 5-10mins but still be semi-useable.
12:26 osse git checkout tag^ will work just fine
12:26 grawity there are two meanings of 'branch' around this place
12:26 DeltaHeavy Just like...wait...wait....wait...(20 seconds later prompt shows up)
12:26 ollehar ok
12:26 grawity "official" branches, as in `git branch`, refs/heads/, etc.
12:26 nilg joined #git
12:26 grawity and the generic word for history/DAG paths/forks/etc.
12:27 ollehar ah ok
12:27 ollehar so, I want to follow the history of a branch, then.
12:27 grawity so anyway, if you check out HEAD^ or tag^ or any arbitrary commit, you're not on "master" anymore
12:27 grawity yes
12:28 tobiasvl I thought this channel was pretty good at talking about actual git branches when we say "branches"
12:28 grawity if master points at commit X, and you check out X^, that's not master; that's where master had once been
12:29 osse tobiasvl: i dont eve know what you mean is "good" and "bad" :p
12:30 manuel joined #git
12:30 tobiasvl osse: not being ambiguous = good ;) using correct terminology in a channel like this, so newcomers are a) not confused and b) learn the correct terminology
12:30 tobiasvl imo of course
12:31 osse i think we're pretty good.
12:31 tobiasvl same
12:31 mekeor joined #git
12:32 grawity well, branches ended up called that way because that *is* a correct generic term for history branches/forks as well...
12:36 bernardio joined #git
12:37 zacts joined #git
12:38 buffal0 joined #git
12:42 manuel left #git
12:44 star_prone joined #git
12:44 _Vi joined #git
12:44 manuel joined #git
12:46 zivester joined #git
12:47 manuel joined #git
12:47 rns joined #git
12:49 citizen-stig joined #git
12:50 bongjovi joined #git
12:51 acetakwas joined #git
12:52 fmcgeough joined #git
12:52 canuk joined #git
12:53 rffleiae joined #git
12:53 mizu_no_oto joined #git
12:55 dan2k3k4 joined #git
12:55 faux___ joined #git
12:56 jeffreylevesque joined #git
12:56 leeN joined #git
12:57 keruspe left #git
12:59 hahuang62 joined #git
13:00 durham_ joined #git
13:01 troulouliou_div2 joined #git
13:01 mischat joined #git
13:02 mizu_no_oto joined #git
13:02 Vinnie_win joined #git
13:03 lindenle joined #git
13:05 achadwick joined #git
13:06 modocache joined #git
13:06 rgrinberg joined #git
13:08 re1 joined #git
13:09 rjack2 joined #git
13:09 ElectronicRU joined #git
13:10 Darren_ joined #git
13:10 rgrinberg joined #git
13:10 ElectronicRU hey, how do I get the refnames that are pointing at some object? (e.g. as git log --decorate does)
13:11 ollehar left #git
13:11 boblehest joined #git
13:11 ExoUNX joined #git
13:11 permalac joined #git
13:18 boblehest left #git
13:23 overlord_tm joined #git
13:25 sangy joined #git
13:25 star_prone joined #git
13:25 isysd joined #git
13:27 jimi_ joined #git
13:27 troulouliou_div2 joined #git
13:28 fuchstronaut joined #git
13:28 fuchstronaut joined #git
13:29 GodGinrai joined #git
13:32 Snugglebash joined #git
13:33 durham joined #git
13:35 strk left #git
13:37 sagerdearia joined #git
13:37 grawity `git name-rev` and `git describe` are close
13:38 grift joined #git
13:38 JeroenT joined #git
13:38 thiago_ joined #git
13:39 durham joined #git
13:39 lvns_ joined #git
13:42 anonymuse joined #git
13:44 ash_workz joined #git
13:44 Snugglebash joined #git
13:44 lvns joined #git
13:45 rnsanchez_ joined #git
13:46 patarr joined #git
13:47 Rodya_ joined #git
13:48 Mindfart joined #git
13:49 delboy1978uk joined #git
13:49 delboy1978uk folder, how do i ignore everything except the gitignore in it?
13:50 delboy1978uk (so the empty folder goes into the repo)
13:50 xcesariox joined #git
13:51 osse *
13:51 osse !.gitignore
13:51 osse or just put * in it and then git add -f dir/.gitignore
13:51 delboy1978uk cheers once again osse
13:52 anoe joined #git
13:52 ams__ joined #git
13:53 oxsyn joined #git
13:53 barteks2x joined #git
13:53 vassagus joined #git
13:53 barteks2x I'm trying to fetch from remote and git shows "permission denied" error: fatal: Unable to create '<project location>/.git/refs/remotes/<r​emoteName>/<branchName>.lock': Permission denied, what is wrong?
13:54 NeverDie joined #git
13:54 delboy1978uk permissions error
13:54 barteks2x but what does it mean?
13:55 delboy1978uk it means you arent the owner, or in the group, or that everyone else doesnt have the correct permissions
13:55 barteks2x yesterday I ccidentally ran a few git commands as root, but I then ran recursive chown on the repository. That should fix it
13:55 troulouliou_div2 joined #git
13:55 delboy1978uk ok you will need to chown and chgrp -r back to the correct people
13:55 delboy1978uk ah
13:55 aavrug joined #git
13:55 anoe Hello, trying "git subtree add --prefix=file remote_address branch", I get: "error: pathspec 'file' did not match any file(s) known to git." If the file exists already, then I get an error since exists already... git --version : 2.9.3 Should I upgrade ?
13:56 barteks2x I was using chown the wrong way...
13:56 barteks2x I used * instead of .
13:56 barteks2x It didn't show any error
13:56 synthroid joined #git
13:57 delboy1978uk just ls -la the folder and see what still needs sorted
13:58 rafalcpp joined #git
14:02 ToBeCloud joined #git
14:02 mischat joined #git
14:04 rffleaie joined #git
14:04 JeroenT_ joined #git
14:04 rffleaie how can I config the parent of one git commit
14:04 rffleaie ?
14:06 prawnzy joined #git
14:06 cdg joined #git
14:07 cdg joined #git
14:07 rpg joined #git
14:07 AaronMT joined #git
14:09 vdv joined #git
14:09 Darcidride joined #git
14:11 delboy1978uk left #git
14:12 hashpuppy joined #git
14:14 e14 joined #git
14:15 Snugglebash joined #git
14:17 cdown_ joined #git
14:19 phaleth joined #git
14:19 al-damiri joined #git
14:21 ResidentBiscuit joined #git
14:25 rffleaie joined #git
14:26 altendky i have a repo that i am trying to split so as to have common library code separated. presently i have separate applications on branches and carefully merge 'library' code back and forth.  *yuck*  i have merged master into my branch but now want to merge the branch back into master but reject some of the 'application' files.  even with --no-commit or --edit i
14:26 altendky still just end up with master on the head of the branch.  i think i understand why but can i force it to do what i want for this last messy merge before separating library code?
14:26 sanketdg joined #git
14:26 ShekharReddy joined #git
14:27 ElectronicRU altendky, --no-ff
14:27 altendky ElectronicRU: thanks, i don't even see that in the git-merge doc but i'll give it a shot.
14:27 ElectronicRU since one of the commits is the ancestor of the other, git fast-forwards the history and doesn't even try to resolve conflicts by default
14:27 IrishPrime joined #git
14:27 Dougie187 joined #git
14:28 ElectronicRU altendky, https://git-scm.com/docs/git-merge it is definitely here, weird
14:28 thebope joined #git
14:28 oggggggg joined #git
14:28 altendky ElectronicRU: a search does pop it up.  i was only looking at the summary :[  *gives himself a good smack on the head*
14:29 raijin joined #git
14:29 NimeshNeema joined #git
14:30 mischat_ joined #git
14:30 altendky ElectronicRU: just as i needed.  thank you and sorry for having been so lazy when looking at the docs.
14:32 oggggggggggggg joined #git
14:33 oggggggggggggg I'm having trouble to change the editor in git
14:34 oggggggggggggg I've tried mostly everything: EDITOR, VISUAL, GIT_EDITOR are set to my editor
14:34 canton7 oggggggggggggg, and what happens? it still launches vim?
14:35 oggggggggggggg git config --get-all core.editor gives the right editor
14:35 canton7 oggggggggggggg, what's the output of 'git config core.editor'?
14:35 oggggggggggggg it gives kwrite
14:35 oggggggggggggg I even added alias vim=kwrite
14:35 oggggggggggggg but git sill opens vim
14:35 canton7 ok, so git first looks at GIT_EDITOR, then core.editor, then VISUAL, then EDITOR
14:35 canton7 so if GIT_EDITOR is set, that should be taking precedence
14:36 tjone270_ joined #git
14:36 canton7 just !repro 'echo $GIT_EDITOR'?
14:36 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
14:36 Khisanth joined #git
14:36 blueyed joined #git
14:37 oggggggggggggg uh this gives an empty result
14:37 axisys joined #git
14:37 Snugglebash joined #git
14:37 canton7 ok, so GIT_EDITOR isn't set
14:37 canton7 that's fine, it means it should be falling back to core.editor
14:37 canton7 what's the output of 'which kwrite'?
14:38 mustmodify joined #git
14:38 oggggggggggggg /usr/bin/kwrite
14:38 axisys left #git
14:38 canton7 set core.editor to '/usr/bin/kwrite', just in case it needs the full path?
14:39 fuchstronaut joined #git
14:39 fuchstronaut joined #git
14:39 oggggggggggggg I tried but it sill open vim
14:39 mustmodify left #git
14:40 canton7 can I just see a !repro of inspecting the value of core.editor, then doing an operation which launches vim?
14:40 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
14:40 oggggggggggggg ok
14:40 Seveas git config --list --show-origin
14:40 canton7 (just being extra-safe - you said GIT_EDITOR was set and it wasn't, so I don't want to take chances)
14:40 prillian5 joined #git
14:41 Seveas git config --list --show-origin; env | grep GIT
14:42 oggggggggggggg https://gist.github.com/anonymous​/4e66240ad90f5ecad789a84275a4e739
14:42 oggggggggggggg Seveas: I get 'error: unknown option `show-origin' '
14:42 kulelu88 joined #git
14:42 oggggggggggggg canton7: sorry I'm kinda slow with these stuff
14:43 eivarv joined #git
14:43 Seveas oggggggggggggg: git stash show doesn't open the editor but the pager
14:43 canton7 (which is less, by default)
14:43 oggggggggggggg what's the pager?
14:43 Seveas oggggggggggggg: git config --list; env | grep GIT
14:43 canton7 it lets you view pages and pages of text without it scrolling past you in one huge go
14:43 canton7 so you can use keys to scroll around, pageup/pagedown, etc
14:43 canton7 'q' to quit
14:44 oggggggggggggg ahhhhh
14:44 oggggggggggggg I was persuaded this was vim because of the :q
14:44 oggggggggggggg I guess I'm dumb
14:44 oggggggggggggg thanks!
14:45 oggggggggggggg but well isn't there a way to get the result of git stash show -p in kwrite?
14:45 Masber_080 joined #git
14:45 canton7 you can set the page to kwrite as well, I guess?
14:45 canton7 *pager
14:45 Seveas no, the pager needs to take things on stdin
14:46 Seveas EDITOR=kwrite PAGER=vipe git stash show -p
14:46 canton7 depends whether kwrite can open stuff from stdin
14:46 Seveas 'vipe' is part of moreutils on ubuntu/debian
14:47 oggggggggggggg yeah it doesn't work with kwrite as the pager
14:47 oggggggggggggg I changed it to vipe, that's kinda better
14:48 oggggggggggggg but still isn't kwrite xD
14:48 acetakwas joined #git
14:48 oggggggggggggg anyway, you helped me a lot :)
14:49 Seveas VISUAL=kwrite GIT_PAGER=vipe git -c color.ui=false show
14:49 oggggggggggggg so thanks Seveas  and canton7
14:49 Seveas worked for me (though with gedit, not kwrite)
14:49 aarobc joined #git
14:50 oggggggggggggg wait what command did you actually put in the command line?
14:50 re1 joined #git
14:50 Seveas VISUAL=gedit GIT_PAGER=vipe git -c color.ui=false show
14:50 oggggggggggggg just like this in one line?
14:50 canton7 (that sets the VISUAL and GIT_PAGER env vars for that one command only)
14:50 Seveas yeah
14:51 oggggggggggggg but where is the stash in this?
14:51 anonymuse joined #git
14:51 oggggggggggggg I'm confused ^^
14:51 Seveas I don't use stash, so did it with another command that uses the pager :)
14:51 canton7 he's running 'git show', which is another command which outputs a lot of text
14:51 Seveas this should work for git stash show -p: VISUAL=kwrite GIT_PAGER=vipe git -c color.ui=false stash show -p
14:52 oggggggggggggg I get error: cannot run vipe: No such file or directory
14:52 grawity vipe is in moreutils
14:52 Guest22_ joined #git
14:52 oggggggggggggg but I don't get this error when using the stash
14:52 grawity though it's not exactly a nice pager
14:52 oggggggggggggg so I don't get it ^^
14:52 canton7 grawity, read the backlog, please
14:52 Vinnie_win joined #git
14:52 linelevel joined #git
14:53 grawity what about the backlog
14:53 Seveas it's back
14:53 Seveas and lo
14:53 Seveas g
14:54 oggggggggggggg Seveas: never mind I installed it and it works
14:54 oggggggggggggg thanks 3
14:54 Jameser_ joined #git
14:54 linelevel Hi, is it possible to change which commit a remote ref points to without having a local branch that tracks it? I want to do the equivalent of `git checkout origin/master; git reset abcd123; git push` -- but of course that doesn't work since origin/master is a remote branch.
14:54 oggggggggggggg Seveas and canton7 I can't thank you enough
14:54 Seveas linelevel: do you have the commit locally that you want to point it to?
14:55 linelevel Seveas: Yes.
14:55 Seveas linelevel: git push origin sha1-of-commit:name-of-branch
14:55 linelevel Seveas: I'd like to do this with a single command, if possible, and without affecting the state of my working tree (which is not in a clean state and is tracking a completely unrelated branch).
14:55 Seveas linelevel: it is a single command that doesn't touch anything locally
14:55 ArSn joined #git
14:56 linelevel Seveas: Yup, excellent, I typed that before reading your message. Trying it now.
14:56 linelevel I'll have to add -f I assume.
14:56 Seveas push -f is only needed if it's not a fast-forward (and add isn't needed at all :)
14:56 Seveas ah, misparsed your question
14:56 linelevel Seveas: That worked perfectly (with -f)
14:56 Seveas parsed it as: I'll have to "add -f" I assume
14:56 danimal2 joined #git
14:57 elisa87 joined #git
14:57 Seveas linelevel: excellent
14:57 sentriz joined #git
14:57 fees joined #git
14:58 linelevel Seveas: The full story is that I rebased a branch locally and wanted to push an ancestor commit of my new HEAD to the server without affecting my working tree. I'll keep this one in mind. Thanks!
14:58 axl_ joined #git
14:58 dave0x6d joined #git
14:58 miklcct joined #git
14:58 Seveas linelevel: you can you any commitish on the left side of the :
14:58 Seveas e.g. git push origin HEAD^3:master
14:59 linelevel Seveas: Great :)
15:00 Rodya_ joined #git
15:01 zivester joined #git
15:03 dliekw joined #git
15:04 manuels joined #git
15:06 InfoTest joined #git
15:06 littleforest joined #git
15:06 manuels joined #git
15:06 sea-gull oggggggggggggg: check your `editor` -- `which editor` or `editor --version`, it can be set-up in alternatives as well
15:07 slayerjain joined #git
15:07 psprint Best way to check a revision exists?
15:08 Seveas git rev-parse
15:08 grawity git cat-file -e $hash
15:08 roelmonn_ joined #git
15:09 grawity or, git cat-file -e ${hash}^{commit}
15:09 Seveas $ git rev-parse --verify 5c371fd2ddd659f272f13efc7198791efee6f379^{object}
15:09 Seveas fatal: Needed a single revision
15:09 Seveas the ^{object} is needed, otherwise it only checks whether it's something that could be a valid name
15:09 zeroed joined #git
15:09 zeroed joined #git
15:10 tyreld_ joined #git
15:10 e14 joined #git
15:11 luke_penn joined #git
15:11 psprint ah, so ^{commit}
15:11 Alienpruts joined #git
15:12 Seveas psprint: in your case probably better, yes
15:12 faux___ joined #git
15:13 vassagus joined #git
15:13 synthroid joined #git
15:14 axl_ joined #git
15:14 dreiss joined #git
15:14 _sfiguser joined #git
15:14 _sfiguser hello everyone... can somebody tell me how do i set up a git project in lan ?
15:15 raijin joined #git
15:15 _sfiguser i do not want to use github
15:15 _sfiguser just local LAN
15:15 _sfiguser which is the smartest way of dealing with this ?
15:15 grawity git-daemon; gitolite; gogs; gitlab
15:15 canton7 or plain and simple ssh
15:15 Electrometro joined #git
15:15 grawity yeah, actually, just ssh
15:16 ElectronicRU well it depends on what he needs
15:16 ElectronicRU maybe some integration (github-esque) is desired
15:16 canton7 !host_gui
15:16 gitinfo There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.p​hp/Interfaces,_frontends,_and_tools
15:16 jberkus joined #git
15:16 canton7 although plain ssh is simpler than any of those ^
15:17 jberkus so, the situation: I'm on master.  I've made a bunch of changes which are neither staged nor committed.  I'd like those changes to be on a new branch instead.  I know that there's a way to do this, but I can't remember what it is.
15:17 canton7 jberkus, git checkout -b newbranch
15:17 canton7 then add/commit
15:17 canton7 !float
15:17 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
15:18 EvilPeng1 joined #git
15:18 seaders joined #git
15:19 axl__ joined #git
15:19 jberkus ok, looks good, thanks
15:20 seaders hey guys, we’ve this big fat repo, with kinda big fat repos at the root of the initial repo, as gitsubmodules
15:20 e14 joined #git
15:21 seaders the submodules are for platform specific stuff, android, ios, windows and swrve
15:21 seaders what we wanna do is break out of that big fat single repo,
15:21 seaders to multiple not as fat, nor complicated repos
15:21 seaders running a git filter-branch goes half the way for what we want to do,
15:22 seaders but I also would like a “reverse” filter-branch
15:22 seaders where the submodule get added back to the main repo, with its history
15:22 seaders I ran git subtree add, with a prefix, but it only took 1 branch (I’d like to take all),
15:23 seaders and the links to the changes of the files were all wrong
15:23 whitby joined #git
15:24 lifted joined #git
15:27 xaa joined #git
15:27 _sfiguser is there something similar to github but usable locally  ?
15:27 dviola joined #git
15:28 osse _sfiguser: gitlab
15:28 axl_ joined #git
15:29 Shakeel_ joined #git
15:30 faux___ joined #git
15:32 mischat joined #git
15:33 Nysar joined #git
15:33 patarr joined #git
15:34 matsaman joined #git
15:36 strk joined #git
15:36 djb-irc joined #git
15:37 Darcidride_ joined #git
15:38 NeXTSUN joined #git
15:38 rffleaie joined #git
15:41 gos joined #git
15:42 bdeferme joined #git
15:43 e14 joined #git
15:43 mmlb joined #git
15:43 mmlb94 joined #git
15:44 einnjo joined #git
15:44 cdown_ joined #git
15:45 Nysar joined #git
15:45 prillian5 I have add a repository via "git remote add myNew git@bimbom.com....."
15:46 prillian5 How do I get now the data from branch "xyz" from this repo?
15:46 _sfiguser why  in a tutorial i saw one created a new account useradd -m -d /lhome/git -u 1005 git like this  ?
15:46 canton7 prillian5, 'git fetch myNew'
15:46 _sfiguser why directory is "/lhome" ? and not simply /home ?
15:46 canton7 prillian5, that'll fetch it as the remote-tracking branch 'myNew/xyz'
15:47 canton7 _sfiguser, seems like a low-quality tutorial? /lhome has to be a typo
15:47 prillian5 ah, ok, I'll so if I do git fetch myNew/master, i got the masterbrach of this repo?
15:47 canton7 prillian5, no, I said 'git fetch myNew'
15:47 Zarthus -u 1005 is also suspicious
15:47 canton7 that fetches all remote-tracking branches from the repo
15:47 canton7 if you want to fetch just one branch: 'git fetch myNew master' - although that will only do what you expect in newer versions of git
15:48 prillian5 I have done this, but no files appear in the directory where I made this.
15:48 canton7 prillian5, yep, you haven't checked the branch out yet
15:48 canton7 'git checkout -b xyz myNew/xyz'
15:48 canton7 that creates a new branch called 'xyz', based on myNew/xyz, and checks it out
15:48 _sfiguser canton7, can you suggest a good tutorial ?
15:48 canton7 _sfiguser, not sure what you're trying to learn?
15:48 canton7 if you're just learning git, !book
15:48 gitinfo 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
15:49 _sfiguser canton7, just sharing a repo through ssh
15:49 _sfiguser to collaborate in lan
15:49 canton7 git hook has some chapters on that
15:49 canton7 *book
15:51 prillian5 ok, great. Thank you canton7
15:51 tang^ joined #git
15:51 lindenle joined #git
15:53 croberts left #git
15:53 hahuang62 joined #git
15:55 ahmed_elgabri joined #git
15:55 xall joined #git
15:56 cdown_ joined #git
15:56 djb-irc joined #git
16:00 nydel07 joined #git
16:00 Rodya_ joined #git
16:01 Hobbyboy joined #git
16:02 lss8 joined #git
16:02 lss8 joined #git
16:03 javlens_ joined #git
16:04 zivester joined #git
16:05 LeBlaaanc joined #git
16:06 suy joined #git
16:06 VampiricPadraig joined #git
16:06 VampiricPadraig joined #git
16:06 strk is it possible to make --ws-error-highlight=all the default for relevant git commands ? (diff,show, log -u)
16:06 cdg joined #git
16:07 WayToDoor joined #git
16:08 Murii joined #git
16:08 rorro joined #git
16:09 e14 joined #git
16:10 romerocesar joined #git
16:11 synthroid joined #git
16:12 Lipp joined #git
16:12 gos left #git
16:13 xcesariox joined #git
16:13 pyler joined #git
16:14 oskarkv joined #git
16:14 djb-irc joined #git
16:15 Endarked joined #git
16:17 prillian5 Is there a way to point a branch only to a subfolder of the master-branch?
16:17 Goplat joined #git
16:17 kpease joined #git
16:18 nitric joined #git
16:18 osse no
16:18 osse but you can make a tag do that
16:19 nedbat osse: you can? how?
16:19 pigeon joined #git
16:19 osse nedbat: git tag blah treehash
16:19 nedbat osse: and what happens when you checkout the tag?
16:19 prillian5 I have a bunch of files in my project, where the most are "make scripts". But there are also files for users only. Those subdirectory should be fetchable as a seperate brach, but this brach should allways be synced from a folder of the master
16:19 pyler git tricks?
16:19 osse nedbat: fatal: Cannot switch branch to a non-commit 'blah'
16:20 prillian5 osse: I don't know if tags are the right thing. I don't need a snapshot at a given time.
16:20 nedbat osse: then what good is it?
16:20 osse nedbat: no clue
16:20 osse you can retrieve stuff from it with checkout
16:21 romerocesar_ joined #git
16:21 nedbat prillian5: sounds like you want a different way to distribute your software.
16:21 prillian5 In short, I have a private project which creates docker-container and some scripts to run them.
16:22 prillian5 And for each new php-Project, I only need to get this "run-scripts" directory to add it to the new php-Project
16:22 prillian5 (without the bunch of "Docker-Make-Files")
16:22 prillian5 you see what I mean?
16:23 osse there are ways of "getting" a directory without having a branch pointed there
16:23 osse won't the new projects be new repos?
16:24 prillian5 osse: this would be great. How can I fetch only a given Directory of a brach? The new php-project will have their own git-repo, but won't commit the fetched "run-scripts" folder
16:24 blackwind_123 joined #git
16:24 osse you can copy it for example :P
16:25 gusnan joined #git
16:25 prillian5 osse: how?
16:25 osse there is no way to make it automatically update or stuff like that, short of making it a subtree or submodule
16:25 osse prillian5: cp, rsync, a file manager
16:25 fedepad joined #git
16:25 prillian5 ahhh, no
16:25 osse I did literally mean copy
16:25 prillian5 thats the way I do it now :)
16:26 osse git archive may make it easier
16:26 prillian5 But I will share the script to other team-members, and they should have allways the newest version of it
16:26 osse then the only way I see forward is making it a separate project
16:27 prillian5 I thougt to make a branch in my project... in this branch I remove all unneeded files.
16:27 prillian5 Then the teammemberes could only fetch this branch... would this work?
16:27 star_prone joined #git
16:27 osse fetch the branch into their repo? the repo which is another one?
16:28 prillian5 mhh... but your right... I've a look to seperate it. This will simplyfy things a lot
16:28 prillian5 :)
16:29 osse and how would you update this branch in the original repo?
16:29 osse it may work but I suspect it'll be a mess
16:30 prillian5 It will become a mess ... I choose the KISS way and seperate.
16:30 prillian5 Thanks for the hints
16:30 prillian5 I'll give submodules a try :)
16:31 osse prillian5: depending on how the original repo is hosted it might be straight-forward to have a script to redownload the directory from time to time
16:31 shymega joined #git
16:31 ash_workz joined #git
16:31 jaequery joined #git
16:32 prillian5 mhh, you ever heard about sparse checkout? A friend posted me a link before 10sec.
16:32 prillian5 http://stackoverflow.com/questions/600​079/how-do-i-clone-a-subdirectory-only​-of-a-git-repository/13738951#13738951
16:32 madewokherd joined #git
16:32 grawity sparse checkout – not sparse clone
16:33 acetakwas joined #git
16:33 durham_ joined #git
16:34 prillian5 grawity: ?? Don't understand. What do you mean?
16:35 stamina joined #git
16:36 sunri5e joined #git
16:36 jknetl joined #git
16:37 shinnya joined #git
16:37 raijin joined #git
16:37 stomplee joined #git
16:38 rgrinberg joined #git
16:39 ochorocho__ joined #git
16:39 ansimation joined #git
16:40 cdg joined #git
16:40 Endarked joined #git
16:42 LucaTM joined #git
16:43 berndl joined #git
16:43 lordjancso joined #git
16:44 dan2k3k4 joined #git
16:45 berndl I have some files that I've --skip-worktree'ed. Is there a way I can rebase without having to --no-skip-worktree them and stashing the changes first?
16:46 sargas joined #git
16:46 _sfiguser joined #git
16:47 nikivi joined #git
16:49 j416 berndl: not an answer to your question; but what is your use-case for using --skip-worktree? In my experience it has never been a good thing
16:49 dreiss joined #git
16:49 berndl The usual: I have config files with custom changes that I don't want to see in "git status".
16:49 _sfiguser i've set up a git server... how can i say that any user can clone without asking password ?
16:50 j416 berndl: then have a config-example file that you keep updated with proper but fake config, then copy that to something that your program will actually read, and have that ignored.
16:51 nedbat berndl: don't you put them in .gitignore?
16:51 j416 berndl: but, perhaps you knew this already.
16:51 concerti joined #git
16:51 j416 _sfiguser: what kind of "git server"?
16:52 j416 _sfiguser: you are using ssh, http(s), or the git protocol
16:52 Darren_ joined #git
16:52 _sfiguser j416, this one ...https://git-scm.com/book/en/v2/Git-​on-the-Server-Setting-Up-the-Server
16:52 _sfiguser j416, git protocol
16:52 _sfiguser i think
16:52 j416 _sfiguser: that's ssh
16:52 _sfiguser but i do git@myip
16:52 _sfiguser ops sorry
16:52 _sfiguser no no
16:52 _sfiguser that's the username
16:52 _sfiguser yeah it's ssh
16:53 j416 either set up users on your system (normal unixy way)
16:53 j416 or use something like !gitolite
16:53 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/
16:53 sunri5e joined #git
16:53 berndl j416: It's not so simple. I'm working on a legacy codebase and the changes are all over the place. I also work on multiple branches and each one has its own config settings.
16:53 berndl nedbat: the files are tracked, so putting them in .gitignore does nothing.
16:53 j416 _sfiguser: gitolite is usually less of a pain if you want to manage different users, and it also gives you more control over permissions
16:54 j416 berndl: I see.
16:54 j416 berndl: I'd refactor that if I had the power to.
16:54 j416 berndl: as for your original question; I don't know I'm afraid. Sorry.
16:54 berndl I would refactor it as well, but it's not my decision to make unfortunately.
16:55 j416 :/
16:55 berndl I bugs we went upper-management won't let you refactor at will.
16:55 j416 switch company :P
16:55 berndl Then again, if I start refactoring, I wouldn't finish for months...
16:55 FroMaster joined #git
16:55 KevinMGranger Isn't there a ! alias for this exact use case (although it more or less says "please don't")
16:55 j416 !config
16:55 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
16:56 Lipp joined #git
16:56 Lipp joined #git
16:56 KevinMGranger That one's good too, but I was thinking of the "I don't want to track changes to this file, but I still want it in the repo"
16:56 Kitty- joined #git
16:57 j416 don't know
16:57 j416 ¯\_(ツ)_/¯
16:57 j416 :)
16:57 j416 https://jk.gs/git/bot/faq.php
16:57 j416 https://jk.gs/git/bot/trigger.php
16:59 dsantiago joined #git
16:59 littleforest joined #git
17:00 berndl How do I see the --skip-worktree files with git ls-files again?
17:01 nevogd joined #git
17:02 mischat_ joined #git
17:03 kerrick joined #git
17:03 DeltaHeavy joined #git
17:05 ElectronicRU j416, huh, reading ugfwiini and apparently using git for config files is somehow defeating its purpose ??
17:05 SteffanW joined #git
17:05 j416 ElectronicRU: not sure what the question is
17:06 sargas joined #git
17:07 sargas joined #git
17:07 ElectronicRU j416, suppose I shouldn't address it to you specifically, but why it is considered so, is the question.
17:08 j416 ElectronicRU: configuration exists for a reason; namely that you want to be able to change things without changing your project, and that you do not want to put sensitive things like api keys and passwords in your code
17:08 j416 ElectronicRU: committing a configuration file defeats the purpose
17:09 j416 ElectronicRU: also, you likely want different configuration for different purposes (stage and production, for instance), and if you commit one config, you'll get some headache trying to juggle back and forth
17:09 ElectronicRU j416, I agree that configs and code should be separate (as I've had the pain to work on projects where this wasn't and still isn't true), but using a separate repository to version config files seems quite sensible to me.
17:10 j416 sure, you can do that
17:10 j416 for heroku, there's environment variables.
17:10 j416 which turns out to be quite sane for many cases
17:10 fuchstronaut joined #git
17:10 fuchstronaut joined #git
17:11 publio joined #git
17:14 cdg joined #git
17:14 a_thakur joined #git
17:14 raijin joined #git
17:15 DJ_Spies joined #git
17:15 Fabricio20 joined #git
17:17 diogenese joined #git
17:18 stamina joined #git
17:21 duderonomy joined #git
17:21 nevogd joined #git
17:22 ochorocho__1 joined #git
17:23 cspack joined #git
17:24 davidbz joined #git
17:24 jaequery joined #git
17:25 mischat joined #git
17:25 crayon joined #git
17:27 cagedwisdom joined #git
17:28 _sfiguser guys how do i created a git server via ssh, but even when i clone i get asked for the password ... i want only to be asked for the password when i push
17:29 _sfiguser i mean i created the sever with the help of doucmentation
17:29 _sfiguser but i get asked for the password even when i clone
17:30 jaequery joined #git
17:30 _rht joined #git
17:30 jay-m joined #git
17:31 Peng SSH is still SSH whether you're pulling or pushing
17:32 vlt _sfiguser: Setup ssh with keys.
17:34 danslo_ joined #git
17:35 manuels joined #git
17:35 strk osse: was it with you that we were discussing earlier about trailing whitespaces shown by git show/diff ?
17:36 ResidentBiscuit joined #git
17:36 osse strk: yes
17:36 xall joined #git
17:37 _sfiguser ok but so git clone uses ssh  ?
17:37 DeltaHeavy joined #git
17:38 osse strk: just read the correspondence now. fair enough, i guess
17:38 osse _sfiguser: depends on the URL you give it
17:38 oskarkv joined #git
17:39 _sfiguser ok thanks
17:40 sea-gull_ joined #git
17:42 fahadash joined #git
17:42 saml joined #git
17:43 Pyrogerg joined #git
17:43 saml is there dryrun for reabase?  git rebase origin/master    I want to see if this will be successful without conflict without actually doing it
17:44 _ikke_ saml: Why? You'll see soon enough when it conflicts, and then you can just do git rebase --abort (short, no, there is no dry-run)
17:44 strk osse: I forgot who was the other one, anyway for the record --ws-error-highlight=all gives me what I wanted
17:45 saml with rebase, i need to push -f, that might mess up code review software (github pr)
17:45 chrisgeorge joined #git
17:45 saml not sure what i'm trying to do. github pr said there's conflict. so i guess there is :P
17:45 saml wait.. but how would github pr know there's conflict
17:45 matsaman joined #git
17:46 _ikke_ it is has something that does the merge
17:46 _ikke_ I guess
17:47 _ikke_ saml: by rebasing, you make sure you can fix the conflicts yourself (instead of the maintainer)
17:47 manuels joined #git
17:48 _ikke_ saml: and if it's a topic/feature for a PR, force pusing is not a problem
17:48 saml yeah i like rebase
17:48 patarr joined #git
17:48 manuels joined #git
17:49 manuels joined #git
17:49 Lipp joined #git
17:50 * strk always force-pushes to github PRs, no problem there
17:50 prawnzy joined #git
17:50 _ikke_ nope
17:50 _ikke_ github just updates the PR
17:51 strk and marks comments to old commits as such
17:51 manuels joined #git
17:52 anonymuse joined #git
17:56 faux___ joined #git
17:57 Sasazuka__ joined #git
17:59 cagedwisdom joined #git
18:00 timvisher joined #git
18:00 duderonomy joined #git
18:02 mablae joined #git
18:02 e14 joined #git
18:02 LBV_User joined #git
18:03 multi_io_ joined #git
18:06 crayon joined #git
18:06 crayon joined #git
18:06 ayjay2 joined #git
18:08 ahmed_elgabri joined #git
18:09 sunri5e joined #git
18:09 LionsMane joined #git
18:10 raijin joined #git
18:12 WayToDoor joined #git
18:13 Dandelock joined #git
18:15 ShekharReddy joined #git
18:17 BSaboia joined #git
18:18 garethdaine joined #git
18:19 navidr joined #git
18:19 synthroid joined #git
18:20 cworth joined #git
18:21 buffal0 joined #git
18:21 faux___ joined #git
18:22 faux___ joined #git
18:23 _ikke_ .version
18:23 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.9.3 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
18:23 Guest1973 joined #git
18:23 _ikke_ auch
18:23 _ikke_ jast: version has been rolled back to 2.9.3 by gitinfo
18:23 bket joined #git
18:23 dsdeiz joined #git
18:23 CHOCODARCHEVILLE joined #git
18:25 kpease joined #git
18:25 Anja joined #git
18:27 Seveas fail
18:27 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
18:27 Doginal joined #git
18:27 Akimb joined #git
18:28 manuels joined #git
18:29 armyriad joined #git
18:29 kerrick joined #git
18:30 manuels joined #git
18:30 masuberu joined #git
18:31 kpease joined #git
18:33 manuels joined #git
18:34 holodoc joined #git
18:35 _Vi joined #git
18:36 cdown joined #git
18:36 thebope joined #git
18:38 Lipp joined #git
18:40 SwiftMatt joined #git
18:40 timvisher joined #git
18:40 rgrinberg joined #git
18:40 Emperor_Earth joined #git
18:42 kerrick joined #git
18:45 nikivi joined #git
18:45 ws2k3 joined #git
18:45 pandeiro joined #git
18:47 ejb joined #git
18:57 cyan__ joined #git
18:59 fedepad joined #git
19:00 elsevero joined #git
19:04 fuchstronaut joined #git
19:05 timini joined #git
19:10 kerrick joined #git
19:13 Masber_080 joined #git
19:15 jknetl joined #git
19:15 andrybak joined #git
19:17 andrybak joined #git
19:17 snthsnth joined #git
19:18 johnmilton joined #git
19:18 Lipp joined #git
19:21 sargas joined #git
19:22 sargas joined #git
19:23 sssilver joined #git
19:24 snthsnth joined #git
19:25 mlvnd joined #git
19:25 Joel joined #git
19:26 Joel I've done a git pull from another remote, and gotte a bunch of conflicts, how can I tell it to just go with the other remote's changes, and ditch mine?
19:27 anonnumberanon joined #git
19:27 _dunaeth joined #git
19:28 timvisher joined #git
19:28 xall joined #git
19:29 j416 Joel: abort the merge (git status will tell you how); then do it properly: git fetch && git reset --hard path/of/remote/branch
19:29 j416 Joel: because, you don't want a merge in that case (git pull == git fetch + git merge)
19:29 Joel 'properly'?
19:29 j416 Joel: also, !backup
19:29 gitinfo Joel: 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
19:29 j416 Joel: did you read my second line yet?
19:29 j416 there's the answer
19:29 DeltaHea_ joined #git
19:30 berndl joined #git
19:31 Shakeel_ joined #git
19:35 rorro joined #git
19:36 faux___ joined #git
19:42 thiago joined #git
19:42 elastix joined #git
19:46 Jackneill joined #git
19:46 sunri5e joined #git
19:52 star_prone joined #git
19:55 thebope joined #git
19:59 rethus joined #git
20:03 rnsanchez_ joined #git
20:04 dsantiag_ joined #git
20:05 fuchstronaut joined #git
20:08 aartist joined #git
20:09 timvisher joined #git
20:10 sargas joined #git
20:10 mrkake joined #git
20:11 alex1a joined #git
20:12 danimal2 joined #git
20:14 diogenese joined #git
20:15 nydel07 joined #git
20:17 Masber_080 joined #git
20:17 xaa joined #git
20:17 alex1a joined #git
20:18 Guest23964 joined #git
20:18 jeffreylevesque joined #git
20:18 sunri5e joined #git
20:18 xameada joined #git
20:18 diego2 joined #git
20:18 diego2 joined #git
20:19 xall joined #git
20:20 ahr3n joined #git
20:21 littleforest joined #git
20:23 DannyFritz left #git
20:25 sunri5e joined #git
20:29 Limes_ joined #git
20:29 tematibr joined #git
20:30 e14 joined #git
20:31 zazc joined #git
20:32 aidalgol joined #git
20:33 Kitty- joined #git
20:38 sunri5e joined #git
20:39 dendazen joined #git
20:39 CussBot joined #git
20:44 aarobc joined #git
20:45 Limes_ joined #git
20:45 cydrobolt joined #git
20:45 cydrobolt joined #git
20:45 svm_invictvs joined #git
20:46 svm_invictvs Hey
20:46 svm_invictvs So I attempt to add a file to git, and it tells me the gitignore file prevents it
20:46 svm_invictvs Is there a way to have git tell me which file and which rule forbids the file?
20:47 kerrick_ joined #git
20:49 dzho svm_invictvs: when I try to add a .gitignore'd file I get the message "The following paths are ignored by one of your .gitignore files:" and then a list of the files
20:49 Seveas svm_invictvs: git check-ignore -v path-to-file
20:50 svm_invictvs dzho That tells me which files, not which rules
20:50 Seveas $ git check-ignore -v lib/gitspindle/github.pyc
20:50 Seveas .gitignore:1:*.py?lib/gitspindle/github.pyc
20:50 heptadecagram joined #git
20:50 svm_invictvs grr
20:51 dzho how big is your .gitignore?
20:51 inflames joined #git
20:51 heptadecagram left #git
20:52 Pyrogerg_ joined #git
20:55 greendo joined #git
20:56 netcarver joined #git
20:59 cbreak apparently at least 1 line :)
20:59 jast hmm, I'm going to have to experiment a little to figure out what's going on with the version parser
21:00 jast .version
21:00 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.9.3 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
21:01 Seveas jast: alphabetical sorting putting 2.9 ahead of 2.10?
21:01 jast no
21:01 jast I think it's mistakenly skipping tags with multi-digit version parts
21:01 jhe_ joined #git
21:01 jast let's try this...
21:01 jast .version
21:01 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
21:02 jast yeah, that was the problem. a boo-boo in my regex.
21:02 Lorcatar joined #git
21:02 Seveas next if $tag !~ /^v(\d(?:\.\d)*)\s*$/;
21:02 Seveas \.\d+ I guess
21:04 LeBlaaanc joined #git
21:04 wogi joined #git
21:06 Not-bb4 joined #git
21:06 jast exactly. just committed the fix.
21:07 jast including support for version 10.x.x and up :)
21:09 cdown joined #git
21:11 canuk joined #git
21:17 snthsnth joined #git
21:19 inflames joined #git
21:20 dsdeiz joined #git
21:21 jeffreylevesque joined #git
21:22 dviola joined #git
21:25 mx987 joined #git
21:26 Mobutils_ joined #git
21:27 emg joined #git
21:29 mx987 left #git
21:31 littleforest joined #git
21:31 berndl joined #git
21:36 aarobc joined #git
21:37 axl_ left #git
21:37 ansimation joined #git
21:39 boombatower joined #git
21:43 e14 joined #git
21:43 Kitty- joined #git
21:44 kerrick_ joined #git
21:47 PocketKiller joined #git
21:49 Dougie187 left #git
21:51 Masber_080 joined #git
21:52 star_prone joined #git
21:52 elc joined #git
21:55 emg joined #git
21:58 mizu_no_oto joined #git
22:00 nolageek left #git
22:03 thebope joined #git
22:06 fuchstronaut joined #git
22:08 einnjo joined #git
22:08 Achylles joined #git
22:10 e14 joined #git
22:14 justanotheruser joined #git
22:15 djBuss joined #git
22:15 djBuss Hi, I accidentally typed ``` git checkout -b ``` and pasted some code instead of the branch name. Now I get git:89: redirection with no command
22:15 djBuss any fixes for that or I have to reinstall ?
22:16 littleforest joined #git
22:17 acetakwas joined #git
22:18 fuzzmz joined #git
22:19 dendazen joined #git
22:19 einnjo joined #git
22:21 hahuang62 joined #git
22:22 jimi_ joined #git
22:23 osse dzho: now you get that when?
22:23 osse oh he left
22:23 WaReZ joined #git
22:27 madewokherd joined #git
22:27 mizu_no_oto joined #git
22:27 sangy joined #git
22:30 EvilPenguin joined #git
22:32 solidus-river joined #git
22:32 solidus-river hey all, i've gotten my repo into a wierd state
22:33 solidus-river there was a merge of develop into a feature branch, that completely deleted 4 files
22:33 solidus-river but it was pushed to the feature branch
22:33 solidus-river that was the most recent commit into that feature branch
22:33 solidus-river now when i go into that feature branch and do a `git reset HEAD~1` the files do not come back
22:33 solidus-river how do i revert this merge?
22:34 solidus-river git reset HEAD~1 does not bring back the files, which is really wierd to me, they were indeed there in the past commit
22:34 apotry joined #git
22:37 pandeiro joined #git
22:37 leolrrj joined #git
22:38 leolrrj hello gurus... what if I want rollback my master branch to 5 prior commits and keep that history?
22:39 leolrrj I tried run git reset --soft but when I try to push the new state to master I receive non-fast-forward rejection
22:39 danslo joined #git
22:40 vlt solidus-river: Have you tried `git checkout HEAD~1`?
22:40 cdg joined #git
22:41 Lor_ joined #git
22:42 shinnya joined #git
22:42 ResidentBiscuit joined #git
22:44 anuxivm joined #git
22:49 Vampire0 leolrrj, of course you get non-fast-forward if you reset to something that is older than what you pushed before. Do you just want to undo the changes with a new commit, use man git revert
22:49 gitinfo leolrrj: the git-revert manpage is available at http://jk.gs/git-revert.html
22:51 thiago joined #git
22:51 leolrrj Vampire0: ok... I think I got it...... does git revert erase my new commits after the point that I want to restore?
22:52 Vampire0 leolrrj, git revert does the reverse of what the commits you revert did and commit this. the old commits will still be in the history, plus one new commit that does the opposite of the reverted commits
22:53 leolrrj Vampire0: cool... and now how do I undo the git reset that I did lol
22:53 solidus-river vlt: no, but i blew away the local version, recloned from remote and then did a git reset <hash i wanted>, stashed any untracked and modified files, then redid the merge and force pushed the branch to origin
22:53 solidus-river that's gotten me back to a good state but I don't get how those files got blown away in the first place
22:53 solidus-river a remerge did not delete those files
22:55 solidus-river usign git 1.9.1, It's probably user error but just seemed really odd, been using git vor almost 8 years and have never run into something like this
22:55 solidus-river *for
22:55 Vampire0 leolrrj, reset again to the commit where the branch was previously
22:55 dodobrain joined #git
22:57 EvilPeng1 joined #git
23:01 e14 joined #git
23:07 fuchstronaut joined #git
23:08 einnjo joined #git
23:09 falkenb0t joined #git
23:16 jason237 joined #git
23:22 bluepixel joined #git
23:23 Lipp_ joined #git
23:26 cspack joined #git
23:26 greendo joined #git
23:27 dendazen joined #git
23:28 dzho osse: I made a toy repo just to try to see the behavior svm_invictvs might be having trouble with
23:28 svm_invictvs hm?
23:28 hahuang62 joined #git
23:29 dzho svm_invictvs: did you get your .gitignore stuff figured out?
23:29 svm_invictvs dzho my .gitignore is like 10 lines
23:29 svm_invictvs Yeah
23:29 dzho so, what was the trouble?
23:29 dzho got some tricky patterns?
23:29 svm_invictvs check-ignore basically tells you why it disqualifies the file
23:29 svm_invictvs Somebody checked in some stupid .gitignore code.
23:29 dzho aha
23:31 berndl joined #git
23:33 shock_ joined #git
23:34 dsdeiz joined #git
23:35 nckpz joined #git
23:37 babilen joined #git
23:38 axl__ joined #git
23:38 mablae_ joined #git
23:40 danslo joined #git
23:40 star_prone joined #git
23:41 ochorocho__ joined #git
23:42 jason237 joined #git
23:44 strugee joined #git
23:44 jmkeyes joined #git
23:46 Jellyg00se joined #git
23:46 juvenal joined #git
23:50 dodobrain joined #git
23:50 greendo joined #git
23:51 perrier-jouet joined #git
23:56 SimonNa joined #git

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