Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-06

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

All times shown according to UTC.

Time Nick Message
00:00 _leb joined #git
00:03 nickabbey joined #git
00:03 anonymuse joined #git
00:04 ThatWebGuy joined #git
00:04 fmcgeough joined #git
00:04 nettoweb joined #git
00:05 tnecniv joined #git
00:06 twg I'm having issues with only tracking a theme I'm creating.  Whenever I try to just track the changes for the theme, it tries to track the changes across the entire application.
00:06 pks joined #git
00:07 thiago twg: please rephrase without saying "theme" and "application". That doesn't exist in Git.
00:07 thiago there are files, directories, the whole repository.
00:08 twg Okay the folder (THEME) I'm working has many files.  I want to track only those files but it seems every time that I add items, it tracks the folders outside of my "theme" folder.
00:08 venmx joined #git
00:09 d0nn1e joined #git
00:09 thiago where is the top of the repository? Inside "theme" or not?
00:10 SpecChum joined #git
00:10 twg That where I want it to be.  For some reason it's make the very top most folder of the project.  I don't need to track all of that as I'm not editing anything inside it.
00:11 thiago does .git already exist in that project?
00:13 twg yes
00:13 thiago delete it
00:13 twg okay
00:13 thiago only after it's been deleted can you git init inside themes
00:13 thiago note: this will lose data
00:14 thiago make sure there's nothing that you can't afford to lose
00:14 blackjid joined #git
00:14 thiago back it up if you need to
00:19 twg left #git
00:21 tmsmith joined #git
00:22 chardan joined #git
00:23 texinwien_ joined #git
00:25 mar77i joined #git
00:27 lvns joined #git
00:35 tmsmith joined #git
00:38 Mobutils_ joined #git
00:42 cagedwisdom joined #git
00:45 anonymuse joined #git
00:48 rahtgaz joined #git
00:51 _28_ria joined #git
00:51 _main_ joined #git
00:51 holodoc joined #git
00:53 User458764 joined #git
00:54 jaguarmagenta joined #git
00:57 BSaboia joined #git
00:58 BSAlb joined #git
01:00 BSAlb joined #git
01:01 jccn joined #git
01:05 scorphus joined #git
01:05 cdown joined #git
01:06 shgysk8zer0 joined #git
01:10 Lemandros joined #git
01:10 Lemandros hi
01:10 gitinfo Lemandros: 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.
01:11 User458764 joined #git
01:11 Lemandros I have a question about a commit I tried to do but which failed when my qt creator crashed :(
01:14 Lemandros when I wanted to commit stuff, I first pulled and then stash and popped all the updated things, after which the application crashed
01:14 Lemandros I found a bunch of files in the /.git/object directory that were made around the time I staged the updated code and was wondering if the files I wanted to push can somehow be recovered from there
01:15 Lemandros or, if I can't decode those directly, if I can still push them and just pull again
01:16 BSaboia joined #git
01:18 shinnya joined #git
01:18 ismithers joined #git
01:18 cdown_ joined #git
01:19 kier joined #git
01:19 Wasp I have no idea, but what about just making a copy/backup and just try?
01:19 peeps[lappy] joined #git
01:20 Lemandros I don't know how, they're all binary files
01:20 hexagoxel joined #git
01:20 alyptik joined #git
01:20 jlebar joined #git
01:21 matsaman joined #git
01:21 dcpc007 joined #git
01:21 HoierM joined #git
01:22 mar77i joined #git
01:22 jeffreylevesque joined #git
01:22 dsantiago joined #git
01:23 Wasp I read again and have to admit: I don't get the problem
01:24 Wasp you sai your push crashed
01:24 Wasp but the commit didn't. So I what is the problem here?
01:25 Wasp just push again?
01:25 * Wasp will underilne that he has no idea about git still ;)
01:25 Wasp -will, +s ;)
01:26 menip joined #git
01:26 Wasp in fact I am stuck my own on a merge conflict during rebase
01:26 Wasp git tells me to solve the conflicts, but I cannot see any marked conflicts
01:28 Gabemo joined #git
01:29 Lemandros I've been using git for a week and am still not that used to it :)
01:29 Lemandros when I popped/stashed it all my new and updated files got reverted/deleted and I panicked
01:30 Lemandros turns out the stash was fine so I just recovered from there
01:30 Lemandros thanks anyway!
01:31 Wasp ood
01:31 Wasp good
01:31 Samual joined #git
01:32 Anja joined #git
01:34 isysd joined #git
01:39 venmx joined #git
01:39 jnewt_ everytime i try tab completion i get warning: ignoring broken ref refs/remotes/origin/HEAD
01:42 howitdo joined #git
01:43 howitdo joined #git
01:44 ome joined #git
01:45 Gsham joined #git
01:46 cqi joined #git
01:47 __main__ joined #git
01:48 tmsmith joined #git
01:49 foul_owl joined #git
01:49 k_sze[work] joined #git
01:50 foul_owl I accidentally did a commit after adding a directory with venv files. As a result, my repo has grown by hundreds of megs. I managed to undo adding the venv dir and got .gitignore put into place, but how do I remove that history now? Especially WRT repo size?
01:50 [0xAA] joined #git
01:50 k_sze[work] There is something I don't understand about git hooks: what user do hooks execute as? Is there any way to control it?
01:51 holodoc joined #git
01:52 HedgeMage k_sze[work]: They run as whatever user invoked git.
01:52 HedgeMage k_sze[work]: Which user this is may depend on your install.
01:52 HedgeMage k_sze[work]: I have this set up so it is always a user dedicated to the purpose, to prevent accidents.
01:53 Wasp foul_owl: you could just check out the last commit. I mean that's what git is made for
01:54 foul_owl I understand that, but the repo size has gone up by hundreds of megs now
01:54 foul_owl How do I remove that data?
01:56 Wasp ah
01:57 Wasp just googled right now myself
01:57 Wasp stash the changes you wanna keep first
01:57 f0rks joined #git
01:57 Nilesh_ joined #git
01:58 Wasp reset hard (google it yourself), don't wanna that you copy and paste something from me, what I am not expirience of
01:58 Wasp foul_owl: http://stackoverflow.com/questions/1338​728/delete-commits-from-a-branch-in-git
01:58 jaguarmagenta joined #git
02:00 dikiaap joined #git
02:01 Vampire0_ joined #git
02:02 jmpp joined #git
02:02 jmpp joined #git
02:03 foul_owl Already pushed to oring
02:03 foul_owl origin
02:03 Wasp bad luck :)
02:03 foul_owl I noticed because the push was taking forever
02:04 foul_owl How do I remove in that case then?
02:04 Wasp no idea, ever considered to look it up on the internet your self?
02:04 red82 joined #git
02:05 [0xAA] joined #git
02:05 foul_owl My guess is git-filter-branch
02:05 foul_owl But unsure
02:05 southernvg joined #git
02:06 Wasp if it is pushed, it is out
02:06 Wasp that's all i know
02:06 Wasp further
02:06 Wasp maybe you are lucky and body pulled so far
02:06 Wasp so you could force push
02:07 gchristensen left #git
02:07 Wasp in fact it is exactly what I try atm as well
02:07 pks joined #git
02:07 mizu_no_oto joined #git
02:08 Wasp but a) I know that there is nobody who pulled or at least I don't care
02:08 foul_owl It appears that it doesn't matter if someone pulled
02:08 foul_owl If they pull again, those files get nuked from their history
02:08 foul_owl ie: http://naleid.com/blog/2012/01/17/findin​g-and-purging-big-files-from-git-history
02:08 foul_owl But not certain
02:08 Mobutils_ joined #git
02:10 Wasp just a few minutes ago I was reading the opposite
02:11 Wasp maybe my source is older. Don't know
02:15 CussBot joined #git
02:15 User458764 joined #git
02:15 breezy_ joined #git
02:19 serialoverflow joined #git
02:22 foul_owl Are you saying there is no way to remove large files from git?
02:23 foul_owl Rather, from the history entirely?
02:24 atrus foul_owl: you can, but it's destructive to everybody that already has it. once it's in the history, it's there, and you have to re-write all the history after the point you change it.
02:25 Vampire0 joined #git
02:26 atrus foul_owl: see: https://git-scm.com/book/ch3-​6.html#The-Perils-of-Rebasing
02:27 foul_owl Can't everyone stash their changes?
02:27 foul_owl Or something like that?
02:27 foul_owl Also: it's on a branch no one else uses
02:28 foul_owl Can you do filter-branch rather than rebase
02:28 foul_owl ?
02:29 foul_owl I mean....if someone accidentally checks in a 1 gig file, you are telling me the repo will stay larger than 1 gig for ever? essentially ruining the entire repo?
02:29 groundup joined #git
02:31 Eugene foul_owl - !annex
02:31 gitinfo foul_owl: git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
02:31 foul_owl I don't need to store binaries...I'm trying to fix a commit that I pushed
02:31 Eugene And yes; hosting providers(eg, Github) will generally not allow you to make such a big push to prevent such things from happening. IMO git ought to throw a warning, but.... yeah
02:31 foul_owl I pushed a commit with 100 MB worth of venv crap
02:32 Eugene Then you get to rebase it away
02:32 Eugene It looks like you've already found a blogpost on purging
02:32 foul_owl Ok, rebase will remove it from the history also?
02:32 Eugene Yup. You'll need to !force push afterwards
02:32 gitinfo [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push --force-with-lease`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.
02:32 groundup I have a project with a bunch of docker containers in it. I want to change those containers and switch branches without committing to the main repo. One branch of my docker stuff is for development (enables a bunch of tools) the other is for testing/production. I am thinking of creating a submodule for the docker stuff and including that in the main repo. Does that make sense or is there a better way of controlling the versioning?
02:32 Eugene And endure the shame of having rewritten history
02:32 foul_owl Haha well I assumed it could be undone easily
02:33 foul_owl Oh well
02:33 foul_owl Live and learn
02:33 Eugene man gitignore; learn to not do it again ;-)
02:33 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
02:33 finalbeta joined #git
02:33 foul_owl I had a gitignore in place
02:33 foul_owl Just not on the branch I was working on :(
02:33 Eugene D'oh
02:33 foul_owl Yeah :(
02:33 baryon joined #git
02:34 foul_owl Stupid mistake
02:34 foul_owl Would you recommend rebase over filter-branch?
02:35 chachasmooth joined #git
02:35 Eugene How long ago was the troublesome commit
02:36 Eugene And was it just one?
02:36 foul_owl Just one commit
02:36 foul_owl I pushed the commit
02:36 foul_owl And then removed the dir and pushed again
02:36 foul_owl That's it
02:37 foul_owl Then realized....crap...100MB of files in the history I don't want
02:37 red82 joined #git
02:37 Eugene Use `git log` to find the last goot commit(before you goof'ed). `git reset --hard SHA` to it. `git push -f` to shove it up.
02:37 durham_ joined #git
02:38 foul_owl Ahhh ok
02:38 foul_owl Thank you
02:38 t-mart joined #git
02:38 tmsmith joined #git
02:38 Eugene You're lucky tht this is a simple case; If you had later commits it would be rebase, or multiple commits is a filter-branch situation
02:38 pikajude joined #git
02:38 foul_owl Will that affect other users?
02:39 foul_owl Other users will have to do a pull after I do my push -f right?
02:39 Eugene Proooobably not too much, if they're not working on that branch.
02:39 foul_owl Ah yeah, it's a basically unusued branch
02:39 foul_owl "testing" XD
02:39 Eugene If they have made any new commits then they'll get to rebase, but it sounds like that doesn't apply
02:39 foul_owl It _should_ be used :P
02:39 foul_owl Ok perfect
02:40 foul_owl Thanks again :)
02:40 Eugene Cheers
02:40 Eugene A bookmark for you for next time: !fixup
02:40 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
02:40 dodobrain joined #git
02:41 kyan joined #git
02:41 foul_owl Oo perfect
02:42 foul_owl Can I back up the repo before doing reset --hard?
02:46 foul_owl Just in case my reset changes screw anything up
02:46 foul_owl I can push my local backup back to origin?
02:46 foul_owl Oo that site tells me I can
02:46 foul_owl I'll do that
02:46 foul_owl Thanks!
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:52 groundup Looks like I don't want a subtree or a submodule. I guess it's not something I should do inside the project or even in Git.
02:53 jaguarmagenta joined #git
02:59 Vampire0_ joined #git
03:02 b3kN joined #git
03:02 b3kN joined #git
03:03 _leb joined #git
03:05 aavrug joined #git
03:06 cebor joined #git
03:09 Andrew_K joined #git
03:09 Vampire0 foul_owl, !backu
03:09 gitinfo foul_owl: [!backup] Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
03:10 venmx joined #git
03:13 chachasmooth joined #git
03:14 ejb joined #git
03:17 moei joined #git
03:25 Emperor_Earth joined #git
03:27 jstimm joined #git
03:29 tmsmith joined #git
03:29 mkoskar joined #git
03:29 guest____ joined #git
03:32 Limes_ joined #git
03:32 Starky joined #git
03:37 mizu_no_oto joined #git
03:38 TikityTik why does git status only compare to origin/master?
03:38 TikityTik I wanted to see how far my branch was compared to a remote branch.
03:38 Noldorin joined #git
03:39 watabou joined #git
03:41 shpew12 joined #git
03:43 sunri5e joined #git
03:43 thiago TikityTik: it compares against the upstream
03:44 thiago you can change which one is upstream
03:44 TikityTik can it be default of what branch i am?
03:45 thiago yes
03:45 thiago each branch has an upstream
03:47 TikityTik what setting? i already set push.defaulty
03:48 col joined #git
03:48 chachasmooth joined #git
03:49 thiago branch.<branchname>.remote and branch.<branchname>.merge
03:50 col joined #git
03:51 db` joined #git
03:51 db` left #git
03:52 a_thakur joined #git
03:53 justanotheruser joined #git
03:53 Shakeel_ joined #git
03:54 Goplat joined #git
04:01 diogenese joined #git
04:04 tmsmith joined #git
04:06 hexagoxel joined #git
04:06 kimnorcott joined #git
04:07 diogenese joined #git
04:07 howdoi joined #git
04:08 _28_ria joined #git
04:08 rdavila joined #git
04:14 Vortex35 joined #git
04:16 jimi_ joined #git
04:17 kyan joined #git
04:18 drbean joined #git
04:21 mkoskar joined #git
04:21 hussam joined #git
04:23 lindenle joined #git
04:30 fstd_ joined #git
04:34 Vangelis joined #git
04:38 dreiss joined #git
04:40 Vangelis joined #git
04:40 venmx joined #git
04:44 sbulage joined #git
04:44 tnecniv joined #git
04:46 leb joined #git
04:48 shgysk8zer0 joined #git
04:49 jon-mac joined #git
04:49 mkoskar joined #git
04:57 robotroll joined #git
05:02 Lotlot joined #git
05:03 raspado joined #git
05:04 hahuang61 joined #git
05:08 cyan__ joined #git
05:10 xwid joined #git
05:11 llamapixel lfs question : after adding the track e.g.: git lfs track "*.zip”  I don’t have to do anything right but add / commit as normal ?
05:11 llamapixel My upload is rather slow so I can only test this every 20 minutes
05:14 mda1 joined #git
05:14 Mobutils_ joined #git
05:14 ayogi joined #git
05:20 cyan__ joined #git
05:21 cwillu_at_work joined #git
05:21 utrack joined #git
05:24 mseyne joined #git
05:26 anry joined #git
05:27 tmsmith joined #git
05:28 inflames joined #git
05:29 bayman joined #git
05:29 flaviodesousa joined #git
05:32 ezio joined #git
05:33 ezio a bunch of files in my git directory got deleted.  that's the only change.  i just want to undelete every file and reset to the last commit.
05:33 ezio how do I do that?
05:33 ezio there's about 30 files
05:33 ezio so i don't want to have to git reset each one
05:33 durham joined #git
05:36 ezio grr
05:36 ezio i've tried git checkout .
05:36 ezio git reset HEAD .
05:36 ezio git checkout --
05:36 tmsmith joined #git
05:36 ezio git reset .
05:37 _ng joined #git
05:39 dreiss joined #git
05:40 xall joined #git
05:41 tmsmith joined #git
05:48 venmx joined #git
05:49 ezio left #git
05:53 romerocesar joined #git
05:55 jaguarmagenta joined #git
05:56 Cabanossi joined #git
06:01 pks joined #git
06:02 Tanfrieze joined #git
06:05 regedit joined #git
06:05 muelli joined #git
06:05 regedit hello
06:06 rscata joined #git
06:06 JanC_ joined #git
06:06 xberg joined #git
06:06 regedit after doing simply 'git reset' why does the output seem to show a lot of 'D' files? what is it about git resetting that involves files being deleted?? this makes me nervous that i did something horribly wrong...
06:07 regedit to my knowledge no files were deleted, only modified
06:07 regedit it seems to be showing most (all?) the rest of the repos tracked files
06:07 xberg_ joined #git
06:07 regedit all with 'D' at the beginning of the line... what does it mean?...
06:07 durham joined #git
06:09 regedit altho git status does seem to show sane status - only modifications to all the expected files that we changes
06:09 regedit *changed
06:09 regedit so why all the rest of the files came up as 'D' when git reset??..........
06:10 Mowgli joined #git
06:10 llamapixel so you did a simple git reset regedit  and then you did a git pull ?
06:11 svm_invictvs joined #git
06:11 regedit no, no pull
06:11 llamapixel Looking at the docs here. https://git-scm.com/docs/git-reset
06:12 llamapixel Was that ’no’ to a simple git reset as well?
06:12 hahuang61 joined #git
06:13 regedit incorrect; it was only no to doing a pull; its a yes for having done simply git reset
06:13 col joined #git
06:13 llamapixel what does git status say?
06:16 regedit it does look fine; seems to show all the expected modified files only, all the rest of those 'D' files are not mentioned at all
06:16 nonconvergent joined #git
06:16 regedit i *hope* that means at least the state of the work tree is as i hope it should be...
06:16 alex1a joined #git
06:16 regedit just concerned/worried why were there so many 'D's
06:17 overlord_tm joined #git
06:17 llamapixel Are you using any third party scripts that are showing you these D symbols as I see Deleted in a full word ?
06:18 regedit here is some example of the output:
06:18 regedit $ git reset
06:18 thiago git reset does not restore files
06:18 regedit Unstaged changes after reset:
06:18 regedit D       .gitignore
06:18 regedit D       wp-content/themes/foo/404.php
06:18 regedit etc
06:19 thiago it's telling you that those files are modified or deleted, after the reset
06:19 thiago compared to the content that was read into the index
06:20 regedit not sure i understand
06:20 regedit those files seem to be present right now, none of them seem to have been deleted or anything
06:20 regedit they are not mentioned in git status either
06:20 d^sh joined #git
06:20 thiago was git reset the last thing you ran?
06:20 regedit yep
06:21 thiago are you sure .gitignore exists?
06:21 regedit yep just checked
06:23 thiago copy & pastebin yout terminal, please
06:23 thiago including an ls of the file
06:24 rendar joined #git
06:26 regedit oops there's something possibly very important i must confess...
06:26 llamapixel ^^
06:26 col joined #git
06:27 regedit i am doing some horrible things with a --bare repo, such as cd-ing into the bare repo and running GIT_WORK_TREE=~/foo/ git status
06:27 regedit and GIT_WORK_TREE=~/foo/ git reset
06:27 regedit might that have anything to do with it?
06:27 snowkidind joined #git
06:28 mehola joined #git
06:28 JeroenT joined #git
06:29 chachasmooth joined #git
06:30 regedit the ~/foo/ directory was behaving nicely as a GIT_WORK_TREE, showing "on branch master - clean no changes" etc most of the time
06:32 nonconvergent joined #git
06:33 lordjancso joined #git
06:33 iliv joined #git
06:36 col joined #git
06:38 xberg joined #git
06:39 * regedit cannot repent and is past redemption
06:40 chachasmooth joined #git
06:42 jfr_ joined #git
06:43 llamapixel I had to lookup bare http://www.saintsjd.com/2011/01​/what-is-a-bare-git-repository/
06:44 regedit i am now trying to tackle my issue from another angle; how can I "insert" another commit earlier in the history?
06:44 regedit i.o.w. i have a state of a bunch of files the way i wish they were for "initial commit"
06:45 regedit but i already committed a bunch of more stuff after the current initial commit
06:45 col joined #git
06:45 regedit i'd like to if possible go back to initial commit, copy over (overwriting) the state of the files i have, commit, and then reconnect all subsequent commits atop of that
06:46 regedit this would take place in a sane git repo - not a bare
06:46 col joined #git
06:46 regedit a normal clone of the bare
06:47 SwiftMatt joined #git
06:48 ThomasLocke joined #git
06:48 ThomasLocke joined #git
06:49 venmx joined #git
06:55 Mannn joined #git
06:56 sbulage joined #git
06:56 aw1 joined #git
06:59 durham joined #git
07:02 venmx joined #git
07:03 Ediz joined #git
07:03 qt-x joined #git
07:05 llamapixel Any luck regedit ?
07:06 regedit after some googling i'm learning about checking out earlier commits and then something called "rebase"....
07:06 subhojit777 joined #git
07:08 freimatz joined #git
07:08 Dragonbird joined #git
07:09 dodobrain joined #git
07:09 lrb joined #git
07:10 chachasmooth joined #git
07:12 g_zen joined #git
07:15 regedit holy crap i think i just successfully rebased...
07:15 lrb I'm having some trouble understanding something and I'm not sure how to research it. I'm making a repo with my dotfiles and I've initialized a repo in ~/. I've added "/*" to ~/.gitignore and I exclude individual files by adding "!file" to .gitignore. Perhaps I simply don't understand, but when I exclude a file anywhere but the same level as .gitignore, it won't show up in git status. Sorry for the wall of text..
07:17 Derperperd joined #git
07:17 OOPMan joined #git
07:19 PickAndMix joined #git
07:20 PickAndMix hi guys, if i wanna merge a branch into develop
07:20 PickAndMix should i be in the branch and put git merge develop
07:20 PickAndMix or stay in develop and git merge feature/branch
07:24 JeroenT joined #git
07:24 basiclaser joined #git
07:24 rewt joined #git
07:25 Karunamon|2 joined #git
07:25 _ikke_ the latter
07:25 _ikke_ you always merge into the current branch
07:25 chele joined #git
07:26 llamapixel good job regedit
07:28 AndreSomers joined #git
07:29 neanderslob joined #git
07:29 regedit thanks :) it was Daunting Infeno
07:29 regedit hardy har har har
07:29 regedit Daunting *Inferno
07:30 Mobutils joined #git
07:30 lrb This is the gitignore I was referring to for my question: http://paste.ee/p/aRWow
07:30 lrb I get the feeling I just don't have a good enough understanding of git fundamentals
07:31 _ikke_ lrb: check man git check-ignore
07:31 gitinfo lrb: the git-check-ignore manpage is available at http://jk.gs/git-check-ignore.html
07:31 hahuang65 joined #git
07:31 venmx joined #git
07:32 ribasushi joined #git
07:32 fuchstronaut joined #git
07:32 danemacmillan joined #git
07:33 zeroed joined #git
07:33 zeroed joined #git
07:33 lrb Does git match /thing to any path ending with /thing?
07:34 _ikke_ No
07:34 lrb Because I've been reading the man page and I'm not seeing what I'm doing wrong.
07:35 jknetl joined #git
07:35 _ikke_ "A leading slash matches the beginning of the pathname. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c"."
07:35 ThomasLocke joined #git
07:36 cwillu_at_work joined #git
07:36 sea-gull joined #git
07:37 dodobrain joined #git
07:38 mbeierl joined #git
07:39 Sceorem joined #git
07:40 lrb Is there a clever way of including a single file in an excluded directory or would I need to manually type each of the rules for that?
07:41 _ikke_ lrb: Instead of unignoring a file, you can also use git add -f for that file
07:41 _ikke_ at the moment git tracks a file, the .gitignore has no effect on that file
07:41 lrb Oh interesting.
07:42 lrb So realistically I don't even need to mess around with .gitignore for my purpose.
07:42 lrb Aside from /*
07:42 _ikke_ Just * would be enough
07:43 troulouliou_div2 joined #git
07:46 Akimb joined #git
07:46 lrb Thanks
07:47 ispn joined #git
07:49 bluezone joined #git
07:50 texinwien_ joined #git
07:50 lrb left #git
07:50 aloksteel joined #git
07:52 brillenfux joined #git
07:53 ribasushi joined #git
07:55 zeroed joined #git
07:55 zeroed joined #git
07:55 djb-irc joined #git
07:56 jaguarmagenta joined #git
07:56 elect__ joined #git
07:56 ewong joined #git
07:59 a_thakur joined #git
08:01 Xatenev joined #git
08:01 Xatenev When I use my first git command in a project
08:01 Xatenev Does it cache the whole project then?
08:02 Xatenev (It takes really long for my first command to run usually)
08:02 TomyWork joined #git
08:04 a_thakur_ joined #git
08:04 Xatenev left #git
08:05 ewong left #git
08:06 arnsa joined #git
08:08 Ragnor joined #git
08:09 llamapixel Run a program like fseventer X and he left
08:10 apotry joined #git
08:12 gitseeker joined #git
08:13 hahuang61 joined #git
08:14 alex1a_ joined #git
08:15 lordjancso_ joined #git
08:15 overlord_tm joined #git
08:15 derk0pf joined #git
08:16 gitseeker What is the best way to pull git changes into a svn project that will have its own changes ?
08:17 Alienpruts joined #git
08:18 maret joined #git
08:18 _ikke_ gitseeker: are you using something like git-svn?
08:22 nowhereman joined #git
08:22 JeroenT joined #git
08:25 g_zen joined #git
08:26 llamapixel is it typical for lfs to require u/p each large file?
08:27 Akimb joined #git
08:28 JeroenT joined #git
08:28 Akimb joined #git
08:29 eduardas_m joined #git
08:29 Akimb joined #git
08:30 cbreak joined #git
08:30 Balliad joined #git
08:32 bukolay-net joined #git
08:33 netj joined #git
08:35 RonaldRage joined #git
08:35 [cust] joined #git
08:36 rasto joined #git
08:37 JeroenT joined #git
08:37 RonaldRage left #git
08:37 as_g5pw joined #git
08:40 a_thakur joined #git
08:43 nonconvergent joined #git
08:43 rorro joined #git
08:45 llamapixel I will have to assume that is the case for LFS : entering a user/pass for each file one at a time.
08:46 m1dnight_ joined #git
08:46 MrMojito joined #git
08:50 j416 llamapixel: I don't know much about LFS, but it sounds like an ssh issue.
08:50 llamapixel ah ok thanks
08:50 j416 or that you're authenticating via https or the like
08:50 llamapixel j416: have you used git annex as well by chance?
08:50 llamapixel https://git-annex.branchable.com/
08:50 j416 I have not
08:50 llamapixel ok
08:53 ahmedelgabri joined #git
08:57 systemovich joined #git
08:57 PCatinean joined #git
09:00 willlondon joined #git
09:00 jnavila joined #git
09:01 lindenle joined #git
09:03 evie_hammond joined #git
09:03 YuGiOhJCJ joined #git
09:05 kini joined #git
09:06 willlondon joined #git
09:06 invisbl joined #git
09:06 Hko joined #git
09:07 ToBeCloud joined #git
09:09 iliv joined #git
09:10 darkcar joined #git
09:12 _ADN_ joined #git
09:12 elsevero joined #git
09:12 marcogmonteiro joined #git
09:12 systemovich joined #git
09:13 encod3 joined #git
09:14 kurkale6ka joined #git
09:20 xall joined #git
09:20 eblip joined #git
09:22 satifant joined #git
09:22 Snugglebash joined #git
09:23 Vampire0_ joined #git
09:25 jast certificate fixed. I got my deadlines mixed up, sorry for the noise.
09:25 buzzLightBeer joined #git
09:26 swalladge joined #git
09:26 darkcar joined #git
09:27 zeroed joined #git
09:27 zeroed joined #git
09:28 djb-irc joined #git
09:30 iliv joined #git
09:31 baryon joined #git
09:32 cdown joined #git
09:33 breezy_ joined #git
09:33 fees joined #git
09:33 ahmed_elgabri joined #git
09:33 nettoweb joined #git
09:34 aax joined #git
09:35 darkcar joined #git
09:35 _ikke_ jast: thanks
09:35 _ikke_ jast: can't you schedule running the renew script?
09:37 clmsy joined #git
09:39 xall joined #git
09:39 achadwick joined #git
09:39 Vampire0 joined #git
09:41 DrRobotic joined #git
09:42 endiruna joined #git
09:45 bcardarella joined #git
09:46 cqi joined #git
09:47 fearless_man joined #git
09:47 tuor joined #git
09:48 djb-irc joined #git
09:48 subhojit777 joined #git
09:49 Milos joined #git
09:50 fearless_man hello one quick question i have commit A B C D E.this was pushed on branch dev, now I want to undo all the commits from B to E and put it in different branch so the dev branch would be A B C D E A. the new branch would be A B C D E A B C D E
09:50 AciD` left #git
09:51 sharkz joined #git
09:51 causasui joined #git
09:52 tobiasvl fearless_man: repeated commits?
09:53 autofly joined #git
09:53 selckin sounds like, git revert b..e; git checkout -b newbrach; git cherry-pick b..e
09:53 * selckin is not sure
09:53 tvw joined #git
09:54 _noblegas joined #git
09:56 eb0t joined #git
09:56 k_sze[work] joined #git
09:56 jaguarmagenta joined #git
09:58 rnsanchez joined #git
09:59 fearless_man tobiasvl: I commited my changes to the wrong branch, now I need to revert it recommit, then put my changes in a new branch
09:59 fearless_man tobiasvl: I messed up big time, now my team is mad at me
10:00 _ikke_ fearless_man: Did you push any of those changes yet?
10:00 fearless_man _ikke_: I did
10:00 tobiasvl fearless_man: I see, but I don't understand what you mean by the new branch being "A B C D E A B C D E"
10:01 fearless_man tobiasvl: ex: dev branch has A B C D, changes C D should not be on dev branch, it should be on another branch
10:02 tobiasvl sure… but I still don't understand why the new branch would have duplicates of all commits
10:02 cyan__ joined #git
10:02 fearless_man tobiasvl: so dev branch should be A B C D (B revert all changes then commit again) then the new branch would be A B C D (B) C D
10:02 eb0t joined #git
10:03 King_Hual joined #git
10:03 leeN joined #git
10:04 jnavila joined #git
10:04 fearless_man tobiasvl: (B revert it like it didn't happen then commit because my team has already pulled my changes)
10:04 tobiasvl I don't understand what you mean, sorry
10:04 Intergage` joined #git
10:05 Ryanar joined #git
10:06 tobiasvl you want to revert B, C, D and E, and then re-commit C and D? why
10:06 tobiasvl I mean I get the revert, but why re-commit
10:06 fearless_man tobiasvl: I want to remove multiple commits like it didn't happen at all then commit it so I can push it because my teammates has already pulled my changes. then copy the dev branch into a new branch then apply my changes
10:07 tobiasvl "like it didn't happen at all" will be hard since your teammates have already pulled your changes. if you completely remove them from the history then, they'll need to fix up locally before they can pull again.
10:07 fearless_man tobiasvl: Because those commits are not supposed to be on the dev branch, they should be on a feature_branch,
10:08 _ikke_ fearless_man: There are two parts to this answer
10:08 _ikke_ It's easy to fix it locally
10:08 fearless_man tobiasvl: Yeah, it will be hard, that's why I wanted to revert then commit it like undo CTR+Z
10:09 _ikke_ Once you've pushed, there is no easy undo
10:09 * selckin thinks what he wrote is what you want, minus some paramter details
10:09 _ikke_ If other created commits on those
10:09 tobiasvl selckin: yeah, your solution sounds good, but if the feature branch is merged into dev in the future, dev already has b..e in its history… a !faulty_merge will occur
10:09 gitinfo selckin: If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Docu​mentation/howto/revert-a-faulty-merge.txt
10:09 subhojit777 joined #git
10:10 fearless_man _ikke_: is there a way to create a patch containing all your changes, then use it to unapply to your current HEAD
10:10 tobiasvl so instead of cherry-picking b..e into the new branch, I'd just make a revert of the dev revert in the new branch, so that can be merged in the future
10:11 _ikke_ fearless_man: man git revert
10:11 gitinfo fearless_man: the git-revert manpage is available at http://jk.gs/git-revert.html
10:13 fearless_man _ikke_: what should I use? revert, revert --soft, or revert --hard?
10:13 hahuang61 joined #git
10:13 fearless_man _ikke_: I need to undo all changes
10:13 _ikke_ fearless_man: you are confusing revert and reset
10:14 _ikke_ fearless_man: revert creates *new* commits undoing the changes in the reverted commits
10:14 _ikke_ fearless_man: reset moves the branches, so that it looks like the commits never happened, but involve rewriting history
10:15 Therior_Slide joined #git
10:15 tobiasvl fearless_man: and !rewriting history creates complications: !rewrite
10:15 gitinfo fearless_man: [!rewrite] 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:15 _ikke_ fearless_man: Rewriting history can be a pain because other people need to make sure they will start using this new history properly (and not merge the old and the new history together for example)
10:17 fearless_man _ikke_: i've created a new branch based on dev, git revert 3ec18aa9baabcd2e2b74055db553caa5dfe663e6 then git diff dev, the diff doesn't contain *ALL* the reverted commit changes
10:17 Tee_Pee joined #git
10:17 _ikke_ fearless_man: You specify the commits you revert, not the commit you want to revert to
10:18 _ikke_ git revert 3ec18aa9baabcd2e2b74055db553caa5dfe663e6..<branch> should revert all of them
10:18 tobiasvl <selckin> sounds like, git revert b..e; git checkout -b newbrach; git cherry-pick b..e
10:18 irqq joined #git
10:19 fearless_man _ikke_: so if I have 3 commits that would mean git revert hash1 hash2 hash3..new_branch_based_on_dev
10:19 nowhereman joined #git
10:20 _ikke_ fearless_man: Either mention them explictly, or specify a range, not both
10:20 eb0t joined #git
10:21 fearless_man _ikke_: OK i'll try it.
10:24 fearless_man _ikke_: error: Commit 364122013707645d5723d0cfa13e418edbaa40d9 is a merge but no -m option was given.
10:26 tobiasvl fearless_man: probably you want -m 1, if the first parent of the merge is the parent.
10:26 tobiasvl but this smells like !faulty_merge already
10:26 gitinfo If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Docu​mentation/howto/revert-a-faulty-merge.txt
10:27 Andrew_K joined #git
10:27 fearless_man tobiasvl: I
10:27 fearless_man tobiasvl: I'll do it tommorrow, my mind is mushy mushy now, I need to sleep. Thanks.
10:28 tobiasvl good luck
10:29 fearless_man tobiasvl: hahahaha (y)
10:29 fearless_man joined #git
10:32 jaguarmagenta joined #git
10:33 re1 joined #git
10:34 mda1 joined #git
10:35 venmx joined #git
10:38 omegak joined #git
10:40 cdown_ joined #git
10:43 jaguarmagenta joined #git
10:44 moop joined #git
10:46 arnsa joined #git
10:48 darkcar joined #git
10:50 darkcar joined #git
10:53 thierryp joined #git
10:58 cdown joined #git
10:59 cdown joined #git
11:03 ki0 joined #git
11:05 byte512 joined #git
11:06 eb0t joined #git
11:09 cheater joined #git
11:09 cheater hi
11:10 cheater how can i make git display the diff between src/a.c on commit a01f and src/b.c on commit b2cd?
11:11 nonconvergent joined #git
11:12 tobiasvl cheater: git diff a01f:src/a.c b2cd:src/b.c
11:13 tobiasvl or perhaps you need to do git diff a01f:./src/a.c b2cd:./src/b.c
11:14 hahuang61 joined #git
11:20 cheater tobiasvl: thank you!
11:21 feodaron joined #git
11:23 zeroed joined #git
11:23 zeroed joined #git
11:24 msonntag joined #git
11:26 re1 joined #git
11:27 delboy1978uk joined #git
11:27 delboy1978uk i've just finished going through merge hell, and my tests passed, so i tried to push, and someone else beat me to it. but when i try to pull..
11:27 delboy1978uk error: Commit 15ed08d52c2509c3f6a46b0936d174be369bfc7e is a merge but no -m option was given.
11:27 delboy1978uk fatal: cherry-pick failed
11:27 paladinn joined #git
11:27 paladinn joined #git
11:28 delboy1978uk what is this?
11:28 a_thakur joined #git
11:28 spacelord_ joined #git
11:33 delboy1978uk should i rebase or something?
11:34 tobiasvl yes, probably something to try anyway. but I wonder what you're pulling that gives you that error
11:36 delboy1978uk so just git rebase, or git pull --rebase, or what?
11:36 tobiasvl doesn't matter
11:37 tobiasvl pull --rebase is just fetch followed by rebase. you have already fetched
11:37 tobiasvl but pull --rebase might know what branch you want to rebase on so you don't have to tell it
11:38 freimatz joined #git
11:40 delboy1978uk tobiasvl: git pull --rebase done the trick, thanks for the tips!
11:40 om_henners joined #git
11:42 manuels joined #git
11:42 manuels joined #git
11:43 om_henners Hi all, anyone have a way to export a single archive from a repo with submodules? With all the code in a single package?
11:44 snufft joined #git
11:44 om_henners I tried Git-archive-all, but no luck as I'm stuck on a windows box
11:45 delboy1978uk you mean you want to remove the submodules .git's and have it in your own repo?
11:45 muelli joined #git
11:47 delboy1978uk left #git
11:47 om_henners Not quite - I want a simple way to package all the code for deployment on a client server which doesn't have Git installed, so we figured a single tar or zip of everything pushed across might do the job
11:48 Starky joined #git
11:48 om_henners And since we use .gitattributes for tagging versions, I figured archive would do the job
11:48 Saturn812 joined #git
11:49 selckin !deploy
11:49 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
11:49 jnavila joined #git
11:50 User458764 joined #git
11:50 om_henners Thanks, I'll take a look.
11:50 aruns joined #git
11:51 mahendratech joined #git
11:51 User458764 joined #git
11:51 selckin but mostly people use dedicated tools to create builds for deployment
11:51 User458764 joined #git
11:53 om_henners We're using Jenkins for packaging, but in this case it needs to be built on the target machine, and without simply zipping the entire repo to copy across I'm trying to simplify the deploy process with a single step to bundle the code
11:54 om_henners But I'll do some reading and hopefully find a much better way to do it, so thanks again!
11:54 a_thakur joined #git
11:55 mahendratech joined #git
11:56 steelsw0rd joined #git
12:02 isysd joined #git
12:04 sea-gull joined #git
12:05 Balliad joined #git
12:06 tvw joined #git
12:08 moriko joined #git
12:08 BadSnappa joined #git
12:10 wgrant joined #git
12:11 om_henners joined #git
12:12 ariscop joined #git
12:12 _Vi joined #git
12:12 Frede__ joined #git
12:13 _Vi RelNotes for Git 2.11 say that "git clone --recurse-submodules --reference" now peeks into reference's submodules. How do I revert to old behaviour and just use one reference for all submodules?
12:13 romerocesar joined #git
12:14 eb0t joined #git
12:14 User458764 joined #git
12:16 ejb joined #git
12:18 zeroed joined #git
12:18 _Vi There is mega-repository where all possible submodules are added as remotes. How do I use this mega-repository as universal reference for all things (including submodules without going into .git/modules/*)?
12:19 ams__ joined #git
12:19 nonconvergent joined #git
12:22 darkcar joined #git
12:22 manuels joined #git
12:23 jfr__ joined #git
12:24 ahmedelgabri joined #git
12:24 brillenfux joined #git
12:26 re1 joined #git
12:27 sdothum joined #git
12:31 f3r70rr35f joined #git
12:32 Snugglebash joined #git
12:34 byte512 joined #git
12:35 cdown joined #git
12:35 nonconvergent joined #git
12:36 f3r70rr36f joined #git
12:39 noecc joined #git
12:42 dminuoso joined #git
12:42 dminuoso How can I revert the changes from a commit to a single file?
12:42 dminuoso i.e. the commit introduced changes to multiple file, but I only want to revert the portion that modified a single file
12:44 danslo_ joined #git
12:44 feodaron joined #git
12:45 tobiasvl perhaps just checkout the file from the commit you want?
12:45 f3r70rr35f joined #git
12:47 _Cyclone_ joined #git
12:47 converge joined #git
12:47 converge joined #git
12:47 eb0t joined #git
12:47 SpeakerToMeat joined #git
12:49 _Vi How do I make thing like GIT_ALTERNATE_OBJECT_DIRECTORIES, but that affects all submodules?
12:50 jfr__ joined #git
12:51 a_thakur joined #git
12:52 johnmilton joined #git
12:53 PinkPonyOfDeath joined #git
12:54 deadnull joined #git
12:55 venmx joined #git
12:56 PinkPonyOfDeath hello everyone. i have a few files which are currently tracked, which i would love to add to the .gitignore now. they shall however stay where they are...just be ignored by git, not removed. what would be the proper way to do this?
12:57 tobiasvl PinkPonyOfDeath: !ignore_tracked
12:57 gitinfo PinkPonyOfDeath: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
13:01 PinkPonyOfDeath tobiasvl: i was considering git rm --cached <file>, but i was not sure if that might result in problems once i try to push again. thx anyway
13:02 shpew12 joined #git
13:03 xberg_ joined #git
13:03 xberg_ joined #git
13:05 f3r70rr36f joined #git
13:06 Nilesh_ joined #git
13:06 eb0t joined #git
13:07 Snugglebash joined #git
13:11 KevinDF joined #git
13:12 eb0t joined #git
13:13 ayjay_t joined #git
13:13 ayjay_t how can you `git status` a repository that was made with `git clone --bare`
13:13 ayjay_t to compare it to upstream
13:14 guest____ joined #git
13:14 dsdeiz joined #git
13:14 dsdeiz joined #git
13:16 bremner you can use git log and git diff
13:16 roxlu_ joined #git
13:16 hahuang61 joined #git
13:17 isysd joined #git
13:19 darkcar joined #git
13:20 guest____ joined #git
13:21 cheater joined #git
13:24 deadnull joined #git
13:24 dminuoso tobiasvl: Oh. That was simpler than I thought.
13:24 dminuoso tobiasvl: I was looking at git-revert the whole time. :)
13:25 rafalcpp joined #git
13:26 rafalcpp how to see history of submodule updates (of who updated the required submodule version)?
13:27 rafalcpp ah, just git log works after all, my mistake
13:29 b3kN joined #git
13:29 b3kN joined #git
13:30 askb joined #git
13:34 synthroid joined #git
13:34 Gamecubic joined #git
13:37 steelsw0rd joined #git
13:38 liyuanhua joined #git
13:38 fmcgeough joined #git
13:39 govg joined #git
13:41 Puffball joined #git
13:41 anonymuse joined #git
13:43 diamond_ joined #git
13:43 jeffreylevesque joined #git
13:45 nettoweb joined #git
13:46 jaafar joined #git
13:47 xall joined #git
13:47 nettoweb joined #git
13:49 treehug88 joined #git
13:49 govg joined #git
13:50 cdown joined #git
13:50 grawity bonus: git config diff.submodule log
13:50 gstoyanov joined #git
13:50 Learath2 joined #git
13:50 grawity shows submodule commits in log -p
13:51 gstoyanov Guys, I'm a newbie with git and I can't get something - why sometimes my changes of file with git add -p (either using txt editor or cmd) are applied and sometimes are not. Do I miss something?
13:51 faux___ joined #git
13:52 g105b_ joined #git
13:55 Juzzika joined #git
13:55 guest____ joined #git
13:56 re1 joined #git
13:58 giraffe joined #git
13:58 a_thakur joined #git
14:02 jaguarmagenta joined #git
14:03 kadoban gstoyanov: Hard to say. The interface for add -p can be pretty intricate sometimes :-/
14:06 isysd joined #git
14:06 guest____ joined #git
14:08 gstoyanov joined #git
14:08 gstoyanov Yeah, I think i hit something strange on it. Anyway. I have other question - i saw somewhere in the net that there is a principle - commit early, commit often, fix your history. What does it mean "fix your history"
14:09 linduxed so git (AFAIK) has knowledge of the concept of renamings, so i'm wondering if there's a possibility to do "git log --patch --treat-renames-as-same-file some_dir/some_file.txt" and have the commits with changes for both "some_dir/some_file.txt" and "some_dir/what_some_file_was​_called_prior_to_rename.txt" be displayed
14:09 linduxed the --treat-renames-as-same-file is obviously something i made up
14:09 selckin try -C -M
14:10 kadoban gstoyanov: It means you go back and change history of the new stuff however you like, when you're finished with it. *but* you shouldn't do that if you've already shared it with someone first.
14:10 tinanoo joined #git
14:10 kadoban gstoyanov: Usually you use rebase -i to accomplish this, there's a lot in there
14:10 aruns joined #git
14:11 kadoban linduxed: Maybe --follow ?
14:11 kadoban Also yeah you'd want to mess with -C and -M in addition. git doesn't actually *record* renames, it figures them out heuristically at output time.
14:11 gstoyanov Ookey, I'll read deeply on that topic of rebase -i :) Thanks :)
14:11 linduxed thx selckin and kadoban
14:11 linduxed will try those
14:12 sbulage joined #git
14:12 jimi_ joined #git
14:12 mischat joined #git
14:12 kadoban gstoyanov: I wouldn't worry about it too much at first either, honestly I rarely do it (at least rarely in order to just make history look pretty ... history is what it is to a certain extent)
14:13 jmpp joined #git
14:13 jmpp joined #git
14:14 linduxed --follow seems to work fine!
14:15 BadSnappa joined #git
14:15 [0xAA] joined #git
14:15 kadoban cool cool
14:16 Gsham joined #git
14:16 dsfreak93 joined #git
14:19 synthroi_ joined #git
14:20 ShekharReddy joined #git
14:20 darkcar joined #git
14:23 mustmodify_ joined #git
14:24 mustmodify_ This is probably me just being overly-crazy but is it possible to have git cycle through when doing `git add -p` so that if I'm doing that, and I quit, when I come back, it starts with the file I was last reviewing?
14:25 mustmodify changed nick
14:25 _ikke_ mustmodify: No, I don't think that's possible
14:25 mustmodify That's kinda what I figured. Shame.
14:25 selckin don't quit, open a 2nd terminal
14:26 _ikke_ or ctrl+z
14:26 JelmerD joined #git
14:26 kbs joined #git
14:27 mustmodify selckin: It's not a lack of terminal windows. I just want to make changes and stage that line while I'm thinking about it. It'd probably be better to just make the change and revisit it again later, or add it manually from a separate command line.
14:27 anuxivm joined #git
14:27 _ikke_ mustmodify: perhaps look at tig?
14:27 selckin git gui is also non linear
14:27 krillr joined #git
14:29 byte512 joined #git
14:30 ExoUNX joined #git
14:31 netj joined #git
14:34 willlondon joined #git
14:36 nickabbey joined #git
14:36 Dougie187 joined #git
14:38 steelsw0rd joined #git
14:40 cdg joined #git
14:41 mada joined #git
14:41 muelli joined #git
14:43 jaguarmagenta joined #git
14:44 red82 joined #git
14:45 danslo_ joined #git
14:47 faux___ joined #git
14:48 faux___ joined #git
14:50 arooni joined #git
14:50 IrishPrime joined #git
14:51 a_thakur joined #git
14:53 shinnya joined #git
14:56 venmx joined #git
14:59 Darren_ joined #git
14:59 thebope joined #git
14:59 jaguarmagenta joined #git
14:59 Snugglebash joined #git
15:00 Eryn_1983_FL joined #git
15:00 fees joined #git
15:01 nickabbey hi all. I have a question around sub modules. I added 2 submodules to a repo, but I did so using http://myusername@myhost/myrepo.com. If I want to witch over to using ssh://git@myrepo.com - what's the right way to do that?
15:02 nickabbey s/http/https
15:03 lindenle joined #git
15:03 nickabbey I'm using git 2.10.0 fwiw
15:04 snowkidind joined #git
15:04 al-damiri joined #git
15:04 e14 joined #git
15:05 mbeierl1 joined #git
15:06 nicksloan joined #git
15:07 Anja joined #git
15:08 _Vi Does "git clone --recurse-submodules --reference ..." work with nested submodules?
15:09 petersaints joined #git
15:09 peepsalot joined #git
15:11 shennyg joined #git
15:12 thierryp joined #git
15:13 Noldorin joined #git
15:14 jaguarmagenta joined #git
15:14 dwts hello guys, quick question, supposing we have two users: user1 and user2. Both users have access(read and write) to the repo. if cloned the repo as user1 is it possible to commit as user2 and be prompted for user2's pass instead of user1's?
15:15 Dougie187 dwts: Yes. Who you commit as is all configured by your ~/.gitconfig / .git/config files.
15:15 mischat joined #git
15:15 Dougie187 dwts: The authentication that you're talking about is all (typically) baked into the remote name
15:16 Dougie187 i.e. you're not prompted for a password until you push
15:17 hahuang61 joined #git
15:17 dwts Dougie187: yes, but I want to push as user2, without changing the .gitconfig
15:17 dwts is that possible?
15:17 Dougie187 Yes, all you have to do is have another remote added.
15:18 Dougie187 When you clone, just add another remote that is user2's address.
15:18 Dougie187 Then when you push, push to that repo instead of origin.
15:18 dwts Dougie187: ah, I see, will check the git clone man page
15:18 GameGamer43 joined #git
15:18 dwts thanks for the tip :)
15:18 Dougie187 np
15:19 Dougie187 dwts: For reference though, it's not going to be in the `man git clone` page. It'd be `man git remote`
15:19 gitinfo dwts: the git-clone manpage is available at http://jk.gs/git-clone.html
15:19 gitinfo dwts: the git-remote manpage is available at http://jk.gs/git-remote.html
15:19 mustmodify left #git
15:19 dwts Dougie187: oh, thanks for that
15:19 rdavila joined #git
15:20 nickabbey what's the best way to change the remotes for submodules? I added them using https, but I want to change to using ssh
15:20 Dougie187 nickabbey: http://stackoverflow.com/questions/913701/ch​anging-remote-repository-for-a-git-submodule
15:21 nickabbey @Dougie187 I've read that but there's no accepted answer so I'm left wondering which approach to tak
15:21 Dougie187 It depends. Have you already initialized the submodule?
15:21 dwts Dougie187: as an additional question, would it be possible to commit straight to the user1's origin? or this would require gitconfig?
15:21 dwts i guess not
15:21 crose joined #git
15:21 dwts just double checking
15:21 sylario joined #git
15:21 nickabbey Dougie187: yeah, they are initialized
15:21 Dougie187 dwts: You can't commit directly to remotes. You commit to your local repo, and push those commits.
15:22 nickabbey and the top level repo that contains the submodules has been committed and push to the remote origin
15:22 Dougie187 nickabbey: Then I think you have two choices: (1) Deinit the submodule, change the address in .gitmodules, and reinit it, or: (2) go into the submodule, and use `git remote` to change the remote address.
15:22 Dougie187 Do you want it to be a permanent change? or just for you?
15:22 nickabbey cool, I was hoping that I could just do (2)
15:22 nickabbey so I guess I'll give it a shot.
15:22 Dougie187 (2) won't be permanent, just so you know.
15:23 Dougie187 That's more of a "your working copy" change.
15:23 nickabbey ha! ok then I guess the answer is that I should just go with (1)!
15:23 nickabbey thanks for the feedback
15:23 Dougie187 np
15:23 ploop joined #git
15:23 xall joined #git
15:26 GodGinrai joined #git
15:26 sagerdearia joined #git
15:27 GodGinrai joined #git
15:29 xall joined #git
15:37 nettoweb joined #git
15:38 navidr joined #git
15:39 roygbiv joined #git
15:40 mazert joined #git
15:40 boombatower joined #git
15:40 boombatower joined #git
15:40 tvw joined #git
15:41 addshore joined #git
15:42 User458764 joined #git
15:43 fahadash joined #git
15:46 nickabbey joined #git
15:47 nonconvergent joined #git
15:47 ggherdov joined #git
15:48 converge joined #git
15:48 converge joined #git
15:48 nd joined #git
15:48 peeps[lappy] joined #git
15:49 ploop joined #git
15:52 dendazen joined #git
15:53 chigang joined #git
15:54 tnecniv joined #git
15:56 spr0tsuki joined #git
15:58 Dragonbird joined #git
15:59 chll_ joined #git
15:59 nickabbey joined #git
16:01 jimi_sanchez joined #git
16:01 ResidentBiscuit joined #git
16:02 texasmynsted_ joined #git
16:03 aarobc joined #git
16:03 ash_workz joined #git
16:05 yottabyte joined #git
16:05 yottabyte should you ask "did you push it?" or "did you commit it?" when waiting for a coworker to fix something
16:05 nowhereman joined #git
16:06 ResidentBiscuit The former
16:08 GodGinrai yottabyte: "have you finished?"
16:08 yottabyte but he may have finished and not pushed it
16:09 GodGinrai no
16:09 cdg joined #git
16:09 GodGinrai finished implies he has nothing else to do
16:09 GodGinrai if he has to push
16:09 GodGinrai then he has something to do
16:09 netj joined #git
16:09 yottabyte I cannot assume he has the same definition of finished as we do
16:09 GodGinrai "fixed" implies he has made the code changes but not necessarily pushed it
16:10 oxsyn joined #git
16:10 GodGinrai yottabyte: you can if you semantically define it in documents your team accesses
16:10 ResidentBiscuit Just ask if he pushed his change yet
16:10 ResidentBiscuit Simple as that
16:10 ResidentBiscuit No need to argue semantics
16:10 ionelmc joined #git
16:10 deepy In any case it's all irrelevant for you unless you got access to his local repository, it's not useful for you until he has pushed
16:10 yottabyte right
16:11 yottabyte why is git so hard
16:11 yottabyte I'm coming from SVN
16:11 GodGinrai it's really not
16:11 ResidentBiscuit Its not
16:11 ResidentBiscuit Its just different
16:11 GodGinrai in fact, I find svn much harder than git
16:11 selckin why is car so hard, i'm coming from tricycle
16:11 GodGinrai I can still use it, of course
16:11 ojdo joined #git
16:11 GodGinrai but simple things take forever or are just hard to do
16:12 GodGinrai with svn
16:12 yottabyte my greatest qualm thus far is this: we're in a branch, we're working on the same files. Every. single. time. I pull it says I have to merge my files first (the same ones he's working on)
16:12 yottabyte SVN would auto merge before me having to commit
16:12 yottabyte so what do I say? git add those files, git commit -m "commit so I can pull"
16:12 selckin !stash
16:13 GodGinrai the bot doesn't have a stash factoid?
16:13 zivester joined #git
16:13 yottabyte I've heard about that approach, so I have to stash every single time I want to pull?
16:13 GodGinrai yottabyte: no.  You either commit, or stash
16:13 yottabyte right
16:13 selckin the changes you pull can conflict with local commits, so it needs a clean working dir for that
16:13 yottabyte because I don't know going in if I'm gonna have a problem pulling
16:13 GodGinrai yottabyte: also, you don't need to merge all the time unless you need the changes from upstream
16:14 GodGinrai yottabyte: you are supposed to work in separate branches, and only merge code in when you need it
16:14 yottabyte we're working on the same feature
16:14 yottabyte he's doing some parts, I'm doing some others
16:15 GodGinrai yottabyte: and is your code not possible to test w/o his changes?
16:16 Tee_Pee joined #git
16:16 selckin alias svnup="git stash -u ; git pull --rebase; git stash pop"
16:16 albel727 joined #git
16:18 jimi_sanchez joined #git
16:20 finalbeta joined #git
16:20 qqx selckin: If you're using a new enough version of git there's a --autostash option for pull to do all of that with a single command.
16:20 selckin yottabyte: ^^ alias svnup=git pull --rebase --autostash
16:22 GodGinrai qqx: what happens if there is a conflict?  it aborts the pop?
16:22 qqx I don't actually use that myself. I generally avoid using pull.
16:22 yottabyte what does the --rebase flag do? I usually just git pull without it
16:22 ResidentBiscuit Wouldnt it just make you fix the conflict? I rarely stash, but I thought if you popped and there was a conflict it would go into normal conflict resolution mode
16:25 GodGinrai yottabyte: --rebase is only needed if you want your commits to be applied to the end of the history after the commits you pulled down
16:25 rivarun joined #git
16:26 selckin yottabyte: it gives you svn behavior, linear history
16:26 qqx Using pull --rebase is also required if you want to use the --autostash option.
16:26 _Cyclone_ joined #git
16:26 GodGinrai qqx: I pull, but only when it would be a fastforward update.  I don't pull onto my own changes
16:27 anuxivm left #git
16:32 nowhereman joined #git
16:32 d5sx43 joined #git
16:32 beckyconning__ joined #git
16:33 theonefoo joined #git
16:33 xberg joined #git
16:34 daxroc joined #git
16:34 Snugglebash joined #git
16:34 dviola joined #git
16:34 f4_ joined #git
16:35 KevinDF_ joined #git
16:35 theonefoo what would be the most straightforward way to stash unstaged changes and untracked files? is it git stash -a? git stash + git stash save -u?
16:35 crayon joined #git
16:36 selckin git stash -u
16:36 guest____ joined #git
16:36 selckin or *only* unstaged?
16:36 theonefoo unstaged *and* untracked
16:36 theonefoo I have two unstaged and one untracked file
16:36 selckin but not staged
16:36 selckin ?
16:36 theonefoo nothing is staged, so no
16:37 selckin git stash -u
16:37 theonefoo excellent, thank you selckin
16:39 epic joined #git
16:39 jmpp joined #git
16:39 e14 joined #git
16:40 saml joined #git
16:40 a_thakur joined #git
16:42 matsaman joined #git
16:42 nowhereman joined #git
16:43 subhojit777 joined #git
16:44 armin joined #git
16:45 PCatinean joined #git
16:45 Shentino joined #git
16:48 elsevero joined #git
16:49 synthroid joined #git
16:49 jccn joined #git
16:51 dreiss joined #git
16:51 armin joined #git
16:51 JrCs joined #git
16:53 jrun joined #git
16:54 jrun is it possible to shallow clone a repo with massive history (like kernel) with a given tag. say i want to shallow (--depth 1) clone linus's repo on github but i only want v4.1 release.
16:55 jrun i have the commit hash of course, maybe i could go by that.
16:56 Rodya_ joined #git
16:56 venmx joined #git
16:56 cyan__ joined #git
16:57 guampa joined #git
16:58 vrlx joined #git
16:58 GodGinrai jrun: http://stackoverflow.com/questions/31278902/how-​to-shallow-clone-a-specific-commit-with-depth-1
16:59 GodGinrai ^ this explains why it is not possible
16:59 GodGinrai and what your options are
16:59 Salander27 joined #git
17:01 jrun thanks
17:01 guest____ joined #git
17:02 GodGinrai np
17:02 jccn joined #git
17:03 qqx GodGinrai: That's talking about why you can't clone arbitrary commits. Since here it sound's like jrun is  trying to clone at a tag it should be possible.
17:03 jrun yes, i just want tag v4.1
17:03 qqx git clone --depth=1 URL  v4.1
17:03 qqx Not sure about how the tags are actually named there.
17:03 jrun qqx: that will clone into directory v4.1 no?
17:05 jrun come to think of it, this actually would be great for package managers.
17:06 GodGinrai jrun: it appears that git 2.5 added the ability to fetch a single commit, using --depth=1.  So it may be possible to shallow clone, and then fetch the commit with a depth of 1
17:06 GodGinrai not completely sure if that will work, tho'
17:07 jrun git clone --depth=1 --branch=v4.1 URL linus
17:07 jrun that seems to be working just fine
17:07 jrun or we will see :)
17:07 GodGinrai lol
17:08 qqx jrun: From the docs it sounds like that should work, but it doesn't seem to be working for me. I was inded missing the --branch option from my earlier guess.
17:09 jrun hmm, it shallow cloned and then checked out 4ec85345 (v4.1) giving 'detached HEAD' warning.
17:09 breezy_ joined #git
17:09 qqx Sounds like it is working properly for you then.
17:09 jrun git tag reports v4.1, nice
17:09 johnny56 joined #git
17:09 qqx Checking out a tag should always result in a detached HEAD.
17:12 derk0pf joined #git
17:12 GodGinrai well
17:13 GodGinrai glad to hear it worked
17:14 jccn joined #git
17:14 jrun now it would be nice to find out that someone already implemented this for a package manager
17:14 encod3_ joined #git
17:14 synthroi_ joined #git
17:14 PinkPonyOfDeath left #git
17:14 jrun anyone knows of such a thing?
17:15 jaguarmagenta joined #git
17:15 xpk joined #git
17:15 xpk joined #git
17:15 jrun that is for source based distros of course where instead of fetching the release archive the package manager would just do a shallow checkout of the release tags (stable/LTS or whatever)
17:16 topi` left #git
17:16 User458764 joined #git
17:16 Remramm joined #git
17:16 Remramm joined #git
17:19 GodGinrai jrun: I'm not aware of a system that does
17:19 Nikitaw99 joined #git
17:20 KevinDF__ joined #git
17:21 Nikitaw99 joined #git
17:22 madewokherd joined #git
17:22 Dougie187 joined #git
17:24 jrun http://sta.li/
17:24 jrun that have the idea but not implemented
17:24 jrun i thought morpheus would do:
17:24 jrun http://morpheus.2f30.org/
17:24 jrun but no... exherbo maybe?
17:25 Ryanar joined #git
17:26 cdg joined #git
17:27 tang^ joined #git
17:27 col joined #git
17:27 netj joined #git
17:28 elsevero joined #git
17:30 cagedwisdom joined #git
17:34 matsaman jrun: I'm pretty sure any Gentoo-PMS compatible package manager would be able to do that, anyway
17:34 GT4066 joined #git
17:35 svm_invictvs joined #git
17:35 bruce_lee joined #git
17:35 bruce_lee joined #git
17:41 e14 joined #git
17:42 robattila256 joined #git
17:42 jimi_ joined #git
17:43 di0_ joined #git
17:44 guest____ joined #git
17:45 Dougie187 joined #git
17:46 SwiftMatt joined #git
17:50 durham joined #git
17:50 OnBrokenWings joined #git
17:50 tnecniv joined #git
17:52 Darcidride joined #git
17:53 crayon joined #git
17:54 cheater joined #git
17:55 nickabbey joined #git
17:55 lindenle joined #git
17:55 Darcidride joined #git
17:55 lindenle joined #git
17:57 DrRobotic joined #git
17:59 Orion3k joined #git
18:01 e14 joined #git
18:03 CubiK joined #git
18:03 converge joined #git
18:04 adam__ joined #git
18:05 thiago joined #git
18:09 hahuang61 joined #git
18:10 jimi_sanchez joined #git
18:10 tnecniv joined #git
18:10 tnecniv joined #git
18:11 scarabx joined #git
18:11 spacelord_ joined #git
18:12 jimi_sanchez joined #git
18:15 lvns joined #git
18:16 rominronin joined #git
18:17 guest____ joined #git
18:18 thierryp joined #git
18:18 cheater joined #git
18:20 e14 joined #git
18:20 raspado joined #git
18:21 jimi joined #git
18:21 chardan joined #git
18:23 tyreld joined #git
18:23 mquin joined #git
18:24 jimi_ joined #git
18:26 jimi_ joined #git
18:27 TomyLobo joined #git
18:28 elsevero joined #git
18:28 jimi_sanchez joined #git
18:29 peeps[lappy] joined #git
18:29 ixjlyons joined #git
18:30 guest____ joined #git
18:30 durham_ joined #git
18:32 dsdeiz joined #git
18:32 dsdeiz joined #git
18:36 rads joined #git
18:37 kfoonamalik joined #git
18:37 Limes_ joined #git
18:37 yottabyte on the conversation from earlier, if I pull but there are conflicts I need to commit before pulling, can I stash them, or is it too late at that point? maybe undo the pull request? or is the pull all or nothing so I should be able to stash my local changes fine?
18:39 hahuang61 joined #git
18:39 iliv joined #git
18:40 jimi_sanchez joined #git
18:41 sea-gull_ joined #git
18:44 refried_ joined #git
18:44 qqx yottabyte: Pull is internally a two step process, a fetch followed by merge or rebase. If there are conflicts it will stop after the fetch.
18:45 qqx At that point you can stash the changes before continuing on (possibly by redoing the pull command).
18:45 adymitruk joined #git
18:47 button joined #git
18:47 adymitruk joined #git
18:49 c1arknova joined #git
18:49 tnecniv joined #git
18:51 Sasazuka joined #git
18:51 ahmedelgabri joined #git
18:52 TheWild joined #git
18:54 TheWild warning: LF will be replaced by CRLF in bootstrap/autoload.php - does it mean that when someone working on Linux clones the repository, he/she may have CRLF instead of LF?
18:55 davimore joined #git
18:55 tnecniv joined #git
18:57 venmx joined #git
18:58 chardan joined #git
18:58 durham joined #git
18:58 SwiftMatt joined #git
18:59 cheater joined #git
19:00 guest____ joined #git
19:00 clarkn0va joined #git
19:00 lvns joined #git
19:00 tnecniv joined #git
19:00 troppie joined #git
19:01 Random832 TheWild, i think it means when *you* check it out again it will have CRLF, even though it had LF when you checked it in.
19:01 Random832 and anyone on windows
19:01 Random832 who has that option enabled
19:02 Random832 if you have autocrlf=true it's expected that you'll actually be using an editor that creates/expects text files with crlf line endings
19:02 mar77i joined #git
19:02 orbisvicis joined #git
19:03 orbisvicis can I convert a regular patch with a junk header so that it applies with git-am ?
19:03 TheWild does git internally distinguish between LF and CRLF. I mean if I would commit a monster that has mixed CRLF and LF, would git preserve them?
19:03 Random832 TheWild, depends on the setting of autocrlf
19:04 grawity TheWild: by default yes, unless core.autocrlf tells it otherwise
19:04 dreiss joined #git
19:04 lvns_ joined #git
19:04 Random832 if it's set to true or input, it converts CRLF to LF, and it has LF in the repository. if it's set to true, then LF comes out as CRLF.
19:04 derk0pf joined #git
19:04 Random832 the warning means that you have it true but you checked in a LF, and to warn you that it will not come out as LF.
19:05 TheWild I'll better check the config
19:05 kfoonamalik joined #git
19:06 urda joined #git
19:06 GodGinrai joined #git
19:07 User458764 joined #git
19:07 GodGinrai joined #git
19:07 TheWild it was set to true.
19:07 TheWild do I have to amend that commit?
19:08 _ADN_ joined #git
19:09 y3ckw7ia joined #git
19:10 causasui joined #git
19:10 finalbeta joined #git
19:11 GavinMagnus joined #git
19:11 inflames joined #git
19:12 leeN joined #git
19:14 TheWild nvm. I amended it and seems fine now. Thank you Random832, gravity.
19:14 lb Nice
19:14 nettoweb joined #git
19:15 jaguarmagenta joined #git
19:15 sdelic joined #git
19:15 Random832 if you have any files that it's important for CRLF to appear in you might have to change those
19:17 anonymuse joined #git
19:20 Flowinho joined #git
19:21 dsantiago joined #git
19:24 tyreld joined #git
19:29 mda joined #git
19:29 dsantiag_ joined #git
19:30 e14 joined #git
19:30 OnBrokenWings joined #git
19:30 y3ckw7ia left #git
19:32 omx joined #git
19:33 sdelic joined #git
19:33 Atm0spher1c joined #git
19:34 c1arknova joined #git
19:34 Spec-Chum joined #git
19:35 suy joined #git
19:35 publio joined #git
19:35 OnBrokenWings joined #git
19:35 kenansulayman joined #git
19:36 venmx joined #git
19:36 Dandelock joined #git
19:36 jesk joined #git
19:36 thoros joined #git
19:36 trondth joined #git
19:36 APic joined #git
19:36 heroux joined #git
19:36 flaviodesousa joined #git
19:36 Moult_ joined #git
19:36 avar joined #git
19:37 e14 joined #git
19:37 traxo-xx joined #git
19:38 cdown joined #git
19:39 alex1a joined #git
19:40 tvw joined #git
19:42 astrofog joined #git
19:43 [0xAA] joined #git
19:44 Rodya_ joined #git
19:46 Mobutils joined #git
19:47 ShekharReddy joined #git
19:49 Mobutils_ joined #git
19:50 GavinMagnus joined #git
19:50 hue joined #git
19:50 [0xAA] joined #git
19:51 orbisvicis hi, I need to create a patch (between branch & tag) in mbox format, when I create it using diff tag..branch, apply works, but when I create it using format-patch tab..branch --stdout, am fails
19:52 danslo_ joined #git
19:53 GavinMagnus joined #git
19:58 irqq joined #git
19:58 OnBrokenWings joined #git
19:58 aidalgol joined #git
19:59 jnavila joined #git
20:01 tobiasvl orbisvicis: does "git am" work with the latter?
20:01 tobiasvl man git am
20:01 gitinfo the git-am manpage is available at http://jk.gs/git-am.html
20:01 jrun left #git
20:03 darkcar joined #git
20:03 orbisvicis tobiasvl: no, git am fails with the latter (when applying to the tag)
20:04 tyreld joined #git
20:04 d0nn1e joined #git
20:05 Mobutils_ joined #git
20:06 sdothum joined #git
20:06 nickabbey joined #git
20:09 Sasazuka joined #git
20:10 askb joined #git
20:10 Doginal joined #git
20:11 User458764 joined #git
20:12 tobiasvl oh, sorry, I didn't see that you wrote "am fails"
20:12 tobiasvl thought you were using apply
20:12 lektrik joined #git
20:12 tobiasvl how does it fail?
20:13 GavinMagnus left #git
20:15 rubyonrailed joined #git
20:18 orbisvicis 11th & 12th patches do not apply
20:18 publio joined #git
20:18 jimi_ joined #git
20:19 johnmilton joined #git
20:20 e14 joined #git
20:22 rdavila joined #git
20:22 hussam how do I check the difference between two branches?
20:22 orbisvicis diff branch1..branch2
20:23 col joined #git
20:24 qqx orbisvicis: The preferred method for diff would be to use a space between the branches rather than .. since diff doesn't operate on ranges
20:24 _ikke_ orbisvicis: note that the dots do not make sense for diff (but it accepts them)
20:24 _ikke_ (3 dots is a thing though)
20:25 crayon joined #git
20:25 User458764 joined #git
20:26 orbisvicis what happens then with two dots ?
20:26 qqx orbisvicis: The two dots works the same as if you use spaces, it's just conceptually cleaner to use a space.
20:26 hussam orbisvicis: that worked nicely. thank you very much.
20:26 adymitruk joined #git
20:27 orbisvicis qqx: I see, thanks
20:27 qqx It also makes the difference from 3 dots much more apparent, and that's a very different operation.
20:29 cheater joined #git
20:30 _ikke_ git diff looks at changes from two commits, specifying a range does not make sense
20:32 osse !dots
20:32 jmleo joined #git
20:33 watersoul joined #git
20:33 osse .trigger_edit dots https://raw.githubusercontent.co​m/Osse/git-stuff/master/dots.txt
20:33 osse !dots
20:33 osse Screw you too, then!
20:33 gitinfo A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.
20:33 gitinfo osse: Okay.
20:33 osse Wooo!
20:34 osse oh shit i overwrote it because the bot is slow :(
20:34 moestevens joined #git
20:34 osse .trigger_edit dots A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.
20:34 gitinfo osse: Okay.
20:34 osse but I think mine is better :3
20:36 blackwind_123 joined #git
20:36 _ikke_ You're biased :P
20:37 nikivi joined #git
20:37 oskarkv joined #git
20:37 osse Heh, I guess.  This doesn't explain the diff discrepancy thuogh
20:39 peeps[lappy] joined #git
20:40 Eugene ur a diff
20:40 m0viefreak joined #git
20:41 osse thanks. that means a lot to me
20:41 nikivi joined #git
20:42 yanome joined #git
20:44 cyan__ joined #git
20:44 _Vi joined #git
20:45 abyx joined #git
20:47 autofly joined #git
20:47 tnecniv joined #git
20:48 jimi_ joined #git
20:51 Anja joined #git
20:51 ResidentBiscuit we're all diff
20:52 yanome joined #git
20:53 _ng joined #git
20:53 Jackneill joined #git
20:55 cdg joined #git
20:56 nickabbey joined #git
20:57 e14 joined #git
21:00 SylvieLorxu joined #git
21:00 askb joined #git
21:02 DrRobotic joined #git
21:02 theonefoo joined #git
21:02 steelsw0rd joined #git
21:04 SylvieLorxu Hey everyone, GitHub just had an outage and it broke my pushing to it, claiming everything is up to date. My setup is a bit weird in the sense that I have 2 remotes, with NotABug being my main remote. Here's my console output: https://paste.fedoraproject.org/500683/58102148/ and here's my .git/config: https://paste.fedoraproject.org/500685/48105821/ (which apparently is a mix of tabs and spaces, oops). I was
21:04 SylvieLorxu wondering if anyone had a clue how to make git push to GitHub anyway?
21:06 dsdeiz joined #git
21:06 dsdeiz joined #git
21:07 GodGinrai SylvieLorxu: "how to make git push to github"?
21:07 GodGinrai what do you mean?
21:07 GodGinrai if you have a github remote, just `git push github <branch>`
21:07 GodGinrai on the branch you want to push
21:08 mar77i joined #git
21:08 SylvieLorxu GodGinrai: GitHub just had an outage and it broke my pushing to it, with git claiming everything is up to date while it hasn't actually be pushed to GitHub, see logs
21:08 SylvieLorxu And nope, specifying the branch doesn't fix it either
21:08 noecc left #git
21:09 GodGinrai are you sure github isn't updated?
21:09 GodGinrai does anyone else use this repo?
21:10 SylvieLorxu Yes, I'm sure it isn't updated: https://lut.im/33Sj2UkxhQ/XCG3V3visSnw0HRJ.png
21:10 SylvieLorxu How do you mean "does anyone else use this repo"?
21:10 hahuang61 joined #git
21:12 GodGinrai SylvieLorxu: well, if no one other than you has pulled from it recently, you could just force push
21:12 SylvieLorxu I tried that, no difference
21:12 SylvieLorxu Git won't push because "Everything up to date"
21:12 GodGinrai SylvieLorxu: no
21:12 GodGinrai SylvieLorxu: git *always* pushes when you force push
21:13 GodGinrai there's no reason to have a force flag if it didn't force it
21:13 SylvieLorxu GodGinrai: Nope: https://paste.fedoraproject.org/500691/81058797/
21:13 HoierM joined #git
21:13 GodGinrai SylvieLorxu: flags before params, Unix 101
21:14 guest____ joined #git
21:14 SylvieLorxu GodGinrai: Granted, but no difference: https://paste.fedoraproject.org/500692/48105885/
21:14 SylvieLorxu Git seems to have gotten really confused when it pushed to GitHub during the outage as I showed in the first log
21:15 _ikke_ If git says everything is up-to-date, the server claims it already has everything you offer
21:15 _ikke_ I bet it's the github web cache that's not up-to-date, not the repository hosted at git
21:16 jaguarmagenta joined #git
21:16 SylvieLorxu _ikke_: Seems you're right, I should've cloned from GitHub to check. Thank you and GodGinrai
21:17 theonefoo joined #git
21:18 GodGinrai SylvieLorxu: you might also check just to make sure that you aren't in detached head mode
21:18 SylvieLorxu GodGinrai: I'm not, but thanks for the suggestion
21:18 GodGinrai k
21:18 SylvieLorxu I shouldn't have trusted a website to show things correctly right after having "fixed" an outage :P
21:19 _ikke_ SylvieLorxu: Comitting something new and pushing might fix it
21:19 irco joined #git
21:19 _ikke_ (or amending the last commit)
21:20 SylvieLorxu I don't want to amend because of risking breaking pulling for someone, I'll surely commit something new soon enough as it's an active project, thanks
21:23 floatingman joined #git
21:23 rdavila joined #git
21:24 nickabbey joined #git
21:24 grumpDev joined #git
21:25 nwkj86 joined #git
21:26 grumpDev hello
21:26 gitinfo grumpDev: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
21:27 _Vi joined #git
21:27 snowkidind joined #git
21:29 mischat joined #git
21:29 mischat joined #git
21:30 grumpDev I keep getting asked 'have you made an app/project before' and I tell them 'no I graduated recently and I'm looking for a job where I can start learning. I already know enough but I meant being part of a team that works on a serious app
21:30 grumpDev please enlighten me
21:30 NeverDie joined #git
21:30 grumpDev serious. I live in a #@$# country
21:31 e14 joined #git
21:31 chachasmooth joined #git
21:32 texinwien_ joined #git
21:32 col joined #git
21:33 chachasmooth_ joined #git
21:33 ExoUNX joined #git
21:33 Learath2 joined #git
21:33 darkcar joined #git
21:34 orbisvicis left #git
21:34 venmx joined #git
21:36 ColoradoPods joined #git
21:37 quesker joined #git
21:37 rdavila joined #git
21:39 llamapixel grumpDev:  If you are just starting out, make some projects and work on them. [1] git_test  [2] CodeExamples_yourpreferredLanguage   [3] Template_yourpreferredEnvironment
21:39 hashpuppy joined #git
21:39 quesker at work they moved to a new git server a while back and I moved my projects to it.   I have another dev box that never got changed over.  all I need to do is git remote set-url origin foo@bar:baz/myproj.git and then pull right?
21:40 llamapixel This way you can show potential business partners you are proactive about your own code and lesson management.
21:40 nikivi joined #git
21:41 _Vi joined #git
21:41 llamapixel Once you have those projects as well grumpDev  you can then think about making some projects you are interesting in or identify some things you can improve or automate.
21:42 llamapixel You can make an app from your template and keep improving it as well when they ask you about that experience.
21:42 grumpDev llamapixel: thanks for the tip
21:43 llamapixel I make games and update those 3 example projects today
21:43 grumpDev what do you mean by [1][2][3]?
21:43 llamapixel no worries
21:43 llamapixel They are 3 git projects you want to manage
21:43 Rodya_ joined #git
21:43 grumpDev I am already familiar with git basics
21:43 llamapixel Never underestimate that project
21:43 quesker I tried it, looks like it worked.  whew    but it is "auto packing" whatever that is, never saw it before
21:43 llamapixel Today for example grumpDev  I am learning Git Annex.
21:43 grumpDev but I don't understand
21:44 grumpDev llamapixel: may I ask where you're from?
21:44 tmsmith joined #git
21:44 llamapixel Australia grumpDev
21:44 grumpDev Sweden?
21:45 grumpDev have you studied anything related to computing?
21:45 llamapixel grumpDev: I am a self taught game developer who lectured at a university or two. I have 30 ish years doing that. 20 professionally.
21:46 llamapixel grumpy - You understand to make 3 projects right? [1] for testing new git concepts [2] for collecting your code thoughts [3] putting the code into practice with templates.
21:46 grumpDev oh, sorry but one needs to make sure he get advice form someone who knows his stuff
21:46 grumpDev that's why I ask
21:46 llamapixel ok
21:48 llamapixel I execute what i preach, this morning I am learning more about LFS and Annex for large file support as I am about to move into larger game projects that involve V.R. / A.R. content from mobile games.
21:48 llamapixel It is a no brainer that I have a test git project, git is just as important as the projects itself in todays terms.
21:49 grumpDev I understand
21:49 llamapixel So you have 3 projects to make today grumpDev
21:49 grumpDev app within one day?
21:49 grumpDev is that even realistic?
21:49 llamapixel If you have more than one language interest make 2 more for each one you like
21:49 grumpDev 3 apps
21:49 llamapixel You are just making 3 repos
21:50 llamapixel You continue to populate the repos with content this month.
21:50 llamapixel In 4 weeks you should have enough data to show something in an interview and distilled it all through the Examples project to the Template project finally to an app
21:52 llamapixel Here is the sample list of code examples I currently have for the environment called Unity3d http://hastebin.com/ociwakowof.vbs
21:52 grumpDev I understand what you are saying
21:52 llamapixel So get started mate.
21:52 grumpDev but you seem like your stiching up jargon just to confuse me
21:52 llamapixel Never assume you know something and don’t need an example project.
21:53 llamapixel If you can’t comprehend 3 projects and why you are in the wrong profession mate.
21:53 grumpDev No I can
21:53 grumpDev why jumping to this drastic shift of events
21:53 llamapixel It is up to you now to be proactive
21:53 grumpDev I've had an interview where they asked me to make a project and upload the reop to github
21:54 grumpDev I did what they asked
21:54 grumpDev didn't even take me time
21:54 grumpDev can you tell where I am from?
21:54 llamapixel yes
21:54 grumpDev where?
21:54 llamapixel middle east saudi
21:54 grumpDev yeah
21:54 grumpDev thought so
21:54 texasmynsted joined #git
21:54 mischat joined #git
21:55 overlord_tm joined #git
21:55 llamapixel You would already have 3 projects in the context above that you can send again and again to potential jobs
21:55 grumpDev you just want to take the computers from there and send the people back to the desert huh?
21:55 llamapixel I suspect you might have to sort out yourself before you are in the right mind to be a developer mate.
21:56 grumpDev I never understand why's the hate one sided
21:56 llamapixel You will ruin your best opportunity talking about that stuff in here
21:56 llamapixel Don’t waste your best resource online with imaginations
21:56 grumpDev no not imagination
21:57 llamapixel I am trying to help you but you are trying to make it a racial argument
21:57 grumpDev you're white and you live in Australia and hate on the minoirites there so you feel like you need to put down another browny because they are stealing your jobs those inferiors
21:57 quesker ugh  lots of this  CONFLICT (add/add): Merge conflict in
21:57 llamapixel Make those 3 projects and constantly update them which will imporve your chance in getting work grumpDev
21:58 grumpDev haha
21:58 llamapixel grumpDev:  don’t make those assumptions
21:58 grumpDev stfu
21:58 llamapixel any mods around?
21:59 grumpDev I'll have to spoof my location
21:59 grumpDev damn it
21:59 quesker I should have just cloned instead.  shit.  is this pushing changes to the new git server?  all I did was pull
22:00 grumpDev does it show where I am from now llamapixel?
22:00 chardan joined #git
22:00 muelli joined #git
22:00 grumpDev of course you won't do me the favor
22:01 shgysk8zer0 joined #git
22:03 lukee910 joined #git
22:04 quesker oh wow I see what I did.  I made a script to move all these to the new remote but I forgot to make that a variable in the script so I set them all to the wrong remote and then pulled.   oops
22:04 quesker no wonder they were blowing up like crazy.  any way to back that out?
22:04 quesker or should I just clone them all clean?
22:05 cheater joined #git
22:06 quesker what a mess
22:06 llamapixel Sometimes it is easier to flush than to clean up quesker if you can for peace of mind.
22:06 kadoban quesker: What'd you do, change the remote and then something?
22:07 quesker it would be slightly better to back out because I have some random stuff not added to git in each dir
22:07 quesker I changed remote to the wrong thing and then pulled
22:07 kadoban You can abort the merge I guess and then set the remote back
22:07 kadoban git merge --abort should work ... test it first YMMV, I dunno what you're doing.
22:07 blackwind_123 joined #git
22:08 rdavila joined #git
22:09 quesker we moved to a new git server a few months ago.  I hadn't set up this particular dev box yet.  I think I just needed to change remote and pull but I did it from script (there are a lot of them) and I forgot to make the repo name a variable.  so I set them to the same remote and pulled
22:09 quesker fatal: There is no merge to abort (MERGE_HEAD missing)
22:10 kadoban You'll get that on every one where the merge didn't conflict, which is not good.
22:10 quesker oh ok that was the right remote oops
22:10 GavinMagnus joined #git
22:10 quesker that is the one that was right
22:10 kadoban You should probably reclone ... this sounds kinda bad. You'd have to check the latest commit on each and make sure it's not nonsense.
22:11 quesker ok
22:11 quesker well at least I am not totally hosed
22:14 MeltedLux joined #git
22:16 texasmynsted joined #git
22:17 [0xAA] joined #git
22:19 quesker I'm blown away how fast it can clone 37000 files
22:19 quesker subversion would take all day for that
22:19 athaller joined #git
22:26 bamb joined #git
22:27 darkcar joined #git
22:28 tax joined #git
22:28 bamb left #git
22:28 neilthereildeil joined #git
22:28 neilthereildeil why does git log --all show stuff that git log doesnt?
22:29 _Vi joined #git
22:33 venmx joined #git
22:36 yqt joined #git
22:37 Exagone313 joined #git
22:38 malice joined #git
22:38 malice What is git bad for?
22:38 malice (when not to use git)
22:40 danemacmillan joined #git
22:40 nettoweb joined #git
22:42 Sasazuka joined #git
22:43 _Cyclone_ joined #git
22:43 cjohnson storing a ton of binary files
22:43 rbern joined #git
22:44 kyan joined #git
22:45 mar77i_ joined #git
22:46 [0xAA] joined #git
22:47 [0xAA] joined #git
22:47 neilthereildeil i am trying to pull from a tree where one of the commit descriptiosn was changed and there fore all the commit hashes were changed. is this a problem?
22:47 [0xAA] joined #git
22:48 kadoban neilthereildeil: Usually, yes, assuming you have the old commit(s)
22:48 [0xAA] joined #git
22:48 rubyonrailed joined #git
22:48 neilthereildeil i have tags in my local copy of the tree pointing to certain commits
22:48 neilthereildeil when i run pull, i get this:
22:48 neilthereildeil Pull is not possible because you have unmerged files.
22:48 neilthereildeil Please, fix them up in the work tree, and then use 'git add/rm <file>'
22:48 neilthereildeil as appropriate to mark resolution, or use 'git commit -a'.
22:48 neilthereildeil how can i resolve this?
22:48 [0xAA] joined #git
22:49 kadoban Well, that's not particularly anything about the changed commits, that's just ... you are already in a merge and are asking git to do another one.
22:49 kadoban Do you know what merge you're in?
22:49 [0xAA] joined #git
22:49 neilthereildeil how can i tell?
22:50 kadoban Can't say I've ever been in that position, I'm not sure. I guess you can check 'git ls-files --unmerged' and see what files are conflicting at least? I think you can check .git/MERGE_HEAD, but that might not be right, I dunno.
22:51 jeffreylevesque joined #git
22:52 kadoban neilthereildeil: I gotta run, but whenever you figure out what you want to do with your current merge, after that you should probably peruse: https://git-scm.com/docs/git-rebase.h​tml#_recovering_from_upstream_rebase
22:53 neilthereildeil ok, but is there any way to recover from changed commit descriptions?
22:53 tnecniv joined #git
22:53 tmsmith joined #git
22:55 mischat joined #git
22:56 rooftopjoe joined #git
22:58 rooftopjoe i'd like to remove the last commit from the repository (not revert to the previous one). i think rebasing means replacing it with another. do i prepare a new commit first?
22:58 kadoban neilthereildeil: Changed commit messages are rewritten history, the above applies.
22:59 dminuoso I was reworking a lot and force pushed to my remote. How can I get rid of all old tags/branches in my remote?
22:59 dminuoso I mean, is there another way than deleting them one by one?
22:59 dminuoso Ideally I just want the remote to be exactly like my local, including branches and tags.
23:01 fmeerkoetter joined #git
23:03 mda1 joined #git
23:03 b3kN joined #git
23:03 b3kN joined #git
23:08 jrnieder joined #git
23:10 cheater joined #git
23:11 chachasmooth joined #git
23:15 rooftopjoe if i did a hard reset to my head, does it still exist anywhere?
23:15 Gsham joined #git
23:16 shpew12 joined #git
23:16 lvns joined #git
23:16 texinwien joined #git
23:16 texinwien_ joined #git
23:16 ayjay_t joined #git
23:17 jaguarmagenta joined #git
23:18 adymitruk joined #git
23:19 dendazen joined #git
23:21 SwiftMatt joined #git
23:26 anuxivm joined #git
23:27 axisys joined #git
23:28 watersoul joined #git
23:29 fmcgeough joined #git
23:30 _Vi joined #git
23:34 _ADN_ joined #git
23:36 _Vi joined #git
23:36 dsdeiz joined #git
23:39 nickabbey joined #git
23:41 neilthereildeil left #git
23:42 GavinMagnus left #git
23:42 thebope joined #git
23:43 chachasmooth joined #git
23:46 asimismo joined #git
23:46 adymitruk joined #git
23:46 jccn joined #git
23:47 hahuang61 joined #git
23:56 mischat joined #git
23:56 jmpp joined #git
23:58 spacelord_ joined #git
23:58 MrWoohoo joined #git
23:59 alex1a_ joined #git

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