Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-29

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

All times shown according to UTC.

Time Nick Message
00:00 vjacob joined #git
00:00 cbreak it'll give you BAD
00:00 cbreak (or something simlar, with your other commits on top)
00:01 hseg So basically, I rebase everything I didn't send to upstream on top of my changes as applied by upstream?
00:02 cbreak no
00:02 cbreak you rebase everything
00:02 tristanp_ joined #git
00:03 hseg i.e. I rebase the feature branch on the new master? And drop the commits sent to upstream?
00:04 cbreak it'll drop them automatically, as I told you
00:04 hseg Really? I didn't think rebase'd be that clever.
00:05 claudiop joined #git
00:05 ochorocho__ joined #git
00:05 skunkz joined #git
00:08 alex1a joined #git
00:09 TinkerTyper joined #git
00:13 interne7y joined #git
00:13 hseg Yep, just checked the git-rebase manpage and it actually *explicitly* discusses my use case. Feel like an idiot. Sorry for wasting time.
00:13 hseg Thanks.
00:13 nettoweb joined #git
00:15 sangy joined #git
00:18 SwiftMatt joined #git
00:20 rneco joined #git
00:22 mellernoia joined #git
00:24 MDRXB95AP joined #git
00:30 tomog999 joined #git
00:31 m_antis joined #git
00:33 dreiss joined #git
00:35 bjpenn joined #git
00:36 drodger joined #git
00:37 tristanp joined #git
00:37 eletuchy joined #git
00:39 JFS left #git
00:41 tristanp_ joined #git
00:43 Noldorin joined #git
00:44 marked joined #git
00:44 tristanp joined #git
00:52 piling_ joined #git
00:58 qpdb joined #git
00:59 ODGREEN joined #git
01:03 SwiftMatt joined #git
01:05 drodger joined #git
01:07 dreiss joined #git
01:10 Noldorin joined #git
01:13 mjuszczak joined #git
01:13 interne7y joined #git
01:14 slappymcfry joined #git
01:16 tristanp_ joined #git
01:20 annoymouse joined #git
01:20 duderonomy joined #git
01:21 bgold joined #git
01:21 annoymouse Hi
01:21 tristanp joined #git
01:21 annoymouse I've never really used git with a team before, so I just realized I don't really know what a good workflow is
01:22 annoymouse I forked the repo and have a branch with my additions
01:22 annoymouse Now I want to submit a PR
01:22 Goplat joined #git
01:22 annoymouse Would I merge with my forked repo's master then make the PR from that to upstream master or should I make a PR from my branch directly to upstream master?
01:23 Havvy annoymouse:  The latter.
01:23 annoymouse Havvy: And when would I need to rebase?
01:23 Havvy Whenever it cannot be merged.
01:23 annoymouse So I should try to merge it first?
01:23 Havvy Also, by using a PR, you mean you are using Github right?
01:24 annoymouse Havvy: Yes, I'm using GitHub. Sorry for not making that clearer.
01:24 Havvy annoymouse:  It's probably a good idea to rebase onto upstream/master right before opening a PR.
01:25 ceaucari joined #git
01:25 tristanp_ joined #git
01:26 annoymouse Havvy: Is there a way to rebase only the patch branch with upstream/master (I don't want to rebase my master yet)?
01:26 Havvy Sure.
01:26 Havvy `git fetch upstream master && git checkout feature-branch && git rebase master`
01:27 Havvy err
01:27 Havvy `git fetch upstream master && git checkout feature-branch && git rebase FETCH_HEAD`
01:27 lindenle joined #git
01:31 exawatts joined #git
01:31 nettoweb joined #git
01:32 eletuchy joined #git
01:35 shades joined #git
01:35 shades hey every one
01:35 shades i was working on a group roject and we all have the master repo (source of truth) and each of us had a fork of it and worked on our own parts of it
01:36 shades a couple of people accidently put api keys publically so i changed that the other day via the web interface on git
01:36 shades i'm sure there is a fast/easy way to pull these changes down to my local, and then push them u to my fork easily
01:36 shades so i don't have to redo the entire process
01:36 shades what would that entail?
01:37 Hello71 "web interface on git"
01:37 Hello71 !github
01:37 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
01:37 Hello71 !sensitive
01:37 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
01:41 shades ok
01:43 rbern joined #git
01:46 pks joined #git
01:49 aidalgol joined #git
01:49 Mobutils joined #git
01:52 rgrinberg joined #git
01:57 bjpenn joined #git
01:57 bollullera left #git
01:59 tristanp joined #git
01:59 jstimm joined #git
02:01 trista___ joined #git
02:04 drbean joined #git
02:06 skunkz joined #git
02:06 tristanp joined #git
02:07 ochorocho__ joined #git
02:09 tristanp_ joined #git
02:10 rnsanchez_ joined #git
02:12 Dougie187 joined #git
02:13 tristanp joined #git
02:14 interne7y joined #git
02:15 void__ joined #git
02:15 raijin joined #git
02:16 void__ left #git
02:17 voidfire joined #git
02:18 d4rklit3 joined #git
02:19 hexagoxel joined #git
02:21 jaguarmagenta joined #git
02:24 raijin joined #git
02:26 drodger joined #git
02:26 eletuchy joined #git
02:26 chachasmooth joined #git
02:28 nilsi joined #git
02:28 robbyoconnor joined #git
02:33 diego1 joined #git
02:33 diego1 joined #git
02:34 d4rklit3 joined #git
02:35 tristanp_ joined #git
02:36 realz joined #git
02:38 fuchstronaut joined #git
02:40 freekevin omg omg
02:40 freekevin im panicking
02:40 freekevin i need help
02:40 freekevin i did a merge i think
02:40 freekevin and lost the remote repo
02:41 freekevin how can i see a list of all whats done?
02:41 freekevin the remote repo is still there
02:41 SwiftMatt joined #git
02:41 freekevin but when i clone it to another computer its missing whats on my main computer
02:41 freekevin and when i git push or pull it says up to date with master/origin
02:42 freekevin from my main computer when i push or pull
02:42 freekevin and theres stuff missing from my main to the repo server that i clone to a new computer
02:43 tristanp joined #git
02:44 freekevin my git server is on my home server
02:45 freekevin so its just on ssh
02:45 DuckMaestro joined #git
02:56 Orion3k joined #git
03:00 artemisart joined #git
03:01 eletuchy joined #git
03:02 Goobbue joined #git
03:03 freekevin omg
03:03 freekevin and im not seeing anything in the log with the some directory changes i did a while ago
03:03 freekevin but my local repo says up to date...
03:03 freekevin what should i do damnit
03:04 freekevin backup and clone repo?
03:04 polyzen `git reflog` freekevin | how can i see a list of all whats done?
03:04 freekevin is idd git log
03:05 freekevin reflog?
03:05 polyzen `man git-reflog`
03:05 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
03:06 rewt maybe fire up `gitk --all` and click around to see where your commits ended up
03:06 diogenese joined #git
03:07 freekevin so i have /directory1/file1 and file2 are appearing in the repo
03:07 freekevin but on my local its /directory1/file1 2 3 4 5
03:07 freekevin also in the repo i removed a /directory2
03:08 freekevin but its still there when cloning
03:08 freekevin so its only been removed locally
03:11 freekevin it only shows the same as log
03:11 freekevin but ty for gitk
03:11 freekevin didnt know that existed
03:12 freekevin ohh
03:12 freekevin it shows a fork
03:12 freekevin a parent
03:12 freekevin with 2 children
03:14 tristanp joined #git
03:14 freekevin sigh
03:14 freekevin how do i get them all back to my local repo then
03:14 freekevin they were merged
03:15 freekevin but like i said some folder/files are not merged
03:15 ensyde joined #git
03:15 interne7y joined #git
03:16 freekevin they contain the same files though i guess
03:16 freekevin the repos are the same
03:16 whomp joined #git
03:17 Waskeend joined #git
03:17 tristanp_ joined #git
03:18 Lyqyd joined #git
03:18 freekevin i tried adding a file and pushing
03:18 freekevin and pulling
03:18 freekevin from each device
03:18 freekevin they are on the same branch again
03:18 freekevin but still the file structure is not right
03:18 freekevin mmm
03:18 fscala joined #git
03:18 freekevin i think ill backup my local and clone it
03:19 freekevin but how do i do that?
03:19 freekevin git clone --mirror ip:/home/user/project.git
03:19 freekevin ?
03:21 batrick joined #git
03:21 k3rn31 joined #git
03:22 freekevin or is there a way to force a reclone into my current working directory?
03:22 freekevin rebase?
03:23 freekevin git clone --mirror user@server:/url-to-repo.git ??
03:29 arescorpio joined #git
03:30 AntiNoisyBot joined #git
03:30 freekevin ...
03:30 freekevin no that didnt work
03:30 freekevin lol that just cloned the actual repo
03:30 freekevin in its nonsense form
03:33 PerlJam freekevin: er  ... what do you want to do?
03:33 freekevin I want to pull my repo from my server to get everything thats there
03:33 freekevin I seem to have had a fork
03:33 freekevin two children frmo a parent
03:33 freekevin i merged them
03:33 freekevin but directory structure is off
03:34 freekevin i'd like to pull my repo down from my server
03:34 freekevin and overwrite anything locally
03:34 PerlJam sounds like you want to use "git reset" to me.
03:34 PerlJam !reset
03:34 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
03:35 freekevin so git reset commit -m "redownloading full repo to home computer" -- path?
03:35 freekevin whats the path?
03:35 freekevin im in the path
03:35 freekevin otherwise git doesnt work
03:35 freekevin the command
03:35 freekevin if im not in my repo at home in ~/project.git folder the git command doesnt run
03:35 tristanp joined #git
03:36 PerlJam no, more like "git reset <commitish>"
03:36 s00pcan_ joined #git
03:36 PerlJam possibly with --hard, but be careful that you don't accidentally nuke nay local changes
03:37 PerlJam s/nay/any/
03:37 freekevin i already backed up my local dir
03:37 freekevin so im not too worreid about nuking stuff lol
03:37 whomp joined #git
03:37 freekevin git reset does nothing
03:37 freekevin whats <commitish>
03:37 freekevin ?
03:38 PerlJam a SHA1, a branch, a tag, or some symbolic ref like HEAD~3
03:39 tristanp_ joined #git
03:41 tristanp joined #git
03:41 freekevin why does this have to be so compilcated...sigh
03:42 freekevin so i need to reset to before the parent had 2 children?
03:42 freekevin but they were merged
03:43 freekevin 2 commits later
03:43 freekevin how come the files arnt merged then into the proper directories
03:43 trista___ joined #git
03:45 tristanp_ joined #git
03:47 Dougie187 left #git
03:48 _rnsanchez_ joined #git
03:50 freekevin ok i just manually moved 20 files
03:50 freekevin and then pushed
03:50 freekevin and pulled
03:50 freekevin and it fixed it
03:51 isxek joined #git
03:51 freekevin you would think "git fucking just work and sync everything you lazy bastard fuckcunt" would work
03:53 freekevin ive had this happen before and fixed it
03:53 freekevin i dont remember how though
03:54 freekevin merge-pull?
03:54 freekevin too bad the logs dont show the commands used
03:54 bjpenn joined #git
03:55 freekevin oh shit im on the wrong branch
03:58 digidog_ joined #git
04:01 freekevin but does it matter?
04:02 freekevin this branch of developement is currently up to date now that i did all those file moves
04:02 freekevin and it still had the same files
04:02 freekevin but a different directory structure
04:02 freekevin i should see how it clones though for someone
04:03 freekevin but  i see what i did wrong
04:04 freekevin i just dont know the commands for bringing the main repo back to my local
04:04 drodger joined #git
04:04 freekevin so i changed my local and then push/pulled and now im on this new branch of developement
04:06 freekevin is there a way to specify merge parent and child?
04:07 skunkz joined #git
04:08 shinnya joined #git
04:08 ochorocho__ joined #git
04:13 Dufflepod left #git
04:13 PaulCape_ joined #git
04:13 netj joined #git
04:15 drodger joined #git
04:15 mikecmpbll joined #git
04:16 hahuang65 joined #git
04:16 tristanp joined #git
04:16 interne7y joined #git
04:18 guardianJ joined #git
04:20 drodger joined #git
04:20 tristanp_ joined #git
04:23 tristanp joined #git
04:25 trista___ joined #git
04:27 tax joined #git
04:27 tristanp_ joined #git
04:28 guardianJ left #git
04:29 josuebrunel joined #git
04:31 mikecmpbll joined #git
04:31 tristanp joined #git
04:32 raijin joined #git
04:32 diego1 joined #git
04:32 shgysk8zer0 joined #git
04:33 diego1 joined #git
04:33 Cabanossi joined #git
04:36 mjuszczak joined #git
04:37 dsantiago joined #git
04:38 fuchstronaut joined #git
04:47 languitar joined #git
04:47 mikecmpbll joined #git
04:50 drodger joined #git
04:56 eletuchy joined #git
04:57 kadoban joined #git
04:58 mohabaks joined #git
05:00 L8D joined #git
05:00 ensyde__ joined #git
05:03 aidalgol joined #git
05:05 nick123 joined #git
05:07 nick123 joined #git
05:08 mikecmpbll joined #git
05:10 tristanp_ joined #git
05:10 nick123 joined #git
05:13 tristanp joined #git
05:15 tristanp_ joined #git
05:15 AfroThundr joined #git
05:15 mehola joined #git
05:16 nick123 joined #git
05:17 interne7y joined #git
05:18 phaleth joined #git
05:19 tristanp joined #git
05:22 guardianJ joined #git
05:24 tristanp_ joined #git
05:25 PaulCapestany joined #git
05:27 jaguarma_ joined #git
05:28 k3rn31 joined #git
05:29 lindenle joined #git
05:29 tristanp joined #git
05:31 inflames joined #git
05:40 eletuchy joined #git
05:40 AfroThundr joined #git
05:43 tristanp joined #git
05:43 thinsoldier joined #git
05:49 tristanp_ joined #git
05:52 Sasazuka joined #git
05:54 tristanp joined #git
05:57 tristanp_ joined #git
05:59 kami joined #git
06:06 mehola joined #git
06:08 mehola joined #git
06:08 skunkz joined #git
06:09 ochorocho__ joined #git
06:14 lynxium joined #git
06:15 artemisart joined #git
06:15 mikecmpbll joined #git
06:18 interne7y joined #git
06:18 tristanp joined #git
06:20 PaulCape_ joined #git
06:20 piling joined #git
06:21 tristanp_ joined #git
06:23 trista___ joined #git
06:24 circ-user-EiykY joined #git
06:25 User458764 joined #git
06:26 tristanp joined #git
06:28 tristanp_ joined #git
06:28 inflames joined #git
06:33 tristanp joined #git
06:33 t0by joined #git
06:34 droidicus joined #git
06:39 fuchstronaut joined #git
06:41 SimonNa joined #git
06:44 PaulCapestany joined #git
06:50 fracting joined #git
06:53 mikecmpbll joined #git
06:53 mehola joined #git
06:56 tristanp_ joined #git
06:57 bjpenn joined #git
07:01 acetakwas joined #git
07:01 uebera|| joined #git
07:01 uebera|| joined #git
07:07 k3rn31 joined #git
07:07 tristanp joined #git
07:09 fracting joined #git
07:09 uebera|| joined #git
07:09 uebera|| joined #git
07:11 cyan__ joined #git
07:12 fracting joined #git
07:12 d0nn1e joined #git
07:18 SwiftMatt joined #git
07:19 interne7y joined #git
07:20 uebera|| joined #git
07:21 dreiss joined #git
07:28 tristanp joined #git
07:29 vjacob joined #git
07:31 tristanp_ joined #git
07:32 Fr0Master joined #git
07:36 tristanp joined #git
07:38 Fijit joined #git
07:40 tristanp_ joined #git
07:44 fling joined #git
07:47 elastix joined #git
07:48 slappymcfry joined #git
07:51 fracting joined #git
07:52 vjacob__ joined #git
07:54 mohabaks joined #git
07:59 afuentes joined #git
08:03 nnyk_ joined #git
08:03 c0ded joined #git
08:06 PaulCape_ joined #git
08:08 skunkz joined #git
08:08 dopesong joined #git
08:09 circ-user-EiykY left #git
08:10 ochorocho__ joined #git
08:11 harish joined #git
08:14 d4rklit3 joined #git
08:17 govg joined #git
08:18 PaulCapestany joined #git
08:18 wrouesnel1 joined #git
08:19 jost joined #git
08:20 interne7y joined #git
08:20 tristanp joined #git
08:21 jagob joined #git
08:22 khmarbaise joined #git
08:23 paul424 joined #git
08:24 tristanp_ joined #git
08:27 tristanp joined #git
08:28 artemisart joined #git
08:28 rgrinberg joined #git
08:29 trista___ joined #git
08:30 SteffanW joined #git
08:33 PaulCape_ joined #git
08:34 paul424 joined #git
08:35 drodger joined #git
08:35 stuh84 joined #git
08:38 vjacob joined #git
08:38 GavinMagnus joined #git
08:40 fuchstronaut joined #git
08:42 King_Hual joined #git
08:45 Psychiatrist joined #git
08:47 leeN joined #git
08:48 drodger joined #git
08:49 lindenle joined #git
08:50 zmanfx joined #git
08:50 GavinMagnus left #git
08:54 monoxane joined #git
08:54 monoxane joined #git
08:55 monoxane joined #git
08:56 monoxane joined #git
08:56 robotroll joined #git
08:57 monoxane|dunce joined #git
08:58 monoxane joined #git
09:01 fling joined #git
09:01 tristanp joined #git
09:01 emPi joined #git
09:02 nwkj86 joined #git
09:04 ochorocho__ joined #git
09:04 tristanp_ joined #git
09:06 tristanp joined #git
09:07 vjacob joined #git
09:08 nnyk_ joined #git
09:08 nnyk_ joined #git
09:10 katherine joined #git
09:11 monoxane joined #git
09:14 realz joined #git
09:15 fling joined #git
09:15 eletuchy joined #git
09:17 zeroed joined #git
09:18 PaulCapestany joined #git
09:18 catsup joined #git
09:18 star_prone joined #git
09:21 interne7y joined #git
09:23 ome joined #git
09:31 User458764 joined #git
09:32 satifant joined #git
09:35 drodger joined #git
09:39 elsevero joined #git
09:39 PaulCape_ joined #git
09:48 asdofindia joined #git
09:49 mikecmpbll joined #git
09:49 tristanp joined #git
09:51 |ifei5g00d joined #git
09:59 tristanp joined #git
10:02 rahtgaz joined #git
10:04 drodger joined #git
10:05 PaulCapestany joined #git
10:09 skunkz joined #git
10:10 drodger joined #git
10:11 User458764 joined #git
10:12 tristanp joined #git
10:13 cdown joined #git
10:13 ManDay joined #git
10:13 tristanp_ joined #git
10:14 ManDay I did "git clone ... ; git pull origin dev;" but I still can't figure out how to locally checkout the branch "dev" at origin.
10:14 osse freekevin: the merge parents implied from where you run the command and with what args. there is no way to specify child
10:15 ManDay Tried git checkout, git branch, nothing will create a local branch which tracks origin/dev. fwiw, I don't understand what's the correct way to refer to it. I some times see it referred to as "origin/dev" and then sometimes as "origin dev" - are both correct?
10:15 osse ManDay: git chbeckout dev
10:15 ManDay osse: "pathspec 'develop' did not match any files known to git."
10:15 ManDay make that "dev"
10:16 trista___ joined #git
10:16 osse do you have both origin/dev and otherplace/dev ?
10:16 vjacob joined #git
10:16 ManDay no. I really only ran the two commands I said
10:17 ManDay "git clone ... ; git pull origin dev; "
10:17 ManDay sorry --depth=1 on clone
10:17 osse FYI you've now merged origin/dev into the current branch
10:17 ManDay I did o_O ?!
10:17 osse also, --depth implies --single-branch so origin/dev may not even be present
10:18 ManDay oy, better start over
10:19 tristanp joined #git
10:20 drodger joined #git
10:21 tristanp joined #git
10:21 artemisart joined #git
10:21 interne7y joined #git
10:23 tristanp_ joined #git
10:25 Fijit joined #git
10:26 star_prone joined #git
10:27 jaguarmagenta joined #git
10:29 tristanp joined #git
10:33 mase-tech joined #git
10:39 Calrik joined #git
10:40 ManDay thanks osse
10:40 ManDay left #git
10:41 fuchstronaut joined #git
10:45 slappymcfry joined #git
10:46 narendraj9 joined #git
10:49 juacado joined #git
10:51 lindenle joined #git
10:58 tristanp joined #git
11:00 tristanp_ joined #git
11:01 ramsub07 joined #git
11:02 trista___ joined #git
11:02 subhojit777 joined #git
11:02 skunkz joined #git
11:03 toogley joined #git
11:08 mohabaks joined #git
11:09 jimmyeatworld joined #git
11:10 elsevero joined #git
11:10 Oebele joined #git
11:11 k3rn31 joined #git
11:12 rahtgaz joined #git
11:12 tristanp joined #git
11:13 zarel joined #git
11:14 User458764 joined #git
11:15 snowbound joined #git
11:17 snowbound joined #git
11:17 Oebele joined #git
11:22 interne7y joined #git
11:23 josuebrunel joined #git
11:23 elsevero joined #git
11:25 tristanp_ joined #git
11:26 vjacob joined #git
11:27 tristanp joined #git
11:27 rnsanchez_ joined #git
11:29 mikecmpbll joined #git
11:29 fuchstronaut joined #git
11:30 john-soda joined #git
11:31 Saturn812 joined #git
11:32 vjacob2 joined #git
11:38 sdothum joined #git
11:42 robotroll joined #git
11:43 snowbound joined #git
11:44 juacado left #git
11:46 zeroed joined #git
11:49 DistantStar joined #git
11:49 Juzzika joined #git
11:53 tristanp_ joined #git
11:54 stuh84 joined #git
11:54 pol123456 joined #git
11:55 SimonNa joined #git
11:55 tristanp joined #git
11:56 bollullera joined #git
11:56 ojdo joined #git
11:59 emPi joined #git
11:59 fstd joined #git
12:00 khmarbaise joined #git
12:03 tristanp joined #git
12:04 ncd|leeN joined #git
12:05 Sendoushi joined #git
12:09 robbyoconnor joined #git
12:10 skunkz_ joined #git
12:11 User458764 joined #git
12:14 bket joined #git
12:17 jason237 joined #git
12:19 vjacob joined #git
12:20 wviana joined #git
12:20 jost_ joined #git
12:20 SonikBoom joined #git
12:22 subhojit777 joined #git
12:23 interne7y joined #git
12:24 vjacob joined #git
12:26 t0by joined #git
12:27 |meta joined #git
12:28 jaguarmagenta joined #git
12:31 tristanp_ joined #git
12:34 fstd joined #git
12:34 tristanp joined #git
12:35 mda1 joined #git
12:36 trista___ joined #git
12:37 ramsub07 joined #git
12:39 tristanp joined #git
12:41 tristanp_ joined #git
12:44 cyan__ joined #git
12:45 FilipNortic joined #git
12:45 fuchstronaut joined #git
12:52 zeroed joined #git
12:52 rneco joined #git
12:56 mjuszczak joined #git
12:57 mjuszczak joined #git
13:02 holodoc joined #git
13:03 samsonite joined #git
13:03 zeroed joined #git
13:06 fstd joined #git
13:07 ciampix joined #git
13:11 m_antis joined #git
13:15 tristanp joined #git
13:16 _rnsanchez_ joined #git
13:17 ToBeCloud joined #git
13:17 tristanp_ joined #git
13:18 acetakwas joined #git
13:19 trista___ joined #git
13:19 cdown joined #git
13:21 star_prone joined #git
13:22 tristanp joined #git
13:24 interne7y joined #git
13:24 mylord_ joined #git
13:28 Tuq joined #git
13:29 afuentes joined #git
13:30 todd_dsm joined #git
13:32 justanotheruser joined #git
13:33 ramsub07 joined #git
13:34 tristanp joined #git
13:37 PaulCape_ joined #git
13:38 cdown joined #git
13:39 Tratos joined #git
13:39 TomyLobo joined #git
13:40 bjpenn joined #git
13:40 dopesong joined #git
13:46 lucido-cwl joined #git
13:47 GavinMagnus joined #git
13:47 tristanp_ joined #git
13:49 fscala joined #git
13:51 sangy joined #git
13:51 tristanp joined #git
13:53 lindenle joined #git
13:54 tristanp_ joined #git
13:55 Sendoushi joined #git
13:56 trista___ joined #git
13:57 dopesong joined #git
14:02 tristanp_ joined #git
14:02 irco joined #git
14:06 m0viefreak joined #git
14:08 noidea joined #git
14:09 Juzzika joined #git
14:09 fahadash joined #git
14:11 skunkz_ joined #git
14:11 cyan__ joined #git
14:12 nilsi joined #git
14:13 thiago joined #git
14:18 dreiss joined #git
14:18 k3rn31 joined #git
14:18 piling joined #git
14:19 diogenese joined #git
14:20 fracting joined #git
14:21 liranp joined #git
14:25 interne7y joined #git
14:27 david007 joined #git
14:29 jaguarmagenta joined #git
14:30 Gamecubic joined #git
14:34 madewokherd joined #git
14:37 brain2k joined #git
14:38 User458764 joined #git
14:40 annoymouse joined #git
14:40 tristanp joined #git
14:41 NeverDie joined #git
14:43 tristanp_ joined #git
14:44 joki joined #git
14:45 tristanp joined #git
14:45 dimi1947 joined #git
14:47 ramsub07 joined #git
14:47 trista___ joined #git
14:49 star_prone joined #git
14:50 tristanp joined #git
14:51 snufft joined #git
14:54 droidicus joined #git
14:54 NeverDie joined #git
14:54 jkm joined #git
14:56 toogley joined #git
14:58 jason237 joined #git
14:59 jkm finally
14:59 cdown joined #git
15:00 jkm clear
15:00 nnyk_ joined #git
15:03 livingstn joined #git
15:03 jkm left #git
15:05 fuchstronaut joined #git
15:06 SwiftMatt joined #git
15:08 rkazak joined #git
15:10 diogenese joined #git
15:11 rahtgaz joined #git
15:13 hlysig joined #git
15:18 Mowgli joined #git
15:20 pampeho joined #git
15:21 pampeho_ joined #git
15:23 tristanp_ joined #git
15:25 sanketdg joined #git
15:25 lalalaaa joined #git
15:25 NeonSynth joined #git
15:25 lalalaaa Anybody know what's up with this? % git clone https://github.com/myapp/myapp.git
15:25 lalalaaa Cloning into 'myapp'...
15:25 lalalaaa fatal: unable to access 'https://github.com/myapp/myapp.git/': Couldn't connect to server
15:25 tristanp joined #git
15:26 interne7y joined #git
15:27 trista___ joined #git
15:28 Juzzika joined #git
15:28 artemisart joined #git
15:29 m_antis joined #git
15:29 tristanp_ joined #git
15:29 exarch joined #git
15:33 j416 lalalaaa: it can't connect to the server.
15:35 david007 joined #git
15:36 mikecmpbll joined #git
15:37 Grimm_ joined #git
15:38 lalalaaa j416: but it can ping google
15:38 j416 what can?
15:38 lalalaaa and ping github
15:39 lalalaaa my virtualbox
15:39 _ikke_ whatabout curl https://github.com
15:39 lalalaaa _ikke_: curl: (7) Couldn't connect to server
15:40 jast sounds like your virtual networking is hosed
15:40 lalalaaa damn
15:40 bjpenn joined #git
15:41 j416 we got hosed tommy, we got hosed
15:41 lalalaaa lol
15:44 paul424 joined #git
15:46 Matrixiumn joined #git
15:49 bruce_lee joined #git
15:49 netj joined #git
15:55 ajf- joined #git
15:58 jason237 joined #git
15:58 bitkiller joined #git
15:59 unbalancedparen joined #git
16:01 Gamecubic joined #git
16:02 Sendoushi joined #git
16:03 NightStrike left #git
16:06 tristanp joined #git
16:08 trista___ joined #git
16:09 grill joined #git
16:11 tristanp_ joined #git
16:11 grill joined #git
16:12 skunkz_ joined #git
16:12 nwkj86 joined #git
16:12 NeverDie joined #git
16:12 catsup joined #git
16:12 Sendoushi joined #git
16:13 ramsub07 joined #git
16:13 tristanp joined #git
16:14 Sendoushi joined #git
16:14 ochorocho__ joined #git
16:15 khmarbaise joined #git
16:15 trista___ joined #git
16:16 bruce_lee \(^_^)/ @all
16:16 bruce_lee how can I list my repositories on github using "git"?
16:16 tvon joined #git
16:17 j416 bruce_lee: you cannot.
16:17 j416 bruce_lee: you might be able to do it using some github API, if that exists.
16:18 tristanp_ joined #git
16:18 bruce_lee j416: thank you
16:18 GavinMagnus left #git
16:18 Sendoushi joined #git
16:18 j416 bruce_lee: you're welcome \^o^/
16:21 Sendoushi joined #git
16:21 tristanp joined #git
16:22 claudiop joined #git
16:23 grill joined #git
16:23 sagerdearia joined #git
16:23 tax joined #git
16:23 Sendoushi joined #git
16:24 tristanp_ joined #git
16:26 droidicus hello all, could use some help with a svn -> git migration issue
16:27 Twirl joined #git
16:27 droidicus I am working with a fairly messy SVN repo, started life as CSV, with a CVS2SVN conversion, the repo has a large number of projects in it (~50), and the orginization of the branches and tags is quite variable, with most being only a copy of a single project folder, but others being the roots of one of the projects... I have tried importing everything using
16:27 droidicus the git svn commands, but I am getting checksum mismatch errors, and other weird issues like nonsense branches
16:27 interne7y joined #git
16:27 droidicus So for instance, if I wanted to convert the following, which all represent the root of a single project folder, what would the best way to do so be? trunk/myProj branches/branchA/myProj branches/branchB tags/tagA/myProj tags/tabB
16:27 Twirl hey guys, how do you remove a folder from a github repo after pushing it? Should have added it to gitignore before
16:28 tgunr joined #git
16:29 osse Twirl: make a commit that deletes it. push that commit
16:30 jaguarmagenta joined #git
16:30 Matrixiumn joined #git
16:30 Twirl osse: so, delete the folder manually?
16:31 Twirl osse: then push?
16:31 osse you can use git rm && git commit
16:31 Twirl alright
16:31 Twirl osse: so, git rm /relative/path/ ?
16:32 Twirl or full path
16:32 osse try it and see. don't think it matters
16:33 SwiftMatt joined #git
16:34 clemf joined #git
16:36 ceaucari joined #git
16:36 subhojit777 joined #git
16:36 Twirl osse: alright, ty man, it worked
16:37 Twirl but why does it remove physically remove the files? i thought it was only a git thing
16:38 osse you can use rm --cached to do that
16:38 Twirl seriously idk why git rm should remove files i thought it was removing them from the repository
16:39 inflames joined #git
16:39 Twirl anyways, can you tell me how to stop pushing those folders once they get created again? it's just libraries
16:39 Twirl and dependencies, not project files
16:39 osse don't add them
16:39 LeMike joined #git
16:39 Twirl what do you mean not add them?
16:39 mellernoia joined #git
16:39 Twirl I do git add . so I don't have to manually add every single file
16:39 osse i mean exactly that
16:40 Twirl can't just add them to git ignore?
16:40 osse try git add -u nstead
16:40 osse you can do that too
16:40 Twirl alright, I'm trying to work it out, could it be something like **/folder and it won't add any files (or folder) with folder name if I put it in the root project when doing git add . ?
16:41 Twirl as in a .gitignore file
16:41 tristanp joined #git
16:42 subhojit_ joined #git
16:42 Twirl where do i have to put the .gitignore file?
16:42 osse a .gitignore files affects the directory it is in and everything below
16:42 osse for smaller projects it's usually enough to have one at the top level
16:43 GavinMagnus joined #git
16:43 GavinMagnus left #git
16:43 ceaucari joined #git
16:44 tristanp_ joined #git
16:45 spudowiar joined #git
16:45 Twirl osse: so, i create a .gitignore file in the root directory, same level than where the .git folder is, and then add the line **/folder and it should work?
16:45 osse Twirl: yes
16:46 osse they should no longer appear as untracked files in git status
16:47 maestrojed joined #git
16:47 tristanp joined #git
16:47 Twirl alright I committed and it shows new file:        .gitignore
16:47 Twirl and now what?
16:48 Twirl can I do git add . and it won't add the new files in those folders?
16:48 Twirl whole contents of the .gitignore file is **/node_modules
16:48 cdown joined #git
16:48 osse yes
16:49 Twirl alright
16:49 Twirl lets test it out
16:51 tristanp_ joined #git
16:51 rgrinberg joined #git
16:52 DuckMaestro joined #git
16:53 Twirl alright it worked, ty man
16:54 j416 or woman
16:54 tristanp joined #git
16:55 blackwind_123 joined #git
16:59 hlysig joined #git
17:00 Twirl is it a woman?
17:00 Twirl on irc?
17:00 Twirl talking about git stuff?
17:01 Twirl must be less than 1% chance of such encounter
17:01 j416 I don't see why not :)
17:01 dshap joined #git
17:01 j416 probabiliyy may be low, indeed
17:01 hiroki joined #git
17:01 * j416 cant even spel
17:01 tristanp joined #git
17:01 Twirl women don't like compuers
17:01 Twirl for some reason
17:02 Twirl probably because they find them boring
17:02 dshap Hey all, is it possible that someone on my team could have made a merge commit to bring changes from 1 branch into another WITHOUT bringing the commits in the other branch over as well?
17:02 dshap My repo is in a strange state that I can't explain...trying to figure out what could have gone on
17:02 bremner t
17:03 dshap I see a commit on master with a custom message "merge develop" (what this person would do after resolving merge conflicts), and in that commit I see some changes introduced by commit XYZ which is in develop, but commit XYZ is not in master right now...and I don't know why.
17:04 efco joined #git
17:05 cdown_ joined #git
17:06 iamthad joined #git
17:06 toogley joined #git
17:07 fuchstronaut joined #git
17:10 ksenja joined #git
17:13 drodger joined #git
17:14 durham joined #git
17:16 tristanp_ joined #git
17:19 sebhoss joined #git
17:19 eletuchy joined #git
17:19 tristanp joined #git
17:24 tristanp_ joined #git
17:24 josuebrunel joined #git
17:27 stevenbenner joined #git
17:28 interne7y joined #git
17:28 hlysig joined #git
17:31 tristanp joined #git
17:31 bollullera left #git
17:34 durham joined #git
17:34 lindenle joined #git
17:35 brain2k left #git
17:39 ramsub07 joined #git
17:40 Lynxium joined #git
17:40 kami joined #git
17:40 bjpenn joined #git
17:41 maestrojed left #git
17:42 User458764 joined #git
17:42 Twirl hey guys, how do i merge locally the changes I pulled from github?
17:43 Twirl I pulled and files look the same
17:43 Twirl with git pull origin master
17:43 _ikke_ That already does the merge
17:44 Twirl then why the files look the same?
17:44 Twirl I'm seeing the changes on github
17:44 josuebrunel joined #git
17:46 subhojit_ joined #git
17:47 Twirl * branch            master     -> FETCH_HEAD Already up-to-date.
17:47 Twirl dafuq
17:47 Twirl _ikke_: what do you mean it does the merge?
17:48 tristanp_ joined #git
17:48 AfroThundr joined #git
17:49 droidicus Twirl, what does 'git status' show?
17:49 diogenese joined #git
17:49 AfroThundr joined #git
17:50 Twirl well now it's ahead of master by 4 commits
17:50 Twirl because i was trying to fix it
17:51 tematibr joined #git
17:54 drodger joined #git
17:56 jeffmjack joined #git
17:56 tristanp joined #git
17:58 mingrammer joined #git
17:58 _ikke_ Twirl: git pull == git fetch + git merge
18:00 mingrammer_ joined #git
18:01 drodger joined #git
18:01 SteenJobs joined #git
18:02 SteenJobs hey everyone, hope you’re enjoying the extended weekend.
18:02 Twirl Alright, i was looking in the wrong place i think
18:02 Twirl lol what extended weekend?
18:02 GavinMagnus joined #git
18:02 SteenJobs if i have two remotes, origin and alt, git status only checks my master against origin/master
18:02 SteenJobs how can i check the same thing but against my alt remote?
18:02 SteenJobs Twirl: haha in the US at least it’s memorial day weekend
18:02 fscala joined #git
18:02 SteenJobs but then again i’m working anyway...
18:03 osse SteenJobs: i don't think you can make git status consider more than one tracking branch
18:03 osse SteenJobs: to get the numbers you can use this weird command:  git rev-list --count --left-right master...alt/master
18:03 SteenJobs osse: intereesting. i would’ve thought there would be some obvious arg i could pass like the remote name.
18:03 SteenJobs haha that is odd
18:03 osse Create a GUI in Visual Basic around that and you're golden
18:04 SteenJobs osse: basically i created my own repo for this project, but there’s a separate repo (which i named alt) which is where other devs are pushing, so i need to be able to pull their changes (preferably checking if there are any changes to be fetched first)
18:04 cmwslw joined #git
18:04 freekevin osse, thx
18:05 SteenJobs ew, isn’t VB part of the microsoft stack?
18:05 osse SteenJobs: it was a joke referencing this:  https://www.youtube.com/watch?v=hkDD03yeLnU
18:06 osse SteenJobs: you can make pull work with one remote and push with another
18:06 SteenJobs osse: haha that was worth watching
18:06 |ifei5good joined #git
18:07 SteenJobs osse: yea, i need pull and push to both - i’m gonna eventually only have one remote once i’m fully onboarded to this proj
18:07 SteenJobs osse: i realize it’s not a huge deal because i never pull, i fetch/merge
18:07 SteenJobs so i can just fetch alt -a and then check the graph
18:08 SteenJobs but the question is, how can i check my master against alt/master to see if it’s fast-forwardable or needs a full merge? git status is usually what gives me that info
18:08 grawity joined #git
18:08 osse SteenJobs: put another way: you can make push push somewhere other than what git status compares the branch with
18:09 iamthad joined #git
18:09 osse SteenJobs: with my rev-list command above, if the right number is zero then it's a fast-forward
18:09 SteenJobs oh cool!
18:09 SteenJobs good to know
18:10 osse git rev-list --count master..alt/master # will only give you that number
18:11 antispaceman joined #git
18:11 Limes_ joined #git
18:11 EvilJStoker joined #git
18:12 mohabaks joined #git
18:12 nettoweb joined #git
18:12 rahtgaz joined #git
18:12 dimi1947 joined #git
18:12 aspiers what's the cleanest way to programmatically check if a ref is a branch?
18:13 skunkz_ joined #git
18:13 aspiers anything better than show-ref?
18:13 diegoaguilar joined #git
18:13 mellernoia joined #git
18:13 osse aspiers: as opposed to what?
18:13 Limes__ joined #git
18:13 aspiers sorry, check if a commit-ish is a branch
18:14 aspiers as opposed to a tag, or a sha
18:14 larsrustand joined #git
18:14 tristanp joined #git
18:14 aspiers hmm, rev-parse --symbolic-full-name maybe
18:15 mdw joined #git
18:15 aspiers | grep ^refs/heads/
18:15 aspiers but it's still a bit ugly
18:16 osse by definition it's only a branch if the full name starts with refs/heads/
18:16 aspiers right
18:16 piling_ joined #git
18:16 aspiers but what's the porcelain to test for that?
18:16 osse i don't know of any
18:17 wariac joined #git
18:17 aspiers but rev-parse --symbolic-full-name "$ref" | grep -q '^refs/heads/' sounds reasonable to you?
18:17 osse in principle, yes
18:17 aspiers ok, thanks
18:18 docnvk joined #git
18:18 osse I think I'd do  fullref=$(git rev-parse --symbolic-full-name "$ref"); if [[ $fullref = refs/heads/* ]]; then
18:18 osse where does ref come from?
18:18 aspiers from the user
18:18 aspiers that relies on bash, which I'm trying to minimise
18:18 aspiers in the vain hope that my subcommand might one day get merged into the distribution
18:19 osse case "$ref" in refs/heads/*); stuff ;; esac
18:19 osse :)
18:19 aspiers sure
18:19 robotroll joined #git
18:19 osse but grep -q is fine
18:19 NeverDie When I want to pull someone else's branch remotely, I have to first create the branch locally before pulling it right?
18:19 _ikke_ NeverDie: nope
18:19 NeverDie _ikke_: What do I do then?
18:19 osse aspiers: or maybe for giving appropriate error messages and such a case esac would be a good fit
18:20 _ikke_ NeverDie: use git fetch, you will have the remote tracking branch
18:20 _ikke_ then you can create a local branch out of it if you want
18:20 NeverDie Just git fetch?
18:20 _ikke_ NeverDie: yup
18:20 osse aspiers: and maybe git-sh-setup.sh has some of this
18:20 NeverDie Hmm, I see the new branch now.
18:20 tristanp_ joined #git
18:21 NeverDie _ikke_: I still have to create the branch locally though, and still pull from origin <branch name>
18:21 NeverDie No?
18:21 osse NeverDie: not necessarily
18:22 osse what do you want to do with it?
18:22 aspiers osse: I didn't know about that - thanks
18:22 NeverDie I want to load up the version of that project.
18:22 NeverDie And check it out.
18:22 NeverDie Make a diff of it with my own branch.
18:22 NeverDie Iron out the issues.
18:22 osse NeverDie: in that case you can checkout thatthing directly
18:22 osse aspiers: with the amount of scripts you've written it's about time :P
18:23 aspiers osse: ;-)
18:23 droidicus hmmm, looks like this has put me on the right track to figuring out how to un-roll this svn repo: http://stackoverflow.com/questions/33199460/git-svn-migration-with-non-standard-layout-doesnt-show-merges
18:23 Dyonisos joined #git
18:23 NeverDie osse: I just did git checkout <branch>
18:23 tristanp joined #git
18:23 NeverDie But I'm guessing I still need to do git pull origin <branch>?
18:23 _ikke_ NeverDie: git pull will merge the branch
18:23 _ikke_ which is probably what you don't want
18:24 NeverDie I want to pull his branch though.
18:24 NeverDie I just don't want it merging with my branch.
18:24 _ikke_ NeverDie: pull = fetch + merge
18:24 NeverDie I'm currently now in the other branch but it doesn't have any new changes.
18:24 _ikke_ So pull is not the term / command that you want to use
18:24 osse NeverDie: if you just fetched then pull is unnecessary
18:25 NeverDie So now that I'm in the new branch, just git merge?
18:25 osse NeverDie: and if you did git checkout branch and you're not seeing what you expected then perhaps the checkout failed
18:25 NeverDie Or git merge <branch> while I'm in <branch>?
18:25 _ikke_ Do you want to merge?
18:25 tristanp_ joined #git
18:25 NeverDie I want the source code lol
18:25 osse what did git checkout say?
18:26 tribly joined #git
18:26 _ikke_ NeverDie: Then you want to check out the branch
18:26 _ikke_ NeverDie: like osse said
18:26 NeverDie Ohhh.
18:26 NeverDie Nevermind, I'm retarded.
18:26 NeverDie It did actually work just fine.
18:26 NeverDie Just loaded the project to make sure. I see the changes now.
18:27 trista___ joined #git
18:29 interne7y joined #git
18:29 diogenese joined #git
18:29 yqt joined #git
18:30 jaguarmagenta joined #git
18:30 eletuchy joined #git
18:33 Ahmed90 joined #git
18:33 settermjd joined #git
18:33 Gitzilla joined #git
18:34 multi_io joined #git
18:35 dimi1947 joined #git
18:35 eletuchy joined #git
18:36 raijin joined #git
18:37 stonerfish joined #git
18:37 stonerfish joined #git
18:38 clemf joined #git
18:38 diogenese joined #git
18:41 CEnnis91 joined #git
18:44 SteffanW joined #git
18:45 t0by joined #git
18:46 aspiers woohoo, git transplant works!
18:46 aspiers just successfully transplanted a range of commits from one branch to another
18:47 raijin joined #git
18:48 jsolano joined #git
18:48 diegoaguilar joined #git
18:49 ceaucari joined #git
18:49 stonerfish joined #git
18:49 Psych joined #git
18:49 Goplat joined #git
18:51 jsolano joined #git
18:51 skunkz joined #git
18:52 _xor joined #git
18:53 drodger joined #git
18:54 _ikke_ nice
18:55 aspiers git transplant from..to dest-branch
18:55 aspiers next failing test to fix is for git transplant --after ref from..to dest-branch
18:55 shantanoo joined #git
18:55 aspiers is rebase --continue always required after rebase --skip, or can --skip complete a rebase by itself? I can't remember
18:57 Noldorin joined #git
18:57 osse aspiers: I skimmed your conversation with Johannes Schindelin on the list. If you end up with a separate repo etc etc then I feel that Git's own coding style no longer applies
18:57 osse In which case arrays are just fine :p
18:57 aspiers osse: agreed. I'm probably not planning to bother re-styling it unless I hear some noises from Junio which give me hope for its inclusion
18:58 aspiers Johannes had some good observations but I kinda felt he was missing the main point of why I'm doing this
18:58 aspiers *shrug*
18:59 Goobbue joined #git
18:59 aspiers aside from scratching my personal itches, I'm hoping this kind of work will stimulate the community to work more on higher-level workflow tools
18:59 aspiers I haven't really seen much innovation on that front for quite a while
18:59 aspiers although I admit I'm not closely following the git community at the moment
18:59 paul424 joined #git
19:00 tristanp joined #git
19:01 aspiers I'm kind of surprised that by now we don't all have fancy UIs for stuff like moving commits/branches around via drag'n'drop or similar
19:03 osse i think i saw a proof of concept that had that feature
19:03 aspiers oh?
19:03 tristanp_ joined #git
19:03 iamthad joined #git
19:03 _ikke_ git kraken
19:03 _ikke_ apparently has it
19:03 piling joined #git
19:04 aspiers interesting
19:05 aspiers actually, magit has definitely innovated in the space of higher level workflows
19:05 aspiers e.g. its "instant fixup" UI is pure gold
19:05 aspiers I use that all the time
19:06 aspiers that's actually not a million miles away from the transplant workflow I'm implementing
19:06 aspiers the problem with implementing that stuff directly in gitkraken is that it doesn't support automating related workflows via scripting etc.
19:06 happy-dude joined #git
19:07 tristanp joined #git
19:07 aspiers that's why I believe it's worth building extra porcelain which offers these operations - then UIs can built on top of them
19:08 _ikke_ Yeah, kindof makes sense
19:10 tristanp_ joined #git
19:11 ryouma joined #git
19:14 nilg joined #git
19:14 drodger joined #git
19:16 tristanp joined #git
19:17 stonerfish joined #git
19:19 acetakwas joined #git
19:20 SteenJobs joined #git
19:22 blahdodo joined #git
19:24 drodger joined #git
19:27 prsn joined #git
19:29 elastix joined #git
19:30 interne7y joined #git
19:30 fstd joined #git
19:32 acetakwas joined #git
19:34 ciampix joined #git
19:36 dreiss joined #git
19:37 Ashley_ joined #git
19:37 tristanp_ joined #git
19:37 aspiers test for git transplant --after ref from..to dest-branch now passes!
19:38 Ashley_ Hi guys. I understand most of the basics of git but have got myself into a situation and would like advice on how to proceed.
19:38 aspiers not much left to do now :) just need to add support for git transplant --new-from $base $from..$to $dest_branch
19:38 Ashley_ I have a local copy of a repository which I've made substantial changes to (But the structure is still there in terms of files, so it'd just be a big edit commit) however I have lost the .git folder.
19:39 Ashley_ It's remote on github and I'd like to know how best I should commit my changes without it just re-uploading everything even though half the files exist on the server already
19:39 _ikke_ clone it into a separate folder, copy files to that new clone, commit and push?
19:39 tristanp joined #git
19:40 arooni joined #git
19:40 Ashley_ Will do. Don't know why I didn't consider that; thanks!
19:41 bjpenn joined #git
19:42 tristanp_ joined #git
19:43 CheckDavid joined #git
19:43 Noldorin joined #git
19:44 Topic for #git is now Welcome to #git1015FM, the place for git help and classic rock | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Carry on my wayward vim, there'll be a build when you're done. https://madeitwor.se/git-jokes
19:44 _ikke_ lol
19:44 trista___ joined #git
19:45 mdw joined #git
19:45 _ikke_ scorpions?
19:45 _ikke_ Ah, Kansas
19:45 Eugene https://youtu.be/2X_2IdybTV0
19:51 alex1a joined #git
19:51 ferr joined #git
19:52 Psychiatrist joined #git
19:53 Noldorin joined #git
19:55 rbr joined #git
19:56 acetakwas joined #git
19:57 iamthad joined #git
19:58 arooni joined #git
20:05 strk joined #git
20:05 strk I had the impression that git subcommands were auto-completed, was it an allucination ? (as it's not working anyore :)
20:05 strk actually, it works for all commands but not for "appraise"
20:06 strk (which works, if I fully type it)
20:06 Eugene git-appraise isn't a part of git.git, so I'm unsurprised that the autocomplete doesn't cover it
20:07 grill joined #git
20:07 fstd joined #git
20:07 toogley joined #git
20:08 strk I was surprised that it work (but the surprise could have been part of the allucination)
20:08 Groscheri joined #git
20:08 Eugene It's likely your shell's autocompletion, rather than git-completion.bash
20:09 dreiss joined #git
20:10 Eugene TIL that git-completion supports custom subcommands
20:11 strk TIL ?
20:11 Vinnie_win_d joined #git
20:11 Eugene Today I Learned.
20:12 strk the only git-related bash-completion script I find is /etc/bash_completion.d/git-prompt
20:12 Eugene Is it the same thing as https://github.com/git/git/blob/master/contrib/completion/git-completion.bash ?
20:12 k3rn31 joined #git
20:13 strk not at all, only sources /usr/lib/git-core/git-sh-prompt
20:13 Eugene Ah, not the same thing then
20:13 drodger joined #git
20:13 strk locate git-completion # no hits
20:13 cdown joined #git
20:13 blackwind_123 joined #git
20:13 blahdodo joined #git
20:13 strk now I wonder how does the completion work :/
20:14 skunkz_ joined #git
20:17 jrm left #git
20:17 strk anyway, sourcing git-completion.bash makes "appraise" also completable :
20:17 Eugene !next
20:17 gitinfo Another satisfied customer. NEXT!
20:18 strk I'm running git version 2.1.4
20:18 strk Eugene: still, I dunno if I was dreaming or something broke somehow after initially working :)
20:18 strk is that "git-completion.bash" supposed to be installed by a debian package for 2.1.4 ?
20:18 strk (that one or another similar one)
20:18 Eugene I've got no idea what the Debian packages look like, sorry
20:19 strk uhm, looks like /usr/share/bash-completion/completions/git is in the package
20:19 Eugene `yum provides /etc/bash_completion.d/git` says it came from the 'git' package.
20:19 Psych joined #git
20:19 strk slightly different (but similar)
20:20 Eugene Do you have /etc/profile.d/bash_completion.sh ?
20:20 strk a-ha, figured
20:20 strk evidently only _new_ shells recognized the new git-appraise command
20:21 strk while old (existing _before_ git-appraise was installed) did not complete it
20:21 Eugene Yeah; it's sourced at shell startup
20:21 strk bingo, I'm not crazy :)
20:21 Eugene I wouldn't go that far
20:22 strk ok, I just didn't have an allucination about autocompletion working :)
20:22 tristanp joined #git
20:22 nnyk_ joined #git
20:23 bjpenn joined #git
20:24 rkazak joined #git
20:24 tristanp_ joined #git
20:24 radsy joined #git
20:25 SwiftMatt joined #git
20:26 strk left #git
20:27 trista___ joined #git
20:28 strk joined #git
20:31 interne7y joined #git
20:31 jaguarmagenta joined #git
20:31 krabat joined #git
20:33 drodger joined #git
20:33 stonerfish joined #git
20:34 Goobbue joined #git
20:35 mohabaks joined #git
20:41 _28_ria joined #git
20:45 tristanp joined #git
20:45 rnsanchez_ joined #git
20:45 shantanoo joined #git
20:46 bgold joined #git
20:49 LeBlaaanc joined #git
20:49 stonerfish joined #git
20:49 tristanp_ joined #git
20:51 iamthad joined #git
20:52 bgold joined #git
20:52 khmarbaise joined #git
20:52 Goplat joined #git
20:54 tristanp joined #git
20:54 t0by joined #git
20:55 ochorocho__ joined #git
20:55 _rnsanchez_ joined #git
21:01 SteenJobs joined #git
21:01 SteffanW joined #git
21:08 fuchstronaut joined #git
21:10 sagerdearia joined #git
21:12 stonerfish joined #git
21:12 diegoviola joined #git
21:12 settermjd joined #git
21:16 strk warn: No match for commit aa1d6ceaeeb61b09391a8f6e044ae0134220bfac found at https://strk.kbt.io/git/git-appraise.git # but I can find that object on cloning, can't you ?
21:18 elsevero joined #git
21:22 ceaucari joined #git
21:26 ochorocho__ joined #git
21:26 iamthad joined #git
21:31 interne7y joined #git
21:31 nettoweb joined #git
21:32 emPi joined #git
21:35 osse strk: what produces that error?
21:36 stonerfish joined #git
21:39 tristanp_ joined #git
21:40 unbalancedparen joined #git
21:40 Vinnie_win joined #git
21:40 stonerfish joined #git
21:40 strk osse: git-request-pull
21:41 strk git request-pull aa1d6ceaeeb61b09391a8f6e044ae0134220bfac https://strk.kbt.io/git/git-appraise.git
21:41 jaequery joined #git
21:42 Lynxium joined #git
21:42 drodger joined #git
21:43 nilsi joined #git
21:43 shantanoo joined #git
21:43 JeremyD joined #git
21:43 JeremyD joined #git
21:46 tristanp joined #git
21:46 jaguarmagenta joined #git
21:46 stonerfish joined #git
21:47 King_Hual joined #git
21:47 King_Hual joined #git
21:47 drodger joined #git
21:50 linuxmint joined #git
21:51 |ifei5g00d joined #git
21:52 Noldorin joined #git
21:52 iamthad joined #git
21:54 _xor joined #git
21:54 bollullera joined #git
21:56 meloc_ joined #git
21:58 osse strange. i don't know
21:58 jason237 joined #git
22:00 Goobbue joined #git
22:00 meloc_ left #git
22:00 jaguarmagenta joined #git
22:01 meloc joined #git
22:01 meloc_ joined #git
22:03 rvsjoen joined #git
22:03 rvsjoen joined #git
22:03 jeffreylevesque_ joined #git
22:03 dling joined #git
22:04 raven-au joined #git
22:06 rafalcpp joined #git
22:09 tristanp_ joined #git
22:12 peeps joined #git
22:13 tristanp joined #git
22:14 cmwslw joined #git
22:14 elastix joined #git
22:14 skunkz_ joined #git
22:16 Noldorin joined #git
22:16 tristanp_ joined #git
22:20 tristanp joined #git
22:20 VampiricPadraig joined #git
22:20 VampiricPadraig joined #git
22:23 stonerfish joined #git
22:23 tristanp_ joined #git
22:25 Korvin joined #git
22:32 fstd joined #git
22:32 interne7y joined #git
22:35 PaulCapestany joined #git
22:38 eletuchy joined #git
22:43 shantanoo joined #git
22:43 shantanoo joined #git
22:44 Twirl left #git
22:47 Noldorin joined #git
22:47 SporkWitch joined #git
22:50 prsn joined #git
22:51 chadi joined #git
22:53 aidalgol joined #git
22:58 GavinMagnus left #git
22:59 drodger joined #git
23:00 pamplemousse joined #git
23:02 tristanp joined #git
23:05 tristanp_ joined #git
23:05 stonerfish joined #git
23:07 cmwslw joined #git
23:07 mingrammer joined #git
23:09 fuchstronaut joined #git
23:09 tristanp joined #git
23:10 mingrammer joined #git
23:13 d0nn1e joined #git
23:18 prsn joined #git
23:20 ffabi joined #git
23:21 MrWoohoo joined #git
23:23 mingrammer joined #git
23:25 nevyn joined #git
23:26 Gitzilla joined #git
23:29 drodger joined #git
23:29 Noldorin joined #git
23:29 mablae__ joined #git
23:32 Noldorin joined #git
23:32 mingrammer__ joined #git
23:33 eletuchy joined #git
23:33 cdown joined #git
23:34 tristanp_ joined #git
23:34 mingrammer joined #git
23:36 trista___ joined #git
23:36 lindenle joined #git
23:38 mingrammer__ joined #git
23:39 tristanp joined #git
23:42 tristanp_ joined #git
23:44 ochorocho__ joined #git
23:45 shantanoo joined #git
23:45 bibble joined #git
23:47 mattfoo joined #git
23:49 shantanoo joined #git
23:55 drodger joined #git
23:56 Rodya_ joined #git
23:56 shantanoo joined #git

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