Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-24

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

All times shown according to UTC.

Time Nick Message
00:06 hahuang65 joined #git
00:08 dreiss joined #git
00:12 Nilesh_ joined #git
00:14 martin290 left #git
00:14 ianmethyst joined #git
00:15 Darren_ joined #git
00:15 ikelso joined #git
00:16 jimi_ joined #git
00:18 BackEndCoder joined #git
00:21 Guest55 joined #git
00:24 GodGinrai joined #git
00:25 Rodya_ joined #git
00:26 jimi_ joined #git
00:29 timvisher joined #git
00:30 eizua joined #git
00:33 cbreak joined #git
00:33 Darren_ joined #git
00:34 MrJoshua joined #git
00:34 Rodya_ joined #git
00:35 GavinMagnus joined #git
00:36 pity joined #git
00:37 msonntag joined #git
00:38 frostythesnowman joined #git
00:38 spacelord_ joined #git
00:39 frostythesnowman hi, i'm a bit confused with how pull requests work.  i've created a new PR that compares my dev branch with master.  however, when i look at the diff, it seems to be comparing my dev branch with an OLD version of master
00:39 frostythesnowman i did some research and PR's are supposed compare your branch with the 'base branch'.  is there some reason why it wouldn't be comparing against the 'latest' version of my base branch?
00:40 dirtyroshi joined #git
00:43 Rodya_ joined #git
00:46 mohabaks joined #git
00:46 snits joined #git
00:48 DolphinDream joined #git
00:50 Rodya_ joined #git
00:50 roelmonnens joined #git
00:52 dreiss joined #git
00:52 madewokherd joined #git
00:52 fandi joined #git
00:52 martin290 joined #git
00:52 martin290 can i get some help with git? i feel totally lost :(
00:53 Lyqyd joined #git
00:55 Rodya_ joined #git
00:56 voldz1tic3n joined #git
00:57 BlessJah !ask
00:57 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
01:00 BlessJah martin290: !man git-checkout
01:00 gitinfo martin290: The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
01:00 gitinfo martin290: the git-checkout manpage is available at http://jk.gs/git-checkout.html
01:00 rominronin joined #git
01:01 GavinMagnus left #git
01:02 Rodya_ joined #git
01:03 pandeiro joined #git
01:03 BlessJah martin290: to undo commited use revert, staged use reset, unstaged use checkout
01:03 BlessJah staged == 'changes to be commited'
01:05 BlessJah I have to go to bed, I hope you'll manage with manpages and three "undo" commands
01:05 * BlessJah computer went to sleep
01:05 gugah joined #git
01:06 martin290 BlessJah: what is staged and unstaged?
01:06 Atrumx joined #git
01:07 Kaisyu joined #git
01:07 oaao joined #git
01:07 thiago joined #git
01:08 syg__ joined #git
01:08 MrWoohoo joined #git
01:11 jmpp joined #git
01:12 King_Hual joined #git
01:12 King_Hual joined #git
01:12 Rodya_ joined #git
01:12 dreiss joined #git
01:13 spacelord_ joined #git
01:13 UnnamedPlayer joined #git
01:13 martin290 i have a vendor folder that i don't want to commit so i ignored it, but every time i commit a change, my vendor folder changes (things get deleted in it), any ideas what i can do???
01:14 nckpz joined #git
01:16 jtri joined #git
01:18 jtri i have gotten very mixed up trying to rebase develop (akin to master) into my branch and the force pushing
01:19 druonysus_ joined #git
01:19 BSaboia joined #git
01:19 Darren_ joined #git
01:20 jtri here are two looks at the graph using git log, the second is with --all http://dpaste.com/2BX8C0B http://dpaste.com/1WEZP83
01:21 jtri i'm afraid to do anything for fear of loosing my work, or overwriting something on the server
01:21 timvisher joined #git
01:22 jtri we've been having issues with git merge and so adopted a new strategy of rebasing the develop branch into our working branch, then merging back into develop, but it didn't go as i expected
01:23 Darren_ joined #git
01:24 dp joined #git
01:26 jtri somehow, the pointer to "jared" branch is at a commit from 12 months ago?
01:27 jtri and when i look on the website for bitbucket it's the same, my code in jared branch is not there, and the jared branch is way way way behind, by 12 months
01:27 fahadash joined #git
01:28 Guest55 joined #git
01:29 dp left #git
01:29 dp joined #git
01:29 jtri i think waht i'd like to do is move the "jared" pointer to "origin/jared" and then force push, but i really want to make sure at this point
01:31 dp joined #git
01:35 dreiss joined #git
01:35 Ryanar joined #git
01:37 Darren_ joined #git
01:37 jimi_ joined #git
01:39 mizu_no_oto joined #git
01:39 dreiss joined #git
01:41 jimi_ joined #git
01:42 strugee joined #git
01:42 d0pamine joined #git
01:44 jimi_ joined #git
01:45 roelmonnens joined #git
01:46 jameser joined #git
01:48 umpc joined #git
01:48 prawnzy joined #git
01:50 eizua joined #git
01:52 dp joined #git
02:03 rominronin joined #git
02:07 denete_ joined #git
02:10 timvisher joined #git
02:11 ryouma joined #git
02:13 tmcmahon joined #git
02:14 jaggz left #git
02:15 amikiri joined #git
02:16 matsaman joined #git
02:19 MrWoohoo joined #git
02:21 prawnzy joined #git
02:25 GodGinrai joined #git
02:28 pks joined #git
02:30 pity joined #git
02:34 mischat joined #git
02:34 finalbeta joined #git
02:35 brent__ joined #git
02:38 mizu_no_oto joined #git
02:40 ppppp5 joined #git
02:40 roelmonnens joined #git
02:41 aavrug joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:49 albel727 joined #git
02:51 bluepixel joined #git
02:53 Vampire0_ joined #git
02:53 dermoth_ joined #git
02:53 forrestv joined #git
02:57 d^sh joined #git
02:57 Guest55 joined #git
03:02 Rodya_ joined #git
03:05 druonysus_ joined #git
03:06 bruce_lee joined #git
03:08 MTecknology joined #git
03:08 pity joined #git
03:09 voldz1tic3n joined #git
03:11 sunri5e joined #git
03:12 govg joined #git
03:14 tmcmahon joined #git
03:15 xall_ joined #git
03:18 Vortex34 joined #git
03:18 Nokurn joined #git
03:22 matsaman joined #git
03:23 digidog joined #git
03:25 jbitdrop joined #git
03:27 arescorpio joined #git
03:28 fstd_ joined #git
03:28 raspado joined #git
03:29 tmcmahon joined #git
03:30 SwiftMatt joined #git
03:30 sklvch joined #git
03:31 mehola joined #git
03:31 sklvch I have two projects in apache using two different repos, I am able to clone/push to github with one, but not another, using the same SSH keys. Any ideas what may be causing this?
03:34 cdown joined #git
03:35 mischat joined #git
03:35 rominronin joined #git
03:35 roelmonnens joined #git
03:36 Ryanar joined #git
03:40 sklvch left #git
03:42 shamowfski joined #git
03:43 chachasmooth joined #git
03:47 thiago people need to wait for the answer...
03:48 govg joined #git
03:49 timvisher joined #git
03:51 z3t0 joined #git
03:52 Oatmeal joined #git
03:57 sargas joined #git
04:00 Nokurn joined #git
04:00 lcb joined #git
04:05 tobiasBora joined #git
04:06 Goplat joined #git
04:07 hexagoxel joined #git
04:09 duderonomy joined #git
04:10 beatdown joined #git
04:10 mohabaks joined #git
04:13 pity joined #git
04:14 sargas joined #git
04:15 Hudu joined #git
04:17 Rodya_ joined #git
04:17 mizu_no_oto joined #git
04:20 msonntag joined #git
04:21 snowkidind joined #git
04:23 pity joined #git
04:25 cagedwisdom joined #git
04:26 GodGinrai joined #git
04:27 druonysus_ joined #git
04:29 ayogi joined #git
04:29 zivester joined #git
04:30 nazri joined #git
04:30 roelmonnens joined #git
04:33 pietv joined #git
04:36 mischat joined #git
04:37 danimal2 joined #git
04:37 subhojit777 joined #git
04:42 Poppa left #git
04:46 [0xAA] joined #git
04:46 disconnect_me joined #git
04:48 timvisher joined #git
04:49 Cabanoss- joined #git
04:50 atrigent joined #git
04:51 Guest55 joined #git
04:52 sbulage joined #git
04:55 tirej joined #git
04:57 mohabaks joined #git
04:59 druonysus_ joined #git
04:59 ws2k3_ joined #git
04:59 cdown_ joined #git
05:00 dermoth joined #git
05:01 svm_invictvs joined #git
05:04 atrigent_ joined #git
05:06 rominronin joined #git
05:11 canuk_ joined #git
05:11 nazri left #git
05:11 jrm2 joined #git
05:19 bgerber joined #git
05:23 Limes__ joined #git
05:24 cluelessperson joined #git
05:24 cluelessperson hey guys, is there a way to have Git automatically sync with a remote repo immediately when I submit something?
05:25 rivarun joined #git
05:25 roelmonnens joined #git
05:34 svm_invictvs joined #git
05:36 mischat joined #git
05:38 TomTomTo1 joined #git
05:38 kadoban cluelessperson: What is "submit" ?
05:41 ckruczek joined #git
05:43 cluelessperson kadoban, commit?
05:43 ShekharReddy joined #git
05:44 Samual joined #git
05:45 snowkidind joined #git
05:45 miczac joined #git
05:45 kadoban cluelessperson: Sounds like a bad idea, but there is a post-commit hook. Sounds like a *really* bad idea really. Part of the nice part of git is that commits are quick and thus you're able to do them without it being disruptive to work.
05:47 AlgorithmWizard joined #git
05:48 lindenle joined #git
05:49 _ikke_ and being able to review / rewrite them before pushing
05:49 Cthalupa joined #git
05:50 _ikke_ and without needing to pull everytime because someone else had just pushed
05:51 sarri joined #git
05:51 sarri joined #git
05:51 kadoban Right, that too
05:52 rajat joined #git
05:53 Peng_ joined #git
05:53 timvisher joined #git
05:57 ShekharReddy joined #git
06:00 ljc joined #git
06:02 pabs3 joined #git
06:05 [0xAA] joined #git
06:07 pks joined #git
06:09 dec0n joined #git
06:09 pabs3 anyone have any tips on how to get my gitk patch accepted? http://public-inbox.org/git/20161225​140611.30536-1-pabs3@bonedaddy.net/
06:10 grawity was it rejected, or just ignored?
06:10 sargas_ joined #git
06:11 pabs3 I think the latter. I CCed the gitk maintainer
06:12 leprechau joined #git
06:12 govg joined #git
06:13 _ikke_ I believe someone else is maintaining it
06:13 Levex joined #git
06:13 _ikke_ Might be wrong
06:14 pabs3 hmm, ok. any idea who?
06:15 pabs3 all the commits Junio merged recently were from the person I CCed (Paul Mackerras <paulus@samba.org>)
06:16 _ikke_ Right\
06:16 _ikke_ It is probable him then
06:18 xall_ joined #git
06:18 Rodya_ joined #git
06:19 drbean joined #git
06:20 osse pabs3: No shame in resending after a week or so. Has happened to me before, and I think Junio has even said so
06:20 pabs3 has been a month, so will do. guess I'll CC again
06:20 sbulage joined #git
06:23 nckpz joined #git
06:24 mns joined #git
06:25 Boniche joined #git
06:26 jay-m joined #git
06:27 GodGinrai joined #git
06:31 safe joined #git
06:34 tarkus joined #git
06:37 mischat joined #git
06:39 rominronin joined #git
06:41 jnavila joined #git
06:41 tubaman joined #git
06:41 mathematic-alpha joined #git
06:42 mathematic-alpha left #git
06:42 brent__ joined #git
06:48 Raging_Hog joined #git
06:49 Hudu joined #git
06:50 peepsalot joined #git
06:50 ParticleGolem joined #git
06:50 ThomasLocke joined #git
06:52 zeroed joined #git
06:55 osse I've added the Git for Windows repos in MSYS2 but have problems getting updates. Can anyone confirm?
06:57 ThomasLocke_ joined #git
06:57 ThomasLocke_ joined #git
06:58 jay-m joined #git
06:59 navidr joined #git
07:00 Rodya_ joined #git
07:01 spacelord_ joined #git
07:01 jagob joined #git
07:01 mohabaks joined #git
07:05 pabs3 left #git
07:05 zeroed joined #git
07:05 zeroed joined #git
07:05 freimatz joined #git
07:06 MrMojito joined #git
07:07 mehola joined #git
07:09 Mo joined #git
07:09 t0by joined #git
07:09 Alienpruts joined #git
07:11 mns joined #git
07:11 jameser joined #git
07:11 lb1c joined #git
07:14 sQVe joined #git
07:16 albel727 joined #git
07:18 ngm joined #git
07:19 chele joined #git
07:20 [0xAA] joined #git
07:21 xcesariox joined #git
07:22 roelmonnens joined #git
07:22 cyan__ joined #git
07:23 zeroed joined #git
07:26 rominronin joined #git
07:27 texinwien joined #git
07:29 eduardas_m joined #git
07:32 UnnamedPlayer joined #git
07:33 markzen joined #git
07:33 markzen hi
07:33 gitinfo markzen: 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.
07:33 osse my name is
07:34 jnavila joined #git
07:34 markzen how do you make an initial commit, after git init, to a branch different than master?
07:35 markzen eg. to some 'dev' branch
07:35 grawity a) commit, then rename master to whatever
07:35 grawity or b) git symbolic-ref HEAD refs/heads/dev, then commit
07:35 grawity or actually, doesn't `git checkout -b dev` work?
07:35 Knirch checkout -b dev works just fine :)
07:35 markzen can i checkout sth just after a git init?
07:35 Knirch yes
07:36 osse you can checkout any time you like, but you can never leave
07:36 grawity -b doesn't actually check out anything, it creates a new branch for the current workdir, so it should work
07:36 markzen nice, tyvm
07:38 ihradek joined #git
07:38 markzen in the same vein, how do you definitively erase all commits but the last one?
07:38 grawity whyyyyyyyyy
07:38 markzen if you've been fooling around in master, and you want to make your repo public
07:38 grawity but I suppose you could `git checkout --orphan` then re-commit
07:38 mischat joined #git
07:38 grawity or publish it as is, who cares
07:39 osse markzen: git checkout --orphan newbranch; git commit -m 'Init'; git branch -M master
07:39 grawity there are other ways, could use `git replace` to edit out the parent from the commit
07:39 grawity (`git replace --edit` that is, then bake it in)
07:40 jast my personal favourite for that: 1) git reset --soft <ID of first commit>; git commit --amend -C HEAD@{1}
07:40 jast because more cryptic ;)
07:40 albel727 joined #git
07:40 markzen thx, didn't know about git replace
07:40 rivarun joined #git
07:41 grawity if you want cryptic, git reset --soft $(git cat-file @ | sed /^parent/d | git hash-object -t commit --stdin)
07:41 JeroenT joined #git
07:42 ferr1 joined #git
07:42 osse even more cryptic;  rm -rf .git; git init; git commit -m Init
07:43 osse with a git add . somewhere
07:43 grawity hah
07:43 markzen ok thanks all
07:46 jast grawity: yeah, yours is more cryptic, but it will potentially mess up the commit message
07:46 jast also, you forgot the type arg for cat-file :}
07:47 jast and the -w for hash-object
07:48 rivarun joined #git
07:54 ac3takwas joined #git
07:58 landstrider joined #git
07:59 zefferno joined #git
07:59 Atm0spher1c joined #git
07:59 Singmyr joined #git
08:02 Disgeae joined #git
08:05 hhee joined #git
08:05 overlord_tm joined #git
08:06 chipotle joined #git
08:10 msonntag joined #git
08:11 lordjancso joined #git
08:11 roelmonn_ joined #git
08:17 zerotresBR joined #git
08:18 rominronin joined #git
08:18 djb-irc joined #git
08:23 leeN joined #git
08:24 guampa joined #git
08:24 TomyLobo joined #git
08:27 treehug88 joined #git
08:27 GodGinrai joined #git
08:28 runlevl4 joined #git
08:30 jknetl joined #git
08:31 nowhere_man joined #git
08:31 dhollinger joined #git
08:32 mns joined #git
08:35 roelmonnens joined #git
08:36 mathematic-alpha joined #git
08:36 mathematic-alpha joined #git
08:37 djb-irc joined #git
08:38 elect__ joined #git
08:38 govg joined #git
08:38 Tobbi joined #git
08:38 pietv joined #git
08:42 Balliad joined #git
08:44 eduardas_m joined #git
08:45 roelmonn_ joined #git
08:45 Hudu joined #git
08:45 smithbone joined #git
08:46 mehola joined #git
08:46 roelmonnens joined #git
08:49 theoceaniscool joined #git
08:52 tvw joined #git
08:52 lindenle joined #git
08:56 mikecmpbll joined #git
08:57 pietv joined #git
08:58 amikiri joined #git
08:58 King_Hual joined #git
09:02 Xatenev joined #git
09:02 Xatenev Hi
09:02 Rodya_ joined #git
09:02 sparetire joined #git
09:02 durham joined #git
09:04 osse my name is
09:04 ckruczek hahah
09:05 vuoto joined #git
09:06 rajat joined #git
09:07 bongjovi joined #git
09:08 Murii joined #git
09:09 miczac joined #git
09:09 kurkale6ka joined #git
09:10 Xatenev Hi
09:10 mohabaks joined #git
09:10 Xatenev I used git log -S 'string' --source --all to find all commits that changed/introduced a specific string
09:11 Xatenev That gives me a bunch of weird messages like:
09:11 Xatenev C:/Users/myUser/AppData/Local/Temp/file1.dot is not a Word Document.
09:11 Xatenev Error: PDF file is damaged - attemping to reconstruct xref table...
09:11 Xatenev Wtf is that?
09:12 osse I have no idea. Have you installed some custom diff viewer thing?
09:12 Xatenev Not that I know of.
09:12 Xatenev I am using PHPStorm's diff viewer to do that
09:12 cqi joined #git
09:13 Xatenev It shows me the correct commits for that change though.
09:13 marcogmonteiro joined #git
09:13 Xatenev Just that weirdb unch of messages after
09:13 osse does it go away if you remove -S string ?
09:13 Xatenev You mean only git log --source --all?
09:13 pity joined #git
09:13 osse oui
09:13 Xatenev Seems like.
09:14 Xatenev Tho I can't scroll through all commits now
09:14 osse Xatenev: cat .gitattributes
09:14 Xatenev Maybe they get shot at the end and I just dont see it.
09:14 rkazak joined #git
09:14 Xatenev I dont have that file
09:14 JeroenT joined #git
09:14 GodGinrai joined #git
09:14 osse cat .git/info/attributes
09:15 Xatenev I dont have attributes there
09:15 Xatenev only exclude
09:15 Xatenev I am on windows btw
09:15 osse git config --get-regexp '.*diff.*'
09:15 osse noob me. git config --get-regexp diff
09:15 Xatenev That worked though
09:15 Xatenev Obv i have weird diff tools
09:15 Xatenev for some reason.
09:16 osse \o/
09:16 Xatenev KDiff3 and meld
09:16 Xatenev I go uninstall them
09:16 osse oh, no that's fine. git log shouldn't launch a diff tool
09:16 JeroenT_ joined #git
09:17 Xatenev How can I remove them as git diff viewer thing?
09:17 Xatenev I uninstalled the programs but they are still listed
09:17 osse edit the config
09:17 osse that's probably not the problem though
09:18 Xatenev I dont need them tho
09:18 zeroed joined #git
09:18 Xatenev Nope its not the problem.
09:18 osse Xatenev: do  GIT_TRACE=/tmp/lol.txt git log -S ... etc.  and show me /tmp/lol.txt
09:19 bernardio joined #git
09:19 Naan left #git
09:19 ChiLL_SurF joined #git
09:20 zacts joined #git
09:21 Xatenev No output?
09:21 Xatenev can this be possible? :P
09:21 osse you used the actual git log command right?
09:21 Xatenev ye
09:21 osse not literally what I wrote
09:21 Xatenev maybe he cannot write to /tmp/
09:22 Xatenev can I set GIT_TRACE=./tmp ?
09:22 osse no
09:22 osse do  GIT_TRACE=1 git log ... 2>lol.txt
09:22 pity joined #git
09:22 Xatenev That outputs the correct thing
09:22 Xatenev All the commits foun din the lol.txt
09:22 Xatenev And only that.
09:23 osse can you show me the complete lol.txt
09:23 xall_ joined #git
09:23 Xatenev https://bpaste.net/show/c3e8a70408dc
09:23 osse fuck me
09:23 Xatenev I only x'ed out names and stuff
09:23 osse you cannot possible have run what i said
09:24 osse notice the 2 in front of the >
09:24 nettoweb joined #git
09:24 Xatenev Oh I didnt write the 2
09:24 Xatenev My bad
09:24 Xatenev Oh
09:24 Xatenev Now all the bad lines are in the lol.txt
09:24 Xatenev And the correct things are output in the git bash
09:24 Xatenev and only them
09:25 osse show me
09:25 Xatenev https://bpaste.net/show/e02a395f0643
09:25 Xatenev are there docs on 2>? :P
09:25 Xatenev What does that mena
09:25 osse that's regular shell redirection
09:25 Xatenev What does that mean
09:25 osse it makes standard error go to the given file
09:25 osse man bash
09:26 Xatenev ah
09:26 Xatenev thanks :)
09:26 osse do you remember whether you have installed any sort of diff thing for viewing documents?
09:26 clmsy joined #git
09:26 t0by joined #git
09:26 t0by joined #git
09:26 osse and you remembered GIT_TRACE=1 too right??
09:26 Xatenev ye i did that
09:26 Xatenev Umm
09:26 Xatenev not rly
09:27 Xatenev Don't think I got any other diff tools, I can search through my programs quick tho
09:27 Xatenev Maybe I find something weird
09:27 osse GIT_TRACE=1 git... not GIT_TRACE=1; git
09:27 osse because that file is not what I expect
09:27 Xatenev Well
09:28 Xatenev im not listening to you sorry, sec :(
09:28 Xatenev I though tthose are two commands.
09:28 osse they are not
09:28 Xatenev osse: https://bpaste.net/show/57b48d45e07b
09:29 osse that's better
09:29 osse now tell me, what the hell is astextplain ?
09:30 interrobangd joined #git
09:30 Xatenev I dont know
09:30 Xatenev I never heard of that
09:30 Xatenev And i definetly never installed that.
09:30 Xatenev (Manually)
09:30 osse it's causing the problem
09:30 osse do  git ls-files | grep .giattributes | xargs cat
09:30 osse oops
09:30 osse do  git ls-files | grep .gitattributes | xargs cat
09:30 quackgyver joined #git
09:30 Xatenev https://github.com/msysgit/msysgit
09:30 Xatenev I think when I started working here, my git has been installed with this
09:31 Xatenev From some sysadmin
09:31 Xatenev on my pc.
09:31 Xatenev "diff=astextplain (msysGit only): converts those files (under the condition that their extension be *.doc, *.pdf, *.rtf, etc.) to a text format before generating their diff."
09:31 osse yes, there we go
09:31 osse you have at least one .gitattributes file
09:31 Xatenev Wheres that
09:31 osse remove the | xargs git part
09:31 osse that file is telling git to use astextplain to produce the diff output
09:32 Xatenev So only git ls-files | grep .gitattributes ?
09:32 osse yes, trust yuorself
09:32 Xatenev That outputs nothing
09:33 osse i don't believe you
09:33 Xatenev I can post you an image
09:33 Xatenev xD
09:33 Xatenev wait
09:33 osse sure
09:34 Xatenev osse: http://i.imgur.com/UjKaTBP.png
09:35 reto_ joined #git
09:35 osse now why did the one with | xargs cat print something?
09:35 Xatenev It didnt
09:35 osse fuck
09:35 osse where did that diff=astextplain come from then
09:36 Xatenev I dunno
09:36 pity joined #git
09:36 osse you don't know!?!?!
09:36 osse you pasted it here, where did you copy it from?!?
09:37 reto_ I can't find a way to set 'rename-threshold' in the .gitconfig file
09:37 Xatenev osse: What?
09:37 reto_ is this possible?
09:37 Xatenev osse: I copied it from the output?
09:37 Xatenev osse: Lol you mean that what I quoted.
09:38 Xatenev osse: That was from a stackoverflow page that mentioned astextplain
09:38 Xatenev "http://stackoverflow.com/questions/28146244/what-i​s-the-difference-between-diff-and-diff-astextplain"
09:38 Xatenev And it says: "The string value astextplain is not part of Git core: in fact, runninggit grep "astextplain" in the Git project repository returns nothing. As far as I can tell, it's a shell script that ships with msysGit and allows you to convert files such as"
09:38 osse Xatenev: is it mentioned in  git config --get-regexp diff ?
09:38 Xatenev yep
09:38 Xatenev Its not in my .gitconfig though
09:39 barteks2x I somehow ended up in state "HEAD detached from <something>", how to fix it?
09:39 osse ok, next time jsut show me everything my commands print
09:39 Xatenev sorry
09:39 Xatenev diff.astextplain.textconv astextplain
09:39 osse firstly, your git is really old.
09:39 mischat joined #git
09:39 Xatenev yeap
09:39 osse secondly, you msut go to C:\Program\ Files\wherever and edit the config file
09:39 Xatenev The config file of what
09:39 Xatenev Of astextplain?
09:39 osse Git
09:40 Xatenev Where is that in that folder
09:40 Xatenev You mean etc/gitconfig ?
09:40 osse wherever git is installed
09:40 Xatenev Yea here it is
09:40 osse do  git config -l | grep astextplain
09:40 Xatenev Git/etc/gitconfig [diff "astextplain"]
09:40 barteks2x and reflog is a bit unhelpful. All I see is clone, then checkout, and then commit
09:40 b100s joined #git
09:41 Xatenev osse: It worked now the weird lines are gone
09:41 Xatenev osse: thank you :)
09:42 robattila256 joined #git
09:42 govg joined #git
09:42 mischat joined #git
09:43 reto_ is ist possible configure git merge -X rename-threshold with .gitconfig?
09:43 osse Xatenev: ooor maybe it's your files that are broken since astextplain stopped working. I see that astextplain is still a part of the newest git for windows
09:43 jast barteks2x: does this explanation help to understand what might have happened? !detached
09:43 gitinfo barteks2x: 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
09:43 barteks2x I'm in a submodule
09:44 barteks2x but still not idea how it happened
09:44 chll_ joined #git
09:44 barteks2x I simply added a submodule and added one commit
09:46 jast in submodules the detached state is normal, because submodules normally tie themselves to a specific commit instead of following a branch
09:46 barteks2x so I should just leave it that way?
09:47 jast it's not exactly straightforward to work directly inside a submodule, and submodules are not at all designed for keeping your own changes in the submodule without putting them in the upstream repo (if that's what you're trying to do, you might want to look into alternatives)
09:47 Serpent7776 joined #git
09:47 mehola joined #git
09:48 barteks2x I want to push the changes
09:48 jast well, you *can* leave it as it is, but the commit you made on top of the detached HEAD is likely to get lost at some point, so... maybe not :)
09:48 Xatenev left #git
09:48 mischat joined #git
09:48 jast are the main repo and the repo for the submodule both maintained by you?
09:49 barteks2x yes
09:49 jast okay. do you want your change to end up in the submodule's upstream repo, too?
09:50 jast I guess you do, if you're trying to push
09:50 barteks2x where "submodule's upstream repo" is? I'm confused as to what it would be
09:50 jast the source for your submodule, whatever URL you used for adding it
09:50 cr34ton joined #git
09:51 barteks2x yes, I have it on github and I want to push my changes. It seemed to work before (the same submodule but in different project)
09:51 jast right, probably because HEAD was not detached there
09:51 jast okay, you can work this way, you just have to remember to check whether the submodule's HEAD got detached
09:52 jast this time we're going to copy the commit back onto the branch, and in the future you just have to remember to checkout the branch before committing
09:52 finalbeta joined #git
09:52 barteks2x I use submodule for a simple library that is usually changed together with the project I use it in
09:53 jast to copy the commit, do the following: 1) git checkout thebranch (e.g. master), 2) git cherry-pick HEAD@{1} (this copies over the commit that was at HEAD immediately before switching back to the branch)
09:53 jast then you can do a quick 'git log' to make sure the result looks sensible
09:54 barteks2x how does it end up with detached head in the first place?
09:54 osse git submodule update
09:54 osse for example
09:54 jast it's something git's submodule feature always does when updating the submodule
09:54 jast anyway, after that you should be able to push. one more thing: as I said before, submodules are tied to a specific commit. this means that if you push your main repo and clone it somewhere else, the clone will still give you the older commit in the submodule. telling the main repo to point to another commit in the submodule is a separate step, it's pretty simple:
09:54 jast in the main repo, 'git add path/to/submodule' followed by 'git commit'
09:55 barteks2x yes, I understand that. This is how I did it since the beginning but I've never seen it create detached head
09:55 jast alternatively you can use submodules differently, so that they follow a branch instead of tracking a specific commit. that should make it more natural to work with for what you seem to want to do. I'm not very familiar with that mode of submodules, though, so I can't tell you much about it.
09:55 rnsanchez joined #git
09:56 barteks2x ideally I would like to completely stop using submodule but it will have to wait
09:59 SilverBe joined #git
10:01 jay-m joined #git
10:02 tirej joined #git
10:02 dec0n joined #git
10:02 Rodya_ joined #git
10:04 barteks2x in all the mess I created, I lost my changes, without any clear idea how :(
10:05 barteks2x wait, no, I was looking in the wrong repository
10:06 jsolano joined #git
10:07 m4sk1n joined #git
10:08 causasui joined #git
10:10 achadwick joined #git
10:12 DarsVaeda joined #git
10:14 DarsVaeda hi, I'm on master and changed some files but did not commit, unfortunately these changes should have gone to a new branch, but I forgot to add that branch and change to it before changing the files
10:14 cdown joined #git
10:14 DarsVaeda I wonder: if I add the new branch now and change to it, would that work too?
10:16 tobiasvl DarsVaeda: yes: !float
10:16 gitinfo DarsVaeda: 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.
10:19 rasto joined #git
10:19 ShapeShifter499 joined #git
10:20 jfr joined #git
10:26 mischat_ joined #git
10:28 felher_ left #git
10:28 Mir4g3 joined #git
10:29 goTAN joined #git
10:29 cdown_ joined #git
10:31 DarsVaeda ah thanks!
10:33 syg__ joined #git
10:34 marcogmonteiro joined #git
10:36 Gloomy joined #git
10:39 Alienpruts joined #git
10:41 manuelschneid3r joined #git
10:42 aw1 joined #git
10:42 ngm joined #git
10:48 mikecmpbll ack, this should be a simple question as i've done it before but my googling is failing me: how can i retrieve a commit message from a commit that i've reset?
10:48 mikecmpbll (reset to before the commit)
10:49 osse mikecmpbll: reflog
10:49 tobiasvl mikecmpbll: if you have the SHA, just "git show SHA". if not, find the SHA in "git reflog"
10:49 osse gti show branch@{1} for example
10:49 mikecmpbll ahh, `git show` :]
10:49 mikecmpbll i could see it there in the reflog but just the one line
10:49 YuGiOhJCJ joined #git
10:49 mikecmpbll thanks osse , tobiasvl !
10:49 finalbeta joined #git
10:50 osse mikecmpbll: you can commit the message directly if you create a new commit:  git commit -C abc1234
10:50 mikecmpbll osse : ahh yeh, that's the command i'd done before that i couldn't recall. super, thanks :)
10:54 theoceaniscool joined #git
11:02 LBV_User joined #git
11:02 masuberu joined #git
11:03 jay-m joined #git
11:03 Snugglebash joined #git
11:03 Rodya_ joined #git
11:04 aswen joined #git
11:05 ShalokShalom_ joined #git
11:06 finalbeta joined #git
11:10 svm_invictvs joined #git
11:10 gigq joined #git
11:11 t-mart joined #git
11:11 afuentes joined #git
11:12 megamnrld joined #git
11:12 dersand joined #git
11:13 goTAN joined #git
11:14 msonntag joined #git
11:14 mohabaks joined #git
11:16 zeroed joined #git
11:17 xall_ joined #git
11:17 irco joined #git
11:19 msonntag joined #git
11:20 sbulage joined #git
11:22 BackEndCoder joined #git
11:22 IndigoTiger joined #git
11:26 chipotle joined #git
11:29 vuoto joined #git
11:30 nahra joined #git
11:32 freimatz joined #git
11:34 Alienpruts joined #git
11:35 gajus joined #git
11:35 pietv joined #git
11:41 dsdeiz joined #git
11:41 dsdeiz joined #git
11:41 JeroenT joined #git
11:52 miczac joined #git
11:53 ertesx joined #git
11:55 lindenle joined #git
11:55 ismithers joined #git
11:57 Hudu joined #git
11:59 msonntag joined #git
11:59 zeroed joined #git
11:59 zeroed joined #git
12:00 mentazoom joined #git
12:01 mischat joined #git
12:04 mischat_ joined #git
12:05 JeroenT joined #git
12:08 theoceaniscool joined #git
12:09 eduardas_m joined #git
12:10 jay-m joined #git
12:11 mischat joined #git
12:11 hhee joined #git
12:13 Droolio joined #git
12:13 Lea2 joined #git
12:13 Snugglebash joined #git
12:22 mentazoom joined #git
12:25 Vampire0 Hey guys, is there a way to *not* detect renamed / copied files when doing a diff?
12:26 osse --no-find-renames
12:28 Vampire0 Ah, almost. --no-renames it is, thanks osse
12:28 finalbeta joined #git
12:28 DrSlony left #git
12:33 aard_ joined #git
12:33 rafalcpp joined #git
12:34 Vampire0 osse,  and is there an easy way to list all files that were not change between two commits? I now use diff with --name-only and --no-renames to write the list of changed files to a file and then ls-tree -r and a grep -vf to filter out the changed files from the list
12:36 [0xAA] joined #git
12:36 douglascorrea joined #git
12:36 Ediz joined #git
12:36 ColdKeyboard joined #git
12:37 osse Vampire0: that sounds like exactly the solution I recommended to someone else a couple of weeks ago
12:37 osse git ls-tree --name-only -r branch1 | grep -vFf <(git diff --name-only branch1 branch2)
12:37 osse I can't think of anything better
12:38 aard__ joined #git
12:38 Snugglebash joined #git
12:40 Vampire0 ok, thx osse
12:40 osse Vampire0: btw no-renames is not necessary with name-only
12:41 mentazoom joined #git
12:41 osse also my solution is more sexy than a temp file etc, but requires bash or zsh
12:42 Vampire0 osse, yes, the subshell redirect is nice, I like it, didn't think of it
12:42 Vampire0 But no-renames is necessary, otherwise you only get the new file, not both
12:42 osse i get both
12:42 msonntag joined #git
12:42 Vampire0 I don't
12:42 Vampire0 Just tried it
12:43 osse never mind, my git is old
12:43 osse boo git
12:43 Vampire0 2.9.3 here
12:43 jameser joined #git
12:43 JeroenT joined #git
12:44 mischat joined #git
12:44 osse I like to compile things myself, install to /usr/local and then forget to update
12:45 mvdan left #git
12:45 Vampire0 Ah, and -x should be given to grep too, otherwise a change of 'foo'  will match a change of 'fooBar'
12:45 osse the -F takes care of that
12:45 zeroed joined #git
12:46 XenophonF joined #git
12:46 osse ehh, nope
12:46 mischat joined #git
12:46 osse stupid grep
12:46 canuk joined #git
12:47 Vampire0 yes it is
12:47 Vampire0 do echo -e 'foo\nfooBar' | grep -vFf <(echo foo)
12:47 osse i agree
12:47 Vampire0 and do echo -e 'foo\nfooBar' | grep -vxFf <(echo foo)
12:47 osse the nope was a nope to "-F takes care of that"
12:47 Vampire0 -F just says that it is plain text, not a regex
12:47 Vampire0 Ah, ok
12:48 str joined #git
12:48 tlaxkit joined #git
12:49 anand[m] joined #git
12:49 osse for some reason I interpret the docs as saying it msut match the whole line
12:49 osse since the fixed strings are separated by newlines
12:49 osse ohw ell
12:49 Vampire0 And actually diff is also not good, depending on the use-case. If you want to match all files that were touched and you changed a file and changed it back, it would not match
12:49 Vampire0 What I have now is
12:49 Vampire0 git ls-tree -r --name-only 9aae~ | grep -vFxf <(git log 9aae~..9aae -c --name-only --no-renames --pretty=format: | sort -u)
12:50 osse A few weeks ago, and now, I wonder how on earth the list of *unchanged* files is interesting
12:52 DolphinDream joined #git
12:56 WayToDoor joined #git
12:57 Vampire0 osse me neither, it is for a SO question where I try to help. :-)
12:59 ojdo joined #git
12:59 irqq joined #git
13:00 HardlySeen joined #git
13:00 HardlySeen joined #git
13:01 roelmonn_ joined #git
13:02 MapMan Hi! I have a file which is tracked in my repo, I  added it a few commits back. Now I want the file to be untracked but still be there. Also when my friend pulls the repo, the file will be there as well but untracked. Is it enough to add the file to gitignore and remove tracking by using git rm --cache file?
13:03 osse MapMan: not possible. you can use rm --cached but your friend needs to take care
13:03 osse MapMan: it is easy enough to resurrect it after the pull
13:03 osse and if he has local changes the pull will fail
13:04 jameser joined #git
13:04 zeroed joined #git
13:04 zeroed joined #git
13:05 Rodya_ joined #git
13:05 mentazoom joined #git
13:05 MapMan osse: Ok, so option B for me is to simply untrack and ignore the files, so everyone can create his own. Since the file is already tracked, what should I do? Simply remove the file, add to gitignore and push?
13:06 osse it's the only thing you can do
13:06 cdown joined #git
13:07 nowhere_man joined #git
13:07 JuliusN joined #git
13:07 ShalokShalom_ joined #git
13:08 JuliusN git status says head detached, but i've checked out a branch. i thought detached heads only occur when checking out commits.
13:09 osse JuliusN: what branch did you check out
13:09 _ikke_ correct, so apparently you have not checked out a branch
13:09 _ikke_ (remote tracking branches do not count as branches)
13:09 JuliusN oh
13:09 JuliusN that's new to me
13:09 Vampire0 osse,  http://stackoverflow.com/questions/418278​09/git-get-unchaged-files-between-commits if you are interested in the use-case
13:09 Hudu joined #git
13:10 osse the use case makes sense
13:10 osse i approve
13:10 Singmyr joined #git
13:10 osse unless the person removes those files without vetting them first
13:10 osse also now I know what you look like. does that make you uneasy?
13:10 synthroid joined #git
13:11 Vampire0 osse, if it would, I wouldn't post my pic all over the web :-)
13:12 JuliusN after checking out a remote branch can i make it an actual branch?
13:12 dcpc007 joined #git
13:12 _ikke_ git checkout -b <branchname>
13:12 Vampire0 osse,  hm, and you look like Guybrush
13:12 osse correct!
13:13 JuliusN i don't remember having to re-checkout from remote branches before
13:13 Ediz joined #git
13:14 MapMan osse: thanks, this is what I did. Out of curiosity, what about git update-index --assume-unchanged file? Wouldn't it do what I wanted in the first place?
13:14 Vampire0 JuliusN, afair when you do "git checkout foo" with foo not being a tag or local branch, but remote tracking branch, Git should automatically create a local branch from the remote branch and check out the local branch
13:14 osse JuliusN: maybe cause you made use of Git's ESP before. if you type 'git checkout bleh' and bleh doesn't exist but origin/bleh does, Git will create that braanch for you
13:14 osse Vampire0: sometimes I look like a different guybrush
13:14 mizu_no_oto joined #git
13:15 osse mabye that's only on Steam
13:15 JuliusN is it because i typed origin/branchname?
13:15 _ikke_ JuliusN: correct
13:15 JuliusN gotcha
13:15 _ikke_ JuliusN: Note that when you type branchname, and it does not exist yet, and there is only one remote with that name, then git automatically creates the branch
13:15 carandraug joined #git
13:16 JuliusN yeah i think i got it
13:16 osse third time's the charm!
13:16 jay-m joined #git
13:17 Tobbi joined #git
13:18 cdown_ joined #git
13:18 Ice_Strike joined #git
13:19 DolphinDream joined #git
13:19 Ice_Strike I did git stash before and I want it back
13:19 Ice_Strike how do I do that?
13:19 daisy_ joined #git
13:20 clmsy joined #git
13:20 _ikke_ git stash pop
13:21 Vampire0 osse, are you then one from Data Respons?
13:22 oskarkv joined #git
13:22 tobiasvl we don't need to doxx people in here, do we
13:23 grawity git doxx drop
13:24 osse Vampire0: can I answer with a youtube link?
13:24 Vampire0 I don't know, try :-D
13:24 Gloomy joined #git
13:25 Ice_Strike _ikke_ I just done git stash pop, files missing
13:25 Ice_Strike Can I get a list of stash?
13:25 tobiasvl git stash list
13:25 osse Vampire0: https://www.youtube.com/watch?v=gM4DkF2rQ4U
13:26 * osse removes linkedin profile
13:26 Ice_Strike Ah
13:26 Ice_Strike git stash show -p stash@{1}
13:26 Ice_Strike I need that back
13:26 Hudu joined #git
13:26 Ice_Strike How do I get stash pop stash@{1} ?
13:26 osse Vampire0: that was a joke
13:27 tobiasvl Ice_Strike: did you try git stash pop stash@{1} ? or did you already pop that off the stash
13:27 Vampire0 osse, I'm not that flexible anyway and interpret it as yes :-D So now we are square *g*
13:27 mohabaks joined #git
13:27 Starky joined #git
13:28 osse lol
13:28 _ikke_ git stash apply stash@{1}
13:29 Ice_Strike Will tru
13:29 Ice_Strike try
13:29 Ice_Strike *.js.map is a pain with working with developers
13:29 Ice_Strike they all use gulp command
13:30 jast generated files should not be checked in at all
13:30 Ice_Strike so .gitignore ?
13:30 ^7heo what language?
13:30 Ice_Strike php laravel
13:30 ^7heo ok
13:31 ^7heo in Go, generated files *have* to be checked in.
13:31 ^7heo but in PHP, I don't know.
13:31 _ikke_ PHP as a language does not require anything
13:31 _ikke_ different frameworks have different requirements
13:32 ^7heo yeah
13:32 ^7heo I guess.
13:32 ^7heo I'm not too good with PHP.
13:33 Ice_Strike I need to google how to deal with *.js.map and *.css.map file
13:34 osse Ice_Strike: what are those?
13:34 _ikke_ Files that tell the browser how to deal with minimized files
13:34 theoceaniscool joined #git
13:34 Ice_Strike It is source maps
13:34 _ikke_ (for developer tools)
13:35 [0xAA] joined #git
13:36 jozwior joined #git
13:37 ^7heo _ikke_: ah, so sorta like a symbol table
13:37 carandraug left #git
13:39 skunkz joined #git
13:39 Ice_Strike *.js.map and *.css.map get generated via gulp command
13:39 Ice_Strike so each developer will use gulp command
13:40 JuliusN left #git
13:40 marijnfs joined #git
13:40 Ice_Strike and when I pull, it can cause conflict
13:40 Ice_Strike so I guess put that in gitignore file
13:40 Ice_Strike and then run gulp for myself
13:40 osse so it's a generated file
13:40 osse remove them from the repo
13:41 Ice_Strike osse what about app.js ? when mulitple files are merged into app.js
13:41 Ice_Strike I came issue with that as well
13:41 Ice_Strike conflict
13:41 osse that you just have to deal with
13:41 qqx Generally app.js would also be a generated file, and so shouldn't be in the repo.
13:42 Ice_Strike So when its ready for production -  I will push to git master, on the production server I will do git pull and then gulp.
13:42 pepe123 joined #git
13:42 Ice_Strike or setup auto deployment. Git pull, gulp.
13:43 cdown joined #git
13:43 brent__ joined #git
13:43 qqx Right. Besides causing conflicts, including generated files also causes clutter in diffs making it harder to do code reviews.
13:43 bongjovi joined #git
13:45 Ice_Strike qqx Actually.
13:45 nettoweb joined #git
13:47 ShekharReddy joined #git
13:47 Snugglebash joined #git
13:47 aard_ joined #git
13:49 mehola joined #git
13:50 Derperperd joined #git
13:52 kadoban joined #git
13:55 nickabbey joined #git
13:56 jeffreylevesque joined #git
13:57 denete_ joined #git
13:58 nettoweb joined #git
13:58 WayToDoor joined #git
14:02 Impaloo joined #git
14:05 minikN joined #git
14:05 Rodya_ joined #git
14:09 frobnic joined #git
14:11 mda1 joined #git
14:11 eroussel joined #git
14:12 nickabbey joined #git
14:17 roelmonnens joined #git
14:17 pietv joined #git
14:17 jimi_ joined #git
14:18 Nilesh_ joined #git
14:22 aard__ joined #git
14:23 snowkidind joined #git
14:24 Ryanar joined #git
14:27 Starky joined #git
14:31 ikelso joined #git
14:31 tirej joined #git
14:32 todd_dsm joined #git
14:35 tirej joined #git
14:35 tirej joined #git
14:38 kpease joined #git
14:39 Snugglebash joined #git
14:40 snowkidind joined #git
14:40 snowkidi_ joined #git
14:42 jameser joined #git
14:43 AlexP11223 joined #git
14:44 Dougie187 joined #git
14:44 kpease_ joined #git
14:47 dendazen joined #git
14:48 mohabaks joined #git
14:48 Murii joined #git
14:48 Orphis joined #git
14:49 AlexP11223 If I change date of my commits using git filter-branch (before push) is it possible to detect it later?
14:49 AlexP11223 I don't want to do it, but I encountered one person asking about it, probably with intents like cheating his employee/client
14:49 AlexP11223 So I wonder if it is possible to detect such things
14:50 AlexP11223 employer*
14:51 ankit01ojha joined #git
14:51 Darcidride joined #git
14:52 rewt it isn't
14:52 kadoban AlexP11223: There's no inherent way to verify the commit metadata like that, unless someone else has an original version.
14:52 masuberu joined #git
14:53 kadoban It'd be impossible to enforce, if you control a computer, how is the software supposed to stop you? git is distributed, meaning that unless you tell it to, everything stays on your machine alone. There is no central verifier of truth.
14:53 snowkidind joined #git
14:54 aw1 joined #git
14:54 Rodya_ joined #git
14:55 snowkidi_ joined #git
14:57 Guest36461 joined #git
14:58 lindenle joined #git
14:59 Emperor_Earth joined #git
15:00 cyan__ joined #git
15:01 chipotle_ joined #git
15:02 sdothum joined #git
15:05 setuid joined #git
15:05 mikecmpbll joined #git
15:06 robotroll joined #git
15:07 voldz1tic3n joined #git
15:10 multi_io_ joined #git
15:12 ShalokShalom joined #git
15:12 LeBlaaanc joined #git
15:13 hs366 joined #git
15:13 titankiller joined #git
15:13 sammyo joined #git
15:13 Orphis joined #git
15:13 AaronMT joined #git
15:18 Noldorin joined #git
15:20 sveinse joined #git
15:20 causasui joined #git
15:21 cdg joined #git
15:21 Ryanar joined #git
15:21 sveinse How do I properly fetch/pull a repo into a bare mirror repo? All the examples I find is using git push --mirror, but I don't have access to the upstream side.
15:22 Orphis joined #git
15:23 sveinse If use 'git remote update --prune'. Will that cover it?
15:26 le_melomane joined #git
15:26 chipotle joined #git
15:27 snowkidi_ joined #git
15:27 JeroenT joined #git
15:27 texinwien_ joined #git
15:30 Junior joined #git
15:30 eroussel joined #git
15:33 Orphis joined #git
15:33 cdg joined #git
15:34 mikecmpb_ joined #git
15:35 ResidentBiscuit joined #git
15:36 jameser joined #git
15:37 King_Hual joined #git
15:44 raspado joined #git
15:45 mischat_ joined #git
15:46 Darren_ joined #git
15:48 bgerber joined #git
15:50 mehola joined #git
15:53 bl0w3d_0ut joined #git
15:53 e14 joined #git
15:53 snowkidi_ joined #git
15:54 douglascorrea joined #git
15:55 rivarun joined #git
15:57 snowkidind joined #git
15:57 kyan joined #git
15:58 snowkidind joined #git
15:58 Particle1olem joined #git
15:59 snowkidi_ joined #git
16:01 snowkidind joined #git
16:01 dksvvljsdvs joined #git
16:01 Emperor_Earth_ joined #git
16:02 snowkidind joined #git
16:03 geoid_ joined #git
16:03 roelmonn_ joined #git
16:04 tinti joined #git
16:05 dksvvljsdvs need a  one-liner that will return latest commit user only - no luck with git show for me - any help?
16:05 grawity something along the lines of: git log --format=%A -1
16:06 isysd joined #git
16:06 celebre joined #git
16:07 xissburg joined #git
16:08 jagob joined #git
16:10 rominronin joined #git
16:10 jsolano joined #git
16:13 sveinse grawity: git log -n1?
16:13 jknetl joined #git
16:13 grawity whichever
16:13 grawity the %format is definitely missing a letter though
16:13 kettlewell joined #git
16:14 zefferno joined #git
16:14 sveinse grawity: git log -n1 --format="%ae" ?
16:14 ash_workz joined #git
16:15 dreiss joined #git
16:15 sveinse or %an if it's the name you're after
16:16 chardan joined #git
16:17 brent__ joined #git
16:18 thierryp joined #git
16:19 z1haze_work joined #git
16:19 z1haze_work i just did a git add -A but i forogt to add a directory to my gitignore.. how can i undo that add -A
16:20 RichiH z1haze_work: git status will show you the options from what's staged
16:20 King_Hual joined #git
16:20 King_Hual joined #git
16:20 RichiH in this case, not giving you the direct answer is probably better, long-term :)
16:20 z1haze_work yea its got my whole .idea folder in there
16:20 RichiH run git status and see for yourself
16:21 z1haze_work i know what ive added
16:21 z1haze_work im asking how to do i add it
16:21 pity joined #git
16:21 z1haze_work UNadd
16:21 RichiH yes, and i am telling you that git status will tell you
16:21 _ikke_ z1haze_work: what he means is that git status also gives hints on how to unstage and other things
16:21 treia joined #git
16:22 z1haze_work "git checkout -- <file>..." this?
16:22 z1haze_work then i have to do this for every single file?
16:22 roelmonnens joined #git
16:22 macivy joined #git
16:23 RichiH z1haze_work: as always, <file> refers to a path
16:23 canuk joined #git
16:23 RichiH so git checkout -- .
16:23 jast except that's not going to unadd anything
16:24 jast because you've been looking in the wrong section of 'git status' :)
16:24 LionsMane joined #git
16:24 z1haze_work look
16:24 z1haze_work a lot of the files i added i want in there
16:24 jast the 'git checkout -- <file>...' is for unstaged changes, whereas you've got *staged* changes
16:24 z1haze_work only one directory i accidentally added
16:25 jast that's one section further up. you find that command, pass it the name of that directory and you're done
16:25 z1haze_work i got it now thanks
16:26 svm_invictvs joined #git
16:27 dksvvljsdvs git log -n1 --format="%an" is getting me a full username it's close but looking for actual git username
16:28 jast there's no such thing as a "git username" tracked in history
16:28 jast commit metadata contains only the name/e-mail you set up in (for example) ~/.gitconfig
16:29 macivy left #git
16:30 raspado joined #git
16:30 Snugglebash joined #git
16:30 sveinse grawity: heh, sorry, I mistook you for the one asking the question of git log. :P
16:31 Peetz0r joined #git
16:31 hobodave joined #git
16:32 jameser joined #git
16:33 jccn joined #git
16:33 sonOfRa dksvvljsdvs: are you looking for the github username mapped to that name/email?
16:34 mikecmpbll joined #git
16:34 rivarun joined #git
16:34 Peetz0r joined #git
16:34 thethorongil joined #git
16:34 sonOfRa If yes, I don't think you can perform that "reverse lookup"
16:34 InfoTest joined #git
16:34 dksvvljsdvs sonOfRa - correct
16:34 sonOfRa Github shows the username based on the committer email
16:34 hiroki Small question: Am I correct to assume that a push to a Gitolite master that has slaves configured (replicating everything) will propogate changes to the slaves right away without a delay ?
16:34 mindfart joined #git
16:34 sonOfRa You can look up the emails a user has if you know their email, but not the other way around
16:35 Rodya_ joined #git
16:35 stamina joined #git
16:35 hiroki Wrong channel....
16:36 x0h_eax joined #git
16:37 sonOfRa dksvvljsdvs: you MIGHT be able to use the github API for this. But git itself does not record this information
16:37 Darren_ joined #git
16:37 gugah joined #git
16:37 Peetz0r joined #git
16:38 zeroed joined #git
16:38 zeroed joined #git
16:39 madewokherd joined #git
16:39 durham joined #git
16:40 howitdo joined #git
16:40 howitdo joined #git
16:42 jameser joined #git
16:42 voldz1tic3n joined #git
16:43 g_zen joined #git
16:44 dksvvljsdvs sonOfRa ty ty
16:45 jaafar joined #git
16:49 thiago joined #git
16:49 sonOfRa joined #git
16:52 pdgwien joined #git
16:52 multi_io joined #git
16:53 eZanmoto joined #git
16:53 CheckDavid joined #git
16:54 mischat joined #git
16:57 ikelso joined #git
16:57 tyreld joined #git
16:59 matsaman joined #git
17:00 ikelso_ joined #git
17:00 e14 joined #git
17:01 eZanmoto Can you get access to the changes being pushed on the server side when you're using the `update` hook?
17:01 sveinse
17:01 paladinn joined #git
17:01 paladinn joined #git
17:02 mischat_ joined #git
17:02 eZanmoto i.e. if I'm pushing changes, can I test those changes before they're committed to the remote repo using the `update` hook?
17:02 tang^ joined #git
17:03 m0viefreak joined #git
17:04 LiENUS is there a way to set up a branch (that gets pushed to remote as well) that follows another branch without needing to be pulled, committed and pushed on a regular basis?
17:04 LiENUS sort of a branch alias
17:06 cdown joined #git
17:09 Ryanar joined #git
17:10 theoceaniscool joined #git
17:10 rominron_ joined #git
17:12 jameser joined #git
17:19 Hudu joined #git
17:19 matsaman joined #git
17:19 Snugglebash joined #git
17:20 Murii joined #git
17:20 rivarun joined #git
17:21 grawity nope
17:22 grawity well, if you want them to be *identical*, you could ssh to the remote and set up a symbolic ref
17:22 grawity assuming you can ssh to the remote
17:22 grawity but otherwise no, not without some client-side hook scripting
17:22 ac3takwas joined #git
17:23 perlpilot joined #git
17:24 Starky joined #git
17:24 LiENUS im doing it on github
17:25 LiENUS the jist is im using docker hub's  dynamic tag name stuff, it generates new tags on docker based on branch and tag names
17:25 chipotle joined #git
17:26 geoid_ joined #git
17:26 LiENUS i have a branch for 3.0 of some software but it also needs to be master
17:27 [0xAA] joined #git
17:29 jaafar joined #git
17:31 timvisher joined #git
17:31 tvw joined #git
17:34 svm_invictvs joined #git
17:36 publio joined #git
17:36 kyan joined #git
17:37 Raging_Hog joined #git
17:39 al-damiri joined #git
17:42 ikelso joined #git
17:43 raspado joined #git
17:44 Raging_Hog joined #git
17:44 Rodya_ joined #git
17:45 mda1 joined #git
17:46 chipotle_ joined #git
17:47 e14 joined #git
17:48 Rodya__ joined #git
17:48 Guest36461 joined #git
17:50 mmattice are there cases where `git log -p $filename` won't show changes to that file?
17:50 Vampire0 LiENUS, so when you push to 3.0 you want to push the same state to master?
17:51 geoid_ joined #git
17:51 LiENUS Vampire0, well probably push to master and it updates 3.0 but thats pretty much the same thing
17:51 LiENUS well from what i understand it is the same thing as far as git is concerned
17:51 Vampire0 LiENUS, how about `git config alias.push3 push master master:3.0`?
17:51 LiENUS docker is slightly different about it
17:52 Vampire0 LiENUS, this should push master to master and 3.0 if you do `git push3
17:52 LiENUS so i would remove my local 3.0 branch and just use master?
17:53 mohabaks joined #git
17:55 BSAlb joined #git
17:57 Hudu joined #git
17:57 sargas_ joined #git
17:58 hahuang65 joined #git
18:00 TheCynicalPanda joined #git
18:00 Vampire0 LiENUS, if you don't need it, sure. You can always push any arbitrary commit to a remote branch by using a full refspec. That `git push master` automatically does `git push master:master` is just convention. You can also do `git push 3466df6:master` if you want (and have a commit with that SHA1)
18:01 causasui joined #git
18:02 lindenle joined #git
18:04 chipotle joined #git
18:04 thiago mohabaks: it could happen for a merge commit
18:08 hramrach joined #git
18:08 codemann joined #git
18:12 doener joined #git
18:14 spacelord_ joined #git
18:14 ikelso joined #git
18:17 rewt joined #git
18:19 cdown joined #git
18:20 noecc joined #git
18:21 ianmethyst joined #git
18:24 eroussel joined #git
18:25 xall_ joined #git
18:25 hramrach joined #git
18:26 dreiss joined #git
18:27 Nysar joined #git
18:30 douglascorrea joined #git
18:30 Rodya_ joined #git
18:31 gugah joined #git
18:31 metachr01 joined #git
18:32 jstein_ joined #git
18:33 metachr0n joined #git
18:33 thierryp joined #git
18:34 nowhere_man joined #git
18:36 hasc joined #git
18:36 douglascorrea joined #git
18:38 mda1 joined #git
18:38 ihradek joined #git
18:41 qqx joined #git
18:41 rominron_ joined #git
18:43 btyne79 joined #git
18:43 nowhere_man joined #git
18:43 Hudu joined #git
18:44 duderonomy joined #git
18:45 Croves joined #git
18:46 Rodya_ joined #git
18:46 Croves Hi folks. I have reverted my branch to before a specific merge request using `git revert -m 1 <merge>`. Now, I'd like to go "foward" in each merge to see in what merge my feature stop working. Is that possible?
18:46 synthroid joined #git
18:46 grawity that's not how `git revert` works though
18:46 grawity or rather, that's not what "revert" does in Git
18:47 grawity you would use `git checkout` if you merely want to jump around between commits
18:47 grawity and `git bisect` to automate bug searching
18:47 XVar joined #git
18:49 Croves grawity: is this work with remote branches?
18:49 grawity it works with remote-tracking branches just as well as local ones
18:50 grawity though before doing it, maybe remove that revert that you needlessly added
18:50 Croves How should I revert that?
18:51 jost joined #git
18:51 Croves I just figured out that my server erases the remote branch after the testing & deployment
18:51 dreiss joined #git
18:51 mehola joined #git
18:51 Kulrak joined #git
18:51 Kulrak joined #git
18:52 Nysar joined #git
18:53 boombatower joined #git
18:55 cdg_ joined #git
18:59 ResidentBiscuit joined #git
19:00 codemann joined #git
19:01 aw1 joined #git
19:01 BackEndCoder joined #git
19:02 prawnzy joined #git
19:02 fatalhalt joined #git
19:03 e14 joined #git
19:04 Ryanar joined #git
19:06 srcerer joined #git
19:06 b100s joined #git
19:07 prg3 joined #git
19:08 regedit joined #git
19:09 tyreld joined #git
19:10 prawnzy joined #git
19:13 zeroed joined #git
19:13 zeroed joined #git
19:13 cdown joined #git
19:14 cdg joined #git
19:14 bill99 joined #git
19:16 MacWinner joined #git
19:18 cqi joined #git
19:20 ecuanaso joined #git
19:21 ecuanaso left #git
19:21 ecuanaso joined #git
19:21 Nysar joined #git
19:21 durham_ joined #git
19:22 sargas joined #git
19:25 MineCoins joined #git
19:29 idlemind joined #git
19:29 druonysus_ joined #git
19:30 denete__ joined #git
19:35 satifant joined #git
19:38 kent\n joined #git
19:39 jccn joined #git
19:41 beny joined #git
19:41 beny joined #git
19:42 Flaghacker joined #git
19:44 Flaghacker I had a problem that was caused by something going corrupt in .git (as we determined a couple of days ago on this channel) but the issue is solved when I clone my local project. I can't however figure out a way to do this while cloning all branches and keeping the old origin (Github). How can I do a full clone?
19:45 moritz Flaghacker: generally with git clone --mirror
19:45 Flaghacker moritz, Thanks, I'll try that!
19:47 peacememories joined #git
19:47 peacememories hi everyone
19:47 gitinfo peacememories: 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.
19:47 NeverDie joined #git
19:47 peacememories can't quite figure this out: if i have a git repo, and another git repo in a subdirectory, can i somehow merge the subdirectory with its history into the parent repo?
19:47 hasc_ joined #git
19:48 t94j0 joined #git
19:48 grawity yeah, search for 'subtree merge'
19:48 grawity I think even `git subtree` is a thing nowadays
19:48 t94j0 left #git
19:48 geoid_ joined #git
19:48 peacememories grawity already did, but it sounds a bit like it's supposed to pull in the subdirs from remotes instead of just using the local ones?
19:49 jsolano joined #git
19:50 hasc joined #git
19:50 idlemind joined #git
19:51 peacememories oh, sorry for disappearing after asking a question, but i have to go. bye everyone
19:52 durham joined #git
19:54 spacelord_ joined #git
19:56 hobodave_ joined #git
19:58 pity joined #git
19:58 Flaghacker moritz, That only cloned the .git folder though. Should I just put those files in the result of a normal clone?
19:59 osse --mirror implies --bare AFAIK
19:59 moritz Flaghacker: it creates a bare repo; you can push from that
19:59 moritz Flaghacker: if you want a copy to work with, do a normal clone
20:00 moritz there are also tutorials out there on how to turn a bare repo in a non-bare one
20:00 nowhereman joined #git
20:01 Flaghacker moritz, The problem was that a normal clone doesn't copy all the the branches, would starting from a bare one and turning it into a non-bare one fix that?
20:02 moritz Flaghacker: yes
20:02 dedondesta joined #git
20:02 Flaghacker And it doesn't simply copy the whole .git folder over, right? Because that wouldn't solve my proble.
20:02 lindenle joined #git
20:02 dedondesta how do i undo merge and already been pushed?
20:03 jimi_ joined #git
20:04 kadoban dedondesta: You can revert a merge. It has one big thing to remember though: when you want to merge in the future *first, revert the revert of the merge*
20:04 kadoban man git revert
20:04 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
20:04 aidalgol joined #git
20:04 LBV_User joined #git
20:09 overlord_tm joined #git
20:13 texinwien joined #git
20:14 rominron_ joined #git
20:14 texinwien joined #git
20:15 askb joined #git
20:18 Cabanoss- joined #git
20:21 e14 joined #git
20:23 noecc left #git
20:24 geoid_ joined #git
20:25 rwb joined #git
20:28 ikelso joined #git
20:28 prawnzy joined #git
20:29 cdown joined #git
20:29 m0viefreak joined #git
20:30 n-st joined #git
20:32 mischat joined #git
20:33 mischat joined #git
20:35 jnavila joined #git
20:36 Es0teric joined #git
20:37 ikelso joined #git
20:40 lucasem joined #git
20:42 ji joined #git
20:43 ji left #git
20:43 ji joined #git
20:44 courrier joined #git
20:45 HELPme joined #git
20:46 Guest4206 hello
20:46 gitinfo Guest4206: 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.
20:46 Guest4206 i need help
20:46 Guest4206 anytime i try to clone a link from github i get 'fatal' unable to resolve host 'github.com'
20:47 Guest4206 is anyone here who can help?
20:48 Guest4206 anyone at all?
20:49 kadoban Guest4206: Sounds like a network problem more than anything. Are you behind any kind of proxy, or?
20:49 kadoban Can you visit github.com in your browser successfully?
20:49 Guest4206 I disable firewall.  I don't believe i am behind a proxy
20:49 Guest4206 i can visit github.com successfully yes
20:50 mischat joined #git
20:50 LionsMane joined #git
20:51 nickabbey joined #git
20:52 e14 joined #git
20:54 gugah joined #git
20:54 Guest4206 any suggestions?
20:55 Dougie187 How are you cloning?
20:55 kulelu88 joined #git
20:55 d5sx43 joined #git
20:55 Guest4206 git clone + link
20:55 Dougie187 But what kind of link?
20:55 Dougie187 git@github.com, or https://github.com?
20:56 Guest4206 https://github.com
20:56 Atm0spher1c joined #git
20:58 Dougie187 can you ping www.github.com?
20:58 Guest4206 yes
20:58 zeroed joined #git
20:58 Flaghacker joined #git
20:58 Dougie187 No ideas from me then. I don't usually use the https links because I find them more annoying.
20:59 Dougie187 maybe someone else can give some ideas.
20:59 j416 joined #git
20:59 ecuanaso joined #git
20:59 Guest4206 up till last week whenever i cloned any link it all went smoothly
21:00 Guest4206 this week for some strange reason it just is unable to resolve host github.com
21:00 theoceaniscool joined #git
21:01 sarri joined #git
21:01 sarri joined #git
21:05 n-st joined #git
21:05 cagedwisdom joined #git
21:05 Tobbi joined #git
21:06 n-st joined #git
21:07 Guest4206 left #git
21:07 dsdeiz joined #git
21:10 anuxivm joined #git
21:10 j416 joined #git
21:14 Nysar joined #git
21:15 Singmyr joined #git
21:18 Derperperd joined #git
21:18 matsaman joined #git
21:18 dreiss joined #git
21:23 druonysus_ left #git
21:27 ecuanaso joined #git
21:29 jeffreylevesque joined #git
21:29 rivarun joined #git
21:31 denete_ joined #git
21:33 jccn joined #git
21:34 Rodya_ joined #git
21:40 eroussel joined #git
21:40 Flaghacker joined #git
21:41 Limes__ joined #git
21:43 Flaghacker Hey guys! I cloned a local project using "git clone --mirror ...", then I converted the resulting bare project to a normal one using this guide (http://stackoverflow.com/a/10637882/5517612). When I now try to "git push origin master" i get the error "error: --mirror can't be combined with refspecs". I already tried changing origin to be github again, is there something else I need to do?
21:44 moritz Flaghacker: does the .git/config mention "bare" or "mirror" or anything related?
21:44 energizer joined #git
21:44 energizer is it possible to git diff <(sort myfile) <(sort file2)
21:44 rominronin joined #git
21:45 moritz energizer: have you tried it?
21:45 Flaghacker moritz, Under [core] it says "bare = false" and under [remote "origin"] it says "mirror = true", so yes.
21:45 energizer moritz: yeah doesnt work exactly like that, maybe somehing a little different
21:47 nickabbey joined #git
21:47 moritz energizer: you could use ordinary diff -u
21:48 energizer moritz: im looking for --color-words
21:48 moritz Flaghacker: try removing the mirror = true
21:49 tyreld joined #git
21:49 Sasazuka joined #git
21:49 Flaghacker moritz, Thanks, that worked! What did that mean?
21:49 moritz Flaghacker: "hey look, this is not a mirror anymore"
21:50 HcsOmot_ joined #git
21:50 moritz energizer: you can use diff-hilight for that
21:50 Flaghacker And what does it mean to be a mirror? Why was that specified within [remote "origin"]?
21:51 moritz Flaghacker: it means that pulling and pushing works on all branches by default, not just on the current oen
21:53 mehola joined #git
21:53 SwiftMatt joined #git
21:54 dreiss joined #git
21:56 Flaghacker moritz, Okay thanks for helping me and thanks for the explanation.
21:59 idlemind joined #git
22:00 cdown joined #git
22:00 tvw joined #git
22:02 thallada joined #git
22:02 thallada joined #git
22:03 HcsOmot_ i'm trying to learn git by solving problems on learngitbranching.js.org and I'm wondering how accurate it is. this is what one of the problems looks like, and what I did. the app didn't accept my solution as valid. I'm wondering what exactly happens to commits when you do git reset HEAD^. could anyone help out please?
22:03 Lea2 joined #git
22:03 HcsOmot_ http://pasteboard.co/q4XQca77U.png
22:04 energizer joined #git
22:04 cdg joined #git
22:05 cdg joined #git
22:05 tyreld joined #git
22:06 blackwind_123 joined #git
22:08 ikelso joined #git
22:08 rivarun joined #git
22:08 douglascorrea joined #git
22:09 jstimm joined #git
22:09 chipotle joined #git
22:10 Nysar joined #git
22:10 sand-bird joined #git
22:10 isysd joined #git
22:11 HcsOmot_ actually, take this link into considerations
22:11 HcsOmot_ http://pasteboard.co/q57NAF8Gj.png
22:11 ikelso_ joined #git
22:12 dunpeal joined #git
22:13 systemovich joined #git
22:14 dunpeal Hi. I have master, and a branch foo diverging from it. Since the divergence, foo had one unique commit A made into it, followed by a merge of master (1 commit B) followed by one more unique commit C on foo. I'd like to squash A and C together into a single commit D, but not include B. Is there a clean option?
22:14 energizer1 joined #git
22:14 Rodya_ joined #git
22:15 thiago dunpeal: no
22:15 dunpeal If I do `git rebase -i A^`, I get the B commit in the list of commits to be merged.
22:15 dunpeal thiago: really?  I'm OK with rebasing foo.
22:15 MattMaker joined #git
22:15 irqq_ joined #git
22:15 dunpeal It's a private branch, I'm the only user.
22:16 Cabanoss- joined #git
22:16 cdg_ joined #git
22:16 thiago the problem is B
22:16 thiago you need to undo the merge
22:16 MattMaker joined #git
22:17 dunpeal Can't I just rebase C onto A?
22:17 thiago easiest is to checkout A, then cherry-pick -n C, git commit --amend
22:17 dunpeal right, or just rebase C onto A, then squash them with rebase -i
22:18 thiago the problem with doing the rebase is that it might show the commits coming via B
22:19 thiago so I cannot recommend it because I don't know how rebase -i will behave
22:19 dunpeal Seems fine, actually.
22:19 peacememories joined #git
22:19 dunpeal I just did a rebase -i, and removed B manually.
22:19 ghoti joined #git
22:20 canuk joined #git
22:20 dunpeal The reason I asked is because it seems like a common task that would be tedious.
22:21 dunpeal I.E. this is obviously a minimal example, with just 3 commits, but often you will have have tons of merged ("B") commits sprinkled among foo commits.
22:21 dunpeal So I thought there would be a shortcut.
22:21 d5sx43 joined #git
22:21 peacememories joined #git
22:22 ikelso joined #git
22:23 mischat joined #git
22:23 thiago it's unlikely to be common
22:23 TrentonDAdams_ joined #git
22:24 dunpeal I think another thing you can do here is to merge --squash back to master.
22:24 jccn joined #git
22:24 thiago if you're still working on your commits and you possibly want to edit them, you shouldn't be merging
22:24 thiago you should be rebasing
22:24 TrentonDAdams_ left #git
22:24 TrentonDAdams_ joined #git
22:24 dunpeal thiago: thing is, rebasing so often is kinda messy.
22:24 dunpeal you have to push -f every time you do.
22:25 TrentonDAdams joined #git
22:25 cdg joined #git
22:25 dunpeal thiago: also, this question is relevant even if you're done working and just want to merge back via a PR or whatever.
22:25 TrentonDAdams is there a way of forcing git log graph option to always show a branch with a branch?  i.e. I have a branch I just rebased against master, but it's confusing for that branch to show in the same line as the master, cause it's a different branch
22:25 ismaris joined #git
22:25 dunpeal e.g. you want to have a PR be a single clean commit, instead of a jumble of many small ones.
22:26 TrentonDAdams dunpeal, I'm toying with the squashing concept.  It seems nice, because you don't get sprinkled commits
22:26 TrentonDAdams And, it's very clear if you have a project branch, what was changed
22:27 shamowfski joined #git
22:27 Virox joined #git
22:28 thiago TrentonDAdams: if it's been rebased, there's no branching
22:28 thiago dunpeal: you can do that, via rebase.
22:29 thiago you always rebase. Don't merge until it's finished.
22:29 d5sx43 joined #git
22:30 rwb joined #git
22:30 lindenle joined #git
22:32 nettoweb joined #git
22:34 dreiss joined #git
22:36 adymitruk is there a way to only show decorated commits, branch points and merge points in git log --graph and exclude all other commits?
22:37 adymitruk or even simpler, only show decorated commits and any relevant branches and merges to them?
22:38 crayon joined #git
22:38 hahuang65 joined #git
22:44 Ryanar joined #git
22:47 ToBeCloud joined #git
22:53 douglascorrea joined #git
22:53 peacememories hmm, still can't figure this out. trying to integrate a repository into a parent repository (preserving commits etc)
22:55 MrWoohoo joined #git
22:56 Nokurn joined #git
22:57 cagedwisdom joined #git
22:58 redhedded1 joined #git
22:58 Eugene peacememories - !subrepo
22:58 gitinfo peacememories: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
22:59 Eugene If you want to merge the subrepo's history with the parent.... then you're in for a ride
22:59 peacememories Eugene then i guess i'm in for a ride^^'
22:59 Eugene The usual approach is to copy the files in and commit it with a message of "Copied from $OLD_REPO_URL at commit ABCDEF"
23:00 Eugene Here's a blog post(I haven't tried it) that gives the full rollercoaster procedure. https://passingcuriosity.com/20​15/combining-git-repositories/
23:00 Eugene You'll also want to read man git-filter-branch
23:00 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
23:01 fmeerkoetter joined #git
23:01 Eugene Straightening out merges is left as an exercise
23:02 Eugene My honest advice is to re-examine why you care about history. In almost all scenarios the answer is "because I want to", and IMO it is far, far simpler to leave a note explaining why you didn't bother.
23:02 Eugene You may also want to reat up on https://git.wiki.kernel.org/index.php/GraftPoint
23:02 peacememories yeah, i think i just won't bother^^'
23:03 peacememories i was hoping to find a somewhat elegant solution, but it's really not worth it breaking open the git internals^^
23:04 TrentonDAdams thiago, I rebased though, I didn't merge it to master.
23:04 TrentonDAdams Yes, the history is the same up until the branch I rebased, and then it's just my changes from that point on, but it's still weird visually to see it look like the changes are on master.
23:05 cdg_ joined #git
23:05 TrentonDAdams Oh, it does change the color of the graph characters.
23:05 Eugene Indeed.
23:07 Dougie187 left #git
23:07 madewokherd joined #git
23:07 ecuanaso joined #git
23:09 publio joined #git
23:09 snowkidind joined #git
23:10 Guest36461 joined #git
23:10 WifiBrain joined #git
23:11 Cabanossi joined #git
23:12 dsdeiz joined #git
23:14 NeverDie joined #git
23:16 rominronin joined #git
23:16 Nysar joined #git
23:19 cdg joined #git
23:21 lindenle joined #git
23:22 matsaman joined #git
23:22 snowkidind joined #git
23:24 ismaris joined #git
23:24 Sasazuka__ joined #git
23:25 nettoweb joined #git
23:27 boz_v1 joined #git
23:27 snowkidind joined #git
23:28 ShapeShifter499 joined #git
23:28 johnny56_ joined #git
23:29 energizer joined #git
23:29 dsdeiz joined #git
23:30 CheckDavid joined #git
23:32 Samual joined #git
23:32 dendazen joined #git
23:33 denete joined #git
23:33 lindenle joined #git
23:33 Nysar joined #git
23:35 a_thakur joined #git
23:36 a_thakur joined #git
23:37 GavinMagnus joined #git
23:37 bocaneri joined #git
23:38 Kaisyu joined #git
23:39 trip joined #git
23:39 parasite_ joined #git
23:41 hasc_ joined #git
23:42 cdg joined #git
23:44 rkazak joined #git
23:44 jameser joined #git
23:46 Samual joined #git
23:48 jccn joined #git
23:51 msonntag joined #git
23:51 jameser joined #git
23:52 swords joined #git
23:52 sargas joined #git
23:53 Zoxc joined #git
23:53 NeverDie joined #git
23:54 moei joined #git
23:55 raspado joined #git
23:55 snowkidind joined #git
23:56 snowkidi_ joined #git
23:56 Zialus joined #git
23:58 barteks2x joined #git
23:58 BlessJah is there an actual algorith to determine graph color or is it just an random thing? (algorith as in "it's based on branching point hash" or "it will loop through red-yellow-magenta...")

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