Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-28

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

All times shown according to UTC.

Time Nick Message
00:01 mellernoia joined #git
00:02 glebihan joined #git
00:05 adino joined #git
00:07 dmto joined #git
00:07 mellernoia-work joined #git
00:12 MZAWeb_ joined #git
00:13 SourTrout joined #git
00:15 tesuji joined #git
00:18 necaremus joined #git
00:18 zacts joined #git
00:18 moei joined #git
00:19 _sjs joined #git
00:20 splud PabloR: with your repo checked out to the commit you want at the head of your new branch, create a branch:  ‘git branch somenewbranch’.  Now that branch has that content.  Assuming it’s at the HEAD, you can ‘git reset —hard commitref’ to reset the master back to some other commit.
00:21 splud I prefer rebasing - not uncommon when working on some fix (do that in a branch), and then you pull other updates from the remote and rebase your branch on top of them.  history stays much cleaner instead of being peppered with merges.
00:23 cyphase joined #git
00:25 cdown___ joined #git
00:26 mingrammer joined #git
00:28 dtrott joined #git
00:30 shgysk8zer0 joined #git
00:31 mwhooker joined #git
00:33 PabloR splud. I'm new to git, still going thru the book. Will work on understanding how your comment works. Thanks!
00:34 splud I was reading the backlog, saw your Q.
00:34 splud Sounded like you were saying you had commited some stuff to a repo, but then wanted those commits to exist in a branch instead of master, right?
00:36 splud If you create a branch, it starts at the ref you’re currently checked out at (and let’s say you’re in the master branch and at HEAD).  If you then reset the master branch to somewhere else, the commits don’t go away because they’re still referred to by the branch.
00:37 danslo joined #git
00:37 anuxivm left #git
00:37 PabloR Yeah, I'm practicing what I read in the book. I committed to the repo. Then I modified a file. For now, I wanted to see know to undo changes in files that I have not committed yet. Not very advanced stuff yet :p
00:38 splud I don’t know “the book” you are referring it.
00:38 splud to.
00:39 splud undoing changes you haven’t committed is easy.  check them back out <g>
00:39 PabloR Git pro and http://gitimmersion.com/
00:40 lindenle joined #git
00:40 adino joined #git
00:40 Hello71 !checkout
00:40 gitinfo checkout does two different things! (1) no file/path argument: 'git checkout <ref>' = switches to a branch or commit. Uncommitted changes are carried over; if they don't apply cleanly the whole operation rolls back. (2) 'git checkout [<commit>] -- <path>' = overwrites the given files/paths with different versions, from <commit> or (if not given) from the index.
00:41 PabloR So I was reading that both git checkout <file> and git checkout -- <file> would modify the file and wanted to know the difference
00:41 PabloR In this specific scenario. Still need to get more in depth
00:42 PabloR thanks guys
00:42 theelous3 how can I push to a specific branch?
00:42 clemf joined #git
00:42 theelous3 initially, I git cloned
00:42 cqi joined #git
00:43 mwd joined #git
00:43 theelous3 I tried "git push origin brancname"
00:43 theelous3 branchname*
00:43 splud you’re wondering what the double hyphen does?
00:44 glebihan joined #git
00:44 PabloR yeah
00:44 splud anything after it should be a FILE
00:44 splud versus a reference (commit or branchname)
00:45 splud handy to use when scripting, since you may have a file that collides with the name of a branch.
00:47 splud no doubt has its roots in getopts - see ‘man rm’ for a prime example - doublehyphen is used to say “no more options, everything else are files/dirs”
00:48 splud In the case of rm, allows for removing files which might otherwise be misconstrued as a commandline switch.
00:49 PabloR ok. Great. With yours and the help I got earlier I'm in much better shape now. I still need to get familiar with many of the commands. Thanks a lot
00:50 splud touch — “-rf .”
00:50 splud now, imagine some fool sees some file in a directory (or has a script that it iterating over them), and tries to rm that.
00:51 Hello71 that's three files
00:51 diegoviola joined #git
00:51 splud suggest you try running it (the touch isn’t dangerous, but a foolish rm of it could be a surprise)
00:51 Hello71 and the best way to handle globbing files is to use ./*
00:52 Hello71 I did rm — “-rf .” and it removed three files from my home directory.
00:52 Hello71 hint: there were more than three files to start with
00:53 splud er, are you not running a unix variant?
00:53 romerocesar joined #git
00:54 MarconM joined #git
00:54 Hello71 I don't think Unicode existed at the time of Unix.
00:54 sangy joined #git
00:54 splud did the quotes get posted as something other than standard ascii quotes?
00:55 splud That’s all they render like here.
00:55 Hello71 also, while we're on the line of "bad history", getopt is the C library call, and -- is GNU specific
00:56 splud this cut-n-paste from an editor: "foo"
00:57 splud funny, — is specifically called out in a BSD manpage for rm.
00:58 Hello71 huh, I stand corrected on the --
00:58 splud and in the getopt(3) manpage, also on BSD.
00:59 Hello71 although I maintain the point about "getopts".
00:59 fairuz joined #git
01:00 Hello71 not all BSDs are the same (assuming you aren't really using 4.3BSD)
01:00 splud and BSDs are’t gnu either
01:01 Hello71 [00:58:47] < Hello71> huh, I stand corrected on the --
01:01 splud But none of this pedantry is helping PabloR, is it?
01:01 PabloR haha, actually not. But I keep reading
01:02 dmto joined #git
01:04 splud Enjoy, today’s been enough fun already, you know?
01:04 BSaboia joined #git
01:05 PabloR Thanks splud. I'll go back to git pro and http://gitimmersion.com/ to keep learning. I'll be back with more questions :)
01:06 PabloR You've been in the channel for a while today?
01:07 PabloR or fun at work?
01:10 afusion joined #git
01:11 rgrinberg joined #git
01:12 MattMaker joined #git
01:16 mellernoia joined #git
01:18 clemf joined #git
01:20 mingrammer joined #git
01:23 clemf_ joined #git
01:24 clemf__ joined #git
01:24 cyphase joined #git
01:26 massey101 joined #git
01:28 lucasem joined #git
01:31 Spec-Chum joined #git
01:31 neilthereildeil left #git
01:33 Ragnor joined #git
01:40 t-mart_ joined #git
01:46 haaja joined #git
01:48 PioneerAxon joined #git
01:49 t-mart joined #git
01:49 makinen joined #git
01:50 PioneerAxon joined #git
01:50 pks joined #git
01:51 crazyhorse18 joined #git
01:51 ash_workz joined #git
01:53 LeBlaaanc joined #git
01:54 PioneerAxon joined #git
01:56 romerocesar joined #git
01:58 ShekharReddy joined #git
02:01 lagothri1 joined #git
02:01 oich joined #git
02:02 d^sh joined #git
02:05 ee joined #git
02:07 LeBlaaanc joined #git
02:08 Spec-Chum joined #git
02:14 danimal2 joined #git
02:15 mingrammer joined #git
02:16 texinwien_ joined #git
02:17 romerocesar joined #git
02:18 durham_ joined #git
02:22 harish_ joined #git
02:23 nyexpress joined #git
02:25 leehambley joined #git
02:27 chachasmooth joined #git
02:29 tabrez joined #git
02:30 Goplat joined #git
02:32 fairuz joined #git
02:33 Literphor joined #git
02:35 glebihan joined #git
02:35 mwd joined #git
02:37 A5101 joined #git
02:37 cqi joined #git
02:39 orcus joined #git
02:40 star_prone joined #git
02:40 rinwa joined #git
02:48 byteflame joined #git
02:52 RedneckDonut joined #git
02:56 justanotheruser joined #git
02:56 inflames joined #git
02:58 citizen-stig joined #git
02:59 fairuz joined #git
02:59 lagothrix joined #git
03:01 Limes_ joined #git
03:01 Dougie187 left #git
03:02 hexagoxel joined #git
03:04 clemf joined #git
03:09 ndim joined #git
03:09 mingrammer joined #git
03:10 clemf joined #git
03:11 bb010g joined #git
03:15 BSAlb joined #git
03:15 cagmz joined #git
03:16 clemf joined #git
03:17 mingrammer joined #git
03:18 xameada joined #git
03:19 romerocesar joined #git
03:20 wxg joined #git
03:20 k3rn31 joined #git
03:22 mwhooker joined #git
03:23 lindenle joined #git
03:31 MattMaker joined #git
03:34 star_prone joined #git
03:36 Mannn joined #git
03:38 star_prone joined #git
03:42 zacts joined #git
03:44 fstd_ joined #git
03:45 RedShift joined #git
03:46 zacts joined #git
03:47 LeBlaaanc this is kinda a bash question but i'll ask anyway, I have a bash script that does ... echo `git log $LAST_TAG..HEAD --oneline` ... but echo seems to strip out all of the newlines, any way to prevent that?
03:49 LeBlaaanc oh wait that's a dump question, ditch the echo and all is good
03:50 red_ joined #git
03:51 mehola joined #git
03:54 osse joined #git
03:58 howdoi joined #git
04:03 jaguarmagenta joined #git
04:09 emPi joined #git
04:10 phanimahesh joined #git
04:19 cdown_ joined #git
04:21 romerocesar joined #git
04:24 anu1 joined #git
04:26 clemf joined #git
04:27 star_prone joined #git
04:28 fahadash joined #git
04:38 k3rn31 joined #git
04:39 WakiMiko joined #git
04:40 danslo joined #git
04:41 Literphor joined #git
04:41 hide joined #git
04:47 Cabanossi joined #git
04:47 cyan__ joined #git
04:47 fairuz joined #git
04:49 jaguarma_ joined #git
04:49 eozelda joined #git
04:49 settermjd joined #git
04:49 eozelda left #git
04:52 blahdodo joined #git
05:00 MattMaker joined #git
05:00 citizen-stig joined #git
05:01 emPi joined #git
05:01 jstimm joined #git
05:04 govg joined #git
05:06 subhojit777 joined #git
05:06 adino joined #git
05:07 LeMike joined #git
05:08 polyzen joined #git
05:09 rscata joined #git
05:20 PresidentBiscuit joined #git
05:20 elsevero joined #git
05:20 zacts joined #git
05:20 hahuang61 joined #git
05:20 romerocesar joined #git
05:20 TomyLobo joined #git
05:22 freimatz joined #git
05:23 qt-x joined #git
05:23 Ph_ joined #git
05:23 watersoul joined #git
05:26 satya4ever joined #git
05:28 watersoul joined #git
05:30 jost joined #git
05:32 nuck joined #git
05:32 A5101 looks like github is down
05:33 Guest32754 joined #git
05:34 watersoul joined #git
05:37 Macaveli joined #git
05:39 watersoul joined #git
05:41 Aces_Charles joined #git
05:41 fairuz joined #git
05:43 Alienpruts joined #git
05:44 watersoul joined #git
05:47 daynaskully joined #git
05:48 realz joined #git
05:49 red_ joined #git
05:49 watersoul joined #git
05:51 Zamerick joined #git
05:51 zeroed joined #git
05:52 Repox joined #git
05:56 realz joined #git
05:57 moriko joined #git
06:01 Literphor joined #git
06:01 citizen-stig joined #git
06:02 Andrew_K joined #git
06:03 subhojit777 joined #git
06:10 MattMaker joined #git
06:14 spudowiar joined #git
06:16 hoangtranwork joined #git
06:17 Hi-Angel joined #git
06:19 King_Hual joined #git
06:19 InfoTest joined #git
06:20 govg joined #git
06:20 nilg joined #git
06:20 wxg joined #git
06:21 dopesong joined #git
06:22 mariuscc joined #git
06:26 LeMike joined #git
06:26 Softeisbieger joined #git
06:26 Pulp joined #git
06:26 chandak joined #git
06:28 JeroenT joined #git
06:30 dmiles joined #git
06:33 cbonobo joined #git
06:34 haaja joined #git
06:34 mingrammer joined #git
06:34 red__ joined #git
06:35 satya4ever joined #git
06:35 cbonobo joined #git
06:38 star_pro_ joined #git
06:41 Silenced joined #git
06:41 Silenced joined #git
06:41 danslo joined #git
06:41 settermjd joined #git
06:43 zeroed joined #git
06:45 ikmaak joined #git
06:47 danslo joined #git
06:47 arnas joined #git
06:47 arnas hello guys
06:47 gitinfo arnas: 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.
06:47 star_pro_ joined #git
06:47 arnas I accidently added the wrong file with "git add filename", but haven't commited it yet. How can I remove it?
06:48 drbean git status will say.
06:49 arnas drbean, indeed it did :) thanks
06:51 Sceorem joined #git
06:51 MrMojito joined #git
06:52 dreiss joined #git
06:52 nebg left #git
06:54 hahuang61 joined #git
06:54 jceb joined #git
06:56 daynaskully joined #git
06:56 Lomex joined #git
07:01 rominronin joined #git
07:06 TomyWork joined #git
07:07 WayToDoor joined #git
07:07 moriko joined #git
07:08 WayToDoor joined #git
07:08 Alienpruts joined #git
07:09 Darcidride joined #git
07:10 dopesong joined #git
07:10 sagerdearia joined #git
07:13 pR0Ps joined #git
07:13 AndreasLutro joined #git
07:14 Corosus joined #git
07:18 EvilPenguin joined #git
07:21 jceb joined #git
07:23 Faylite_ joined #git
07:24 AndreasLutro left #git
07:25 fairuz joined #git
07:27 Balliad joined #git
07:27 moriko joined #git
07:27 skroon joined #git
07:29 mingrammer joined #git
07:37 cyphase joined #git
07:37 settermjd joined #git
07:40 aidalgol joined #git
07:40 garethdaine joined #git
07:40 nnyk joined #git
07:41 JeroenT joined #git
07:42 CaptainQuirk joined #git
07:42 CaptainQuirk Hi guys
07:43 CaptainQuirk I'm about to split a single repo into 2 different ones
07:43 LiohAu joined #git
07:43 CaptainQuirk I'm thinking about using git subtrees to keep my history intact
07:44 quackgyver joined #git
07:45 dopesong joined #git
07:45 CaptainQuirk unfortunately, the operations I have to do to split the repo seem a bit complicated to me
07:45 eijk_ joined #git
07:45 rom1504 google it
07:45 CaptainQuirk I don't know if my situation qualifies for subtree
07:46 jaguarmagenta joined #git
07:47 CaptainQuirk that's helpful
07:47 Literphor joined #git
07:48 Stummi we don't know either. Whats your situation?
07:49 piattino joined #git
07:49 alcohol something like this CaptainQuirk https://help.github.com/articles/splittin​g-a-subfolder-out-into-a-new-repository/ ?
07:49 circ-user-GvKtY joined #git
07:50 piattino hi. i have this: A -> B (branch1) -> C -> D (branch2). how can i, from branch1, generate a diff capturing changes to all files, bringing branch1 to branch2 in a single commit, save that patch and apply it to branch1?
07:50 alcohol rebase?
07:51 Lomex left #git
07:51 Lomex joined #git
07:51 ahmedelgabri joined #git
07:52 arnas guys, I screw up something. When I type "git status" on master branch it says that there's nothing to commit, everything is up to date, but there are some local changes that are not online and I want to delete them. How can I just have new clean master branch?
07:52 piattino can i do this with a patch file.
07:52 iota_pi joined #git
07:52 alcohol arnas: you made a commit locally that you did not yet push?
07:53 alcohol piattino: why would you need a patch file?
07:53 arnas alcohol, that's right
07:53 CaptainQuirk alcohol, the thing is, I need to compose a repository with several subfolders of the current one
07:53 ki0 joined #git
07:53 piattino alcohol: send it via email or to another machine
07:53 alcohol arnas: you could just git reset to a previous commit
07:53 CaptainQuirk that's why I ask
07:53 alcohol CaptainQuirk: and..?
07:53 arnas alcohol, I tried git reset --hard HEAD but there are still some changes that shouldn't be there
07:53 mikecmpbll joined #git
07:53 alcohol arnas: that just resets state to the current commit
07:54 CaptainQuirk well, the folders I'm trying to extract aren't propertly speaking dependencies
07:54 arnas alcohol, well, "git reset" didn't help either
07:54 alcohol arnas: because you need to specify a target..
07:55 arnas alcohol, how can I check available targets?
07:55 jceb joined #git
07:55 alcohol arnas: git log?
07:55 rinwa joined #git
07:55 piattino i got it. git diff branch1..branch2 > /tmp/f
07:56 CaptainQuirk basically, I need to remove 6 or 7 directories from my main project and create a new repository with all of them combined plus other stuff
07:57 CaptainQuirk From what I've read, I need to create a repo for each folder
07:57 CaptainQuirk And in a separate repo, add all those folders as subtrees
07:57 CaptainQuirk this would keep all the history intact
07:57 arnas alcohol, thank you!
07:58 CaptainQuirk but after that, I'll be needing to work on those folders like they are a part of the new composed repo
07:58 CaptainQuirk is this going to work ?
07:59 kurkale6ka joined #git
08:02 CaptainQuirk alcohol, seems to me that the splitted directories added in my new composed repo will keep their subtree nature
08:02 bongjovi joined #git
08:02 CaptainQuirk which is not what I need
08:02 citizen-stig joined #git
08:05 netcarver joined #git
08:05 eijk_ joined #git
08:05 PioneerAxon joined #git
08:05 daynaskully joined #git
08:08 eijk_ joined #git
08:08 marcogmonteiro joined #git
08:09 ki0_ joined #git
08:10 ki0_ joined #git
08:11 Literphor joined #git
08:11 Grievre joined #git
08:13 tomog999 joined #git
08:15 zeroed joined #git
08:18 alcohol CaptainQuirk: https://help.github.com/artic​les/about-git-subtree-merges/ ?
08:18 CaptainQuirk seems to do the job yes
08:19 CaptainQuirk after the read-tree, I can remove the branches created from the subtrees remotes right ?
08:19 GavinMagnus joined #git
08:20 CaptainQuirk I won't be caring about any updates
08:20 CaptainQuirk can I go on making changes on the folders ?
08:21 chll_ joined #git
08:22 clmsy joined #git
08:23 mingrammer joined #git
08:25 [Brain] joined #git
08:25 alcohol CaptainQuirk: honestly, I'm just googling whatever you throw at me. I've never used this stuff.
08:26 CaptainQuirk lol
08:27 CaptainQuirk don't hesitate to dodge
08:29 wrouesnel1 joined #git
08:30 eijk_ joined #git
08:31 kadoban CaptainQuirk: You just need to make two separate repos, one with subdirs A B and C, and one with D E and F, correct? Do they need to share history going forward, or you just want to preserve old history in each?
08:32 ljc joined #git
08:32 CaptainQuirk only to preserve old history
08:33 CaptainQuirk well on the first repo, if I could filter out anything that had to do with those subdirs, it would also be great
08:33 CaptainQuirk but I guess that would be quite a messy thing to do
08:33 kadoban CaptainQuirk: Then just make a copy of the repo (just copy the files, easy). In each one, use filter-branch to nuke the subdirs you no longer want there.
08:33 Lomex joined #git
08:34 CaptainQuirk interesting
08:34 kadoban You don't even really need to do filter-branch even if you don't want to, but in the one it sounds like you do. If you want you can just do a commit that deletes the content you don't want.
08:34 skraito joined #git
08:34 skraito WELCOME TO GUINESS BOOK WORLD GAMER OF RECORD ... . JOIN ##WORLDGAMER FOR MORE INFO , BOUNTY AND GAME FOR THE CURRENT GAME ELECTION
08:34 skraito left #git
08:34 alcohol dafuq
08:35 maroloccio joined #git
08:36 kadoban CaptainQuirk: I'd only do the 'git subtree' stuff if I actually cared about them sharing history going forward, since it'll be kind of super tedious with that many splits and adds.
08:36 arnas joined #git
08:36 CaptainQuirk sure
08:36 kadoban Even if they must share going forward, still might be a better way, that's going to be pretty awful even if required.
08:36 CaptainQuirk the filter-branch operation seems scarier though
08:37 maroloccio hi. how can i checkout branch1 from origin and call it branch2? now i do this: git checkout branch1 && git branch -m branch2. in one command?
08:37 CaptainQuirk They'll share but not as git subtrees
08:37 grawity git checkout -b branch2 origin/branch1
08:37 CaptainQuirk repo B will become a dependency of repo A
08:37 CaptainQuirk but managed with php dependency manager "composer"
08:38 rolha joined #git
08:38 kadoban filter-branch isn't really that scary, just take backups first.
08:38 maxorator joined #git
08:39 ahmedelgabri joined #git
08:39 Spec-Chum joined #git
08:40 JeroenT joined #git
08:40 CaptainQuirk kadoban, do you have an example of such a filter-branch operation
08:40 CaptainQuirk operations
08:40 CaptainQuirk I guess there will be several
08:40 CaptainQuirk one for each dir ?
08:41 maroloccio grawity: thank you
08:41 kadoban CaptainQuirk: It's pretty much just the example ones they give in the filter-branch manpage for index-filter . You can delete multiple subdirs at once, it doesn't matter.
08:43 Faylite joined #git
08:43 harish_ joined #git
08:43 Lvjasha joined #git
08:43 JeroenT joined #git
08:45 alcohol CaptainQuirk: ah, why dont you just look at how symfony does it?
08:48 mra90 joined #git
08:48 mra90 is vim embedded in git ?
08:48 alcohol ..
08:48 alcohol no
08:49 JeroenT joined #git
08:50 mra90 so how is that possible when I do git commit somehow vim is openning
08:50 fairuz joined #git
08:51 alcohol could be for a number of reasons
08:52 alcohol could be env EDITOR is set to vim, or VISUAL, or GIT_EDITOR
08:52 mra90 the funny thing is I cannot open vim by typing "vim filename"
08:52 ramsub07 joined #git
08:52 necaremus joined #git
08:52 Anticom joined #git
08:52 alcohol what does `env | grep vim` return?
08:52 mra90 I am on win 7
08:52 alcohol o look, time for coffee
08:54 mra90 ;/
08:55 alcohol do you use gitbash?
08:56 hahuang61 joined #git
08:56 govg joined #git
08:58 PCatinean joined #git
08:58 mra90 no
08:59 mra90 I only want to edit files with vim but I cannot get vim opened
08:59 mra90 it only opens when I do git commit
09:00 alcohol where do you run git commit?
09:00 _ikke_ mra90: It means vim is not in your PATH
09:00 mra90 it must be in git editor path although
09:00 alcohol there is no such thing
09:01 mra90 so how is git able to open vim ?
09:01 jknetl joined #git
09:02 _ikke_ absolute path
09:03 mra90 do you have any idea how to open git ?
09:03 mra90 or rathe, how to edit files with vim ?
09:03 _ikke_ Do you have git bash installed?
09:03 citizen-stig joined #git
09:04 xaa joined #git
09:04 mra90 I dunno, how to check it ? >git bash ?
09:04 _ikke_ In start, type git bash
09:06 JeroenT joined #git
09:06 mra90 nothing unrecognized command
09:06 mra90 git: 'bash' is not a git command. See 'git --help'.
09:06 _ikke_ Not in cmd
09:06 _ikke_ in your start meny
09:06 _ikke_ menu
09:08 BryzNSTY joined #git
09:08 mra90 yes I have bash
09:08 mra90 git bash*
09:08 _ikke_ ok
09:08 _ikke_ In there, try to open vim
09:08 mra90 yes I did and it opens
09:09 _ikke_ now exit vim, and type which vim
09:10 maroloccio joined #git
09:10 mniip how do I show diffs of all commits that affected a specific file
09:10 mniip if possible, the diff would only include the said file
09:11 selckin git log --diff file
09:11 mra90 said "/usr/bin/vim
09:11 mra90 "
09:12 JeroenT joined #git
09:12 mniip fatal: unrecognized argument: --diff
09:12 selckin -p
09:12 wxg joined #git
09:12 mra90 but how is usr/bin/vim possible on windows
09:14 mra90 I was right frm the start vim is included in git instalation
09:14 mra90 or rather smartgit
09:14 _ikke_ right
09:15 Literphor joined #git
09:15 _ikke_ It installs a linux compattibility layer (msys or mingw)
09:17 eozelda1 joined #git
09:18 eozelda1 left #git
09:20 garethdaine joined #git
09:20 texinwien_ joined #git
09:20 stfn joined #git
09:20 ki0 joined #git
09:21 mra90 does cygwin contain vim ?
09:21 drbean_ joined #git
09:22 Zarthus yes
09:22 Zarthus the git bash client does too
09:23 mra90 ok thanks
09:23 mniip selckin, thanks
09:24 nnyk joined #git
09:27 mahendra_ joined #git
09:28 interne7y joined #git
09:31 marcogmonteiro joined #git
09:32 jceb joined #git
09:33 crazyhorse18 joined #git
09:34 jaguarmagenta joined #git
09:35 eijk_ joined #git
09:37 ljc joined #git
09:37 drbean joined #git
09:39 ribasushi joined #git
09:41 spudowiar joined #git
09:42 doebi joined #git
09:42 maroloccio joined #git
09:43 settermjd joined #git
09:45 ki0 joined #git
09:45 ki0 joined #git
09:49 mingrammer joined #git
09:49 garethdaine joined #git
09:51 ahmedelgabri joined #git
09:54 p4trix joined #git
09:55 dopesong joined #git
09:56 khelkun_ joined #git
09:56 JJjack joined #git
09:57 JJjack I updated a vendor file, how can I force it on push
09:58 JJjack and pull
09:59 osse JJjack: there is no way other than the usual way
09:59 osse commit etc
09:59 Codfection joined #git
09:59 JJjack ok
10:00 GT4066 joined #git
10:00 yuhlw_ joined #git
10:03 yoan_ joined #git
10:04 JJjack this means I need to commit on the production server
10:05 subhojit777 joined #git
10:05 _ikke_ 1..
10:08 _ikke_ makes me sad
10:08 mehola joined #git
10:12 arnas joined #git
10:12 settermjd joined #git
10:21 rinwa_ joined #git
10:23 sdaugherty JJjack, presumably, you have some sort of system for deploying your app to production? :)
10:23 circ-user-GvKtY joined #git
10:24 drbean_ joined #git
10:24 JJjack I mean vendor marked on gitignore
10:24 JJjack so composer install reinstalls the package
10:24 JJjack so I need to force the file I edited locally  to production
10:25 osse copy it over
10:25 sdaugherty ahh, ok, yeah, was going to say,, git alone ceases to be a  viable deployment solution at some level of complexity
10:25 wxg joined #git
10:25 CaptainQuirk is it possible when adding a folder as a subtree to not have a merge commit ?
10:26 JJjack I did copy over it but it is very crude
10:28 sdaugherty JJjack, you probably want some sort of configuration management / orchistration / deployment tooling that can handle more complex details..
10:28 chrisml left #git
10:29 JJjack any references?
10:29 sdaugherty if you are running into this sort of problem, it's  probably  a sign you need to use tools that are designed to  handle it. :)
10:29 ki0 joined #git
10:29 JJjack thanks
10:31 sdaugherty You can manage deployments with some sort of config management tooling, like puppet, salt, ansible, chef, cfengine etc..
10:31 sdaugherty Or you can handle them  with something specifically a deployment tool (capistrano is popular for ruby apps but by no means restricted to them, composer  for php, and so on)
10:33 sdaugherty Docker can even handle things in its own way.
10:33 JeroenT joined #git
10:34 sdaugherty Even homegrown shell scripts are a viable  approach.
10:35 sdaugherty Do your research though, there are many  advantages and disadvantages to various approaches.
10:35 nilg joined #git
10:36 sdothum joined #git
10:36 sdaugherty Some tools give you functionality like not replacing and restarting the existing "live" application until the entire process successfully completess
10:36 strk joined #git
10:37 ShekharReddy joined #git
10:37 strk git branch -r # shows some <remotename>/<branchname> but <remotename> is not known as a remote anymore, how do I get rid of those branches ?
10:37 sdaugherty so that, for instance, a failed git clone just stops in  its tracks without  breaking  the production  environment
10:37 strk example: git branch -r | grep osgeo #     osgeo/php7
10:37 rinwa__ joined #git
10:37 strk git branch -D osgeo/php7 # error: branch 'osgeo/php7' not found.
10:38 dsdeiz joined #git
10:38 dsdeiz joined #git
10:41 strk git branch -rD osgeo/php7 # does it
10:42 ams__ joined #git
10:44 mingrammer joined #git
10:45 cyan__ joined #git
10:47 cbreak strk: look for prune
10:47 cbreak i.e. git fetch --prune
10:47 k3rn31 joined #git
10:47 cbreak strk: but deleting a remote should delete all associated tracking branches
10:48 Dro joined #git
10:48 jaguarmagenta joined #git
10:50 notebox joined #git
10:50 k3rn31_ joined #git
10:50 citizen-_ joined #git
10:51 yoan__ joined #git
10:52 notebox joined #git
10:53 citizen-stig joined #git
10:54 strk cbreak: cannot delete a non-existent remote (evidently I renamed it manually or something)
10:54 alcohol argh unicorn
10:55 Orion3k joined #git
10:55 strk funny: 'git prune <remote>' and 'git fetch --prune <remote>' keep undoing one the work of the other
10:56 strk prune:  * [pruned] gogs/pr/2 || fetch --prune:  * [new ref]         refs/pull/2/head -> gogs/pr/2
10:56 strk the above happens with config fetch = +refs/pull/*/head:refs/remotes/gogs/pr/*
10:56 hahuang61 joined #git
10:57 danslo joined #git
10:58 rnsanchez joined #git
10:59 texinwien_ joined #git
11:04 Alienpruts joined #git
11:05 holodoc joined #git
11:06 sostenuto joined #git
11:07 tinajohnson___ joined #git
11:08 Lomex joined #git
11:08 drbean joined #git
11:10 mehola joined #git
11:10 drbean- joined #git
11:14 HoierM joined #git
11:14 _ikke_ strk: git for-each-ref --format="%(refname)" refs/remotes/osgeo | xargs git update-ref -d
11:14 _ikke_ Something like that
11:14 _ikke_ (untested)
11:15 Macaveli joined #git
11:16 ojdo joined #git
11:17 maucar joined #git
11:18 necaremus joined #git
11:21 dopesong joined #git
11:24 tvw joined #git
11:25 JeroenT joined #git
11:25 pests joined #git
11:26 mra90 is there pdf manual for git ?
11:27 _ikke_ Like the manpages?
11:28 Orion3k joined #git
11:28 pests I accidentally commited a very large sqlite database and log file. I have not pushed. I'm trying to 'git reset HEAD~' so I can remove those files, properly ignore them, and then re-stage and re-commit. The problem is I'm on a RAM-constrained system and those files are so huge the 'git reset ~HEAD' command is giving me 'fatal: Out of memory, malloc failed'. Is there a manual way I can clean this up?
11:28 mra90 _ikke_: yes
11:29 dopesong joined #git
11:29 Lomex joined #git
11:30 _ikke_ mra90: there is a pdf target in the Makefile
11:30 mra90 where is that makefile ?
11:30 pests That is what I assume at least. I figured I should be able to reset HEAD one item in history and ignore the new commit ever exists but my git skills are rusty.
11:31 _ikke_ mra90: in the source
11:31 c0ded joined #git
11:33 Gamecubic joined #git
11:33 spudowiar joined #git
11:33 ash_workz joined #git
11:34 JeroenT joined #git
11:34 cbreak pests: git reset HEAD~ -- file should do it
11:35 cbreak then git commit --amend
11:35 cbreak pests: or git rm --cached file
11:35 CaptainHeavy joined #git
11:35 _ikke_ mra90: It doesn't contain the manpages
11:36 mra90 so there is no manual for git ?
11:36 interne7y joined #git
11:37 _ikke_ It's a manual
11:37 _ikke_ but not the reference man pages
11:38 CaptainHeavy Hello! I have an issue where a file copied from one git repo, a, into another git repo, b, isn't being picked up as modified. I've checked all relevant git ignores but there's no matching pattern to cause this. One thing I did note however was that, when I tried to force add the file (git add -f java/java.jar ), Git responded with "fatal: Pathspec 'java/java.jar' is in submodule 'java' ". I'm guessing the issue is that the file is still under version co
11:39 arnas joined #git
11:39 CaptainHeavy ANy help would be greatly appreciated
11:39 _ikke_ mra90: https://ikke.info/d/git-user-manual.pdf
11:39 mra90 where have you find it ?
11:40 _ikke_ mra90: compiled it from source
11:40 mra90 hmm
11:40 mra90 ok thank you
11:41 jeffreylevesque joined #git
11:45 _ikke_ mra90: The html version: https://jk.gs/user-manual.html
11:45 cbreak CaptainHeavy: git can not track files outside a repository
11:46 CaptainHeavy cbreak: I thought as much but the "submodule" thing threw me. I'm not familiar with submodules at all.
11:46 cbreak CaptainHeavy: it seems that in your case, the git repository you are in has an other repository, java, inside
11:46 CaptainHeavy cbreak: that's weird
11:46 Lomex joined #git
11:46 netj joined #git
11:46 mra90 _ikke_: I was expecting to find ith there -> https://git-scm.com/
11:47 alcohol CaptainHeavy: it's not weird. the question is, did you add that unintentionally, did you not notice, or did someone else?
11:47 cbreak CaptainHeavy: pastebin the output of git submodule status, and ls -la, and ls -la java
11:47 _ikke_ mra90: https://git-scm.com/doc
11:47 CaptainHeavy alcohol: well, its is weird if that's what's happened because I haven't done anything to cause that!
11:47 CaptainHeavy cbreak: will do
11:47 cbreak CaptainHeavy: git blame will show who did it.
11:48 mra90 _ikke_: only online docs are there
11:48 CaptainHeavy cbreak: there's only me who works on the repo. If this has happened then its been a complete oversight on my behalf
11:48 mra90 the nice thing is they offer free ebook
11:49 cyan__ joined #git
11:50 alcohol CaptainHeavy: if you ran a git clone inside the repo, and then committed, that might have happened i think
11:50 alcohol CaptainHeavy: git status will just show a new directory/file, but its actually a submodule
11:51 alcohol unless i am mistaken :x
11:52 alcohol which is most likely the case now that i tried it out myself
11:52 nikitasius joined #git
11:53 CaptainHeavy cbreak: here's the pastebin https://gist.github.com/mlk5060/​bc5f076408d345d8c00e60fa3841723c
11:53 cbreak CaptainHeavy: weird
11:53 CaptainHeavy alcohol: the only thing I remember doing with this is setting the remote url last night (because it had been switched, unknowingly)
11:54 CaptainHeavy cbreak: I bloody knew it was weird haha!
11:54 cbreak that is inconsistent with what you wrote above
11:54 CaptainHeavy cbreak: which part, the setting of the url?
11:54 cbreak type git add java, then git status
11:54 cbreak CaptainHeavy: no
11:55 sagerdearia joined #git
11:55 CaptainHeavy cbreak: "git add java" exists normally, i.e. gives me a prompt on a new line in terminal
11:56 cbreak a prompt?
11:56 CaptainHeavy cbreak: The command was processed successfully, in other words?
11:56 CaptainHeavy No output from Git though
11:56 CaptainHeavy cbreak: status gives me "On branch talent-and-expertise nothing to commit, working directory clean"
11:57 cbreak CaptainHeavy: pastebin output of git ls-files
11:58 CaptainHeavy cbreak: https://gist.github.com/mlk5060/​4513e7ce2f28e1d77df168b236590d16
11:58 alcohol CaptainHeavy: this contradicts your earlier statement where you said that adding it resulting in a fatal error
11:58 CaptainHeavy alcohol: I supplied -f to git add earlier
11:58 CaptainHeavy alcohol: that's what generated the "fatal" message
11:59 alcohol that doesnt make much sense though
11:59 alcohol instead of git add java, try git add java/java.jar
11:59 alcohol that returns the fatal again?
11:59 CaptainHeavy it does indeed
11:59 jceb joined #git
12:00 cbreak CaptainHeavy: looks like you added a submodule java
12:00 cbreak and then removed the .git
12:00 dopesong joined #git
12:00 cbreak CaptainHeavy: type this: git rm -f --cached java && git add java
12:00 cbreak CaptainHeavy: also, extra is a half-submodule
12:00 cbreak you should fix it the same way, after removing its .git
12:00 cbreak anyway, got to go, back in an hour or so
12:00 alcohol extras* ?
12:00 CaptainHeavy cbreak: bloody hell, will do
12:01 CaptainHeavy cbreak: OK, the last command you asked me to run returned "rm 'java' "
12:01 CaptainHeavy cbreak: Right, "git status" now gives me "deleted:    java  new file:   java/java.jar"
12:02 alcohol sounds about right
12:02 CaptainHeavy cbreak: looks like that's fixed it
12:02 alcohol no more submodule
12:02 CaptainHeavy alcohol: good news then!
12:02 nnyk joined #git
12:02 CaptainHeavy So at some point I've copied the .git repo, deleted it but the working index is still tracking it
12:03 CaptainHeavy or, still thinks it exists
12:03 rinwa_ joined #git
12:03 mra90 is it possible to log all commits fro mall branches ?
12:03 _ikke_ mra90: git log --all ?
12:04 alcohol CaptainHeavy: that would be my guess, yes
12:04 mra90 _ikke_: yes, once again thanks ;)
12:04 alcohol CaptainHeavy: it would only do that if you git add and git commit it though
12:04 alcohol hence why you had to git rm --cached
12:05 mra90 unforatunately this list doesn't say branch name
12:05 mra90 which is pitty
12:05 CaptainHeavy alcohol: OK, I'll have a look back through the commits and see what's happened
12:05 CaptainHeavy thanks to you both cbreak and alcohol though, that's a tremendous help :)
12:05 alcohol CaptainHeavy: we're here to help
12:05 _ikke_ mra90: git log --oneline --decorate --all
12:05 _ikke_ (add --graph if you want that too)
12:06 bolovanos joined #git
12:06 CaptainHeavy alcohol: true but I'm grateful for you taking the time to help!
12:06 bolovanos hithere
12:06 bolovanos is this page official for git distribution? https://git-scm.com/download/win
12:07 _main_ joined #git
12:07 mra90 _ikke_: great!
12:08 synthroid joined #git
12:08 _ikke_ bolovanos: yes
12:09 nilg joined #git
12:10 bolovanos _ikke_, thank you
12:11 bolovanos where can I find with what settings were last git installation made?
12:11 bolovanos now it wants me to choose line ending conversions
12:11 bolovanos I would like to choose what was chosen with previous installation
12:11 danslo joined #git
12:13 eijk_ joined #git
12:16 fahadash joined #git
12:17 freimatz joined #git
12:17 alcohol just use automatic or unix
12:18 fooobarrr joined #git
12:20 averell joined #git
12:21 bolovanos how about Git Credential Manager https://github.com/Microsoft/Git​-Credential-Manager-for-Windows - I am not clever from this
12:21 bolovanos do I need it?
12:22 _ikke_ Do you use https with passwords or ssh with keys?
12:23 bolovanos _ikke_, r u asking me?
12:23 _ikke_ yes
12:24 bolovanos ok - I am using git mainly locally with Tortoise git on Win10, sometimes I am uploading project files through git integrated in Android Studio
12:24 bolovanos answer is - I do not know...
12:24 alcohol please do not bastardize the english language. punctuation is one thing, but 'u r' :<
12:24 bolovanos probably https
12:24 _ikke_ Just install it
12:24 anu0 joined #git
12:24 bolovanos with that manager? -
12:25 _ikke_ yes
12:25 bolovanos ok thank you
12:25 cyan__ joined #git
12:26 arnas joined #git
12:26 mra90 hmm how to go back to ealier commit ?
12:27 mra90 or to some specyfic one ?
12:28 bolovanos _ikke_, btw - how about that topic info - and git-gui - any source of information - why?
12:28 _ikke_ Do you want to undo the changes after that commit?
12:28 _ikke_ bolovanos: sorry, what?
12:29 mra90 _ikke_: no I want to tempoarary switch to commit form past
12:29 mra90 from*
12:29 bolovanos _ikke_, "Be careful not to step in the git-gui"
12:29 kedare joined #git
12:30 _ikke_ bolovanos: that's just a joke
12:30 mra90 is it worth to use git GUI like smartgit?
12:30 _ikke_ mra90: git checkout <comimt>
12:30 mra90 and as a <commit> should I provide this long sha-1 code ?
12:31 _ikke_ mra90: first 8 characters would be enough
12:31 _ikke_ mra90: also read into man gitrevisions
12:31 gitinfo mra90: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
12:32 mra90 ok thank you, works as expected
12:32 mingrammer joined #git
12:34 qt-x joined #git
12:35 phanimahesh joined #git
12:36 interne7y joined #git
12:37 leeN joined #git
12:37 rinwa__ joined #git
12:37 mra90 I did checkout to older revision,then some commits from there and now i have HEAD ahead of master how to merge master to HEAD ?
12:38 Lomex joined #git
12:41 yoan___ joined #git
12:41 mra90 if same file was edited in two branches then there is no wasy to merge them aoutmaticly by git ?
12:43 mwd joined #git
12:43 Jonuz joined #git
12:43 deadnull joined #git
12:44 d0nkeyBOB joined #git
12:45 alcohol mra90: how would git know which version is the truth?
12:45 mra90 that;s right, so what;s the best way to solve it ?
12:45 alcohol mra90: depends on how heavily the file was modified though. different lines could be no issue. same lines, then your guess is as good as mine. requires manual intervention.
12:46 mra90 sure
12:47 ki0 joined #git
12:47 mahendra_ joined #git
12:47 usm4n joined #git
12:48 danslo joined #git
12:49 jaguarmagenta joined #git
12:52 kyan joined #git
12:52 jimi_ joined #git
12:54 kyan joined #git
12:54 citizen-_ joined #git
12:56 rawtaz joined #git
12:57 rwb joined #git
12:57 hahuang61 joined #git
13:00 Cryp71c joined #git
13:01 __main__ joined #git
13:02 Arban joined #git
13:03 tureba joined #git
13:03 ShekharReddy joined #git
13:04 InfoTest joined #git
13:05 wrouesnel1 joined #git
13:05 Brain joined #git
13:10 achadwick joined #git
13:11 fmcgeough joined #git
13:11 rgrinberg joined #git
13:11 MrMojito1 joined #git
13:12 mehola joined #git
13:14 byteflame joined #git
13:15 arnas joined #git
13:19 nettoweb joined #git
13:19 Anticom Hi all. I'm using `git rev-parse HEAD` in a script to get the current commit hash from my working copy. I'd like to append "-dirty" to it, if my WC isn't clean similar to what `git describe --tags --dirty=-dirty` does.
13:19 AaronMT joined #git
13:20 AaronMT joined #git
13:20 MZAWeb_ joined #git
13:20 quackgyver joined #git
13:20 TooLmaN joined #git
13:23 cbreak Anticom: man git-diff
13:23 gitinfo Anticom: the git-diff manpage is available at http://jk.gs/git-diff.html
13:23 cbreak Anticom: look for --exit-code
13:24 cbreak and --quiet
13:24 drbean joined #git
13:25 NeverDie joined #git
13:26 Anticom cbreak: searching the man page for "dirty" just points to --ignore-submodules
13:26 Anticom could you elaborate this a little further? (:
13:26 star_prone joined #git
13:26 Anticom oh, nvm
13:27 mingrammer joined #git
13:27 phanimahesh joined #git
13:28 Gsham joined #git
13:29 cbreak Anticom: basically, you diff with HEAD
13:29 cbreak if there's a difference, then it's dirty
13:29 Anticom cbreak: yea got it, i overlooked your comment to search man page for --exit-code :)
13:30 afusion joined #git
13:32 ejb joined #git
13:33 l4v2 joined #git
13:33 rnsanchez joined #git
13:34 mahendrak joined #git
13:34 mra90 on this picture https://git-scm.com/book/en/v2/book/03​-git-branching/images/two-branches.png why they show arrows in such direction ?
13:35 mra90 I mean from last commit to first one
13:35 _ikke_ mra90: Each commit points to its parent
13:35 mra90 shouldn't it be another direction ?
13:35 cbreak mra90: because that's the direction the dependency goes
13:35 mra90 confuses me a bit
13:35 cbreak branches point to commits
13:35 _ikke_ mra90: Each commit knows its parents, but not its children
13:35 cbreak commits point to parent commits (multiple in the case of merges)
13:35 cbreak tags point to what ever they tag (i.e. commits)
13:36 mra90 ok thanks for explenation
13:36 cbreak commits point to a tree object, which also points to tree object and file blobs
13:37 mycyber joined #git
13:39 nilg joined #git
13:40 str joined #git
13:41 mra90 how often do you use rebase ?
13:41 mra90 is it really usefull ?
13:41 JeroenT joined #git
13:42 _ikke_ I use it regularly
13:42 kloeri joined #git
13:42 tabrez joined #git
13:43 ShekharReddy joined #git
13:44 JeroenT_ joined #git
13:45 _ikke_ For cleaning up history, updating topic branches
13:45 psprint What would be a more explicit refspec to fetch using just FETCH_HEAD – than "<branch>:" ? Sadly, libgit2 does not handle "<branch>:", returns error
13:46 dopesong joined #git
13:46 _ikke_ refs/heads/*:refs/remotes/<remote>/*
13:46 cbreak git fetch remotename branchname
13:46 cbreak no :
13:46 strk left #git
13:47 bgamari joined #git
13:47 _ikke_ cbreak: I think he needs to specify a full refspec (libgit2)
13:47 psprint _ikke_: that will update also remotes, and I fetch via url, without config entry. The fine trick described in doc, to do a peek on some repo, by doing git log ..FETCH_HEAD after the FETCH_HEAD-only fetch
13:47 _ikke_ psprint: what do you want to achieve?
13:47 crose joined #git
13:48 psprint _ikke_: provide users the ability to fetch and play with objects around, "with no chains", durable refs/remotes/ tracking branches
13:51 psprint cbreak: "no :" worked thanks!
13:51 _ikke_ and refs/heads/branch:FETCH_HEAD doesn't work?
13:51 _ikke_ ah ok
13:51 psprint will try that too
13:52 doebi joined #git
13:52 GodGinrai joined #git
13:54 psprint it worked but not fully, git log ..FETCH_HEAD outputs at top: "warning: refname 'FETCH_HEAD' is ambiguous."
13:57 RedShift joined #git
14:00 fairuz joined #git
14:01 dopesong joined #git
14:02 Repox joined #git
14:06 ejb joined #git
14:07 AKPWD joined #git
14:13 mehola joined #git
14:16 ResidentBiscuit joined #git
14:20 Gsham joined #git
14:21 axl_ joined #git
14:22 synthroid joined #git
14:23 catag87 joined #git
14:24 catag87 joined #git
14:26 ExoUNX joined #git
14:27 usm4n joined #git
14:28 mra90 is it possible to set git server in a way which checks users commits i.e the comment of them ?
14:29 _ikke_ mra90: You can use git hooks for that
14:29 _ikke_ man githooks
14:29 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
14:29 mra90 ohh yes thanks!
14:30 leehambley joined #git
14:30 phaleth joined #git
14:31 han-solo joined #git
14:31 ramsub07 joined #git
14:32 Gsham joined #git
14:33 usm4n joined #git
14:34 courrier joined #git
14:35 harish_ joined #git
14:36 FuzzySockets joined #git
14:36 flaguy48 left #git
14:36 gargola joined #git
14:37 interne7y joined #git
14:37 han-solo joined #git
14:38 han-solo left #git
14:39 SASDOE joined #git
14:40 SASDOE I commited on master but do not have permission to push to it. Therefore I'd like to move this commit to another branch and push that, how could I do that ?
14:40 _ikke_ git checkout -b <new_branch_name>
14:41 sostenuto joined #git
14:41 ejb joined #git
14:42 han-solo joined #git
14:44 AKPWD joined #git
14:45 PCatinean joined #git
14:46 PCatinean joined #git
14:46 PioneerAxon joined #git
14:48 Matt__ joined #git
14:49 cbl joined #git
14:49 star_prone joined #git
14:50 jaguarmagenta joined #git
14:52 necaremus joined #git
14:52 InfoTest joined #git
14:52 citizen-stig joined #git
14:54 Gsham joined #git
14:56 PioneerAxon joined #git
14:58 SourTrout joined #git
14:58 hahuang61 joined #git
14:58 kaldoran joined #git
14:58 Matt__ Hi there. Can anyone help me with the correct syntax for a git clone ssh command. I have a space in my user name, multiple spaces in one of the file path segments and the repo is on my remote (LAN) server's D: drive, not C: drive?
14:58 Matt__ I am using: git clone ssh://user name@file-server:/path to this dir/website/repository.git
14:59 selckin try git clone "git+ssh://user name@file-server:/path to this dir/website/repository.git"
15:00 synthroi_ joined #git
15:00 selckin first create a new repo in the root, and try to see if it accepts the username
15:00 selckin then try the rest
15:00 dsdeiz_ joined #git
15:01 garethdaine joined #git
15:02 Matt__ I accepts the username. I am using Bitvise SSH Server on the file server and the activity log indicated a successful login.
15:02 djb-irc joined #git
15:03 spudowiar joined #git
15:03 dellhem joined #git
15:03 Matt__ @selckin Error: bash: git+ssh://user: No such file or directory
15:03 hiroki joined #git
15:04 selckin the quotes aren't optional
15:04 danslo joined #git
15:04 dellhem Hey. When I edit a file in a development branch, it changes in master too, is that intentional?
15:04 Matt__ Oh. Ok. Let me try again.
15:04 ojacobson dellhem: !transcript
15:04 gitinfo dellhem: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
15:04 ojacobson 90% you're not committing your changes; uncommitted changes do not belong to any branch
15:04 ojacobson 10% something else is up, and I'll need to see what you're actually doing to figure out what
15:05 sdothum joined #git
15:08 cdg joined #git
15:09 jeremyhall joined #git
15:09 mangolisk joined #git
15:09 dopesong joined #git
15:10 ResidentBiscuit joined #git
15:11 PioneerAxon joined #git
15:11 Matt__ @selckin - Error - ssh: Could not resolve hostname git+ssh: Name or service not known. Do I need for set my name and email using git config --global on the server first?
15:12 clemf joined #git
15:12 grawity nope, but you do need to stop using git+ssh
15:12 grawity it's called ssh:// in gitland
15:12 cbreak + in a hostname? :(
15:13 Matt__ I still getting use to the lingo. I will try again.
15:13 grawity no, in URI scheme
15:13 ojacobson that it's being parsed as a hostname tells me it's hitting the rcp-style paths case
15:13 ojacobson regardless of intention :)
15:13 cbreak I don't think you can combine git and ssh
15:13 sdothum joined #git
15:13 grawity well, the source still accepts "git+ssh://" – maybe they were copying svn, which has things like svn+http:// etc.
15:13 grawity but it's marked as "deprecated, do not use, stick with ssh://"
15:13 ojacobson and, yes, in git you'd want either username@host:path or ssh://username@host/abs-path
15:14 grawity (it's supposed to mean that Git actually speaks the git protocol over ssh, rather than something dumber.)
15:14 UTAN_dev joined #git
15:14 Gsham joined #git
15:14 dellhem ojacobson: something like this? http://pastebin.com/NhV4w3nf
15:15 SourTrou_ joined #git
15:15 mingrammer joined #git
15:17 Matt__ git clone "ssh://user name@file-server:/path to the dir/website/repository.git" -> Cloning into 'repository'... Entered my password -> fatal: '/path to the dir/website/repository.git' does not appear to be a git repository. fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists.
15:17 fairuz joined #git
15:17 grawity well, that's a bit better
15:17 fees joined #git
15:18 The_Phoenix joined #git
15:18 jaafar joined #git
15:19 The_Phoenix joined #git
15:19 govg joined #git
15:19 ojacobson dellhem: exactly like.
15:19 ojacobson And, yep. You're not committing your changes. Changes don't belong to a branch until they're committed: the work tree is its own thing, and uncommitted changes !float when you switch branches.
15:19 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
15:20 The_Phoenix joined #git
15:21 sangy joined #git
15:21 thiago joined #git
15:22 The_Phoenix joined #git
15:23 dellhem ojacobson: I got "Changes not staged for commit:
15:24 dellhem " when trying to commit, but because I forgot "-a". Worked now.
15:24 dellhem Thanks :)
15:26 ojacobson Or `git add` first, either way :)
15:26 eivarv joined #git
15:28 rahtgaz joined #git
15:28 unbxpg joined #git
15:28 sfeinste joined #git
15:28 SwiftMatt joined #git
15:30 sdothum joined #git
15:30 axl_ left #git
15:30 synthroid joined #git
15:32 dmto joined #git
15:32 unbalancedparen joined #git
15:33 sdothum joined #git
15:33 wcpan joined #git
15:34 oich joined #git
15:37 IWishIKnew joined #git
15:37 burtons joined #git
15:38 ResidentBiscuit joined #git
15:38 jknetl joined #git
15:41 daveomcd joined #git
15:43 cqi joined #git
15:43 Alienpruts joined #git
15:44 LeBlaaanc joined #git
15:45 rinwa joined #git
15:46 markelite joined #git
15:47 tyreld joined #git
15:48 crayon joined #git
15:48 LeBlaaanc joined #git
15:48 texinwien_ joined #git
15:48 Dougie187 joined #git
15:49 Darren_ joined #git
15:49 sostenuto joined #git
15:50 danimal2 joined #git
15:51 flaguy48 joined #git
15:52 guardian hello, when dealing with a merge conflict, I did a git reset <file> by mistake. is there a way to undo that, so that I can git mergetool <file> ?
15:53 BSaboia joined #git
15:53 nettoweb joined #git
15:54 CheckDavid joined #git
15:54 jlewis_ joined #git
15:55 Derperperd joined #git
15:59 Lomex joined #git
15:59 mikecmpbll joined #git
16:00 fmcgeough joined #git
16:00 qpdb joined #git
16:00 Zamerick joined #git
16:00 spriz joined #git
16:01 durham joined #git
16:02 fairuz joined #git
16:02 durham joined #git
16:04 Gloomy joined #git
16:05 circ-user-hroqE joined #git
16:07 LeBlaaanc joined #git
16:07 Lomex joined #git
16:07 crayon joined #git
16:07 crayon joined #git
16:08 mwhooker joined #git
16:08 daumie joined #git
16:10 le_melomane joined #git
16:12 jaafar joined #git
16:12 dreiss joined #git
16:14 mehola joined #git
16:14 madewokherd joined #git
16:14 starkhalo joined #git
16:15 GavinMagnus left #git
16:15 MZAWeb_ joined #git
16:16 kpease joined #git
16:17 kpease joined #git
16:17 leeN joined #git
16:20 stantonk joined #git
16:20 mnero_ joined #git
16:21 Lomex joined #git
16:22 mnero_ is there a way to have a file exist in the repo but .gitignore any further changes? For example a local config file you want people to get on git pull, but not push changes back to
16:22 freimatz joined #git
16:22 _ikke_ !config
16:22 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
16:22 fairuz joined #git
16:22 flavius joined #git
16:22 mnero_ thx
16:23 _ikke_ You either want to track a file, or you don't
16:23 tonyj joined #git
16:23 griffindy joined #git
16:25 mnero_ _ikke_: the problem is the local config is in a plain code file and the app won't compile unless it's there
16:25 mnero_ so can't just leave it out of the repo
16:25 lindenle joined #git
16:25 nitric joined #git
16:25 _ikke_ can it be a build step to copy it from a template to the real thing?
16:26 jknetl joined #git
16:26 _ikke_ Can you include the actual config from a file that isn't being tracked?
16:27 drbean_ joined #git
16:27 TomyLobo joined #git
16:27 mnero_ _ikke_: ooh, I think that last one will work. I have the main config referencing the local config right now, but if I reverse that and modify the main config from the local, it should work
16:28 _ikke_ :-)
16:28 mnero_ then the local will be optional, and I have can have a local.template or something which is tracked
16:28 mnero_ thanks :)
16:28 _ikke_ yw
16:29 SteffanW joined #git
16:30 King_Hual joined #git
16:30 King_Hual joined #git
16:30 EvilPenguin joined #git
16:36 burtons joined #git
16:36 zeroed joined #git
16:38 interne7y joined #git
16:38 psprint Does merging a branch into master update refs/heads/<thebranch> or anything else besides refs/heads/master?
16:40 Seveas no
16:41 bongjovi joined #git
16:42 rgrinberg joined #git
16:43 Macaveli joined #git
16:44 crayon joined #git
16:49 spike joined #git
16:50 spike I'm currently using this command but it doesn't archive my changes that haven't been committed yet. how can i include my current work without committing it first? `git archive --prefix my-repo/ --format tar HEAD | gzip -9 > ../my-archive.tgz`
16:50 jaguarmagenta joined #git
16:51 jknetl joined #git
16:51 HoierM joined #git
16:52 vuoto joined #git
16:53 vassagus joined #git
16:53 t0by joined #git
16:55 eivarv joined #git
16:56 psprint when does FETCH_HEAD contain multiple entries?
16:59 hahuang61 joined #git
16:59 nitric spike: you could stash first, and then pass `stash@{0}` instead of `HEAD`
17:02 psprint Can I somehow iterate on multi-entry FETCH_HEAD file with git rev-parse or other command?
17:02 EvilPeng1 joined #git
17:03 mingrammer joined #git
17:04 shinnya joined #git
17:05 crayon joined #git
17:05 boushi joined #git
17:05 tabrez joined #git
17:05 choki joined #git
17:06 israelzuniga joined #git
17:08 Balliad joined #git
17:08 synthroid joined #git
17:09 Noldorin joined #git
17:10 drbean joined #git
17:10 tvw joined #git
17:10 sostenuto joined #git
17:11 spike nitric, that was perfect! thanks for the tip
17:12 nitric yw
17:14 MZAWeb joined #git
17:14 daurnimator joined #git
17:14 israelzuniga_ joined #git
17:19 israelzuniga_ joined #git
17:21 crayon joined #git
17:22 Limes_ joined #git
17:22 Mannn joined #git
17:23 Mikerhinos joined #git
17:23 durham joined #git
17:23 danslo joined #git
17:23 anth0ny joined #git
17:26 belak joined #git
17:27 Cryp71c joined #git
17:28 belak joined #git
17:29 aep-shoutlet joined #git
17:29 nitin_ joined #git
17:32 f3r70rr35f joined #git
17:34 belak joined #git
17:34 leeN joined #git
17:36 burtons joined #git
17:37 belak joined #git
17:38 ki0 joined #git
17:38 Dyonisos joined #git
17:38 fission6 joined #git
17:38 fission6 how do i abort a merge
17:38 fission6 there was a conflict
17:39 fission6 and i want to just undo the merge attempt
17:39 nitin_ joined #git
17:39 Seveas git merge --abort
17:39 GodGinrai `git merge --abort`
17:39 samsonizzle joined #git
17:40 Balliad joined #git
17:40 jimi_ joined #git
17:43 Darcidride joined #git
17:46 ResidentBiscuit "git merge --abort"
17:46 smithbone joined #git
17:46 ojacobson ‘git merge --abort’
17:46 eivarv joined #git
17:47 kadoban joined #git
17:47 belak joined #git
17:48 smithbone_ joined #git
17:48 Mikerhinos joined #git
17:48 dreiss joined #git
17:49 belak joined #git
17:51 Sasazuka joined #git
17:51 fission6 thankseveryone
17:52 adino joined #git
17:52 Literphor joined #git
17:54 le_melomane joined #git
17:54 spike left #git
17:56 samsonite joined #git
17:56 ktosiek joined #git
17:57 thiago joined #git
17:58 mingrammer joined #git
17:58 Rodya_ joined #git
17:59 ejb joined #git
17:59 diegoviola joined #git
18:04 jstimm joined #git
18:07 stonerfish joined #git
18:07 fmcgeough joined #git
18:09 circ-user-hroqE joined #git
18:09 davisonio joined #git
18:10 hahuang65 joined #git
18:10 sostenuto joined #git
18:11 EricPoe joined #git
18:12 drbean_ joined #git
18:14 star_prone joined #git
18:15 mehola joined #git
18:17 segment-fault joined #git
18:19 Darren_ joined #git
18:24 samsonite joined #git
18:25 ahmedelgabri joined #git
18:27 avar If you get tired of typing that there's always: git merge --abor
18:28 editshare-ericf joined #git
18:28 preaction abhor?
18:29 k3rn31 joined #git
18:30 LeBlaaanc joined #git
18:33 editshare-ericf joined #git
18:34 vuoto joined #git
18:35 sdothum joined #git
18:35 vuoto joined #git
18:38 davisonio joined #git
18:39 interne7y joined #git
18:39 Bladdezz joined #git
18:39 ahmed_elgabri joined #git
18:39 FuzzySockets joined #git
18:40 Bladdezz joined #git
18:40 m0viefreak joined #git
18:42 docnvk joined #git
18:44 henriquev joined #git
18:48 sostenuto joined #git
18:48 zacts joined #git
18:48 Zamerick_ joined #git
18:48 Cryp71c joined #git
18:49 ELFrederich any quick one-liners to see if all of the commits on my local branches exist on a remote or not?
18:51 jaguarmagenta joined #git
18:52 marc_v92 joined #git
18:52 EricPoe joined #git
18:56 millerti joined #git
18:57 zacts_raincity joined #git
18:58 millerti I have a git repo that tells me I'm behind by 38 commits.  Before I fast-forward, how can I see what commits will be fast-forwarded?
18:59 ejb joined #git
18:59 hahuang61 joined #git
19:00 osse millerti: git log master..origin/master (for example)
19:00 zacts joined #git
19:00 osse or whatever are the branches git status are reporting
19:00 osse super-duper shorthand: git log ..@{u}
19:03 Bladdezz joined #git
19:03 MrMojito1 joined #git
19:04 oich I have rebased twice where there is only the addition of a file in the parent branch that is new. The previous rebase worked. Now, it fails including warnings about trailing whitespace when applying the target branch changes and apparently rebases correctly if I pass -Xignore-space-at-eol. Do you know how there can be conflict about whitespace at the end of a line when it is applying commits...
19:04 oich ...that have already been committed?
19:04 millerti osse: Thanks.  I've been on the dev branch of this one private repo for a long time and had some minor issue pushing changes to the origin.  When investigating, I switched to the master branch and saw that I could fast-forward 38 commits.  The weird thing is that this is the primary development machine, and I have no memory of pushing commits from anywhere else.
19:04 nitric joined #git
19:06 Balliad joined #git
19:07 brb_ joined #git
19:07 Gsham joined #git
19:08 peepsalot what happens if a commit has been pushed to a remote, and then commit is amended, and you push to remote again?
19:09 rpd joined #git
19:09 sostenuto joined #git
19:10 spudowiar joined #git
19:10 selckin i gives you an error
19:12 SourTrout joined #git
19:13 peepsalot how would i un-amend the last change?
19:14 rpd peepsalot: try git-reflog to go back before the amend
19:14 ctjctj joined #git
19:15 ctjctj Hello.  How do I get git to verify that all the files in the working directory match what git thinks it should be.  (we had disk corruption and want git to recover the damaged files from the repo)
19:15 circ-user-hroqE joined #git
19:15 preaction ctjctj: if "git status" doesn't say they've changed, then they're fine
19:16 Topic for #git is now Welcome to #git, the place for git help and nursery rhymes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.1 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Ring around the repo, pockets full of plumbing, objects, objects, we all commit.
19:16 preaction if you want to check the validity of the objects in the database, git fsck
19:19 freimatz joined #git
19:19 ctjctj preaction, thank you.  How does git detect a change in a file in the Working Directory?
19:20 spudowiar hashes, I believe
19:20 spudowiar but not too sure
19:20 preaction ctjctj: my guess would be by sha1 the file and checking if it exists in the database
19:20 Eugene lstat()
19:20 Eugene https://www.kernel.org/pub/software/​scm/git/docs/technical/racy-git.txt
19:21 ctjctj Eugene, ah, that's what I suspected.  That's why I said I wanted to force a comparison regardless.  a hash would be great.
19:21 Eugene hash-object is only called when `git add`
19:21 zacts_pi joined #git
19:21 ctjctj preaction, spudowiar the amount of time it takes to compute a hash can get very expensive.  So I doubted that would be used and Eugene just confirmed.
19:21 spudowiar heh
19:21 ctjctj Eugene, so is there a way to force hash object compares?
19:22 Eugene I would like to see the use case where lstat() doesn't return different ifno on ANY change ;-)
19:22 Eugene Update the mtime(eg, `touch foo`) and rerun `git status` should do just fine
19:22 Eugene If that doesn't work !xy
19:22 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
19:23 Eugene Because WTF are you doing
19:23 ctjctj Eugene, pull the power plug on the Virtual machine so often that you corrupt the file system.
19:23 Eugene Get less shitty hardware
19:24 ctjctj Eugene, teach the person running the VM that hard power off is not the same as a clean shutdown is what I acutally did.
19:24 kadoban Does that even corrupt files anymore, with modern filesystems?
19:24 Eugene It isn't git's job to figure out problems that can be solved by `fsck`
19:24 ctjctj kadoban, if you do it often enough your odds start to approach certainty.
19:25 Eugene In theory, no. In practice it eats squirrels and poops them on your platter without noticing.
19:25 Eugene Eventually the squirrel poop will overflow
19:25 ctjctj Eugene, you are correct.  It is not gits job to do this, on the other hand since the kitchen sink, bathtub and Eliza are all in the git code somewhere I was hoping.
19:26 Eugene My honest advice is to blow the repo away and re-clone.... possibly the whole VM if its that ugly
19:27 ctjctj Eugene, we did recover via blowing away the repo and a bunch of other aux stuff and started over.  Fortunately this is a "sandbox" for one of my devs so it isn't a huge thing if we have to blow the whole VM away.  But we are trying to keep on trucking till the weekend
19:28 Eugene This is also a great time to review/rewrite your developer & environment-setup documentation
19:28 marc_v92 joined #git
19:28 ctjctj Is there a way to get git to provide a hash for every file in the repo?  Sort of like a sha1sum * but of what is in the repo?
19:28 [Brain] joined #git
19:28 Eugene man git-ls-files
19:28 gitinfo the git-ls-files manpage is available at http://jk.gs/git-ls-files.html
19:29 ctjctj I applied that the day I found him doing the "pull the plug" mode of turning off the VM.
19:29 ctjctj I also applied a clue by four.  He's a sharp dude which is why I had no idea that he would be doing this.
19:29 Eugene Note that `sha1sum foo` and `git hash-object foo` will NOT return the same hash; man gitrepository-layout for the technical bits
19:29 gitinfo the gitrepository-layout manpage is available at http://jk.gs/gitrepository-layout.html
19:30 Zamerick joined #git
19:30 Eugene Huh, it's not in there.... I wonder which man page I'm thinking of
19:32 Bennux joined #git
19:32 peepsalot i tried to undo a commit amend with reflog delete, but my changes are still in the file.  then i tried to checkout the proper version, and i'm in a detached state, i don't understand this
19:32 pr0fess0r joined #git
19:32 kutsuya joined #git
19:33 peepsalot and my detached state didn't undo the change either
19:33 Eugene reflog delete doesn't update the branch; it only munges the reflog
19:33 Eugene Which !revert did you want?
19:33 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
19:33 Eugene I *think* what you really wanted to do was something like `git reset --hard <reflog entry>`, but that's probably mucked-up now
19:34 Eugene !detach !reattach
19:34 gitinfo [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
19:34 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
19:34 fahadash joined #git
19:34 ramsub07 joined #git
19:34 Eugene First get back onto your branch ^
19:34 Eugene Then play the !fixup game and see where you land
19:34 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!
19:34 peepsalot ok i did heckout branchname and no longer detached
19:35 burtons joined #git
19:37 EricPoe joined #git
19:37 robotroll joined #git
19:40 atomicb0mb joined #git
19:40 peepsalot how do i just set my local repo to be matched up with the last push to remote
19:41 dsdeiz joined #git
19:41 dsdeiz joined #git
19:41 peepsalot i don't even know how to answer this fixup game, not sure my situation applies
19:41 peepsalot i messed up a commit amend
19:41 Sasazuka joined #git
19:41 adino joined #git
19:42 linuxdaemon joined #git
19:42 doebi joined #git
19:43 p4trix joined #git
19:43 eivarv joined #git
19:43 Eugene `git reset --hard @{u}` will make your current branch equivalent to the upstream branch. This WILL eat anything uncommitted, so make sure that's what you want first
19:44 peepsalot if i have an unstaged file, i can stash that first?
19:44 peepsalot or does it reset the stash too
19:45 Eugene Yes, you can stash first. reset doesn't touch stashes; only your current branch.
19:46 airdisa joined #git
19:46 peepsalot does each repo have unique sha hashes for every node?
19:46 mingrammer joined #git
19:48 quetz joined #git
19:48 kadoban What's a node?
19:49 peepsalot isn't everything in git a node in a tree
19:49 peepsalot jesus christ i can't stand how impossible git is
19:49 kadoban peepsalot: Perhaps you mean commits?
19:49 kadoban Okay ... well good luck with that.
19:50 tutti joined #git
19:51 ki0 joined #git
19:52 rgrinberg joined #git
19:53 pwn joined #git
19:53 pwn any suggestions how to build a C development environment based on GIT? many users at work are using windows, the code itself needs to compile on a linux machine.
19:54 pwn I am considering whether to host a git repository on gitlab/github, or install gitlab CE, or gitolite, etc..?
19:57 kadoban pwn: Probably just depends what features you need in terms of the central-ish repos. Do people need web views? Integrated issue tracking and PR commenting, etc.?
19:58 kadoban If in doubt, start simple probably. It's usually quite easy to move a git repo from one place to another, it's one of the major benefits of git really.
19:59 Rodya_ joined #git
20:00 pwn kadoban: im actually not sure what i want, it's a new and small team developing for an embedded device
20:00 pwn i would like to be robust, and having a web interface for code reviews and issue tracking sounds nice
20:00 qsx i like !gerrit for review
20:00 gitinfo Gerrit is a web-based code review system, built by Google. https://www.gerritcodereview.com/
20:00 pwn especially because the other devs are used to work on windows
20:01 WaReZ joined #git
20:01 jstimm joined #git
20:04 Rodya_ joined #git
20:04 NeverDie joined #git
20:06 peepsalot left #git
20:08 robotroll joined #git
20:12 King_Hual joined #git
20:12 Repox joined #git
20:13 paul424 joined #git
20:13 zacts_raincity joined #git
20:13 maroloccio hi. how can i switch to branch1 and have a completely clean working directory?
20:14 BlaXpirit maroloccio, !orphan branch?
20:14 gitinfo maroloccio: To create an orphaned branch(unrelated to existing history): `git checkout --orphan newbranchname`. This will leave your index/worktree as-is(use `rm .git/index; git clean -dfx` to delete EVERYTHING). If you get 'error: unknown option `orphan`' see !orphan_old. For an empty/null commit see !orphan_null.
20:14 GodGinrai wait, who said anything about orphaning branches?
20:15 GodGinrai he just asked for a clean workdir
20:15 maroloccio that was confusing
20:15 BlaXpirit oh, i thought about "clean" in a different way
20:15 BlaXpirit especially "completely clean"
20:15 maroloccio ok. i asked badly. sorry
20:15 mehola joined #git
20:16 BlaXpirit well, checkout, then  git clean -dfx
20:16 BlaXpirit but that will delete all untracked files
20:16 maroloccio how can i checkout branch1 and have nothing in my working dir but the stuff from branch1?
20:16 m1dnight_ joined #git
20:16 emPi joined #git
20:17 _ikke_ maroloccio: git checkout branch1 ?
20:18 Rodya_ joined #git
20:18 maroloccio _ikke_: untracked files are still there
20:19 _ikke_ git clean -f
20:19 Noldorin joined #git
20:20 xall joined #git
20:21 Rodya_ joined #git
20:21 l4v2 joined #git
20:22 LeBlaaanc joined #git
20:22 cdg joined #git
20:23 cdg joined #git
20:23 LeBlaaanc joined #git
20:24 anu1 joined #git
20:25 yoan___ joined #git
20:25 eivarv joined #git
20:28 IWishIKnew joined #git
20:28 ctjctj left #git
20:30 zacts_pi joined #git
20:33 zacts_raincity joined #git
20:33 elastix joined #git
20:34 hmmmm joined #git
20:34 zacts joined #git
20:34 p4trix joined #git
20:34 ProbabilityMoon joined #git
20:36 zeroed joined #git
20:36 zeroed joined #git
20:37 zacts_pi joined #git
20:37 star_prone joined #git
20:38 Shentino joined #git
20:39 zacts___ joined #git
20:39 interne7y joined #git
20:40 maroloccio _ikke_: thank you.
20:41 maroloccio how can i fast forward merge branch1 without actually checking it out first and git pulling from it? can i do that whilst on branch2, staying on branch2? (my guess would be no because otherwise conflict resolution would not work... wrong?)
20:41 zacts joined #git
20:41 aidalgol joined #git
20:44 realz__ joined #git
20:49 wgrant joined #git
20:49 rpd maroloccio: what do you mean by "without actually checking it out first?"
20:49 d4rklit3 joined #git
20:49 mattcen joined #git
20:50 _ikke_ git branch -F <branch> <upstream>
20:50 NightMonkey joined #git
20:50 jaafar joined #git
20:50 hmmmm hi, I'm having trouble with this single file that somehow got stuck in git on windows...
20:51 hmmmm it has something to do with line endings because i keep getting "warning CRLF will be replaced by LF in <problematic file>"
20:51 _ikke_ trouble how?
20:51 maroloccio _ikke_: git branch dash-capital-F?
20:51 hmmmm it kept staying stuck so i just committed it along with the rest of my files that i actually edited
20:51 martixy joined #git
20:51 maroloccio _ikke_: i dont see that on my computer
20:51 hmmmm and now that's a mistake because it causes problems when i go to rebase my branch
20:52 nitric maroloccio: i'm pretty sure you *do* have to `git checkout branch1` in order to pull it up to date...but you can make the switch back to branch2 a little less annoying by doing `git checkout -`, instead of typing the name of branch2
20:52 hmmmm so i'm trying to revert that file completely to an older revision with git checkout HEAD~3 <filename here>
20:52 hmmmm when i do that, i get two copies, one in the working branch and one in the local branch
20:52 hmmmm that shows up in git status
20:53 hmmmm when i git checkout a single file, i expect it to show up in the working repository, not the local one as well... right?
20:53 maroloccio nitric: oh, nice. git checkout - is like cd - then? previous branch i was in?
20:54 nitric yep
20:54 maroloccio nitric: thanks. nice tip. let me practice it a couple of times so it "sticks" in memory
20:54 SebastianFlyte joined #git
20:54 jeffreylevesque joined #git
20:55 Literphor joined #git
20:55 maroloccio rpd: without abandoning branch2. without updating my working directory to the content of branch1 rather than its current content, which matches the trees under the tip commit of branch2
20:59 martixy Hello. I have 2(master and dev) branches and I usually merge from one to the other - and I have it set up so that 1 config file is different between both somewhere down the line. If I always merge from dev to master, I can keep the config files separate(git produces a commit called Merge remote tracking branch...), but if I merge back from master to dev, the files become equal again. Will this
20:59 martixy happen if I cherry-pick from master to dev?
21:00 hahuang61 joined #git
21:01 Shentino joined #git
21:05 nitric joined #git
21:05 ee joined #git
21:09 duderonomy joined #git
21:10 JanC_ joined #git
21:11 maroloccio hi. how can i log from HEAD to commit with message containing foo. git log ':/foo'..@ falls short by one commit. i would need to ':/foo'~ but that does not work.. how do i get the commit before the one matched by the pattern?
21:13 ResidentBiscuit joined #git
21:14 Gsham joined #git
21:14 ShekharReddy joined #git
21:17 maroloccio basically.. gitrevisions tells me about :/pattern but not how to go one step further from that commit
21:17 burtons joined #git
21:18 kulelu88 joined #git
21:18 texinwien_ joined #git
21:18 Noldorin joined #git
21:19 Shentino joined #git
21:20 davisonio joined #git
21:23 maroloccio perhaps it is not possible to ~ or ^ away from a :/pattern rev?
21:25 davisonio joined #git
21:32 SwiftMatt joined #git
21:32 byteflame joined #git
21:32 MZAWeb_ joined #git
21:33 zivester joined #git
21:33 mattcen joined #git
21:33 MatthewAllan93 joined #git
21:34 mingrammer joined #git
21:34 Literphor joined #git
21:36 byteflame joined #git
21:37 byteflame joined #git
21:37 xall joined #git
21:38 byteflame joined #git
21:39 byteflame joined #git
21:40 kutsuya joined #git
21:42 byteflame joined #git
21:43 cdown_ joined #git
21:43 byteflame joined #git
21:46 Rodya_ joined #git
21:48 IWishIKnew joined #git
21:48 Dougie187 left #git
21:54 vassagus joined #git
21:54 spudowiar joined #git
21:59 gitsvnohno joined #git
22:00 matsaman joined #git
22:00 matsaman joined #git
22:00 matsaman joined #git
22:00 matsaman hello all -- doing a git svn fetch, and the log is updated with changes, but the actual files themselves have not been... explanation?
22:00 eldios joined #git
22:00 preaction fetch is fetch. perhaps you need to merge?
22:01 matsaman oho, merge you say
22:01 fission6 joined #git
22:01 matsaman just git svn merge?
22:01 matsaman or pull for both?
22:01 preaction that i don't know. i haven't used git-svn in 6+ years
22:01 hseg1 joined #git
22:01 preaction but make a !backup and give it a try?
22:01 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
22:02 eldios hello git wise people... maybe I'm asking a silly question but I can't seem to find the answer. Is there a way to have a customization for a specific line/file in a repo? say "variable=hostA" in one repo and "variable=hostB" in another repo on another server
22:02 eldios filter seems to come quite close to this scenario.. but not quite perfect I'd say
22:02 cbreak eldios: no
22:02 jstimm joined #git
22:03 cbreak eldios: use separate files
22:03 Vaelatern joined #git
22:03 cbreak or separate branches if you have to
22:03 eldios well I'd still want to keep the rest of that file the same
22:03 matsaman preaction: so like, git svn merge?
22:04 matsaman oh sorry you said you don't know
22:04 matsaman uhhh, hrmm
22:04 preaction right, and then i said make a backup and try it to see what happens.
22:04 eldios cbreak: well it seems I actually *can* use different files.. so nvm. Thanks for the suggestion and sorry for the noise :>
22:04 eldios have a nice evening!
22:05 eldios left #git
22:05 matsaman yeah, doesn't do anything
22:05 matsaman so with ordinary git, it'd be git fetch && git merge (or git pull)?
22:05 cyan__ joined #git
22:05 hseg1 left #git
22:06 daveomcd joined #git
22:09 Derperperd joined #git
22:10 adino joined #git
22:12 mostlybadfly joined #git
22:12 GavinMagnus joined #git
22:13 jstimm joined #git
22:16 notadrop joined #git
22:16 mehola joined #git
22:17 joki joined #git
22:18 Rodya_ joined #git
22:19 hmmmmm joined #git
22:24 Literphor joined #git
22:24 jpX joined #git
22:26 edude03 joined #git
22:26 ki0 joined #git
22:29 Filystyn joined #git
22:29 Filystyn i need to *git* something
22:29 mingrammer joined #git
22:29 Filystyn ps stop
22:29 Filystyn no no nvm
22:32 sdothum joined #git
22:32 Sasazuka joined #git
22:36 sostenuto joined #git
22:38 red_ joined #git
22:38 jpX joined #git
22:39 kyan_ joined #git
22:40 interne7y joined #git
22:40 jimi_ joined #git
22:41 Gsham joined #git
22:43 madewokherd joined #git
22:47 fairuz joined #git
22:47 nettoweb joined #git
22:50 Furai joined #git
22:57 Grievre joined #git
22:58 bolovanos joined #git
23:00 fairuz joined #git
23:01 hahuang61 joined #git
23:02 spudowiar joined #git
23:04 HoierM joined #git
23:05 nfk joined #git
23:07 red_ joined #git
23:07 BryzNSTY joined #git
23:10 zacts joined #git
23:10 cloudstrif3 joined #git
23:12 gmag_ joined #git
23:12 crayon joined #git
23:16 GavinMagnus left #git
23:18 b1tchcakes joined #git
23:18 citizen-stig joined #git
23:20 zacts joined #git
23:21 Gsham joined #git
23:22 kyan joined #git
23:22 mablae__ joined #git
23:23 Tobbi joined #git
23:23 Tobbi Can a git patch be applied to an HG repo?
23:24 preaction yes, using the patch(1) utility (at patchlevel 1 [-p1])
23:24 Literphor joined #git
23:24 Tobbi Great.
23:27 crayon joined #git
23:27 Filystyn left #git
23:30 fairuz joined #git
23:36 sostenuto joined #git
23:41 ejb joined #git
23:42 preyalone joined #git
23:45 Gsham joined #git
23:45 MZAWeb_ joined #git
23:45 vassagus joined #git
23:46 acetakwas joined #git
23:47 crayon joined #git
23:47 RedneckDonut joined #git
23:47 shgysk8zer0 joined #git
23:48 ahmed_elgabri joined #git
23:48 shgysk8zer0 joined #git
23:51 Lyqyd joined #git
23:53 lucasem joined #git
23:54 Rodya_ joined #git
23:54 johntramp hey when dealing with refspecs (cf jenkins jobs), what is the + for? eg +refs/tags/*:refs/remotes/origin/tags/*
23:57 xall joined #git
23:58 kadoban It means update even if it's not a fast-forward

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