Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-26

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

All times shown according to UTC.

Time Nick Message
00:01 re1 joined #git
00:02 gdelfino joined #git
00:05 nettoweb1 joined #git
00:11 Guest30 joined #git
00:16 mindriot101 joined #git
00:16 romerocesar joined #git
00:17 drmt joined #git
00:18 WhiskerBiscuit joined #git
00:20 Buoy joined #git
00:22 thiago joined #git
00:25 theskillwithin joined #git
00:32 fatalhalt joined #git
00:32 cdesai joined #git
00:34 akurniawan joined #git
00:35 polyzen joined #git
00:37 Bray90820 joined #git
00:37 romerocesar joined #git
00:37 Bray90820 I am relying to do a git clan for a wifi driver and am getting this error
00:37 Bray90820 fatal pack has bad object at offset
00:37 Bray90820 *Trying
00:38 realz joined #git
00:39 Bray90820 Sorry I just realized I am in the wrong channel
00:40 Bray90820 left #git
00:42 romerocesar joined #git
00:46 fstd_ joined #git
00:48 pks joined #git
00:50 nettoweb joined #git
00:51 _August_ joined #git
00:51 LordRyan joined #git
00:53 jaguarmagenta joined #git
00:54 irqq_ joined #git
00:55 Kaisyu joined #git
00:55 jaguarma_ joined #git
00:55 ojdo joined #git
00:56 durham_ joined #git
00:59 dsdeiz joined #git
01:02 inflames joined #git
01:05 d^sh joined #git
01:07 brokensyntax joined #git
01:09 finalbeta joined #git
01:10 brokensyntax joined #git
01:11 jstimm joined #git
01:11 Lyqyd joined #git
01:14 oxsyn joined #git
01:14 _cyril_ joined #git
01:14 ash_workz joined #git
01:16 GavinMagnus joined #git
01:17 ejnahc joined #git
01:19 worstadmin joined #git
01:19 neunon joined #git
01:20 jleclanche joined #git
01:20 evanc joined #git
01:21 bcardarella joined #git
01:21 etcinit joined #git
01:21 xall joined #git
01:21 thecomedian joined #git
01:21 Xe joined #git
01:21 User458764 joined #git
01:21 hahuang65 joined #git
01:21 Mekkis joined #git
01:22 ybden joined #git
01:22 GavinMagnus left #git
01:22 Tee_Pee joined #git
01:22 wenzowski joined #git
01:22 XDS2010 joined #git
01:22 discopatrick joined #git
01:23 richardlitt joined #git
01:24 plos joined #git
01:24 ahr3n joined #git
01:24 henriquev joined #git
01:24 janx joined #git
01:25 boombatower joined #git
01:25 boombatower joined #git
01:25 panda81 joined #git
01:26 Derperperd joined #git
01:26 panda81 hi I had a disk full failure while cloning a repo. Now I cleared up space, I tried to 'pull' and 'fetch'. But none gets me the remaining missing files?
01:27 fb| joined #git
01:27 Cerise joined #git
01:27 Cerise joined #git
01:28 mizu_no_oto joined #git
01:29 fakenerd joined #git
01:29 |ifei5good joined #git
01:30 CheckDavid joined #git
01:30 realz joined #git
01:30 netj joined #git
01:30 |ifei5good joined #git
01:31 swift1_ joined #git
01:31 saidelike joined #git
01:32 jacob123 joined #git
01:32 aartist joined #git
01:32 aartist left #git
01:33 bgerber joined #git
01:33 diogenese joined #git
01:34 Furai joined #git
01:35 Maggie joined #git
01:39 bernardio joined #git
01:40 nsh joined #git
01:40 mrpackethead joined #git
01:41 Dougie1871 left #git
01:41 Anthaas joined #git
01:46 bulletmark joined #git
01:46 crazyhorse18 joined #git
01:46 crazyhorse18 how do you get the timestamp of the last commit?
01:46 mazeto joined #git
01:46 silvers joined #git
01:46 Vampire0 joined #git
01:46 mazeto Hey folks, I got a question. We can do git clone --depth 1 to clone only the last level of the tree. But as we pull the repo, the history gets bigger and bigger, the opposite of --depth 1. How can I cut off the lower levels of the repo's tree?
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
01:49 boombatower joined #git
01:51 mkoskar joined #git
01:51 BenderRodriguez joined #git
01:52 jstimm joined #git
01:54 srcerer joined #git
01:54 llamapixel crazyhorse18: git log will show you but do you mean piped to a file?
01:56 romerocesar joined #git
01:57 panda81 joined #git
01:57 BenderRodriguez joined #git
01:59 Shakeel_ joined #git
01:59 Houston joined #git
02:03 d^sh joined #git
02:07 chachasmooth joined #git
02:09 NeverDie joined #git
02:11 Houston joined #git
02:12 mizu_no_oto joined #git
02:14 Goplat joined #git
02:15 boombatower joined #git
02:15 m___1 joined #git
02:16 TGiFallen joined #git
02:17 romerocesar joined #git
02:19 sunri5e joined #git
02:22 mazeto left #git
02:22 hexagoxel joined #git
02:25 harish joined #git
02:26 moei joined #git
02:29 gfixler joined #git
02:29 dsantiago joined #git
02:30 QwertyDragon joined #git
02:34 xameada_ joined #git
02:36 fakenerd joined #git
02:37 watabou_ joined #git
02:38 romerocesar joined #git
02:38 railssmith joined #git
02:44 lagothrix joined #git
02:48 MrWoohoo joined #git
02:49 chachasmooth joined #git
02:50 Jameser_ joined #git
02:55 Jameser_ joined #git
02:59 romerocesar joined #git
03:01 dodobrain joined #git
03:04 aavrug joined #git
03:04 PioneerAxon joined #git
03:05 StrongJava joined #git
03:07 liuzhen joined #git
03:10 Xuefer joined #git
03:11 cdown joined #git
03:12 Andrew_K joined #git
03:13 d^sh joined #git
03:13 jaguarmagenta joined #git
03:13 al-damiri joined #git
03:14 crazyhorse18 joined #git
03:15 Vortex34 joined #git
03:16 flippo joined #git
03:19 buddyq joined #git
03:20 romerocesar joined #git
03:20 joki joined #git
03:23 nuck joined #git
03:23 mehola joined #git
03:23 hahuang65 joined #git
03:23 Mobutils joined #git
03:26 emattiza joined #git
03:27 ISmithers joined #git
03:28 e14 joined #git
03:28 mrpackethead joined #git
03:28 Puhe joined #git
03:29 Puhe joined #git
03:30 prawnzy joined #git
03:31 sonvh joined #git
03:31 crazyhorse18 joined #git
03:32 snappy joined #git
03:32 snappy when in a git rebase conflict, is there a way to reset to the original state of the conflict?
03:33 xall joined #git
03:33 rossome joined #git
03:35 Random832 what do you mean original state
03:35 Random832 you can git rebase --abort and start over, if you mean you've edited the file and don't like your edits
03:36 NeverDie joined #git
03:36 Drone4four joined #git
03:37 snappy right so rebase --abort is one option, but during a rebase you may hit several different conflicts, i just want to reset the state of the conflict i'm in
03:37 snappy not sure if its possible
03:39 Random832 eh
03:39 thiago are you saying that you made some modifications when trying to solve the conflict and now you want to undo those modifications?
03:39 Random832 personally i'd use git mergetool with vimdiff, paste one of the three originals into the destination buffer, and look at the differences with the other two
03:40 thiago go back to the conflicted state with conflict markers?
03:40 Random832 i don't know if you can do that after having accepted a merged version though
03:40 thiago I assume it's before the acceptance
03:40 romerocesar joined #git
03:41 Random832 i normally use mergetool so i'm rusty on how to do it by hand
03:42 dreiss joined #git
03:42 troyt joined #git
03:42 snappy thiago: yeah
03:43 BenderRodriguez joined #git
03:44 Intee joined #git
03:45 Intee left #git
03:53 utanapischti joined #git
03:56 pks joined #git
03:57 User458764 joined #git
03:57 prawnzy joined #git
03:58 jost joined #git
04:01 romerocesar joined #git
04:06 ochorocho__ joined #git
04:06 svm_invictvs joined #git
04:07 BenderRodriguez joined #git
04:08 justan0theruser joined #git
04:09 cyphase joined #git
04:16 Drone4four left #git
04:17 KnownSyntax joined #git
04:17 KnownSyntax joined #git
04:21 arescorpio joined #git
04:22 romerocesar joined #git
04:24 a_thakur joined #git
04:27 Electrometro joined #git
04:27 nuck joined #git
04:27 impermanence joined #git
04:27 Guest70781 joined #git
04:30 Cabanossi joined #git
04:31 zacts joined #git
04:35 Jameser joined #git
04:38 daey_ joined #git
04:41 Puffball joined #git
04:45 subhojit777 joined #git
04:45 impermanence joined #git
04:48 sonvh joined #git
04:48 jstimm joined #git
04:50 |prawnzy joined #git
04:51 Endarked joined #git
04:55 maroloccio hi. branch B is a plain sequence of commits on top of A. A <- b1 <- b2 <- ... <- bN. how can i find b1 programmatically? the first commit added to A by B?
04:55 Puffball joined #git
04:56 SpeakerToMeat joined #git
04:57 thiago define "find"?
04:57 thiago do you need it in a script?
04:57 thiago what are ou going to do once you find it?
04:58 dreiss joined #git
04:58 maroloccio definition of find: get its sha1
04:58 maroloccio need in script? yes
04:58 maroloccio after find? git show it
04:58 maroloccio thiago: ^
04:59 thiago are you going to show the other ones too?
05:00 _ikke_ So basically you want a commit, reachable by B, which has A as it's parent
05:00 maroloccio just "the one".
05:00 maroloccio _ikke_: precisely
05:00 thiago git rev-list --reverse A..B | head -1
05:00 maroloccio without doing A..B | tail
05:01 maroloccio i prefer not to use tail/head
05:01 Random832 why
05:01 thiago ok
05:01 thiago git rev-list --reverse A..B | sed '1p;q'
05:01 Anupkumar joined #git
05:01 maroloccio :)
05:02 thiago actually, sed 2q
05:02 thiago otherwise, it prints twice
05:02 thiago you can also use: awk NR==1
05:02 romerocesar joined #git
05:02 thiago I can find plenty more commands that print just the first line
05:02 thiago nothing I can do about the left side of the pipe
05:02 maroloccio say that i am in a container without coreutils
05:03 romerocesar joined #git
05:03 thiago then you install coreutils
05:03 thiago we're talking shell scripts. You need coreutils.
05:03 _ikke_ There is no built-in way in git
05:03 OnBrokenWings joined #git
05:03 thiago you can't do *anything* without it
05:03 thiago so, no, you're NOT in a container without coreutils
05:03 slavanap joined #git
05:04 thiago unless you're talking about writing an application in some programming language (other than shell script). Then just use its programming functions to extract the first line from the pipe.
05:04 maroloccio i will use what you say. code, not an external util
05:04 maroloccio i am surprised it can't be done in git, somethow?
05:04 maroloccio (by the way.. i appreciate the help a lot)
05:05 thiago because git doesn't need to do it
05:05 Mowgli joined #git
05:05 overlord_tm joined #git
05:05 Random832 A=`git rev-parse A`; i=1; while true; do x=`git rev-parse B~$i`; if [[ $x = $A ]]; then git rev-parse B~$((i-1)); break; fi; i=$((i+1)); done
05:05 Random832 or you could use head
05:06 maroloccio rev-list --count or something then
05:06 sonvh_ joined #git
05:06 thiago or use a better shell
05:06 Random832 because you are not in a container without coreutils
05:07 maroloccio what about in a container, as a process, which can't shell out of system execute things in coreutils?
05:07 Random832 but you can execute git?
05:07 thiago if you're writing a shell script, you have coreutils
05:08 thiago if you don't have coreutils, then you're using a higher-level programming language
05:08 thiago and if you don't have coreutils, some git commands will fail
05:08 maroloccio yes. python.
05:08 cdown joined #git
05:09 maroloccio anyway.. appears there is not a "gitrevisions" way to find that first commit of B from A
05:09 Random832 it's kind of a silly thing to want, tbh
05:09 Random832 why do you want it
05:09 xall joined #git
05:10 thiago here's why it can't do that:
05:10 thiago because Git repositories are a DAG
05:10 thiago in order to find out the first commit after A leading to B, it needs to start from B and work backwards until it finds A
05:10 Puffball joined #git
05:11 maroloccio all you need is a one hop memory to backtrack?
05:11 thiago yes, the last one before it finds A
05:11 maroloccio previous = current; current = next()
05:12 maroloccio you can do that on a DAG
05:12 Random832 what are you actually trying to do
05:12 thiago yes, you can do that
05:12 thiago that's what git rev-list does
05:12 thiago it walks the DAG and prints the information about the nodes
05:14 sea-gull joined #git
05:15 maroloccio Random832: i need to base some decisions on the first commit of B on top of A, considering author, tag (is there a tag on the same commit?), etc.
05:16 nilg joined #git
05:16 crazyhorse18 joined #git
05:18 maroloccio thiago, Random832 thank you guys
05:18 thiago that's a weird workflow
05:18 safe joined #git
05:20 sonvh__ joined #git
05:22 cyan__ joined #git
05:23 Mowgli joined #git
05:24 User458764 joined #git
05:24 realz joined #git
05:25 emPi joined #git
05:26 justanotheruser joined #git
05:27 Macaveli joined #git
05:29 nawwmz joined #git
05:30 dsantiago joined #git
05:30 Jameser_ joined #git
05:36 fakenerd_ joined #git
05:37 ThomasLocke joined #git
05:38 fakener__ joined #git
05:40 Endarked joined #git
05:43 impermanence joined #git
05:45 lindenle joined #git
05:46 dan2k3k4 joined #git
05:47 raphink joined #git
05:47 glebihan joined #git
05:52 MaxLeiter joined #git
05:52 MaxLeiter left #git
05:52 vuoto joined #git
05:53 _cyril_ joined #git
05:55 ToBeCloud joined #git
05:55 jknetl joined #git
05:56 jozwior joined #git
05:57 qt-x joined #git
05:57 Jameser joined #git
05:59 gfixler joined #git
06:00 sonvh_ joined #git
06:02 fatalhalt joined #git
06:02 PCatinean joined #git
06:03 Jameser joined #git
06:04 Darren_ joined #git
06:05 Anja joined #git
06:06 hilizere joined #git
06:07 _ng joined #git
06:09 rscata joined #git
06:09 astrofog joined #git
06:10 mozzarel1 joined #git
06:10 Jameser joined #git
06:13 OnBrokenWings joined #git
06:14 phanimahesh joined #git
06:18 Puffball_ joined #git
06:20 thott joined #git
06:20 thott joined #git
06:21 testuser_ joined #git
06:23 bmahe joined #git
06:25 nidr0x joined #git
06:25 bocaneri joined #git
06:26 NoOutlet joined #git
06:27 Xethron joined #git
06:28 sonvh__ joined #git
06:28 chele joined #git
06:28 svm_invictvs joined #git
06:29 sonvh__ joined #git
06:35 JeroenT joined #git
06:36 flavius joined #git
06:37 Orbitrix joined #git
06:37 Orbitrix joined #git
06:40 Jameser joined #git
06:40 elect joined #git
06:41 NoOutlet joined #git
06:43 zulutango joined #git
06:43 impermanence joined #git
06:43 PHPanos joined #git
06:44 bruce_lee joined #git
06:45 Sceorem joined #git
06:45 Alienpruts joined #git
06:46 jnavila joined #git
06:46 elect joined #git
06:47 styler2go joined #git
06:48 corsibu joined #git
06:50 fub joined #git
06:50 star_prone joined #git
06:51 brk_ joined #git
06:51 fub Hi. I want to upload a git repository to my server so a client can do a "git clone" to fetch it over http (it has to be http because of proxies). Is there any other ismple way than setting this up via an fcgiwrapper?
06:51 star_prone joined #git
06:52 User458764 joined #git
06:52 corsibu joined #git
06:52 User458764 joined #git
06:53 _ikke_ You have dumb-http
06:53 _ikke_ which requires to run git update-server-info after each push
06:53 _ikke_ but then works over plain http
06:54 netj joined #git
06:58 finalbeta joined #git
06:59 gigq joined #git
06:59 romerocesar joined #git
07:00 brk_ joined #git
07:00 brk_ joined #git
07:02 corsibu joined #git
07:03 qpdb joined #git
07:03 realz joined #git
07:04 fatalhalt joined #git
07:05 cyan__ joined #git
07:06 quackgyver joined #git
07:07 Jameser joined #git
07:08 overlord_tm joined #git
07:09 lb fub https://git-scm.com/book/en/v2/​Git-on-the-Server-The-Protocols see dumb http
07:09 fub lb: yeah just found it and trying it, thanks!
07:10 heftig do unannotated tags also have a tag object?
07:10 TomyWork joined #git
07:10 jmz joined #git
07:11 User458764 joined #git
07:11 _ikke_ No
07:11 _ikke_ They're just refs pointing to a commit
07:12 lb heftig no, https://git-scm.com/book/en/v2/G​it-Internals-Git-References#Tags
07:12 lb gnarf, _ikke_ keeps beating me :D
07:12 _ikke_ :P
07:12 _ikke_ But you come with the references
07:14 pks_ joined #git
07:14 Arun_ joined #git
07:15 littleforest joined #git
07:18 GavinMagnus joined #git
07:19 romerocesar joined #git
07:20 lb _ikke_ https://cdn.meme.am/instances/500x/72680855.jpg
07:21 _ikke_ lol
07:21 lb ^^
07:27 Endarked joined #git
07:27 JeroenT joined #git
07:27 |prawnzy left #git
07:27 Prawnzy joined #git
07:29 likewhoa joined #git
07:33 fees joined #git
07:34 SwiftMatt joined #git
07:34 danslo_ joined #git
07:35 GavinMagnus joined #git
07:36 xall joined #git
07:37 dome joined #git
07:40 romerocesar joined #git
07:40 eduardas_m joined #git
07:40 dome hello. i wonder if there is any downside of doing a frequently pushing mirror clone to other remote. i want to frequently take a full clone from local repository but not to push every commit
07:41 Gonzo89 joined #git
07:43 _August_ joined #git
07:43 kurkale6ka joined #git
07:43 drbean joined #git
07:44 pluszak joined #git
07:45 ahmedelgabri joined #git
07:45 moritz resource usage might be a downside
07:47 pluszak joined #git
07:48 corsibu joined #git
07:48 pluszak joined #git
07:48 nivag joined #git
07:49 pluszak joined #git
07:50 _joes__ joined #git
07:51 pluszak joined #git
07:51 User458764 joined #git
07:52 pluszak joined #git
07:53 dome does this mean all previous clones will be preserved or what resources?
07:54 JeroenT joined #git
07:55 pluszak joined #git
07:57 Guest98448 joined #git
07:57 Balliad joined #git
07:57 leehambley joined #git
07:59 GavinMagnus joined #git
08:00 Sleepy63 joined #git
08:01 romerocesar joined #git
08:01 JeroenT joined #git
08:03 lb dome bandwith .... cpu time ... time. ....
08:03 NeverDie joined #git
08:05 dome such small repositories that this won't be an issue
08:05 encod3 joined #git
08:06 pks joined #git
08:07 halbomin joined #git
08:08 mikecmpbll joined #git
08:09 Balliad joined #git
08:09 encod3_ joined #git
08:10 blur3d joined #git
08:13 troyt joined #git
08:13 lordjancso joined #git
08:13 cyan__ joined #git
08:15 quizzi joined #git
08:18 _August_ joined #git
08:18 bongjovi joined #git
08:21 dan2k3k4 joined #git
08:21 romerocesar joined #git
08:21 tlaxkit joined #git
08:22 a_thakur joined #git
08:22 User458764 joined #git
08:22 clmsy joined #git
08:25 theskillwithin after many PM's and emails, finally just made my resource list into a gist.  here it is https://gist.github.com/theskillwithin/0b2ca6​aa7767a7b227728ab65d36cc83#file-resources-md
08:26 wrouesnel1 joined #git
08:28 cagedwisdom joined #git
08:29 marcogmonteiro joined #git
08:29 manuels joined #git
08:30 leehambley joined #git
08:30 GT4066 joined #git
08:32 afuentes joined #git
08:39 User458764 joined #git
08:41 kimonorouge joined #git
08:42 romerocesar joined #git
08:47 qpdb joined #git
08:47 chll_ joined #git
08:47 PCatinean joined #git
08:49 corsibu joined #git
08:49 fuchstronaut joined #git
08:49 a_thakur joined #git
08:50 corsibu joined #git
08:51 mehola joined #git
08:53 jfr joined #git
08:57 timothy joined #git
08:57 fuchstronaut is there a way to edit all commits before pushing them in a way that will remove all timestamps or alter timestamps? I want to hide the times I have been working on something
08:58 _ikke_ git rebase can do that
08:58 Mulf joined #git
08:58 _ikke_ and something with --reset-author-date
08:59 Xuefer joined #git
08:59 impermanence joined #git
09:02 romerocesar joined #git
09:03 kimonorouge joined #git
09:03 troyt joined #git
09:03 laumann joined #git
09:05 Keridos joined #git
09:05 _ikke_ Not sure if this works, but: git rebase <base_branch> -x 'git commit --amend -CHEAD --reset-author'
09:06 xall joined #git
09:07 tvw joined #git
09:08 snappy Ill ask again since my question went stale. Is there a way to reset to the original state of a conflict during a rebase/merge conflict? That is if I made changes when solving the conflict, I want ot undo it and return back to the conflicted state with the conflict markers.
09:08 danslo_ left #git
09:08 redi joined #git
09:09 fuchstronaut thanks _ikke_, "git rebase --ignore-date" did the trick i think
09:09 snappy (im also wondering if this is where git rerere woudl come in)
09:10 _ikke_ snappy: If you haven't done git add for that file, then you can use git checkout --merge <file>
09:10 xall_ joined #git
09:11 _ikke_ snappy: git rerere is about applying the same conflict resolution when encountering the same conflict
09:11 pluszak joined #git
09:11 redi hello gits. Apologies if this is a FAQ, but would it be helpful for git newbies if "Your branch is up-to-date with 'origin/master'."  included some text to say that origin/master could be behind the remote?
09:12 redi my answer at http://stackoverflow.com/q/27828404/981959 has a few comments complaining about the "logical" behaviour being unfriendly
09:12 redi the latest comment suggests "Your branch was up-to-date with 'origin/master' when last checked at {timestamp}"
09:12 nawwmz joined #git
09:13 redi obviously this would only make sense when the branch being tracked is actually remote
09:13 mkoskar joined #git
09:13 satya4ever joined #git
09:13 redi and I'd want a config option to silence this extra noise, because I know how git works
09:13 tobiasvl there are many newbies who don
09:13 tobiasvl don't understand that output in that case, yes
09:14 robattila256 joined #git
09:14 snappy _ikke_: hm, i usually have it in a git add state, but then i'm not sure if i resolved things correctly, which is why i want to rewind to the start of the conflict
09:14 _ikke_ redi: "when last checked at .. would imply that git regularly checks the remote itself
09:14 redi _ikke_: sure, the wording could be improved. just *something* to say "you know I haven't actually checked the remote, right? you need to fetch again to know if upstream changed"
09:15 tobiasvl "when last fetched at" maybe
09:15 redi or just "'$UPSTREAM' was last fetched at $timestamp" as an extra line after the current one
09:16 _ikke_ Not sure if git stores when a fetch happened (reflog might be one place)
09:16 redi ah
09:17 redi timestamp on the ref would give an approximate idea, but not reliable. the wording might need to account for that being inaccurate ... but then the more technically correct the wording is, the less useful it is to noobs
09:17 tobiasvl why does it just not say that it's ahead?
09:17 tobiasvl I never understood that
09:17 tobiasvl it says if it's behind, right?
09:18 redi it does say if it's ahead
09:18 redi Your branch is ahead of 'origin/master' by 11 commits.
09:18 redi (use "git push" to publish your local commits)
09:18 heftig _ikke_, lb: thanks
09:18 _ikke_ redi: But if you want something to actually happen (instead of just discussing it), you might want to send an e-mail to git@vger.kernel.org
09:19 redi _ikke_: sure, I'll even prepare a patch, but wanted to know if the idea would be shot down right aay
09:19 redi *away
09:19 Mowgli joined #git
09:19 redi the lack of immediate "that's a stupid idea" replies has encouraged me :) thanks
09:19 Serpent7776 joined #git
09:20 tobiasvl http://stackoverflow.com/questions/2782​8404/why-does-git-status-show-branch-is​-up-to-date-when-changes-exist-upstream
09:20 LucaTM joined #git
09:20 _ikke_ Right, I do see that will improve the message
09:20 redi tobiasvl: yeah that's the one I posted above :)
09:20 tobiasvl oh, sorry
09:20 redi I'm the author of the accepted answer
09:21 redi np :)
09:21 redi ok, cloning the source now, I'll see how easy it would be to add
09:22 ferr joined #git
09:23 romerocesar joined #git
09:23 ieee joined #git
09:25 heftig joined #git
09:25 skunkz joined #git
09:26 leehambley joined #git
09:27 _ADN_ joined #git
09:28 m___1 joined #git
09:28 pluszak joined #git
09:29 pluszak joined #git
09:29 m___2 joined #git
09:31 InfoTest1 joined #git
09:32 King_Hual joined #git
09:33 achadwick joined #git
09:34 suchkultur joined #git
09:36 realnot_ joined #git
09:37 cdown_ joined #git
09:37 realnot_ Hi guys o/ I created a new local branch and after pushing it, doesn't appear on remote repository. What I miss?
09:37 Prawnzy joined #git
09:37 tobiasvl realnot_: what did git say when you pushed it?
09:38 dan2k3k4 joined #git
09:38 WayToDoor joined #git
09:38 realnot_ tobiasvl: http://dpaste.com/0TN4ZKV
09:38 irqq joined #git
09:39 djb-irc joined #git
09:41 xaa joined #git
09:41 mindriot101 joined #git
09:41 nettoweb joined #git
09:42 canton7 realnot_, that includes everything except what git said when you pushed it :P
09:43 ieee joined #git
09:43 redi i.e. everything except the relevant infomation
09:45 realnot_ canton7: ?
09:45 tobiasvl realnot_: I asked you what git said when you pushed, but you didn't supply that information
09:45 canton7 realnot_, you didn't include the output of that 'git push' command
09:45 canton7 which is the thing that tobiasvl asked for
09:45 nawwmz joined #git
09:46 realnot_ tobiasvl, canton7 http://dpaste.com/0GE2KXY
09:46 realnot_ ok :)
09:46 canton7 what makes you think that it doesn't appear on the remote repository?
09:47 corpsicle so im doing git cherry origin/branch, and get a list of lots of commits. im pretty sure it cant be that many that are differing, so am i missing something? should i add some parameter to narrow it down?
09:47 tvw joined #git
09:47 corpsicle also when doing git log origin/branch ^localbranch --no-merges i get nothin
09:48 jmz joined #git
09:49 txdv tobiasvl: it said: Updates were rejected because the tip of your current branch is behind
09:49 tobiasvl txdv: huh? are you realnot_?
09:49 tobiasvl or are you talking about something else
09:50 tobiasvl txdv: in your case, it means the remote has work that you don't have locally, so the remote can't fast-forward
09:51 User458764 joined #git
09:51 realnot_ canton7: https://drive.google.com/file/d/0B_BTjJ​49ooqtMXpOWThnWUdoM1U/view?usp=sharing
09:51 tobiasvl txdv: so git fetch, and then either git merge or git rebase
09:51 realnot_ canton7: is not available on source / branch list
09:52 realnot_ canton7: but is available on branch list: https://drive.google.com/file/d/0B_BTjJ​49ooqtNWtDdFdlOFdWSjA/view?usp=sharing
09:52 txdv tobiasvl: thanks, i didnt see the nickanme in front of that, so I thought you shouted out a retoric question in the channel and assumed a 'what did the' joke
09:53 canton7 realnot_, looks like an issue with the bitbucket web interface not updating
09:53 canton7 realnot_, 'git ls-remote origin' will show you which branches are actually on the remote
09:53 canton7 realnot_, any difference between that and the bitbucket web interface is down to bitbucket
09:54 tobiasvl and bitbucket has its own channel btw: #bitbucket
09:54 realnot_ canton7: http://dpaste.com/2EA482J
09:54 canton7 yeah, so that branch definitely exists on the remote
09:54 realnot_ canton7: so everything is ok?
09:55 realnot_ bitbucket still have to update the web interface
09:55 belak Hm? Did someone say bitbucket?
09:55 wget joined #git
09:55 wget joined #git
09:55 canton7 realnot_, any issue is with bitbucket, not git
09:56 realnot_ canton7: ok, thanks
09:56 TheOrangeOne joined #git
09:57 belak There's a chance webhooks are behind... they're what actually end up caching that data
09:57 ocbtec joined #git
09:58 ocbtec joined #git
09:58 PioneerAxon joined #git
09:59 m___1 joined #git
09:59 tvw joined #git
10:00 aswen joined #git
10:00 pijiu joined #git
10:01 bernardio joined #git
10:01 Surfer2010 joined #git
10:03 ahr3n joined #git
10:06 JeroenT_ joined #git
10:07 mischat joined #git
10:07 rnsanchez joined #git
10:08 ieee joined #git
10:10 kimonorouge joined #git
10:11 cagedwisdom joined #git
10:11 rahtgaz joined #git
10:12 jeffreylevesque joined #git
10:13 the_cybersphinx joined #git
10:13 jacob123 joined #git
10:16 encod3 joined #git
10:16 maret joined #git
10:17 tjone270 joined #git
10:18 lss8 joined #git
10:18 lss8 joined #git
10:19 sdothum joined #git
10:19 encod3_ joined #git
10:20 romerocesar joined #git
10:20 jbitdrop joined #git
10:22 encod3 joined #git
10:26 User458764 joined #git
10:28 c0t joined #git
10:28 nfk joined #git
10:28 a_thakur joined #git
10:31 a_thakur joined #git
10:32 Jameser joined #git
10:35 inflames joined #git
10:36 djb-irc joined #git
10:41 mrpackethead joined #git
10:43 kimonorouge joined #git
10:43 pluszak joined #git
10:44 jfr joined #git
10:45 Mowgli joined #git
10:49 fuchstronaut joined #git
10:50 lss8 joined #git
10:50 lss8 joined #git
10:50 nutan joined #git
10:54 fuchstronaut joined #git
10:54 m___1 left #git
10:55 m___1 joined #git
10:55 leehambley joined #git
10:57 maret joined #git
10:57 harish joined #git
10:59 jknetl joined #git
10:59 Anja Well, thanks to you guys, i was able commit my changes, create a branch, rebase the branch to include my changes, clone the original repo on github, add that as a new remote, push my changes, issue a pull request, have my changes accepted upstream, fetch from the original repo, rebase, push to my github clone. history looks sane. i no longer am. only took 15 hours.
11:01 romerocesar joined #git
11:02 JeroenT joined #git
11:03 m___1 testing channel
11:04 bremner m___1: please use #test for any further testing.
11:05 m___1 thnks
11:09 redi left #git
11:09 PHPanos joined #git
11:12 emattiza joined #git
11:12 thib joined #git
11:16 WayToDoor joined #git
11:18 jmz joined #git
11:19 tlaxkit joined #git
11:19 CussBot joined #git
11:21 bgerber joined #git
11:22 romerocesar joined #git
11:22 leeN joined #git
11:29 raijin joined #git
11:29 blur3d left #git
11:32 jimi_ joined #git
11:32 JeroenT_ joined #git
11:35 m___1 joined #git
11:35 kimonorouge joined #git
11:36 Cavallari joined #git
11:36 bgerber joined #git
11:36 JeroenT joined #git
11:38 Prawnzy joined #git
11:41 JeroenT_ joined #git
11:41 fahadash joined #git
11:42 dsdeiz joined #git
11:42 dsdeiz joined #git
11:43 Felishia joined #git
11:43 NeverDie joined #git
11:43 romerocesar joined #git
11:43 Felishia guys I accidentally commited the wrong files in a commmit
11:43 Felishia how do I fix the commit?
11:43 Felishia I almost pushed
11:44 osse Felishia: make whatever changes are required, then use git commit --amend
11:44 _ikke_ Is it the last commit you made?
11:44 Felishia osse, the problem is that I added a file that wasn't supposed to be added
11:44 Felishia and I have no idea how it looked before it's autogenerated
11:45 JuliusN_ is there a way to create a pull request on master to notify other devs to pull from master?
11:45 Felishia I want to remove that file from the commit
11:45 osse Felishia: is it a new file ?
11:45 _ikke_ Felishia: Do you want to restore the previous version?
11:45 Felishia _ikke_, no I want it not to be in the commit whatsoever
11:45 _ikke_ JuliusN_: What system? (git has no pull requests)
11:45 Felishia it's the file for the IDE configuration
11:45 _ikke_ Felishia: git rm --cached <file>
11:45 PioneerAxon joined #git
11:45 osse Felishia: git rm --cached thefile; git commit --amend
11:45 Felishia _ikke_, I already commited
11:45 _ikke_ Felishia: No problem
11:45 ThomasLocke joined #git
11:45 JuliusN_ _ikke_: Bitbucket
11:46 JuliusN_ _ikke_: doesn't git have a request-pull command?
11:47 Felishia _ikke_, now it says that the file will be deleted
11:47 averagedan joined #git
11:47 Felishia I don't want it deleted from the source code
11:47 osse it won't
11:47 osse it will be deleted from the commit, not the disk
11:48 qpdb joined #git
11:48 Felishia it deleted it from the repository
11:48 Felishia I can see it in the diff
11:48 osse yes
11:48 Felishia even github says so
11:49 Felishia now it's pushed there's nothing to do
11:49 _ikke_ JuliusN_: Yes, but all that does is sending an e-mail
11:50 Felishia now how do I undelete it?
11:50 Felishia I don't want that when my commit is merged the file is removed from the develop branch
11:51 _ikke_ git checkout HEAD <file>
11:51 osse so you did want the previous version of the file, thebn
11:51 _ikke_ But you need to make a choice
11:51 _ikke_ Felishia: Note that git commits contain a complete snapshow of all files
11:51 _ikke_ It's not that only contains changed files
11:52 _ikke_ That's where the confusion came form
11:53 Kurolox joined #git
11:53 harish joined #git
11:54 JeroenT joined #git
11:55 Felishia now it says that the file is deleted
11:55 Felishia I want it to be whatever it was on develop
11:55 jim I've got a repo that's pretty linear, only one committer, no merges etc...
11:55 osse Felishia: git checkout HEAD~1 -- thefile; git commit --amend
11:55 johnmilton joined #git
11:56 Vinnie_win_s joined #git
11:56 jim and, I have a situation like this: (earlier)-C-D-E-F-G-(later)
11:56 johnmilton joined #git
11:56 ayjay_t joined #git
11:57 Felishia osse, D:
11:57 Felishia just make it a new commit
11:57 Felishia to fix the file
11:57 jim so the latest commit is G, but I made a mistake in the code, and the commit just before the mistake is D...
11:57 osse Felishia: rem ove --amend then
11:58 jim so, what I want to do is grab the code that was current as of D and commit it as H, reversing E, F and G
11:59 jim that's the way that avoids rewriting history,,, yes?
11:59 osse yes
12:00 drmt joined #git
12:00 jim ok,,, right now my head of master is G, so how would I go about this?
12:00 _ikke_ You can also revert a single commit if it's a single commit that introduces the mistage
12:00 _ikke_ mistake*
12:00 _ikke_ man git revert
12:00 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
12:00 jim it was a couple commits
12:00 _ikke_ ok
12:01 _ikke_ git revert -n E..G && git commit
12:01 osse jim: git revert --no-commit G F E && git commit -m 'Revert stuff'
12:01 corpsicle what do i do if git actually automerges incorrectly?
12:01 corpsicle obviously because the history is borked
12:02 _ikke_ You could manually fix the merge commit
12:02 jim ok, so git revert can take multiple commit hashes?
12:02 _ikke_ yes
12:03 _ikke_ and by using -n / --no-commit, you can create a single commit that reverts all changes
12:03 corpsicle if youre talking to me i have about 300 commits in 15 repos or so ...
12:03 Endarked joined #git
12:03 _ikke_ (otherwise it will create a commit for each reverted commit)
12:03 jim ok, understood
12:03 fakenerd joined #git
12:04 romerocesar joined #git
12:05 fuchstronaut joined #git
12:05 GavinMagnus joined #git
12:06 teest joined #git
12:07 kimonorouge joined #git
12:07 jim ok, found the commits.... so --no-commit adds the code to the index?
12:08 _ikke_ and the working tree
12:08 jim err adds the stuff that would revert
12:09 Jameser joined #git
12:10 synthroid joined #git
12:13 jim see if this works...
12:14 Mowgli joined #git
12:16 JyZyXEL joined #git
12:16 bl0w3d_0ut joined #git
12:20 InfoTest joined #git
12:20 akurniawan joined #git
12:22 akurniawan joined #git
12:23 nopf joined #git
12:25 jim back in a sec
12:25 romerocesar joined #git
12:26 jim joined #git
12:26 jasap joined #git
12:27 StrongJava joined #git
12:30 JeroenT joined #git
12:30 jim I think that worked... I'll leave you with a cool tip which would also serve to test... you can pastebin the output of an arbitrary command by running "anArbitraryCommand | nc termbin.com 9999", and to include error messages, "anArbitraryCommand 2>&1 | nc termbin.com 9999"
12:31 jim yep works fine... thanks.
12:32 sunri5e joined #git
12:32 jeffreylevesque joined #git
12:34 rivarun joined #git
12:35 netj joined #git
12:37 Cavallari1 joined #git
12:39 rishi` joined #git
12:40 athaller joined #git
12:41 jimi_ joined #git
12:45 canton7 joined #git
12:46 romerocesar joined #git
12:48 corsibu joined #git
12:48 ELFrederich joined #git
12:48 JyZyXEL joined #git
12:48 maret joined #git
12:49 Cavallari joined #git
12:50 encod3_ joined #git
12:51 StrongJava joined #git
12:51 encod3 joined #git
12:51 corsibu_ joined #git
12:52 geko- joined #git
12:52 fuchstronaut joined #git
12:52 Ice_Strike2 joined #git
12:53 mischat joined #git
12:53 Kulrak joined #git
12:53 Kulrak joined #git
12:53 nikivi joined #git
12:54 kimonorouge joined #git
12:55 Ram-Z joined #git
12:56 corsibu joined #git
12:56 ELFrederich when I rebase a series of commits on top of something newer, how can this be undone?  When I try to rebase going backwards I get conflicts... but if I just cherry-pick them it works without conflicts
12:56 akurniawan joined #git
12:57 kimonorouge joined #git
12:57 nilg` joined #git
12:57 eindoofus_ joined #git
12:57 fuchstronaut joined #git
12:57 fuchstronaut joined #git
12:58 pluszak ELFrederich: how about opening the git reflog and find the correct version?
12:59 ELFrederich pluszak: I guess I can do that
13:00 corsibu joined #git
13:00 pluszak so you can switch to that or reset --hard to that
13:00 JeroenT joined #git
13:01 introx joined #git
13:01 introx_ joined #git
13:02 star_prone joined #git
13:02 Corosauce joined #git
13:02 mindriot101 joined #git
13:02 jost joined #git
13:03 akurniawan joined #git
13:04 ash_workz joined #git
13:04 Orbitrix joined #git
13:05 Orbitrix joined #git
13:07 wrouesnel joined #git
13:07 romerocesar joined #git
13:08 nindustries joined #git
13:08 nindustries Hi, so I have unpushed commits on my local branch. How can I move them over to another local branch?
13:08 acetakwas joined #git
13:08 tobiasvl nindustries: a few ways. you can merge, of course. or cherry-pick
13:09 tobiasvl what do you want to achieve?
13:09 nindustries Remove them from the master branch and put them in my 'dev' branch
13:09 nindustries They are unpushed
13:10 tobiasvl do you need to keep the hashes? are master and dev otherwise identical, save for those extra commits on master?
13:10 nindustries (I accidently did work and commits on the local master branch instead of a dev branch)
13:10 nindustries tobiasvl: no & yes
13:10 introx_ joined #git
13:10 introx joined #git
13:11 cdg joined #git
13:11 jujib joined #git
13:11 tobiasvl ok, since you don't need the hashes, you can cherry-pick them on dev and then do a hard reset on master. or, since they are identical, you can just switch the branches around. git checkout dev && git reset --hard master && git checkout master && git reset --hard OLD_DEV_HASH. or something else
13:12 tobiasvl (note that git reset --hard throws away uncommited work)
13:12 ytti /win 20
13:13 nindustries hm
13:14 jujib left #git
13:14 siphr joined #git
13:14 siphr Hi. I am trying to figure out a good way to organize a new git repo. I have a bunch of plugins, these are all similar but not related. I was thinking of organizing them into separate branches on the repo. These branches will stay open. Is this good or bad?
13:14 harish joined #git
13:15 nindustries thanks tobiasvl !
13:15 tobiasvl np
13:15 nindustries wohoo
13:15 dsdeiz joined #git
13:15 dsdeiz joined #git
13:15 tobiasvl siphr: sounds a bit weird. why do you need them in separate branches if they'll never be merged? why do they need to be separate from the main code base?
13:16 ExoUNX joined #git
13:16 tobiasvl are you thinking orphan branches? if so, why? if not, will you just rebase them every time master gets new stuff? what would you achieve by doing that?
13:16 nindustries left #git
13:16 siphr tobiasvl: size basically and to keep everything clean.
13:17 siphr tobiasvl: expecting the master to only hold a template to help people write a plugin from scratch
13:17 tobiasvl size? well the repo won't get any smaller
13:18 bsanford joined #git
13:19 siphr tobiasvl: Apologies! By size I mean the number of plugins in one directory and they'll keep growing, which means that a person who is working on one plugin will be exposed to alot of other things that they should probably not know about or could do without
13:19 jeffreylevesque does gitlab use apache?
13:19 tobiasvl siphr: oh, ok. is it just a repo containing a bunch of plugins? if someone wanted to install a plugin, would they then need to clone and checkout all the branches of the different plugins they want?
13:20 tobiasvl jeffreylevesque: it uses nginx, but I'm sure it can also use apache
13:20 jeffreylevesque ok thanks!
13:20 tobiasvl jeffreylevesque: perhaps #gitlab can answer
13:21 impermanence joined #git
13:21 siphr tobiasvl: no! they'll have to clone the repo if they want to develop a new plugin or improve an old one and they only use branches of plugins they require. So imagine I have 30 plugin branches but I only require 3. I'll just work with those 3.
13:22 tobiasvl OK, so they won't have to clone the repo to actually get the plugins and install them
13:22 chll__ joined #git
13:22 jost joined #git
13:23 siphr tobiasvl: No! Mr. Jenkins will take care of the CI and I'm planning to host on artifactory.
13:23 anonymuse joined #git
13:23 DeltaHeavy joined #git
13:24 tobiasvl all right, well, then I guess it's fine. a bit weird workflow though, and I'm not sure why it's better to have lots of branches to navigate than lots of files to navigate, but you do you
13:24 PCatinean joined #git
13:24 siphr tobiasvl: I am curious and open to suggestions. What would your advice be?
13:24 Zumochi joined #git
13:24 Zumochi joined #git
13:25 tobiasvl I have already aired all my grievances and they're not relevant to you, so I'm not sure I can add anything more :)
13:25 siphr tobiasvl: hahaha, ok thanks
13:25 tobiasvl the usual way to do it is to just have all the plugins together in a directory, I guess. "contrib" or something
13:27 SourTrout joined #git
13:27 siphr tobiasvl: I see. I am kind of torn between these 2 methods. Maybe it won't be such a huge deal to have everything in one directory
13:27 _August_ joined #git
13:27 serialoverflow joined #git
13:28 siphr tobiasvl: are there any adverse effects of having never ending branches?
13:28 dviola joined #git
13:28 romerocesar joined #git
13:29 Orbitrix joined #git
13:29 Orbitrix joined #git
13:30 tobiasvl not really, but it's an uncommon workflow that people might not be familiar with
13:30 mindriot101 joined #git
13:30 StrongJava joined #git
13:30 siphr tobiasvl: I see, ok. Thank a lot for your comments.
13:32 User458764 joined #git
13:35 andydev joined #git
13:35 davimore_ joined #git
13:37 andydev hey everyone. I have a git auto-deploy setup on a production site and am getting a "You have not concluded your merge (MERGE_HEAD exists)." when I pull. This local server (prod site) doesn't/shouldn't be adding any files from it. What is the safest way to abort the merge and make sure no untracked files do not get deleted? (ie. uploaded files by users, etc.). Thanks in advance!
13:37 troulouliou_div2 joined #git
13:39 CEnnis91 joined #git
13:39 _ikke_ andydev: aborting a merge can be done with git merge --abort
13:39 Prawnzy joined #git
13:39 _ikke_ andydev: But deploying should not require using git pull
13:40 jimi_ joined #git
13:40 jimi_ joined #git
13:40 andydev _ikke_: cool. and running that abort merge won't touch any untracked files?
13:41 _ikke_ no
13:42 andydev hmm, get a similar message when I try that: "fatal: You have not concluded your merge (MERGE_HEAD exists)"
13:42 tobiasvl andydev: !deploy
13:42 gitinfo andydev: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
13:44 systemovich joined #git
13:44 ayjay_t joined #git
13:46 johnmilton joined #git
13:46 Pazzaz joined #git
13:46 SourTrou_ joined #git
13:47 fakenerd joined #git
13:47 ieee joined #git
13:48 AaronMT joined #git
13:48 ieee joined #git
13:48 NimeshNeema joined #git
13:49 lindenle joined #git
13:49 romerocesar joined #git
13:49 bsanford joined #git
13:50 rnsanchez_ joined #git
13:51 ayjay_t joined #git
13:51 vuoto joined #git
13:51 Xethron joined #git
13:52 boombatower joined #git
13:53 SourTrout joined #git
13:55 TomyLobo joined #git
13:57 sonvh__ joined #git
13:58 juvenal joined #git
14:00 _ng joined #git
14:00 chilversc joined #git
14:01 chilversc I was creating a merge and have resolved all the conflicts but it was a bit larger than I intended, so I ran `git checkout -b foo` to move the work to a different branch
14:01 mindriot101 joined #git
14:01 chilversc it still has all the changes but has forgotten its in a merge, how can I convert this to a merge commit?
14:02 converge joined #git
14:02 converge joined #git
14:02 e14 joined #git
14:03 fuzzmz wait, did you commit the changes after creating and switching to the foo branch?
14:03 SourTrou_ joined #git
14:03 chilversc no, before creating the branch
14:03 chilversc I thought it would let me avoid the `git branch foo; git reset head^ --hard`
14:03 Es0teric joined #git
14:04 johnmilton joined #git
14:05 chilversc also supprised git let me do that, its normally pretty good at preventing you from accidentally losing work
14:05 Felishia why does git autopush to another branch when it cannot find the one it's trying to push to?
14:05 Felishia that is so wrong...
14:05 chll__ left #git
14:05 _ikke_ Felishia: It all depends on your push.default setting
14:06 Felishia push.default?
14:06 _ikke_ man git config
14:06 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
14:06 _ikke_ !push_default
14:06 Felishia god damn I wanted to push to the proper banch
14:07 tjone270_ joined #git
14:08 nd_ joined #git
14:09 chilversc ok, so solved it, commited the changes to a temporary branch, then ran `git checkout master; git checkout -b foo; git merge -s ours other; git cherry-pick --no-commit temp; git commit --amend`
14:10 aarobc joined #git
14:10 Felishia why does it not instead complain that the target branch does not exist?
14:10 romerocesar joined #git
14:10 Felishia instead of pushing it to the wrong branch?
14:10 _ikke_ Felishia: What does git config push.default return?
14:11 Felishia _ikke_, nothing
14:11 tlaxkit joined #git
14:11 _ikke_ Felishia: iirc, git never just pushes to random branches
14:11 _ikke_ Felishia: What version of git are you on?
14:11 ochorocho__ joined #git
14:12 Felishia _ikke_, 2.7.4
14:12 Felishia well it just did... :(
14:12 Felishia I ran git checkout anotherbranch
14:12 tjone270__ joined #git
14:12 Felishia then add then push
14:12 Felishia and it pushed to the branch I was before the checkout
14:13 Felishia that doesn't make sense...
14:13 Felishia someone removed the "anotherbranch" branch
14:13 JeroenT joined #git
14:13 _ikke_ Felishia: what does git config --get-regex branch.<branchname> return?
14:14 corsibu_ joined #git
14:15 Felishia _ikke_, branch.feature/admin_should_be_ab​le_to_see_teacher_pictures.remote origin
14:15 Felishia branch.feature/admin_should_be_ab​le_to_see_teacher_pictures.merge refs/heads/feature/admin_should_​be_able_to_see_teacher_pictures
14:15 emattiza joined #git
14:15 Felishia that's the branch I expected to merge to
14:16 Gsham joined #git
14:17 mindriot101 joined #git
14:17 umpc joined #git
14:18 Ryanar joined #git
14:18 _ikke_ Felishia: Can you also paste a log of what happened when you pushed?
14:19 ohmy joined #git
14:19 ohmy hello everybody
14:20 ohmy i'm stuck with an issur trying to push my code into a remote repository (were i'm enabled) http://pastebin.com/3dTXrQxw
14:20 ohmy i dont understand the log (i guess they use gitolite or something)
14:20 Felishia _ikke_, https://gist.github.com/onzag/3​f20b40d5a9520ff03b604fad7f6c324
14:20 ohmy i'm just pushing, does this mean that i'm not enabled really to this repo ?
14:20 jstimm joined #git
14:21 CheckDavid joined #git
14:21 _ikke_ Felishia: So it pushed bugfix/show_current_plan_in_plans_view -> bugfix/show_current_plan_in_plans_view
14:21 _ikke_ not the feature branch
14:22 Felishia no
14:22 Felishia so the checkout failed
14:22 codepython777 joined #git
14:22 kbs2 joined #git
14:23 codepython777 We are moving projects from a particular user to a new group/user. What is the best way to do this?
14:24 _ikke_ ohmy: Proably, there's a hook running on the server, and it prevented you to push
14:24 _ikke_ ohmy: So you have to ask the admins why
14:25 cyphase joined #git
14:27 PioneerAxon joined #git
14:29 Es0teric joined #git
14:30 ShekharReddy joined #git
14:31 romerocesar joined #git
14:31 Andrew_K joined #git
14:32 al-damiri joined #git
14:32 Darren_ joined #git
14:32 mustmodify joined #git
14:33 mustmodify so I merged two branches (master and fix) and now I want to unmerge. Can I just revert?
14:33 _ikke_ revert creates a new commit, only undoing the *changes* made by the merge
14:33 mustmodify the merge is the most recent commit.
14:33 mustmodify Oh right.
14:33 _ikke_ if you want to completely get rid of the merge, you'll want to use git reset --keep HEAD~1
14:34 mustmodify So that's not what I want. `git reset HEAD~1` ?
14:34 matsaman joined #git
14:34 mustmodify perfect thanks.
14:35 Felishia how do I make a git diff avoiding one file?
14:35 Felishia git diff origin develop --avoid "bundle.js"
14:35 _ikke_ :!file should do it
14:35 _ikke_ git diff develop :!bundle.js
14:37 Felishia http://storage3.static.itmages.com/i/16/​1026/h_1477492680_3409043_e3de7fea10.png
14:37 Felishia WTF?
14:38 Mowgli joined #git
14:39 phanimahesh joined #git
14:39 mischat joined #git
14:39 zack_s_ joined #git
14:40 Felishia _ikke_, bash: !adminBundle.js: event not found
14:40 _ikke_ Felishia: You have to escape it with quoets
14:40 _ikke_ quotes
14:41 Felishia not working
14:41 buddyq joined #git
14:41 Felishia fatal: ambiguous argument ':!adminBundle.js': unknown revision or path not in the working tree.
14:41 zack_s_ I have a patch files, which does not match my repo to the repo of the patch
14:41 zack_s_ how can I apply the patch anyway?
14:43 buddyq I have a branch where I've done a lot of commits. One of the commits fixes some php notices that still need to be fixed on the master branch. However, that was several commits ago. Is there a way that I can apply everything just from that commit to another branch? Without including other previous commits?
14:43 Random832 buddyq: cherry-pick
14:44 buddyq there's something called cherry-pick?
14:45 shinnya joined #git
14:45 gchristensen you bet, cherry-pick is wonderful
14:46 cyborg_ joined #git
14:46 ^7heo yeah
14:46 ^7heo it's better than prune-pick
14:46 ^7heo much better
14:48 mustmodify buddyq: yep, love it.
14:48 buddyq sweet... loooking at docs
14:48 mustmodify _ikke_: that worked, thanks.
14:48 Raging_Hog and prune-pick is better than force-prune-with-lease
14:49 v0lksman joined #git
14:50 v0lksman hello all.  Simple question but I want to be 100% sure I'm doing it right.  I created a branch months ago, wrote some changes and then switched back to master.  Made a bunch of changes in master and now want to pick up on my branch but with the changes to master included.  Is that simply checkout branch and rebase?
14:50 buddyq wow... cherry-pick looks like a hard command to understand. I can never understand docs very well.
14:52 buddyq i stashed some changes before moving to a branch. Now I want to go back to that branch and continue working. How do I get my stash back?
14:52 moritz v0lksman: yes, git checkout thebranch; git rebase master
14:52 moritz v0lksman: in case you haven't pushed the branch, that is
14:52 moritz buddyq: git stash apply
14:52 buddyq ok
14:52 thiago v0lksman: yes
14:52 buddyq thanks
14:52 romerocesar joined #git
14:52 v0lksman moritz: haven't and I'm sole developer... :)
14:53 kpease joined #git
14:53 mustmodify left #git
14:53 xall_ joined #git
14:54 buddyq okay cool. That worked.
14:54 adamm joined #git
14:55 buddyq Now... when I do git status I have new file for all my wp-content/themes/ files. Including images... By my gitignore file ignores should ignore all image files I thought.
14:55 cdown joined #git
14:56 buddyq I exclude everything in my gitignore and allow with exceptions like this: !wp-content/themes/enfold-child/
14:56 buddyq would this also track images? I guess I dont block images.
14:58 dreiss joined #git
14:59 ahmed_elgabri joined #git
15:00 nickthetait joined #git
15:02 crayon joined #git
15:02 crayon joined #git
15:03 Prawnzy joined #git
15:03 LionsMane joined #git
15:04 jaguarmagenta joined #git
15:04 converge joined #git
15:04 converge joined #git
15:05 star_prone joined #git
15:07 IrishPrime joined #git
15:07 zivester joined #git
15:07 IrishPrime joined #git
15:08 tvw joined #git
15:08 moritz buddyq: !ignore_tra
15:08 gitinfo buddyq: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
15:08 kimonorouge joined #git
15:09 buddyq moritz: I did that. The thing was for some reason, it had my entire wp-content folder in red.  And I dont know why it did that.
15:10 buddyq Would that happen if I was accidentally in a folder other than root of the git repo and did some commits and changes and then discovered my shell directory was a few directories in and then switched to the root?
15:13 romerocesar joined #git
15:14 buddyq holy crap... my commit just got rid of a bunch of core wordpress files!!! ACK! If I undo that commit will I also lose all the changes I did??????
15:14 gchristensen buddyq: what was the sha of that commit?
15:14 buddyq hash?
15:14 gchristensen yeah
15:14 buddyq d0c0eb740471f3
15:15 gchristensen great, remember that, and as long as you don't git-gc you won't lose it. now you can do somethng like git reset --soft HEAD~1 and you'll go back one commit with your changes staged, there you can git reset individual paths to remove them from the index
15:16 gchristensen if you want to be extra careful, you can do git show --patch d0c0eb740471f3 > my.patch and it should save a patch of all your changes
15:16 buddyq ok. one step at a time. I'm a git baby
15:16 cagmz joined #git
15:17 fakenerd_ joined #git
15:18 madewokherd joined #git
15:19 buddyq gchristensen: crap... I did that and it looks like it worked when I do git status. I see them all staged. However, my site is still borked and missing files.
15:19 leehambley joined #git
15:19 fub joined #git
15:19 gchristensen left #git
15:20 buddyq where are my files??
15:22 cdown_ joined #git
15:22 corsibu joined #git
15:23 umpc joined #git
15:24 buddyq i'm missing core wordpress files in my root directory. My gitignore file doesn't track anything unless specified. So I track 4 custom plugins and my themes folders. That's it. Everything should no be tracked or touched.
15:24 JeroenT joined #git
15:26 buddyq i did that command again and went back another commit. Now I can see delete" <files>
15:27 buddyq why is that??
15:28 hahuang65 joined #git
15:28 emattiza joined #git
15:28 rezrov joined #git
15:29 VagabondAzulien joined #git
15:29 anonymuse joined #git
15:29 buddyq I wonder what I may have done for it to think that i wanted to delete file.
15:30 e14 joined #git
15:30 buddyq is there a way to keep any changes but still unstage all the files?
15:30 nawwmz joined #git
15:31 buddyq everything staged says deleted: <filename> about a million times.
15:31 buddyq anyone here? Or did my ocnnection give out?
15:31 jost_ joined #git
15:31 buddyq left #git
15:31 buddyq joined #git
15:32 jez9999 joined #git
15:32 jez9999 I'm amazed at how well git compresses data
15:32 buddyq anyone get my last messages??
15:32 jez9999 it almost seems like it isn't storing all of my repo
15:32 jez9999 like, if I zip up my repo with the TOP 7Zip algorithm, it is 42MB
15:32 jez9999 but the .git dir is just 36MB - and that includes deltas!
15:33 JeroenT joined #git
15:33 jez9999 so git takes several MB less than the best 7Zip algorithm, INCLUDING deltas
15:33 Es0teric joined #git
15:33 Macaveli joined #git
15:33 buddyq I did that command git reset --soft HEAD~1 and my files are deleted still. SO I did it a second time and now I see this is a commit where it deleted all the files. Thousands. I dont know why it would do that since they are not tracked.
15:33 jez9999 actually to be fair........ git isn't storing my node_modules. :-)
15:34 codepython777 joined #git
15:34 Random832 buddyq: if they're not tracked they shouldn't ever have been in the repository in the first place
15:34 buddyq So, right. Thats what I thought.
15:34 Random832 if you go from tracking to not tracking files, particularly if you follow instructions to "git rm --cached", that deletes them from the repository even though it leaves them alone on your disk, and will show up as a commit deleting them
15:34 romerocesar joined #git
15:35 fmcgeough joined #git
15:36 buddyq I know. But I dont rmember doing that with all these files. My gitignore ignores everything unless specificed. I have a gitignore I found here: https://gist.githubusercontent.com/salc​ode/b515f520d3f8207ecd04/raw/.gitignore and added my own plugins and themes
15:36 jez9999 left #git
15:37 buddyq i'm tracking with these at the bottom of that file: !wp-content/plugins/agentassets_custom/
15:38 buddyq if I do a git reset will I lost all changes?
15:38 buddyq or just unstage?
15:38 r00twrh joined #git
15:38 buddyq git status just has deleted: <filename> for thousands of files.
15:38 buddyq or hudnreds
15:39 marcogmonteiro joined #git
15:40 kimonorouge joined #git
15:43 Faylite joined #git
15:45 fakenerd joined #git
15:46 Spacew00t joined #git
15:47 Pieplay joined #git
15:49 sangy joined #git
15:51 converge joined #git
15:53 synthroid joined #git
15:54 jfran joined #git
15:55 tyreld joined #git
15:55 fuchstronaut joined #git
15:55 kimonorouge joined #git
15:55 fuchstronaut joined #git
15:55 romerocesar joined #git
15:55 Cavallari1 joined #git
15:58 alex1a joined #git
15:59 hariel joined #git
16:02 systemovich joined #git
16:04 oskarkv joined #git
16:05 mrpackethead joined #git
16:05 fuchstronaut joined #git
16:06 jasondockers joined #git
16:06 davix joined #git
16:06 zero85 joined #git
16:07 svm_invictvs joined #git
16:08 durham joined #git
16:08 _cyril_ joined #git
16:09 thiago_ joined #git
16:10 jccn joined #git
16:10 BSaboia joined #git
16:10 cyan__ joined #git
16:11 Cavallari joined #git
16:12 mindfart joined #git
16:13 parasite joined #git
16:14 Electrometro joined #git
16:15 durham joined #git
16:16 davimore__ joined #git
16:16 Guest79037 joined #git
16:16 romerocesar joined #git
16:18 VagabondAzulien joined #git
16:19 thebloggu joined #git
16:19 [Brain] joined #git
16:20 fuchstronaut joined #git
16:21 Vinnie_win joined #git
16:24 Pazzaz joined #git
16:25 Oip joined #git
16:27 madewokherd joined #git
16:30 tlaxkit joined #git
16:31 buddyq joined #git
16:31 algun joined #git
16:32 nettoweb joined #git
16:33 lindenle joined #git
16:36 nickthetait joined #git
16:37 romerocesar joined #git
16:38 kulelu88 joined #git
16:41 r00tWearsRedHats joined #git
16:41 Salander27 joined #git
16:41 ahmed_elgabri joined #git
16:43 InfoTest joined #git
16:44 drmt joined #git
16:48 nitric joined #git
16:48 davix[matrix] joined #git
16:49 _ADN_ joined #git
16:51 User458764 joined #git
16:51 stomplee joined #git
16:51 tyreld joined #git
16:52 treehug88 joined #git
16:53 SteffanW joined #git
16:54 ||JD|| joined #git
16:54 kimonorouge joined #git
16:54 ||JD|| hey, what's the proper way to tell git to ignore a symlink?
16:55 GavinMagnus left #git
16:56 j416 ||JD||: use gitignore
16:56 hahuang65 joined #git
16:56 j416 ||JD||: man gitignore
16:56 gitinfo ||JD||: the gitignore manpage is available at http://jk.gs/gitignore.html
16:58 romerocesar joined #git
16:59 ||JD|| kthanks
17:02 cdown joined #git
17:03 jimi_ joined #git
17:03 CtrlC on bitbucket, where can I see the email of someone who did a commit?
17:03 robotroll joined #git
17:03 laumann joined #git
17:04 dreiss joined #git
17:04 cdown joined #git
17:04 grawity CtrlC: "View Raw Commit"
17:04 subhojit777 joined #git
17:05 CtrlC Thank you.
17:05 dan2k3k4 joined #git
17:05 nidr0x joined #git
17:07 nanga joined #git
17:07 Derperperd joined #git
17:09 star_prone joined #git
17:10 jfran joined #git
17:11 Vampire0 grawity, and on GitHub?
17:11 grawity Vampire0: add .patch to the URL
17:11 grawity I dunno where the button is
17:11 mquin joined #git
17:11 Vampire0 Ah, nice trick, thx grawity
17:13 jstimm joined #git
17:14 Vampire0 grawity, I think there is no button. The page just includes <link> tags with rel="alternate" one for .diff and one for .patch. But unless you have a browser or plugin that renders these alternates somehow, I think there is no button
17:15 fuchstronaut joined #git
17:15 Sasazuka joined #git
17:16 mischat_ joined #git
17:17 diogenese joined #git
17:19 mgoodwin Has anyone modified their workflow after basically constantly roadblocking themselves on "hiding the sausage"
17:19 romerocesar joined #git
17:20 mgoodwin I often work quickly when creating something new and find it too cumbersome to stop and make small commits, and then I find myself fighting between adding each file and explaining its purpose in separate commits, or just adding everything at once and being "lazy"
17:20 bongjovi joined #git
17:21 apaz joined #git
17:21 ochorocho__ joined #git
17:22 emg joined #git
17:24 User458764 joined #git
17:24 Groscheri joined #git
17:24 SpeakerToMeat joined #git
17:26 sea-gull joined #git
17:29 Es0teric joined #git
17:31 bremner you can always split commits later
17:31 ||JD|| left #git
17:32 Hacker432 joined #git
17:33 Hacker432 Hi guys, I have a question on git, I need help on a strange thing that something happens to me
17:33 Hacker432 when I do "git commit -a" it shows a value and just stops
17:33 Hacker432 why?
17:34 Gsham joined #git
17:35 mikecmpbll joined #git
17:35 mgoodwin bremner: yeah sure, if you're not collaborating - but I'm talking about the most efficient path to `git push` without having to spend 30-50% of the time of curating commits and rebasing
17:36 WhiskerBiscuit joined #git
17:36 bremner well, I mean split them later before you commit
17:36 bremner err, before you push
17:37 atomi joined #git
17:39 Spacew00t joined #git
17:41 fenris_kcf joined #git
17:42 Orion3k joined #git
17:43 fenris_kcf saluton. is there a way to group git-repositories, so that i can operate on the "master" in order to handle all the sub-repos?
17:44 aard_ joined #git
17:47 xall_ joined #git
17:49 hahuang65 joined #git
17:50 overlord_tm joined #git
17:50 tobiasvl fenris_kcf: !submodule !git-subtree
17:50 gitinfo fenris_kcf: git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
17:50 gitinfo fenris_kcf: git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/mas​ter/contrib/subtree/git-subtree.txt for more info.
17:50 kadoban joined #git
17:53 HoierM joined #git
17:53 mrpackethead joined #git
17:57 Mulf joined #git
17:58 osse joined #git
17:59 gfixler joined #git
18:01 Faylite_ joined #git
18:03 cagedwisdom joined #git
18:04 umpc joined #git
18:04 thejoecarroll joined #git
18:05 mgoodwin joined #git
18:05 mns joined #git
18:06 jfran joined #git
18:07 osse joined #git
18:07 fenris_kcf tobiasvl: so if i have a folder "foo" with two subfolders "bar" and "baz", which are bot git-repos, i can init a repo in "foo" and add the sub-repos by "git add submodule bar/baz"?
18:07 fenris_kcf * git submodule add
18:07 tobiasvl yes
18:08 fenris_kcf ok, let me try that
18:09 ki0 joined #git
18:09 fenris_kcf tobiasvl: if i init "foo" as bare repo i get "fatal: /usr/lib/git-core/git-submodule cannot be used without a working tree." on "git submodule add bar"
18:13 Seveas fenris_kcf: that's expected
18:13 Seveas 'git submodule add' needs to edit the worktree, so it needs to have one :)
18:14 vuoto joined #git
18:15 fenris_kcf Seveas: so i can only use it in a non-bare repository, you say?
18:16 satifant joined #git
18:16 star_prone joined #git
18:16 fuchstronaut joined #git
18:17 jacob123 joined #git
18:18 Learath2 joined #git
18:19 dsantiago joined #git
18:19 manuels joined #git
18:23 kimonorouge joined #git
18:24 m0viefreak joined #git
18:24 dsantiago joined #git
18:25 rahtgaz joined #git
18:25 dsantiag_ joined #git
18:33 DuckHuntDog joined #git
18:33 finalbeta joined #git
18:33 NeverDie joined #git
18:34 barteks2x joined #git
18:36 mischat joined #git
18:37 d0nn1e joined #git
18:37 madewokherd` joined #git
18:37 Gsham joined #git
18:40 cschneid joined #git
18:40 WayToDoor joined #git
18:41 Pazzazour joined #git
18:43 forrestv joined #git
18:43 nikivi joined #git
18:46 irqq joined #git
18:49 m1dnight_ joined #git
18:50 m1dnight2 joined #git
18:50 nuck joined #git
18:51 leehambley joined #git
18:51 Guest51781 joined #git
18:58 cagedwisdom joined #git
19:00 shaggycat joined #git
19:01 jasondockers joined #git
19:06 tvw joined #git
19:07 dreiss joined #git
19:09 endiruna joined #git
19:11 Dougie187 joined #git
19:12 Dougie187 joined #git
19:12 tobiasvl fenris_kcf: a little late, but yes
19:12 tobiasvl well, you can use it in a non-bare of course, the history will be there. but you can't add files in a bare repo
19:12 johnmilton joined #git
19:13 davimore joined #git
19:14 _ADN_ joined #git
19:14 fenris_kcf tobiasvl: it's ok if i can't add files in the master
19:14 fenris_kcf i just want it to group the subrepos
19:14 fenris_kcf how should i do that?
19:16 finalbeta joined #git
19:17 fuchstronaut joined #git
19:21 davimore joined #git
19:21 cryptopsy joined #git
19:21 cryptopsy hello, my server is full, i wanna push from local to server my current files, nuking everything else there
19:21 cryptopsy its just serving static http content
19:22 dpower joined #git
19:22 Rodya_ joined #git
19:23 BanHammor joined #git
19:23 BanHammor left #git
19:24 bluezone joined #git
19:26 cryptopsy so i deleted some files off local then i deleted them off the server , then i run the same git add -A pub/* , git commit -m "date" , git push origin master --force
19:26 cryptopsy this should work?
19:26 cryptopsy i.e the files on server in pub/ should be exactly those local, nothing more nothing less?
19:27 cryptopsy l
19:27 ochorocho__1 joined #git
19:29 fuchstronaut joined #git
19:32 nwkj86 joined #git
19:32 tobiasvl fenris_kcf: do it in a non-bare repo
19:34 crayon joined #git
19:38 freimatz joined #git
19:39 kimonorouge joined #git
19:40 rnsanchez_ joined #git
19:41 trelane joined #git
19:41 trelane joined #git
19:41 mrpackethead joined #git
19:44 cyan__ joined #git
19:46 aidalgol joined #git
19:48 kazantip joined #git
19:51 cdg joined #git
19:52 jacob123_ joined #git
19:54 slappy16 joined #git
19:55 sssilver joined #git
19:56 Faylite joined #git
19:56 cyan__ joined #git
19:57 fatalhalt joined #git
19:57 skunkz joined #git
19:58 sssilver joined #git
20:09 roo joined #git
20:09 cachemoi joined #git
20:11 kimonorouge joined #git
20:11 ResidentBiscuit joined #git
20:11 alex1a joined #git
20:15 Guest46700 I am using git reset <fileName> but then doing git status that file is shown in the modified list. I dont want to track that file
20:20 Scriptonaut joined #git
20:22 Scriptonaut hey guys, I'm setting up a new machine, and when I do git log, and then hit q, the entire page of text disappears and brings me back to the previous state of the terminal before I did any of that. On my other machines, it stays there (so I can hit q, then read the log while I type a command). Does anyone know how I can make git log stay on the screen after I hit q?
20:22 Didac joined #git
20:22 preaction Scriptonaut: configure your pager (probably less)
20:22 Scriptonaut preaction: ah, oh. So it's less?
20:22 Scriptonaut how does one configure that? (man page?)
20:23 preaction i said "probably", i don't know what your pager is. check $PAGER
20:23 preaction and then it'd be "man less"
20:23 Scriptonaut ya it's less
20:23 Scriptonaut ah ok
20:24 preaction there's a $LESS envvar you can use to set options, so whatever option to less does what you want, add it to $LESS
20:24 preaction like mine is "RSXin", but i'm pretty sure it doesn't have the behavior you want
20:24 preaction oh, no wait it does
20:25 davix joined #git
20:27 Scriptonaut preaction: cool
20:27 Scriptonaut mine is "-R"
20:27 preaction it's the X that does it, i think
20:28 Scriptonaut cool, I'll try that
20:28 preaction but it's all there in the less manpage under Options
20:28 Scriptonaut yay, that works
20:28 Scriptonaut thanks
20:29 cdown joined #git
20:30 fuchstronaut joined #git
20:30 fuchstronaut joined #git
20:32 durham joined #git
20:33 crayon joined #git
20:35 mischat joined #git
20:36 ahr3n joined #git
20:37 durham joined #git
20:43 cyan__ joined #git
20:44 ieee joined #git
20:45 m___1 joined #git
20:46 shpew12 joined #git
20:46 NightMonkey Howdy. Silly sysadmin question. Let's say I have changes in my working tree. I want to switch branches to work on something else, but I know my worktree changes are half-baked. Should I still 'git add' the changes before I checkout the other branch? Or "git stash"?
20:47 NightMonkey (I'm adhering to the "GitHub Workflow", fwiw.)
20:47 kadoban NightMonkey: You should likely !float them over or stash them, depending on what you want to happen.
20:47 gitinfo NightMonkey: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
20:47 NightMonkey Also, is there a way to make 'git checkout' warn me before discarding working tree changes?
20:48 Synthead joined #git
20:48 mischat__ joined #git
20:49 NightMonkey Generally, I'm looking for simple ways to make git less "destructive by default" in my working environment. :D
20:49 moritz NightMonkey: git checkout <branch> doesn't discard any working tree changes
20:50 moritz only the git checkout <path> version does
20:50 NightMonkey moritz: Oh!
20:50 NightMonkey moritz: Sorry, I was reading this: http://stackoverflow.com/questions/2728404​/what-are-the-destructive-commands-in-git
20:50 NightMonkey moritz: Is this no longer true?
20:51 moritz NightMonkey: also, regarding your question earlier, you can commit half-baked features, and later make the commits prettier
20:51 moritz NightMonkey: 'git checkout' can do *very* different things depending on how you call it.
20:51 moritz if you call it with a branch name, it won't ever discard your changes
20:52 moritz if you call it with a file or directory, it discards the changes in those paths
20:52 NightMonkey moritz: Ah, okay. Thank you for that.
20:52 * NightMonkey hopes his filenames never resemble branch names.
20:53 e14 joined #git
20:53 moritz in case of doubt, git favors the branch name interpretation
20:53 moritz and you can disambiguate with ./master or with 'git checkout -- master' if you mean the file
20:54 NightMonkey moritz: Ah, and at least on my system, git checkout <tab> shows only branch names, not filenames.
20:54 moritz NightMonkey: ah, but git checkout <part of a filename><tab> might still show file names
20:55 moritz anyway, collisions between file names and branches are pretty rare in practise
20:56 DuckHuntDog I've got a branch with a bunch of commits and now I want to take some of the latest versions of those files and merge them into another branch. What would you recommend for that? the most popular answer on Stackoverflow is `git diff <branch>^..<branch> -- <filename> | git apply` - do you agree?
20:57 Scriptonaut left #git
20:59 buddyq joined #git
20:59 moritz DuckHuntDog: I mostly disagree with the basic premise. If you need to do it more than once, you likely have workflow that is in conflict with what git as a tool can easily do for you
21:00 geoid joined #git
21:00 cdown joined #git
21:01 juvenal joined #git
21:01 davimore_ joined #git
21:02 kimonorouge joined #git
21:04 DuckHuntDog moritz: I will not do that regularly. Just this once I have a branch that's was the victim of requirement changes so it's been going on for too long and have some commits that change things back and forth. So kinda wanna abandon that branch and just salvage some of the files
21:04 moritz DuckHuntDog: ok
21:05 ki0 joined #git
21:06 NightMonkey moritz: Thank you a bunch.
21:06 DuckHuntDog what does `^..` do in this command  `git diff <branch>^..<branch> -- <filename> | git apply` ?
21:06 Lor_ joined #git
21:06 Learath2 joined #git
21:06 NightMonkey (and thanks kadoban)
21:07 Seveas DuckHuntDog: man gitrevisions
21:07 gitinfo DuckHuntDog: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
21:07 DuckHuntDog I get the same output from `git diff mybranch1 mybranch2 -- somefile.js`
21:07 BlaXpirit DuckHuntDog, wrong assumption. actually is   branch^
21:07 Seveas ^ means 'first parent of what I said'
21:07 DuckHuntDog I get the same output from `git diff mybranch1 mybranch2 -- somefile.js` as I do with `git diff mybranch1^..mybranch2 -- somefile.js`
21:07 Seveas also, stop snickering. That damn duck is hard to shoot!
21:07 NightMonkey I still would love to find out how to make git more 'toddler safe'. :D
21:08 fenris_kcf make an abstraction layer
21:08 DuckHuntDog Seveas: :)
21:08 NightMonkey "Are you sure <y/N>?"
21:08 Seveas M
21:09 DuckHuntDog Seveas: Why would one use 'first parent' in this case?
21:09 DuckHuntDog I don't really get what that would mean in terms of branches
21:09 Seveas DuckHuntDog: didn't read the case, was just responding to that question :)
21:09 BlaXpirit joined #git
21:11 fb| joined #git
21:11 dsdeiz joined #git
21:11 dsdeiz joined #git
21:12 DuckHuntDog Seveas: The case is: you want to apply the latest changes from somefile.js from mybranch1 to mybranch2. And the question is what the difference is between `git diff mybranch1 mybranch2 -- somefile.js | git apply`  versus  `git diff mybranch1^..mybranch2 -- somefile.js | git apply`
21:12 shpew12 I'm trying to modify http-backend, but I'm having trouble figuring out how to tell the difference between a push and a commit in run-time. I'm printing the directory out to a log each time http-backend is run right now, but it's the same for push and commit.
21:14 rorro joined #git
21:15 railssmith joined #git
21:16 codepython777 joined #git
21:20 mustmodify joined #git
21:21 eivarv joined #git
21:24 netj_ joined #git
21:27 shpew12 Has anyone here looked at the git source?
21:28 Seveas shpew12: commit is local, never involves http-backend
21:28 Gsham joined #git
21:28 shpew12 sorry I meant push and clone
21:29 mrpackethead joined #git
21:29 Seveas push == receive-pack, pull/fetch/clone/ls-remote == upload-pack
21:30 fuchstronaut joined #git
21:31 Seveas look at the service_cmd array to see which urls map to what
21:32 nilg joined #git
21:34 corsibu joined #git
21:35 shpew12 oh ok. so there's a variable *c that gets assigned a service command, so I'm assuming I'd look into that variable to differentiate the two.
21:36 Seveas almost at the end of the file: cmd->imp(...)
21:37 buddyq is there a way to show branches graphic in mac terminal?
21:37 corsibu joined #git
21:37 mustmodify left #git
21:37 buddyq git branch just shows a flat list
21:37 Seveas how else would you show them?
21:37 Seveas !soviet_git
21:37 gitinfo In Soviet Git, commits are not on branches, branches point to a commit.
21:37 buddyq like branches on a tree
21:38 Seveas that's not what branches are in git :)
21:38 Seveas but you're looking for !lol
21:38 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
21:38 eivarv joined #git
21:38 Seveas or gitk
21:38 lyddonb joined #git
21:38 Seveas shpew12: what are you trying to change in it?
21:38 lyddonb left #git
21:39 buddyq thanks  Seveas
21:39 buddyq that was pretty cool
21:41 mischat joined #git
21:42 Guest72395 joined #git
21:43 osse feel free to replace --all with --branches. --all might show way to much in some repos
21:48 buddyq okay. I am deciding to do smaller chunks of code and break them into more branches so that if something happens, I dont lose everything.
21:49 kimonorouge joined #git
21:49 geoid joined #git
21:57 nikivi joined #git
21:57 cdown joined #git
21:57 Anja i have just found https://github.com/github/gitignore.git
21:58 shpew12 Seveas: I'm trying to make per-branch permissions, so I'm just grabbing the user in http-backend and crossrefrencing it to a mysql table
22:00 Anja is there any kind of #include or . include syntax for a .gitignore?
22:00 Anja or, asking in a better way, can i have multiple top-level gitignore files?
22:01 elastix joined #git
22:01 Anja this would allow me to pull that repo and not have to dick around with my local files
22:01 Anja but i only want a handful of selections from there
22:02 shpew12 joined #git
22:03 akurniawan joined #git
22:04 ResidentBiscuit joined #git
22:04 thiago joined #git
22:06 f3r70rr35f joined #git
22:07 Xethron joined #git
22:08 blackwind_123 joined #git
22:10 Seveas shpew12: bad idea. Just do it as an update hook
22:10 Seveas the http-backend never sees the branch names
22:11 Seveas it only sees 'hey, give me receive-pack' and pipes all incoming data to a receive-pack process.
22:12 Anja ubuntu 16.04 git from repo. i have no $HOME/.config/git/ignore
22:12 ki0 joined #git
22:13 Seveas then create it :)
22:13 Anja tell me that's a directory and not a file please
22:13 Seveas it's a file
22:13 Anja balls
22:13 benbergman joined #git
22:14 Anja there must be a way to merge several global ignore files from gits perspective
22:14 nettoweb1 joined #git
22:14 Anja but i'm blowed if i can find it
22:14 txdv joined #git
22:14 Anja clearly i'm looking at this from the wrong perspective
22:15 shpew12 Seveas: Oh ok, do you happen to have any examples? or an api referce, man git-hooks seemed like an overview. im kinda dumb.
22:15 ToBeCloud joined #git
22:17 Seveas shpew12: I just happen to have one, yes :)
22:17 Seveas https://dpaste.de/k0c7
22:18 Seveas line 130-140 do something like per-user permiions
22:18 BSaboia how can I treat PDF files as binary in my repo? the autocrlf is messing up with a checked PDF file
22:19 shpew12 Seveas: Oh cool, thanks!
22:19 raijin joined #git
22:20 ResidentBiscuit joined #git
22:21 up_the_irons joined #git
22:24 iamthad_ BSaboia add a line to your .gitattributes file "*.pdf binary", see https://git-scm.com/docs/gitatt​ributes#_using_macro_attributes
22:26 Gsham joined #git
22:28 pdgwien joined #git
22:31 Derperperd joined #git
22:31 fuchstronaut joined #git
22:32 deanosaur joined #git
22:32 f3r70rr35f joined #git
22:32 iamthad joined #git
22:32 e14 joined #git
22:34 jstimm joined #git
22:38 elastix joined #git
22:38 mizu_no_oto joined #git
22:38 Noldorin joined #git
22:40 cyphase joined #git
22:40 BSaboia iamthad, thanks
22:44 madewokherd joined #git
22:45 Anja a brief look at dir.c would indicate that a recursive call from add_excludes to itself when it parses some sort of include tag would do it
22:45 Gsham joined #git
22:46 Anja where is the place to log and/or work on feature requests?
22:46 preaction Anja: the only place i know of is the git mailing list
22:47 Anja preaction, thanks. i will find it and join.
22:47 dreiss joined #git
22:48 Exagone313 joined #git
22:53 jeffreylevesque joined #git
22:58 shpew12 joined #git
23:04 glebihan_ joined #git
23:05 Remram joined #git
23:06 tyreld joined #git
23:12 dikiaap joined #git
23:14 sorenb_ joined #git
23:15 dreiss joined #git
23:16 ayjay_t joined #git
23:17 Sasazuka joined #git
23:18 ResidentBiscuit joined #git
23:19 WhiskerBiscuit joined #git
23:22 anuxivm joined #git
23:22 davidfetter_ge joined #git
23:22 davidfetter_ge hi
23:23 davidfetter_ge i've made a gigantic blob of a commit locally,  but to get it for review, i'd like to split it into more digestible pieces. it's already committed locally, if that matters
23:23 davidfetter_ge how do i do this?
23:26 bremner !perfect
23:26 gitinfo [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
23:27 davidfetter_ge thanks for the tip :)
23:30 gitinfo davidfetter_ge: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
23:30 davidfetter_ge thanks, bremner
23:30 davidfetter_ge .karma bremner
23:30 davidfetter_ge hrm
23:32 svm_invictvs joined #git
23:34 xall_ joined #git
23:34 dsdeiz joined #git
23:36 jast joined #git
23:37 arescorpio joined #git
23:37 gitinfo joined #git
23:38 gitinfo the Genuine Real Life Karma™ REST API results are back! b‍remner: 40 (0 in past 30 days) (1 given out)
23:41 mizu_no_oto joined #git
23:43 shpew12 joined #git
23:47 lindenle joined #git
23:48 shpew12 joined #git
23:50 Shentino joined #git
23:51 BlackMaria_netsp joined #git
23:51 fmcgeough joined #git
23:53 lindenle joined #git
23:54 f3r70rr35f joined #git
23:56 kyan joined #git
23:57 vengative joined #git
23:58 bernardio joined #git

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