IRCloggy #git 2022-04-22

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.

2022-04-22

← causa_sui left00:01
← Sulky__ left00:02
← XV8 left00:03
→ Sulky__ joined00:05
← williewillus left00:08
← Sasazuka left00:09
← DNH left00:10
← fling left00:12
→ williewillus1 joined00:12
← williewillus1 left00:13
→ fling joined00:14
→ DNH joined00:16
← littlebobeep left00:17
← DNH left00:17
→ DNH joined00:18
← cbreak left00:18
→ caveman joined00:20
← caveman left00:21
→ cbreak joined00:21
← rgrinberg left00:22
← DNH left00:23
← vicfred left00:23
← Knowsin left00:28
← gurkenglas left00:28
← nyah left00:30
← dka left00:34
→ dka joined00:35
← yte3 left00:36
→ kaiseisei joined00:39
← blaklistd left00:50
← mannequin left01:06
→ vysn joined01:14
← duxsco left01:14
← fling left01:16
→ fling_ joined01:16
fling_ → fling01:23
← zebrag left01:23
← analoq left01:25
→ analoq joined01:27
← pulse left01:28
← Murr left01:30
→ Murr joined01:31
← stutz left01:32
→ mgedmin joined01:33
→ stutz joined01:39
← stutz left01:39
→ stutz joined01:39
→ sa0 joined01:50
→ Guest69 joined02:05
→ Jong joined02:05
→ hbautista joined02:06
→ littlebobeep joined02:17
← Sulky__ left02:17
← fling left02:20
→ fling joined02:20
← sa0 left02:22
→ nate1 joined02:23
← Guest69 left02:24
→ mitrokov joined02:27
→ hbautista_ joined02:27
← hbautista left02:30
← nate1 left02:30
← caverton left02:36
→ caverton joined02:36
← duderonomy left02:38
← beencubed left02:46
→ TSH joined02:50
→ haasn joined03:01
→ onizu joined03:01
← littlebobeep left03:06
→ littlebobeep joined03:09
← cliluw left03:11
← fling left03:12
← littlebobeep left03:14
→ GNUmoon joined03:20
→ cliluw joined03:24
← cliluw left03:28
→ kaartic joined03:34
→ pulse joined03:35
→ littlebobeep joined03:40
← tyson2 left03:43
← kaartic left03:49
← jiffe left03:49
→ kaartic joined03:50
← pulse left03:50
← mitrokov left03:52
← bloody left03:57
→ mitrokov joined04:05
→ williewillus5 joined04:06
williewillus5 → williewillus04:08
← mitrokov left04:09
← skapata left04:11
→ skapata joined04:11
← skapata left04:11
→ skapata joined04:11
→ mitrokov joined04:15
← mitrokov left04:16
→ mitrokov joined04:17
→ sa0 joined04:20
← littlebobeep left04:21
→ littlebobeep joined04:21
← riposte left04:22
→ riposte joined04:22
← kaartic left04:27
← TSH left04:30
→ Guest560 joined04:33
← GNUmoon left04:34
→ GNUmoon joined04:35
← Guest560 left04:36
→ kaartic joined04:38
← kaartic left04:47
← hololeap left04:51
← sa0 left04:52
← gast0n left04:53
← adanwan left04:54
→ adanwan_ joined04:54
→ hololeap joined04:57
→ madewokherd` joined04:59
← cbreak left05:01
← madewokherd left05:02
→ cbreak joined05:07
→ kaartic joined05:15
ikke .version05:16
gitinfo changed the topic to: Welcome to #git, we like graphs | Current stable version: 2.36.0 | First visit? https://gitirc.eu | This channel is logged: https://gitirc.eu/log05:16
→ YuGiOhJCJ joined05:17
→ fling joined05:24
→ saroy joined05:31
← mrME2 left05:35
→ mrME2 joined05:36
→ gurkenglas joined05:36
← great_taste left05:37
← mrME2 left05:43
← kaartic left05:45
→ mrME2 joined05:45
← Murr left05:46
→ Murr joined05:46
→ kshockey joined05:47
← kshockey left05:47
→ kshockey joined05:47
→ kaartic joined05:51
← kaartic left05:57
→ kaartic joined05:57
→ coot joined05:58
← makara1 left06:04
← makara left06:04
→ makara_ joined06:04
→ makara joined06:05
→ w_lehinsun joined06:06
← hbautista_ left06:06
← thiago left06:08
→ jusski joined06:08
← Xaldafax left06:10
← kaartic left06:15
← fling left06:17
→ fling joined06:19
→ srinidhi joined06:23
→ kaartic joined06:24
← w_lehinsun left06:26
← jusski left06:29
→ jinsun__ joined06:34
← jinsun left06:38
→ EvilDMP joined06:41
← jensen left06:45
→ mihael joined06:48
← mihael left06:51
← xuxx left06:51
← llh left06:52
→ mihael joined06:52
→ lelux joined06:53
→ llh joined06:54
← mitrokov left06:54
← vdamewood left07:00
← Noisytoot left07:02
← mihael left07:03
→ vdamewood joined07:04
← kaartic left07:04
→ mitrokov joined07:08
→ Noisytoot joined07:08
→ daru joined07:09
→ rfuentess joined07:09
← jinsun__ left07:12
→ jinsun joined07:13
→ iomari891 joined07:14
← olbat__ left07:18
→ olbat joined07:18
← olbat left07:18
→ olbat joined07:18
← Noisytoot left07:20
← fling left07:21
→ fling joined07:22
→ palasso joined07:24
← Masklin left07:28
→ zeenk joined07:29
← The_Blode left07:31
→ The_Blode joined07:34
→ Gaboradon joined07:35
← hololeap left07:36
→ feriman joined07:41
→ jazzy2 joined07:44
→ carl-- joined07:45
jazzy → Guest139007:46
jazzy2 → jazzy07:46
← Guest1390 left07:47
→ carl--- joined07:53
Kartagis I have pushed my branch, but my colleague's branch happened to be merged before I did, hence conflict. How do I handle that?07:54
← carl-- left07:55
← coot left07:56
ikke Kartagis: rebase your branch, force push07:57
← carl--- left07:57
Kartagis with or without -i*07:57
s/*/?07:58
ikke No need to be interactive07:58
git rebase origin/master for example would work07:58
assuming you have your branch checked out07:58
Kartagis okay07:59
← keypusher left08:00
Kartagis there are still conflicts08:01
ikke Did you fetch from origin before you did that?08:01
← zeenk left08:03
Kartagis I just did, now working out issues in composer.json08:06
← Gustavo6046 left08:06
→ adlternative joined08:07
→ bob518 joined08:07
→ duderonomy joined08:09
← vysn left08:09
← adlternative left08:10
→ vladoski joined08:11
→ Masklin joined08:12
→ keypusher joined08:12
→ kaartic joined08:14
→ otisolsen70 joined08:20
← GNUmoon left08:22
← fling left08:26
→ duxsco joined08:27
→ fling joined08:28
→ GNUmoon joined08:30
→ dionysus69 joined08:30
← madewokherd` left08:30
→ einar joined08:30
einar Why is the order of commits in `git log` different from `git rebase --interactive`, and is there a config option to make them act consistently?08:32
→ dharrigan joined08:32
ikke git log shows the newest on top, so that it's the first you see when you do git log, and you scroll back in history08:33
git rebase -i shows the commits in order that they are applied (so oldest first, newer later)08:34
as far as I know, you cannot change the order of the rebase todo list08:35
You can do git log --reverse, but most of the time, that's not what you want08:36
→ enkeyz joined08:38
← xkuru left08:43
→ MajorBiscuit joined08:45
einar I just like it to be consistent.08:48
← m1dnight left08:49
ikke It doesn't make sense in these cases08:50
→ m1dnight joined08:50
→ sa0 joined08:51
ikke Having the todo list in the reverse order would be a lot more confusing when trying to use it08:51
← magic_ninja left08:52
← bob518 left08:55
← Thanatermesis left08:58
→ magic_ninja joined09:04
→ nyah joined09:06
← ikke left09:08
→ Sulky joined09:08
← sa0 left09:08
→ sa0 joined09:08
→ ikke joined09:09
← vladoski left09:11
→ zer0bitz joined09:11
→ distantsail joined09:12
→ kenan-office joined09:13
← AbleBacon left09:17
← jbg left09:18
→ jbg joined09:20
→ eroux joined09:24
← duderonomy left09:29
← wonko-the-sane left09:30
← fling left09:31
→ fling joined09:32
→ wonko-the-sane joined09:32
← feriman left09:35
→ feriman joined09:37
→ hxztnxt joined09:38
← hxztnxt left09:38
→ drogas joined09:54
→ zebrag joined09:58
← rudi_s left10:04
→ rudi_s joined10:05
→ tealtabbycat joined10:09
→ wakeup joined10:10
→ cmn joined10:13
← wonko-the-sane left10:15
← littlebobeep left10:18
← tealtabbycat left10:19
→ benni joined10:21
← eroux left10:23
→ knallmaus joined10:26
furrymcgee einar: there is config core.editor10:27
← haskl[error] left10:30
→ vladoski joined10:31
→ haskl joined10:33
→ Noisytoot joined10:33
← fling left10:35
← MiguelX413 left10:35
→ fling joined10:36
← drogas left10:36
→ MiguelX413 joined10:36
→ Lord_of_Life_ joined10:37
← Lord_of_Life left10:38
← Noisytoot left10:38
→ coot joined10:39
Lord_of_Life_ → Lord_of_Life10:40
← wakeup left10:40
→ drogas joined10:41
← kaiseisei left10:42
→ TomyWork joined10:46
→ eroux joined10:48
→ wakeup joined10:49
← wakeup left10:50
→ Noisytoot joined10:57
← vishal left11:00
← chenqisu1 left11:01
→ vishal joined11:04
→ john_johnk joined11:04
← duxsco left11:05
→ gas51627 joined11:07
→ henko joined11:10
← john_johnk left11:18
→ carl--- joined11:18
einar okay, I see. Thank you both.11:20
← carl--- left11:25
← henko left11:30
→ coaxing joined11:33
← fling left11:37
← eroux left11:37
← drogas left11:40
→ fling joined11:40
→ wakeup joined11:45
→ tyson2 joined11:52
← zer0bitz left11:56
← jazzy left11:59
← Xenguy left12:02
→ vitali64 joined12:04
→ john_johnk joined12:04
→ ibrahim joined12:06
→ pdc joined12:06
→ pulse joined12:06
← baffodoro left12:09
→ mannequin joined12:09
→ mexen joined12:11
← pdc left12:14
→ pdc joined12:14
← pdc left12:16
→ Visne_ joined12:36
← Visne left12:37
Visne_ → Visne12:37
→ gh34 joined12:40
← fling left12:41
→ Guest78 joined12:41
→ fling joined12:42
← Guest78 left12:44
← kaartic left12:44
→ kaartic joined12:44
← perrierjouet left12:50
→ bloody joined12:51
← coaxing left12:52
→ coaxing joined12:54
← Ram-Z left12:55
← coaxing left12:59
← benni left13:01
→ tulpa_ joined13:01
← nyah left13:02
→ [twisti] joined13:03
→ stef204 joined13:03
[twisti] i was reading something and saw a mention of 'tig' but at first glance, that just looks like the regular git cli. anyone know what the added value is ?13:04
→ nyah joined13:04
osse if it looks like regular git cli then you might have spelled it backwards13:05
→ Rogerspianocat joined13:05
← funhouse left13:06
→ coaxing joined13:07
osse that was a joke13:08
[twisti] i figured13:08
→ szkl joined13:09
osse I don't use it much myself, but I find myself running git log -p, then realizing that's too much and run git log --stat, then decided I want to take a closer look at a commit and run git show foo in a separate terminal. it's a mess. it's a mess I believe tig can help me with, but I haven't gotten around to learning it yet13:09
I think much of the added benefit is just running 'tig' and then find what you want from there13:11
→ jiffe joined13:11
osse looking at 'tig --help' I realize how similar to git it looks :p13:11
← nyah left13:11
→ fling_ joined13:12
← fling left13:13
→ zer0bitz joined13:13
→ nyah joined13:13
← vdamewood left13:16
[twisti] oh i see now, its interactive13:16
← wakeup left13:17
← coot left13:17
→ wakeup joined13:17
[twisti] that was not clear to me at all from what i read13:18
fling_ → fling13:18
→ PaowZ joined13:24
← coaxing left13:24
→ coaxing joined13:25
→ coot joined13:27
← stef204 left13:28
← wakeup left13:32
PaowZ Hi there ! I'm having an issue cloning a repo. I can connect to my git server which tends to prove my ssh key is correct (on windows, c:\users\.ssh\id_rsa) and I can clone under WSL. The error is the usual "fatal: Could not read from remote repository".. any clue ?13:33
← nyah left13:33
→ wakeup joined13:34
ikke path to the repo is wrong or no permissions to read the repo13:34
or something like that13:34
→ rgrinberg joined13:34
→ Ram-Z joined13:36
PaowZ ikke: I figured this out.. needed PubkeyAcceptedKeyTypes +ssh-rsa13:37
in /config13:37
← zumba_addict left13:38
← rgrinberg left13:39
← fling left13:45
→ fling joined13:46
→ Xaldafax joined13:47
→ duxsco joined13:57
→ thiago joined14:00
→ vysn joined14:02
← kenan-office left14:03
BlessJah_ → BlessJah14:04
→ lgc joined14:05
← bkircher left14:07
→ nyah joined14:07
← wakeup left14:08
← lgc left14:08
→ jim87 joined14:10
← jim87 left14:10
→ rgrinberg joined14:11
→ kaiseisei joined14:11
← kaartic left14:16
→ kaartic joined14:17
← off^ left14:18
← YuGiOhJCJ left14:19
← john_johnk left14:23
→ john_johnk joined14:23
→ wakeup joined14:25
← tyson2 left14:25
← Sulky left14:27
→ gooble_gobble joined14:30
gooble_gobble hey folks, im having some trouble understanding git. I want to be able to get the commit where my branch started. But I cannot seem to find a solution for a situation where i have merges from master into my feature branch14:31
can anyone help meout14:31
ikke gooble_gobble: this is not something that git tracks14:32
j416 except for the reflog14:32
ikke so there is no straight-forward and reliable way to get this14:32
right, but that assumes you created the branch locally and not longer than 90 days ago14:32
j416 nod14:33
gooble_gobble ikke, so the reason for this was I wanted to get a list of all the files that changed in the branch. If a certain file changed, it would trigger a build.14:33
But your understanding seems consistent with everything i've googled14:34
ikke gooble_gobble: if you know what branch it was created from, this is trivial14:34
gooble_gobble ikke, i dont follow14:34
ikke git diff --name-only master...branch14:34
gooble_gobble right, but if I merge master into branch, then that gets all screwed up14:35
no?14:35
testing, it looks like it does find changed files that only changed on my branch14:37
https://pastebin.com/V8jaunqm14:38
ikke, any idea how it does this? I'd imagine it must then know which commits apply to the branch?14:38
thiago when you merge, it's exactly the same as deleting the branch and creating it again from that point14:40
that is to say, the comparison above compares since the last merge-base14:41
← coot left14:43
gooble_gobble hmmm14:43
they only "solution/hack" i've seen is to tag the commit when a branch is created14:44
im assuming there is no feature i can turn on and no plan to add this feature any time soon14:44
j416 rebase?14:44
instead of merge14:44
← kaartic left14:45
→ kaartic joined14:46
→ nomn joined14:47
nomn i accidentally typed `git checkout filename` when i meant branch name instead of file. what does that do?14:49
ikke it would overwrite the file with whatever is in the index (staged)14:49
← fling left14:49
→ gast0n joined14:49
thiago git checkout will have told you what it did14:49
$ git checkout Makefile14:50
Updated 0 paths from the index14:50
nomn Updated 1 path from the index14:50
the file was staged14:50
the editions are lost14:51
or, i can't see thehm14:51
→ fling joined14:53
← Ram-Z left14:57
bookworm points at switch14:58
bookworm exactly because of that ;)14:58
nomn yup got it lol14:59
rough14:59
← Shentino left14:59
→ Shentino joined15:01
nomn `git remove -v` instead of `remote -v` now... i should lay off the keyboard for a while15:04
→ vdamewood joined15:06
← vladoski left15:08
← mrME2 left15:10
→ madewokherd joined15:10
← kaiseisei left15:10
→ mrME2 joined15:11
→ Ram-Z joined15:12
← PaowZ left15:15
← mrME2 left15:15
→ PaowZ joined15:22
roboirc Yes nomn15:24
→ xuxx joined15:24
→ stuffy joined15:25
→ mrME2 joined15:29
← srinidhi left15:30
→ tyson2 joined15:34
← MajorBiscuit left15:37
← rfuentess left15:38
← mexen left15:40
← Duality left15:42
← stuffy left15:45
→ han-solo joined15:45
← Murr left15:45
→ Murr joined15:46
→ srinidhi joined15:46
→ romesrf joined15:48
← gxt left15:50
gooble_gobble j416, you were suggesting I rebase rather than merge my commits to keep the branch history clean?15:52
j416 gooble_gobble: yes15:52
gooble_gobble j416, thinking through it on paper15:53
rading through this article: https://www.atlassian.com/git/tutorials/merging-vs-rebasing15:53
j416 if your branch is long-lived it may prove tricky15:53
→ gxt joined15:53
j416 if not, it's often a good choice15:53
← fling left15:54
→ fling joined15:55
← mrME2 left15:57
← aduialthin[m] left16:00
← Shentino left16:02
→ Shentino joined16:02
← john_johnk left16:03
gooble_gobble this post seems to do what i need: https://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git16:03
j416, but i think you and ikke agreed that revlist may not work in all situations16:03
→ wootehfoot joined16:05
gooble_gobble i think the git gc will "cleanup" and remove data from the repo after 90 days16:05
ikke Yes, mostly due to the reflog entries expiring after 90 days16:05
j416 nod16:06
→ kix joined16:06
saroy → bytehackr16:07
→ mrME2 joined16:07
← madewokherd left16:08
← Techcable left16:11
gooble_gobble help me understand how these entries work... like on my gitlab server... is gitlab removing them or is it once ive cloned the git client removes them and then pushes which tells gitlab to remove16:13
wonderingif i can jsut tell gitlab to never expire and keep all16:13
← coaxing left16:13
gooble_gobble that ways the command always works16:13
→ coaxing joined16:14
imMute the reflog is local to the repository. it's not shared between remotes16:14
gooble_gobble imMute, so if I cloned, the reflog command wouldnt work?16:15
← rgrinberg left16:15
imMute each clone has it's own reflog, which is not shared with any other clone/remote.16:16
gooble_gobble imMute, so is the reflog "built"? Like if i clone an old repo (commit history took place +90 days ago), would my client be able to run the reflog commands and see events or would the automagically get GC'd?16:17
imMute no. because a fresh clone would make it's own reflog that would having nothing in it16:17
j416 the reflogs are temporary, and per-repo.16:18
imMute the reflog is basically a history of what git is doing internally. like your shell's history buffer (pretend it's not written to disk)16:18
← rwp left16:19
gooble_gobble imMute, so when you said no, you were saying "no, reflog will not work in that case"16:19
imMute gooble_gobble: correct.16:20
gooble_gobble if the commits were younger than 90 days... it would work?16:20
imMute no16:21
because the reflog on whatever clone made the branch is not shared to the remote or any other clone16:21
that information only exists in that one clone16:21
← vysn left16:23
← kaartic left16:26
→ junktext joined16:28
← kix left16:28
← dionysus69 left16:29
OnlineCop I've modified a couple dozen files with lines starting with whitespace followed by "///..." that I want to add to the index. I want to exclude other changes to the files, however. Will I need to `git add --interactive --patch` and go through each file manually, or is there a different/faster/more automated way I could do this?16:29
I'd be fine passing the changes to a .patch file and then removing lines that don't match, but I don't understand how the +++ and --- lines work properly, and don't know if I can automate that correctly.16:30
→ carl--- joined16:30
→ vicfred joined16:32
gooble_gobble imMute, i just cloned a repo into a new directory and it looks like the reflog command is working. So based on whatyou and j416 are saying, i am guessing the client rebuilt the reflog info?16:32
ie. how was the command able to run if the info wasnt shared between the server/client?16:32
imMute which command?16:34
← romesrf left16:34
gooble_gobble diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | head -116:35
imMute I don't think that's using the reflog.16:35
j416 gooble_gobble: it didn't copy the reflog; that's a new reflog16:35
gooble_gobble from this article: https://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git16:35
j416 also rev-list is not reflog16:36
gooble_gobble j416, imMute, my mistake, I thought it WAS reflog16:36
ok. then this solution should work for my needs then16:36
← carl--- left16:37
→ madewokherd joined16:42
← enkeyz left16:43
→ enkeyz joined16:44
→ Thanatermesis joined16:44
← enkeyz left16:47
→ enkeyz joined16:47
← wootehfoot left16:49
→ coot joined16:50
→ squirrel joined16:51
→ dionysus69 joined16:56
→ romesrf joined16:59
← jlc left17:01
→ Betal joined17:03
→ duderonomy joined17:05
← led_belly left17:08
← tyson2 left17:09
→ DF32 joined17:09
→ rgrinberg joined17:10
← dionysus69 left17:11
← mrME2 left17:12
→ mrME2 joined17:14
→ TomyLobo joined17:16
→ led_belly joined17:18
→ mrMe joined17:18
→ Sasazuka joined17:18
← mrME2 left17:18
← TomyWork left17:19
← iomari891 left17:23
← mrMe left17:24
→ great_taste joined17:24
→ mrMe joined17:27
→ kenanmarasli joined17:27
← wakeup left17:28
← rgrinberg left17:29
← romesrf left17:29
→ ibrahim_ joined17:31
→ rgrinberg joined17:31
← ibrahim left17:33
← mitrokov left17:34
→ jlc joined17:34
→ mitrokov joined17:35
→ rwp joined17:35
← rgrinberg left17:36
→ carl--- joined17:36
→ kix joined17:37
gooble_gobble anyone know off the top of their head if git diff is inclusive or exclusive17:39
cant find it in manpage17:40
j416 of what17:41
gooble_gobble like if i run a: git diff --name-only "${COMMIT_HASH}" HEAD17:42
lets say that the commit for COMMIT_HASH is the only place i modified file X17:42
will the diff command show file X in the output17:42
j416 it compares the state of those two.17:42
gooble_gobble so to understand that X changed, I would want to diff the previous commit and head17:43
j416 commits are states17:43
yes.17:43
gooble_gobble j416, gotcha... thinking about them as "states" makes it much clearer17:43
← mthall left17:43
j416 they _are_ states; it's not just a way of thinking17:44
each commit records the entire state of your files at that point17:44
rewt out of curiosity, how were you thinking of them? as: each commit is a "set of diffs", and `git diff` combines them and shows them as one big diff?17:45
← Sasazuka left17:46
→ mthall joined17:48
→ Sasazuka joined17:50
osse Many version control systems actually store a commit has some form of patch against the previous commit. Eg. svn17:50
→ tyson2 joined17:50
osse *as some17:50
← xuxx left17:51
→ john_johnk joined17:52
← srinidhi left17:52
→ romesrf joined17:56
gooble_gobble rewt, as osse said, I was thinking about a commit as a patch against the previous commit18:03
← kix left18:03
gooble_gobble not a full copy ofthe data at that point in time18:03
→ raindrop joined18:04
← mitrokov left18:08
→ mrME1 joined18:08
→ mitrokov joined18:08
→ bob518 joined18:09
→ causasui joined18:09
← mthall left18:10
← mrMe left18:10
→ mthall joined18:12
→ srinidhi joined18:12
← mrME1 left18:15
→ mrME1 joined18:16
→ kix joined18:18
→ mrME2 joined18:18
← srinidhi left18:19
← mrME2 left18:20
→ mrME2 joined18:20
→ stuffy joined18:20
osse gooble_gobble: Weeell it's exactly a *copy* :P Only the files that are different are stored separately.18:21
← Betal left18:21
osse Think of a commit as a bunch of hardlinks18:21
Ish kinda somewhat18:21
← mrME1 left18:21
← john_johnk left18:22
→ wakeup joined18:22
→ fattredd joined18:23
→ mrMe joined18:23
← mrME2 left18:24
→ karabaja4 joined18:26
→ mrME1 joined18:26
→ rgrinberg joined18:27
← bytehackr left18:27
← mrMe left18:29
← daru left18:34
← PaowZ left18:34
→ PaowZ joined18:35
← vicfred left18:36
← roadie` left18:36
← causasui left18:37
← han-solo left18:38
← mrME1 left18:42
→ mrME1 joined18:43
→ srinidhi joined18:46
→ mrME2 joined18:46
← mrME1 left18:48
→ mrMe joined18:50
← mrME2 left18:51
← distantsail left18:52
← mrMe left18:55
→ xuxx joined18:57
→ mrMe joined18:57
← DF32 left18:58
← julian left19:01
← kix left19:02
→ julian joined19:02
→ mrME1 joined19:03
← mitrokov left19:05
← mrMe left19:05
→ mitrokov joined19:05
← mitrokov left19:06
→ mitrokov joined19:06
→ duxco joined19:07
← duxsco left19:07
duxco → duxsco19:07
← knallmaus left19:11
→ mrME2 joined19:12
← mrME1 left19:13
← junktext left19:15
→ junktext joined19:16
← vitali64 left19:16
→ Gustavo6046 joined19:17
← wakeup left19:17
← duderonomy left19:18
← carl--- left19:19
← mrME2 left19:19
→ mrME2 joined19:20
→ m0viefreak joined19:20
← bob518 left19:26
← szkl left19:28
← tyson2 left19:28
→ Knowsin joined19:30
→ xkuru joined19:30
→ tealtabbycat joined19:30
← Murr left19:45
→ Murr joined19:46
← splud left19:55
← PaowZ left19:57
→ PaowZ joined19:57
← tealtabbycat left20:00
← coot left20:03
← stuffy left20:05
← vdamewood left20:06
← elastic_dog left20:07
→ splud joined20:09
→ john_johnk joined20:09
← BrianBlaze left20:12
→ elastic_dog joined20:13
→ vdamewood joined20:14
← palasso left20:17
→ palasso joined20:20
→ littlebobeep joined20:22
← FinnElija left20:27
→ FinnElija joined20:28
← littlebobeep left20:29
→ tyson2 joined20:29
→ littlebobeep joined20:30
← Vonter left20:34
← kenanmarasli left20:35
→ tealtabbycat joined20:40
← tealtabbycat left20:43
← zer0bitz left20:44
← otisolsen70 left20:45
→ BrianBlaze joined20:47
← littlebobeep left20:48
← epony left20:54
← fling left20:59
→ fling joined20:59
nightstrike how do I abort a merge like I can abort a rebase?21:00
ikke git merge --abort21:00
nightstrike ikke: fatal: 'merge' is not possible because you have unmerged files.21:00
ikke are you in a conflicted merge state?21:01
nightstrike yeah21:01
ikke what does git status tell21:01
nightstrike that's why I want to abort21:01
→ famicom_guy joined21:01
nightstrike when you have conflicts while doing a rebase, you can just abort and have everything go back to normal21:02
ikke nightstrike: well, similar with merging21:02
nightstrike then you can try again21:02
apparently not similar enough :)21:02
ikke What does git status return?21:03
nightstrike it lists a bunch of files "to be committed" and others as "unmerged paths" (the ones with conflicts)21:03
well the one with conflicts21:03
resolving a conflict before aborting seems...... dumb21:04
ikke it's not required21:04
but the message says21:04
"'merge' is not possible because you have unmerged files. "21:04
so it somehow interprets that you want to merge21:05
nightstrike Right, well I tried a merge, the merge failed, I can't resolve the conflicts, so I want to abort21:05
ikke are you sure you specify '--abort' and not some m-dash or something similar?21:05
← raindrop left21:05
→ vicfred joined21:05
nightstrike I typed it, I didn't copy/paste it21:05
in fact, I tried --abort before asking21:05
ikke what version of git?21:06
nightstrike for the record, there's no --abort option in 'man git-merge'21:06
gitinfo the git-merge manpage is available at https://gitirc.eu/git-merge.html21:06
nightstrike 1.7.121:06
ikke oh, that's quite ancient21:07
osse git reset --hard does the needful I think?21:08
nightstrike https://stackoverflow.com/a/2534968 looks like this is my answer21:08
merge abort was added in 1.7.421:08
that SO answer says to do git reset --merge21:08
ikke was added in 1.7.421:09
yea21:09
nightstrike I have no idea what the difference is between reset merge and reset hard21:09
but I'll try the merge21:09
....and it appeared to work21:09
I have yet to do anything with git and think "man, I love this tool" :(21:09
ikke nightstrike: it does not help that you use such an ancient version21:10
← skapata left21:12
← chexum left21:18
→ chexum joined21:19
→ jazzy joined21:20
← mthall left21:21
← madewokherd left21:24
← rgrinberg left21:29
← gh34 left21:32
→ hbautista_ joined21:34
→ cliluw joined21:36
← feriman left21:36
← fattredd left21:37
→ caveman joined21:42
← tyson2 left21:47
→ madewokherd joined21:49
← vdamewood left21:53
← xuxx left21:53
→ Yruama joined21:53
→ vdamewood joined21:54
← PaowZ left21:57
→ PaowZ joined21:57
← john_johnk left21:59
← squirrel left22:00
→ dionysus69 joined22:03
← mitrokov left22:06
← PaowZ left22:13
→ m__ joined22:19
→ littlebobeep joined22:19
← coaxing left22:19
← m_ left22:22
← dionysus69 left22:24
← vdamewood left22:25
← toulene left22:28
← EvilDMP left22:38
← palasso left22:40
→ toluene joined22:41
← caveman left22:42
← srinidhi left22:43
← Sasazuka left22:45
→ Sasazuka joined22:46
→ clf059 joined22:48
→ jaket joined22:52
← romesrf left22:57
← gas51627 left22:57
← jaket left23:00
→ tealtabbycat joined23:00
← tealtabbycat left23:03
← sa0 left23:09
→ sa0 joined23:11
← tulpa_ left23:15
← sa0 left23:16
← Yruama left23:21
← enkeyz left23:25
→ tealtabbycat joined23:32
← wirv left23:37
← tealtabbycat left23:41
→ chenqisu1 joined23:43
← Sasazuka left23:44
← m0viefreak left23:50
→ n0s joined23:50
→ blahboybaz joined23:51
← n0s left23:52
← clf059 left23:52
blahboybaz I'm trying to remember.. 1: I can rebase a single commit onto another branch? 2: If I do that then the only thing that ends up on the targed branch is the single commit (without all the history leading up to it)?23:53
← gurkenglas left23:56
another| man git cherry-pick23:59
gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html23:59

Logs Search ←Prev date Next date→ Channels Documentation