IRCloggy #git 2018-10-04

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.

2018-10-04

← billa left00:00
yasar should I just delete a recreate github repo?00:00
→ billa joined00:01
benharri git push --force00:01
→ lanlink joined00:02
→ nivag joined00:03
← mupylinx_patriot left00:05
→ eemeson joined00:06
← liefer left00:08
← jhulten left00:08
→ blizzow joined00:08
← carlos_ left00:09
→ liefer joined00:09
← thebope left00:12
→ thebope joined00:12
→ Odyseus joined00:12
← thebope left00:12
→ mupylinx_patriot joined00:13
← yasar left00:13
← goweol left00:13
→ jhulten joined00:14
→ piggah joined00:14
← mupylinx_patriot left00:15
← gordonfish left00:16
→ thebope joined00:16
← thebope left00:16
→ thebope joined00:19
← thebope left00:19
→ novumsen1 joined00:20
← blizzow left00:20
← Sasazuka left00:20
→ thebope joined00:21
← thebope left00:21
→ thebope joined00:22
← codyw left00:22
← thebope left00:22
← piggah left00:22
← AtumT left00:24
← notnull left00:25
→ goweol joined00:26
← Bucciarati left00:29
→ kneeki|a joined00:29
→ tomek joined00:31
← tomek left00:31
→ tomek joined00:31
← manuelschneid3r left00:32
← kneeki left00:32
→ Bucciarati joined00:32
← TomyLobo left00:34
← _ADN_ left00:38
→ AcousticDan joined00:39
← Chaos_Zero left00:39
← enriq left00:42
← jhulten left00:42
→ Terry_ joined00:43
← Terry_ left00:43
→ orbyt_ joined00:45
→ veegee joined00:45
→ kneeki|aa joined00:45
→ breakingsad joined00:46
← kneeki|a left00:48
cjohnson git push --force-with-lease00:54
you mean00:54
benharri cjohnson: yes00:54
→ Mattiasl_ joined01:00
← Mattiaslndstrm left01:00
← fstd left01:00
→ fstd joined01:01
→ codyw joined01:01
→ Mattiaslndstrm joined01:03
← mollusk left01:03
← Mattiasl_ left01:04
← mniip left01:05
→ pity_ joined01:07
← pity left01:08
← orbyt_ left01:09
→ durham_ joined01:10
→ Mattiasl_ joined01:11
← Mattiaslndstrm left01:11
Foxhoundz → BenderRodriguez01:12
← durham left01:13
← durham_ left01:14
→ finalbeta joined01:15
← duderonomy left01:16
→ erebel55 joined01:16
→ notnull joined01:17
erebel55 I have a branch that I would like to reset to be identical to master. Another developer merged one of my commits to this branch into their own branch. How can I reset my branch to be identical to master without disturbing their merge?01:17
→ enriq joined01:19
→ mollusk joined01:23
→ thebope joined01:23
→ cagomez joined01:24
→ Goplat joined01:24
← novumsen1 left01:27
← expert975 left01:27
→ ixian joined01:29
← drodger left01:29
← thebope left01:29
← AcousticDan left01:29
→ drodger joined01:35
→ dsdeiz joined01:38
← dsdeiz left01:38
→ dsdeiz joined01:38
→ muelleme joined01:39
← billa left01:39
→ bigHouse joined01:40
→ Chaos_Zero joined01:41
← dsdeiz left01:42
← enriq left01:45
← F0rTex left01:45
→ F0rTex joined01:46
← al-damiri left01:46
← njbair left01:47
→ enriq joined01:51
← bigHouse left01:51
→ orbyt_ joined01:51
← libertyprime left01:51
→ sitaram joined01:54
← ilmostro left01:54
← sitaram left01:54
→ sitaram joined01:54
← cdown left01:55
→ cdown joined01:55
→ bigHouse joined01:55
← codyw left01:56
→ ilmostro joined01:56
← LionsMane left01:56
→ drudge`tZ joined01:57
← drudge`tZ left01:57
→ codyw joined01:57
→ saqss joined01:59
← acercle left01:59
← saqss left01:59
← cliluw left01:59
→ cliluw joined02:00
← muelleme left02:01
← cdown left02:02
→ esrse joined02:02
← bigHouse left02:03
→ bigHouse joined02:04
← bigHouse left02:05
← foul_owl left02:07
→ bigHouse joined02:09
← MACscr|lappy left02:10
← Zexaron left02:11
← enriq left02:11
← mollusk left02:12
← Olipro left02:14
→ enriq joined02:14
← Odyseus left02:16
← enriq left02:16
← t0dd1v left02:17
← lagothrix left02:17
→ lagothrix joined02:17
← catern left02:17
← bigHouse left02:19
→ catern joined02:19
→ t0dd1v joined02:20
← TinkerT left02:20
→ TinkerT joined02:22
→ Odyseus joined02:23
→ foul_owl joined02:23
→ mizu_no_oto joined02:25
← goweol left02:28
→ dsdeiz joined02:29
← dsdeiz left02:29
→ dsdeiz joined02:29
→ bigHouse joined02:30
→ carlos_ joined02:30
← bigHouse left02:31
→ jstimm joined02:31
→ bigHouseMGBH joined02:31
→ goweol joined02:32
← bigHouseMGBH left02:33
→ goweol1 joined02:33
→ enriq joined02:34
→ yyy joined02:35
← erebel55 left02:36
← Mattiasl_ left02:37
← goweol left02:37
← drodger left02:39
← yyy left02:39
← cagomez left02:41
← ilmostro left02:42
→ drodger joined02:44
→ piggah joined02:44
← codyw left02:44
→ ilmostro joined02:44
← piggah left02:46
→ Pytor joined02:47
→ Bass10 joined02:48
← mizu_no_oto left02:48
← TheRuckus left02:49
→ TheRuckus joined02:49
← Bass10 left02:52
→ granttrec joined02:53
→ Bass10 joined02:53
granttrec how can I add to my previous commit?02:53
← Bass10 left02:54
granttrec git commit --amend02:54
→ cdown joined02:55
mozzarella granttrec: yeah02:57
← carlos_ left02:59
← XenophonF left03:01
← MIR100_ left03:01
→ XenophonF joined03:01
→ MIR100_ joined03:01
→ carlos_ joined03:02
← enriq left03:02
← zumba_addict left03:03
→ blizzow joined03:05
← carlos_ left03:07
→ carlos_ joined03:07
→ mollusk joined03:08
→ Foxhoundz joined03:10
→ timj1 joined03:10
→ codyw joined03:10
← BenderRodriguez left03:11
truexfan81_ → truexfan8103:12
← BrAsS_mOnKeY left03:12
← timj left03:13
← kneeki|aa left03:16
→ carlos joined03:16
← sctskw left03:17
→ BrAsS_mOnKeY joined03:18
← carlos_ left03:19
← carlos left03:21
← Chaos_Zero left03:23
← blizzow left03:25
→ thebope joined03:25
→ awkwardpenguin joined03:28
→ applecrumble joined03:29
← thebope left03:30
← kurahaupo left03:31
→ kurahaupo joined03:31
← lanlink left03:37
← ilmostro left03:38
→ sctskw joined03:40
→ howdoi joined03:41
← granttrec left03:42
→ ilmostro joined03:42
Foxhoundz → BenderRodriguez03:50
← polman left03:53
← kurahaupo left03:55
← orbyt_ left03:55
→ kurahaupo joined03:56
← jstimm left03:56
→ polman joined03:57
← inovas left04:02
← watabou left04:04
→ inovas joined04:04
← mrCyborg|zzz left04:05
→ Pytor1 joined04:05
← MACscr left04:05
→ mrCyborg|zzz joined04:05
→ blizzow joined04:06
→ Olipro joined04:06
← Olipro left04:06
→ Olipro joined04:06
→ redj joined04:06
← Pytor left04:08
→ rkta_ joined04:10
← freeman42y left04:11
← rkta left04:12
rkta_ → rkta04:12
← BrAsS_mOnKeY left04:13
← kurahaupo left04:13
← dskull left04:13
→ redj_ joined04:13
← Gabemo left04:13
→ staafl__ joined04:13
→ freeman42x joined04:14
→ kurahaupo joined04:14
← jmnk_ left04:14
→ Xiti` joined04:14
← Raimondi left04:14
← Xiti` left04:14
→ Xiti` joined04:14
← staafl_ left04:14
← chachasmooth left04:14
← aananev left04:14
← Calinou left04:14
→ Gabemo joined04:15
← Gabemo left04:15
→ Gabemo joined04:15
→ Raimondi joined04:15
← wreed left04:15
← permalac left04:15
← crmne left04:15
→ chachasmooth joined04:15
→ jmnk joined04:15
← redj left04:15
← inkbottle left04:15
→ permalac joined04:16
→ crmne joined04:16
→ dskull joined04:16
← themayor left04:17
→ Calinou joined04:17
← Xiti left04:18
→ aananev joined04:18
← Exagone313 left04:18
→ BrAsS_mOnKeY joined04:18
→ igemnace joined04:18
← redj_ left04:19
→ themayor joined04:20
→ Exagone313 joined04:20
← applecrumble left04:20
→ redj joined04:20
→ xall joined04:21
← blizzow left04:21
→ F4D3C0D3 joined04:26
→ thebope joined04:26
→ teodorg joined04:26
← codyw left04:27
→ duderonomy joined04:28
→ codyw joined04:29
→ watabou joined04:29
← thebope left04:31
← krabat left04:32
← g2anj left04:33
← xall left04:33
← duderonomy left04:36
← Hobbyboy left04:37
← Emperor_Earth left04:38
→ lanlink joined04:38
→ g2anj joined04:38
← Darcidride left04:40
→ themill joined04:45
→ ToBeCloud joined04:47
gitinfo set mode: +v04:47
← TheRuckus left04:47
→ TheRuckus joined04:47
→ Hobbyboy joined04:48
← oojacoboo left04:50
→ amosbird joined04:50
← amosbird left04:53
→ amosbird joined04:53
← amosbird left04:54
→ amosbird joined04:54
← Sleepy63 left04:56
→ blizzow joined04:57
→ fieldmapper joined05:01
→ pks_ joined05:02
← pks left05:04
pks_ → pks05:04
← t0dd1v left05:07
← ilmostro left05:08
← R2robot left05:10
→ ilmostro joined05:10
→ R2robot joined05:10
→ TheDcoder joined05:13
TheDcoder I am working with a submodule in my repository, I would like to work with the code in it directly instead of cloning the repository separately and push/pull changes again in the sub-module05:14
→ esotericnonsense joined05:15
esotericnonsense lo. i'm wondering if there's a simple way to do a sort of 'reverse git pull'.05:15
→ sauvin joined05:15
esotericnonsense oh i'm a bloody idiot never mind me05:16
esotericnonsense hangs his head in shame05:16
LordRyan would you like to explain what you meant by that05:16
because i'm genuinely curious05:16
esotericnonsense in typing it out I realised that it's exactly what git push _is_05:16
example: host A can ssh to host B but not vice versa. host A wants to push to B. (at this point I realise I've typed the word 'push')05:17
← awkwardpenguin left05:17
LordRyan hah :P05:17
→ awkwardpenguin joined05:18
→ granttrec joined05:18
granttrec how can I pull but put all my commits show as the latest05:19
→ mniip joined05:20
← TheDcoder left05:20
→ soee joined05:20
_ikke_ granttrec: git pull --rebase05:20
granttrec _ikke_: thats it?05:21
← cdown left05:21
← blizzow left05:21
← serialoverflow left05:22
→ serialoverflow joined05:22
→ TheDcoder joined05:23
← Xiti` left05:23
TheDcoder I am reading the ProGit book and it mentions that I would have to checkout a branch so that i can track my changes05:23
→ Xiti joined05:23
TheDcoder I already have some changes in my sub-modules, will they be overwritten when checking out?05:24
*submodule05:24
→ mohabaks joined05:25
→ thebope joined05:27
granttrec ok if I work in another branch test and I want those changes in master, then I just merge, is that fine? is there a way to avoid the cycle it creates in the graph?05:29
← lankanmon left05:31
→ awkwardp_ joined05:32
← thebope left05:32
→ danishprakash joined05:33
← awkwardpenguin left05:34
→ muelleme joined05:38
→ dhollinger joined05:38
← teodorg left05:40
← Acelogic left05:40
← awkwardp_ left05:42
→ awkwardpenguin joined05:42
igemnace granttrec: merge is fine. no cycle, commit edges always go from child to parent. it's instead two branches that fork out then get joined later on05:44
granttrec igemnace: oh ok cool, thanks for the info05:44
← igemnace left05:45
→ jnavila joined05:45
→ JeroenT joined05:45
← notnull left05:45
→ igemnace joined05:46
igemnace TheDcoder: you changed them in your project itself?05:47
→ sQVe joined05:48
igemnace checkout doesn't touch submodules by default afaik, but you really shouldn't be changing them like that. you'll want to make the changes in the submodule upstream itself, then just pull them in your project05:48
→ schleppel joined05:50
igemnace (unless i suppose your submodule upstream is out of your control and you intend to fork off altogether in the future)05:50
→ gordonfish joined05:51
← granttrec left05:53
← lanlink left05:57
→ bibek22 joined06:02
→ kitchent joined06:02
→ fcrsEe joined06:04
← fcrsEe left06:04
→ T_UNIX joined06:06
← kitchent left06:07
← jnavila left06:08
→ chele joined06:10
→ nowhere_man joined06:10
← muelleme left06:10
← chele left06:10
← xcm left06:11
← codyw left06:12
← cd left06:12
→ goweol joined06:12
→ xcm joined06:13
← goweol1 left06:15
→ jgoss joined06:15
← yeshurun left06:17
→ jiji606 joined06:20
← opal left06:23
→ Hi-Angel joined06:28
→ thebope joined06:28
→ opal joined06:28
→ zais joined06:28
→ pawle joined06:31
← thebope left06:33
← Bobdude left06:34
→ lowbro joined06:35
← lowbro left06:35
→ lowbro joined06:35
→ yyy joined06:37
jast TIL 'git apply' silently confines itself to the CWD if it's a subdir of the working tree06:39
→ seventh__ joined06:39
jast there doesn't seem to be an option to override that06:40
→ oxymoron93 joined06:42
← ilmostro left06:43
→ blizzow joined06:43
← jgoss left06:45
→ ilmostro joined06:45
→ dreiss joined06:46
← TheRuckus left06:48
→ yyy- joined06:50
← thiago left06:51
← cybrNaut left06:52
→ cybrNaut joined06:52
→ Silmarilion joined06:54
→ Noti joined06:55
← yyy- left06:56
← rkta left06:56
→ hendry joined06:56
hendry hi, when i do a `git fetch upstream; git merge upstream/master;` on my fork, I don't know why, but sometimes there appears to be an unwanted merge commit on HEAD. "Merge remote-tracking branch 'upstream/master'"06:59
How do I avoid that?06:59
← gxt left07:00
jast it only does that if it's necessary... you can use 'git merge --ff-only' to abort if a fast-forward (i.e. without merge commit) is impossible07:00
the other option is using rebase instead of merge, but you should only do that if your local commits haven't been shared with anyone else yet07:01
hendry jast: all my commits are in branches07:05
oxymoron93 hendry: you question was about unwanted merge, the way to avoid it are options provided to you by jast , is there something unclear?07:07
→ Marmotte joined07:07
← nuc left07:08
hendry iiuc, you're saying, instead of a `git merge upstream/master` which i normally do, I do instead a `git merge --ff-only upstream/master`, is that right?07:08
oxymoron93 yes, --ff-only option will guarantee merge abort if fast forward merge isn't possible07:10
→ codyw joined07:10
hendry do folks alias `git merge --ff-only upstream/master` ? i am assuming this workflow is common07:11
→ nuc joined07:12
oxymoron93 I can't answer that, as I am only in team of two who works with maintaining git repository, ie still no workflows :(07:13
← dreiss left07:18
← veegee left07:24
→ _joes_ joined07:24
→ Forlorn_ joined07:25
→ chele joined07:25
→ TheRuckus joined07:25
→ duderonomy joined07:27
← awkwardpenguin left07:27
← Odyseus left07:28
← raulp left07:28
→ thebope joined07:29
→ Odyseus joined07:29
→ dege joined07:29
← TheRuckus left07:30
← m_ left07:32
← Odyseus left07:32
← pawle left07:32
→ gxt joined07:32
→ rokups joined07:33
← thebope left07:34
→ MACscr joined07:35
← bibek22 left07:35
← w0ng left07:36
← GreenJello left07:37
sveinse I am mirroring an upstream git repo and want to push it to another repo without modification. I'm running git remote update origin and then git push mirror --all, but then it fails on "Updates were rejected because a pushed branch tip is behind its remote". How can I fetch and then push this and capture all remote changes?07:37
← duderonomy left07:38
→ spitswR joined07:39
← spitswR left07:39
← goweol left07:40
← F4D3C0D3 left07:41
← g00s left07:41
→ F4D3C0D3 joined07:42
→ raulp joined07:43
→ goweol joined07:44
→ duderonomy joined07:44
→ goweol1 joined07:44
← yyy left07:45
→ rkta joined07:48
→ ijash joined07:48
← goweol left07:48
← duderonomy left07:49
← Pytor1 left07:51
→ parthi joined07:51
← F4D3C0D3 left07:52
→ Pytor joined07:53
← selckin left07:53
→ hexnewbie joined07:55
← Goplat left07:58
← PEG left07:58
→ PEG joined07:59
→ elichai2 joined08:01
← ToBeCloud left08:05
→ bibek22 joined08:06
← pwhat2 left08:06
→ TheRuckus joined08:06
→ kurkale6ka joined08:06
→ LiftLeft2 joined08:07
← LiftLeft left08:08
→ plexigras joined08:08
← pity_ left08:09
→ quxgyver joined08:10
← Eryn_1983_FL left08:10
LiftLeft2 → LiftLeft08:10
← TheRuckus left08:11
← bibek22 left08:11
← kurkale6ka left08:12
→ Eryn_1983_FL joined08:13
← inovas left08:14
→ MIR100 joined08:14
→ polydo_s joined08:14
← Marmotte left08:14
→ Marmotte joined08:14
← MIR100_ left08:15
← MIR100 left08:15
→ MIR100 joined08:15
→ inovas joined08:16
→ kurkale6ka joined08:18
TheDcoder igemnace: It is possible to change your submodule and track changes. I own the upstream repository in this instance, so I should able to push it too :)08:19
I tried the checkout and it didn't over-write my untracked change... which is good I suppose08:19
→ kurkale61 joined08:21
→ bibek22 joined08:23
← kurkale6ka left08:25
→ yyy joined08:25
→ YuGiOhJCJ joined08:26
→ TheRuckus joined08:26
→ venmx joined08:27
← Raed|Laptop left08:27
igemnace "good I suppose" why the reservation, is there another effect you wanted to have08:27
← Raed left08:28
→ floppydh joined08:29
→ Raed|Laptop joined08:29
→ thebope joined08:30
→ Raed joined08:30
← TheRuckus left08:31
← yyy left08:31
← thebope left08:35
← mohabaks left08:37
→ yyy joined08:38
← dude187 left08:38
← codyw left08:39
→ dude187 joined08:40
← blizzow left08:41
→ LiftLeft2 joined08:42
← LiftLeft2 left08:43
→ Nothing4You_pp joined08:44
← Nothing4You_pp left08:44
TheDcoder igemnace: No, not really :)08:45
igemnace alrighty08:46
→ w0ng joined08:46
→ kerframil joined08:48
→ codyw joined08:48
← kurkale61 left08:54
→ pawle joined08:55
← bibek22 left08:58
← Puffball left08:59
← matjam left09:00
→ bibek22 joined09:03
← mollusk left09:04
→ _ADN_ joined09:04
→ mohabaks joined09:05
→ wildermind joined09:07
→ TheRuckus joined09:07
→ kurkale6ka joined09:07
→ opalepatrick joined09:08
← goweol1 left09:08
→ cek joined09:10
→ Zexaron joined09:10
→ bavila joined09:10
← lowbro left09:11
← TheRuckus left09:12
→ pity joined09:13
→ quipa joined09:16
← Juzzika left09:21
→ TheRuckus joined09:28
→ thebope joined09:30
→ throstur joined09:31
→ ocelotsloth joined09:32
throstur I can't git mv to rename a directory... I can rename it in Windows Explorer, but that's not what I want...09:32
_ikke_ What happens if you try to do that?09:32
← TheRuckus left09:32
← pawle left09:34
← thebope left09:35
→ Barabacha joined09:35
→ libregeekingkid joined09:37
← erratic left09:38
→ alirobe joined09:43
← alirobe left09:45
throstur _ikke_: you mean, if I try to rename with git mv? It just tells me Permission denied, or Operation not permitted, depending on the OS I use09:49
← JeroenT left09:49
← codyw left09:50
→ JeroenT joined09:50
← throstur left09:51
jast I was going to respond but throstur is gone :)09:52
← JeroenT left09:55
← Raed|Laptop left09:55
→ pawle joined09:56
← seventh__ left10:00
← ocelotsloth left10:00
← tango_ left10:01
← eemeson left10:02
→ throstur joined10:02
→ ocelotsloth joined10:02
→ tango_ joined10:02
→ b00g3rjb joined10:02
← b00g3rjb left10:02
→ CodeSlingerPaul joined10:03
← _ADN_ left10:03
← mofai left10:03
← libregeekingkid left10:05
→ libertyprime joined10:07
← kurkale6ka left10:08
→ kurkale6ka joined10:08
→ TheRuckus joined10:08
→ jtrzebiatowski joined10:11
← Pytor left10:12
← TheRuckus left10:13
← hussam left10:13
→ JeroenT joined10:13
→ _ADN_ joined10:18
← ocelotsloth left10:20
← breakingsad left10:21
→ Essadon joined10:23
← Kaisyu left10:23
← Bucciarati left10:24
← g2anj left10:24
→ trip__ joined10:24
← avar left10:25
→ avar joined10:25
← avar left10:25
→ avar joined10:25
→ Bucciarati joined10:25
← fatalhalt left10:26
→ g2anj joined10:27
→ TomyLobo joined10:27
← ilmostro left10:28
→ TheRuckus joined10:29
→ erratic joined10:30
→ ilmostro joined10:30
→ highkix joined10:31
→ thebope joined10:31
← TheRuckus left10:33
← pawle left10:34
→ pawle joined10:34
→ JJjack joined10:35
JJjack can you add . but ignore certain files?10:35
← thebope left10:36
igemnace yes, with .gitignore10:37
→ mofai joined10:38
← MACscr left10:39
← dpyro left10:45
← dsdeiz left10:46
← g2anj left10:47
← opalepatrick left10:47
← throstur left10:48
→ lankanmon joined10:48
→ g2anj joined10:49
→ TheRuckus joined10:49
→ MACscr joined10:50
← TheRuckus left10:54
→ xaa joined10:55
← kurkale6ka left10:56
← hexnewbie left10:56
→ makos joined10:56
→ kurkale6ka joined10:56
→ hexnewbie joined10:59
→ rkta_ joined11:00
→ kneeki|aa joined11:02
← rkta left11:03
← rkta_ left11:04
← mobile_c left11:08
→ TheRuckus joined11:10
← newnick left11:10
→ newnick joined11:11
→ seventh__ joined11:11
→ hussam joined11:12
← TheRuckus left11:14
→ rkta joined11:15
→ zimmie_ joined11:19
Barabacha I accidentally overwritten my README.md file, the right one is on the remote but not on my local copy, how can I get it back?11:19
→ freetol joined11:19
← JJjack left11:20
← seventh__ left11:21
← zimmie_ left11:21
→ enriq joined11:23
oxymoron93 could you explain more? ie git checkout <remote>/<branch> -- README.md will work if you have already fetched remote branch11:23
and it will update your working directory README.md from remote branch Barabacha11:23
→ seventh__ joined11:24
Barabacha yes I want to update my working directory README.md from remote branch11:24
→ throstur joined11:25
Barabacha ok that worked I think11:26
oxymoron93 you could run provided command immediately now and check if that suits your needs?11:26
oh cool11:26
Barabacha isn't "git checkout" for changing branches?11:26
or making new ones11:26
??11:26
oxymoron93 it depends on context11:27
tobiasvl man git checkout11:27
gitinfo the git-checkout manpage is available at https://gitirc.eu/git-checkout.html11:27
→ irc_viewer_test joined11:27
tobiasvl "git-checkout - Switch branches or restore working tree files"11:27
→ ocelotsloth joined11:30
← irc_viewer_test left11:30
→ wreed joined11:30
→ TheRuckus joined11:31
→ makos_ joined11:31
← TheRuckus left11:32
→ TheRuckus joined11:32
→ thebope joined11:32
→ ahmed89 joined11:32
← libertyprime left11:34
← makos left11:35
→ teodorg joined11:35
← Zexaron left11:36
← thebope left11:37
← drodger left11:41
← greatgatsby left11:41
→ drodger joined11:42
→ Chaos_Zero joined11:42
← ocelotsloth left11:44
→ bsanford joined11:45
← bsanford left11:46
← seventh__ left11:48
→ seventh__ joined11:51
→ preisi joined11:53
→ greatgatsby joined11:55
← donofrio left11:56
← lacrymology left11:57
→ tombusby joined11:57
← rwb left12:00
→ feksclaus joined12:03
← enriq left12:04
→ codyw joined12:04
← esrse left12:07
← Chaos_Zero left12:12
→ billa joined12:12
← throstur left12:20
← cek left12:23
→ bolovanos joined12:27
→ donofrio joined12:28
→ lowbro joined12:29
← lowbro left12:30
→ lowbro joined12:30
← drodger left12:31
→ thebope joined12:33
← Noti left12:34
→ rafasc joined12:35
→ drodger joined12:36
← thebope left12:38
→ rsrx joined12:40
← venmx left12:42
← ahmed89 left12:42
← kurkale6ka left12:43
→ ahmed89 joined12:43
→ enriq joined12:45
→ venmx joined12:46
← ahmed89 left12:47
→ kurkale6ka joined12:47
→ ahmed89 joined12:47
→ throstur joined12:48
→ DisruptiveNL joined12:51
← enriq left12:51
← opal left12:52
→ opal joined12:53
→ ableto joined12:53
← codyw left12:54
→ lacrymology joined12:55
← TheRuckus left12:55
→ ocelotsloth joined13:00
← DisruptiveNL left13:03
← ableto left13:03
→ e_l1997 joined13:08
→ F4D3C0D3 joined13:09
← ocelotsloth left13:10
→ oem joined13:11
→ ocelotsloth joined13:12
← ocelotsloth left13:12
→ n8chan joined13:13
← sQVe left13:13
→ enriq joined13:14
→ blizzow joined13:14
→ ocelotsloth joined13:15
→ fission6 joined13:15
→ TheRuckus joined13:16
← shicks2525 left13:20
← TheRuckus left13:20
← e3ef13f4ff44 left13:23
→ shicks2525 joined13:24
← dege left13:25
→ crissae joined13:26
crissae Hey. I plan on going offline for a bit. If I want to grab a copy of my master and all branches, I see that cloning with '--mirror' is the suggested solution13:26
Short of me unplugging my ethernet cable and switching branches and verifying the file changes on-disk, can I assume this will bring all branches and history down to my local machine when I clone?13:26
→ Mat001 joined13:29
← enriq left13:29
← n8chan left13:29
→ antfoo joined13:30
→ CreazioN joined13:30
→ enriq joined13:31
← comptroller left13:31
→ Eagleman joined13:31
→ eset_ joined13:31
rafasc crissae: usually that's not needed. A clone will usually fetch everything you need.13:31
Silmarilion crissae, or you could just clone it and then do `git fetch --all`13:32
rafasc the different with --mirror, is where those changes get stored with git.13:32
Eagleman Is it possible to git clone up to a specific commit, and not beyond that?13:32
rafasc Eagleman: when you say up to, which direction are you referring? past->X or X<-present ?13:33
← ocelotsloth left13:33
→ thebope joined13:34
rafasc Silmarilion: btw, the --all from fetch means all remotes, not all refs.13:34
Silmarilion rafasc, I see, thanks for the info13:34
crissae I got paranoid and also cloned all branches just to back up our work. haven't tested calling 'git' or switching branches offline13:34
Thanks for considering my question btw, I'm sure this is asked often.13:35
→ TheRuckus joined13:36
← eset_ left13:36
rafasc crissae: let me try to give you a summarized explanation of the difference.13:37
when you clone/fetch, git will use a fetchspec to decide what gets transfered.13:37
git config --get remote.origin.fetch13:37
← howdoi left13:38
rafasc there's some extra rules on top of this, like if you fetch a commit that has a tag pointing to it, the tag also comes.13:38
← thebope left13:38
rafasc the command above should return something like this: +refs/heads/*:refs/remotes/origin/*13:39
crissae imagine all of this happens with no internet connection.13:39
does this change the above? :)13:39
→ carlos_ joined13:39
rafasc it means, transfer everything inside refs/heads (which is the place where git stores branches), and store it on your local repo under refs/remotes/origin/13:40
Eagleman rafasc, I think I just did it with the following:13:40
git checkout <sha1 rev> of the rev you want13:40
git reset --hard13:40
git checkout -b master13:40
→ eset_ joined13:40
← TheRuckus left13:41
rafasc Eagleman: that doesn't answer your question. You still cloned everything. You just checked out a past commit.13:41
which is technically different, but maybe that's what you wanted in the first place.13:42
Eagleman I dont have any changes past that commit13:43
rafasc crissae: --mirror will set up a refspec like this: +refs/*:refs/*13:44
← madewokherd left13:44
crissae ah this is starting to click actually13:45
→ ocelotsloth joined13:45
← eset_ left13:46
oxymoron93 Eagleman: run git log --all to see all history13:46
→ rwb joined13:46
→ comptroller joined13:47
← stoopkid left13:48
→ hypercore joined13:48
hypercore how do i revert back to a previous commit for a branch?13:48
← ocelotsloth left13:48
→ yeshurun joined13:48
rafasc hypercore: with or without rewriting history?13:49
→ eset_ joined13:50
→ ocelotsloth joined13:50
← CreazioN left13:51
← makos_ left13:52
→ JimmyRcom joined13:52
→ AbleBacon joined13:52
tobiasvl !revert13:52
gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?13:52
→ Milos joined13:53
oxymoron93 I was about to write some of these options... nice13:53
← tchan left13:53
→ TheRuckus joined13:54
hypercore rafasc: er i'm not sure...13:54
basically i want HEAD to point to this old commit (i think that's what i want, not totally sure)13:54
_ikke_ And the changes that happened since then?13:55
DO you want to keep them or should they be removed?13:55
oxymoron93 maybe they just want to inspect files at certain point? hypercore13:56
hypercore _ikke_: keep them13:56
_ikke_ git reset <commit>13:56
← throstur left13:56
→ n8chan joined13:57
← oem left13:58
hypercore _ikke_: just to be clear, this will only make changes to the branch right?13:58
_ikke_ yes, as long as you don't supply --hard13:58
← TheRuckus left13:58
hypercore awesome, thanks13:58
→ turkeston joined13:59
← R2robot left13:59
→ R2robot joined14:00
→ Raed|Laptop joined14:01
hypercore _ikke_: hmm didn't work, still getting the newest changes14:02
(did "git reset {old-hash}")14:02
→ AaronMT joined14:02
_ikke_ you said you wanted to keep the changes14:03
← n8chan left14:03
hypercore _ikke_: sorry, maybe i didn't want to keep them. I've created a clone branch, so i can use that in case something goes wrong14:04
how can i do it without keeping the changes?14:04
_ikke_ So you have nothing in your working tree that you need to keep?14:04
git stash is the safest way to get rid of them14:05
← highkix left14:05
→ AcousticDan joined14:05
hypercore _ikke_: so just run "git stash" in this branch?14:05
_ikke_ git stash operates on your working tree14:06
hypercore (there's alos a "previous-state" header in my logs)14:06
← eset_ left14:06
← Revan- left14:07
← turkeston left14:07
hypercore _ikke_: just "git stash"?14:07
_ikke_ yes14:07
hypercore thanks14:08
_ikke_: hmm "no local changes to save"14:08
← polman left14:08
_ikke_ did you run the git reset command?14:08
hypercore when i run git diff against the cloned branch, it shows no differences. and yeah, i ran the git reset command14:08
← ocelotsloth left14:09
→ eset_ joined14:09
hypercore ah ok my bad14:09
→ Revan- joined14:09
hypercore i changed back to my latest commit14:10
← nowhere_man left14:10
→ notnull joined14:11
→ ocelotsloth joined14:11
← ocelotsloth left14:12
→ polman joined14:12
hypercore _ikke_: hmm still not working, doing git diff back to that hash shows a lot of differences14:13
← eset_ left14:14
← JimmyRcom left14:15
← JeroenT left14:16
→ czart joined14:17
rafasc hypercore: there are many things you can do, that are pretty similar between themselves, I not positive which one you want. Maybe try to clarify why you want to this.14:17
→ eset_ joined14:18
hypercore rafasc: ok, so i've made several changes on branch "test/new_feature". I want to revert these changes to an old commit on this branch, and have that be the new "state", if that makes sense14:18
→ madewokherd joined14:18
hypercore rafasc: ive cloned the branch, so i can lose changes to it now14:18
← carlos_ left14:19
rafasc is that branch public? Or just a local branch?14:19
→ carlos_ joined14:20
→ DeepStateNine joined14:20
hypercore rafasc: it's public, and i want to revert the state of the public version14:20
not just locally14:20
rafasc or in other words: do you want that branch to say (did A)-(did B)-(did C)-(did D)-(ooops back to B);14:21
→ achadwick joined14:21
rafasc or just make it (did A)-(did B);14:21
hypercore rafasc: exactly, and i want to push that new reverted state to our hosted repo14:21
← slde_track left14:21
← AcousticDan left14:22
← lagothrix left14:22
rafasc $ git revert --no-commit B..D; git commit;14:23
← enriq left14:23
rafasc or $git checkout <hash> -- .;14:23
→ astronavt joined14:23
← eset_ left14:23
rafasc careful as this will discard any uncommited work you have on your working directory.14:23
→ threenuc joined14:23
hypercore rafasc: is this isolated to only once branch?14:24
*one14:24
→ tchan joined14:24
← tchan left14:24
→ tchan joined14:24
rafasc yes.14:24
→ lagothrix joined14:24
→ olux joined14:24
→ libregeekingkid joined14:25
rafasc both will not rewrite history, they'll be added as a new commit on top of your existing history setting things back how they were in <hash>.14:25
→ soee_ joined14:25
← seventh__ left14:26
← carlos_ left14:26
rafasc the checkout version is probably easier to deal with, especially if you have merges in the B..D range.14:26
→ rkta_ joined14:26
→ bavila_ joined14:26
→ newnickk joined14:26
hypercore great, thanks for the help!14:27
→ eset_ joined14:27
← tomfarr left14:27
← xcm left14:27
→ xcm joined14:27
→ fstd_ joined14:28
threenuc Hey. I'm trying to force push a local branch with the HEAD hash "90b..." to a remote branch with the HEAD hash "9bx" (so they're different). When I do "git push origin remotebranch -f", git says "Everything up to date". What could be the problem?14:28
→ hexnewbie_ joined14:28
threenuc If I do git checkout origin/remotebranch and git log, the HEAD is still different14:28
← AaronMT left14:29
← soee left14:29
← ijash left14:29
← hexnewbie left14:29
← jakogut left14:29
← czart left14:29
← fission6 left14:29
← bavila left14:29
← fstd left14:30
fstd_ → fstd14:30
→ spacesuitdiver joined14:30
→ czart joined14:30
← F0rTex left14:30
← __xor left14:30
→ _xor joined14:30
← newnick left14:30
← inovas left14:31
→ F0rTex joined14:31
→ SputHB joined14:31
← oxymoron93 left14:31
← SputHB left14:31
← Silmarilion left14:31
← rkta left14:31
rkta_ → rkta14:31
→ enriq joined14:31
F4D3C0D3 can I remove log by author? I'm in emergency..14:32
← eset_ left14:32
→ cek joined14:32
rafasc what's remove log?14:32
→ inovas joined14:32
→ va7lnxkE joined14:32
← va7lnxkE left14:32
F4D3C0D3 wait.. I'll take a photo14:32
https://snag.gy/0VlZJX.jpg14:34
This is my situtation. very awful and scary14:34
← justanotheruser left14:34
→ thebope joined14:34
_ikke_ the 0xDEADBEEF part?14:34
F4D3C0D3 I want to remove donghojung14:35
my old nick14:35
rafasc threenuc: you can use sha's with the push command; git push origin sha:remotebranch14:35
F4D3C0D3 I tried "https://help.github.com/articles/changing-author-info/" and this happens14:36
how can I remove logs that author equals donghojung14:36
→ eset_ joined14:36
← rokups left14:36
rafasc threenuc: git log --oneline --boundary --graph HEAD...remotebranch14:36
→ liori joined14:37
F4D3C0D3 plz I can't go home now.. here is deep dark night ;014:37
← Raed|Laptop left14:37
→ dferris joined14:38
→ maestrojed joined14:38
rafasc threenuc: if push says up to date, it already has that commit in its history.14:38
F4D3C0D3 I want to fix thix and go home.. but google don't give me any answer :(14:38
← thebope left14:39
rafasc F4D3C0D3: this isn't a thing you can easily fix without rewriting the entire history.14:39
threenuc rafasc: I've already resolved the problem, but I'd like to understand why. Say I have the "wannapush" branch and remote branch. I changed the name of wannapush to the name of the remote branch and it pushed normally. Why?14:39
← dferris left14:39
← blizzow left14:39
F4D3C0D3 rafasc: that's a sad news14:40
← spacesuitdiver left14:40
rafasc F4D3C0D3: the best thing you can do that doesn't involve changing the entire history is add a .mailmap file14:41
← eset_ left14:41
threenuc rafasc: and the commit wasn't in the history. Only the HEADs differed, and the local HEAD definitely wasn't in the remote14:42
F4D3C0D3 rafasc: and that's a little bit hard to me. but I'll try it14:42
thanks14:42
← e_l1997 left14:43
→ spacesuitdiver joined14:44
← danishprakash left14:46
→ eset_ joined14:46
→ thiago joined14:47
← enriq left14:48
→ enriq joined14:49
← bavila_ left14:49
→ bavila joined14:50
← TheDcoder left14:50
← eset_ left14:51
← bavila left14:51
← yyy left14:52
→ stoopkid joined14:52
→ bavila joined14:53
→ c3llulardaxius joined14:53
c3llulardaxius → c3llular14:53
→ eset_ joined14:55
← YuGiOhJCJ left14:56
→ Noti joined14:56
← Duikb00t left14:57
→ kitchent joined14:58
← enriq left14:58
F4D3C0D3 HOLY BANANA(This is positive meaning)!!! I make it@! I did it https://snag.gy/AqMy4X.jpg14:58
I don't know about mailmap but I little bit know about rebase14:59
so I checked out tmp branch at HEAD and rebase -i to remove author that donghojung and reset hard and so on14:59
→ Dougie187 joined14:59
← eset_ left14:59
F4D3C0D3 It might be very bad practice, but I have no other options, and now I can go home. thanks guys15:00
→ AaronMT joined15:01
← F4D3C0D3 left15:01
← zais left15:03
→ oojacoboo joined15:03
→ eset_ joined15:04
← threenuc left15:05
→ e_l1997 joined15:05
← Forlorn_ left15:05
← igemnace left15:06
→ al-damiri joined15:06
→ BloodyMary joined15:09
← eset_ left15:09
→ highkix joined15:10
← drodger left15:11
→ drodger joined15:12
→ eset_ joined15:13
← highkix left15:13
→ mollusk joined15:13
← chele left15:13
→ dsdeiz joined15:15
← dsdeiz left15:15
→ dsdeiz joined15:15
← rasb left15:15
← spacesuitdiver left15:16
→ r3myjC joined15:17
← r3myjC left15:17
← eset_ left15:18
→ jhulten joined15:18
← BrianBlaze left15:19
→ BrianBlaze joined15:20
← maestrojed left15:21
→ eset_ joined15:22
← a3Dman left15:23
→ ocelotsloth joined15:24
← BloodyMary left15:24
← ocelotsloth left15:25
→ blizzow joined15:26
→ dege joined15:26
← rkta left15:26
→ bbronx joined15:26
← eset_ left15:27
→ polo51 joined15:28
← thiago left15:28
← AaronMT left15:29
← mollusk left15:30
← bbronx left15:30
→ mastro joined15:31
mastro hi, is there a git command (without bash scripting) that gives me a text information of the state of the repository? ideally something like: 1) empty string if all is committed, 2) "dirty" or something like that if there's something not committed (index or not).. I want to append it to the output of `git rev-parse --short HEAD` to have the commit hash + state of the tip15:31
→ eset_ joined15:31
_ikke_ mastro: not really possible to with just plain git15:31
esotericnonsense porcelain?15:31
mastro I want to use it in the build script to include automated information that allow me to trace back to the specific commit / fail the build if "release build" + dirty15:32
_ikke_ mastro: what about git describe?15:32
esotericnonsense I have git rev-parse HEAD; git log -1 --oneline HEAD; git status --porcelain15:32
(technically I put it in a script but I mean you can oneliner it)15:32
← thomasross left15:32
← nuc left15:32
→ thomasross joined15:33
→ F4D3C0D3 joined15:33
esotericnonsense on a related topic I'm wondering if there are any tools for monitoring a bunch of git repositories, maybe a sort of "git status all the folders"15:33
mastro _ikke_: i found that command not very reliable. For example if there are no tag "fatal: No names found, cannot describe anything." and in other occasions it had unpredictable results15:34
esotericnonsense at the moment I just do something daft like blah() {for d in $(ls); do cd dir; git status; cd ..; done}15:34
→ nuc joined15:34
← Hi-Angel left15:34
mastro _ikke_: also I don't want the branch name, just know if dirty or not15:34
esotericnonsense and then blah | grep "something"15:34
which is terrible.. :P15:34
← lowbro left15:34
← xcm left15:35
→ xcm joined15:35
→ thebope joined15:35
← eset_ left15:36
mastro I was hoping in something like `git rev-parse --short HEAD` which is really perfect for extracting the current commit15:37
← F4D3C0D3 left15:37
← notnull left15:37
mastro I don't know like: `git status --short`15:37
→ notnull joined15:38
← notnull left15:38
→ notnull joined15:38
esotericnonsense did you try --porcelain15:38
mastro (git status --short is too long for me, hironically)15:38
esotericnonsense: to git status?15:38
esotericnonsense yes, git status --porcelain15:38
mastro esotericnonsense: same as --short, just without the colors15:39
esotericnonsense heh indeed. I see15:39
→ polo51_ joined15:39
← thebope left15:40
→ eset_ joined15:40
→ fatfreegal joined15:42
→ ocelotsloth joined15:42
← polo51 left15:43
← fatfreegal left15:43
← lacrymology left15:44
→ mikecmpbll joined15:45
← eset_ left15:46
→ cdown joined15:48
← floppydh left15:49
→ eset_ joined15:49
→ cdown_ joined15:50
← cdown left15:53
cdown_ → cdown15:53
← pawle left15:55
← eset_ left15:55
← ocelotsloth left15:56
← kurkale6ka left15:57
→ eset_ joined15:58
→ DarthRadar joined15:59
→ ocelotsloth joined16:00
→ MrRooks joined16:00
← dsdeiz left16:01
→ nowhere_man joined16:02
← Tobbi_ left16:02
← MrRooks left16:02
→ duderonomy joined16:03
← eset_ left16:04
→ kurkale6ka joined16:04
→ danishprakash joined16:07
→ eset_ joined16:08
→ orbyt_ joined16:08
rafasc git describe --dirty --always16:08
← sctskw left16:08
rafasc --always makes sure it fallsback to hash if there's no other way to describe it.16:09
← orbyt_ left16:09
→ Pytor joined16:10
rafasc esotericnonsense: don't parse ls. filanems can contains spaces and newlines... for d in $(ln) will bite you some day.16:10
→ sctskw joined16:11
esotericnonsense rafasc: i guess i'm just lazy.. I don't use spaces or newlines or odd characters in my directory names, though I suppose it would be easy to forget a script I've written for internal use will bork if I use it in some other case16:11
← duderonomy left16:12
← eset_ left16:12
kerframil for d in */; do ...16:13
→ F4D3C0D3 joined16:14
→ spacesuitdiver joined16:14
→ enriq joined16:15
→ applecrumble joined16:16
→ eset_ joined16:17
→ Envil joined16:17
→ yyy joined16:18
← F4D3C0D3 left16:18
→ duderonomy joined16:19
→ thiago joined16:20
← duderonomy left16:21
← eset_ left16:22
← Eagleman left16:22
← edwardly left16:22
→ Tobbi_ joined16:23
→ jrnieder joined16:24
→ eset_ joined16:26
→ edwardly joined16:26
→ duderonomy joined16:26
→ ukyrgf joined16:27
← edwardly left16:27
→ edwardly joined16:27
← duderonomy left16:28
→ duderonomy joined16:29
← Mat001 left16:31
← eset_ left16:31
← chachasmooth left16:32
← enriq left16:33
← duderonomy left16:34
← _joes_ left16:34
→ arunkumar413 joined16:35
← BrAsS_mOnKeY left16:35
→ eset_ joined16:35
arunkumar413 remote branches are not showing up in my local repo16:35
only master branch is showing up16:35
← ocelotsloth left16:35
→ thebope joined16:36
→ cd joined16:36
benharri arunkumar413: git fetch --all16:36
← cdown left16:37
→ ocelotsloth joined16:37
rafasc arunkumar413: git branch --remotes;16:37
→ BrAsS_mOnKeY joined16:37
← ocelotsloth left16:37
← mikecmpbll left16:38
← mohabaks left16:39
mastro rafasc: that is perfect!!!16:40
→ ocelotsloth joined16:40
← gxt left16:40
← kurkale6ka left16:40
arunkumar413 did git fetch and pull16:40
← eset_ left16:40
→ Regon joined16:41
← thebope left16:41
arunkumar413 but git branch -a shows only remote branches16:41
→ psprint-osx joined16:42
rafasc arunkumar413: hmmm you don't have any local branches?16:42
mastro rafasc: thank you very much!16:42
← yyy left16:42
arunkumar413 rafasc, I git cloned the repo using the link but it didn't create all the branches from remote16:43
rafasc mastro: you're welcome.16:43
→ yyy joined16:43
→ abf_ joined16:43
→ enriq joined16:43
psprint-osx Hello. I have some short format, one-line git log alias, like everybody probably have. I would however want: Include in the one line log message an additional line – The-First-Line from the long-commit-message (the one separated with empty line, in new paragraph). Is it doable?16:43
rafasc arunkumar413: git clone only creates one. The one pointed by the remote's HEAD16:43
→ raynold_ joined16:44
→ leeN joined16:44
rafasc arunkumar413: usually 'master'16:44
→ eset_ joined16:44
rafasc psprint-osx: you mean the subject? or the first line of the body?16:45
arunkumar413 rafasc, so how do get the other branches16:45
psprint-osx rafasc: first line of the body, Subject\n\nThe-First-Line\nRest-of-body16:46
rafasc git fetch already transfers it, and they get stored under their own remote.16:46
if you want to used them, just do $git checkout branchname;16:47
→ durham joined16:47
rafasc arunkumar413: !rtb16:48
gitinfo arunkumar413: [!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>/<b16:48
psprint-osx So guys, how to do it? Commit message: Subject\n\nThe-First-Line-of-Body\nThe\nRest... – how to show log message as follows: {date} {Subject} {The-First-Line-of-Body} (i.e. in single line)?16:49
← eset_ left16:49
→ irrgit joined16:50
→ jhaenchen joined16:50
← jhaenchen left16:50
→ jhaenchen joined16:50
→ chaosruler joined16:51
irrgit How can i push a local repository which doesnt exist on my git server?16:51
→ duderonomy joined16:51
→ fluxAeon joined16:52
← duderonomy left16:52
rafasc depends on the server.16:52
irrgit I think on this one im stuck on version 1.8 of git iirc16:53
rafasc some tools create the repo on-the-fly16:53
→ eset_ joined16:53
→ gxt joined16:54
irrgit If i add the remote url i want, which doesnt exist yet, can i create it by pushing?16:54
rafasc what are you using as remote?16:54
→ greggerz joined16:54
rafasc or are you just pushing over ssh?16:55
psprint-osx log --date=short --pretty=format:'%Cgreen%cd %h %Creset%s %b' shows the Subject, then the body, *in-single-line*, like expected. However, can I somehow limit %b (the body) to say, 4 words?16:55
irrgit over ssh16:55
← yyy left16:56
rafasc irrgit: then ssh into your box, do git init --bare repo16:57
irrgit Well i mean i could do that, im saying is there a way to create on push?16:57
rafasc then you can push.16:57
← ocelotsloth left16:58
← polo51_ left16:58
→ yyy joined16:58
← theoceaniscool_ left16:58
← eset_ left16:59
→ ocelotsloth joined16:59
← ocelotsloth left16:59
rafasc psprint-osx: %<(10,trunc)%b17:00
still playing with it.17:00
→ ocelotsloth joined17:00
← ocelotsloth left17:00
→ CrystalMath joined17:00
CrystalMath hi all17:01
is there any way to list all commits that are only a part of a branch?17:01
i have an old branch that might have no commits ever done on it17:01
and i'd like to delete it17:01
← hypercore left17:01
CrystalMath but i'm not really sure17:01
→ ocelotsloth joined17:01
← ocelotsloth left17:02
psprint-osx rafasc: thanks it works somewhat good, except doesn't limit for words, but that might be good17:02
→ eset_ joined17:03
→ polo51_ joined17:03
rafasc psprint-osx: yea, it's a lenght limit.. the closest you can do.17:03
→ wootehfoot joined17:03
rafasc psprint-osx: but there are some empty lines.17:03
→ sgen joined17:03
psprint-osx Guys, pretty-format %D or %d shows ref-names, so there's typically "(HEAD -> master, origin/master)" in the log. Can I: not show this standard limited-information substring "(HEAD ...)", but show *Tag-Names*-only?17:04
← yyy left17:05
← watabou left17:06
← xaa left17:06
← amosbird left17:06
→ amosbird joined17:07
← kerframil left17:07
→ kerframil joined17:07
← eset_ left17:07
← greggerz left17:09
← amosbird left17:09
→ dsdeiz joined17:09
← dsdeiz left17:09
→ dsdeiz joined17:09
→ Forlorn_ joined17:09
psprint-osx rafasc: any mistical-formula for skipping HEAD -> master etc. from %D pretty-format?17:09
→ greggerz joined17:09
→ amosbird joined17:09
rafasc try --decorate-refs=refs/tags17:09
→ theoceaniscool_ joined17:09
← amosbird left17:09
psprint-osx I just want tags, best without "tag: " insertion17:09
← mzf left17:10
→ amosbird joined17:10
← raynold_ left17:10
→ eset_ joined17:12
psprint-osx rafasc: works with 2.19, not with 2.15, I thus have a luck of owning an old Git (from Apple, on OS X), I see this a luck because if I would miss this, my users would be affected by it. Any workaround, other method, working on older git?17:12
← _ADN_ left17:12
rafasc psprint-osx: no. I know because I also tried. Which I ultimately ended up doing was contributing --decorate-refs to git.17:13
→ AtumT joined17:13
→ mzf joined17:14
psprint-osx rafasc: ahso, that's an ultimate statement. So I'll better implement some if [[ $(git --version) ]]; and stuff in my script. BTW, maybe you know cleanest way of doing this, i.e. checking for git version?17:14
rafasc unless you pipe to awk or something like that.17:15
psprint-osx nevermind, under Zsh I can do: if is-at-least 2.19 $(git --version); then17:16
hexnewbie_ → hexnewbie17:16
rafasc psprint-osx: it go released into 2.16.017:16
psprint-osx ok, thanks17:16
← eset_ left17:17
→ Mattiaslndstrm joined17:17
psprint-osx rafasc: maybe some clue about the $<(20,trunc), is it highly-recent, likely to not be available?17:17
rafasc no, that's old17:17
psprint-osx cool17:17
← quxgyver left17:17
→ Mat001 joined17:19
← arunkumar413 left17:19
← staafl__ left17:20
rafasc psprint-osx: git::a7f01c6b4ddf9f2f6bdcb23fc7afb56695807cba^{commit}17:20
gitinfo psprint-osx: Git web link: https://github.com/git/git/commit/a7f01c6b4ddf9f2f6bdcb23fc7afb56695807cba17:20
→ eset_ joined17:21
→ czart_ joined17:21
← quipa left17:21
← danishprakash left17:22
psprint-osx 1.8.3-rc0, really old. BTW. thanks for contributing the --decorate-refs option, git has flexible formats but this statement may be easily revised when someone wants to use `git log ...' in a released-project and will need a *true* control over what's being shown17:22
← mastro left17:23
← j7k6 left17:23
→ quipa joined17:23
→ matsaman joined17:23
→ thebope joined17:24
psprint-osx one more thing, I'm currently separating %b from %s by " | ", i.e. a bar. Is it possible to show this bar only when %b is not empty?17:24
← czart left17:25
← eset_ left17:26
→ salek_ joined17:26
← enriq left17:27
← jas4711 left17:27
← TinkerT left17:28
← Forlorn_ left17:28
← Salek left17:28
→ TinkerT joined17:28
← abf_ left17:28
→ eset_ joined17:30
→ Forlorn_ joined17:30
← matsaman left17:32
→ Onionnion joined17:32
→ heroux_ joined17:35
← eset_ left17:35
→ cdown joined17:36
← achadwick left17:37
rafasc I don't think so.17:38
← gxt left17:39
rafasc you would need something like the for-each-ref language. But unfortunately git log doesn't know about it yet.17:39
→ eset_ joined17:39
← daurnimator left17:40
← chaosruler left17:40
← ilmostro left17:41
→ chaosruler joined17:42
→ ilmostro joined17:43
→ Trel joined17:44
← eset_ left17:44
Trel Is there a command or man file that lists all available git config options along with what they are?17:44
bremner man git config17:45
gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html17:45
← venmx left17:46
Trel Thanks!17:46
rafasc psprint-osx: https://public-inbox.org/git/20181002144639.GC24480@sigill.intra.peff.net/17:46
→ seventh__ joined17:46
← sgen left17:47
← arecaceae left17:47
→ arecaceae joined17:48
← BrianBlaze left17:48
→ BrianBlaze420 joined17:48
→ eset_ joined17:48
← kitchent left17:51
← cdown left17:51
→ cdown joined17:51
→ flavius joined17:52
← eset_ left17:53
← jtrzebiatowski left17:53
← sctskw left17:53
→ sctskw joined17:54
← T_UNIX left17:55
← czart_ left17:56
← applecrumble left17:56
→ eset_ joined17:57
→ enriq joined17:57
← sctskw left17:58
→ yyy joined18:01
← eset_ left18:02
→ sourcream joined18:03
→ eset_ joined18:06
→ unpythonic joined18:07
← eset_ left18:11
CrystalMath okay i need help, i messed something up bad18:13
← gesker left18:13
CrystalMath how do i cancel a merge?18:13
→ duderonomy joined18:14
→ j7k6 joined18:14
CrystalMath git so incredibly confusing18:14
*is so18:14
← j7k6 left18:15
Hello71 git merge --abort18:15
something something pro life something18:15
→ eset_ joined18:16
→ xp0inter joined18:17
CrystalMath Hello71: lol, thanks :)18:17
→ gesker joined18:17
CrystalMath i did git commit --amend18:18
and now i don't know how to push this18:18
→ ocelotsloth joined18:19
← comptroller left18:20
→ m_ joined18:20
← eset_ left18:21
→ chachasmooth joined18:21
← z]bandito left18:22
CrystalMath okay i did a force push18:22
← Mat001 left18:22
→ eset_ joined18:25
← cliluw left18:27
→ comptroller joined18:27
→ bemo joined18:28
→ cliluw joined18:28
→ mikecmpbll joined18:28
← eset_ left18:30
→ hypercore joined18:31
← Hello71 left18:32
← rsrx left18:34
→ eset_ joined18:34
← Forlorn_ left18:35
→ Hello71 joined18:36
→ millerti joined18:36
→ shabius_ joined18:38
← eset_ left18:39
← GeraldW_ left18:40
→ jnavila joined18:41
← shabius left18:42
← inovas left18:42
→ GeraldW joined18:42
→ eset_ joined18:43
→ z|bandito joined18:44
→ inovas joined18:44
← irrgit left18:47
→ e joined18:47
→ jas4711 joined18:48
← eset_ left18:48
← jorj left18:48
→ jorj joined18:49
← cliluw left18:49
→ cliluw joined18:50
← Mattiaslndstrm left18:51
← UTAN_dev left18:52
→ eset_ joined18:52
→ j7k6 joined18:53
→ Forlorn_ joined18:53
→ UTAN_dev joined18:54
→ dsx_ joined18:55
→ yyy- joined18:56
← eset_ left18:56
← sourcream left18:57
← wootehfoot left18:59
→ AtumT_ joined18:59
← UTAN_dev left18:59
← xcm left19:00
→ xcm joined19:00
→ eset_ joined19:01
→ kent\n joined19:02
← madewokherd left19:02
← yyy- left19:02
← AtumT left19:02
← eset_ left19:06
← jiji606 left19:09
→ austinphilp joined19:09
→ eset_ joined19:10
→ muelleme joined19:12
→ AtumT joined19:13
← AtumT_ left19:13
→ Acelogic joined19:17
→ xaa joined19:19
← xcm left19:19
→ xcm joined19:19
← j7k6 left19:19
← austinphilp left19:19
→ j7k6 joined19:21
← j7k6 left19:22
→ yyy- joined19:22
→ j7k6 joined19:23
← jnavila left19:25
← jrnieder left19:26
→ pwhat2 joined19:26
← yyy- left19:26
← olux left19:27
→ applecrumble joined19:27
← ocelotsloth left19:28
→ pure-tadams joined19:29
→ ocelotsloth joined19:31
→ yyy- joined19:31
pure-tadams Is there a nice way to amend a commit's 'diff' like how it's easy to amend the message?19:33
← Envil left19:33
← yyy left19:35
→ zbandito joined19:35
dawik if its only that file diffing you could use --amend -a19:35
thats what I do19:35
→ rkta joined19:35
dawik but it will amend to add all of the changes. so beware :)19:35
rafasc pure-tadams: when you amend, you're not really amending the message.19:36
dawik you are amending the head right19:36
rafasc so you can stage files, and run commit --amend. Of course that will put the changes on the HEAD.19:37
if you want to place it further back, you can use git rebase --interactive, and choose 'edit'19:37
dawik nice19:37
rafasc but that will rewrite every single commit after the one you changed.19:37
← z|bandito left19:37
pure-tadams Yeah but that's file centric, I'd like to edit a patch file instead19:37
→ UTAN_dev joined19:38
→ sararussell8875E joined19:38
← polo51_ left19:38
pure-tadams So, here's a short but nasty program which does what I want, https://upaste.de/haX19:39
← Onionnion left19:41
← sararussell8875E left19:45
← spacesuitdiver left19:46
→ fatalhalt joined19:49
rafasc pure-tadams: git checkout -p HEAD~1;19:49
← muelleme left19:49
→ F4D3C0D3 joined19:49
→ muelleme joined19:50
← Regon left19:50
rafasc or just git checkout -p;19:51
depending19:51
→ madewokherd joined19:53
← F4D3C0D3 left19:54
→ libertyprime joined20:00
→ spacesuitdiver joined20:00
→ hermann_nordung joined20:03
→ ThisGeekChick joined20:04
← seventh__ left20:05
→ finalbeta1 joined20:07
← ilmostro left20:08
← ThisGeekChick left20:09
← soee_ left20:09
→ pawle joined20:09
→ Guest14363 joined20:10
→ dviola joined20:10
→ seventh__ joined20:10
← finalbeta left20:10
← enriq left20:11
→ Sasazuka joined20:11
→ ilmostro joined20:12
→ TheRuckus joined20:12
→ Skarlso joined20:12
← Sasazuka left20:12
← Guest14363 left20:12
← m_ left20:12
← Skarlso left20:13
→ Mat001 joined20:14
← pawle left20:14
← TheRuckus left20:17
pure-tadams rafasc: That's nice since it is the separate patches. Can I go a step further and put all the patches into a single file which I can then edit with vi or other shell tools?20:19
"git checkout -p HEAD~1 e" on all the files at once would work20:21
rafasc e?20:21
pure-tadams the manually edit hunk command20:21
← rwb left20:21
← jas4711 left20:22
pure-tadams "(echo e && cat;) | git checkout -p HEAD~1"20:22
rafasc it will still split in chunks, you rarely will get the whole thing as one patch.20:22
→ jakogut joined20:22
pure-tadams Darn20:22
rafasc nonono... huge nono. -p is meant to be used non interactively.20:23
→ dege_ joined20:23
rafasc crap, s/non//20:23
→ fragamus joined20:23
→ Mattiaslndstrm joined20:23
pure-tadams hahahaha, I've definitely scripted -p20:23
rafasc that's a terrible idea.20:24
what are you trying to do really?20:25
→ aphilp joined20:25
← dege left20:26
pure-tadams do text editing operations on a single patch file instead of having to manage multiple files20:26
→ dpyro joined20:27
→ mobile_c joined20:27
pure-tadams (scripting -p was done in the past for other one off situations)20:27
rafasc well, then edit the diff like you're doing.20:29
multi_io looks like git checkout --theirs has a bug: https://pastebin.com/TwViDuuG20:29
rafasc instead of applying it in reverse, I would probably do it in another branch.20:29
multi_io ^^^ the ony difference between the ours and theirs file there is the line: password = "openstack-\"password" (ours) vs. password = "openstack-password" (theirs)20:30
I do git checkout --theirs <file>, it keeps the "openstack-\"password".20:31
double checked that --ours and --theirs are what I think they are...20:32
pure-tadams rafsc: Alright, thank you for your help20:34
← Noti left20:34
→ jstein_ joined20:34
jstein_ → jstein20:34
rafasc multi_io: is this on rebase or on a merge conflict?20:36
→ enriq joined20:37
← enriq left20:38
← libertyprime left20:39
← pure-tadams left20:39
← jhaenchen left20:39
→ jhaenchen joined20:40
dege_ → dege20:41
← Forlorn_ left20:42
← oojacoboo left20:43
← fragamus left20:43
← jhaenchen left20:44
← cek left20:48
→ manuelschneid3r joined20:49
← eset_ left20:50
← xcm left20:52
→ eset_ joined20:52
← dpyro left20:53
→ xcm joined20:54
→ dpyro joined20:57
→ enriq joined20:58
← aphilp left20:59
→ TheRuckus joined20:59
→ hph^ joined20:59
← hph^ left20:59
→ hph^ joined21:00
← TheRuckus left21:00
← hph^ left21:00
→ jnavila joined21:00
→ hph^ joined21:00
← hph^ left21:00
→ TheRuckus joined21:00
← muelleme left21:00
→ hph^ joined21:00
← hph^ left21:00
→ hph^ joined21:01
← TheRuckus left21:01
→ TheRuckus joined21:01
→ aphilp joined21:02
← dsdeiz left21:02
← zbandito left21:03
← theoceaniscool_ left21:04
→ codyw joined21:06
→ z|bandito joined21:11
← timj1 left21:11
← Barabacha left21:12
→ GreenJello joined21:13
← eset_ left21:14
→ fragamus joined21:14
→ rwb joined21:17
→ m_ joined21:18
← Mat001 left21:21
← notnull left21:21
← kent\n left21:21
→ Danibalhs joined21:21
← Danibalhs left21:21
→ notnull joined21:21
← notnull left21:21
→ notnull joined21:21
→ kent\n joined21:22
→ timj joined21:22
← AbleBacon left21:22
← ilmostro left21:25
← seventh__ left21:26
← wildermind left21:26
← elichai2 left21:27
→ seventh__ joined21:27
← dviola left21:29
← schleppel left21:29
→ ilmostro joined21:29
← m_ left21:29
← TheRuckus left21:30
← leeN left21:31
→ TheRuckus joined21:32
← jstein left21:32
→ metrixx joined21:32
→ g00s joined21:33
← jnavila left21:34
← metrixx_ left21:34
← Olipro left21:35
metrixx → Guest7559221:35
→ metrixx_ joined21:35
← enriq left21:35
→ Olipro joined21:36
← Olipro left21:36
→ Olipro joined21:36
← plexigras left21:37
→ Zexaron joined21:38
← Guest75592 left21:38
← yyy- left21:39
← metrixx_ left21:40
← CodeSlingerPaul left21:40
→ acercle joined21:40
→ metrixx joined21:41
→ enriq joined21:43
← TheRuckus left21:44
→ TheRuckus joined21:44
← flavius left21:45
→ gxt joined21:48
→ Celmor joined21:51
Celmor I keep getting "Problem with the SSL CA cert (path? access rights?)" when trying to clone a repo21:51
→ _ADN_ joined21:52
→ Narrat joined21:52
Celmor I did `apt-get update && apt-get upgrade`21:52
← novumsensum left21:52
← seventh__ left21:52
← gesker left21:54
→ dpyro_ joined21:54
← Mattiaslndstrm left21:55
← ocelotsloth left21:55
→ Mat001 joined21:56
← hph^ left21:58
← TheRuckus left21:58
← dpyro left21:58
← thorie left21:59
← nephyrin left21:59
→ nephyrin joined21:59
← shicks2525 left22:00
→ TheRuckus joined22:00
→ e_l1997_ joined22:04
← fragamus left22:04
← metrixx left22:04
rafasc Celmor: that means there's an issue with your ca certificates.22:04
← e_l1997 left22:05
rafasc what's the output of $curl-config --ca22:06
Celmor `$curl-config --ca`?, gives me "bash: -config: command not found"22:07
there's no `curl-config` either22:08
← fluxAeon left22:08
rafasc you're not suposed to paste the $22:08
Celmor well, you didn't have a space between that and the command so I thought you meant a var22:09
I alo tried executing `curl-config`22:09
← Essadon left22:09
→ WhyNotHugobK joined22:10
← WhyNotHugobK left22:10
→ durham_ joined22:11
rafasc can you try to clone again with GIT_TRACE_CURL=1 GIT_TRACE=1 git ...22:12
← durham left22:12
← feksclaus left22:12
← chaosruler left22:12
→ feksclaus joined22:13
Celmor https://ptpb.pw/HiNX22:14
→ jstimm joined22:14
← greggerz left22:15
Celmor ok, looks like I didn't have ca-certificates installed for whatever reason22:16
→ ocelotsloth joined22:17
→ pr0ton joined22:19
← TheRuckus left22:19
→ hph^ joined22:19
← hph^ left22:20
→ hph^ joined22:20
← hph^ left22:21
→ justanotheruser joined22:21
→ hph^ joined22:21
← hph^ left22:21
→ hph^ joined22:22
← hph^ left22:23
→ hph^ joined22:23
← DarthRadar left22:31
→ teej joined22:36
← Acelogic left22:45
← aphilp left22:48
← mikecmpbll left22:48
→ aphilp joined22:49
← timj left22:50
→ muelleme joined22:51
TomyLobo i found a bug i think22:51
→ timj joined22:51
TomyLobo git worktree add ../foo && git rebase foo foo22:52
=> foo is checked out in 2 worktrees22:52
rafasc TomyLobo: git version?22:54
→ oojacoboo joined22:54
← inovas left22:54
← Celmor left22:54
← pr0ton left22:55
TomyLobo 2.17.022:55
← muelleme left22:56
→ inovas joined22:56
→ pr0ton joined22:56
TomyLobo fun things happen if you do that22:56
rafasc I get fatal: 'foo' is already checked out at ... using 2.19.022:57
TomyLobo cool22:57
rafasc let me compile 2.17.0 real quick.22:57
← bolovanos left22:58
TomyLobo anyway, fun things: all changes on one worktree end up as staged in reverse on the others22:58
← dege left22:59
rafasc TomyLobo: could not reproduce with 2.17.023:01
TomyLobo odd23:02
→ justinmrkva joined23:03
← thiago left23:03
TomyLobo did you create the repo with 2.17.0?23:03
rafasc good call.23:03
← jnewt left23:03
TomyLobo or with 2.19.0?23:03
i'm not 100% certain it was the rebase,tbh23:03
→ Acelogic joined23:03
rafasc I tried on a existing one.23:03
TomyLobo but i have no idea what else could have cause it23:03
← finalbeta1 left23:04
← unpythonic left23:04
→ kelowb joined23:06
← kelowb left23:06
→ ManiacTwisternz joined23:06
← ManiacTwisternz left23:06
→ thiago joined23:06
← acercle left23:07
rafasc using rebase does checkout the last argument you give to it.. So maybe it didn't check.23:07
fatal: 'foo' is already checked out at ...23:07
can you reproduce it from scratch?23:07
← ocelotsloth left23:08
← DefB left23:10
← _ADN_ left23:11
→ Mattiaslndstrm joined23:11
← trip__ left23:12
← durham_ left23:13
← Mattiaslndstrm left23:13
→ DefB joined23:13
→ durham joined23:13
← pr0ton left23:14
→ sctskw joined23:14
→ goweol joined23:15
← durham left23:15
→ pr0ton joined23:15
→ durham joined23:16
→ Kaisyu joined23:16
→ dviola joined23:16
← applecrumble left23:17
→ Chaos_Zero joined23:19
← oojacoboo left23:19
← blizzow left23:20
← deltam left23:22
← hph^ left23:22
← quipa left23:23
→ hph^ joined23:23
← enriq left23:24
← hph^ left23:24
→ hph^ joined23:24
← hph^ left23:25
→ hph^ joined23:25
← hph^ left23:25
→ hph^ joined23:26
← hph^ left23:26
→ Sasazuka joined23:27
→ hph^ joined23:27
← hph^ left23:27
← rwb left23:29
→ Noldorin joined23:29
← thebope left23:30
← BrianBlaze420 left23:30
→ BrianBlaze joined23:31
← Sasazuka left23:33
→ piggah joined23:34
← piggah left23:36
→ wildermind joined23:36
← aphilp left23:37
← codyw left23:37
← spacesuitdiver left23:42
← Pytor left23:47
→ JimmyRcom joined23:49
← drodger left23:49
← thiago left23:50
→ Bobdude joined23:51
← Narrat left23:52
→ drodger joined23:56
← BrianBlaze left23:57
← thomasross left23:57
→ BrianBlaze joined23:58

Logs Search ←Prev date Next date→ Channels Documentation