IRCloggy #git 2019-10-02

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.

2019-10-02

→ omnireq joined00:03
← freedom left00:04
← fphilipe left00:04
← SilentGhost left00:05
→ SilentGhost joined00:09
→ perrier-jouet joined00:10
← Fernando-Basso left00:11
← perrier-jouet left00:16
→ nabil_ joined00:17
← bambanx left00:18
→ bambanx joined00:19
← d^sh left00:20
← nabil__ left00:20
← learningc left00:20
→ d^sh joined00:21
→ kerframil joined00:21
→ perrier-jouet joined00:21
← bambanx left00:27
→ learningc joined00:33
← perrier-jouet left00:34
← vicfred left00:35
← scoobertron left00:36
→ scoobertron joined00:36
→ oatmealraisin joined00:37
→ jguddas-tr3 joined00:37
← _ADN_ left00:39
→ Diggsey joined00:42
← Sasazuka left00:51
→ Murr joined00:51
← ketas left00:52
→ g00s joined00:52
→ freedom joined00:55
→ thiago joined00:55
→ malina joined00:56
← Necrocter left00:58
← topdownjimmy left01:07
→ Necrocter joined01:07
← Necrocter left01:08
← g00s left01:08
→ topdownjimmy joined01:08
→ yonder joined01:11
← jguddas-tr3 left01:12
← sgen left01:21
← azwieg103 left01:26
← F0rTex left01:37
→ F0rTex joined01:38
→ perrier-jouet joined01:40
← apetresc left01:42
→ doublex joined01:43
→ apetresc joined01:46
→ PerryHugh joined01:50
PerryHugh Hello, the command 'git add ___' is continuing to request input after hitting enter, is there a solution to this? It happens for git add . and git add -A but not git add -u01:52
→ saint_ joined01:54
← saint__ left01:57
← PerryHugh left01:59
→ fphilipe joined01:59
→ saint__ joined02:00
← saint_ left02:00
→ libertyprime joined02:01
← Envil left02:04
← fphilipe left02:04
lagothrix → Guest4296202:08
← Guest42962 left02:08
→ lagothrix joined02:08
→ Envil joined02:09
← Yossi left02:12
→ azwieg103 joined02:14
→ fairuz joined02:16
← malina left02:16
← Frobozz left02:16
→ rosco_y joined02:19
rosco_y Is there a way to compare the diff of a file in a branch I'm in, and the same file in the master?02:20
I guess I've seen this in a gui, can it be done from the command-line?02:21
b0nn git diff mybranch..master -- myfile.cs02:23
→ xnaas joined02:25
← Cabanossi left02:38
← causasui left02:41
← nic-hartley left02:43
→ helpdeskaleer joined02:44
→ nabil__ joined02:46
→ jstimm joined02:47
← pks left02:48
← nabil_ left02:48
← helpdeskaleer left02:49
→ Cabanossi joined02:50
← xcm left02:51
→ xcm joined02:51
→ Goplat joined02:52
← freedom left02:52
← Atlenohen left02:54
← rosco_y left03:02
→ nabil_ joined03:02
← nabil__ left03:05
→ g00s joined03:06
→ jguddas-tr3 joined03:09
← yokisuci left03:09
→ Yossi joined03:09
→ omnireq_ joined03:11
← omnireq left03:13
← jguddas-tr3 left03:14
→ publio joined03:17
→ malina joined03:18
→ vicfred joined03:21
← azwieg103 left03:23
→ azwieg103 joined03:24
→ jguddas-tr3 joined03:41
← clime left03:43
← jguddas-tr3 left03:46
→ SwiftMatt joined03:49
← malina left03:49
← CodeSlingerPaul left03:51
→ causasui joined03:52
← azwieg103 left03:53
→ duderonomy joined03:53
→ azwieg103 joined03:54
← apetresc left03:57
← libertyprime left03:58
→ clime joined03:59
→ fphilipe joined04:00
→ freedom joined04:02
← fairuz left04:02
← g00s left04:02
→ apetresc joined04:03
← fphilipe left04:05
← freedom left04:08
← clime left04:09
→ g00s joined04:09
→ freedom joined04:10
→ cesario_ joined04:21
→ Atlenohen joined04:21
← cesario_ left04:23
← jstimm left04:23
→ ddevault joined04:25
→ cesario_ joined04:27
← Atlenohen left04:27
← SwiftMatt left04:27
← xcm left04:27
→ xcm joined04:28
← cesario_ left04:28
← Fusl left04:33
→ albel727 joined04:33
← _xor left04:34
→ Fusl joined04:34
→ _xor joined04:34
← rewt left04:36
→ rewt`` joined04:36
→ akemhp_ joined04:36
rewt`` → rewt04:36
← rigid left04:37
← random_yanek left04:37
← naf left04:37
← maxel left04:37
← catsup left04:37
→ pR0Ps_ joined04:38
→ maxel_ joined04:38
→ rigid joined04:38
→ ZachGibbens joined04:38
← ddevault left04:38
← LeMike left04:38
← vishal left04:38
← dhollinger left04:38
← jaeckel left04:38
← dka left04:38
← bipolar left04:38
← lavalike left04:38
→ vishal joined04:38
← topdownjimmy left04:38
← akemhp left04:38
← deltab left04:38
← tdn left04:38
← mooasaurus left04:38
← pR0Ps left04:38
← tharkun left04:38
← nsh left04:38
pR0Ps_ → pR0Ps04:38
← Cork left04:39
→ mooasaurus joined04:39
xcm → Guest1435904:39
← Guest14359 left04:39
→ xcm joined04:39
→ topdownjimmy joined04:39
→ catsup joined04:39
→ _ADN_ joined04:40
→ fairuz joined04:40
→ dzho joined04:40
→ telling joined04:40
→ deltab joined04:40
← stutter left04:40
← teward left04:40
← benoliver999 left04:40
← weltall left04:40
→ tdn joined04:40
← ferdna left04:41
→ SwiftMatt joined04:41
← kjartan left04:41
→ ddevault joined04:42
→ kjartan joined04:43
→ weltall joined04:44
→ teward joined04:44
→ Cork joined04:44
→ varesa joined04:44
← _ADN_ left04:44
→ lavalike joined04:45
→ naf joined04:45
→ bipolar joined04:46
→ benoliver999 joined04:46
→ dka joined04:47
← fairuz left04:49
→ Atlenohen joined04:50
→ random_yanek joined04:50
→ dijitol joined04:50
→ Twey joined04:51
→ dhollinger joined04:52
← Wetmelon left04:56
→ pks joined05:00
← SwiftMatt left05:01
← jubal left05:05
← Inline left05:06
→ jaeckel joined05:08
→ Anthaas_ joined05:10
← Anthaas left05:11
← vicfred left05:17
→ n3wborn joined05:23
← glik22 left05:28
← dijitol left05:34
← Atlenohen left05:35
→ glik22 joined05:37
← Muzer left05:39
← Cabanossi left05:42
→ yokisuci joined05:42
→ jguddas-tr3 joined05:42
→ Cabanossi joined05:46
→ Muzer joined05:50
← g00s left05:57
→ fphilipe joined06:01
→ g00s joined06:02
→ SkarmoutsosV joined06:05
← fphilipe left06:06
← knullare left06:10
→ Wetmelon joined06:10
→ Phylock joined06:15
← Wetmelon left06:17
← jguddas-tr3 left06:17
→ Noti joined06:19
← Furai left06:23
← thiago left06:24
← markzen left06:30
→ jguddas-tr3 joined06:31
→ libertyprime joined06:32
→ rfuentess joined06:33
← jguddas-tr3 left06:35
→ Necrocter joined06:35
→ fphilipe joined06:36
→ chele joined06:36
→ sQVe joined06:36
→ feriman joined06:37
→ Furai joined06:39
← cd left06:39
← Necrocter left06:39
→ arunkumar413 joined06:40
← fphilipe left06:41
→ chele_ joined06:43
← chele_ left06:44
→ chele_ joined06:45
← chele left06:46
→ fphilipe joined06:51
→ gareppa joined06:52
→ jguddas-tr3 joined06:55
← fphilipe left06:56
← lunaphyte left06:56
→ TomyWork joined06:56
→ rafasc joined06:57
→ SteffanW joined06:58
← Noti left06:59
→ lunaphyte joined06:59
← Phylock left06:59
← jguddas-tr3 left07:00
← Heirlung left07:10
→ oxymoron93 joined07:11
→ fphilipe joined07:11
→ Heirlung joined07:12
← Stoot left07:13
← vavkamil left07:16
→ asrob joined07:16
→ Phylock joined07:17
→ Ring0` joined07:20
→ vicfred joined07:21
← freedom left07:21
→ freedom joined07:22
→ freedom_ joined07:28
← bitwinery left07:29
← disi left07:30
← vicfred left07:30
← igemnace left07:30
→ esrse joined07:31
← freedom left07:32
freedom_ → freedom07:32
← SteffanW left07:33
→ sinhue joined07:33
← SkarmoutsosV left07:38
← gareppa left07:38
→ Noti joined07:39
→ mobidrop joined07:41
← Unode left07:41
→ jguddas-tr3 joined07:42
→ igemnace joined07:43
← nabil_ left07:44
→ Mattiaslndstrm joined07:45
→ jguddas-tr4 joined07:45
← jguddas-tr3 left07:46
← Rhonda left07:47
→ Unode joined07:48
→ Rhonda joined07:49
→ tonythomas joined07:49
→ Jackneill joined07:51
→ mimajof joined07:53
← asrob left07:55
← kerframil left07:56
← libertyprime left08:02
→ SteffanW joined08:03
→ asrob joined08:03
← Noti left08:03
→ mikecmpbll joined08:06
→ _ADN_ joined08:07
← Unode left08:07
→ pks_ joined08:13
← pks left08:14
pks_ → pks08:14
→ Makaveli7 joined08:18
→ Darcidride joined08:19
→ deathwishdave joined08:19
→ is_null_ joined08:23
→ vdamewood joined08:24
→ floppydh joined08:25
← is_null left08:26
→ LaScoumoune joined08:28
chele_ → chele08:37
→ sazop joined08:41
← Diggsey left08:42
→ clime joined08:45
← arunkumar413 left08:52
← sazop left08:52
← deathwishdave left08:56
← Goplat left09:00
← freedom left09:01
→ ExeciN joined09:01
→ hegemoOn joined09:02
→ freedom joined09:02
hegemoOn hello there, i run 2 git one fron git-bash withing intelij and one coming from msys full install on windows1009:03
when i run a "git status" in intelij i dont have the same output than when i run it inside the msys console09:03
is it normal ?09:03
→ alex_pa joined09:04
→ alex__pa joined09:04
hegemoOn i mean, it's like all files need in the git repo need to be added when using the msys git command, while in intelij everything is up to date09:05
→ enoq joined09:05
cdunklau hegemoOn: what's different about the output?09:07
← yonder left09:08
→ cdown joined09:09
hegemoOn cdunklau: all files are modified when runing command from the msys git09:13
while all file are up to date when running command in intelij git-bash09:13
inside the same folder of course09:13
cdunklau hegemoOn: what's diff show09:14
i bet it's just a line ending thing09:14
hegemoOn CTRL-M09:14
← c0san0stra left09:14
hegemoOn yep you are right ! :)09:14
cdunklau hegemoOn: yep :)09:14
hegemoOn lol09:14
→ c0san0stra joined09:15
cdunklau hegemoOn: so the intelij git is likely using a different set of conf files09:15
hegemoOn diff.astextplain.textconv i guess ?09:15
cdunklau i'm not really sure, but that looks right09:15
osse msys git thinks it's on linux09:17
← ongo left09:17
osse so it interprets the line endings differently09:18
← freedom left09:20
→ ongo joined09:21
cdunklau ah that would explain it. so it's getting conf from the msys env, not what intelij reads09:22
hegemoOn exact09:23
→ roadie joined09:23
hegemoOn ok core.autocrlf fixed it09:27
(to true)09:28
← |aaron left09:28
← g00s left09:29
anddam after I filter-branch I would like to delete ref backups, I see both efs/original/refs/heads/master and refs/original/refs/remotes/origin/master in reflog's output09:29
questions: 1.) what is the proper way to list refs? 2.) how do I "clean" non-used refs?09:30
hegemoOn thank your cdunklau and osse09:30
← d^sh left09:30
→ Aquazi joined09:30
rafasc anddam: man git filter-branch09:31
gitinfo anddam: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html09:31
← zamba left09:31
anddam rafasc: CHECKLIST FOR SHRINKING A REPOSITORY?09:32
the caps was in original source09:32
→ d^sh joined09:32
rafasc in the CHECKLIST FOR SHRINKING A REPOSITORY, there's a part that describes.09:32
→ planetcall|work joined09:32
→ libertyprime joined09:33
→ zamba joined09:34
anddam yep, I'm on it, thanks09:35
it's pretty clear btw, apart the absurd command names09:35
print all the ref/original refs, delete them, expire reflogs, call garbage collector09:36
← asrob left09:40
→ asrob joined09:41
← Takkun left09:41
← n3wborn left09:45
rafasc making a new clone of it is much simpler.09:48
← cebor left09:52
→ cebor joined09:53
← cebor left09:56
→ cebor joined09:56
← zamba left09:56
← surfist left10:00
→ surfist joined10:00
← asrob left10:01
→ asrob joined10:01
→ zamba joined10:07
← igemnace left10:15
→ sazop joined10:18
← learningc left10:22
→ is_null joined10:23
→ arunkumar413 joined10:24
← is_null_ left10:26
← feriman left10:27
← sazop left10:27
→ royal_screwup21 joined10:28
→ nsh joined10:29
← Anthaas_ left10:32
← akemhp_ left10:33
← LaScoumoune left10:34
→ akemhp_ joined10:35
→ Anthaas joined10:35
anddam yes, but I wanted to figure a couple things in the meanwhile10:38
→ [twisti] joined10:40
anddam I have https://gist.github.com/anddam/801b0972f055fae3860689f7e712c8a2 and I would like the parent of 14fdadc to be 4228e02, I figure I need to rebase but doing a 'rebase 14fdadc master' resulted in a detached state and a new commit, clone of 14fdadc10:40
[twisti] how can i see whether a branch is behind, ahead or both compared to another branch/master ?10:40
anddam what am I missing,"--onto"?10:40
[twisti]: does the concept of being behind and ahead even apply to branches?10:41
_ikke_ [twisti]: git branch -vv10:41
anddam oh wow10:41
_ikke_: I thought that was restricted to local/remote branches couple10:41
_ikke_ technically you can track any branch you want, but only one at the same time10:42
[twisti] thanks, ikke10:42
_ikke_ So the command I gave applies to the tracked branch10:42
[twisti] hm, no, that doesnt work, it seems to compare with upstream. what im looking for is something that tells me if local branch X is ahead, behind or both relative to local branch master10:43
rafasc anddam: you can do: git rebase --onto 4228e02 14fdadc~1 14fdadc. (the last argument works best when it is a branch name, otherwise you'll get detached head)10:44
_ikke_ with man git merge-base --is-ancester you can verify if a branch is ahead of another10:44
gitinfo the git-merge-base manpage is available at https://gitirc.eu/git-merge-base.html10:44
_ikke_ [twisti]: git merge-base --is-ancestor <branch1> <branch2> && echo behind || echo ahead10:45
anddam rafasc: I'm reading the --onto part in git-rebase(1) but I don't get the role of the "upstream" argument, even in your example10:45
[twisti] ouch, thats a lot more complicated than i thought :(10:45
but thank you10:46
anddam rafasc: the branch name for the last arg is not issue, I can assign one10:46
_ikke_ anddam: git uses upstream to calculate what commits to rebase10:46
git log --oneline upstream..branch10:46
(and without --onto, it's also the new base)10:47
anddam rafasc: so you are (or rather I am) telling git to: break 14fdadc history at its parent (the ~1) then attach this onto 4228e0210:47
right?10:47
_ikke_ yes10:49
rafasc you can think of git rebase --onto A B C, as take commits in the range ]B,C] and apply them on top of A.10:49
anddam yes, that's what I tried to mean10:49
$ git rebase --onto 4228e02 14fdadc~1 14fdadc10:50
fatal: Needed a single revision10:50
→ computer2000 joined10:50
anddam invalid upstream '14fdadc~1'10:50
rafasc it isn't exactly what happens, but it's a pretty good approximation.10:50
anddam it's Good Enough™ for me10:50
→ nabil joined10:51
← foul_owl left10:51
rafasc anddam: is 14fdadc a root commit?10:51
anddam maybe10:51
oxymoron93 always a good question :D10:51
anddam I have to google "root commit"10:51
_ikke_ it must be a root commit10:51
oxymoron93 initial commit10:51
→ foul_owl joined10:52
rafasc I guess, otherwise 14fdadc~1 would resolve...10:53
anddam it was the root of another repo, that I rebased onto initial commit of this one10:53
← oatmealraisin left10:53
_ikke_ the other options is if 14fdadc does not exist at all10:53
← ChrisLane left10:53
anddam I thought that would have made 14fdadc a child of 291f40b10:54
in my gist, doesn't the representation of vertically aligned * mean parent/child commits?10:54
rafasc anddam: use --parents, or --format='%C(auto)%h%d %s%n'10:55
I have the latter configured as pretty.twoline 'format:%C(auto)%h%d %s%n'10:56
anddam yep, root commit10:56
my bad10:56
rafasc gives some space for --graph do draw connections between commits.10:56
anddam so different topic, I want 14fdadc to be a child of 4228e0210:56
→ ketas joined10:57
→ ChrisLane joined10:57
← ChrisLane left10:57
rafasc git reset --hard 4228e02; git cherry-pick 14fdadc; would be probably the easier route.10:58
Can't remember if --root works with --onto10:59
anddam rafasc: on what branch should I run the reset --hard?10:59
rafasc git rebase --onto 4228e02 --root; maybe10:59
for both, on the branch you're trying to rewrite.11:00
anddam that 14fdadc would be the root commit of develop11:01
rafasc If it's just a single commit, I find it much easier to just cherry-pick.11:01
anddam but if I checkout develop I get the working directory at the tip of develop (sorry for the possible wrong naming there)11:01
that's why I'm checking out specific commits, in this case 14fdadc11:02
rafasc is that log output you pasted truncated?11:02
anddam no, it's tail -711:02
develop has ~600 commits11:02
but that's the bottom11:02
basically i had a previous repo, I inited a new one and wanted to import the other repo master as develop11:03
rafasc so it is truncated...11:03
anddam yes, it is truncated11:03
rafasc of course cherry-pick will not work in that case..11:03
→ learningc joined11:03
anddam it's not that obvious to me11:03
rafasc and you're willing to rewrite 600 commits?11:05
git rebase --onto master --root develop;11:06
→ kjartan_ joined11:06
rafasc but that will flatten all merges...11:06
and rewrite the entire history of develop, that could be problematic.11:07
← cpackham[m]2 left11:07
← henrebotha[m] left11:07
← DamienCassou left11:07
← Celmor[m] left11:07
← mebus left11:07
← olbat[m] left11:07
← jplatte left11:07
← MaliusArth[m] left11:07
← Pseudonosaur left11:07
anddam develop is linear and has is only touched by me, until now11:07
s/ is//11:07
← rickbutton left11:07
← kjartan left11:08
anddam brb11:08
← raven-au left11:09
← jimInDevNull left11:09
im0nde1 → im0nde11:10
→ raven-au joined11:10
→ jimInDevNull joined11:11
→ SkarmoutsosV joined11:13
← azwieg103 left11:13
→ azwieg103 joined11:14
← rafasc left11:14
→ lacrymology joined11:17
← ketas left11:17
→ emsjessec joined11:17
→ rafasc joined11:19
→ ketas joined11:19
→ atomi_ joined11:20
→ Celmor[m] joined11:22
← perrier-jouet left11:26
→ perrier-jouet joined11:29
anddam and we're back11:31
literally11:31
→ ChrisLane joined11:32
← cebor left11:33
→ cebor joined11:34
→ Atlenohen joined11:39
→ varnaud joined11:40
→ oatmealraisin joined11:40
→ LearnAllTheTime joined11:44
→ jcgruenhage joined11:44
anddam rafasc, _ikke_: maybe I'm just trying to do something inappropriate11:44
I have this repo with a somehow long, linear history only in master11:45
I want to have a different structure, a master and develop, with stable on master so the old master branch should be imported as develop11:46
that I figure should branch off the first master commit11:46
_ikke_ You could just rename master to develop and create master on the commit it should be11:47
→ eblip joined11:51
← eb0t left11:52
→ CodeSlingerPaul joined11:55
→ jcg joined11:56
gitinfo set mode: +v11:57
← arunkumar413 left11:58
jcg hello, I have a problem debugging a git hook11:59
anddam _ikke_: I was thinking about having a root master and develop branching off of it11:59
_ikke_: you mean create master at the first "stable" merge, right?11:59
← Hoffman left12:00
jcg It's a pre-commit hook that works when I execute it manually in the repository root, but when I run 'git commit' it doesn't work12:00
→ Hoffman joined12:00
_ikke_ anddam: yes, whatever you consider the new master should be12:00
jcg: define works/doesn't work?12:01
anddam _ikke_: the issue with rebasing a root commit is that all hashes change, right?12:01
other than that it's fine12:01
_ikke_ anddam: yes, that's generally the issue indeed12:01
jcg _ikke_: this is the commit hook: https://upaste.de/bKT12:03
anddam _ikke_: willing to go that road should I delete the currently existing but separated master?12:03
jcg Works is that cargo fmt -- --check works correctly, doesn't work is that it complains it can't find the source stuff12:03
So something before the format check already fails12:04
_ikke_ jcg: verify what the current directory is in the hook when run by git12:04
Ah, apparently you already did that12:04
jcg yeah, it's the repository root, as the githooks documentation says12:04
→ freedom joined12:05
_ikke_ So where is it failing then?12:05
I see that you are already changing the directory to a different path12:06
jcg I think it's failing at the checkout-index command12:06
_ikke_ cd ${WORK_TREE}12:06
What is the error message12:06
jcg https://upaste.de/baT is the error12:07
when I remove the cleanup command (rm -rf ${WORK_TREE}) and go in there, the path is empty12:08
so I think my usage of checkout-index might be wrong, but it's confusing that it works when I run the script myself12:09
← raven-au left12:11
→ raven-au joined12:13
jcg has anyone got an idea?12:16
← atomi left12:18
← mszyszko left12:20
→ simon816 joined12:21
→ caffeinatedcode joined12:22
← realies left12:23
→ Stoot joined12:23
jcg I've put up a minimal example over at https://github.com/jcgruenhage/git-hook-failure-example-2019-10-0212:23
→ olbat[m] joined12:23
→ Pseudonosaur joined12:23
→ mebus joined12:23
→ MaliusArth[m] joined12:23
→ cpackham joined12:23
→ rickbutton joined12:23
→ DamienCassou joined12:23
→ henrebotha[m] joined12:23
→ jplatte joined12:23
→ realies joined12:24
← freedom left12:26
→ Raging_Hog joined12:27
→ catbusters joined12:28
osse jcg: try adding --git-dir=.git next to --work-tree=...12:28
though I think GIT_DIR is laready in the environment12:29
→ lucasb joined12:29
→ nic-hartley joined12:30
jcg osse: doesn't solve it sadly12:30
osse try running git --work-tree=/tmp/wherevr checkout-index... etc. etc live in the shell12:31
do you get files then?12:31
jcg yes, that works: https://stickers.t2bot.io/12:33
damn, wrong clipboard12:33
https://upaste.de/HeJ12:33
osse do you see the bash -x output when committing?12:34
← crose left12:37
← enoq left12:37
← libertyprime left12:38
← roadie left12:38
→ roadie joined12:38
← esrse left12:38
jcg yes, I do12:39
→ tmager joined12:40
← eblip left12:40
jcg https://upaste.de/7bE12:40
← ExeciN left12:41
osse I see the same thing12:42
← Cabanossi left12:42
← royal_screwup21 left12:45
osse jcg: using git ... checkout -f -- :/ works12:46
it defaults to the index contents so should do the trick12:47
anddam _ikke_: anyway I'll fix this later, for now I have a double history and that's it12:53
double, unrelated branch12:53
← Mattiaslndstrm left12:54
jcg osse: doesn't work for me12:54
+ git --git-dir=.git --work-tree=/tmp/home-jcgruenhage-dev-git-hook-failure-example-2019-10-02 checkout -f -- :/fatal: Unable to create '/tmp/home-jcgruenhage-dev-git-hook-failure-example-2019-10-02/.git/index.lock': No such file or directory12:55
Do I have to init the git repo over there before that?12:55
I don't really want to copy the whole repo, just the current tree as it's staged12:55
→ Cabanossi joined12:56
→ libertyprime joined12:57
← rohieb|ptx left12:59
rafasc jcg: you can use: git checkout-index -a -f --prefix="$worktree/"12:59
← khisanth_ left13:01
→ Mattiaslndstrm joined13:02
jcg rafasc: Thanks! That works!13:04
osse strange13:05
rafasc Not sure if this is a bug or not.13:07
→ sbeyer joined13:08
→ royal_screwup21 joined13:08
rafasc GIT_TRACE_SETUP=1 is exactly the same.. yet yields different results.13:09
→ jguddas-tr joined13:10
← jguddas-tr4 left13:13
→ khisanth_ joined13:14
→ gareppa joined13:15
robertparkerx If I had to clear a branch by git reset --hard... how do I force a push13:18
osse use the --force, robert13:18
robertparkerx git push -u origin feature_123 --force ?13:19
osse I would put the --force next to the -u13:19
I presume the -u isn't necessary since it's been pushed before13:20
robertparkerx git push --force feature_12313:20
→ feriman joined13:21
← lmat left13:23
osse where did "origin" go?13:25
→ eb0t joined13:25
→ gschanuel7 joined13:26
← vdamewood left13:27
← vals_ left13:27
← gschanuel left13:28
← royal_screwup21 left13:31
→ sgen joined13:35
→ eblip joined13:35
← comptroller left13:35
← eb0t left13:36
← LearnAllTheTime left13:36
← yn left13:42
→ eb0t joined13:46
→ yn joined13:47
← Makaveli7 left13:49
← xcm left13:50
→ xcm joined13:50
→ comptroller joined13:51
← gareppa left13:54
← libertyprime left13:59
← computer2000 left14:00
← sgen left14:00
robertparkerx ty osse14:01
→ Inline joined14:04
→ fstd_ joined14:04
→ mehuden joined14:04
→ czart joined14:04
← SkarmoutsosV left14:05
← fstd left14:08
→ arunkumar413 joined14:08
fstd_ → fstd14:08
← is_null left14:12
→ is_null joined14:14
← oxymoron93 left14:17
→ pllong joined14:19
← sQVe left14:19
← clime left14:20
← omnireq_ left14:22
→ ExeciN joined14:23
← doug16k left14:26
→ nerosnm joined14:26
← Stoot left14:27
snappy is there a way to reword a series of commit comments from the interactive rebase screen - without having to go through each individual comit14:29
→ im0nde_ joined14:31
→ Stoot joined14:31
← Anthaas left14:31
→ Anthaas joined14:32
← im0nde left14:34
← fstd left14:35
→ fstd joined14:37
→ thiago joined14:37
pllong Why? It's simple enough to just set the action to 'reword' and then edit the commit message. When you save and exit the editor, rebase will automatically continue.14:44
osse you can set GIT_EDITOR to a script maybe14:46
im0nde_ → im0nde14:46
osse GIT_EDITOR='sed -i s/lol/rofl/' GIT_SEQUENCE_EDITOR=vim git rebase -i14:47
← [twisti] left14:53
→ royal_screwup21 joined14:53
→ greggerz joined14:55
→ nika joined14:57
→ aw1 joined14:58
→ fstd_ joined15:01
pllong If you want to sed, then maybe use 'git filter-branch'15:01
→ deathwishdave joined15:02
← chele left15:02
pllong git filter-branch --msg-filter='sed -i s/lol/rofl/' master..HEAD15:03
(I'm assuming you want to rebase against master)15:03
→ omnireq joined15:04
← fstd left15:04
fstd_ → fstd15:04
saint__ → saint_15:04
pllong Sorry, slightly wrong command.15:05
← SteffanW left15:05
pllong git filter-branch --msg-filter 'sed s/lol/rofl/' master..branch15:05
→ bjpenn joined15:06
← cdown left15:06
→ doug16k joined15:06
→ stennowork joined15:07
stennowork hmm i am wondering: i am doing `git pull --rebase origin <branchname>`, however after pulling, `git status` tells me "Your branch is ahead of 'origin/<branchname>' by 3 commits."15:08
→ rsrx joined15:08
stennowork how can that be? i assumed that after pulling from the origin, my local branch would be the same commit level as the origin repository15:09
← feriman left15:10
← saint_ left15:12
← doublex left15:12
← doug16k left15:14
→ saint_ joined15:14
→ ericfreese joined15:14
← duderonomy left15:14
← royal_screwup21 left15:15
→ helpdeskaleer joined15:18
← floppydh left15:20
helpdeskaleer Question about git cherry-pick: https://stackoverflow.com/q/58203992/1814915:21
→ CalimeroTeknik joined15:21
→ MACscr_ joined15:22
← MACscr left15:22
CalimeroTeknik is there some equivalent of post-receive but for a normal repository, that runs after I pull?15:22
post-merge is the closest bet I have15:23
bin_bash whoa hey CalimeroTeknik long time :D15:23
helpdeskaleer Sounds like hooks15:23
stennowork hai bin_bash15:23
we meet again15:23
CalimeroTeknik hello15:23
stennowork unsurprisingly :D15:23
bin_bash heh hey stennowork15:24
Hello, old friends :D15:24
← mobidrop left15:24
stennowork o715:24
← thiago left15:24
← aw1 left15:25
← asrob left15:26
→ akem__ joined15:30
← stennowork left15:31
← akemhp_ left15:33
← helpdeskaleer left15:35
→ vicfred joined15:36
← rfuentess left15:36
← Stoot left15:39
→ dijitol joined15:39
← lucasb left15:39
→ MACscr joined15:41
← MACscr_ left15:41
← xcm left15:41
→ doublex joined15:43
→ xcm joined15:43
→ boombatower joined15:44
→ zumba_addict joined15:46
zumba_addict What step am I doing wrong with CONFLICT during git rebase. I manually fixed the conflicts then I ran `git add .` then ran `git rebase --continue`. The conflicts came back15:47
_ikke_ zumba_addict: probably nothing15:47
a change might conflict with more then one commit15:47
zumba_addict it showed 2 conflicts which I fixed15:48
I'll try again15:48
i ran `git rebase --continue` and it opened up vi like it did earlier. I just saved it15:50
it worked this time15:50
hmm15:50
git push failed15:51
oh, --force15:52
it's successful now :)15:52
_ikke_ good15:54
→ asrob joined15:56
axsuul Is there a shortcut to rebase on master and squash all commits in one go? Currently the workflow is `git rebase -i master` and then I replace all "pick" commits with "f" and save15:58
_ikke_ axsuul: git merge --squash15:59
(followed by git commit)16:00
← yokisuci left16:01
← mikecmpbll left16:01
→ gareppa joined16:02
← learningc left16:04
→ mikecmpbll joined16:04
→ disi joined16:05
← gareppa left16:05
→ Exec1N joined16:06
← caskd left16:06
→ yokisuci joined16:06
← asrob left16:06
→ caskd joined16:06
→ MACscr_ joined16:06
→ tucked joined16:06
← MACscr left16:08
← nic-hartley left16:08
← disi left16:10
axsuul _ikke_ : Sorry, i don't want to merge into master, I forgot to mention I'm currently checked out of another branch (that's on top of master) and want to squash all the commits of current branch into one commit16:12
← nerosnm left16:13
gschanuel7 → gschanuel16:13
← jguddas-tr left16:14
← justanotheruser left16:17
→ thiago joined16:17
→ Stoot joined16:19
_ikke_ axsuul: not the pretiest solution, but this works: GIT_SEQUENCE_EDITOR='sed "2,\$s/pick/f/"' git rebase -i origin/master16:26
sorry, you'd need sed -i16:27
axsuul thanks loving the approach!16:29
→ SuperL4g joined16:30
→ clime joined16:31
→ malina joined16:32
axsuul on macOS, I had to change the command to: GIT_SEQUENCE_EDITOR='sed -i '' -e "2,\$s/pick/f/"' git rebase -i master16:33
→ justanotheruser joined16:33
axsuul but it works, thanks a bunch!16:33
← SuperLag left16:33
→ jguddas-tr joined16:33
→ jguddas-tr1 joined16:36
← jguddas-tr left16:38
← doublex left16:40
← _ADN_ left16:42
→ _ADN_ joined16:43
← MACscr_ left16:44
→ MACscr joined16:44
← TomyWork left16:44
→ gareppa joined16:46
→ helpdeskaleer joined16:47
helpdeskaleer Orientation of git flow feature merges? https://stackoverflow.com/q/58205848/1814916:48
← gareppa left16:48
← _ADN_ left16:48
← helpdeskaleer left16:48
→ gareppa joined16:50
← nabil left16:52
→ nabil joined16:52
← mikecmpbll left16:52
← arunkumar413 left16:54
← deathwishdave left16:56
→ helpdeskaleer joined16:58
← helpdeskaleer left17:01
← Darcidride left17:02
← mimajof left17:03
→ cfoch joined17:03
→ helpdeskaleer joined17:05
← helpdeskaleer left17:09
→ AtumT joined17:09
← saint_ left17:10
→ duderono_ joined17:17
→ fstd_ joined17:18
← planetcall|work left17:18
← duderono_ left17:20
← fstd left17:21
fstd_ → fstd17:21
← SuperL4g left17:21
→ royal_screwup21 joined17:22
← xcm left17:22
→ xcm joined17:23
→ SuperLag joined17:23
← Raging_Hog left17:28
← SuperLag left17:29
← caskd left17:35
← jwest left17:38
akem__ → akem17:38
← MACscr left17:40
→ SuperLag joined17:43
→ doublex joined17:46
→ tango_ joined17:48
anddam I want to merge the feature branch into develop at https://gist.github.com/anddam/043020e22b70e648bda896567a3d74d317:48
I think this should just be a fast-forward17:48
do I need to manually force it or will git merge pick it on its own?17:49
vishal anddam: is a fast-forward ok, or do you want to force the creation of a merge commit?17:49
it will fast-forward by default17:49
but you can override that17:49
bin_bash what version of git is this from https://gitirc.eu/git-checkout.html? I don't see these same options when I check the manpage17:51
specifically i dont have --overwrite-ignore or --no-overwrite-ignore17:51
→ MACscr joined17:52
← czart left17:52
vishal the page says: Last updated 2019-07-10 11:51:04 JST so probably from the git tree thereabouts17:52
→ caskd joined17:56
← oatmealraisin left17:56
← gareppa left17:57
→ Sasazuka joined17:57
bin_bash i'm trying to confirm something i was told yesterday, whcih is that git will silently overwrite ignored files. i've never had this happen, and i cant seem to replicate it. there's an ignored file test.flag that doesn't exist. i create it, add text to it, then checkout origin/master (where the file doesnt exist). on checkout my test.flag file still exists, so git didnt delete it17:58
rafasc: perhaps i misunderstood but based on what you were saying yesterday shouldnt the file have been removed?18:02
→ nicexe joined18:03
← ExeciN left18:05
→ fahadash joined18:11
Habbie bin_bash, you were told that git MAY do that18:14
bin_bash, you were not promised destruction18:14
bin_bash, git clean may do it quite bluntly; git checkout may do it if you switch between branches that do and do not have that file18:14
bin_bash, but git will not actively seek out your ignored files to destroy them18:15
bin_bash Habbie: based off the documentation linked it says it's the default behavior18:15
so if it's the default behavior it should happen, right?18:15
Habbie bin_bash, which documentation is that, exactly?18:15
bin_bash the one i linked above https://gitirc.eu/git-checkout.html18:16
see --no-overwrite-ignore18:16
Habbie that flag is relevant when the branch you are switching to contains ignored files18:17
which yours does not18:17
so there is nothing to overwrite or not overwrite18:17
my local manpage also lacks those options btw18:17
← Aquazi left18:17
→ ELFrederich joined18:18
→ jwest joined18:19
→ shabius_ joined18:19
_ikke_ I think it's quite new18:20
bin_bash if the files are ignored the branch shouldn't contain them, hence my confusion18:20
_ikke_ But hab18:21
→ oatmealraisin joined18:21
nicexe → ExeciN18:21
← Jackneill left18:22
_ikke_ Habbie is right, it's only very specific circumstances where this is an issue18:22
← shabius_ left18:22
Habbie bin_bash, the summary is 'git will ignore your ignored files as much as it can'18:22
bin_bash ok so then it's not true that gitignore is only meant for garbage files? or it is true? like that's basically what i'm trying to understand.18:22
Habbie it's not true18:23
it's also not what's relevant18:23
_ikke_ Habbie: that idea comes from the maintainer of git18:23
← shabius left18:23
bin_bash and previously my understanding was ignored files are ignored. if you've added the files to a repo and then ignore them, you use git clean to remove them (which deletes them)18:23
Habbie _ikke_, ah18:23
bin_bash, git clean does not do that18:23
bin_bash er sorry, you're right, git clean is for removing untracked files18:24
but git clean -x can remove ignore files iirc18:24
was looking at this yesterday, sec18:24
Habbie yes18:24
if they are not tracked18:24
_ikke_ Someone complained that git ate their ignored files, when Junio replied that ignored files are deamed trashable18:24
Habbie _ikke_, right18:24
_ikke_ That git has no concept of precious but ignored files yet18:25
Habbie _ikke_, i consider that subtly different than 'gitignore is for garbage files'18:25
but the point is taken18:25
bin_bash ohhhhhhhh18:25
okay that makes WAY more sense18:25
I misunderstood yesterday18:25
Habbie bin_bash, i figured :)18:25
→ pyfgcr joined18:25
Habbie bin_bash, glad it's clear now18:25
← Mattiaslndstrm left18:26
→ shabius joined18:26
_ikke_ If git doesn't have to touch those files, it doesn't18:27
← sauvin left18:27
_ikke_ But when you check out a branch that does track that file, git would not complain as it usually would18:27
bin_bash to rephrase (and please correct me if i'm wrong) but git basically doesn't know or care about ignored files. it cant determine ignored trash files vs ignored precious files, so treats them the same. if you were to remove with git clean -xdf or something then all the files would get removed, even if theyre "precious", but regular behavior of git isnt going to just randomly delete them18:27
<_ikke_> But when you check out a branch that does track that file, git would not complain as it usually would18:27
this clarifies it a lot18:28
branch where file is ignored, branch where it's not ignored, not ignored will take precendence and overwrite local file regardless of whether local file is newer since git is ignoring it18:28
→ g00s joined18:29
→ deathwishdave joined18:30
→ lucasb joined18:33
ELFrederich I want to push all branches from one remote to a new empty remote. I have not found a straight forward way to do this. Someone here told me a while ago to do "git push gov refs/remotes/origin/*:refs/heads/*" ... but that ends up pushing a branch called HEAD18:34
← Hoffman left18:35
→ Hoffman joined18:35
← Enphuego left18:37
← shabius left18:39
→ KeyJoo joined18:39
← Cabanossi left18:42
ELFrederich I looked at the --mirror option for push, but it only pushes local references, not from one remote to another18:48
→ gareppa joined18:48
→ shabius joined18:50
→ owlscientist joined18:52
rafasc bin_bash: https://upaste.de/Gy818:53
→ zub1n joined18:54
rafasc if you checkout i-hate-config-files, your ignored changes will be lost.18:54
← azwieg103 left18:55
→ azwieg103 joined18:56
rafasc this is the obvious case, but there are other not-so-obvious ones.18:57
bin_bash so it's only if you've already added an ignored file18:57
→ Cabanossi joined18:57
← xcm left18:58
rafasc I think I remember someone complaining that a pull could do it, but I don't remember the exact scenario.18:58
→ xcm joined19:00
rafasc the link I gave you yesterday has a more complex one: https://public-inbox.org/git/4C6A1C5B.4030304@workspacewhiz.com/19:00
→ kleisli joined19:04
← kleisli left19:05
→ kleisli joined19:05
← azwieg103 left19:05
← bjpenn left19:06
kleisli hey all. i have a repo where if i do git rebase -i --root and make no changes (ie pick every commit), i get a bunch of merge conflicts. i don't understand how this is possible19:07
shouldn't it be the case if i just pick every commit, that's just the same as replaying history exactly?19:07
rafasc "cant determine ignored trash files vs ignored precious files, so treats them the same." This is true. The problem is that it treats it as trashable files.19:07
jrnieder kleisli: does --rebase-merges do what you're looking for?19:08
← Aelius left19:08
→ leeN joined19:08
← fphilipe left19:08
→ Aelius joined19:09
kleisli jrnieder: hmm i just tried that. i get "error: refusing to update ref with bad name". i should be clear, i didn't write this project myself, so anything could have happened in the past19:11
jrnieder weird, sounds worth contacting [email@hidden.address] about19:11
anyway, I suspect the answer to your first question is "merges" :)19:12
actually, before I conclude that the error is a bug, what is the full command line you ran?19:12
← nika left19:13
kleisli jrnieder: https://paste.ee/p/DzAZa19:13
i didn't make any changes interactively19:14
i guess that's equivalent to just `git rebase --root --rebase-merges` ?19:14
← doublex left19:17
→ doublex joined19:24
← jguddas-tr1 left19:25
→ plexigras joined19:27
→ ExtraSteve joined19:32
← Kaivo left19:34
ExtraSteve So I'm a bit of a gitiot (git-idiot, get it?) - I don't know the right tool for what I'm trying to do. Maybe y'all can help.19:35
← gareppa left19:35
ExtraSteve I have a project, ProjectA, which I'd like to make a copy of: ProjectB. ProjectB will have a few key changes - we'll call them XYZ. I will be making changes to ProjectA in the future - I'd like to push those same changes to ProjectB without interfering with XYZ.19:35
Is this the job of fork? If so, what do I need to do to keep my fork up to date with the original project from which it was forked?19:35
Or is this the job of branching?19:36
← BonusPlay left19:36
ExtraSteve I just don't want to overwrite XYZ in ProjectB with the original version from ProjectA19:36
→ BonusPlay joined19:36
ExtraSteve When I make my other changes19:36
If that makes sense19:36
← BonusPlay left19:37
→ BonusPlay joined19:37
← BonusPlay left19:37
→ BonusPlay joined19:38
← catbusters left19:38
vishal ExtraSteve: yes, sounds like a fork, and yes you'll have to choose when to sync up with the progress ProjectA makes19:39
→ macaronus joined19:39
→ jubal joined19:40
vishal XYZ won't go anywhere unless you do something like reset --hard <some-ref-from-A>19:40
otherwise you can periodically do something like git merge projectA/master; <resolve conflicts>19:41
ExtraSteve So if I fork, it's not going to say, "hey XYZ exists in A but not B" when I sync? Only the changes that were made after the fork?19:41
vishal and also keep making commits on B's XYZ and they will continue to coexist19:41
ExtraSteve Right19:42
vishal I thought XYZ were changes local to B?19:42
ExtraSteve Yes, XYZ are going to be local to B19:43
vishal right so this 'sync' operation will typically be a git merge19:43
→ nabil_ joined19:43
ExtraSteve But if I make new changes (let's say ABC) to A - is git not going to say "I've got ABC to merge... you've got XYZ, so let me just kill that also" ?19:44
Or is it going to give me merge conflicts every time?19:44
vishal no, it will attempt to keep both19:44
ExtraSteve And then I just have to resolve?19:44
Ahhh19:44
vishal there may be merge conflicts depending on the exact nature of the changes19:44
ExtraSteve Shouldn't be anything on the same lines - and hopefully not even in the same files19:45
vishal should be straightforward then19:45
ExtraSteve Cool :)19:45
← BonusPlay left19:45
vishal note that merge will bring in /all/ the changes from project A19:46
→ BonusPlay joined19:46
vishal if this is what you want, great19:46
← nabil left19:46
vishal if not, and if you want to only bring in things selectively, you can use cherry-pick or so19:46
← BonusPlay left19:46
vishal both are valid directions to go in19:46
→ BonusPlay joined19:47
← malina left19:47
← emsjessec left19:47
→ gareppa joined19:47
vishal but note that a merge will attempt to bring in the entire history of A starting from the point of divergence (usually called the merge-base)19:48
← nabil_ left19:49
→ nabil_ joined19:50
← MACscr left19:52
→ n3wborn joined19:53
→ MACscr joined19:55
→ veegee joined20:02
→ malmalmal joined20:05
← gareppa left20:06
jrnieder kleisli: thanks! Yeah, looks like a bug, so a mail to [email@hidden.address] would be welcome20:09
→ Ignacy joined20:09
kleisli jrnieder: interesting, thanks20:10
→ SkarmoutsosV joined20:10
← infinisil left20:11
→ infinisil joined20:15
→ bitwinery joined20:17
← bitwinery left20:17
→ bitwinery joined20:18
← justanotheruser left20:26
← ELFrederich left20:28
→ arahnoid joined20:29
← Ignacy left20:37
→ cdown joined20:37
← cdown left20:43
→ justanotheruser joined20:46
→ blackmesa joined20:48
← arahnoid left20:48
← tmager left20:51
→ arahnoid joined20:52
→ nuala joined20:53
→ LaScoumoune joined20:54
← nuala left20:54
→ nuala joined20:56
← eb0t left21:05
→ fphilipe joined21:05
→ bambanx joined21:05
← bambanx left21:05
← pllong left21:07
→ blackmesa1 joined21:07
← Exec1N left21:07
← blackmesa left21:08
→ edgimar joined21:08
foo Is there a way to do a git commit and set the date? In a way that no one else can know the date was not the actual date of commit?21:08
j416 foo: man git-commit look for GIT_AUTHOR_DATE, GIT_COMMITTER_DATE21:09
gitinfo foo: the git-commit manpage is available at https://gitirc.eu/git-commit.html21:09
Habbie (1) yes (2) your push, and other related operations, will no doubt also leave some trails behind21:09
j416 sorry, man git-commit-tree21:10
gitinfo the git-commit-tree manpage is available at https://gitirc.eu/git-commit-tree.html21:10
edgimar I made a commit a while ago which reflects the working dir state that I would like to have for a merge I'm doing. What I want to know is if there's a way, after a 'git merge --no-commit ...' to reset ONLY THE WORKING DIR to match the working-dir state of some commit, but leave the index and everything else untouched.21:10
← fphilipe left21:12
← xcm left21:12
→ xcm joined21:12
← Aelius left21:12
← arahnoid left21:13
← KeyJoo left21:16
edgimar hm, I guess I could (1) reset --hard to the 'good' commit, (2) reset --soft HEAD^, and (3) merge with an ours strategy21:16
← sbeyer left21:17
edgimar But I would like to know if there's a way to change the working dir w/o touching the current index (i.e. a 'checkout rev -- filename' but for all files in rev).21:18
← Fusl left21:18
j416 edgimar: probably, but with the likelyhood of fatfingering something, I'd recommend you simply commit first21:18
→ Fusl joined21:19
rafasc with lastest version you can: git restore --source=commit --worktree21:19
git restore --source=commit --worktree :/ it also accepts -p, which is very nice.21:21
← robertparkerx left21:21
← Phylock left21:21
← jubal left21:21
edgimar hmph - 'git merge -s ours ...' results with 'Merge with strategy ours failed.' -- how is this possible?21:21
← deathwishdave left21:22
→ sbeyer joined21:22
→ robertparkerx joined21:22
edgimar oh, I guess I can't merge w/ changes to the working dir.21:23
Is there a way to add an additional parent to an existing commit?21:23
j416 edgimar: man git-replace21:23
gitinfo edgimar: the git-replace manpage is available at https://gitirc.eu/git-replace.html21:23
edgimar (i.e. convert a normal commit into a merge commit)21:23
j416 never done it, but I'd assume it'd work.21:24
--graft should do it. --edit would be another option.21:24
foo j416 / Habbie - thanks, looks like if I set GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables and the --date option ... to the same date, I suspect I'll be ok. (These are adding new files only, in my own branch not in staging, so I *think* this should be ok and not cause any challenges)21:25
edgimar I'd like to avoid replace, as it adds another layer that maps the replaced nodes.21:25
j416 foo: you don't need --date; just the env vars.21:25
edgimar: you can run filter-branch to make those changes permanent.21:25
edgimar j416: true.21:25
but now it's getting to the tipping point where it's almost too much of a pain to take that path.21:26
j416 so don't21:26
foo j416: thank you21:26
j416 o/21:26
→ jubal joined21:27
→ Fernando-Basso joined21:27
→ seebyr joined21:29
rafasc filter-branch also has a parent rewrite filter.21:31
→ crose joined21:31
← pyfgcr left21:32
← sbeyer left21:32
j416 fancy21:33
til21:33
← xcm left21:35
→ xcm joined21:36
→ coco joined21:37
rafasc but muckering the parent list is the recipe to create evil merges, so not so fancy. :P21:39
→ feriman joined21:41
j416 :)21:42
← edgimar left21:43
← seebyr left21:45
← oatmealraisin left21:46
← kleisli left21:49
← greggerz left21:55
→ dre_ joined21:56
← dre_ left21:57
← owlscientist left21:57
→ LearnAllTheTime joined21:57
amcclure → amcclure|22:01
← coco left22:01
← veegee left22:01
→ Jackneill joined22:01
→ m0viefreak joined22:02
→ Aelius joined22:03
← vicfred left22:05
← dijitol left22:06
← akem left22:06
← LaScoumoune left22:06
→ amcclure joined22:07
→ akemhp joined22:08
← feriman left22:13
→ Exec1N joined22:14
→ kleisli joined22:14
→ Newami joined22:16
→ Wetmelon joined22:16
← Newami left22:17
← Jackneill left22:17
← Exec1N left22:19
tucked → disi22:23
← SkarmoutsosV left22:31
→ oatmealraisin joined22:32
foo git merge branchB (when I'm in branchA) gives me a merge commit in the log which makes it easier to revert compared to a rebase, correct? (I believe yes, simply want to make sure)22:32
→ jamiejackson joined22:32
jamiejackson hi folks. i can't figure out how to revert. i've never successfully done one. i want to revert the commits containing "spot debug" and here's my failed attempt: https://gist.github.com/jamiejackson/5d5cec30eb735d6b70b31f177c8585e722:33
→ P1RATEZ joined22:33
← CodeSlingerPaul left22:33
← kleisli left22:34
→ eb0t joined22:37
← royal_screwup21 left22:42
← malmalmal left22:43
vishal foo: correct, unless the merge can be fast forwarded, in which case there won't be a merge commit. You can override that using --no-ff which will force the creation of a merge commit22:45
foo vishal: thank you22:46
vishal jamiejackson: did you try giving it the -m option as it suggested?22:46
jamiejackson: !revert_merge22:46
gitinfo jamiejackson: [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you can use 'git revert' but there are gotchas to be aware of. Please read: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt22:46
jamiejackson vishal, yeah, with -m, it gave `error: option `mainline' expects a number greater than zero`22:47
vishal jamiejackson: right, you need to give it 'which side' of the merge to revert22:49
inspect that merge commit it is complaining about, and look at the two histories merged22:49
find the one you want gone, and see which parent it is, and then supply 1 or 2 to -m22:50
→ cdown joined22:51
← plexigras left22:51
← rafasc left22:52
← jcg left22:52
jamiejackson okay, i'm beginning to see, but i've got to wrap up for today. thanks for the tips, vishal22:53
vishal cheers22:53
← lucasb left22:53
← omnireq left23:02
← kreyren left23:05
→ fphilipe joined23:08
← fphilipe left23:12
→ yonder joined23:19
← cfoch left23:23
← n3wborn left23:23
← Yossi left23:25
← ericfreese left23:28
→ Yossi joined23:30
→ omnireq joined23:37
← fahadash left23:39
← jamiejackson left23:40
← cdown left23:40
→ blackmesa joined23:40
← blackmesa1 left23:42
← nuala left23:42
→ ferdna joined23:42
← xcm left23:45
→ xcm joined23:45
← thiago left23:50
← g00s left23:54
← rsrx left23:56
→ adder` joined23:58
→ cdown joined23:59

Logs Search ←Prev date Next date→ Channels Documentation