Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-28

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

All times shown according to UTC.

Time Nick Message
00:02 YoLoGrimm joined #git
00:04 neanderslob joined #git
00:04 NeverDie_ joined #git
00:05 Noldorin joined #git
00:07 tristanp_ joined #git
00:10 trista___ joined #git
00:12 drodger joined #git
00:17 johnmilton joined #git
00:17 marked joined #git
00:18 sangy joined #git
00:19 GeneralVagueness oh hey
00:19 GeneralVagueness I was going to ask the question the last guy that popped up asked
00:19 GeneralVagueness it doesn't look like it was really answered though
00:20 GeneralVagueness the question being how to change commit messages already put down
00:20 GeneralVagueness like there's a thing about how to fix it afterwards, but not how to actually do it
00:23 iamthad joined #git
00:23 mizu_no_oto joined #git
00:24 AbsurdTech joined #git
00:25 diosmiux joined #git
00:27 fuchstronaut joined #git
00:31 tomog999_ joined #git
00:32 tristanp joined #git
00:32 unreal_ joined #git
00:37 Noldorin joined #git
00:38 johnmilton joined #git
00:39 rkazak joined #git
00:46 tristanp_ joined #git
00:49 rgrinberg joined #git
00:54 tristanp joined #git
01:01 Lunatrius` joined #git
01:03 ojacobson GeneralVagueness: git rebase -i has a reword option, which works for commits back a ways; git commit --amend can do it for the most recent commit
01:04 ojacobson which is often easier than dealing with rebase
01:06 drodger joined #git
01:09 Grimm_ joined #git
01:11 jstimm_ joined #git
01:12 wviana_ joined #git
01:13 frozen3 joined #git
01:13 tristanp_ joined #git
01:14 EgS joined #git
01:14 WizJin- joined #git
01:14 dustinm joined #git
01:15 drodger joined #git
01:15 MeltedLux joined #git
01:15 tabakhase joined #git
01:15 mamParra joined #git
01:16 skalpin joined #git
01:16 thejoecarroll joined #git
01:16 whomp joined #git
01:16 Soliton joined #git
01:16 Apasmara joined #git
01:16 pwnz0r joined #git
01:17 ormaaj joined #git
01:17 SporkWitch joined #git
01:17 thunfisch joined #git
01:17 g5pw joined #git
01:20 _rnsanchez_ joined #git
01:21 clemf joined #git
01:22 Lyqyd joined #git
01:24 frozen3 joined #git
01:26 ensyde joined #git
01:26 w33nd0x joined #git
01:26 ochorocho__ joined #git
01:27 L8D joined #git
01:29 prsn joined #git
01:34 marked joined #git
01:35 howdoi joined #git
01:35 SporkWitch joined #git
01:35 whomp joined #git
01:36 tristanp joined #git
01:36 howdoi is there a post pull hook?
01:36 Grimm_ joined #git
01:37 Grimm_ joined #git
01:39 tristanp_ joined #git
01:39 howdoi anyone?
01:46 eletuchy joined #git
01:46 NwS joined #git
01:46 pks_ joined #git
01:47 User458764 joined #git
01:53 tristanp joined #git
01:56 BenderRodriguez joined #git
01:57 skunkz joined #git
01:57 interne7y joined #git
01:57 tristanp_ joined #git
01:58 howdoi no one?
01:58 riceandbeans joined #git
01:58 riceandbeans I have a question
01:58 riceandbeans I don't understand git bisect
01:59 riceandbeans git bisect start; git bisect good SHA1; git bisect bad HEAD; do whatever; git bisect (good|bad)
01:59 riceandbeans when I started it said like 150 revisions to go through
01:59 riceandbeans two marks in of good|bad it's down to 50 revisions
01:59 riceandbeans how does that work?
02:00 i7c Binary search.
02:00 i7c It jumps somewhere in the middle between a working and a non-working revision.
02:00 fscala joined #git
02:00 i7c Which approximately narrows it down to half the revisions in each iteration.
02:00 tristanp joined #git
02:02 boudicca joined #git
02:02 riceandbeans but how does it know that?
02:03 drbean_ joined #git
02:03 riceandbeans doesn't it have to test every single commit?
02:03 i7c Well, you tell it if a commit has the bug or not.
02:03 raijin joined #git
02:04 i7c The idea is that the bug was introduced in some commit and you want to find out which one. So you keep testing commits in between until you narrowed it down to one.
02:04 riceandbeans right, but if from HEAD to $good_commit is 20 commits, how is it possible to not have to test at max 20 commits
02:04 riceandbeans I assume it just iterates through commits one by one in history
02:04 howdoi someone?
02:04 i7c Of course this is based on the assumption that the commit was introduced once and is still present in the following history.
02:04 riceandbeans from good->bad
02:05 i7c No.
02:05 i7c It does binary search. :)
02:05 riceandbeans I don't understand how that can be done with commits
02:05 i7c Say you have commits 1 2 3 4 5 6 and 3 introduces the bug. So you start bisect with good 1 and bad 6
02:05 i7c say git selects 4, you test, you find the bug
02:06 i7c next it selects 2, no bug. test 3, bug. So 3 must be the commit that introduced the bug.
02:06 i7c Because before there was no bug and afterwards there is a bug.
02:07 riceandbeans so it literally jumps back and forth in history
02:07 i7c yup
02:07 riceandbeans wait a minute
02:07 riceandbeans I just understood a binary search
02:07 prsn joined #git
02:07 i7c :)
02:07 riceandbeans military training actually was useful for once
02:07 riceandbeans I just realized a certain piece of military training was basically a binary search
02:08 i7c hehe
02:08 riceandbeans artillery
02:08 arescorpio joined #git
02:10 harish joined #git
02:10 harish joined #git
02:13 artemisart joined #git
02:16 diosmiux joined #git
02:17 Goplat joined #git
02:17 tristanp_ joined #git
02:19 whomp joined #git
02:19 tristanp joined #git
02:20 rnsanchez_ joined #git
02:21 rainbyte joined #git
02:22 watabou joined #git
02:23 tristanp joined #git
02:24 hexagoxel joined #git
02:24 L8D joined #git
02:25 BenderRodriguez joined #git
02:27 JFS joined #git
02:28 chachasmooth_ joined #git
02:29 fuchstronaut joined #git
02:33 pabs3 joined #git
02:34 ceaucari joined #git
02:37 tristanp joined #git
02:39 harish joined #git
02:40 jamiejackson joined #git
02:41 eletuchy joined #git
02:42 jamiejackson hi folks. someone submitted a pull request a while back to a project i'm interested in. it had conflicts, and neither party ended up with the time to resolve them. what would be the workflow for me to take a crack at it, given that i don't have access to either repo?
02:50 tristanp joined #git
02:50 dopesong joined #git
02:57 dsantiago joined #git
03:09 pabs3 left #git
03:10 dmod_ joined #git
03:10 mehola joined #git
03:11 dmod_ where did ssh move to? I it used to be in the path, but now when i run a ssh command in cmd it fails to find that program.
03:13 StuartMI joined #git
03:15 drodger joined #git
03:16 tristanp_ joined #git
03:17 pwnz0r joined #git
03:19 tristanp joined #git
03:20 k3rn31 joined #git
03:20 drodger joined #git
03:21 trista___ joined #git
03:23 Peng dmod_: Wrong channel?
03:24 dmod_ Git-scm for win used to have ssh in the path. now it doesn't
03:24 BenderRodriguez joined #git
03:24 tristanp joined #git
03:25 livingstn joined #git
03:27 dmod_ that is what im wondering Peng
03:27 ochorocho__ joined #git
03:29 david007 joined #git
03:29 L8D joined #git
03:30 T4nkAbb0t joined #git
03:34 eletuchy joined #git
03:36 bjpenn joined #git
03:37 jaequery joined #git
03:42 dreiss joined #git
03:53 L8D joined #git
03:54 mizu_no_oto joined #git
03:54 Aboba joined #git
03:57 skunkz joined #git
03:58 interne7y joined #git
04:00 clemf joined #git
04:00 tristanp_ joined #git
04:03 justanotheruser joined #git
04:04 tristanp joined #git
04:05 diosmiux joined #git
04:08 prsn joined #git
04:08 tristanp joined #git
04:13 boudiccas joined #git
04:17 Shentino2 joined #git
04:19 phaleth joined #git
04:20 whomp joined #git
04:20 rkazak joined #git
04:24 akushner joined #git
04:24 tax joined #git
04:24 clemf joined #git
04:25 tristanp_ joined #git
04:25 maestrojed joined #git
04:27 drodger joined #git
04:28 eletuchy joined #git
04:29 mehola joined #git
04:29 fuchstronaut joined #git
04:31 PaulCapestany joined #git
04:34 Cabanossi joined #git
04:35 liuzhen joined #git
04:38 dsdeiz_ joined #git
04:39 cagedwisdom joined #git
04:43 ajf- joined #git
04:46 harish joined #git
04:46 diogenese joined #git
04:49 dshap joined #git
04:51 axion left #git
04:51 xall joined #git
04:51 dshap Hey all, I'm super confused about the state of my repo and was hoping someone might be able to guess what could have happened...it seems like a bunch of changes from my "develop" branch are now in my "master" branch, and i see a commit from someone that looks like a merge commit, but when i compare master...develop I see the individual commits that originally contributed those changes i.e. those commits are not in master. How could this be?
04:52 k3rn31 joined #git
04:52 dshap we're definitely not doing anything like squashing or advanced modification of history here
04:53 Guest69671 joined #git
04:53 dopesong joined #git
04:53 tristanp joined #git
04:57 waveclaw joined #git
04:58 bjpenn joined #git
04:59 fracting joined #git
04:59 tristanp_ joined #git
04:59 dreiss joined #git
04:59 mehola joined #git
05:03 tristanp joined #git
05:08 howdoi is there a post pull hook?
05:09 wagle joined #git
05:12 milki howdoi: there is a post-checkout i believe
05:13 hahuang65 joined #git
05:13 howdoi milki: no, actually I am trying to check if pull changed and a file and run a script based on it, so pull is all I need?
05:19 muthu joined #git
05:19 rkazak joined #git
05:20 nobso joined #git
05:22 kami joined #git
05:24 fracting joined #git
05:25 lalilulelo joined #git
05:28 ochorocho__ joined #git
05:29 L8D joined #git
05:29 tristanp_ joined #git
05:30 artemisart joined #git
05:32 SwiftMatt joined #git
05:32 tristanp joined #git
05:35 tristanp_ joined #git
05:36 livingstn joined #git
05:38 tristanp joined #git
05:40 barteks2x joined #git
05:45 drodger joined #git
05:48 david007 joined #git
05:49 rainbyte joined #git
05:49 nobso Hi all.
05:50 nobso why am i getting ‘denied to deploy key
05:50 nobso fatal: Could not read from remote repository.
05:50 nobso Please make sure you have the correct access rights
05:50 nobso and the repository exists.’ error while pushing?
05:50 nobso ssh -T git@github.com                                                                                                                                                                            128 ↵
05:50 nobso Hi [username]! You've successfully authenticated, but GitHub does not provide shell access.
05:50 dsdeiz_ joined #git
05:51 dsdeiz_ left #git
05:51 sauvin joined #git
05:51 dsdeiz joined #git
05:52 livingstn joined #git
05:53 justanotheruser joined #git
05:53 diosmiux joined #git
05:55 whomp joined #git
05:58 skunkz joined #git
05:58 interne7y joined #git
06:01 tristanp_ joined #git
06:01 cmosguy how do i sync my local setup to someone elses PR?
06:01 livingstn joined #git
06:02 cmosguy here is the link to someone's PR: https://github.com/firebase/firechat/pull/60/commits how do I sync my work area to this?
06:02 ajf- joined #git
06:06 tristanp joined #git
06:10 whomp joined #git
06:13 MattMaker joined #git
06:14 fscala joined #git
06:14 Seveas cmosguy: what do you mean with 'sync'? Do you basically want to check out the head of that branch?
06:15 OnBrokenWings joined #git
06:16 cmosguy Seveas: i am trying to utilize a project in someone elses repo (firebase/firechat)
06:17 cmosguy i basically want to checkout that branch into my local area on my machine
06:17 cmosguy Seveas: do I need to fork it first? then do a merge on the pull request?
06:17 cmosguy Seveas: basically i am trying to understand how to get that pull requests stuff into my local area
06:18 Seveas if you have a clone of that repo, you can just fetch the PR: git fetch origin refs/pulls/60/HEAD temp_branch_for_pr_60
06:19 Seveas and then you can treat temp_branch_for_pr_60 as any other branch
06:20 cmosguy i got
06:20 cmosguy fatal: Couldn't find remote ref refs/pulls/60/HEAD
06:21 Seveas hmm, let me spell that correctly then :)
06:21 cmosguy Seveas: the docs says something like: git fetch origin pull/ID/head:BRANCHNAME
06:21 Seveas git fetch origin refs/pulls/60/head:temp_branch_for_pr_60
06:21 Seveas so yeah, what the docs say
06:21 Seveas pull, not pulls
06:22 Seveas In my defence, I'm barely awake :)
06:22 cmosguy Seveas: ok so is there a difference between "ref refs****"?
06:22 cmosguy and origin pul//ID......
06:23 Seveas alls refs (branches, tags, pull requests, remote tracking branches) live under refs
06:23 Seveas but most commands will prepend refs/ automatically if they expect a ref name
06:23 L8D joined #git
06:23 Seveas e.g. 'git branch foo' will turn 'foo' into 'refs/heads/foo' where needed
06:23 cmosguy i did: git fetch origin pull/60/HEAD firebase-3.0.0
06:23 tvw joined #git
06:24 cmosguy fatal: Couldn't find remote ref pull/60/HEAD
06:24 Seveas lowercase head, and : instead of space between remote and local ref
06:25 cmosguy hmm....
06:25 cmosguy not working
06:25 cmosguy $ git fetch origin refs/pull/60/head firebase-3.0.0
06:25 cmosguy fatal: Couldn't find remote ref firebase-3.0.0
06:25 elsevero joined #git
06:25 Seveas : instad of space between head and firebase
06:26 Seveas fetch takes a refspec as argument, not two refs
06:26 fracting joined #git
06:26 Seveas a refspec is a remote and local ref, separated by a colon
06:26 cmosguy ohhh
06:26 Seveas e.g. refs/pull/60/head:firebase-3 maps the remote ref refs/pull/60/head to the local branch (refs/heads is automatically prepended) firebase-3.0.0
06:27 cmosguy sweet!
06:27 cmosguy this is great!
06:27 cmosguy thhanks!
06:30 fuchstronaut joined #git
06:30 Miguel_RF joined #git
06:33 diosmiux joined #git
06:36 neanderslob joined #git
06:41 moobee joined #git
06:41 xall joined #git
06:46 neanderslob joined #git
06:46 eletuchy joined #git
06:46 t0by joined #git
06:47 daidoji joined #git
06:47 SimonNa joined #git
06:48 dsdeiz joined #git
06:48 tristanp joined #git
06:49 dsdeiz joined #git
06:50 User458764 joined #git
06:50 dsdeiz joined #git
06:50 dsdeiz joined #git
06:50 User458764 joined #git
06:51 Fijit joined #git
06:51 ajf- joined #git
06:53 SteffanW joined #git
06:56 apprentice joined #git
06:57 eijk_ joined #git
07:01 linuxmint joined #git
07:02 PCatinean joined #git
07:05 wrouesnel1 joined #git
07:05 LeMike joined #git
07:06 tristanp_ joined #git
07:10 ceaucari joined #git
07:10 p joined #git
07:13 afuentes joined #git
07:17 L8D joined #git
07:18 Paddy joined #git
07:19 bjpenn joined #git
07:19 hahuang65 joined #git
07:19 pol123456 joined #git
07:20 fracting joined #git
07:21 tristanp joined #git
07:22 blackwind_123 joined #git
07:22 BombStrike joined #git
07:32 tristanp joined #git
07:34 liuzhen joined #git
07:39 drodger joined #git
07:42 elsevero joined #git
07:43 kg6hum joined #git
07:43 emPi joined #git
07:44 lindenle joined #git
07:46 mehola joined #git
07:48 Miguel_RF Buenos dias desde españa
07:48 Miguel_RF Conoceis algun sitio donde haya una explicacion sencilla de comoinstalar y configurar git
07:48 Miguel_RF tanto los repositorios en una maquina Centos
07:48 Miguel_RF como el cliente en una maquina windows
07:48 tristanp_ joined #git
07:50 jagob joined #git
07:50 trista___ joined #git
07:53 tristanp joined #git
07:54 robotroll joined #git
07:54 pantsman- joined #git
07:55 nnyk_ joined #git
07:59 paul424 joined #git
07:59 skunkz joined #git
07:59 interne7y joined #git
07:59 nitin joined #git
08:00 DolphinDream joined #git
08:03 r3c0d3x joined #git
08:03 dopesong joined #git
08:05 tristanp_ joined #git
08:05 elsevero joined #git
08:06 shinnya joined #git
08:07 Kicer86 joined #git
08:08 tristanp joined #git
08:09 Sendoushi joined #git
08:09 netj joined #git
08:10 drodger joined #git
08:11 L8D joined #git
08:14 LeMike joined #git
08:19 ramsub07 joined #git
08:22 milki i see spanish
08:22 milki lesse
08:22 milki good day something spain
08:23 milki uh
08:23 milki tell me how to install and configure git?
08:23 ayushshah joined #git
08:23 milki all the repos something centos
08:23 milki and the client is windows?
08:24 tristanp_ joined #git
08:25 glebihan joined #git
08:30 dsdeiz joined #git
08:30 dsdeiz joined #git
08:31 fuchstronaut joined #git
08:32 fracting joined #git
08:32 tristanp joined #git
08:33 diosmiux joined #git
08:34 dopesong joined #git
08:35 toothe joined #git
08:35 toothe I have been working on some code for a few hours. Its not done, but I don't want to lose it. Should I commit it?
08:35 toothe I'm concerned that if I commit it, it'll be an incomplete commit
08:40 subhojit777 joined #git
08:42 milki toothe: you can always fix the commit later
08:42 toothe you know, i've had immense trouble with that.
08:42 milki toothe: better to be safe and commit than to lose all your work
08:42 milki toothe: you'll get used to it
08:45 artemisart joined #git
08:46 tristanp_ joined #git
08:47 a_thakur joined #git
08:48 trista___ joined #git
08:48 Havvy toothe:  Commit to a feature branch.
08:53 durham joined #git
08:56 pedro4 joined #git
09:03 harish joined #git
09:04 tristanp joined #git
09:04 Sendoushi joined #git
09:05 toogley joined #git
09:05 L8D joined #git
09:05 User458764 joined #git
09:07 tristanp_ joined #git
09:10 zincrokx joined #git
09:10 fracting joined #git
09:20 tristanp_ joined #git
09:20 satifant joined #git
09:20 hahuang65 joined #git
09:23 Corosus joined #git
09:23 dsdeiz joined #git
09:23 dsdeiz joined #git
09:24 WayToDoor joined #git
09:28 diosmiux joined #git
09:28 drodger joined #git
09:28 Jackneill joined #git
09:29 ochorocho__ joined #git
09:31 heroux joined #git
09:31 harish_ joined #git
09:31 trista___ joined #git
09:35 dopesong joined #git
09:36 drodger joined #git
09:36 rahtgaz joined #git
09:36 mda1 joined #git
09:36 Sendoushi joined #git
09:37 diosmiux joined #git
09:45 dsdeiz joined #git
09:45 zarel joined #git
09:46 drodger joined #git
09:49 tristanp joined #git
09:50 MutantMahesh joined #git
09:54 bcc joined #git
09:54 circ-user-EiykY joined #git
09:56 drodger joined #git
09:56 eletuchy joined #git
09:59 liuzhen joined #git
09:59 L8D joined #git
10:00 skunkz joined #git
10:00 tristanp_ joined #git
10:00 interne7y joined #git
10:02 tristanp joined #git
10:03 ki0 joined #git
10:03 radsy joined #git
10:05 drodger joined #git
10:06 tinajohnson___ joined #git
10:08 bcc joined #git
10:09 ahmedelgabri joined #git
10:09 tristanp joined #git
10:10 King_Hual joined #git
10:11 LeMike joined #git
10:12 GavinMagnus joined #git
10:13 GavinMagnus left #git
10:13 nwkj86 joined #git
10:15 drodger joined #git
10:16 MDRXB95AP joined #git
10:17 ArchNoob joined #git
10:18 uwijpy joined #git
10:19 tristanp joined #git
10:20 cdown joined #git
10:23 MutantMahesh joined #git
10:23 mase-tech joined #git
10:26 drodger joined #git
10:26 fscala joined #git
10:31 bfvyrx joined #git
10:32 fuchstronaut joined #git
10:36 mda1 joined #git
10:36 tristanp_ joined #git
10:39 drodger joined #git
10:40 espindola joined #git
10:50 stfn joined #git
10:51 Dufflepod joined #git
10:53 drodger joined #git
10:53 Dufflepod Doing a bare clone, do I have to clone the whole repo locally, or can I specify a specific folder in the repo I want to grab. I can't seem to figure out the cmd line syntax.
10:54 L8D joined #git
10:54 grawity clones *always* download the whole repo
10:54 grawity if it's too large, you can trim down the old history using --depth, but you cannot pick specific subfolders
10:55 Dufflepod Ah well - thanks for the info
10:55 ahmed_elgabri joined #git
10:57 k3rn31 joined #git
10:58 jimmyeatworld joined #git
10:59 drodger joined #git
11:00 _rnsanchez_ joined #git
11:01 interne7y joined #git
11:01 tristanp joined #git
11:04 mathaus joined #git
11:04 drodger joined #git
11:05 ceaucari joined #git
11:06 User458764 joined #git
11:07 roflin joined #git
11:10 tristanp_ joined #git
11:13 tristanp joined #git
11:13 drodger joined #git
11:16 isxek joined #git
11:17 ChoHag joined #git
11:17 mdw joined #git
11:18 ChoHag I'm trying to fetch from https://git.gitorious.org/; openssl successfully verifies the server certificate, curl successfully verifies the server certificate, git does not.
11:20 ChoHag Specifically, with GIT_CURL_VERBOSE set: * server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none
11:20 isxek joined #git
11:21 grawity ChoHag: what's the *full* output you get from that?
11:21 isxek joined #git
11:21 ChoHag http://fpaste.scsys.co.uk/519483
11:22 hahuang65 joined #git
11:22 Mavericks joined #git
11:23 tristanp_ joined #git
11:23 grawity looks a bit old
11:23 grawity you say a direct `curl -v https://git.gitorious.org/` works fine?
11:23 ernest joined #git
11:24 ChoHag Yes.
11:24 nettoweb joined #git
11:24 ChoHag "SSL certificate verify ok." just prior to a complete HTTP transaction.
11:24 tristanp joined #git
11:24 ChoHag Do you want its full output?
11:26 SimonK joined #git
11:26 grawity can you instead run `ldd` on both the 'curl' and 'git-remote-https' programs, and check if they're using the same libcurl and libssl, etc.?
11:27 cdown joined #git
11:27 grawity (you can use `strace -fe execve git ls-remote https://whatever` to find the real git-remote-https)
11:28 ChoHag I just looked at that.
11:28 ChoHag Git's is using libcurl-gnutls.
11:29 ChoHag curl is using plain old libcurl which is linked against libssl.
11:29 grawity ok, and does /etc/ssl/certs/ca-certificates.crt actually exist?
11:29 ChoHag Any idea what gnutls' equivalent is of openssl s_client -connect?
11:29 grawity gnutls-cli
11:30 grawity (the difference is, OpenSSL can use either a CAfile *or* a CAdir, while GnuTLS only supports the former – so make sure it's properly generated)
11:30 drodger joined #git
11:30 ochorocho__ joined #git
11:31 SimonK joined #git
11:31 ChoHag It does and one of the 172 certificates it contains is probably the right one.
11:31 grawity I'd say re-run `update-ca-certificates` or `update-ca-trust` just in case
11:33 SimonK joined #git
11:34 ChoHag No difference.
11:34 ChoHag http://fpaste.scsys.co.uk/519484
11:34 tristanp_ joined #git
11:35 grawity which version of GnuTLS is that, by the way?
11:36 ChoHag gnutls-cli (GnuTLS) 2.12.20
11:36 ChoHag Packaged by Debian (2.12.20-8+deb7u5)
11:37 |meta joined #git
11:37 grawity wheezy?
11:37 grawity ugh their version numbers https://packages.debian.org/wheezy/gnutls-bin
11:38 ChoHag I gave up on Debian when they went full retard^W^Wto systemd.
11:38 grawity I'll pass on that
11:38 ChoHag My main workhorse is too important to switch to an OS I'm unfamiliar with though.
11:39 _ikke_ There is nothing wrong with systemd :-)
11:41 ChoHag Hi I see you're new to this universe. When did the year of the linux desktop happen in yours?
11:41 grawity I for one welcome our new systemd overlords
11:41 _ikke_ ChoHag: Ages ago
11:42 ChoHag Sod it I think I'll just install my own git in ~
11:43 _ikke_ Running Archlinux for years
11:43 osse ooOOOo
11:43 * osse pops popcorn
11:43 osse dis gonna be gud
11:44 tristanp joined #git
11:44 ChoHag Bloody hell so much stuff depends on gnutls.
11:45 sdothum joined #git
11:46 lindenle joined #git
11:47 shinnya joined #git
11:47 ChoHag Ironically I uncovered this problem a few yaks down after resuming the process of fully switching to openbsd.
11:48 L8D joined #git
11:48 osse ChoHag: in case you haven't compiled git before:  There is no ./configure. You do make prefix=whatever, and you must pass it when running make install too
11:49 User458764 joined #git
11:50 m0viefreak joined #git
11:50 Sadeukko joined #git
11:51 tristanp_ joined #git
11:51 ChoHag Thanks, although it says that in the documentation.
11:52 ChoHag I know reading documentation isn't fashionable these days but I'm old.
11:52 FoRTu joined #git
11:53 tristanp joined #git
11:54 FoRTu left #git
11:54 ArchNoob joined #git
11:55 MutantMahesh joined #git
11:56 ojdo joined #git
11:57 mehola joined #git
11:59 fstd joined #git
12:00 skunkz joined #git
12:01 ochorocho__ joined #git
12:02 interne7y joined #git
12:02 tristanp_ joined #git
12:04 tristanp joined #git
12:10 ahmedelgabri joined #git
12:12 jeffreylevesque joined #git
12:14 ki0 joined #git
12:15 drodger joined #git
12:15 acetakwas joined #git
12:15 cdown_ joined #git
12:15 Sendoushi joined #git
12:15 tristanp_ joined #git
12:15 JanC_ joined #git
12:20 drodger joined #git
12:20 jost__ joined #git
12:22 sq-one joined #git
12:22 ramsub07 joined #git
12:22 rnsanchez_ joined #git
12:23 mda1 joined #git
12:25 espindola joined #git
12:25 synthmeat joined #git
12:29 ajf- joined #git
12:32 drodger joined #git
12:32 weckl joined #git
12:32 fuchstronaut joined #git
12:32 tristanp joined #git
12:34 thiago joined #git
12:35 ernest left #git
12:38 LeMike joined #git
12:39 SaraDR joined #git
12:40 SaraDR Any drawback to adding .gitignore with simply "#" to folders, to sourcecontrol them, as empty folders?
12:41 _ikke_ Even an empty file would suffice
12:41 BlessJah SaraDR: sometimes empty .gitkeep file is used for that purpose
12:42 L8D joined #git
12:42 SaraDR Gitkeep? Never heard of that, I will google it. Just wanted to make sure I wasn't accidently tripping myself over down the line by doing it this way.
12:42 BlessJah no need to google, it's just a file with no special meaning to git
12:43 lucz joined #git
12:43 lucz joined #git
12:43 BlessJah user noticing .gitignore file may wonder if any files are ignored in that part of tree, to avoid such confusion you can use different name
12:43 OrbsTheorem joined #git
12:44 SaraDR Yeah read that on a stackoverflow.
12:44 SaraDR I'll do that then. Thank you BlessJah & _ikke_
12:44 BlessJah no problem
12:45 jaguarmagenta joined #git
12:48 tristanp_ joined #git
12:49 Gamecubic joined #git
12:52 thiago joined #git
12:57 harish_ joined #git
12:57 digidog joined #git
12:58 PCatinean joined #git
12:59 cbreak SaraDR: you could also fix your build system or program to create the directories it requires :)
13:01 SaraDR My make files do, but I still like them to show up in the git :)
13:01 a_thakur joined #git
13:02 tristanp joined #git
13:03 thiago then create a file inside those dirs
13:03 interne7y joined #git
13:03 _ikke_ thiago: That's what has been proposed already
13:03 john-soda joined #git
13:04 nilsi joined #git
13:04 osse _ikke_: I prefer "oooold"
13:04 harish_ joined #git
13:05 drodger joined #git
13:09 OrbsTheorem Hello, I was wondering if there's any way to show an old version of a file but without the patch view
13:09 OrbsTheorem just the raw file
13:09 thiago git show
13:09 OrbsTheorem without checkout (I'm currently merging such file)
13:09 thiago git show revname:filename
13:10 OrbsTheorem git show gives me a diff view of the file
13:10 OrbsTheorem oh, I just realized the ':' actually do something else
13:10 OrbsTheorem thanks
13:10 drodger joined #git
13:10 tristanp joined #git
13:15 mehola joined #git
13:16 drodger joined #git
13:16 _rnsanchez_ joined #git
13:17 ahmedelgabri joined #git
13:20 tristanp_ joined #git
13:21 drodger joined #git
13:21 harish_ joined #git
13:21 cyan__ joined #git
13:22 acetakwas joined #git
13:22 User458764 joined #git
13:23 hahuang65 joined #git
13:24 SwiftMatt joined #git
13:25 nnyk_ joined #git
13:25 robotroll joined #git
13:25 tristanp joined #git
13:26 compeman joined #git
13:28 ajf- joined #git
13:32 kam270 joined #git
13:32 drodger joined #git
13:33 kam270 joined #git
13:33 kam270 joined #git
13:34 tristanp_ joined #git
13:35 harish_ joined #git
13:35 ggherdov Hello. I am about to make a commit where I have to duplicate (copy) a tracked file foo, and the new copy will be called bar. Do I need to tell git about this, or can I just `cp foo bar && git add bar` ? I mean, is there a Right Way to do this?
13:36 L8D joined #git
13:36 i7c You mean the fact that two files will have the exact same content?
13:36 i7c You don't have to tell git. It'll figure it out alone anyways.
13:36 _ikke_ ggherdov: git will figure it out
13:36 ggherdov i7c: yes, to preserve this fact in the history. _ikke_ ok
13:39 _ikke_ git does not keep a record of this, but it can figure it out if you ask it
13:40 denisMone joined #git
13:41 drodger joined #git
13:41 lastcow joined #git
13:43 blackwind_123 joined #git
13:43 dshap joined #git
13:44 MattMaker joined #git
13:44 tristanp joined #git
13:45 gaen joined #git
13:45 User458764 joined #git
13:48 ayushshah left #git
13:49 elbrvm joined #git
13:51 JFS joined #git
13:51 happy-dude joined #git
13:51 tgunr joined #git
13:54 nick123 joined #git
13:56 t0by joined #git
13:57 fracting joined #git
13:57 ArchNoob joined #git
14:00 fracting joined #git
14:01 MattMaker joined #git
14:01 drodger joined #git
14:02 franl joined #git
14:03 franl left #git
14:03 fracting joined #git
14:04 interne7y joined #git
14:05 linuxmint joined #git
14:08 artemisart joined #git
14:11 drodger joined #git
14:12 SaraDR left #git
14:13 tristanp_ joined #git
14:15 mehola joined #git
14:16 drodger joined #git
14:17 ShapeShifter499 joined #git
14:18 fahadash joined #git
14:19 ahmedelgabri joined #git
14:20 bitkiller joined #git
14:21 dreiss joined #git
14:21 madewokherd joined #git
14:22 espindola joined #git
14:23 nnyk_ joined #git
14:27 cyan__ joined #git
14:28 tristanp joined #git
14:30 L8D joined #git
14:32 drodger joined #git
14:33 samsonizzle joined #git
14:33 fuchstronaut joined #git
14:33 archer121 joined #git
14:34 archer121 Hi, I have a local git repo, and I want to upload it to github. How do I do this?
14:34 k-man joined #git
14:35 _ikke_ Do you already have a github project?
14:35 dopesong joined #git
14:40 sangy joined #git
14:40 fscala joined #git
14:41 khmarbaise joined #git
14:44 joki joined #git
14:46 john-soda joined #git
14:48 liquidjamm joined #git
14:53 NeverDie joined #git
14:59 MDRXB95AP joined #git
14:59 CheckDavid joined #git
14:59 bjpenn joined #git
15:00 gaen joined #git
15:05 interne7y joined #git
15:07 harish_ joined #git
15:08 drodger joined #git
15:10 mdw joined #git
15:13 rgrinberg joined #git
15:13 diogenese joined #git
15:14 harish_ joined #git
15:14 drodger joined #git
15:15 GavinMagnus joined #git
15:16 rahtgaz joined #git
15:21 ahmedelgabri joined #git
15:21 knutstrut joined #git
15:24 hahuang65 joined #git
15:24 L8D joined #git
15:24 maestrojed joined #git
15:25 MadHatter42 joined #git
15:29 SwiftMatt joined #git
15:30 drodger joined #git
15:34 nwkj86 joined #git
15:34 GavinMagnus left #git
15:35 drodger joined #git
15:36 User458764 joined #git
15:37 tristanp joined #git
15:37 netj joined #git
15:37 nnyk_ joined #git
15:41 L8D joined #git
15:42 drodger joined #git
15:43 khmarbaise_ joined #git
15:45 Grimm_ joined #git
15:46 xaptao joined #git
15:49 L8D joined #git
15:49 drodger joined #git
15:49 diogenese joined #git
15:49 paddor joined #git
15:50 tristanp joined #git
15:51 OrbsTheorem left #git
15:52 eijk_ joined #git
15:53 paddor Hi! I'm writing a script to analyze performance differences of an application over time (e.g. over a range of commits). After checking out each commit with "git checkout ...", I wanna restore the previous state. Unfortunately, doing "git checkout HEAD@{1}" keeps Git in a detached state. What's the solution?
15:53 netj joined #git
15:54 osse paddor: git checkout branchname
15:55 tristanp joined #git
15:56 paddor osse: Thanks, but that would restore it to that branch's tip. I'd like to restore it to whatever commit or tip it was before.
15:56 drodger joined #git
15:56 xall joined #git
15:56 ojacobson you can't have both
15:56 ojacobson if you check out a branch you are necessarily on the tip of it
15:56 paddor okay, thanks
15:56 ojacobson if you check out a non-tip commit you are necessarily detached from any branch
15:57 grawity you can actually check out HEAD@{-1}, I think
15:57 netj joined #git
15:57 grawity which will try to re-attach you to a branch
15:57 paddor grawity: doesn't look like it. :(
15:58 Rooxo joined #git
15:58 tvw joined #git
15:59 ojacobson hmm, is there a good generic ref-copying mechanism
15:59 ojacobson or do you have to special-case symbolic refs manually
15:59 therooxo joined #git
15:59 ojacobson in any case if you want to make this really reliable, create a ref that's a copy of HEAD and restore HEAD from it at the end of your script
16:00 osse paddor: HEAD *is* whatever was before, by definition
16:00 ojacobson man git-symbolic-ref, man git-update-ref
16:00 gitinfo the git-symbolic-ref manpage is available at http://jk.gs/git-symbolic-ref.html
16:00 gitinfo the git-update-ref manpage is available at http://jk.gs/git-update-ref.html
16:00 ojacobson (you'll need to figure out what state you want the work tree and index to end up in, too - it may be easier to use git stash for those though)
16:00 osse paddor: you mean to whatever was at the time the user started the script? You have to store that at the start and then restore to that
16:01 paddor osse: yeah, that'd be nice.
16:02 paddor osse: I guess i'll just read the current branch name (if detached) and check that out at the end of the script.
16:02 skunkz joined #git
16:02 drodger joined #git
16:03 paddor okay then, how to get the name of the current branch in a script-friendly way?
16:04 paddor Is this a good idea? git branch|grep '^*'|cut -d" " -f2
16:05 osse paddor: git symbolic-ref HEAD
16:05 grawity git symbolic-ref HEAD
16:05 marked joined #git
16:05 grawity cut off initial refs/heads/ if present
16:05 paddor ah perfect, thanks!
16:05 interne7y joined #git
16:06 DonRichie joined #git
16:06 subhojit777 joined #git
16:06 Sendoushi joined #git
16:07 mellernoia joined #git
16:08 DonRichie joined #git
16:09 InfoTest joined #git
16:09 dermoth joined #git
16:10 Rooxo joined #git
16:12 paddor By the way, is there any better way to get git-rev-list --bisect-all's output sorted by author date? --date-order is ignored with --bisect-all. :( I'm doing this now: git rev-list --bisect-all --pretty=format:"%H %at" commits... | grep -v '^commit ' | sort -nk2
16:13 paddor Also, passing --pretty=format:... to git-rev-list still makes it print its normal lines, in addition to the formatted lines. Isn't that a bug?
16:13 kadoban joined #git
16:14 osse paddor: if you want a different ordering then you probably want to not use --bisect-all
16:15 osse --date-order
16:15 dreiss joined #git
16:15 lindenle joined #git
16:15 rkazak joined #git
16:16 unbalancedparen joined #git
16:17 paddor osse: I want to use --bisect-all together with --max-count=N to be able to select a subset of a commits so I can interpolate the performance measurement results and save build time.
16:17 drodger joined #git
16:17 mehola joined #git
16:18 osse paddor: the point of --bisect-all is to reorder the commits. but you seem to want a different order
16:19 paddor osse: I see. No big deal. I'll sort it by unix timestamp
16:19 osse ahh, it makes a difference when you add the max-count
16:19 osse maybe you stull want --date-order though
16:19 paddor osse: sorted by timestamp, of course, is useful to get it back into a CSV-useful order
16:20 livingstn joined #git
16:20 paddor osse: pretty sure --date-order is ignored with --bisect-all
16:20 osse that would make sense
16:20 osse they conflict
16:20 paddor osse: No big deal.
16:20 paddor But what about the --pretty=format:... issue?
16:22 osse I don't know
16:22 osse try git log
16:22 osse hah, it doesn't know bisect-all
16:22 paddor yeah :(
16:22 mdw joined #git
16:22 paddor I mean, isn't it a bug? I specify a format and it keeps printing its normal lines in addition to the formatted lines.
16:22 ahmedelgabri joined #git
16:23 osse I dunno
16:23 osse I think it's weird it accepts --pretty to begin with
16:23 osse it's meant to be a lower level tool
16:23 paddor you still wanna be able to add more fields to its output
16:24 fracting joined #git
16:24 osse I do?
16:25 paddor not you you. like... the user
16:26 osse hmm
16:26 osse it doesn
16:26 osse it doesn't have that behaviour when you do --pretty=full
16:26 paddor Even weirder
16:26 SwiftMatt joined #git
16:27 osse I'm starting to think it's on purpose, but I don't understand the purpose
16:29 paddor :D
16:29 paddor it's not a big deal either. | grep -v '^commit '       hehe
16:30 osse it strikes me that the extra line 'commit ...' is identical to the line you see with a plain git-log or with revlist --pretty=full
16:30 osse (full is log's default)
16:30 josuebrunel joined #git
16:31 ki0 joined #git
16:33 osse paddor: can you try this for teh lulz:  git rev-list --bisect-all commits... | git rev-list --stdin --date-order --no-walk
16:33 osse the idea is that the second one should just order the ones it gets on stdin
16:33 osse not sure if it works as (I) intended
16:34 Tashi joined #git
16:34 espindola joined #git
16:34 fuchstronaut joined #git
16:35 drodger joined #git
16:35 Tashi left #git
16:36 nu11_byte joined #git
16:36 dopesong joined #git
16:37 tristanp joined #git
16:37 WayToDoor joined #git
16:41 flavius joined #git
16:41 tristanp joined #git
16:42 paddor osse: unfortunately not, because the --bisect-all output is like "<commit> (dist=N)"
16:42 paddor osse: thanks though
16:42 Ahmed90 joined #git
16:48 rkazak joined #git
16:50 Psychiatrist joined #git
16:53 ncd|leeN joined #git
16:54 nnyk_ joined #git
16:55 mase-tech joined #git
16:57 qpdb joined #git
16:58 nitin joined #git
16:59 bjpenn joined #git
17:04 mykespb joined #git
17:05 ahmedelgabri joined #git
17:05 tristanp_ joined #git
17:06 interne7y joined #git
17:07 hahuang65 joined #git
17:11 tristanp joined #git
17:13 dreiss joined #git
17:13 nettoweb joined #git
17:13 SteffanW joined #git
17:14 knutstrut I have never done this, but is it reasonable to use git for an artwork in the format of an image, perhaps png.
17:15 knutstrut ?
17:15 ojacobson It'll store it and version it just fine, but png isn't merge-friendly so the branching and merging features of git will be of limited value
17:15 ojacobson images also tend to be hard to compress, so expect your repo to balloon
17:16 knutstrut hmm, do you know if there are any better alternatives?
17:16 knutstrut Or perhaps a better image format, that works more favorably with git?
17:18 User458764 joined #git
17:19 knutstrut oh, well, better just save and order them by name with notation for branches.
17:19 unbalancedparen joined #git
17:19 boudiccas joined #git
17:19 kadoban knutstrut: It works pretty okay as long as you understand the limitations, and it depends on what expectations you have. There's probably not really a much better image format, the problems are more fundamental than specific.
17:20 kadoban I version assets for websites all the time, and it's fine. But they don't change much, and they don't tend to change in a branching manner.
17:22 sctskw joined #git
17:25 clemf joined #git
17:26 Sendoushi joined #git
17:26 boudicca joined #git
17:28 sLite joined #git
17:32 nwkj86 joined #git
17:32 tristanp_ joined #git
17:35 sLite joined #git
17:35 drodger joined #git
17:35 mdw joined #git
17:36 boudiccas joined #git
17:37 fahadash joined #git
17:37 paul424 joined #git
17:38 tristanp joined #git
17:42 phaleth joined #git
17:43 paul424 joined #git
17:43 boudicca joined #git
17:44 irco joined #git
17:52 |meta joined #git
17:53 ahmedelgabri joined #git
17:53 nilg joined #git
17:54 sctskw joined #git
17:54 ki0 joined #git
17:55 Grimm_ joined #git
17:59 jaguarmagenta joined #git
18:03 skunkz joined #git
18:04 tristanp_ joined #git
18:07 tristanp joined #git
18:07 interne7y joined #git
18:09 mylord joined #git
18:12 tristanp_ joined #git
18:12 prsn joined #git
18:15 mablae joined #git
18:18 astrofog joined #git
18:18 neniuseksemo joined #git
18:19 neniuseksemo If I'm adding a line identical to another line close to it, is there a way to tell git which one is the new one?
18:20 neniuseksemo I.e., I want to have git see the first `parser.add_argument(` as the addition: http://imgur.com/pwyl7Vq
18:20 zeroed joined #git
18:20 zeroed joined #git
18:21 osse neniuseksemo: under the hood, git doesn't care. but maybe diff --patience or diff --histogram makes a difference
18:22 jason237 joined #git
18:24 neniuseksemo osse: Those changed nothing, but it doesn't make any practical difference.
18:24 neniuseksemo So I'll just leave it as it is, thanks :)
18:24 Domhack joined #git
18:25 osse neniuseksemo: even if you "fix" it, some other guy looking at the diff a year from now might see it this way
18:26 sagerdearia joined #git
18:26 piling joined #git
18:26 diegoviola joined #git
18:28 dreiss joined #git
18:28 neniuseksemo Yeah, exactly... and any reasonable person would look at it, be confused for a second, and then see the second parser line above it.
18:31 neniuseksemo I could always have changed the way I laid out all the arguments, then added a new one, but that'd be silly in the end
18:31 neniuseksemo Only because of how my folds are set up in vim tho
18:32 osse i sometimes am tempted to make extra deep 'return;s' or weird stuff like that in order to make the diff look "clean"
18:33 osse but in the end I prefer the new code to look clean. if the diff is noisy then so be it
18:34 multi_io joined #git
18:34 neniuseksemo I wonder if it would be possible to add to git a manual diff override
18:35 neniuseksemo like for one specific commit
18:35 bjpenn joined #git
18:35 elementalest joined #git
18:35 elementalest joined #git
18:35 osse how would that work? :O
18:38 dopesong joined #git
18:41 neniuseksemo Like, if there's a possibility of confusion in the diff, you'd get a diff conflict and you tell git (in some sort of text file) which line is new
18:41 neniuseksemo and it keeps that in the git project history forever, so whenever anyone diffs something that goes over that particular change, git fetches that text file and takes it into account
18:41 neniuseksemo I dunno, it's a weird idea.
18:45 Gianormagantrous joined #git
18:45 Gianormagantrous joined #git
18:46 tristanp joined #git
18:48 DarthCloakedGuy joined #git
18:48 DarthCloakedGuy Hello everyone. Does anyone in here use Git Bash?
18:49 spudowiar joined #git
18:49 ojacobson There are people here who use Git Bash.
18:49 ojacobson Hope that helps!
18:49 zeroed joined #git
18:49 tristanp_ joined #git
18:50 User458764 joined #git
18:52 tristanp joined #git
18:53 fscala joined #git
18:53 DarthCloakedGuy Well, I'm currently trying to use it, but I am currently rather frustrated by the... uh... quirks of its interface. Specifically, it's trying to get me to type a commit message. So I did that, and hit Enter... but instead of accepting my message, it just added a new line
18:54 DarthCloakedGuy Since it's a horrifyingly primitive DOS-esque interface, I'm very concerned by the fact that the Enter key is not doing what the Enter key is supposed to do.
18:54 osse DarthCloakedGuy: Mismatch of quote characters
18:54 DarthCloakedGuy What does that mean, osse?
18:54 osse DarthCloakedGuy: alternative: Don't give -m 'message' and use an editor to write it. Usually much more comfortable
18:54 osse DarthCloakedGuy: My guess is you did git commit -m 'Here's an apostrophe'
18:54 DarthCloakedGuy No
18:55 DarthCloakedGuy I just did "git commit"
18:55 osse oh, now you're in the editor
18:55 DarthCloakedGuy And now I'm in this screen where it wants me to enter a commit message, but won't accept my message
18:55 osse press Esc, then :wq then Enter
18:56 DarthCloakedGuy This is possibly the worst-designed interface I have ever used.
18:56 osse after that, do  git config --global core.editor '/c/Program Files/EditorYouKnowWell/editor.exe'
18:56 osse and then you won't ever have this problem again
18:57 DarthCloakedGuy I don't think I have that program installed
18:57 osse I hope you realize I meant for you to put the actual path to an actual editor
18:59 osse Alternatively, *start* using git commit -m "message here"
19:00 DarthCloakedGuy What do you mean by editor?
19:00 DarthCloakedGuy You mean like Notepad?
19:00 osse yes
19:00 DarthCloakedGuy Oh
19:00 Neon1024x joined #git
19:01 osse Notepad, Notepad++, Sublime Text, Vim, Atom
19:01 EduardoMartins joined #git
19:01 osse http://stackoverflow.com/questions/10564/how-can-i-set-up-an-editor-to-work-with-git-on-windows
19:03 mehola joined #git
19:07 paul424 joined #git
19:08 interne7y joined #git
19:09 dopesong joined #git
19:10 rossome joined #git
19:10 tristanp_ joined #git
19:11 scoobertron joined #git
19:14 tristanp joined #git
19:14 jaguarmagenta joined #git
19:14 TinkerTyper joined #git
19:15 nilsi joined #git
19:16 ToBeCloud joined #git
19:17 tristanp_ joined #git
19:19 toothe left #git
19:26 _28_ria joined #git
19:27 ceaucari joined #git
19:28 eletuchy joined #git
19:31 LeMike joined #git
19:31 ceaucari joined #git
19:35 ceaucari joined #git
19:37 qsx vim, emacs
19:42 dopesong joined #git
19:45 rahtgaz joined #git
19:46 khmarbaise joined #git
19:49 Jeroen joined #git
19:54 tristanp joined #git
19:55 ash_workz joined #git
19:57 inflames joined #git
19:57 fracting joined #git
19:59 tristanp_ joined #git
20:02 d0nn1e joined #git
20:04 skunkz joined #git
20:05 rnsanchez_ joined #git
20:08 dsdeiz joined #git
20:09 interne7y joined #git
20:10 mda1 joined #git
20:11 cdown joined #git
20:13 Neon1024x joined #git
20:15 whomp joined #git
20:20 nitin joined #git
20:23 PaulCape_ joined #git
20:23 sLite joined #git
20:30 scorphus Say I found a bug or would like to understand the `cherry-pick` command, what part of Git source code should I read?
20:31 GavinMagnus joined #git
20:32 fornax joined #git
20:32 silkm0 joined #git
20:35 fuchstronaut joined #git
20:35 nnyk_ joined #git
20:37 nitin joined #git
20:37 elsevero joined #git
20:38 diego1 joined #git
20:38 cdown joined #git
20:38 diego1 joined #git
20:38 toogley joined #git
20:40 rgrinberg joined #git
20:40 linuxmint joined #git
20:42 tristanp joined #git
20:43 gaen joined #git
20:47 tristanp_ joined #git
20:47 blackwind_123 joined #git
20:48 flaguy48 joined #git
20:50 zeroed joined #git
20:50 diego1 joined #git
20:50 tristanp joined #git
20:53 zeroed joined #git
20:53 zeroed joined #git
20:54 d4rklit3 joined #git
20:54 drodger joined #git
20:54 scoobertron joined #git
20:57 fornax joined #git
21:00 rbr joined #git
21:01 diego1 joined #git
21:08 PaulCapestany joined #git
21:09 maestrojed joined #git
21:10 thetic joined #git
21:10 interne7y joined #git
21:12 marked joined #git
21:13 crameth joined #git
21:15 robotroll joined #git
21:17 _rnsanchez_ joined #git
21:19 tristanp joined #git
21:22 tristanp_ joined #git
21:25 tristanp joined #git
21:27 trista___ joined #git
21:32 bollullera joined #git
21:33 Ediz joined #git
21:33 ronny left #git
21:34 floatingpoint joined #git
21:35 sword joined #git
21:36 tanuki_ joined #git
21:37 nb-ben joined #git
21:39 cdown_ joined #git
21:41 tanuki joined #git
21:47 Ediz joined #git
21:47 Guest87233 joined #git
21:48 yqt joined #git
21:49 tristanp joined #git
21:49 ediz_ joined #git
21:49 mablae joined #git
21:49 sagerdearia joined #git
21:51 ediz_ left #git
21:51 |ifei5good joined #git
21:51 tristanp_ joined #git
21:52 Ediz joined #git
21:53 Sleepy63 joined #git
21:53 nobso joined #git
21:54 trista___ joined #git
21:54 neniuseksemo scorphus: git cherry-pick --help
21:55 eletuchy joined #git
21:56 nu11_byte joined #git
21:56 drodger joined #git
21:57 maxorator joined #git
21:58 Ediz joined #git
21:58 Goplat joined #git
22:01 shgysk8zer0 joined #git
22:01 tanuki joined #git
22:02 drodger joined #git
22:04 skunkz joined #git
22:05 nitin joined #git
22:08 tristanp joined #git
22:08 cdown joined #git
22:08 _ikke_ scorphus: cherry-pick is implemented in builtin/revert.c
22:09 shgysk8zer0 joined #git
22:09 mdw joined #git
22:10 am55 joined #git
22:11 tristanp_ joined #git
22:11 interne7y joined #git
22:17 lindenle joined #git
22:18 tanuki joined #git
22:27 tristanp joined #git
22:29 mase-tech joined #git
22:31 xlegoman_ joined #git
22:33 tristanp_ joined #git
22:36 todd_dsm joined #git
22:36 fuchstronaut joined #git
22:36 tristanp joined #git
22:38 josuebrunel joined #git
22:39 tristanp_ joined #git
22:43 dopesong joined #git
22:43 josuebrunel joined #git
22:46 afuentes joined #git
22:50 eletuchy joined #git
22:53 McNozes joined #git
22:54 tvw joined #git
22:56 gaen joined #git
22:58 elsevero joined #git
23:03 ochorocho__1 joined #git
23:03 nettoweb joined #git
23:06 Mobutils joined #git
23:06 fscala joined #git
23:07 tristanp joined #git
23:09 mdw_ joined #git
23:10 mwhooker joined #git
23:10 SocialBlunder joined #git
23:11 clemf joined #git
23:12 tristanp_ joined #git
23:12 interne7y joined #git
23:13 SocialBlunder left #git
23:15 tristanp joined #git
23:16 GavinMagnus left #git
23:17 elsevero joined #git
23:18 tristanp_ joined #git
23:20 ffabi joined #git
23:21 rneco joined #git
23:21 italoacasas joined #git
23:23 SimonNa joined #git
23:24 diegoaguilar joined #git
23:24 nettoweb joined #git
23:25 madewokherd joined #git
23:27 troyt joined #git
23:27 PaulCape_ joined #git
23:30 mablae_ joined #git
23:30 tristanp joined #git
23:32 peeps joined #git
23:33 Sleepy63 joined #git
23:35 mwhooker joined #git
23:35 jaguarmagenta joined #git
23:37 DolphinDream joined #git
23:37 marked joined #git
23:38 d4rklit3 joined #git
23:41 PaulCapestany joined #git
23:42 Chunk2 joined #git
23:44 tristanp joined #git
23:46 italoacasas joined #git
23:48 hseg joined #git
23:48 mattfoo joined #git
23:48 khmarbaise joined #git
23:50 tristanp joined #git
23:50 hseg Hi. Quick question about git am. If upstream uses git am to apply a commit, will their version have a different SHA? More to the point, if I then pull from upstream, will Git realize that the two commits are the same and fast-forward?
23:51 hseg Otherwise, I don't see how to link up the feature branch on which this commit appears with the main upstream branch.
23:53 cbreak hseg: different
23:53 cbreak it'll be like a cherry-pick, they will have their own committer and committer date
23:54 cbreak hseg: if you want you can rebase, that'll remove your version
23:55 hseg Not sure what use of rebase you're suggesting. Rebase my feature branch commits onto the new master with the pulled-in commits?
23:55 tristanp_ joined #git
23:56 bjpenn joined #git
23:56 cbreak which ever rebase you want
23:57 tristanp joined #git
23:59 hseg Still unsure what you mean. For concreteness' sake, suppose master is at f00, and feature is at BA7. I format-patch F00..BA7, and upstream applies it, to obtain BAD. At the code level, BA7=BAD. However, this is not reflected in the git history. How does rebase fix this?
23:59 JFS joined #git
23:59 fstd joined #git

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