IRCloggy #git 2018-11-01

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-11-01

← ciscobandit left00:00
← vals_ left00:00
← hapos left00:00
→ tango_ joined00:01
← dsx_ left00:01
← revoltingPeasant left00:02
→ Marvel joined00:03
← finalbeta1 left00:04
← m3ddle left00:05
← archergodson left00:05
→ zulutango joined00:06
→ nephyrin` joined00:06
← nephyrin left00:06
nedbat ycon_: @ means HEAD, so @ could do it.00:07
← matthiaskrgr left00:07
→ dreiss joined00:08
ycon_ nedbat: nice! Thank you00:09
nedbat: so that sees' the HEAD (first commit) of my current branch00:09
← sleepee left00:10
← canton7 left00:10
← ephemer0l left00:10
→ canton7 joined00:10
nedbat ycon_: which is the same reference as your branch name00:11
→ matthiaskrgr joined00:12
ycon_ Great00:12
matthiaskrgr → Guest4511700:12
← mofai left00:12
← nephyrin` left00:14
→ nephyrin joined00:14
← nephyrin left00:15
← YuGiOhJCJ left00:15
→ m3d joined00:16
← lewix left00:17
← dreiss left00:18
← fahadash left00:19
← Ox1b4 left00:19
→ ephemer0l_ joined00:21
← Regon left00:26
Zexaron Git has this no new line at end of file, it's sporadic, also many times VS files00:28
any kind of clang-format type thing to just make all files add a line batch ?00:28
← venmx left00:30
nedbat Zexaron: git isn;'t adding or removing the newline at the end of the file i don't think00:30
Zexaron not that it is, I'm asking if it's a way to do that automatically batchmode for the whole repo00:31
like clang-format "all200:31
"all" *00:31
← zulutango left00:31
Zexaron if clang-format had an option to do that for example00:31
← Sasazuka left00:32
→ zulutango joined00:32
→ orbyt_ joined00:33
nedbat Zexaron: that I don't know00:33
← Marvel left00:34
→ rnat joined00:35
→ sleepee joined00:37
→ Kaisyu joined00:37
→ BallChang-CN joined00:38
→ Acelogic joined00:38
→ astronavt joined00:38
← astronavt left00:38
→ puller joined00:40
rafasc Zexaron: https://unix.stackexchange.com/a/3195500:40
← Enphuego left00:40
← BallChang-CN left00:40
Zexaron thanks00:40
← mescalinum left00:42
← tango_ left00:42
→ vals_ joined00:42
→ prakashd1 joined00:43
← sleepee left00:43
← puller left00:45
gruetzkopf → gruetze_00:45
← F4D3C0D3 left00:45
→ F4D3C0D3 joined00:46
→ andyhuzhill joined00:46
→ mollusk joined00:47
← oojacoboo left00:53
→ TheRuckus joined00:53
← freeman42y left00:53
→ sleepee joined00:56
→ BallChang-CN joined00:56
→ crimastergogo joined00:58
← F4D3C0D3 left00:58
← JanC left00:58
← dviola left00:59
→ revoltingPeasant joined00:59
← surfist left01:00
→ surfist joined01:00
← mollusk left01:01
← BallChang-CN left01:01
← platzhirsch left01:01
→ JanC joined01:05
← Narrat left01:07
← bubo left01:08
→ bubo joined01:09
← impermanence left01:10
← prakashd1 left01:11
→ crimastergogo_ joined01:11
→ F4D3C0D3 joined01:12
← species1873 left01:13
← crimastergogo left01:13
crimastergogo_ → crimastergogo01:13
→ sanraf joined01:13
← sanraf left01:14
→ BallChang-CN joined01:16
← rafasc left01:22
← msev- left01:25
← db` left01:25
→ breakingsad joined01:26
→ msev- joined01:30
→ GreenJello joined01:30
← BallChang-CN left01:31
→ yyy joined01:31
→ platzhirsch joined01:31
→ db` joined01:31
← troulouliou_div2 left01:32
← n3wborn left01:33
← yyy left01:33
← akushner left01:34
→ BallChang-CN joined01:36
← topdownjimmy left01:37
→ topdownjimmy joined01:38
← Hobbyboy left01:41
→ Hobbyboy joined01:42
→ dsx_ joined01:44
← orbyt_ left01:44
← sleepee left01:45
← virmaha left01:47
→ hyp3rbor3ax_ joined01:52
← hyp3rbor3ax_ left01:53
→ mollusk joined01:54
← wildermind left01:54
→ hyp3rbor3ax_ joined01:54
← sanches left01:55
← hyp3rbor3ax left01:55
← hyp3rbor3ax_ left01:55
→ jakogut_ joined01:56
← BallChang-CN left01:56
→ fahadash joined01:56
← staafl_ left01:57
→ hyp3rbor3ax_ joined01:57
→ staafl_ joined01:57
← hyp3rbor3ax_ left01:58
← bubo left01:58
→ bubo joined01:59
→ BallChang-CN joined02:01
← andyhuzhill left02:03
→ justanotheruser joined02:03
→ sanches joined02:05
← platzhirsch left02:05
→ t0dd1v joined02:06
← BallChang-CN left02:06
→ BallChang-CN joined02:06
→ andyhuzhill joined02:06
← ycon_ left02:07
→ lewix joined02:08
← sanches left02:10
← dsx_ left02:11
← DemonDestroyer left02:12
→ finalbeta joined02:12
→ dsx_ joined02:13
← ilmostro left02:15
→ sanches joined02:17
gruetze_ → gruetzkpf02:17
gruetzkpf → gruetzkopf02:17
→ ilmostro joined02:17
← thiago left02:17
← Mapleyyy left02:18
← MACscr left02:20
→ Mapleyyy joined02:21
← MrNr left02:24
← murph left02:24
← Klumben left02:24
← ghormoon left02:30
← barteks2x left02:31
← Hobbyboy left02:31
→ ghormoon joined02:31
→ Hobbyboy joined02:32
→ MrNr joined02:32
→ gaucheph joined02:33
→ barteks2x joined02:33
← ghormoon left02:36
→ ghormoon joined02:37
parsnip-olantern → parsnip02:37
← hbautista left02:40
← ghormoon left02:41
→ gitnoob joined02:41
→ ghormoon joined02:41
← ghormoon left02:42
→ ghormoon joined02:43
gitnoob → acwatt02:43
← horia_g left02:43
→ wrouesnel joined02:43
→ esrse joined02:45
→ murph joined02:45
← BallChang-CN left02:46
murph → Guest6570402:46
← acwatt left02:46
← F0rTex left02:48
← ghormoon left02:48
→ ghormoon joined02:49
→ F0rTex joined02:49
← igemnace left02:49
→ hph^ joined02:49
→ nivag joined02:50
→ BallChang-CN joined02:51
→ Klumben joined02:57
← ghormoon left02:58
→ sfarzy joined03:00
← BallChang-CN left03:01
→ ghormoon joined03:02
McKraken_zzzzz → McKraken03:08
→ cagomez joined03:10
← TinkerT left03:11
→ lanlink joined03:12
→ TinkerT joined03:13
→ regedit joined03:14
→ gasolwu joined03:17
→ thiago joined03:22
→ MoziM joined03:22
← nevodka left03:22
← nevodka_ left03:23
← Mattiaslndstrm left03:23
→ Mattiaslndstrm joined03:24
← gasolwu left03:26
→ BallChang-CN joined03:26
→ gasolwu joined03:28
← gasolwu left03:28
← F4D3C0D3 left03:30
→ gasolwu joined03:30
← BallChang-CN left03:30
← gasolwu left03:31
→ gasolwu joined03:31
← gasolwu left03:31
→ gasol_tw joined03:31
→ Mattiasl_ joined03:32
← Mattiaslndstrm left03:32
← m0viefreak left03:32
→ BallChang-CN joined03:36
← sanches left03:39
→ platzhirsch joined03:41
← discopatrick left03:46
→ sanches joined03:50
→ Toadisattva joined03:50
← xcm left03:50
← BallChang-CN left03:50
→ xcm joined03:51
→ watabou joined03:54
← sanches left03:55
← hph^ left03:56
← Mattiasl_ left03:58
← boombatower left03:59
← lagothrix left03:59
→ lagothrix joined03:59
← johnny56 left04:01
→ F4D3C0D3 joined04:03
← mrCyborg|zzz left04:05
→ mrCyborg|zzz joined04:05
→ BallChang-CN joined04:06
→ johnny56 joined04:06
→ sanches joined04:10
← BallChang-CN left04:11
← drbean left04:14
← justanotheruser left04:14
→ drbean joined04:14
← sanches left04:15
→ BallChang-CN joined04:16
→ sauvin joined04:18
← gasol_tw left04:18
→ gasol_tw joined04:19
→ timj joined04:19
← Toadisattva left04:19
→ zumba_addict joined04:20
→ sanches joined04:21
zumba_addict What are your thoughts on gitops? First time I heard it - https://www.twistlock.com/2018/08/06/gitops-101-gitops-use/04:21
→ justanotheruser joined04:21
← timj1 left04:22
← gasol_tw left04:23
← F4D3C0D3 left04:23
→ sanscoeur joined04:23
→ F4D3C0D3 joined04:23
→ gasol_tw joined04:23
← groundnuty left04:24
← andyhuzhill left04:24
→ jstimm joined04:24
→ andyhuzhill joined04:24
→ groundnuty joined04:25
← sanches left04:25
← BallChang-CN left04:26
← andyhuzhill left04:28
← cagomez left04:29
→ andyhuzhill joined04:29
← PLLunlock left04:31
→ Goplat joined04:35
← revoltingPeasant left04:38
← sfarzy left04:39
← m3d left04:40
→ sanches joined04:41
→ dandre joined04:45
← dandre left04:45
← sanches left04:46
← howdoi left04:47
← Puffball left04:49
← mollusk left04:49
→ Puffball joined04:50
→ g00s joined04:51
→ sfarzy joined04:52
→ mollusk joined04:55
→ BallChang-CN joined04:56
→ rossdpr joined04:58
← F4D3C0D3 left04:58
← sfarzy left04:59
→ F4D3C0D3 joined05:00
← yohnnyjoe left05:00
← Puffball left05:00
← mollusk left05:00
→ fstd_ joined05:01
← realies left05:01
→ pks_ joined05:01
→ sanches joined05:02
← pks left05:02
pks_ → pks05:02
Guest65704 → murph05:02
← fstd left05:05
fstd_ → fstd05:05
← sanches left05:07
→ realies joined05:09
→ Puffball joined05:10
← shicks_ left05:12
→ sanches joined05:12
← libertyprime left05:13
→ shicks2525 joined05:14
← spuc left05:14
→ spuc joined05:14
← F4D3C0D3 left05:15
← a3Dman left05:15
→ akushner joined05:16
← BallChang-CN left05:16
→ F4D3C0D3 joined05:16
← sanches left05:16
← rossdpr left05:17
→ a3Dman joined05:18
← Acelogic left05:19
→ ferdna joined05:20
→ bwasti joined05:21
→ BallChang-CN joined05:21
→ okovko joined05:21
← Bobguy left05:25
→ waveclaw joined05:27
← F4D3C0D3 left05:27
← Puffball left05:31
→ sanches joined05:32
→ F4D3C0D3 joined05:32
→ Puffball joined05:33
← sanscoeur left05:34
← F4D3C0D3 left05:34
→ sanscoeur joined05:34
← sanches left05:37
← inovas left05:38
← sanscoeur left05:39
← platzhirsch left05:40
→ inovas joined05:40
→ parallel2113 joined05:41
← parallel2113 left05:41
← BallChang-CN left05:41
← ferdna left05:41
→ F4D3C0D3 joined05:42
_ikke_ haven't heard of it either05:42
But I think the concept behind it is nothing new05:42
← andyhuzhill left05:44
→ andyhuzhill joined05:45
← g00s left05:45
← monr0e left05:45
_ikke_ The general concept is called infrastructure as code05:45
← cybrNaut left05:45
→ BallChang-CN joined05:46
← bachler left05:48
← andyhuzhill left05:48
→ andyhuzhill joined05:49
← F4D3C0D3 left05:49
→ F4D3C0D3 joined05:52
← F4D3C0D3 left05:54
← BallChang-CN left05:55
→ cybrNaut joined05:55
← JimmyRcom left05:56
→ goweol joined06:00
→ mescalinum joined06:01
← OrangeManBad left06:01
→ mollusk joined06:03
← durham left06:04
→ igemnace joined06:05
→ platzhirsch joined06:06
→ F4D3C0D3 joined06:10
← netj left06:12
← thiago left06:12
→ netj joined06:12
→ thiago joined06:14
→ OrangeManBad joined06:14
→ hexnewbie joined06:15
← F4D3C0D3 left06:16
→ prakashd1 joined06:18
→ b2eed622 joined06:19
→ F4D3C0D3 joined06:21
← igemnace left06:22
← F4D3C0D3 left06:22
→ Hi-Angel joined06:24
← jakogut_ left06:25
→ F4D3C0D3 joined06:25
→ BallChang-CN joined06:26
← F4D3C0D3 left06:26
← gasol_tw left06:28
→ robotman321_ joined06:29
→ fragamus joined06:30
→ muelleme joined06:32
← xcm left06:32
→ xcm joined06:33
← robotman321 left06:33
→ F4D3C0D3 joined06:33
→ sanches joined06:34
← wcpan left06:34
← rnat left06:34
→ wcpan joined06:35
← lanlink left06:37
→ VaultTec joined06:38
→ Envil joined06:39
← sanches left06:39
← Envil left06:39
← platzhirsch left06:40
← BallChang-CN left06:40
← xcm left06:41
→ Envil joined06:41
→ xcm joined06:41
→ dreiss joined06:43
→ gasol_tw joined06:43
→ sanches joined06:44
← sanches left06:45
← okovko left06:46
→ sQVe joined06:49
→ pd09041999 joined06:52
→ sanches joined06:54
→ Guest70797 joined06:57
← Guest70797 left06:57
← muelleme left06:58
← gasol_tw left06:59
← sanches left07:00
← esrse left07:00
xcm → Guest9728707:00
← Guest97287 left07:00
→ xcm joined07:00
← crimastergogo left07:01
→ metnel joined07:02
← staafl__ left07:04
← gaucheph left07:04
→ connectkushal joined07:04
→ connectkushal_ joined07:05
→ staafl__ joined07:05
→ sanches joined07:05
← connectkushal left07:05
connectkushal_ → connectkushal07:05
→ g00s joined07:06
← pd09041999 left07:06
← sanches left07:09
← staafl__ left07:12
← fragamus left07:13
→ Assault_ joined07:13
← Assault_ left07:15
→ BallChang-CN joined07:16
→ oxymoron93 joined07:17
→ Raed|Laptop joined07:19
← ilmostro left07:22
← lewix left07:24
← akushner left07:24
← mollusk left07:24
← BallChang-CN left07:25
→ freimatz joined07:26
→ chele joined07:30
→ ilmostro joined07:31
→ b7219264_ joined07:34
← b7219264__ left07:34
→ sanches joined07:35
← novumsensum left07:36
→ BallChang-CN joined07:36
→ mollusk joined07:37
← noya left07:39
← mollusk left07:39
← sanches left07:40
← BallChang-CN left07:40
← dreiss left07:41
← Mat001 left07:42
← b7219264_ left07:42
→ b7219264 joined07:43
vals_ → tango_07:45
→ mollusk joined07:46
→ pd09041999 joined07:47
← madewokherd left07:47
← thiago left07:48
← bwasti left07:53
cbreak zumba_addict: doesn't sound very useful in most cases07:53
→ muelleme joined07:54
← rkta left07:54
→ johnvonneuman joined07:55
cbreak in my experience, using a proper tool like ansible, or bash scripts (in a git repository of course) works well, unlike git would on its own, to administer and control a lot of the infrastructure I work with.07:55
← pd09041999 left07:55
→ YuGiOhJCJ joined07:55
→ sanches joined07:56
← Emperor_Earth_ left07:59
← muelleme left07:59
← sanches left08:01
→ nrubsig joined08:01
→ z]bandito joined08:01
gitinfo set mode: +v08:01
nrubsig Does GIT have a way to create a *.git in the local filesystem which automagically redirects all fetch/pull/push-requests to the repository from which it was created from ?08:03
← z|bandito left08:04
→ gunnarx joined08:04
← gunnarx left08:04
→ gunnarx joined08:04
osse No08:04
→ dege joined08:06
_ikke_ !GIT08:06
gitinfo Git is not an acronym, nor a proper noun ("git" is equally valid). All-caps is heresy and will be punished with SVN or possibly SCCS. https://git.wiki.kernel.org/index.php/Git_FAQ#Why_the_.27Git.27_name.3F and 48a8c26c625a4d3631c4f614bceb38933e74140808:06
cbreak nrubsig: if you git clone from a repository, all fetch, pull, push are redirected to origin08:08
which is the repository you cloned from08:08
is that what you want?08:08
kgspooks → kgz08:10
→ n3wborn joined08:12
→ Kartagis joined08:14
Kartagis hi08:14
can I ask a github question? #github seems not responsive08:14
_ikke_ Sure, not answers guaranteed though08:15
← t0dd1v left08:16
Kartagis I'm on macOS, have my keys and all, and added my key to github. however, I am asked for my credentials when I first try to push. any ideas?08:16
_ikke_ Are you using ssh or https?08:16
Kartagis btw, my key is not id_rsa08:16
→ BallChang-CN joined08:16
→ sanches joined08:16
Kartagis https08:17
should I use ssh?08:17
osse you must use ssh to use keys08:18
or ssh keys, as they're sometimes called08:18
Kartagis https means creds then08:19
→ G2__ joined08:21
_ikke_ yes, https always users a username and password (or application token if you enabled multifactor authentication)08:21
→ pd09041999 joined08:21
← BallChang-CN left08:21
G2__ hi all08:21
← sanches left08:21
G2__ quick question, let say I rename a branch that had a tag somewhere in it, is the tag still valid ?08:21
_ikke_ yes08:22
Kartagis okay, thanks08:22
_ikke_ G2__: a branch is just a label08:22
renaming the branch just renamed the label08:22
G2__ alright then08:22
_ikke_ and tags are not part of branches, they stand on their own08:22
G2__ perfect, thanks a lot08:22
_ikke_ (both are a type of reference)08:22
← pd09041999 left08:23
← goweol left08:23
→ pd09041999 joined08:23
← aLeSD_ left08:27
← mollusk left08:28
→ Noti joined08:31
cbreak tags (and branch heads) refer to commit hashes usually. tags can also refer to other object types.08:32
_ikke_ most commonly tag objects08:34
(for annotated tags)08:34
← regedit left08:34
→ goweol joined08:36
← mobile_c left08:36
← g00s left08:37
← Goplat left08:38
→ schleppel joined08:39
→ Silmarilion joined08:39
→ bsaboia joined08:40
→ star_prone joined08:42
→ seventh__ joined08:43
← dsx_ left08:43
← star_prone left08:46
← zumba_addict left08:51
→ elsheepo joined08:51
← lupine left08:54
→ archergodson joined08:58
← andyhuzhill left08:59
→ andyhuzhill joined08:59
← luckman212 left09:00
→ luckman212 joined09:00
→ lupine joined09:01
← andyhuzhill left09:03
→ andyhuzhill joined09:04
← sQVe left09:05
→ kes joined09:06
→ revoltingPeasant joined09:06
→ WhereIsMySpoon joined09:06
← WhereIsMySpoon left09:06
→ WhereIsMySpoon joined09:06
→ sQVe joined09:06
← goweol left09:07
→ mollusk joined09:08
→ Guest65 joined09:11
← Guest65 left09:13
← pd09041999 left09:14
→ elsheepo_ joined09:15
← netj left09:15
→ netj joined09:16
← prakashd1 left09:17
← catsup left09:18
→ catsup joined09:18
← WhereIsMySpoon left09:18
← elsheepo left09:19
→ WhereIsMySpoon joined09:19
← WhereIsMySpoon left09:19
→ WhereIsMySpoon joined09:19
→ yyy joined09:19
← catsup left09:19
→ catsup joined09:19
→ GreenJel_ joined09:21
← GreenJello left09:21
← WhereIsMySpoon left09:23
→ WhereIsMySpoon joined09:24
← WhereIsMySpoon left09:24
→ WhereIsMySpoon joined09:24
deadk → e09:24
→ pd09041999 joined09:26
→ qswz joined09:26
qswz Can this be done in one rebase command only: git fetch origin $1:$1; git rebase $1;09:27
rebasing against a remote branch, not sure09:27
I don't think so09:27
→ LondonAppDev joined09:28
canton7 qswz, not with that custom fetchspec, no09:30
← WhereIsMySpoon left09:31
canton7 ooh, although pull can take a fetchspec09:31
so maybe 'git pull --rebase origin $1:$1'09:31
qswz, it's rare to want to do that though: it looks like you want to create a new local branch for a corresponding remote branch $1, and then rebase the current branch onto it?09:32
qswz, if so, it's more common to just let git fetch the remote branch into its corresponding remote-tracking branch, and the rebase onto that09:32
(without bothering with the local branch for $1)09:32
→ muelleme joined09:32
← Raed|Laptop left09:33
→ dsx_ joined09:33
← holdsworth left09:35
← YuGiOhJCJ left09:35
→ holdsworth joined09:35
← freimatz left09:35
← andyhuzhill left09:36
← pd09041999 left09:36
→ BallChang-CN joined09:36
← muelleme left09:37
→ Emperor_Earth_ joined09:38
→ venmx joined09:42
← seventh__ left09:43
← Eryn_1983_FL left09:44
GreenJel_ → GreenJello09:45
← BallChang-CN left09:45
→ seventh__ joined09:46
← archergodson left09:49
← inovas left09:50
→ Eryn_1983_FL joined09:50
→ shabius_ joined09:52
→ inovas joined09:52
← LondonAppDev left09:53
← Emperor_Earth_ left09:54
→ LondonAppDev joined09:54
← shabius left09:54
→ BallChang-CN joined09:56
← hussam left09:57
→ nevodka joined09:58
→ archergodson joined09:58
← c0san0stra left09:58
→ afuentes joined09:58
→ sanches joined09:59
← dpyro left10:00
→ miczac joined10:00
← lankanmon left10:00
← BallChang-CN left10:00
→ c0san0stra joined10:01
← LondonAppDev left10:01
qswz ok thanks10:02
→ LondonAppDev joined10:02
elsheepo_ → elsheepo10:02
qswz yes that's what it's doing10:02
hmm good idea! with pull -r10:03
not even needed since I have [pull] rebase=true in .gitcinfig, thanks10:03
← sanches left10:05
qswz are there legit cases of pulling without rebase?10:07
maybe I'm missing it :)10:08
rudi_s qswz: If you want to actually create a merge request?10:08
s/request/commit/10:08
Or if the history has diverged in such a way that a rebase creates many conflicts, but a merge works just fine.10:09
qswz oh ok10:09
hmm in that case10:09
I'd like to do a git pull --hard10:09
if that exist10:09
rudi_s Personally I never use pull, but always fetch and then a manual merge or rebase.10:10
What is --hard supposed to do?10:10
→ sanches joined10:10
qswz I mean forcing to have the remote version, overwriting my local one (after haveing backed up)10:10
oxymoron93 you wanna overwrite your branch with what is on remote repo?10:10
qswz like a reset --hard HEAD10:10
tobiasvl that's not a pull though, that's a reset10:10
qswz yes10:10
tobiasvl yes, use reset --hard10:10
luis qswz: if you're Linus Torvalds and you're pulling stuff from the other maintainers. Thanks to that use case, the rest of us have to suffer through excessive and/or accidental merging. 🙂10:10
qswz reset works with remote branch?10:10
ok thanks guys10:10
oxymoron93 git fetch && git reset --hard origin/<branch> while on local <branch>10:10
tobiasvl qswz: for sure10:10
qswz haha, thanks10:11
oxymoron93 mind your unstashed or uncommited changes qswz10:11
qswz sure!10:11
← djapo left10:12
canton7 qswz, perhaps you're working on the branch with another person, and you don't want to !rewrite it10:12
gitinfo qswz: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum10:12
canton7 because it will screw them up10:12
→ bolovanos_ joined10:13
qswz yea that's the case, it can happen that we push -f, and we just notify each other if so, but very rare10:14
→ wm4 joined10:14
← sanches left10:14
qswz thanks for link10:14
oxymoron93 it is all fine, until automation processes kick in :D10:15
wm4 I currently do a ton of cherry-picking (resynchronizing a repo after it has diverged for years)10:15
qswz heh, duplicated commits are hell10:15
wm4 I'm getting a lot of conflicts, and I'm usising "conflictstyle = diff3", which makes them slightly more readable10:15
but what I really want is to see what changed in the current repo, and what changed in the repo I'm cherry-picking from10:16
so what I tend to do is e.g. copying the first two merge conflict marker sections into a diff viewer10:16
isn't there something better?10:16
qswz I love using vscode for resolving conflicts10:17
→ rsrx joined10:17
qswz easy conflicts thoug10:17
canton7 wm4, you could set up a graphical mergetool?10:19
wm4 canton7: such as? (I'm using git-cola, which is somewhat helpful, but also sometimes unhelpful)10:19
canton7 wm4, look at the list under "merge.guitool" in man git config10:20
gitinfo wm4: the git-config manpage is available at https://gitirc.eu/git-config.html10:20
wm4 hm10:20
qswz meld is good10:21
wm4 aha meld supports a 3 way view for this10:21
→ BallChang-CN joined10:21
← seventh__ left10:21
→ jtrzebiatowski joined10:22
← elsheepo left10:22
← yyy left10:22
canton7 wm4, in case you're not aware, man git mergetool will launch the merge tool automatically for each of the conflicted files10:22
gitinfo wm4: the git-mergetool manpage is available at https://gitirc.eu/git-mergetool.html10:22
→ yyy joined10:22
← gunnarx left10:23
→ gunnarx joined10:23
← gunnarx left10:23
→ gunnarx joined10:23
wm4 hm meld doesn't reload if you edit externally10:24
→ jtrzebiatowski_ joined10:27
→ aLeSD_ joined10:28
← jtrzebiatowski left10:28
→ ams__ joined10:30
→ sanches joined10:30
← jtrzebiatowski_ left10:30
← BallChang-CN left10:31
← gunnarx left10:31
→ BallChang-CN joined10:32
← staafl_ left10:33
→ mona_x joined10:34
mona_x i am in the master branch ... i've done some changes10:34
← sanches left10:34
mona_x the master remote has made some changes ... i am trying to pull that change ... it is saying some wierd fucked up shit10:34
Your local changes to the following files would be overwritten by merge:10:35
docker-compose.yml10:35
that file is not even altered10:35
i've reset it10:35
← F4D3C0D3 left10:36
mona_x just fucking pull and replace muthat fucker mode ?10:36
→ F4D3C0D3 joined10:36
mona_x git is retarded10:36
how hard can it be to pull a change and get a merge conflict?10:36
to merge locally10:37
at least10:37
← F4D3C0D3 left10:39
canton7 mona_x, watch your language, please10:39
mona_x the file has even been reset: git reset HEAD docker-compose and is not listed in git status10:39
still i get:10:39
error: Your local changes to the following files would be overwritten by merge: docker-compose.yml10:40
qswz autostash10:40
canton7 firstly, did you type 'git reset HEAD docker-compose' or 'git reset HEAD docker-compose.yml'?10:40
qswz [rebase]10:40
autoStash = true10:40
→ sanches joined10:40
← GreenJello left10:41
← LondonAppDev left10:41
← mollusk left10:42
mona_x canton7 the latter10:42
it is not being reset i can see now10:43
→ LondonAppDev joined10:43
mona_x it's still in unstaged changed after reset10:43
canton7 mona_x, ah, so it is listed in 'git status'?10:43
mona_x but why am i not getting a merge conflict to resolve anywqay10:43
canton710:43
yes10:43
but not resetting10:43
git reset HEAD docker-compose.yml10:43
canton7 mona_x, merges happen between *commits*. If you've got an *uncommitted* file, it can't be merged. Either stash it, commit it, or remove the uncommitted changes10:43
mona_x, can you pastebin the actual output of 'git status'?10:44
mona_x if i stash it then i can't unstash because of the changes10:44
canton7 I'm not sure what you mean by that. A !repro would help10:44
gitinfo [!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 see10:44
mona_x https://hastebin.com/sugulakuno.sql10:44
canton7 if I stash10:44
pull10:44
canton7 mona_x, of 'git status', please10:45
not the 'reset' command10:45
← sanches left10:45
← xcm left10:45
mona_x https://hastebin.com/titedolobo.sql10:45
→ xcm joined10:45
canton7 Right, you've got a lot of uncommitted changes there10:46
← BallChang-CN left10:46
mona_x canton7 so what ? i only want the one change from the master10:46
canton7 If you *do* want to throw away all local changes to 'docker-compose.yml', see how the output of 'git status' describes the command to do that10:46
→ BallChang-CN joined10:46
mona_x canton7 i don't really .. i want to merge conflict manage it10:46
canton7 isn't sure why you were trying to reset it then10:46
mona_x canton7 to get around this issue ... git pull is not working10:47
use "git pull" to merge remote to yours10:47
not working10:47
canton7 let's take a step back: you've got uncommitted changes, and you're trying to merge another branch into your local branch. As I said, git merges commits, so if you've got uncommitted changes, git will refuse to merge so it doesn't throw away your local changes10:47
mona_x https://hastebin.com/dezasedohe.sql10:47
wm4 does anyone if I can put back meld into the 3 way mode after a merge conflict has been marked as resolved?10:48
canton7 so, again either stash, or commit your uncommitted changes10:48
→ jngk joined10:48
osse wm4: git checkout --merge file10:48
mona_x canton7 that's fucking insane .. so I have to commit shit just because I want to see how the master file has changed ...10:48
osse wm4: it will overwrite the file though10:48
canton7 mona_x, language, please10:48
mona_x, if you just want to see how the file has changed in master, you can do that without merging10:49
wm4 annoying10:49
mona_x canton7 i prefer doing that in my *** editor10:49
jngk scenario: I believe I committed an copyrighted file, I loop over commits with git rev-list and apply git diff -name-only, then grep for the copyrighted file10:49
→ yqt joined10:49
jngk but I can't find it...10:49
osse jngk: do you know its name?10:50
jngk yep10:50
osse git ls-tree -r HEAD | grep name10:50
canton7 mona_x, right, so let's say you *do* want to merge, and you don't want to commit first. The answer is stashing.10:50
jngk ah10:50
canton7 mona_x, let's go back to "<mona_x> if i stash it then i can't unstash because of the changes"10:50
→ ocds joined10:51
← yyy left10:52
→ prakashd1 joined10:52
← qswz left10:52
→ libertyprime joined10:53
jngk osse, thanks, found i10:53
mona_x canton7 yes, the previous experience is that stashing10:53
pulling10:53
jngk trying to remove it now, is this the right command10:53
git filter-branch --tree-filter HEAD~1010:54
mona_x and then unstashing ... won't work if any stashed file will conflict with a file that has been changed since the stash10:54
right?10:54
osse jngk: !sensitive10:54
gitinfo jngk: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/10:54
jngk git filter-branch --tree-filter 'rm -f myFile' HEAD~1010:54
mona_x i just committed10:54
canton7 mona_x, it "works" just fine. If there are conflicts, it will add merge markers and put those files into a conflicted state, which is correct behaviour10:54
osse mona_x: normally you only get conflicts if the same file has been changed in the spot within the file10:54
canton7 the same conflicts you would get if you committed and then merged10:54
mona_x canton7 ok, that's not my previosu experience ... maybe I should have tried that10:55
canton7 but now I comiitted10:55
pulled10:55
no conflicts10:55
wierd10:55
canton7 mona_x, what exactly do you mean by "won't work" in "won't work if any stashed file will conflict with a file that has been changed since the stash"10:55
no conflicts is fine. that means stash && merge && stash pop would have worked fine without conflicts10:55
mona_x canton7 i've usually unstashed from sourcetree and remember having an issues saying the files have changed and your stash will replace them .... can't continue ...10:56
canton7 ok10:56
automerge10:56
you mean?10:56
canton7 mona_x, never seen that. Not sure whether sourcetree has some weird custom behaviour there10:56
"automerge"?10:56
jngk osse: know what's wrong with the command I wrote? it's syntactically identical to what I see in the manpage, but I get error "You must specify a ref to rewrite"10:56
osse jngk: did you specify a ref to rewwrite?10:57
→ nevodka_ joined10:58
mona_x canton7 the earlier claim was that the file had been changed .. and the remove could not be pulled .. so i committed the file .... then i pulled ... no conflict ... no info on what happened ... if the file has changed remotely and mine .. then obviously one of three things must happen ... theirs replaces mine, mine replaces theirs (locally) or there is a merge which i was not asked to handle ... automerge ?10:58
canton7 jngk, it's probably not happy with 'HEAD~10'. That doesn't resolve to a branch that it can rewrite the commits on10:58
mona_x and the remove = remote10:58
jngk osse: in this, "git filter-branch --tree-filter 'rm -f myFile' HEAD~10", is HEAD~10 not the ref?10:58
canton7 mona_x, you're only asked to "handle" a merge if conflicts happened. A conflict occurs when both sides of the merge edit the same part of the file.10:59
mona_x, most merges happen successfully without conflicts, and you are not asked to intervene. If a conflict does happen, that's when you have to step in and fix it.10:59
mona_x canton7 hence the term automerge10:59
canton7 "automerge" is not a term. It sounds like you mean "a merge which happened without conflicts"10:59
but all merges are "automerges" in that sense, in that git will always attempt to merge11:00
jngk okay, I'm able to get it to run. presumably if "branch is unchanged" after the run, "rm -f myFile" didn't hit any file, on any of the commits11:00
mona_x someobdy / something merged automagically without notify me11:00
→ JimmyRcom joined11:00
canton7 mona_x, again, git does not "notify" you of merges11:00
and it did not happen "automatically" -- you asked it to merge explicitly11:01
mona_x canton7 sometimes those merges ... adding a line at the bottom in remove and changing a line at the top ... might actually be related and not workable together11:01
git here won't catch that11:01
canton7 mona_x, sometimes that is true, in which case you have to fix the result11:01
→ sanches joined11:01
mona_x i prefer if I am always asked rather then this bullshit auto magic bullshit11:01
→ rnat joined11:01
canton7 mona_x, again, language11:01
last warning11:01
mona_x canton7 but I won't even be notified11:01
bullshit is a frowned upon ?11:02
canton7 you ask git to merge. it merges. What do you expect?11:02
you can see what it merged in the output11:02
mona_x canton7 no, i asked to pull11:02
canton7 pull = fetch + merge11:02
mona_x so git fetch11:02
canton7 it's shorthand. it means merge.11:02
git fetch will never cause a merge11:02
mona_x would have required me to manually resolve conflicts ?11:02
← BallChang-CN left11:02
canton7 you are ALWAYS required to manually resolve conflicts11:02
!fetch11:03
gitinfo When you work with remote repositories, Git stores copies of the remote's branches in !tracking_branches (basically mirrors). You can use 'git fetch' to update those. If you want to actually apply changes from the remote to your checked out branch, a second step is needed, usually 'git merge' or 'git rebase'. There's also 'git pull' which combines both steps.11:03
mona_x me and you differ on what a conflict is11:03
stop being so anal11:03
a conflict is the entire file11:03
not a line11:03
canton7 If you want to use a term, you need to use git's definition of it11:03
mona_x any change in a file is a conflict11:03
canton7 otherwise we're only going to get confused11:03
→ spacesuitdiver joined11:03
canton7 a conflict is when git tries to merge a file, but both sides have changed the same part, and it can't successfully complete the merge on its own. That is a conflict.11:04
mona_x anyway .. sorry for being harsh ... i just hate this crap ... svn is superior .. the only issue is the f***king svn files everywhere11:04
canton7 the place where git beats svn is its better support for multiple parallel lines of work, and better merging. If you don't want merging, yes you'll do better with svn11:05
I thought never svn versions moved to a single .svn folder in the root, the same as git?11:05
← sanches left11:05
mona_x canton7 for me a conflict is actually a change to any part of the file .. period ... that git analyzes text files and what not i don't get ... it can hardly get 100% accurate ...11:05
canton7 s/never/newer/11:05
mona_x always11:06
canton7 really?11:06
jngk okay, I manage to remove the file with git filter-branch. However, when I "git show <sha1>" for the commit when the file was added, I still see the file contents11:06
mona_x time to switch11:06
bremner please do11:06
canton7 mona_x, yes, but if you're in a git channel talking about git and git's output, you must expect that when you say 'conflict', people use git's definition of it :P11:06
jngk does this mean I haven't actually filtered/remove the file from the repo history?11:06
mona_x canton7 pararelly works ... lol ... branches are the evil of the new junior developers11:06
← Spooktober left11:07
canton7 you might want to update that thinking, or it's possible you might find yourself a bit left behind the times11:07
mona_x branches everywhere .. duplicate, redundant and unaccessiable code everywhere, in a ll branches waiting to be merged into master at some point .. .code hell11:07
canton7 possible11:07
canton7 do you want any more help, or do you just want to complain?11:07
→ grumble joined11:07
mona_x but i worked at a company where they wanted a "feature" branch for any kind of change ...11:07
← SheepMaester left11:08
tobiasvl that's a common git workflow11:08
mona_x only problem if you are working on two separate branches ... and you write a util method .... that the other might need or use11:08
→ BtbN joined11:08
mona_x how do you share that /11:08
??11:08
difficult as hell11:08
canton7 feature branches shouldn't last long11:08
mona_x it's idiotirc11:08
canton7 ours live normally for less than a day11:08
mona_x idiotic11:08
canton7 that's rarely the case11:08
sometiems you work on thing for a week or longer11:09
← jngk left11:09
canton7 I'm getting sick of trying to have a proper discussion with your sour and grating attitude I'm afraid11:09
mona_x canton7 because I am right here11:09
canton7 and sorry, it's not perosnal11:09
→ gunnarx joined11:09
← gunnarx left11:09
→ gunnarx joined11:09
canton7 if you want a constructive discussion, you're welcome to have one. Otherwise, this is a help channel: if you want help, please ask, otherwise please cut it out11:09
mona_x but defending a way of working when I am raising obvious and specific issues11:09
→ Barabacha joined11:09
BtbN So, I just upgraded from Debian 9 to 10, and now any attempt to clone/pull/push via ssh ends with "packet_write_wait: Connection to 192.30.253.112 port 22: Broken pipe" No matter what host, github and our local gitlab are equally broken. If I increase the ssh verbosity, I can see that authentication succeeds, so it's not that. Anyone encountered that issue already?11:10
mona_x which is obviosly flawed does not irritate me any less11:10
canton7 this isn't the place to complain about git. This is the place to get help with your git problems11:10
mona_x canton7 i am trying to figure out how any of these approaches actually lead to better code ... i believe google have one big repo .. maybe they use feature branches ... but I suspect they've worked their way around sharing code in a different way11:11
canton7 they will use a lot of branches11:11
← mona_x left11:13
→ mofai joined11:14
→ diimdeep joined11:15
→ yohnnyjoe joined11:15
diimdeep Yo, after you pulled changes you see nice per file diff, is there way to see exactly this for last commit?11:16
or between any commit11:16
tobiasvl git diff --stat commit1 commit211:17
→ lankanmon joined11:17
tobiasvl or more generally a range11:17
man git diff11:17
gitinfo the git-diff manpage is available at https://gitirc.eu/git-diff.html11:17
canton7 diimdeep, 'git show' often works as an alias for diffing just the last commit11:18
→ jnavila joined11:18
→ F4D3C0D3 joined11:18
canton7 so 'git show' will show the diff of the previous commit11:18
diimdeep canton7: git show - shows content11:18
canton7 diimdeep, it also shows diffs11:19
'git show'-ing a commit shows its diff11:19
→ jikz joined11:19
canton7 'git show' on its own shows the diff of the last commit11:19
tobiasvl I think diimdeep wanted the stats for the diff (which git shows by default when pulling)11:19
canton7 ah, then add --stat, for 'git show --stat'11:20
diimdeep tobiasvl: you right11:21
you rock, tahnks11:21
Thanks11:21
canton7 I interpreted 'per file diff' as being a diff ><11:21
← ocds left11:23
→ CodeSlingerPaul joined11:25
← jnavila left11:27
← spacesuitdiver left11:28
→ jnavila joined11:28
← diimdeep left11:29
→ ahmed89 joined11:30
← OrangeManBad left11:32
→ yyy joined11:34
← LondonAppDev left11:37
→ LondonAppDev joined11:38
→ sanches joined11:41
→ Hounddog joined11:42
→ OrangeManBad joined11:45
← sanches left11:46
← wm4 left11:46
← LondonAppDev left11:50
← justanotheruser left11:50
→ freimatz joined11:51
→ tchan1 joined11:54
← nevodka left11:55
→ Yoda2 joined11:56
← tchan left11:57
← Noti left11:57
← Yoda1 left11:58
→ LondonAppDev joined11:59
→ olalonde joined12:00
→ rkta joined12:02
→ jammm joined12:02
← jammm left12:02
→ jammm joined12:02
→ mona_x joined12:03
→ k047n0de joined12:04
← TheRuckus left12:05
← jikz left12:07
← k047n0de left12:11
← yohnnyjoe left12:15
← cdown left12:16
← topdownjimmy left12:18
→ topdownjimmy joined12:19
→ spacesuitdiver joined12:19
← miczac left12:22
← tchan1 left12:26
→ tchan joined12:27
→ platzhirsch joined12:27
→ mostlybadfly joined12:28
← F4D3C0D3 left12:32
→ F4D3C0D3 joined12:32
← mniip left12:35
→ miczac joined12:37
→ guest joined12:43
→ madewokherd joined12:44
→ GreenJello joined12:44
← F4D3C0D3 left12:44
← guest left12:45
→ plexigras joined12:46
← yqt left12:46
← GreenJello left12:49
→ hph^ joined12:51
← platzhirsch left12:52
← spacesuitdiver left12:55
→ sleepee joined12:55
← xcm left12:59
→ xcm joined12:59
GDPR → emerson13:01
→ cdown joined13:02
← LondonAppDev left13:04
← VaultTec left13:06
→ ableto joined13:07
→ AndresInSpace joined13:09
→ artemon joined13:11
→ crimastergogo joined13:12
→ DemonDestroyer joined13:13
→ pd09041999 joined13:14
→ voolik joined13:14
McKraken → McKraken_zzzzz13:16
→ oojacoboo joined13:16
← Hounddog left13:16
← libertyprime left13:17
→ czart joined13:18
→ TheRuckus joined13:19
→ boombatower joined13:21
← ahmed89 left13:22
← oojacoboo left13:22
→ oojacobo_ joined13:22
← TheRuckus left13:23
← madewokherd left13:23
← oojacobo_ left13:24
→ sanches joined13:24
→ oojacoboo joined13:25
← oojacoboo left13:26
→ oojacoboo joined13:27
→ pawle joined13:28
← pawle left13:29
← sanches left13:29
→ libertyprime joined13:30
← Shushi left13:33
← oojacoboo left13:34
→ oojacoboo joined13:35
→ sanches joined13:35
← oojacoboo left13:36
→ fairuz joined13:37
→ Mat001 joined13:38
→ oojacoboo joined13:38
← Trel left13:39
← oojacoboo left13:40
← sanches left13:40
→ nxet joined13:40
→ oojacoboo joined13:40
← oojacoboo left13:41
→ oojacoboo joined13:42
← n3wborn left13:42
→ TheRuckus joined13:42
← TheRuckus left13:43
→ TheRuckus joined13:43
← oojacoboo left13:44
→ oojacoboo joined13:44
← oojacoboo left13:47
→ oojacobo_ joined13:47
→ zivanovicb joined13:50
→ griffindy joined13:52
→ hussam joined13:52
← oojacobo_ left13:52
→ oojacoboo joined13:53
← droplet left13:53
→ droplet joined13:53
→ Shushi joined13:54
← Shushi left13:54
← chrfle left13:54
← jammm left13:56
← artemon left13:57
→ Gamoder_ joined13:57
Gamoder_ Hi everyone, if I create a new branch using git checkout -b <newbranch>, will I lose any changes?13:57
_ikke_ no13:58
→ madewokherd joined13:58
← zivanovicb left13:59
Gamoder_ great, thanks!13:59
→ F4D3C0D3 joined13:59
← archergodson left14:00
→ Guest38700 joined14:03
→ lewix joined14:03
← F4D3C0D3 left14:03
← rkta left14:03
← Revan- left14:04
→ LondonAppDev joined14:06
← oojacoboo left14:06
→ LondonAp_ joined14:06
→ oojacoboo joined14:07
_ikke_ If you would specify a different base commit / branch, git would try to checkout that branch first, but then abort as soon as it notices it has to overwrite uncomitted changes14:07
← Guest38700 left14:07
← oojacoboo left14:08
→ Revan- joined14:08
→ oojacoboo joined14:09
← LondonAppDev left14:11
← oojacoboo left14:11
→ oojacoboo joined14:12
→ Acelogic joined14:12
← LondonAp_ left14:12
→ lanlink joined14:13
← connectkushal left14:13
→ chrfle joined14:14
← chrfle left14:14
→ chrfle joined14:14
← xcm left14:17
→ LondonAppDev joined14:17
← oojacoboo left14:18
← LondonAppDev left14:18
→ Noti joined14:18
→ oojacoboo joined14:18
← jelmer left14:18
→ xcm joined14:19
← libertyprime left14:20
← robotman321_ left14:20
esotericnonsense hmm. is there a 'very-aggressive' git gc?14:20
→ robotman321 joined14:20
← bauruine left14:21
esotericnonsense i've somehow managed to end up with a 150MiB .git folder. if I clone the project again from remote it's tiny.14:21
like, < 1MB.14:21
i can just clone it again but i'm confused as to how this has happened14:21
→ jelmer joined14:22
charlton Do you have a lot of stashed changes or something?14:22
That's very odd14:22
← sleepee left14:22
esotericnonsense yeah, i'm confused. i'm just going to blow it away I guess.14:23
rewt are you sure the remote has everything that's in your local?14:23
esotericnonsense (I had one stash, in reply to your comment, but it was trivial, and dropping it made near as no difference)14:23
→ gaucheph joined14:24
→ Regon joined14:24
← oojacoboo left14:25
→ oojacoboo joined14:26
← Gamoder_ left14:26
→ libertyprime joined14:27
→ ciscobandit joined14:28
→ bauruine joined14:28
osse esotericnonsense: this might help, but it wipes the reflog: git reflog expire --expire=all && git gc --prune=all14:31
→ prakashdanish joined14:31
← prakashd1 left14:31
osse add --expire-unreachable=all to reflog expire14:32
→ blackandblue joined14:33
→ Essadon joined14:35
← ciscobandit left14:35
← gaucheph left14:35
→ greggerz joined14:39
→ hbautista joined14:41
→ al-damiri joined14:42
→ gaucheph joined14:43
→ sammyo joined14:44
→ AbleBacon joined14:45
→ GreenJello joined14:45
→ m0viefreak joined14:46
← miczac left14:46
→ miczac joined14:48
← austin987 left14:49
→ D5N_ch3ck joined14:49
← D5N_ch3ck left14:50
← GreenJello left14:50
← Puffball left14:52
→ Puffball joined14:52
→ D5N_ch3ck joined14:53
Anthaas How can I find a class anywhere within a git repo (all branches, all stash/commits)?14:53
← D5N_ch3ck left14:53
→ justanotheruser joined14:54
← dsx_ left14:55
← genius_monkey left14:58
→ genius_monkey joined14:59
← voolik left14:59
← rnat left15:01
← genius_monkey left15:03
→ genius_monkey joined15:04
→ ferdna joined15:04
→ peacememories joined15:05
← prakashdanish left15:07
← CheckDavid left15:07
oxymoron93 Anthaas: your question is a bit ambiguous to me, you can visualize all history with !lol15:08
gitinfo Anthaas: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all15:08
oxymoron93 or using `gitk` command to launch gui15:08
`gitk --all` that is15:08
← ferdna left15:10
Anthaas I want essentially a grep where I can give my class name, and have it find it.15:10
oxymoron93 aha check git log -S in man git log15:11
gitinfo the git-log manpage is available at https://gitirc.eu/git-log.html15:11
→ ciscobandit joined15:12
osse Anthaas: like git grep ?15:12
oxymoron93 I am not of a user of that command myself, so can't help much15:12
← ujjain left15:13
← JimmyRcom left15:13
← jast left15:13
← peacememories left15:13
_ikke_ git grep only searches in a single tree15:14
← lanlink left15:14
← cybrNaut left15:18
→ cybrNaut joined15:18
→ durham joined15:20
→ orbyt_ joined15:21
→ thiago joined15:22
→ _kk22kk_ joined15:23
← pd09041999 left15:23
← crimastergogo left15:26
→ sanches joined15:27
← libertyprime left15:29
→ jast joined15:30
→ ujjain- joined15:31
→ libertyprime joined15:31
→ Derwish joined15:32
→ Raed|Laptop joined15:32
← sanches left15:32
→ veegee joined15:32
→ NwS joined15:33
← G2__ left15:33
→ monr0e joined15:34
← _kk22kk_ left15:34
→ pd09041999 joined15:36
→ peacememories joined15:37
→ AaronMT joined15:37
→ sanscoeur joined15:38
← sQVe left15:38
→ Toadisattva joined15:38
← peacememories left15:38
← sanscoeur left15:39
→ sanscoeur joined15:40
← cd left15:42
← oojacoboo left15:42
→ oojacoboo joined15:42
Zexaron Hello15:43
→ mniip joined15:44
→ dpyro joined15:44
← sanscoeur left15:44
Zexaron Does maybe git support some kind of file symlink/hardlink, where you could have one file checked out in worktree with a different path/name than it is checked in ?15:44
Like auto crlf, but for files15:45
filenames*15:45
_ikke_ no15:45
→ n3wborn joined15:47
→ sanches joined15:48
→ igemnace joined15:48
→ peacememories joined15:48
← oojacoboo left15:49
← holodoc left15:49
→ oojacoboo joined15:49
→ holodoc joined15:50
← Hi-Angel left15:50
← sh3iny left15:50
→ G2__ joined15:50
← mona_x left15:51
← Noti left15:51
← oojacoboo left15:52
← sanches left15:52
← thiago left15:53
→ oojacoboo joined15:53
← oxymoron93 left15:53
→ troulouliou_dev joined15:54
← peacememories left15:54
← bsaboia left15:57
→ licnep joined15:59
→ santosh joined16:00
→ moei joined16:01
← Derwish left16:01
← metnel left16:02
santosh How to squash last two commits into one?16:02
I'm doing git rebase -i HEAD~216:02
doing squash to first line and pick on second line (commit)16:02
getting following error16:03
j416 santosh: change line two from "pick" to "squash"16:03
santosh error: cannot 'squash' without a previous commit16:03
osse santosh: pick first and squash second16:03
santosh I want the commit message of second line.. (the latest commit)16:03
will that do it?16:03
j416 you'll get to keep that, yes.16:03
you will get both messages in your editor and then you can pick whatever you want from that16:04
→ amrits_ joined16:04
→ no_gravity joined16:05
no_gravity Strange, that gits default diff visualization is not very smart.16:05
← oojacoboo left16:05
no_gravity For example when you change a space to a tab, git shows the line as deleted and added.16:05
And when you add --word-diff-regex=., lines that are really deleted look funky.16:06
→ oojacoboo joined16:06
no_gravity Is there a switch to make it more intelligent?16:06
j416 not sure. You can ignore whitespace changes with -b.16:07
← inovas left16:07
santosh Is force pushing safe at this position? This was a pull request and I was asked to squash the commits.16:07
no_gravity j416: REally? Even with -b it shows me the lines where spaces turned into tabs as deleted and added.16:08
← durham left16:08
j416 santosh: if they asked you to squash commits, then the only way to get that to the same PR is to force push.16:08
igemnace santosh: yes, very likely that's what they expect16:08
→ inovas joined16:09
j416 santosh: it's never "safe", though. It will make those old commits unavailable from the remote.16:09
but it sounds like that's what you want.16:09
→ fission6 joined16:09
← no_gravity left16:09
j416 no_gravity: it shouldn't.16:10
← kdub left16:10
→ kdub joined16:10
kdub is there a way to use a custom merge driver as a command switch in 'git merge'? I have it working via .gitattributes16:10
→ stuser joined16:12
← Xiti left16:14
← mofai left16:14
→ Xiti joined16:15
→ peacememories joined16:15
← Silmarilion left16:15
→ prakashdanish joined16:15
← chele left16:16
_ikke_ Don't think so16:16
← santosh left16:16
← ciscobandit left16:16
_ikke_ .gitattributes is the only way to specify that a custom driver should be used16:16
← nxet left16:16
→ durham joined16:17
→ Emperor_Earth_ joined16:17
← jstimm left16:18
← czart left16:18
← libertyprime left16:19
→ wildlander joined16:19
→ Gamoder_ joined16:20
← peacememories left16:20
→ tomfarr joined16:24
← tomfarr left16:24
Zexaron _ikke_: Well some projects are reluctant to change unoptimal paths/namings/terminology because of hard rooted "I'm used to it" but also because of some git history and git blame functions not working16:25
→ sanscoeur joined16:26
Zexaron The reasoning being more that this project is too old for the change and a lot of other philosophical reasons, which means bad namings get dragged forever16:26
→ tomfarr joined16:26
→ dsx_ joined16:26
Zexaron But one reason was git history and git blame, I was familiarizing myself with this due to another unrelated case where I was renaming a file with 100% content the same, while changing the content afterward in subsequent commits16:27
→ neunon joined16:27
→ archergodson joined16:27
Zexaron In this case, there's no change, it's only a rename, 100% same exact content, I would greately appreciate any input from you guys if this kind of change would break git history? https://github.com/dolphin-emu/dolphin/pull/753716:28
j416 what do you mean by "break git history"?16:28
← pd09041999 left16:29
← oojacoboo left16:29
Zexaron That's one of the reasons the old seasoned maintainers/devs said, one of them, most of the reasons are philosopical in nature which I do respect I understand people are used to the file structure, but this is only really one directory16:29
→ oojacoboo joined16:30
_ikke_ Zexaron: So what is your question?16:30
How to deal with committed files that you have to change locally?16:31
→ gasol_tw joined16:33
← causasui left16:34
← oojacoboo left16:34
Zexaron Ij416: I'll copy paste what one of them said just minutes ago: Zexaron: The barrier is that if you change the path of all the code files, using the git history or git blame on any of those files across the date the change was made will get painful16:34
stuser Hi, hoping someone can help: I did a git clone from a local bare repo, made some small commits, then pushed. I let the push run overnight, but it never finished. I ran it with --verbose and the last line said "total 3 (delta 0), reused 0 (delta 0)". why would a push fail to a repo on the same machine?16:34
← G2__ left16:34
→ oojacoboo joined16:35
_ikke_ good question16:35
what os?16:35
Zexaron If that is true, if yes, is it that painfull really?16:35
← snufft left16:35
← Acelogic left16:35
_ikke_ Zexaron: if it's a clean rename (no changes made to the file in the same commit), git can easily track renames for git log and git blame16:36
even if changes were made but not substantial, git can most of the time still follow16:36
stuser _ikke_: raspbian, on a raspberry pi16:36
Zexaron Without needing any special params to track it back before the rename date? like --follow ?16:36
→ libertyprime joined16:37
Zexaron Well git maybe yes, but it's also github who needs to do this properly.16:37
_ikke_ github uses git16:38
Zexaron Okay16:39
→ cagta joined16:39
← cagta left16:39
→ cagta joined16:39
→ horia_g joined16:39
→ thiago joined16:39
← oojacoboo left16:40
→ oojacoboo joined16:40
→ JimmyRcom joined16:41
← sanscoeur left16:41
← AaronMT left16:42
→ Acelogic joined16:42
→ sanscoeur joined16:42
← Acelogic left16:43
← libertyprime left16:43
→ libertyprime joined16:43
← durham left16:44
→ Acelogic joined16:44
→ durham joined16:44
← Mat001 left16:44
psprint_ Uh.. I have to write a script that will check if a repository has: A) 1 commit in each of last 3 months OR B) 5 commits in total in last 3 months. Seems very problematic, doesn't it?16:45
← oojacoboo left16:45
← Acelogic left16:45
→ Acelogic joined16:46
← Acelogic left16:46
→ oojacoboo joined16:46
stuser _ikke_: I don't know if it helps, but its a raspi 2b with raspbian stretch lite. I set it up use ssh, and there's a dedicated "git user" that uses git-shell. git pulls from the repo are nearly instant, but as I said the push didn't complete overnight16:46
← sanscoeur left16:46
→ Acelogic joined16:46
← Gamoder_ left16:47
← durham left16:47
← topdownjimmy left16:48
igemnace psprint_: check --since and --count flags in git help rev-list16:48
→ topdownjimmy joined16:48
← oojacoboo left16:48
→ LondonAppDev joined16:48
→ oojacoboo joined16:49
→ sanches joined16:49
→ akushner joined16:49
_ikke_ stuser: You could try to look with strace on both the sending and receiving process to see what it's doing16:50
← donofrio left16:50
→ donofrio joined16:51
← oojacoboo left16:52
→ oojacoboo joined16:53
→ durham joined16:54
← sanches left16:54
→ Gamoder_ joined16:55
← Kaisyu left16:58
psprint_ igemnace: thanks16:58
igemnace: luckily it has also --before=<date> (--since is a synonym for --after=<date>). Could I provide the date in the git-flexible way, like "30 days ago" ?17:00
← rsrx left17:00
igemnace seems like you can17:01
← oojacoboo left17:01
igemnace "each of last 3 months" i missed that initially. yes, you can use --before or --until17:01
→ oojacoboo joined17:01
→ muelleme joined17:03
Zexaron Well: there's history on my fork unchanged master https://github.com/Zexaron/dolphin/commits/master/Source/Core/Common/x64Emitter.cpp17:04
psprint_ it works well, thanks17:04
Zexaron And here's history of the branch with the rename change https://github.com/Zexaron/dolphin/commits/build_refactor-core-paths-names/Source/Main/Common/x64Emitter.cpp17:05
_ikke_ so is that sure or it would be different after going through the PR and into upstream, but so far it's not looking good if there's no history here on my fork17:06
← oojacoboo left17:06
→ oojacoboo joined17:07
← DemonDestroyer left17:08
← oojacoboo left17:08
→ peacememories joined17:08
→ oojacoboo joined17:09
→ causasui joined17:09
← causasui left17:09
→ causasui joined17:09
← muelleme left17:09
← n3wborn left17:10
← horia_g left17:10
→ mollusk joined17:10
← peacememories left17:11
zombs → bs17:11
→ acercle joined17:12
→ gnu_d joined17:12
← z]bandito left17:12
gnu_d Hi, I tried to do sparse checkout, however, when I push new changes even though the directory has updates it keeps old files after push. I tried deleting the files in that directory then pushing them again it works. Is there some sync or reindex command cause I building a deployment script ?17:13
→ z|bandito joined17:14
→ pawle joined17:14
← ilmostro left17:15
→ Mat001 joined17:17
← Raed|Laptop left17:18
← oojacoboo left17:18
→ ilmostro joined17:18
→ oojacoboo joined17:19
← sauvin left17:20
→ sanches joined17:21
← lewix left17:21
← Gamoder_ left17:22
← Guest45117 left17:23
→ Guest45117 joined17:23
← Guest45117 left17:23
→ Guest45117 joined17:23
Guest45117 → matthiaskrgr17:23
← Acelogic left17:24
← sanches left17:25
← Toadisattva left17:25
← oojacoboo left17:26
→ oojacoboo joined17:26
← thiago left17:27
← stuser left17:27
← pawle left17:28
← LondonAppDev left17:29
← oojacoboo left17:29
← cagta left17:29
→ peacememories joined17:29
→ oojacoboo joined17:30
→ m_ joined17:30
→ akushner_ joined17:30
← peacememories left17:30
← Mat001 left17:32
← akushner left17:33
→ LondonAppDev joined17:33
→ rnat joined17:33
← oojacoboo left17:35
j416 gnu_d: what are you doing exactly?17:35
→ oojacoboo joined17:36
← oojacoboo left17:38
→ oojacoboo joined17:38
gnu_d j416: I have master branch, and I don't want to have another branch for release. What I want is directory named beta do be sparced, but when I push, the directory to be synced upon pull.17:38
→ kapil____ joined17:39
kapil____ hello i first time joined #git channel17:39
j416 kapil____: congratulations.17:39
kapil____ thanks,17:40
j416 gnu_d: push to where?17:40
kapil____ can i create a branch and then i want to delete it if its not successful. is it possible.?17:40
j416 kapil____: yes.17:40
← oojacoboo left17:40
j416 kapil____: man git-branch look for -d or -D17:41
gitinfo kapil____: the git-branch manpage is available at https://gitirc.eu/git-branch.html17:41
kapil____ thanks a lot17:41
j416 you're welcome17:41
→ oojacoboo joined17:41
→ sanches joined17:42
← oojacoboo left17:43
→ oojacoboo joined17:43
→ Satsuki joined17:44
← mollusk left17:45
← Satsuki left17:45
← oojacoboo left17:45
→ oojacoboo joined17:46
→ mollusk joined17:47
→ johnvonneuman_ joined17:47
← johnvonneuman left17:50
← prakashdanish left17:50
→ djapo joined17:50
← oojacoboo left17:51
→ oojacoboo joined17:52
→ sanscoeur joined17:54
← oojacoboo left17:54
→ Gamoder_ joined17:55
→ oojacobo_ joined17:55
gnu_d j416: push to origin master17:56
→ prakashdanish joined17:57
← mostlybadfly left17:57
gnu_d j416: I tried git read-tree -mu HEAD; but nothing updated. What I trying is when I push from one machine to the remote branch, and try to pull on another machine which has sparse enabled to update the new files17:59
→ howudodat joined18:00
← akushner_ left18:00
← LondonAppDev left18:00
→ ankeetshkk joined18:01
← oojacobo_ left18:02
← nowhere_man left18:02
ankeetshkk how to use github in mobile18:02
→ oojacoboo joined18:02
howudodat quick question on changing branches. I had checked out a branch 5.1.5 from a driver repo. I changed to a newer branch using git checkout v5.3.4 and that went fine. I then did a git pull and it said already up to date. I know there are commits. not sure why it didn't pull them down18:02
← mollusk left18:03
→ muelleme joined18:05
→ mollusk joined18:06
→ akushner joined18:06
← prakashdanish left18:06
→ horia_g joined18:08
grawity those sound like tag names, not branch names18:08
gnu_d Anyone, why does the sparse failes to update the local files ?18:09
s/failes/fails/18:09
howudodat grawity https://pastebin.com/mmFBHUNr18:09
← muelleme left18:10
← oojacoboo left18:10
→ oojacoboo joined18:10
← diogenese left18:12
→ diogenese joined18:12
→ YuGiOhJCJ joined18:13
→ andrew_ joined18:14
→ Sasazuka joined18:15
← andrew_ left18:17
→ DudestOfMen joined18:17
← Gamoder_ left18:18
→ bachler joined18:19
← DudestOfMen left18:20
← mollusk left18:21
→ lewix joined18:23
→ temhawk joined18:24
temhawk Noob here. I have made a bunch of edits in multiple files (all the same edits) and I have decided I want to put this code into just one file and include() it everywhere. How do I commit this without everything being just big --- blocks and the new file all +++?18:27
← bachler left18:28
→ bachler joined18:29
→ Phylock joined18:31
→ Garen joined18:31
ankeetshkk why cann't create repositary through phone18:31
← liefer left18:33
→ akushner_ joined18:34
→ olux joined18:34
← troulouliou_dev left18:34
→ liefer joined18:35
← kes left18:36
← akushner left18:36
→ Mattiaslndstrm joined18:38
j416 gnu_d: read-tree has nothing to do with this.18:38
gnu_d: what does 'git log' say on the other computer? do you have the commit?18:39
→ jadax joined18:39
jadax when I modify commit and do git commit --amend - does the SHA change?18:39
osse jadax: yes18:39
← miczac left18:40
j416 jadax: that effectively creates a new commit and replaces the old one with it.18:40
jadax I see, thanks18:40
← freimatz left18:40
j416 jadax: the hash is of everything in the commit, including which parent(s) it has. If anything at all changes, the hash must change too.18:41
→ pawle joined18:41
jadax gerrit injects extra SHA into the commit, it's a cool way to be able to track how given commit changes over time18:42
when people ammend it18:42
they call it change-id or something like that18:43
→ nephyrin joined18:47
← drodger left18:54
→ drodger joined18:56
← akushner_ left18:57
→ Gamoder_ joined18:58
← gunnarx left18:59
← sanches left19:01
→ RuckusBringer joined19:02
→ czart joined19:02
← RuckusBringer left19:02
→ RuckusBringer joined19:03
→ peacememories joined19:03
→ manuelschneid3r joined19:05
← TheRuckus left19:05
← manuelschneid3r left19:05
← RayTracer left19:06
→ sanches joined19:06
deltab temhawk: it's possible to add an alternative diff program that can understand that kind of change, but I don't know of any19:07
j416 temhawk: what kind of diff would you prefer?19:07
← xcm left19:08
→ xcm joined19:09
← ankeetshkk left19:09
← cdown left19:12
deltab temhawk: I'd write a commit message that explains the change and commit separately from any other changes19:12
← chrfle left19:14
→ chrfle joined19:14
← chrfle left19:14
→ chrfle joined19:14
j416 ^19:15
(just like any commit)19:15
← gnu_d left19:16
→ dawid joined19:17
→ Hello71_ joined19:18
→ leeN joined19:18
← sammyo left19:19
← Hello71 left19:20
→ rkta joined19:20
← Gamoder_ left19:21
← drodger left19:27
← sanches left19:29
← fission6 left19:29
→ akushner joined19:30
→ nowhere_man joined19:31
← oojacoboo left19:33
← sentriz left19:34
→ sentriz joined19:35
← madewokherd left19:36
→ sanches joined19:38
← nowhere_man left19:40
← sanches left19:44
→ thiago joined19:44
← bachler left19:45
→ bachler joined19:46
← libertyprime left19:47
← djapo left19:47
→ sanches joined19:49
← m_ left19:50
→ Gamoder_ joined19:50
temhawk deltab, j416: I think either I can undo the changes in each file, cut and paste the code into the new file, commit, redo the changes and commit again, --OR-- commit the changes in only 1 file, cut and paste the new code into the new file and commit again (with the other files include()ing the new file now).19:50
→ Mat001 joined19:50
temhawk which do you think is better?19:51
→ kryptonunited joined19:51
→ muelleme joined19:51
j416 do the moving and the changing of the code as two separate commits.19:52
← blackandblue left19:52
← rnat left19:52
j416 order doesn't matter19:53
← sanches left19:53
← czart left19:55
temhawk I think it's easier if I do changes first, then move, because I don't know how to reapply the changes from one file in the new file (apart from manually copy pasting which would work but that's not a proper way)19:56
j416 manual copypaste would probably be the easiest; can't think of a better way19:56
you could try to use git to apply the changes but I doubt it'd figure out the files merged into one. Maybe.19:57
→ envex joined19:57
→ sanches joined19:58
temhawk well, I think move first, then change is more ideal because the first commit affects 10 files and the second commit only 1, whereas change first, then move affects all 10 files both times19:58
→ GreenJello joined19:58
← sanches left20:00
→ sanches joined20:01
→ DemonDestroyer joined20:03
→ libertyprime joined20:03
temhawk I mean I don't have to change the other 9 files on the first commit if i do change first, then move, but it would be slightly dirty to commit changes in only 1 file that should be the same in all files.20:03
j416 as long as the commits are separate I wouldn't think either is more clean than the other20:05
it's the change that matters, not the number of files20:05
← ableto left20:05
← sanches left20:05
← mescalinum left20:06
temhawk Well, I happened to have already copy-pasted the changes to the other 9 files so either way works for me now, but if I hadn't it would be easier to commit the changes in one file first, then move that code into the new file and update all 10 files to include() the new file.20:07
But what I mean is that the section of code that I'm changing should logically be the same across all files, so committing a change in only one of them feels a bit dirty/non-atomic.20:08
j416 yes20:08
← DemonDestroyer left20:08
→ cdown joined20:08
← olux left20:11
← yyy left20:11
← dawid left20:12
← Gamoder_ left20:14
→ r3my joined20:14
r3my Hi, so git rebase reword is really slow. Is there anyone working on making it faster?20:15
I remember other git operations that were also slow and rewritten to be faster20:15
← xcm left20:16
→ nowhere_man joined20:16
→ xcm joined20:17
← cdown left20:17
→ madewokherd joined20:17
← gitinfo left20:17
→ cdown joined20:17
← jast left20:18
temhawk j416: thanks20:18
← inovas left20:19
→ jast joined20:19
→ inovas joined20:20
→ gitinfo joined20:20
ChanServ set mode: +o20:20
→ _ADN_ joined20:22
← bachler left20:22
← antfoo left20:26
← jiji606 left20:26
← peacememories left20:26
← nowhere_man left20:27
LordRyan r3my: typically things get rewritten because they start off as a shell script and then integrated into Git20:29
in this case, I'm pretty sure that rebasing is such a central part to Git, that optimizing it would be quite an accomplishment.20:29
→ m_ joined20:30
→ sanches joined20:30
osse parts of it has been rewritten already20:31
but not all20:31
_ikke_ r3my: what platform?20:31
→ Acelogic joined20:32
← Mat001 left20:32
r3my _ikke_: macOS20:33
osse: yep20:34
← _ADN_ left20:34
→ rf` joined20:35
← venmx left20:35
← sanches left20:35
→ djapo joined20:36
← envex left20:37
← rf` left20:37
→ envex joined20:38
→ _ADN_ joined20:40
→ nowhere_man joined20:42
→ bachler joined20:46
→ Gamoder_ joined20:47
← Barabacha left20:47
→ ZyX-I joined20:48
← Wes- left20:50
← nowhere_man left20:50
← amrits_ left20:54
→ jtrzebiatowski joined20:55
← kryptonunited left20:57
← libertyprime left20:59
→ hellz joined20:59
→ sanches joined21:00
← m_ left21:02
← hellz left21:02
→ omn joined21:05
← nicoulaj left21:05
← timj left21:05
← sanches left21:06
→ nicoulaj joined21:06
← Envil left21:09
→ venmx joined21:10
← Gamoder_ left21:11
← _ADN_ left21:12
← gaucheph left21:12
→ nowhere_man joined21:13
← temhawk left21:15
→ sanches joined21:20
→ gaucheph joined21:21
→ timj joined21:21
← YuGiOhJCJ left21:22
← acercle left21:23
→ acercle joined21:23
← sanches left21:25
← jtrzebiatowski left21:25
WebDawg → neowebdawg21:25
jp → pineboat21:26
pineboat → jp21:27
← jp left21:27
← nowhere_man left21:27
← venmx left21:29
← moei left21:29
← RuckusBringer left21:32
→ Mat001 joined21:33
→ welovfree joined21:34
→ crose joined21:36
← random_yanek left21:38
→ Toadisattva joined21:38
← AbleBacon left21:39
← jadax left21:40
→ Raed|Laptop joined21:40
← ams__ left21:41
← crose left21:41
→ libertyprime joined21:41
← AndresInSpace left21:43
McKraken_zzzzz → McKraken21:44
← griffindy left21:44
→ random_yanek joined21:45
← gaucheph left21:46
← Acelogic left21:46
← lewix left21:47
→ Gamoder_ joined21:47
→ gaucheph joined21:48
→ jp joined21:48
→ peacememories joined21:51
← Toadisattva left21:52
→ Toadisattva joined21:52
← SirFunk left21:55
← Raed|Laptop left21:55
← revoltingPeasant left21:55
← Mattiaslndstrm left21:57
→ Acelogic joined21:57
← Gamoder_ left21:57
→ revoltingPeasant joined21:57
→ preflex joined21:59
→ Mattiaslndstrm joined22:00
← jnavila left22:00
→ SirFunk joined22:03
← Acelogic left22:03
→ boombatower_ joined22:05
← greggerz left22:08
← boombatower left22:08
→ VibesYuth joined22:10
← VibesYuth left22:11
→ lewix joined22:12
→ novumsensum joined22:14
→ n3wborn joined22:15
← n3wborn left22:15
← olalonde left22:16
← wildlander left22:17
→ Wes- joined22:17
← cbrt64 left22:17
← lewix left22:17
→ kus_ubuntui686 joined22:17
← horia_g left22:20
→ JohnnyRico joined22:23
← ZeZu left22:24
← fairuz left22:29
→ sanches joined22:30
→ Gamoder_ joined22:34
← sanches left22:35
← hexnewbie left22:35
← xcm left22:37
→ xcm joined22:38
→ philippirrip joined22:40
→ sanches joined22:40
→ secretmessage joined22:40
← muelleme left22:42
→ lewix joined22:44
← sanches left22:44
← plexigras left22:47
→ PLLunlock joined22:48
→ perrier-jouet joined22:48
← lewix left22:49
← schleppel left22:50
→ violentE joined22:53
← violentE left22:53
→ violentE joined22:53
→ AtumT joined22:54
← philippirrip left22:55
← secretmessage left22:55
← kus_ubuntui686 left22:55
← Essadon left22:56
← perrier-jouet left22:56
→ dg_vrani joined22:57
← Phylock left22:57
← Anthaas left22:58
← pawle left23:00
← Toadisattva left23:01
→ yohnnyjoe joined23:01
→ Anthaas joined23:02
← leeN left23:05
→ sanches joined23:05
← Gamoder_ left23:08
← ZyX-I left23:08
← cliluw left23:09
← ilmostro left23:09
→ cliluw joined23:09
→ bolovanos__ joined23:09
→ ilmostro joined23:11
← MatthewAllan93 left23:11
→ Other joined23:11
← Anthaas left23:12
← violentE left23:12
← Soni left23:12
→ bolovanos joined23:13
← bolovanos_ left23:13
→ Anthaas joined23:13
→ tjbp_ joined23:13
← tjbp left23:13
← Other left23:13
→ Soni joined23:13
← shabius_ left23:13
← thunderbolt left23:13
→ violentE joined23:14
→ goweol joined23:14
← AtumT left23:15
→ lewix joined23:15
→ MatthewAllan93 joined23:15
→ [tty1] joined23:15
← bolovanos__ left23:15
→ sleepee joined23:15
→ goweol1 joined23:16
→ thunderbolt joined23:16
← Anthaas left23:17
→ TrentonDAdams joined23:18
→ Arab_M40 joined23:18
TrentonDAdams I'm experiencing difficulty rebasing. I'm running -> git rebase -s recursive -X ours bug-753523:18
← goweol left23:19
→ Anthaas joined23:20
TrentonDAdams I'm finding that an old file that was moved to another folder on bug-7535 previously is being re-added back into the file tree. In fact, my current branch and bug-7535 have the same history in that regard already, it's been moved. Why would this be happening?23:20
← lewix left23:20
← thunderbolt left23:21
← dpyro left23:22
→ Bobguy joined23:22
← liefer left23:22
← misuto left23:22
→ misuto joined23:23
← JimmyRcom left23:23
← Peetz0r left23:25
→ dpyro joined23:25
→ Peetz0r joined23:26
TrentonDAdams Also, keep in mind I've been using a rebasing practise successfully, but I'm thinking it's just a horrible idea in hindsight. That practise is rebasing chains of branches. master -> A -> B or C where I rebase A first, then B or C, then the other.23:26
→ Acelogic joined23:26
→ thunderbolt joined23:27
→ liefer joined23:28
← cybrNaut left23:29
→ nsanden joined23:29
→ Kaisyu joined23:29
← envex left23:31
← orbyt_ left23:31
← [tty1] left23:32
→ cybrNaut joined23:33
← Acelogic left23:35
← blueyed left23:38
← Lunatrius left23:38
→ muelleme joined23:38
nsanden Hi all, I have what may be more of a Github question. I have an existing project (A) and a new project (B) that I want to begin. Project (b) will be very similar to Project (a) but will differ in a few small ways. So i figured it would be nice that if i change something in either project i could also push those changes somehow to the other project as well if need be. It seems like doing branches would be easiest way to accomplish that but23:41
issues*23:42
I also thought a fork might work well here, but i dont think i can fork my own existing repo23:42
→ dequeued joined23:42
→ Lunatrius joined23:42
nsanden Any advice appreciated23:43
← JohnnyRico left23:43
← revoltingPeasant left23:43
← Anthaas left23:43
→ JohnnyRico joined23:43
GreenJello nsanden, a branch is the easiest way to do this23:44
← welovfree left23:44
→ Anthaas joined23:45
← al-damiri left23:45
GreenJello nsanden, if you really need two repos, and they share a common base history, you can add A as a remote inside B, and then fetch the remote and merge branches or cherry pick commits into B23:45
← muelleme left23:45
← dequeued left23:45
GreenJello nsanden, more or less what you'd do with a branch, just a bit less convenient, and you can't open pull requests across repos that aren't forks23:46
← JohnnyRico left23:46
→ Johnny_Rico joined23:46
GreenJello nsanden, if you wish to maintain a fork, you can fork it as an organization you're a member of23:46
organizations with public repos are free to create23:46
← thiago left23:47
nsanden Thank you @GreenJello much appreciated23:47
→ revoltingPeasant joined23:50
→ Gamoder_ joined23:50
TrentonDAdams GreenJello: master Jello, any thoughts on my earlier question? :D23:51
← holodoc left23:51
GreenJello TrentonDAdams, I don't know23:51
TrentonDAdams Fair enough.23:52
osse TrentonDAdams: what does this show: git log bug-7535 -- path/to/file23:54
→ holodoc joined23:55
← dege left23:56
→ lewix joined23:57
→ orbyt_ joined23:59

Logs Search ←Prev date Next date→ Channels Documentation