IRCloggy #git 2017-12-26

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2017-12-26

← CheckDavid left00:02
→ mel00010 joined00:02
← mel00010 left00:03
← finalbeta left00:04
← maheshpec left00:04
→ Kaisyu joined00:07
← felixsanz left00:09
→ felixsanz joined00:11
← ArcaTech left00:11
← Wetmelon left00:11
← mda1 left00:12
→ TomyLobo joined00:30
← Lyqyd left00:31
← thiago left00:34
← v4ult left00:34
→ shinnya joined00:35
← Guest18 left00:35
← dsdeiz left00:36
→ dsdeiz joined00:37
← FoxRocks left00:37
← Acerific left00:39
→ Guest18 joined00:39
← converge left00:41
← duderonomy left00:45
→ FoxRocks joined00:46
← Hi-Angel_ left00:46
→ jameser joined00:46
→ Masber_080 joined00:52
→ hash-z3r0 joined00:57
← Murr left00:57
→ Murr joined00:58
← hash-z3r0 left01:02
→ safe joined01:04
→ tunekey joined01:14
← FoxRocks left01:16
← MacWinner left01:20
← Gustavo6046 left01:23
← z8z left01:29
→ ismithers joined01:30
→ meesles joined01:34
→ eh3 joined01:38
→ checkItOut joined01:39
← checkItOut left01:39
→ nikheizen joined01:40
← schleppel left01:40
→ checkItOut joined01:40
→ Noldorin joined01:40
→ maheshpec joined01:42
← Tobbi left01:43
← checkItOut left01:44
→ checkItOut joined01:45
← checkItOut left01:46
→ checkItOut joined01:46
→ coreyfarrell joined01:47
← checkItOut left01:48
→ checkItO_ joined01:48
→ checkItOut joined01:49
← checkItO_ left01:50
→ checkIt__ joined01:50
→ Cae joined01:52
← checkItOut left01:53
← checkIt__ left01:53
→ neil_cn joined01:53
coreyfarrell does anyone know of a way to find out if the the current HEAD commit can be cherry-picked to a different branch?01:54
← johnny56_ left01:55
← ismithers left01:56
→ johnny56 joined01:57
→ gugah joined01:57
← dsdeiz left01:58
← maheshpec left01:59
→ giraffe joined01:59
→ dsdeiz joined01:59
← dsdeiz left02:00
→ dsdeiz joined02:00
← shinnya left02:01
→ hash-z3r0 joined02:03
→ finalbeta joined02:04
← fatalhalt left02:05
← ShapeShifter499 left02:05
← Cae left02:07
→ linuxmodder joined02:16
← linuxmodder left02:16
→ linuxmodder joined02:16
← linuxmodder left02:17
→ linuxmodder joined02:18
← linuxmodder left02:18
→ linuxmodder joined02:18
→ felepo joined02:18
← linuxmodder left02:19
← tombusby left02:19
→ dreiss joined02:19
→ linuxmodder joined02:19
← linuxmodder left02:19
→ linuxmodder joined02:19
← felepo left02:19
← linuxmodder left02:20
→ checkItOut_ joined02:21
→ linuxmodder joined02:21
← linuxmodder left02:22
→ linuxmodder joined02:22
← linuxmodder left02:23
→ linuxmodder joined02:24
← linuxmodder left02:24
→ linuxmodder joined02:24
← linuxmodder left02:25
→ z8z joined02:26
→ FoxRocks joined02:26
→ tombusby joined02:26
→ armyriad joined02:32
← moei left02:34
← dreiss left02:35
← jameser left02:36
→ jameser joined02:37
← hash-z3r0 left02:37
← davidfetter left02:38
→ rivalomega joined02:38
→ hash-z3r0 joined02:40
← Barrt left02:43
→ Arcaelyx joined02:45
← ilbot3 left02:46
← cdown left02:47
← themill left02:49
→ themill joined02:55
← surfist left02:55
→ cdown joined02:56
← gugah left02:56
← Murr left02:57
→ Murr joined02:57
→ ilbot3 joined02:58
← salamanderrake left03:00
→ cqi joined03:00
→ salamanderrake joined03:00
→ mud joined03:01
← cdown left03:05
→ houami joined03:05
← leeN left03:08
← houami left03:10
← TomyLobo left03:11
→ houami joined03:12
← hash-z3r0 left03:13
← houami left03:15
→ rajat joined03:16
→ hash-z3r0 joined03:19
← dave0x6d left03:21
← FoxRocks left03:22
← konsolebox left03:25
→ houami joined03:25
→ konsolebox joined03:26
← salamanderrake left03:28
→ salamanderrake joined03:29
LocaMocha → Sauvin03:30
← houami left03:30
← noyb left03:31
→ chachasmooth_ joined03:32
→ dreiss joined03:33
← chachasmooth left03:33
→ jagobdue joined03:34
→ shripadr joined03:34
← Arcaelyx left03:35
→ houami joined03:35
→ Arcaelyx joined03:37
← jagob left03:37
← rajat left03:39
← mud left03:40
← houami left03:40
→ houami joined03:41
← lb1c left03:44
→ lb1c joined03:44
← a3Dman left03:48
← VoradorPT left03:49
← hash-z3r0 left03:51
← nchambers left03:52
← shripadr left03:52
← phinxy left03:52
→ phinxy joined03:53
← phinxy left03:54
→ mizu_no_oto joined03:57
→ g00s joined04:01
→ akushner joined04:02
← Noldorin left04:02
→ hash-z3r0 joined04:03
← pks left04:04
→ pks joined04:05
→ surfist joined04:05
→ ShapeShifter499 joined04:05
← houami left04:07
← vrc414 left04:09
→ duderonomy joined04:11
→ gtristan joined04:11
← mizu_no_oto left04:13
← dreiss left04:14
→ mizu_no_oto joined04:17
← hash-z3r0 left04:18
← bkxd left04:21
→ houami joined04:23
← surfist left04:26
→ vrc414 joined04:28
← mizu_no_oto left04:31
← akushner left04:32
→ surfist joined04:33
← Bin4ry left04:37
← ghost43 left04:38
→ ghost43 joined04:38
← checkItOut_ left04:40
← dsdeiz left04:40
→ dsdeiz joined04:41
→ boombatower joined04:42
← houami left04:43
→ houami joined04:43
→ KeyJoo joined04:45
→ hash-z3r0 joined04:45
← houami left04:48
← eh3 left04:49
→ matsaman joined04:50
← matsaman left04:51
→ houami joined04:54
← Cabanossi left04:58
← hash-z3r0 left05:00
→ Cabanossi joined05:00
→ noyb joined05:00
← houami left05:07
→ houami joined05:07
← houami left05:11
← Saragog left05:12
→ re1 joined05:14
← z8z left05:14
→ t0adst00l joined05:15
→ mel00010 joined05:19
← g00s left05:21
→ pkx2 joined05:24
→ hash-z3r0 joined05:27
← rivalomega left05:28
← t0adst00l left05:28
→ ogny joined05:30
→ houami joined05:30
← ColdKeyboard left05:31
← meesles left05:31
→ ColdKeyboard joined05:31
→ rivalomega joined05:32
← ColdKeyboard left05:32
→ ColdKeyboard joined05:32
← ColdKeyboard left05:33
← rivalomega left05:34
← pkx2 left05:34
→ rivalomega joined05:34
→ FoxRocks joined05:35
→ nan2 joined05:35
← nan2 left05:36
→ t0adst00l joined05:38
← hash-z3r0 left05:38
← t0adst00l left05:40
← felixsanz left05:40
→ felixsanz joined05:41
← arecacea1 left05:43
→ wandering_vagran joined05:43
→ arecacea1 joined05:44
→ ColdKeyboard joined05:44
← Guest18 left05:44
→ pkx2 joined05:45
→ xxMatiasxx joined05:49
→ rajat joined05:50
← dviola left05:52
xxMatiasxx Hi we have a master branch which has the version that we have in production of our application. Then we have a develop branch were we develop and test our code. We decided to do some changes on our folder structure and we made some big "git mv"s. Later another couple of bug fixes were solved in master since it was code that was needed to be put on production asap. Now I want to sync our develop branch with those fixes, but i05:52
t will recreate the folders that we moved. How can I accomplish this ?05:52
_ikke_ One way is to merge, but not commit, and then move those files as well05:56
→ t0adst00l joined05:56
→ hdqn joined05:56
hdqn awwwhhh silly me! so I added some lines, committed, merged a branch, deleted it, forgot about the merge, reset HEAD~; add .; commit -C ORIG_HEAD to add a change I wanted to include in the commit before the merge, aaand obviously fail, since now the change is included with the merge instead06:00
→ shripadr joined06:00
→ hash-z3r0 joined06:01
← foul_owl left06:02
← t0adst00l left06:02
← hash-z3r0 left06:06
← m0viefreak left06:07
← IanLiu left06:08
→ shripadr_ joined06:09
→ fatalhalt joined06:10
← shripadr left06:10
→ t0adst00l joined06:16
← pkx2 left06:17
← t0adst00l left06:18
→ pkx2 joined06:18
← rivalomega left06:24
→ rivalome_ joined06:24
← Guest90807 left06:26
← justan0theruser left06:30
→ justanotheruser joined06:30
→ prometheus_falli joined06:31
→ re1_ joined06:32
→ hash-z3r0 joined06:32
← FoxRocks left06:34
← menip left06:35
← re1 left06:35
← xxMatiasxx left06:35
← matoro left06:36
→ matoro joined06:36
← rivalome_ left06:44
→ rivalomega joined06:45
→ macopython joined06:46
→ deepakbndeepu joined06:48
macopython Can I extract changes for particular file from git patch ?06:52
← PaulePanter left06:54
→ xcm joined06:57
← deepakbndeepu left06:58
← tombusby left07:00
→ jesst_ joined07:01
→ tombusby joined07:02
← strugee left07:03
← jesst_ left07:03
← hash-z3r0 left07:06
← rivalomega left07:06
→ rivalomega joined07:06
→ dreiss joined07:06
← Xiti left07:08
→ Silmarilion joined07:10
→ Xiti joined07:12
→ littlepython joined07:18
littlepython → houami_07:18
← houami left07:20
← dreiss left07:20
← konsolebox left07:20
→ strugee joined07:21
→ Rr4sT joined07:22
← johnzorn- left07:23
← prometheus_falli left07:23
← houami_ left07:23
→ prometheus_falli joined07:23
→ YuGiOhJCJ joined07:24
→ sz0 joined07:24
← prometheus_falli left07:25
→ prometheus_falli joined07:26
← staafl_ left07:26
→ konsolebox joined07:27
← strugee left07:27
→ johnzorn joined07:27
→ foul_owl joined07:28
→ staafl joined07:29
← konsolebox left07:32
← Xiti left07:34
← YuGiOhJCJ left07:34
→ YuGiOhJCJ joined07:34
→ konsolebox joined07:34
→ Xiti joined07:35
→ PaulePanter joined07:36
← kculpis left07:38
→ strugee joined07:40
← macopython left07:41
→ hash-z3r0 joined07:41
← Neo_ left07:44
→ tkore joined07:47
← hdqn left07:47
← YuGiOhJCJ left07:48
→ YuGiOhJCJ joined07:49
→ houami joined07:49
← publio left07:51
← knop_ left07:53
→ KnoP joined07:53
← hash-z3r0 left07:56
← konsolebox left07:56
← prometheus_falli left07:56
→ prometheus_falli joined07:57
← rivalomega left07:57
← boombatower left07:59
→ konsolebox joined08:00
← YuGiOhJCJ left08:04
→ YuGiOhJCJ joined08:04
← jagobdue left08:08
→ zefferno joined08:10
→ jnavila joined08:10
← YuGiOhJCJ left08:15
zxd hi08:17
how do I see the history of changes of a paticular files from 20 commits back08:18
→ Darcidride joined08:18
→ bkxd joined08:20
← cqi left08:20
← jnavila left08:22
← blahdodo left08:23
→ hash-z3r0 joined08:23
→ tvw joined08:31
← prometheus_falli left08:31
→ prometheus_falli joined08:31
← tvw left08:32
← coreyfarrell left08:33
→ tvw joined08:36
← hash-z3r0 left08:36
→ a3Dman joined08:38
← madewokherd left08:38
→ oxymoron93 joined08:38
← houami left08:42
← johnzorn left08:43
← safe left08:44
← katiex7 left08:46
→ shripadr joined08:46
← shripadr_ left08:48
← pkx2 left08:51
→ johnzorn joined08:52
← tvw left08:53
→ houami joined08:54
← houami left08:56
→ houami joined08:56
→ jceb joined09:01
→ hash-z3r0 joined09:04
→ blahdodo joined09:07
← blahdodo left09:10
← hash-z3r0 left09:11
→ blahdodo joined09:14
← PaulePanter left09:14
→ PaulePanter joined09:14
→ cqi joined09:15
← because left09:21
→ because joined09:23
← swalladge left09:25
← xcm left09:26
→ t0adst00l joined09:26
← t0adst00l left09:27
→ t0adst00l joined09:27
← cqi left09:28
← jceb left09:28
← rajat left09:28
← prometheus_falli left09:28
← t0adst00l left09:28
→ t0adst00l joined09:29
→ prometheus_falli joined09:30
← re1_ left09:31
← jameser left09:31
← Rr4sT left09:32
← tombusby left09:33
← sz0 left09:33
→ tombusby joined09:33
→ swalladge joined09:33
→ ZexaronS joined09:34
← nydel07 left09:35
→ publicarray joined09:37
← publicarray left09:38
houami i get this09:38
Please commit your changes or stash them before you merge.09:38
Please commit your changes or stash them before you merge.09:39
hi09:39
StephenS git stash or git commit ...09:39
← houami left09:39
→ houami joined09:40
← ShapeShifter499 left09:40
houami hi09:40
i get this error Please commit your changes or stash them before you merge.09:40
how can i resolve this09:40
StephenS <StephenS> git stash or git commit ..09:40
houami i want to discard my changes09:42
can i just do git checkout on <untracked files>?09:43
← tombusby left09:43
→ SteffanW joined09:44
→ tombusby joined09:44
→ hash-z3r0 joined09:44
← energizer left09:44
zxd how does git blame work?09:45
_ikke_ zxd: In what way?09:45
houami On branch master09:46
Your branch is behind 'origin/master' by 93 commits, and can be fast-forwarded.09:46
→ nydel07 joined09:46
houami when i do git status ^^09:46
now if i do a git pull,it tells me09:47
Please commit your changes or stash them before you merge.09:47
but I have not done any changes09:47
zxd _ikke_: technically09:47
houami when i do git status,it shows lot of modifications09:47
how is that possible09:47
zxd _ikke_: how does it keep track of who changed the file and the lines09:47
_ikke_ zxd: It traverses the history (each commit) that touches the file09:48
Each commit is compared to it's parent to see what lines the commit touched09:48
the lines that are changed are attributed to the author of that commit09:48
houami: did you by chance use git update-index --asume-unchanged?09:49
houami _ikke_: no09:49
← hash-z3r0 left09:49
← ArKane left09:49
_ikke_ Might be an untracked / ignored file that git warns you about09:50
houami no09:51
→ schleppel joined09:51
zxd _ikke_: it must go through the entire history to look for commits that touched the file?09:51
houami there are lot of file09:51
this is the first time I am trying to do a git pull after a long time09:51
← konsolebox left09:53
_ikke_ houami: git diff --name-only --diff-filter=A HEAD @{u}09:54
→ konsolebox joined09:54
_ikke_ houami: git diff --name-only --diff-filter=A @{u} HEAD09:54
← johnzorn left09:54
_ikke_ sorry, no the first one was correct09:54
houami the first command told 3 files09:54
the second command told only one file09:55
→ TomyLobo joined09:55
_ikke_ houami: Is one of those 3 files a file that09:55
houami ?09:56
→ johnzorn joined09:56
houami I dont understand that09:56
_ikke_ Are those files currently untracked / ignored?09:57
← Random832 left09:59
→ navidr joined10:01
← TSS_ left10:06
← wandering_vagran left10:09
→ Random832 joined10:12
→ TSS_ joined10:13
houami _ikke_: no they are not10:14
← diogenese left10:16
→ diogenese joined10:17
→ mikecmpbll joined10:20
→ JoshuaD joined10:25
→ Teremy joined10:25
→ opalepatrick joined10:25
→ czart joined10:27
→ imack joined10:28
→ tkore\work joined10:29
← tkore\work left10:30
→ tkore\work joined10:31
← tkore\work left10:31
→ tkore\work joined10:31
← tkore\work left10:32
→ tkore\work joined10:33
→ jnavila joined10:33
← tkore left10:33
tkore\work → tkore10:33
← tkore left10:34
→ tkore joined10:35
← tkore left10:35
→ tkore joined10:36
← tkore left10:37
→ nms joined10:38
→ tkore joined10:38
← tkore left10:38
→ tkore joined10:38
houami _ikke_: any idea what to do10:39
← prometheus_falli left10:41
← t0adst00l left10:41
→ TomyLobo2 joined10:43
← mikecmpbll left10:43
← TomyLobo left10:46
← TomyLobo2 left10:50
→ ok91 joined10:51
← dmaian left10:52
→ dmaian joined10:52
← konsolebox left10:57
← tobiasvl left10:58
→ MarioBranco joined10:58
← MarioBranco left10:58
→ konsolebox joined11:00
← dmaian left11:02
→ dmaian joined11:02
→ tvl joined11:02
tvl → tobiasvl11:02
← Teremy left11:04
← tkore left11:07
→ MarioBranco joined11:10
← MarioBranco left11:10
→ MarioBranco joined11:12
→ cdown joined11:13
← nms left11:22
← QualityAddict left11:23
→ shinnya joined11:26
← dmaian left11:30
→ dmaian joined11:30
→ BouncyKnightMike joined11:30
→ m0viefreak joined11:32
→ dave0x6d joined11:32
← neil_cn left11:32
→ thiago_ joined11:33
← MarioBranco left11:34
← dmaian left11:34
→ MarioBranco joined11:34
→ dmaian joined11:34
← konsolebox left11:34
← houami left11:35
→ konsolebox joined11:36
→ IanLiu joined11:37
← thiago_ left11:37
← noyb left11:37
← JoshuaD left11:37
← clickjac_ left11:39
← raynold left11:39
→ clickjack joined11:39
→ mishu_ joined11:40
← cdown left11:41
→ mobarmeg joined11:42
→ thiago_ joined11:43
← mobarmeg left11:43
→ cdown joined11:43
← BouncyKnightMike left11:43
→ mobarmeg joined11:43
→ db8093246 joined11:44
→ JoshuaD joined11:47
→ bhavya2b joined11:48
→ senaps joined11:49
← senaps left11:51
← mobarmeg left11:55
→ houami joined11:55
← houami left11:55
→ houami joined11:56
← cdown left11:58
← mmattice left11:58
← konsolebox left11:59
→ Master__ joined11:59
→ mmattice joined11:59
← a3Dman left12:00
→ konsolebox joined12:01
← MarioBranco left12:03
→ a3Dman joined12:03
← clickjack left12:03
← bhavya2b left12:05
← houami left12:11
→ HuskyApocalypse joined12:13
→ phluks joined12:15
→ mikecmpbll joined12:16
← HuskyApocalypse left12:17
← heroux left12:17
← mikecmpbll left12:19
→ houami joined12:23
← houami left12:24
→ houami joined12:24
→ rawste joined12:24
← frivol left12:25
← albel727 left12:25
→ noobineer joined12:26
← Gurkenglas left12:27
→ shripadr_ joined12:28
← shripadr left12:28
→ albel727 joined12:29
→ Discovery joined12:30
← jimmyrcom left12:34
← shripadr_ left12:34
→ TheOrangeOne joined12:34
← houami left12:37
→ houami joined12:39
← unreal left12:41
← db8093246 left12:43
← houami left12:44
→ Floflobel joined12:44
→ clickjack joined12:48
→ houami joined12:49
← noobineer left12:50
→ sarp joined12:50
→ fenix joined12:50
→ mizu_no_oto joined12:52
← houami left12:54
→ mobarmeg joined12:54
← mobarmeg left12:55
→ mobarmeg joined12:55
→ dviola joined12:55
← mizu_no_oto left12:57
→ mobarmeg_ joined12:59
← kus left12:59
← bkxd left13:00
← mobarmeg_ left13:00
← mobarmeg left13:02
fenix hi how to load db/redis etc settings automatically when working on developemnt and production (php), can we automate it like when i work on testing server all the testing settings will be loaded and same when working on live.how do you guys manage this, currently we are manually chaning live details when pushing to live and same when working on testing. thanks in advance13:03
→ LichtMacher joined13:04
→ cdown joined13:04
← sarp left13:05
ChristmasSucks → Hello7113:08
→ mmlb joined13:09
← ok91 left13:09
→ synthroid joined13:11
→ sarp joined13:12
→ AliSSaBaby joined13:14
← AliSSaBaby left13:15
→ wxg joined13:17
→ dimi1947 joined13:17
← finalbeta left13:17
→ finalbeta joined13:18
→ houami joined13:19
→ Gustavo6046 joined13:20
← Hello71 left13:21
← fenix left13:21
← AndyBlue left13:21
→ Hello71 joined13:21
← rawste left13:22
← mishu_ left13:23
← houami left13:23
← johnzorn left13:24
→ mostlybadfly joined13:26
→ mikecmpbll joined13:27
→ leeN joined13:28
→ tkore joined13:28
← tkore left13:28
→ tkore joined13:28
→ houami joined13:29
→ bkxd joined13:31
← houami left13:33
cbreak I don't use databases or redis13:35
why would it?13:35
have you thought about using a proper language / platform? :)13:36
← wxg left13:36
← Darcidride left13:37
← sarp left13:37
→ regedit joined13:38
→ pkx2 joined13:38
thiago_ he'sleft a long time ago13:39
thiago_ → thiago13:39
→ houami joined13:39
→ Darcidride joined13:39
→ shripadr joined13:41
→ mud joined13:41
← vrc414 left13:42
→ vrc414 joined13:43
← houami left13:43
← Gustavo6046 left13:44
→ Gustavo6046 joined13:44
→ houami joined13:49
→ Tobbi joined13:50
→ senaps joined13:50
→ iLembus joined13:51
← ggoebel left13:52
→ sarp joined13:53
← houami left13:53
→ yohnnyjoe joined13:54
← Master__ left13:55
→ MarioBranco joined13:55
← senaps left13:58
← yohnnyjoe left13:58
← mecasou left13:59
→ houami joined13:59
← raijin left13:59
← Gustavo6046 left14:00
→ fission6 joined14:03
← houami left14:03
← phluks left14:06
← fission6 left14:08
← pkx2 left14:08
→ houami joined14:08
→ fission6 joined14:09
→ str_ joined14:12
← houami left14:13
→ Amanas joined14:13
→ Bathyal joined14:13
Bathyal hey folks, is there a way to make git log display the log without a pager14:14
I found a way to disable it through git config but that's not what I'm looking for14:14
← mikecmpbll left14:14
Bathyal I want to make an alias something like glog='git log --oneline -5 --no-pager'14:15
→ ggoebel joined14:16
_ikke_ --no-pager should go before the log subcommand14:16
← str_ left14:16
_ikke_ Bathyal: git config --global alias.glog '!git --no-pager log --oneline -5'14:17
← finalbeta left14:17
→ finalbeta joined14:17
Bathyal _ikke_: thank you14:18
← SteffanW left14:18
→ houami joined14:18
→ southernirc joined14:19
← iLembus left14:19
Bathyal _ikke_: What is the exclamation mark ! doing?14:21
→ mikecmpbll joined14:23
_ikke_ Bathyal: It's telling git that execute a shell command14:23
← houami left14:23
_ikke_ s/that/to/14:24
→ Gustavo6046 joined14:24
→ behr328 joined14:25
← behr328 left14:25
← Puffball left14:25
→ Puffball_ joined14:25
→ pkx2 joined14:28
→ houami joined14:28
← houami left14:33
→ Noldorin joined14:34
← sarp left14:34
← kvik left14:35
← konsolebox left14:35
→ kvik joined14:35
← yn left14:36
→ Acerific joined14:37
→ konsolebox joined14:37
← oxymoron93 left14:38
→ houami joined14:38
← shinnya left14:39
← mooasaurus left14:39
→ mooasaurus joined14:40
→ oxymoron93 joined14:40
→ johnzorn joined14:41
← houami left14:43
← Masber_080 left14:44
← cdown left14:44
→ cdown joined14:45
→ yn joined14:45
→ houami joined14:48
Bathyal I have another problem. I generated a ssh key, ssh -T [email@hidden.address] says that I authenticated succesfully and yet when I try to push I'm still prompted for a username and pass14:48
the git package on my distro(openSUSE leap 42.3) came with some gui for getting credentials sshaskpass or smth14:49
I removed it14:49
→ endiruna joined14:49
Bathyal and still I'm prompted14:49
mud Bathyal: Check the URL in git remote -v , at a guess it's probably the HTTPS one. It should be the SSH-ish one14:50
Bathyal yup it's https14:50
← mikecmpbll left14:50
← clickjack left14:50
_ikke_ yeah, https does not use ssh keys :-)14:53
← pkx2 left14:53
← houami left14:53
Bathyal works like a charm, thank you14:53
← cdown left14:53
← Raed left14:58
← justanotheruser left14:58
→ houami joined14:58
← finalbeta left15:00
→ finalbeta joined15:01
→ VoradorPT joined15:01
← ogny left15:02
← houami left15:03
→ Teremy joined15:04
→ houami joined15:08
→ justanotheruser joined15:10
→ mikecmpbll joined15:11
← mikecmpbll left15:12
← houami left15:13
← oxymoron93 left15:14
→ QualityAddict joined15:15
→ nBhati joined15:15
← QualityAddict left15:15
→ oxymoron93 joined15:16
← MarioBranco left15:17
→ pkx2 joined15:17
→ phinxy joined15:18
← oxymoron93 left15:18
→ houami joined15:18
← pkx2 left15:20
← nanga left15:20
→ re1 joined15:21
→ pkx2 joined15:21
← pkx2 left15:21
→ str joined15:23
← houami left15:23
→ pkx2 joined15:23
← str left15:23
→ nanga joined15:23
→ rivalomega joined15:25
← kvik left15:25
→ xcm joined15:27
→ mikecmpbll joined15:27
→ houami joined15:28
← pkx2 left15:28
→ pkx2 joined15:28
← mikecmpbll left15:29
Bathyal exit15:29
oops15:29
← Bathyal left15:29
→ clickjack joined15:31
← pkx2 left15:31
→ mikecmpbll joined15:31
→ pkx2 joined15:32
← cdleonard left15:32
← houami left15:32
→ cdleonard joined15:34
← mikecmpbll left15:34
→ rusty joined15:34
rusty → Guest6509615:35
← diogenese left15:35
→ diogenese joined15:35
Guest65096 Hi. What should one do it accidentally deleted with rm -rf all his local repo(checked out from remote)? Delete branch and checkout from remote again?15:37
selckin if you deleted .git notting you can do15:38
← justanotheruser left15:38
← ephemer0l_ left15:39
cbreak other than to clone fresh15:41
← konsolebox left15:41
_ikke_ "I accidentally put my report through the shredder and burned the remains" :P15:42
→ konsolebox joined15:43
Guest65096 Just want to know how to restore local copy to exact last commit on branch.15:46
I mean what if I deleted every file except .git15:46
← diogenese left15:47
cbreak git reset --hard HEAD15:47
selckin git checkout -- .15:47
→ ephemer0l joined15:47
→ houami joined15:47
→ nchambers joined15:47
← nchambers left15:47
← synthroid left15:47
cbreak selckin: won't work properly15:48
that'll give the last staged version, not the last committed as he wants15:48
_ikke_ git checkout HEAD -- .15:48
selckin well last staged is probably closer to what he wants15:48
cbreak it's not closer to what he SAID he wants though :)15:48
selckin just wants his files back, then back to normal usage15:48
Guest65096 I want exact copy from remote repo without my any changes15:49
selckin then ignore me15:49
cbreak then use reset --hard @{u}15:49
(maybe fetch first if you want up to date)15:49
← Discovery left15:50
→ cdown joined15:51
Guest65096 Are "reset --hard @{u}" and "reset --hard HEAD" the same?15:52
← houami left15:52
→ yohnnyjoe joined15:54
cbreak no15:55
← cdown left15:57
→ houami joined15:57
← yohnnyjoe left15:59
← Silmarilion left16:00
← michael_mbp left16:01
→ synthroid joined16:01
→ hash-z3r0 joined16:02
← houami left16:02
→ rominronin joined16:03
← tkore left16:03
→ diogenese joined16:05
→ houami joined16:07
→ mikecmpbll joined16:08
→ matsaman joined16:09
← matsaman left16:09
← mikecmpbll left16:09
← zefferno left16:09
→ menip joined16:09
← menip left16:10
← Amanas left16:11
→ mikecmpbll joined16:12
→ YuGiOhJCJ joined16:12
← houami left16:12
← mikecmpbll left16:12
→ michael_mbp joined16:15
← _ADN_ left16:16
→ houami joined16:17
← YuGiOhJCJ left16:18
→ xxMatiasxx joined16:19
→ YuGiOhJCJ joined16:19
← Gustavo6046 left16:20
→ _ADN_ joined16:20
→ ok91 joined16:21
← houami left16:21
→ raijin joined16:21
→ Lyqyd joined16:24
← ok91 left16:25
→ ok91 joined16:25
→ Claw_wolf joined16:27
→ houami joined16:27
← imack left16:27
← YuGiOhJCJ left16:29
← hahuang65 left16:31
← houami left16:31
→ pbrewczynski joined16:32
→ mikecmpbll joined16:33
← mikecmpbll left16:35
→ meesles joined16:36
← pkx2 left16:36
gxt Guest65096: `@{u}` is short for `HEAD@{upstream}`, which stands for the remote tracking branch of the current branch.16:37
man gitrevision16:37
→ houami joined16:37
gxt Sorry, man gitrevisions16:37
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html16:37
← meesles left16:37
→ meesles joined16:39
→ QualityAddict joined16:40
← houami left16:42
→ pasadinhas joined16:44
→ heroux joined16:46
→ houami joined16:47
← _ADN_ left16:48
→ db8093246 joined16:49
← houami left16:52
MeiR` → MeiR16:52
← mostlybadfly left16:55
← nBhati left16:56
→ houami joined16:57
← Murr left16:57
→ Murr joined16:57
← southernirc left16:59
→ madewokherd joined17:01
← houami left17:01
→ justanotheruser joined17:02
← xxMatiasxx left17:02
← nanga left17:04
← ghost43 left17:06
→ nanga joined17:06
← nanga left17:06
→ nanga joined17:06
→ houami joined17:07
→ ghost43 joined17:07
→ imack joined17:08
← QualityAddict left17:09
→ xD3C joined17:10
← houami left17:11
→ Gurkenglas joined17:13
→ mostlybadfly joined17:14
← synthroid left17:14
→ QualityAddict joined17:14
← Tobbi left17:17
→ houami joined17:17
→ tmm88 joined17:17
← tmm88 left17:17
→ tmm88 joined17:17
← justanotheruser left17:17
← tmm88 left17:18
→ guhcampos joined17:19
← shripadr left17:21
→ Amanas joined17:21
← houami left17:21
→ cdown joined17:21
← shoogz left17:21
→ shoogz joined17:22
← shoogz left17:22
→ shoogz joined17:24
← shoogz left17:24
→ shoogz joined17:25
→ houami joined17:27
→ noobineer joined17:30
← houami left17:31
← Guest65096 left17:31
→ dreiss joined17:32
→ zlogan joined17:34
← zlogan left17:36
→ houami joined17:37
← njbair left17:37
← cdown left17:37
← noobineer left17:39
← surfist left17:39
→ surfist joined17:40
← navidr left17:40
← houami left17:41
→ njbair joined17:42
→ synthroid joined17:42
← guhcampos left17:43
← dreiss left17:43
← dviola left17:43
← pasadinhas left17:44
→ xxMatiasxx joined17:45
MrChristmas → MrC17:49
← xxMatiasxx left17:51
→ xxMatiasxx joined17:51
← mel00010 left17:54
→ yohnnyjoe joined17:55
← rominronin left17:57
← naiveai left17:58
← re1 left17:58
→ Tobbi joined18:00
→ nd_ joined18:00
← yohnnyjoe left18:00
← QualityAddict left18:00
← nd left18:01
→ re1 joined18:02
→ jesst_ joined18:03
← Floflobel left18:04
← Claw_wolf left18:04
← tunekey left18:05
← jast left18:05
→ houami joined18:06
→ jast joined18:08
→ Gustavo6046 joined18:11
← houami left18:11
→ Darcidride_ joined18:14
← Darcidride_ left18:14
← ZexaronS left18:15
→ Darcidride_ joined18:16
→ houami joined18:16
← finalbeta left18:17
→ cdown joined18:17
mac- hey. I'm reading now about refspecs18:17
→ finalbeta joined18:17
mac- and I found out that it in general is in two schemas: refs/heads/* and refs/remotes/*18:18
bremner houami: please fix your connection18:18
← rivalomega left18:20
mac- and as I understand refs/heads is location in remotes (which will be fetched when fetch is called), but it is also on local where I commit to, when refs/remotes is on local where data is fetched and from which I will merge into local refs/heads ?18:20
→ rivalomega joined18:20
→ JeffH joined18:21
← houami left18:21
→ raynold joined18:21
bremner mac-: have you read the <refspec> documentaion in man git-push and man git-fetch?18:23
gitinfo mac-: the git-push manpage is available at https://gitirc.eu/git-push.html18:23
mac-: the git-fetch manpage is available at https://gitirc.eu/git-fetch.html18:23
← xxMatiasxx left18:23
← hash-z3r0 left18:24
← rivalomega left18:25
← imack left18:25
→ houami joined18:26
ChanServ set mode: +o18:28
bremner kicked houami (please fix your connection)18:28
→ rivalomega joined18:29
← jab416171 left18:30
← Darcidride_ left18:31
← perrier-jouet left18:32
→ perrier-jouet joined18:33
→ nivag_ joined18:34
mac- bremner: I'm reading it now but wish to ensure that understand refspecs correctly18:35
bremner I'm sorry to say I could not understand your statement.18:36
mac- ok18:36
→ houami joined18:36
mac- let me try again ;p18:36
← JeffH left18:36
← opalepatrick left18:37
mac- on remote server refspec is refs/heads/<branchName>|glob, on local machine refspec is same as refs/heads/<branchName>|glob but on local machine tracked refspec is refs/remotes/<remoteName>/<branchName>|glob ?18:38
bremner mac-: do you understand what remote branches are?18:39
→ Darcidride_ joined18:40
mac- then when I do i.e. fetch from origin for branchName it should be as: git fetch origin refs/heads/branchName:refs/remotes/origin/branchName18:40
?18:40
← fission6 left18:41
← houami left18:41
→ glad joined18:41
mac- those are branches on bare repository on remote server (which can be some local directory as well, not necessary remote by network)18:41
bremner mac-: sounds plausible, but I usually just run "git fetch" and fetch them all.18:41
mac-: well, sortof, Maybe !remote helps18:42
gitinfo mac-: [!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)18:42
← pbrewczynski left18:42
bremner err.18:42
!remote branches18:42
mac- yeah I know that there are shortcuts for it but I wish to understand schema of refspecs18:42
← KeyJoo left18:43
mac- remote branches can be tracked or not18:44
→ guzzlefry joined18:44
guzzlefry howdy18:44
→ fission6 joined18:44
guzzlefry I need to revert specific files from a commit. Is there a common way of doing this?18:45
← Darcidride_ left18:46
→ Darcidride_ joined18:47
mac- !remote_branches18:49
gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'18:49
→ KeyJoo joined18:49
← cdown left18:50
← Darcidride_ left18:51
mac- ok, then remote tracking branch is represented in local system by refspec: refs/remotes/<remoteName>/<branchName>|glob18:51
→ cdown joined18:53
→ Darcidride_ joined18:54
bremner well, not glob in the local fs18:54
mac- and git pull in fact is equivalent to git fetch (which gets data from remote server refs/heads/<branchName>|glob) to my local refs/remotes/<remoteName>/<branchName>|glob) and immediately do merge from my local refs/remotes/<remoteName>/<branchName>|glob to my local refs/heads/<branchName>|glob18:55
?18:55
or is trying to do merge18:56
when some conflicts can occur18:56
bremner both of those statements seem true18:56
yes, pull = fetch+merge, and yes, conflicts can occur.18:56
← Tobbi left18:57
← LichtMacher left18:57
ChanServ set mode: -o18:58
mac- but more important for me now is if I write it correctly in terms of refspecs18:58
← guzzlefry left18:58
bremner !tias18:58
gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.18:58
mac- :]18:58
→ Tobbi joined18:59
← Joao_ left19:00
← salamanderrake left19:01
← Darcidride_ left19:02
← Darcidride left19:02
← Kestrel-029 left19:03
→ Sasazuka joined19:03
→ houami joined19:06
← dimi1947 left19:08
→ Nicmavr joined19:08
Nicmavr → Guest8385319:09
← Guest83853 left19:09
→ Guest83853 joined19:09
Guest83853 → Kestrel-02919:10
← houami left19:10
→ energizer joined19:11
→ shaiful joined19:12
← wrouesnel left19:13
ChanServ set mode: +o19:14
bremner set mode: +b19:14
bremner msg chanserv deop #git19:14
oops19:14
mac- :>19:14
ChanServ set mode: -o19:14
mac- I did: git fetch origin refs/heads/master:refs/remotes/origin/master219:15
and now, no master2 on local existed19:15
and has been created19:15
but this is branch only in refs/remotes19:15
which is tracked branch, read-only19:15
tracking branch I man19:16
mean19:16
← tombusby left19:16
mac- I wanted to delete it, because it is remote tracking branch I have to use flags -r -d19:16
→ tombusby joined19:17
→ SteffanW joined19:17
mac- and the queston is why I can't delete it with use of: git branch -r -d refs/remotes/origin/master2 ?19:17
→ rorro joined19:18
mac- man of git-branch doesn't say anythng special about format of branch name in section '<branchname>'19:18
→ Darcidride joined19:18
mac- I would expect that full refspec I have provided is the correct one19:19
← jesst_ left19:19
→ v4ult joined19:20
← perrier-jouet left19:22
← supercool left19:23
→ rath joined19:23
→ perrier-jouet joined19:23
← ggoebel left19:24
→ cdg joined19:25
→ fstd_ joined19:26
→ wrouesnel joined19:26
← fstd left19:28
fstd_ → fstd19:28
← endiruna left19:29
→ theoceaniscool joined19:30
← infinisil left19:32
→ infinisil joined19:32
mac- git remote show origin, shows refs/remotes/origin/master2 as stale to be removed by git prune (why?) when I've just fetched it and I would expect that the fetch will link origin/master with local remotes/origin/master2 ?19:35
tracking branches HAS TO have same names as tracked ones on the remote side ?19:36
← cdown left19:38
→ Wetmelon joined19:38
→ basiclaser joined19:41
→ Barrt joined19:41
← theoceaniscool left19:43
← Kaisyu left19:44
← cdg left19:44
→ cdg joined19:44
→ LichtMacher joined19:46
← cdg left19:49
JollyLage → johnlage19:53
← xD3C left19:54
→ yohnnyjoe joined19:56
→ endiruna joined19:56
← re1 left19:59
→ salamanderrake joined19:59
→ xD3C joined19:59
→ hash-z3r0 joined20:00
→ xxMatiasxx joined20:00
← yohnnyjoe left20:01
← xD3C left20:04
→ QualityAddict joined20:09
→ altendky joined20:09
→ cdown joined20:10
→ btree joined20:14
← btree left20:14
→ Medulla joined20:18
← Medulla left20:19
← cdown left20:20
→ nckpz joined20:26
→ cdg joined20:27
← rorro left20:27
→ marian1235813 joined20:27
→ notnull joined20:30
← Ranhir left20:30
→ Ranhir joined20:31
→ converge joined20:31
→ cdown joined20:32
→ xD3C joined20:33
← shaiful left20:33
→ mda1 joined20:34
→ dege joined20:35
→ bergice_ joined20:36
→ phluks joined20:38
→ cousteau joined20:40
cousteau can I "clone this repository, but seriously, don't fetch commits more than one month old, just give me the latest changes"?20:41
.git is like 1.3 GB20:42
← hussam left20:42
_rgn shallow clone20:42
→ yohnnyjoe joined20:45
← rath left20:46
→ sat-aton__ joined20:48
→ misosoup joined20:49
cousteau ok thanks! I'll google that20:49
← dansan left20:49
→ b0nn joined20:50
→ Mai-Chan joined20:50
imMute mac-: yes, that's the point of remote tracking branches.20:50
mac-: also, "git fetch" doesn't prune removed branches automatically. use either "git fetch --prune" or the config option to do prune on fetch20:51
← sat-aton left20:51
← johnzorn left20:52
b0nn hrm, I'm havinga bit of a problem; I created some files, then edited them. I decided that I didn't want to commit the edits together with the initial creation, so I git -N app_folder/ ; git add -p app_folder/ (only selecting the intial creations) ; git commit -m "Wee" But when I check the commit with git log -n1 --stat, none of the added patch has been committed20:52
mac- imMute: hm, then I have created non-exeisting tracking branch and now it is treated as stale ?20:53
b0nn So, I'm at a bit of a loss how to split things up such that I have a commit of initial creation, and a commit of edits20:53
mac- because no remote origin exists and after first push it will be created on remote ?20:53
← notnull left20:54
mac- and then it will loose stale but both branches will be empty ?20:54
imMute b0nn: based on my usage of git-gui, it might not be possible. :/ my work around has been to edit hte file to be what I want the initial commit to be, commit that, then change it back to what I want for the second commit.20:54
← Mai-Chan left20:54
← Case_Of left20:55
→ Case_Of joined20:55
→ jsrtr joined20:55
gitinfo set mode: +v20:55
imMute mac-: I'm not sure what you're doing.... but "git fetch origin refs/heads/master:refs/remotes/origin/master2" definitely seems like something you shouldn't do...20:56
→ durham joined20:56
mac- it is just experiment in learning to understand refspecs correctly20:56
jsrtr If I have some files in my repository which are also in .gitignore, how do I get them back if I deleted them from my working copy?20:56
mac- and I just step into this scenario20:57
which I not fully understood20:57
← Murr left20:57
→ Murr joined20:57
→ Nordantel joined20:57
cousteau _rgn, well, the bad news is that I had already cloned the thing; the good news is that I couldn't do this on my home PC so I had to ssh to my work PC and do the clone there so I could test the --depth thing :)20:57
← Nordantel left20:59
← VoradorPT left20:59
← converge left21:00
← durham left21:00
→ VoradorPT joined21:01
→ converge joined21:01
← converge left21:01
→ converge joined21:01
b0nn it's weird, because my patch is staged, anbd when I do a git diff --staged, it only shows my patch21:03
But, when I git commit, nothing is committed21:03
cousteau isn't a staged patch "a patch saved for later"?21:04
moritz b0nn: what do you mean by "nothing is committed"? does it create an empty commit? or refuse to create an empty commit?21:04
→ elsevero joined21:04
cousteau and thus reverted?21:05
moritz cousteau: no21:05
cousteau ah no wait, that was stashed, sorry21:05
b0nn +moritz empty commit21:05
→ notnull joined21:05
moritz b0nn: !repro please21:06
gitinfo b0nn: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see21:06
← cdg left21:06
b0nn hmm, not sure how to get you a log. reflog?21:06
moritz scroll up in your terminal?21:07
b0nn ok, but there's a lot21:07
→ Lyqyd_ joined21:07
→ SilentV joined21:08
jsrtr If I have some files in my repository which are also in .gitignore, how do I get them back if I deleted them from my working copy?21:10
→ hussam joined21:10
← SilentV left21:10
_rgn you can't get files back that were never committed21:10
jsrtr They're in the repository, they're just .gitignored because they're cached files that get updated differently depending on how the application is used21:11
imMute jsrtr: .gitignore doesn't affect files that have been comitted.21:11
→ johnnyrd joined21:13
← notnull left21:14
← johnnyrd left21:15
moritz jsrtr: git checkout <some commit> --- list of files here21:15
mac- imMute: please take a look, they wrote about my case https://git-scm.com/book/en/v2/Git-Internals-The-Refspec21:16
jsrtr Hmm21:16
← elsevero left21:16
mac- imMute: there is an example $ git fetch origin master:refs/remotes/origin/mymaster21:16
→ ocds joined21:17
jsrtr Oh, I was pointed at the wrong upstream repository, nevermind21:17
b0nn +moritzhttps://gist.github.com/anonymous/f6b6f4526c5f47b16ebe71aa45696c6a21:17
er, moritz https://gist.github.com/anonymous/f6b6f4526c5f47b16ebe71aa45696c6a21:18
mac- imMute: as they wrote "If you want to do a one-time only fetch, you can specify the specific refspec on the command line, too. To pull the master branch on the remote down to origin/mymaster locally, you can run"21:18
b0nn I've cut some of the patch out to try and introduce some brevity (and marked where thast's been done)21:18
→ TomyLobo joined21:20
→ notnull joined21:20
moritz b0nn: at the time that you committed, the new files showed up in both "Changes to be committed" and "Changes not staged for commit", which is suspicious21:20
b0nn: it seems the "git add -p" hasn't worked for some reason21:21
b0nn but when I do a git diff --staged I only see the patch21:21
← cdown left21:21
cousteau that sounds like a file with partial changes, right?21:21
→ cdown joined21:22
moritz right21:22
b0nn: I don't have enough experience with git add -N to tell what's going on, sorry21:22
b0nn git add -N puts the file into the staging area21:22
moritz no21:22
b0nn yes21:22
moritz no, it puts an empty file of the same name into the staging area21:22
b0nn ok, that's the same in my mind21:23
moritz but it's not21:23
b0nn ok, lets argue about semantics21:23
moritz if you commit in that stage, you add an empty file to the repo21:23
b0nn no21:23
imMute moritz: TIL. that's useful.21:23
→ jetisr joined21:23
b0nn the file doesn't egt committed IME21:23
← exotime left21:24
← jetisr left21:24
← Lyqyd_ left21:24
moritz huh21:24
and git doesn't warn that the commit is empty21:24
← Lyqyd left21:24
→ exotime joined21:25
b0nn it didnt for me21:25
moritz that is curious21:25
and might even be a bug in git21:25
b0nn it could have been because I had other stuff in the staging area21:25
stuff it was happy to commit21:25
moritz huh, in my tests, git add -N seems to behave totally weird21:26
which kinda explains what you see, b0nn21:26
and I'd recommend against using it21:26
b0nn hmm, I guess I will have to commit the blob and live with intiial and edits in the same commit21:27
moritz you can still fix your history with rebase -i21:27
b0nn yeah, I had thought that, but I had thought that the splitting of the commit would put me in the same position21:28
→ wrrn joined21:28
← wrrn left21:29
b0nn I'm thinking I'll commit the files that aren't edited as 1st commit, then the dirty files as 2nd21:29
→ pkx2 joined21:29
b0nn thanks for the ideas21:29
→ theoceaniscool joined21:32
→ A5101 joined21:34
→ astrofog joined21:40
→ aielima joined21:43
← xcm left21:43
→ xcm joined21:43
← dege left21:45
← SteffanW left21:45
→ jason237 joined21:48
← schleppel left21:48
→ Elon_Satoshi joined21:48
← leah2 left21:49
→ RapeNsnuff joined21:50
← basiclaser left21:50
← RapeNsnuff left21:50
← A5101 left21:50
← v4ult left21:51
→ katiex7 joined21:54
→ xDEC joined21:55
← synthroid left21:56
→ matsaman joined21:56
← xD3C left21:57
← xDEC left21:57
← matsaman left21:58
→ xD3C joined21:58
← aielima left22:00
→ aielima joined22:00
→ leah2 joined22:02
← cousteau left22:04
← theoceaniscool left22:04
foo I had a git branch that was originally a remote branch. I saw it when I did git branch -r ... then I did git checkout the-branch... and it gave me a local copy. If I do git branch -d the-branch ... it *only* deletes my local branch, it doesn't delete it from origin - correct/22:05
_ikke_ correct22:05
← xD3C left22:07
foo _ikke_: thank you22:08
← yohnnyjoe left22:09
→ safe joined22:10
→ _ch4l45h45k4 joined22:11
← Darcidride left22:13
← hdaugherty_90 left22:13
→ hdaugherty_90 joined22:15
→ yohnnyjoe joined22:19
← ocds left22:22
← jnavila left22:23
→ mobarmeg_ joined22:23
← jason237 left22:24
← exotime left22:25
→ Masber_080 joined22:25
← nckpz left22:25
→ exotime joined22:25
→ Neo joined22:26
→ dviola joined22:28
← mobarmeg_ left22:28
gxt Is there even another way to delete remote branches besides `git push origin :branch`?22:29
_rgn git push --delete or something like that22:29
_ikke_ exactly that22:29
gxt Ah thanks, should have looked in the man page. Wasn't sure which sub-command to check though.22:31
_rgn git push is the only command that mutates remote (afaik)22:31
← Neo left22:31
_ikke_ it is22:31
that and git remote update22:31
oh no22:32
that does a fetch22:32
← cybrNaut left22:32
→ Neo joined22:32
→ jason237 joined22:34
← mda1 left22:34
gxt Thanks, good to know.22:36
→ cybrNaut joined22:40
← sat-aton__ left22:44
→ satifant joined22:44
← db8093246 left22:48
← glad left22:49
← aielima left22:51
→ aielima joined22:52
→ ZyX-I joined22:54
→ yegortimoshenko joined22:56
→ sergivb01 joined22:56
yegortimoshenko hi, are object blob hashes ephemeral? do they never change (unless they are no longer referenced and gc'd)?22:57
← Murr left22:57
→ Murr joined22:57
← leeN left22:57
_ikke_ yeah, the hash describes the content22:57
so the same content will always have the same hash22:58
← sergivb01 left22:58
yegortimoshenko _ikke_: good to know! thank you.22:58
_ikke_ So no, they never change, they are 'baked' into history22:59
→ sergivb01 joined23:01
← cdown left23:02
→ graff joined23:03
graff so yeah, i've been a bad bad boy23:03
→ cdown joined23:03
graff pushing all sort of experimental shit/crap to upstream, and generally probably making life miserable for my 8 contributors23:03
what exactly are the commands, and abstractions associated with doing this correctly23:04
let's say I go ahead and just push to my other account, make my remote test suite draw from that (this is why i push crap)23:04
then what? i git pull otheraccount?23:04
→ theoceaniscool joined23:05
graff i shuld probably instead just make a script to send tarballs to my various machines for testing23:07
← canton7 left23:08
imMute graff: or use branches?23:08
← theoceaniscool left23:10
graff imMute: right, that is what I want to understand better23:10
← madewokherd left23:10
← Teremy left23:11
← tourdownunder left23:12
← dfas left23:12
→ canton7 joined23:12
b0nn So, my fix was, explicitly commit the files that had no modified tag, eg. git commit login/__init__.py login/apps.py etc23:12
then I git add the modified files, and committed them23:13
→ justanotheruser joined23:13
→ hahuang65 joined23:20
ChanServ set mode: +o23:23
← hdaugherty_90 left23:23
bremner set mode: -b23:23
ChanServ set mode: -o23:24
→ tx41 joined23:24
→ EternalEclipse joined23:24
→ metts joined23:24
← converge left23:26
← justanotheruser left23:28
← ZyX-I left23:29
← QualityAddict left23:30
← diogenese left23:31
→ converge joined23:31
← sergivb01 left23:32
→ cdg joined23:32
← SleePy left23:33
→ madewokherd joined23:34
← astrofog left23:36
→ diogenese joined23:37
→ cqi joined23:40
→ Kaisyu joined23:43
→ justanotheruser joined23:43
→ houami joined23:44
→ kus_ joined23:47
← houami left23:48
← tx41 left23:49
→ SleePy joined23:50
→ houami joined23:53
← justanotheruser left23:54
← meesles left23:54
← JoshuaD left23:54
← converge left23:55
→ g00s joined23:55
→ rorro joined23:57
← houami left23:58
← thiago left23:59

Logs Search ←Prev date Next date→ Channels Documentation