IRCloggy #git 2018-02-24

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-02-24

← weez17 left00:00
→ weez17 joined00:00
gitinfo set mode: +v00:00
brwoods question, let's say I'm on branch X and go a git pull, both branch X and Y are updated from a remote origin. When I do a git checkout Y, is Y up to date with the origin Y?00:01
go do a git pull*00:01
→ deehuck joined00:02
← weijin left00:02
← black_13 left00:03
← finalbeta1 left00:04
rafasc brwoods: !pull00:05
gitinfo brwoods: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/00:05
← yobop_ left00:06
brwoods ok a terminal only system so I can't read the link but I guess I'll read it later00:06
rafasc pull is fetch and merge, the fetch part will update all your remote branches (the things named remote/branch)00:06
→ Nokurn joined00:07
brwoods rgr, thanks a ton =]00:07
← konsolebox left00:07
← jwmann left00:08
→ konsolebox joined00:08
← venmx left00:08
← bolovanos left00:08
→ weijin joined00:08
rafasc and merge defaults to upstream if no arguments, so what you said I believe is correct.00:09
← Nokurn left00:09
→ zerow joined00:12
→ applecru1 joined00:12
← applecrumble left00:12
→ Nokurn joined00:13
← threenuc left00:13
← weijin left00:13
← wgyin_home left00:14
→ dviola joined00:15
← ioc_ left00:15
← BlessJah left00:17
← zerow left00:18
← sim590 left00:21
← pionen left00:22
→ venmx joined00:22
← GoBear left00:25
→ sim590 joined00:27
→ banisterfiend joined00:28
← mlopezviedma left00:28
→ weijin joined00:28
→ mlopezviedma_ joined00:28
→ nimomo joined00:28
← afuentes left00:29
→ BlessJah joined00:29
→ dendazen joined00:32
← weijin left00:32
← nimomo left00:33
← dsdeiz left00:34
→ cfoch_ joined00:35
← i336 left00:35
← banisterfiend left00:37
→ i336_ joined00:37
← sweatsuit left00:37
→ banisterfiend joined00:38
← \void left00:38
→ safe joined00:39
→ nimomo joined00:39
→ zerow joined00:40
← jottr_ left00:40
← dendazen left00:40
→ sanscoeu_ joined00:41
→ weijin joined00:41
← venmx left00:41
← nimomo left00:43
← sanscoeur left00:44
← sanscoeu_ left00:45
← weijin left00:46
← Nokurn left00:46
→ venmx joined00:46
→ cqi joined00:47
→ nimomo joined00:49
← thiago left00:51
→ Some_Person joined00:52
ephemer0l → GeneralDiscourse00:52
← venmx left00:53
← nimomo left00:54
→ dsdeiz joined00:55
← dsdeiz left00:55
→ dsdeiz joined00:55
← alezandro left00:55
← Amanas left00:58
← jrnieder left00:58
→ nimomo joined00:59
← zerow left00:59
→ zerow joined01:00
→ alezandro joined01:00
← publio left01:02
← al-damiri left01:02
← zerow left01:02
→ zerow joined01:03
← kneeki left01:03
→ weijin joined01:04
← Cabanossi left01:04
← nimomo left01:04
→ Cabanossi joined01:05
← EvilPenguin left01:07
← zerow left01:07
← King_Hual left01:07
→ jesst joined01:08
← weijin left01:08
← jesst left01:09
→ nimomo joined01:09
← dpyro left01:10
→ dpyro joined01:12
← nimomo left01:14
→ adiabatic joined01:14
→ jottr_ joined01:14
→ zerow joined01:14
← Guest21 left01:15
→ Evoken joined01:15
→ nimomo joined01:18
← jottr_ left01:18
→ wgyin_inginim joined01:18
← shinnya left01:19
→ jottr_ joined01:20
← zerow left01:20
adiabatic Hi, I have a bunch of commits that I've made to the dashes-and-colons branch, all of which I've pushed to origin, one at a time. The maintainer of the project I've made a pull request to would like me to squash it all into one commit onto the dashes-and-colons branch. I checked Git Flight Rules and it said to do `git merge --squash --no-commit dashes-and-colons`, but git said there's nothing to squash because everything's up to date. What sho01:20
uld I do instead?01:20
→ weijin joined01:21
→ zerow joined01:21
← topdownjimmy left01:22
← nimomo left01:23
→ topdownjimmy joined01:23
→ durham_ joined01:23
nedbat adiabatic: you use rebase to squash the commits.01:24
← weijin left01:25
← zerow left01:26
→ wgyin_inginim_qd joined01:26
← wgyin_inginim_qd left01:26
→ wgyin_qd joined01:26
← jottr_ left01:26
← durham left01:27
→ nimomo joined01:27
← mborgard left01:27
← durham_ left01:28
← wgyin_inginim left01:28
← hunterlabs left01:29
→ fx250_ joined01:30
← thxffo left01:32
← nimomo left01:32
← fx250__ left01:33
→ yobop joined01:36
→ hunterlabs joined01:37
adiabatic OK, I did that, but then when I tried to push all that to the branch I got a "couldn't push" error. Let me do it again…01:37
→ fx250__ joined01:38
← Mike11 left01:38
nedbat adiabatic: you need push -f01:38
adiabatic ty01:38
→ nimomo joined01:40
← fx250_ left01:40
→ thiago joined01:40
← konsolebox left01:41
→ figurehe4d joined01:41
← yobop left01:41
→ yobop__ joined01:41
→ thxffo joined01:42
→ sasheto joined01:42
→ konsolebox joined01:42
→ wadeyi_qd joined01:42
← Mattiaslndstrm left01:42
← nimomo left01:45
→ spacesuitdiver joined01:46
← VoradorPT left01:46
→ mlopezviedma joined01:48
← philosaur left01:48
→ nimomo joined01:49
→ philosaur joined01:50
← mlopezviedma_ left01:50
← wgyin_qd left01:50
← wadeyi_qd left01:50
← yobop__ left01:51
→ wadeyi_qd joined01:51
→ weijin joined01:52
← nimomo left01:56
← menip left01:57
← weijin left01:57
→ yobop_ joined02:00
→ jottr_ joined02:01
← RougeR left02:01
← spacesuitdiver left02:01
← alezandro left02:02
→ orbyt_ joined02:02
→ parsnip1 joined02:03
parsnip1 → parsnip02:03
← yobop_ left02:06
← jottr_ left02:06
← exotime left02:08
→ weijin joined02:08
← anjen left02:09
→ exotime joined02:10
→ anjen joined02:10
← mlopezviedma left02:12
← adiabatic left02:12
→ mborgard joined02:12
← weijin left02:13
← figurehe4d left02:14
← robin1 left02:14
→ mlopezviedma joined02:15
→ weijin joined02:15
→ kadoban joined02:16
← weijin left02:18
→ weijin joined02:18
→ toothe joined02:18
toothe Are there any tools that will search through a git repository for strings?02:18
← CodeSlingerPaul left02:19
← _ADN_ left02:20
→ jottr_ joined02:22
← xcm left02:22
kadoban toothe: git grep, and git log -S and git log -G02:22
→ xcm joined02:22
→ finalbeta joined02:23
→ djapo joined02:24
→ xaxxon joined02:26
← wadeyi_qd left02:27
→ wadeyi_qd joined02:27
← jottr_ left02:27
→ Symfony3 joined02:28
→ lessless joined02:29
← xcm left02:29
→ xcm joined02:30
← anjen left02:30
← wadeyi_qd left02:30
← yaewa left02:31
← monokrome left02:31
→ zerow joined02:32
→ Thominus joined02:33
← Symfony3 left02:34
→ wadeyi_qd joined02:34
← zerow left02:37
← xcm left02:39
→ xcm joined02:40
← djapo left02:41
→ nimomo joined02:42
← ilbot3 left02:45
← nimomo left02:47
← nephyrin left02:49
← goatish left02:49
← energizer left02:55
→ cagmz joined02:56
→ energizer joined02:56
→ nimomo joined02:57
→ ilbot3 joined02:57
→ alezandro joined02:59
→ cdg joined03:00
← rafasc left03:00
← nimomo left03:01
→ sweatsuit joined03:04
← cdg left03:04
→ nimomo joined03:05
→ chaosruler joined03:08
→ surfist joined03:09
← ZyX-I left03:10
← errr left03:10
← energizer left03:10
← nimomo left03:11
→ nimomo joined03:13
← comptroller left03:14
← nimomo left03:17
→ govg joined03:19
→ Kitana joined03:20
→ lagothri1 joined03:21
← Sasazuka left03:21
→ jottr_ joined03:22
→ chachasmooth_ joined03:23
← chachasmooth left03:24
← lagothrix left03:24
← deehuck left03:24
→ deehuck joined03:25
→ nimomo joined03:25
→ comptroller joined03:26
← applecru1 left03:27
→ Raed|Laptop joined03:28
← jottr_ left03:29
← netj left03:29
→ metalinjection joined03:30
← nimomo left03:30
→ netj joined03:30
← Kitana left03:30
→ wgyin_inginim joined03:30
← wadeyi_qd left03:30
→ canvon_ joined03:30
← canvon left03:30
← metalinjection left03:33
→ nimomo joined03:33
→ energizer joined03:35
← Praxi left03:35
← nimomo left03:38
← sentriz left03:42
→ sentriz joined03:43
← minionofgozer_ left03:45
→ minionofgozer_ joined03:45
→ nimomo joined03:46
← lafleurdubien left03:50
← nimomo left03:51
→ joshbright joined03:52
→ hph^ joined03:54
← minionofgozer_ left03:54
→ yobop joined03:54
→ nimomo joined03:56
→ shinnya joined03:57
← deehuck left03:57
→ deehuck joined03:58
← Noldorin left03:58
→ minionofgozer_ joined03:59
← piggah_ left04:00
← nimomo left04:02
→ cagomez joined04:05
→ nimomo joined04:07
← weijin left04:10
← ianbrandt left04:10
→ Lyqyd joined04:11
← nimomo left04:12
← zulutango left04:12
← ScioMin left04:13
→ zulutango joined04:13
← hph^ left04:14
→ BlueGrit joined04:16
→ ianbrandt joined04:16
← BlueGrit left04:18
← fassl left04:21
→ nimomo joined04:22
← cagomez left04:25
← nimomo left04:26
→ jottr_ joined04:26
← mborgard left04:27
→ weijin joined04:28
→ Bobdude joined04:31
→ nimomo joined04:32
← weijin left04:32
→ zerow joined04:33
← banisterfiend left04:33
← deehuck left04:34
← jottr_ left04:36
← xcm left04:37
→ xcm joined04:37
← zerow left04:37
← nimomo left04:38
→ Kitana joined04:39
→ jimi_ joined04:39
→ nimomo joined04:40
→ weijin joined04:41
→ figurehe4d joined04:41
→ piggah joined04:42
← nimomo left04:45
← weijin left04:45
← xcm left04:46
→ xcm joined04:47
→ weijin joined04:47
→ nimomo joined04:48
← Kitana left04:50
→ kdragon joined04:50
→ Kitana joined04:51
← nimomo left04:53
← Cabanossi left04:54
→ nimomo joined04:56
→ Cabanossi joined04:57
← kadoban left04:58
→ Darcidride__ joined05:01
← Darcidride left05:02
→ dysfigured joined05:03
← pks left05:03
← nimomo left05:04
→ pks joined05:04
← alezandro left05:05
→ salman joined05:05
← xcm left05:06
→ beautifulmind joined05:06
→ xcm joined05:07
← Kitana left05:07
→ nimomo joined05:09
← beautifulmind left05:12
→ beautifulmind joined05:12
← nimomo left05:13
← beautifulmind left05:15
→ nimomo joined05:15
← ldiamond_ left05:18
→ ShapeShifter499 joined05:18
← weijin left05:18
→ beautifulmind joined05:20
← beautifulmind left05:20
← nimomo left05:20
→ mostlybadfly joined05:21
← konsolebox left05:22
← xcm left05:23
→ xcm joined05:24
→ nimomo joined05:25
→ ryanjohnstonyyc joined05:28
→ konsolebox joined05:28
← salman left05:29
← nimomo left05:29
← M6HZ left05:29
→ jottr_ joined05:29
→ nimomo joined05:31
← jimi_ left05:31
→ nephyrin joined05:32
← jottr_ left05:35
← nimomo left05:35
← cagmz left05:37
→ nimomo joined05:42
← sweatsuit left05:42
→ sweatsuit joined05:45
← nimomo left05:46
← dviola left05:48
→ weijin joined05:49
← weijin left05:50
→ weijin joined05:50
← energizer left05:52
→ nimomo joined05:52
→ banisterfiend joined05:52
← Puffball left05:53
→ wilbert joined05:55
→ metalinjection joined05:55
← banisterfiend left05:55
← metalinjection left05:56
← nimomo left05:57
→ wilbert_ joined05:58
← wilbert left05:59
→ Mattiaslndstrm joined06:00
McKraken → McKraken_zzzzz06:03
← cliluw left06:03
← Mattiaslndstrm left06:04
← comptroller left06:06
→ cliluw joined06:06
→ nimomo joined06:06
→ learning joined06:10
← nimomo left06:11
→ beautifulmind joined06:13
→ nimomo joined06:13
← d^sh_ left06:15
→ d^sh joined06:16
← nimomo left06:18
← beautifulmind left06:18
← uptime left06:18
← orbyt_ left06:21
→ orbyt_ joined06:22
→ nimomo joined06:23
→ comptroller joined06:25
← IanLiu left06:26
← nimomo left06:28
→ jottr_ joined06:29
→ nimomo joined06:31
→ Arcaelyx_ joined06:32
→ zerow joined06:34
← jottr_ left06:35
← Arcaelyx left06:35
→ kfoonamalik joined06:35
← nimomo left06:35
← zerow left06:38
→ fekir joined06:40
→ MoziM joined06:40
← cfoch_ left06:44
→ nimomo joined06:46
→ DocRedfish joined06:48
→ wilbert joined06:51
← nimomo left06:51
← Sonarpulse left06:51
→ borkr joined06:51
← piggah left06:52
→ piggah_ joined06:52
← wilbert left06:52
← wilbert_ left06:53
← diogenese left06:53
→ wadeyi_qd joined06:55
← wgyin_inginim left06:55
→ nimomo joined06:56
→ Arcaelyx joined06:57
← thiago left06:59
→ schleppel joined06:59
← Arcaelyx_ left06:59
→ wgyin_inginim joined06:59
← dpyro left07:00
← xaxxon left07:00
→ energizer joined07:00
← nimomo left07:00
← wadeyi_qd left07:00
← Lyqyd left07:03
← yobop left07:03
→ nimomo joined07:08
← netj left07:13
→ netj joined07:14
← kdragon left07:16
→ kdragon joined07:16
← nimomo left07:18
→ dege joined07:24
← piggah_ left07:26
→ jottr_ joined07:27
→ Green_Crystal joined07:27
→ LocaMocha joined07:29
→ veegee joined07:31
→ nimomo joined07:32
← jottr_ left07:33
→ venmx joined07:35
→ alezandro joined07:37
← nimomo left07:37
→ leeN joined07:39
→ Kitana joined07:41
← alezandro left07:41
→ nimomo joined07:42
← Bobdude left07:44
← Kitana left07:45
→ Kitana joined07:45
→ Sonarpulse joined07:46
→ explodes joined07:47
← nimomo left07:47
← Arcaelyx left07:47
→ imack joined07:47
← Kitana left07:49
→ staafl joined07:49
→ nimomo joined07:49
→ dre_ joined07:50
← peepsalot left07:50
→ Kitana joined07:50
← leeN left07:51
← venmx left07:53
→ dreiss joined07:53
← Kitana left07:53
← nimomo left07:54
→ SteffanW joined07:54
← kfoonamalik left07:54
AciD` why does doing `git checkout origin/next` result in a detached head state?07:55
→ dpyro joined07:56
→ Kitana joined07:56
→ nimomo joined07:57
_ikke_ AciD`: Because you are checking out a non-branch07:57
AciD`: origin/next is a remote tracking branch07:57
AciD` you mean I should have git pull my `origin/master` and `origin/next` branch locally, THEN merge `master` into `next` locally, then push the `next` branch onto `origin/next`?07:58
(I wanted to merge master into next)07:59
_ikke_ AciD`: try git checkout next07:59
← Kitana left07:59
← Sonarpulse left07:59
_ikke_ this should automatically create a local branch next tracking origin/next07:59
AciD` well, not now because somehow instead of doing the correct thing, I finished the merge and committed the whole thing08:00
now I have a commit on HEAD only08:00
_ikke_ ah ok08:00
AciD` when I do `git status`, I get `detached head from origin/next`08:00
_ikke_ right, you can just ignore that and redo merge08:01
so checkout next08:01
← nimomo left08:01
AciD` ok08:02
← fekir left08:02
AciD` well08:02
my local next branch is waaay outdated by the origin one08:03
→ peepsalot joined08:03
_ikke_ do you care about any local changes on the next branch?08:03
AciD` nope, I 'fixed' that by doing `git branch --set-upstream-to origin/next next`, then `git pull`08:04
_ikke_ ok08:04
that'll work08:04
AciD` (I could have sworn I already set that upstream branch..oh well)08:04
→ nimomo joined08:05
→ llorephie joined08:05
AciD` ok, so I have both my local master and next branch up to date08:05
Am I right thinking I should now merge `master` into `next` locally, then push the local `next` branch onto `origin/next`?08:06
and that would prevent any detached head problem?08:06
_ikke_ yes08:06
you only get a detached HEAD when you checkout things like remote tracking branches, commits and tags08:06
AciD` which I always did until now08:06
fool I was08:07
_ikke_ AciD`: fyi, origin/next is still local08:07
AciD` what?08:07
how?08:07
_ikke_ AciD`: it's a branch to track what you fetched or pushed last to the remote08:07
!rtb08:07
gitinfo [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'08:07
→ rokups joined08:08
→ MACscr joined08:08
AciD` ok08:08
→ Kitana joined08:09
→ xaxxon joined08:09
← nowhere_man left08:09
← finalbeta left08:10
→ nowhere_man joined08:10
→ finalbeta joined08:10
← mostlybadfly left08:11
← Kitana left08:11
← nimomo left08:14
← dreiss left08:16
AciD` I'm not sure how I managed to make such a mess in my repo. I think the last (and first) rebase I did was terrible08:16
I have duplicated commits from last august to now :/08:16
→ diogenese joined08:17
_ikke_ AciD`: did you do a pull after a rebase?08:19
AciD` "Your branch is ahead of 'origin/next' by 93 commits." welp08:19
I don't recall08:19
_ikke_ AciD`: that is just a matter of pushing08:19
AciD` I won't push that08:20
→ Nudist69-M joined08:20
AciD` not in this state if I can fix it08:20
_ikke_ ure08:20
sure08:20
AciD` because there clearly not have been 93 commits between next and master on origin08:20
perhaps 10, max08:20
_ikke_ ⟹ does this looks bad to you? https://github.com/autoNumeric/autoNumeric/commits/master08:23
_ikke_ let me check08:24
AciD` on february 12th, `next` was merged into `master`, which led to lots of duplicated commits08:25
→ jottr_ joined08:26
_ikke_ I don't see that from that repo08:26
→ zhang joined08:27
← MattMaker left08:27
→ goatish joined08:27
← matumbo`` left08:28
AciD` well08:28
← imack left08:29
← llorephie left08:30
AciD` now my local `next` branch has 93 more commits ahead of `origin/next`, which must be wrong since the last commit I did on `origin/next` date february 11th08:31
and since then the rebase on `master` duplicated the commits from `next` onto `master`08:31
← jottr_ left08:32
_ikke_ AciD`: I don't see you next branch08:32
← zhang left08:32
_ikke_ oh, wait, I do08:32
AciD` Now somehow since I pulled the changes from `origin/next` to my local `next` branch, the did a `git merge` from master onto next, I have those duplicated commits onto next too now! >_<08:32
it's in the dropdown in the upper left08:32
_ikke_ I cloned your repo locally08:33
AciD` thanks for your time08:33
I made a mess with rebase, right? :/08:34
← xaxxon left08:34
← kgrimes left08:34
→ zerow joined08:34
_ikke_ So yeah, I do see duplicated commits08:34
AciD` what would be the best path to clear the current state, given I cannot rewrite history?08:35
_ikke_ Nothing much08:35
← Green_Crystal left08:35
← dege left08:35
AciD` so you would commit those 93 additional duplicated commits to `origin/next` too?08:36
→ Kitana joined08:38
← zerow left08:39
← Kitana left08:39
_ikke_ So they *are* already in next, right08:39
AciD` yes they are08:40
← Darcidride__ left08:40
AciD` it seems weird to me that git needs to duplicated those, since they first were replayed on `master` from `next`08:41
_ikke_ so unless you can rewrite next, they will remain part of history08:41
git doesn't need to duplicate commits08:41
it happened due to something you did08:41
AciD` yes, unfortunately08:41
right now the state is meh on the public repo, but if I were to push my master->next merge, it would be even more horrible. When you say 'rewrite' next, what do you have in mind?08:42
would it be possible to modify the current `origin/next` branch, by just having a new single commit `Merging v4.2.0 into next` on it?08:45
← Doginal left08:46
← cqi left08:47
→ cqi joined08:48
_ikke_ the first commit I see on next is 'Merge v4.0.3 from master into next'08:49
→ opalepatrick joined08:50
_ikke_ AciD`: ok, try to run git cherry master origin/next08:50
(it's just an informational command)08:51
AciD` ok08:52
_ikke_ So would it be correct to assume that there are only 4 unique commits in next?08:52
AciD` when I run git cherry master origin/next I get a looong list of hashes08:52
_ikke_ either prefixed with a + or a -08:53
AciD` most by -, and 3 by +08:53
_ikke_ I count 408:53
AciD` ah yes, 4, my bad08:53
what are those?08:54
_ikke_ Those are commits git cherry think are unique in next08:54
AciD` all the commits that are on master, but not on next?08:54
→ kes joined08:54
← Raed|Laptop left08:55
→ imack joined08:55
AciD` I have 59 commits shown in total in that list08:55
_ikke_ right08:55
So of these 59 commits, git cherry sees only 4 that are unique in next (so not already in master)08:56
AciD` ok08:57
(I was reading the git cherry manpage ;x)08:57
← mikemcowie left08:58
_ikke_ git cherry looks at the changes each commit introduces08:58
→ zerow joined08:58
→ mikemcowie joined08:58
_ikke_ so it can see duplicate commits even if the commit hash changed (due to different parent / comitted)08:58
AciD` well, that bothers me08:59
← hurricanehrndz left09:00
→ Kitana joined09:00
→ Tobbi joined09:00
AciD` since most of those 59-4=55 commits on master are coming from next originally09:00
_ikke_ right09:00
AciD` I'm not sure why git does not pick that up09:00
_ikke_ so you somehow (probably due to bad rebase+merge)09:00
caused those commits to be in master already09:01
and pushed it09:01
← Kitana left09:01
← mikemcowie left09:01
_ikke_ So the only way to properly fix it would be to rewrite master09:01
AciD`: Pick that up in what way?09:02
← orbyt_ left09:02
→ widp joined09:03
AciD` well, git cherry sees the duplicates according to its documentation, so I was thinking it should see that the commit on master already happened on next, and would allow me to merge master onto next by only having to replay the commits done only on master09:04
→ hurricanehrndz joined09:04
AciD` anyway, while it is tempting to clean the history, I read you should never do that on public repo09:04
_ikke_ In git it's perfectly fine to have a commit in one branch, and then duplicate it (for example with cherry-pick) to backport fixes in a stable branch09:04
AciD`: Are others working on that repo?09:04
AciD` yes09:04
sometimes, but not since I made that faulty rebase09:05
none that I am aware of at least09:05
_ikke_ You have to decide09:07
But, when you merge, git cannot just decide to drop commits, even if they are duplicate09:08
git rebase can do that though09:08
AciD` hum09:08
since my last rebase generated that mess, I'm not really eager to use it again ;x09:08
but the mess is there, and I need to clean it09:08
I'm ok rewriting the history09:09
_ikke_ But you also already created tags with those commits09:10
AciD` yes09:11
and with each tag, a published npm version09:11
_ikke_ Wouldn't it be better to just drop the next branch, except for the commits that are still missing?09:12
AciD` how?09:12
← joshbright left09:12
AciD` just delete it?09:12
→ joshbright joined09:12
_ikke_ recreate it at the point where you want to start09:13
← joshbright left09:13
_ikke_ and cherry-pick missing commits (in as far they are still relevant)09:13
→ theoceaniscool joined09:14
_ikke_ I'm afk for a bit09:16
→ piggah joined09:17
→ _ADN_ joined09:22
→ mohabaks joined09:22
← figurehe4d left09:23
→ jottr_ joined09:27
← ferdna left09:29
→ YuGiOhJCJ joined09:32
→ jakogut joined09:34
← rvgate left09:36
→ rvgate joined09:36
→ theoceaniscool_ joined09:39
← theoceaniscool left09:39
← jottr_ left09:39
← sasheto left09:41
→ sasheto joined09:41
← jakogut left09:43
→ jooni joined09:43
→ jakogut joined09:44
AciD` hum, I yolo'ed the git push from my local `next` branch, and now `origin/next`....is 64 commits ahead of `master`, while the merge I did was supposed to give those two branch a single starting point09:45
AciD` sobs09:45
AciD` at this rate I'm guessing when I'll want to merge next on master, it'll once again duplicates 60+ commits..09:47
→ King_Hual joined09:47
← King_Hual left09:47
→ King_Hual joined09:47
← YuGiOhJCJ left09:48
→ YuGiOhJCJ joined09:48
← Case_Of left09:49
← fahadash left09:49
→ Case_Of joined09:50
→ gonzodark_ joined09:53
→ coco joined09:54
xcm → Guest8703209:56
← Guest87032 left09:56
→ xcm joined09:56
→ dege joined09:57
→ menip joined09:58
← jimmyrcom left09:58
← menip left09:58
← nikheizen left10:01
← YuGiOhJCJ left10:04
← staafl left10:04
→ YuGiOhJCJ joined10:04
→ nikheizen joined10:05
_ikke_ So next now contains all of master10:05
maste can now be fast-forwarded and they're equal10:05
master*10:05
← jakogut left10:06
→ jakogut joined10:07
← weijin left10:08
AciD` _ikke_ ⟹ ? When I do git status on each master and next branch, it says that everything is up to date10:15
_ikke_ up-to-date regarding to their upstream tracking branch10:16
next contains one commit (the merge) that master does not yet10:16
AciD` the plan now it to release all the minor versions on next, and the major on master10:17
_ikke_ right10:17
← lessless left10:18
← dre_ left10:18
_ikke_ AciD`: http://tpaste.us/kWE610:19
AciD` good I guess10:20
:)10:20
_ikke_ alright, nice to hear10:21
← cliluw left10:24
← cqi left10:24
→ jottr_ joined10:27
← King_Hual left10:29
→ nimomo joined10:30
→ King_Hual joined10:30
← King_Hual left10:30
→ King_Hual joined10:30
→ pbandark joined10:30
← catsup left10:31
→ catsup joined10:31
← catsup left10:32
→ catsup joined10:32
← nimomo left10:34
→ phluks joined10:34
← PaulePanter left10:36
← SteffanW left10:36
→ weijin joined10:38
← mohabaks left10:39
← wgyin_inginim left10:39
→ nimomo joined10:40
← jottr_ left10:40
→ urbanmonk joined10:40
← weijin left10:42
← phluks left10:43
← nimomo left10:44
← urbanmonk left10:45
→ PsySc0rpi0n joined10:46
→ nowhereman_ joined10:46
→ threenuc joined10:46
← PsySc0rpi0n left10:47
← safe left10:47
→ weijin joined10:48
← nowhere_man left10:48
← imack left10:52
← weijin left10:53
→ Kitana joined10:55
← chaosruler left10:55
← xcm left10:56
← alyptik left10:57
→ xcm joined10:57
← Kitana left10:57
→ alyptik joined10:58
→ RougeR joined10:58
← RougeR left10:58
→ RougeR joined10:58
← jakogut left10:58
→ jakogut joined10:59
← cdown left10:59
→ cdown joined10:59
→ Mike11 joined10:59
← konsolebox left11:00
← jakogut left11:02
← piggah left11:03
→ jakogut joined11:04
→ weijin joined11:06
← dpyro left11:07
→ konsolebox joined11:07
→ Gurkenglas joined11:13
← jakogut left11:13
→ pirocks joined11:13
→ mostlybadfly joined11:15
→ llorephie joined11:17
→ freimatz joined11:23
→ Kitana joined11:24
← Kitana left11:25
→ jottr_ joined11:29
→ chaosruler joined11:32
← xcm left11:32
← chaosruler left11:32
→ kus joined11:32
← saidelike left11:32
→ wgyin_home joined11:33
← wgyin_home left11:34
→ wadeyi_qd joined11:34
→ xcm joined11:36
← jottr_ left11:36
← Mike11 left11:40
← xcm left11:42
→ afuentes joined11:43
← konsolebox left11:44
→ xcm joined11:46
← nopacien13 left11:49
← sim590 left11:49
→ konsolebox joined11:49
← energizer left11:50
→ sim590 joined11:52
→ mohabaks joined11:52
← bobdobbs left11:56
→ bolovanos joined11:57
← konsolebox left12:02
← parsnip left12:02
→ Anja_ joined12:02
→ konsolebox joined12:03
← Anja_ left12:04
→ _borkr_ joined12:04
← nowhereman_ left12:05
→ nowhere_man joined12:05
← weijin left12:05
→ Anja_ joined12:05
← dangernoob left12:05
← borkr left12:08
→ HuskyApo_ joined12:09
→ mikecmpbll joined12:09
← freimatz left12:12
← mohabaks left12:12
← HuskyApo_ left12:14
→ jottr_ joined12:15
← jottr_ left12:15
← tunekey left12:17
← zulutango left12:18
← lohfu left12:18
→ lohfu joined12:19
→ chaosruler joined12:19
→ saidelike joined12:20
→ weijin joined12:21
→ c_dub_ joined12:24
← weijin left12:26
← dege left12:27
→ tt_ joined12:27
→ h12o joined12:28
← Thominus left12:30
→ jimi_ joined12:30
← konsolebox left12:30
→ konsolebox joined12:31
← YuGiOhJCJ left12:33
← netj left12:36
→ jnavila joined12:36
→ netj joined12:36
← Anja_ left12:36
→ weijin joined12:38
← ShapeShifter499 left12:41
← weijin left12:42
→ M6HZ joined12:43
← jnavila left12:43
← h12o left12:44
← RougeR left12:45
← kus left12:45
tkore\ → tkore12:46
← MACscr left12:47
→ vdv joined12:49
→ MACscr joined12:49
→ weijin joined12:53
← Deflate left12:53
← mikecmpbll left12:55
→ ShapeShifter499 joined12:55
← ShapeShifter499 left12:55
→ Kitana joined12:56
← weijin left12:57
← Kitana left12:59
→ ShekharReddy joined12:59
→ \void joined13:00
→ staafl joined13:00
← _borkr_ left13:02
→ h12o joined13:03
→ borkr joined13:03
← winny left13:04
→ Deflate joined13:04
← konsolebox left13:05
→ konsolebox joined13:06
← surfist left13:06
→ Kitana joined13:06
← Kitana left13:07
← h12o left13:07
→ wintrytbs joined13:08
← chaosruler left13:08
→ RougeR joined13:09
← RougeR left13:09
→ RougeR joined13:09
→ weijin joined13:10
→ h12o joined13:12
→ imack joined13:12
← weijin left13:14
→ weijin joined13:16
→ chaosruler joined13:17
← PioneerAxon_ left13:18
→ PioneerAxon joined13:18
← tt_ left13:18
← weijin left13:21
← rokups left13:24
← mostlybadfly left13:25
← h12o left13:27
← mooasaurus left13:29
→ mooasaurus joined13:29
→ rokups joined13:31
→ oxymoron93 joined13:32
→ jnavila joined13:32
→ Nizumzen joined13:33
← PioneerAxon left13:34
→ PioneerAxon joined13:34
← llorephie left13:35
→ llorephie joined13:35
→ caution joined13:36
← jimi_ left13:37
caution I have '.idea/**' in my gitignore file but i still local changes warning when i try to change branch https://pastebin.com/15KEeudK13:38
i did 'git rm --cached .idea/workspace.xml'13:38
← phinxy left13:39
caution anyone?13:41
← c_dub_ left13:42
→ Kitana joined13:42
← Gurkenglas left13:43
← Kitana left13:45
→ Kitana joined13:46
← caution left13:46
→ weijin joined13:48
← Kitana left13:48
← kostur86 left13:49
← kgz left13:49
← threenuc left13:50
← jnavila left13:50
→ Arcaelyx joined13:51
→ ZyX-I joined13:52
← weijin left13:52
← Adoray` left13:55
← bolovanos left13:55
→ Murr- joined13:55
→ Adoray` joined13:55
→ Xiti` joined13:55
→ BSabo joined13:56
← BSabo left13:56
← oxymoron93 left13:56
→ BSabo joined13:56
← BSabo left13:56
← rewt left13:56
→ rewt`` joined13:56
→ Adoray`` joined13:57
← Adoray` left13:57
rewt`` → rewt13:57
← mlopezviedma left13:57
→ mlopezviedma joined13:57
← __rob left13:58
→ __rob joined13:58
→ dfas` joined13:58
← Croepha left13:59
← peepsalot left13:59
← Kaj left13:59
← luckman212 left13:59
← Xiti left13:59
← Murr left13:59
→ peepsalot joined13:59
→ kgz joined13:59
← theoceaniscool_ left13:59
→ weijin joined13:59
→ hvxgr joined14:00
→ om-henners joined14:00
→ luckman212 joined14:01
→ Kaj joined14:01
→ robogoat joined14:01
→ Bucciarati joined14:01
→ sweatsuit_ joined14:02
→ jargan joined14:02
→ Nenadovic joined14:02
→ Amanas joined14:02
→ Kidd joined14:03
← weijin left14:04
→ Murr joined14:04
→ nephyrin` joined14:04
→ ghormoon_ joined14:04
→ Croepha joined14:05
→ Sleepy63_ joined14:05
→ heroux_ joined14:05
→ weez17_ joined14:05
→ konsolebox_ joined14:06
→ farsider355 joined14:07
← farsider355 left14:07
→ farsider355 joined14:07
→ whyme joined14:07
← farsider355 left14:07
← BucciaratiVEVO left14:07
← BSab left14:07
→ farsider355 joined14:08
← farsider355 left14:08
← shinnya left14:08
→ JoshL- joined14:08
→ Grum_ joined14:08
→ malt3 joined14:09
→ glebihan_ joined14:09
→ fxrs joined14:09
→ jwynn6_ joined14:09
→ _musl_ joined14:09
→ nielsk_ joined14:09
→ MochaLoca joined14:09
→ pks_ joined14:09
→ murr5y joined14:09
→ amosbird_ joined14:09
← Xiti` left14:09
← diogenese left14:09
← dfas left14:09
← robogoat_ left14:09
← hvxgr_ left14:09
← Sleepy63 left14:09
← om_henners left14:09
← Nudist69-M left14:09
← sweatsuit left14:09
← GeneralDiscourse left14:09
← whyme_ left14:09
← [Kid] left14:09
← Grum left14:09
Grum_ → Grum14:10
sweatsuit_ → sweatsuit14:10
← antismap left14:10
← jwynn6 left14:10
← liefer left14:10
← ghormoon left14:10
← nielsk left14:10
← tkazi left14:10
→ doug16k_ joined14:10
← konsolebox left14:10
← nikheizen left14:10
← beerdrop left14:10
← JoshL left14:10
← Murr- left14:10
← LocaMocha left14:10
← nephyrin left14:10
← pks left14:10
pks_ → pks14:10
← weez17 left14:10
← glebihan left14:10
← Eryn_1983_FL left14:10
← malt3_ left14:10
← theskillwithin left14:10
← musl_ left14:10
← andecy left14:10
← murr4y left14:10
← dcpc007 left14:10
← doug16k left14:10
← eldritch left14:10
← amosbird left14:10
← Ranhir left14:10
← heroux left14:10
← i336_ left14:10
← fxrs_ left14:10
← jast left14:10
← farsider350 left14:10
← k left14:10
heroux_ → heroux14:10
→ tkazi joined14:10
→ Ranhir joined14:10
→ antismap joined14:10
→ beerdrop joined14:10
→ theoceaniscool_ joined14:11
→ theskillwithin joined14:11
→ liefer joined14:11
→ andecy joined14:11
→ Eryn_1983_FL joined14:12
→ nikheizen joined14:12
← llorephie left14:12
← beerdrop left14:12
← HolodocPrime left14:12
→ eldritch joined14:13
→ i336_ joined14:13
→ krok joined14:14
→ holodoc joined14:14
→ wandering_vagran joined14:15
→ beerdrop joined14:15
→ phinxy joined14:15
→ diogenese joined14:16
→ dcpc007 joined14:18
← diogenese left14:18
← vdv left14:18
→ OnBrokenWings joined14:19
→ c_dub_ joined14:20
→ mikecmpbll joined14:21
cbreak remove it from tracking14:21
→ eldritch2 joined14:22
← OnBrokenWings left14:22
← eldritch left14:22
← Ranhir left14:22
← tkazi left14:22
← mikecmpbll left14:22
→ Ranhir joined14:22
← beerdrop left14:23
← wandering_vagran left14:23
→ wandering_vagran joined14:23
eldritch2 → eldritch14:23
→ beerdrop joined14:24
→ diogenese joined14:24
→ tkazi joined14:24
→ bravespear|2 joined14:29
→ winny joined14:30
← diogenese left14:31
← Ranhir left14:31
← beerdrop left14:31
← wandering_vagran left14:31
→ wandering_vagran joined14:31
→ mikecmpbll joined14:32
← goatish left14:32
→ weijin joined14:32
← mikecmpbll left14:32
→ beerdrop joined14:33
→ diogenese joined14:35
← weijin left14:36
← imack left14:39
McKraken_zzzzz → McKraken14:43
← harmaahylje left14:45
← steven left14:46
← c_dub_ left14:46
→ kalos joined14:47
→ harmaahylje joined14:47
→ Constantin joined14:48
← wadeyi_qd left14:48
→ threenuc joined14:49
→ steven joined14:49
→ beerdrop_ joined14:50
→ bongozig joined14:50
← Constantin left14:55
→ nowhereman_ joined14:57
← harmaahylje left14:57
← diogenese left14:58
← beerdrop left14:58
→ diogenese joined14:59
→ harmaahylje joined14:59
← chaosruler left14:59
← nowhere_man left14:59
← pirocks left15:01
→ mikecmpbll joined15:03
→ weijin joined15:04
timewalk1r → timewalker15:05
← ShekharReddy left15:07
← weijin left15:08
← harmaahylje left15:09
← kalos left15:11
← raynold left15:13
→ harmaahylje joined15:15
→ IndianArya joined15:15
→ jnavila joined15:16
← IndianArya left15:17
← mikecmpbll left15:17
→ IndianArya joined15:17
→ weijin joined15:19
→ h12o joined15:21
→ pirocks joined15:22
→ urbanmonk joined15:22
← weijin left15:23
← harmaahylje left15:25
amosbird_ → amosbird15:26
← urbanmonk left15:26
← h12o left15:26
← IndianArya left15:26
← theoceaniscool_ left15:26
→ IndianArya joined15:27
← IndianArya left15:27
→ IndianArya joined15:28
→ jimi_ joined15:29
→ lonelyflyer joined15:32
→ harmaahylje joined15:32
← learning left15:33
→ goatish joined15:34
→ learning joined15:34
← cebor left15:36
→ cebor joined15:37
→ zhang_ joined15:37
← harmaahylje left15:38
→ VoradorPT joined15:39
→ yobop joined15:39
← lonelyflyer left15:40
→ harmaahylje joined15:41
→ Gurkenglas joined15:42
→ thiago joined15:46
← IndianArya left15:46
← harmaahylje left15:47
→ royal_screwup21 joined15:47
← cebor left15:47
royal_screwup21 what's the difference between git reset <commit log> vs git checkout <commit log>?15:47
→ cebor joined15:48
thiago reset changes the commit current branch points to, checkout does not15:48
→ schiffsratte joined15:49
→ Arcaelyx_ joined15:50
royal_screwup21 but does reset allow you to back to where you were previously?15:51
← jimi_ left15:51
← Arcaelyx left15:51
→ weijin joined15:51
royal_screwup21 my understanding is that if I do git checkout <commit log>, play around a bit, then git checkout <branch name>, I'll be back where I started15:52
← cebor left15:52
→ cebor joined15:52
→ harmaahylje joined15:53
→ star_prone joined15:53
royal_screwup21 does reset allow for a similar mechanism to go back?15:54
just found about "git reset --soft HEAD@{1}" -- this does the trick15:55
← weijin left15:56
→ IndianArya joined15:57
_ikke_ royal_screwup21: Right, but that *does* change where the current branch points to15:58
← MACscr left16:00
← Gurkenglas left16:00
← harmaahylje left16:01
← Blkt left16:02
→ h12o joined16:02
→ Blkt joined16:02
→ cdown_ joined16:02
→ MACscr joined16:02
→ ldiamond_ joined16:03
← cdown left16:04
cdown_ → cdown16:04
→ harmaahylje joined16:05
← h12o left16:07
→ fassl joined16:07
Guest16989 → murph16:08
← schiffsratte left16:10
← harmaahylje left16:10
→ quackgyver joined16:10
royal_screwup21 what are the use-cases of git reset <commit log>?16:11
cbreak royal_screwup21: rewriting history of the current branch16:12
or rather, re-setting history16:12
→ ephemer0l joined16:12
← cbreak left16:14
← wandering_vagran left16:15
← ldiamond_ left16:16
→ bongozig_ joined16:16
Bigcheese_ → Bigcheese16:17
← M6HZ left16:20
← xcm left16:20
→ xcm joined16:20
← bongozig left16:20
← govg left16:25
← Myk267 left16:27
jrabe → carl0s16:27
carl0s → jrabe16:27
→ ok91 joined16:31
→ weijin joined16:31
→ djb-irc joined16:32
→ M6HZ joined16:33
← widp left16:34
← weijin left16:35
→ cbreak joined16:37
← gonzodark_ left16:38
→ nowhere_man joined16:39
← nowhereman_ left16:43
→ chaosruler joined16:43
→ h12o joined16:43
→ Mike11 joined16:44
→ tvw joined16:46
← h12o left16:48
← ok91 left16:48
→ DaGoaty joined16:48
→ publio joined16:48
← goatish left16:48
→ cdown_ joined16:49
← chaosruler left16:50
← zhang_ left16:50
→ felixcra joined16:51
← IndianArya left16:51
→ weijin joined16:52
← cdown left16:52
→ llorephie joined16:52
cdown_ → cdown16:52
→ GoBear joined16:52
→ Gurkenglas joined16:53
→ Myk267 joined16:53
← weijin left16:56
← i336_ left16:56
eblip → eb0t-16:56
→ jimi_ joined16:58
← NerdyPepper left16:58
→ NerdyPepper joined17:00
← star_prone left17:01
← hanneso left17:03
← DaGoaty left17:03
→ DaGoaty joined17:04
holodoc Any ideas? (https://stackoverflow.com/questions/48958727/preserve-files-from-local-branches-while-maintaining-the-ability-to-merge-or-reb)17:06
cbreak idea on what?17:07
→ harmaahylje joined17:07
← DaGoaty left17:08
holodoc cbreak, Everything is explained at the given link. How to isolate a file tracked among different branches yet still preserve the ability to merge/rebase them.17:08
cbreak git doesn't support weird stuff like that17:08
if you want to merge without merging, restore the original file contents after merging17:09
bremner !config17:09
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas17:09
→ weijin joined17:09
holodoc bremner, Thank you.17:09
cbreak (for example with a commit --amend or a merge -n)17:09
holodoc: if you want to rebase without actually rebasing... have fun... fixing every commit17:09
→ fekir joined17:10
cbreak holodoc: but really, those requirements are dumb, try to solve your problem in a different way17:10
← yobop left17:10
← tvw left17:10
cbreak like having those files with different names in all branches17:11
→ hanneso joined17:11
holodoc cbreak, I have no control over the project so my options are very limited.17:12
→ kus joined17:13
→ agowa338 joined17:13
← weijin left17:14
← harmaahylje left17:14
→ star_prone joined17:14
→ dviola joined17:15
← Myk267 left17:15
→ Myk267 joined17:15
→ harmaahylje joined17:18
← felixcra left17:18
← llorephie left17:20
← dermoth left17:22
krok → k17:23
→ dermoth joined17:23
→ jstimm joined17:24
→ h12o joined17:24
← harmaahylje left17:26
→ kfoonamalik joined17:26
→ harmaahylje joined17:28
← h12o left17:29
← NerdyPepper left17:29
→ nimomo joined17:30
→ weijin joined17:31
→ brianrhude joined17:33
← nimomo left17:35
brianrhude I created a new detached head A and I'd like to merge in B, one commit before master head C; everything looks good, but when I git checkout master, it just vanishes, disappearing from log --all, what am I doing wrong?17:35
← weijin left17:36
← harmaahylje left17:36
← star_prone left17:36
→ yobop_ joined17:37
_ikke_ brianrhude: Every commit that you make while detached does not belong to any branch, and thus, will not show up when git traverses the branches17:37
brianrhude: these commits will eventually be removed17:38
What do you want to actually achieve?17:39
→ imack joined17:39
→ harmaahylje joined17:39
→ nasd4 joined17:40
← borkr left17:40
→ nimomo joined17:41
← jimi_ left17:41
→ SteffanW joined17:41
← yobop_ left17:41
→ weijin joined17:42
→ jimi_ joined17:43
brianrhude _ikke_: I see, can you retrieve them or is it too late when you checked out master? I'd basically like to split the work I have in HEAD into 2 smaller commits, much as if I injected a new commit before HEAD, but a diverted commit from an older ancestor better shows what I actually did - does it make sense?17:44
← jimi_ left17:44
→ alezandro joined17:45
← nimomo left17:45
← harmaahylje left17:45
_ikke_ brianrhude: the reflog keeps track of every commit you made up to 90 days17:45
with rebase you can split up commits17:46
← weijin left17:46
→ nimomo joined17:48
→ ok91 joined17:50
→ harmaahylje joined17:50
→ rajat joined17:50
← albel727 left17:50
← topdownjimmy left17:51
brianrhude _ikke_: would you be so kind to point me to picking up something off the reflog, and how you would run rebase in this scenario? I can rebase interactively but really can't see how to produce a merge commit before head17:52
→ topdownjimmy joined17:52
→ alezandro1 joined17:52
← alezandro left17:53
← rajat left17:55
→ chaosruler joined17:56
→ albel727 joined17:56
← harmaahylje left17:58
← threenuc left17:59
→ surfist joined18:00
→ SteffanW2 joined18:02
← SteffanW left18:02
→ harmaahylje joined18:02
cbreak brianrhude: just create a branch18:02
→ weijin joined18:02
cbreak git branch namehere hashhere18:02
← nuc left18:03
→ nuc joined18:03
brianrhude cbreak: thank you, I'll try that18:03
← staafl left18:04
cbreak it's much easier to work with named refs such as branches18:04
→ joshbright joined18:05
← joshbright left18:05
← nimomo left18:05
→ nimomo_ joined18:05
← murr5y left18:05
→ h12o joined18:06
→ aielima joined18:06
← weijin left18:06
→ murr4y joined18:06
→ star_prone joined18:08
→ ferdna joined18:09
← h12o left18:10
← harmaahylje left18:10
→ IndianArya joined18:10
← GoBear left18:12
← star_prone left18:12
← Cabanossi left18:13
→ yobop_ joined18:13
→ Cabanossi joined18:14
→ star_prone joined18:14
→ Sonderblade joined18:15
→ harmaahylje joined18:15
→ staafl joined18:16
→ threenuc joined18:17
← threenuc left18:17
→ weijin joined18:17
→ threenuc joined18:17
← yobop_ left18:18
← pbandark left18:19
← weijin left18:21
← nimomo_ left18:21
→ nimomo joined18:22
← nimomo left18:26
← harmaahylje left18:28
→ harmaahylje joined18:30
→ Shmam joined18:32
← altendky left18:32
→ nimomo joined18:32
← imack left18:32
Shmam So I merged a branch into master with squash + merge. It merged all of the commits into master, shows that it merged on github but says that the release branch is 1 commit behind, 5 commits ahead of master and wont let me delete it.18:32
← dermoth left18:33
→ orbyt_ joined18:34
→ zzz joined18:35
→ Plouescat joined18:35
← kes left18:35
← IndianArya left18:35
← harmaahylje left18:36
→ weijin joined18:36
← nimomo left18:36
← learning left18:39
→ yobop joined18:40
← Shmam left18:40
← weijin left18:41
← aielima left18:41
_ikke_ What do you try to delete?18:41
→ ldiamond_ joined18:42
← yobop left18:45
← agowa338 left18:46
→ agowa338 joined18:46
← ldiamond left18:48
→ ldiamond joined18:48
→ weijin joined18:48
→ harmaahylje joined18:49
→ learning joined18:51
→ Xiti joined18:52
← weijin left18:53
→ Mattiaslndstrm joined18:55
← xcm left18:55
→ xcm joined18:55
← harmaahylje left18:58
→ mezod joined18:58
→ harmaahylje joined18:59
mezod Hello, I have a branch master and a "featureX" branch. It's frequently the case that when I am working on a featureX branch I need to do a hotfix on master. This leads me to conflicts when I merge featureX with master. What would be a good way to minimize issues regarding this fact, should I also make the changes on the featureX branch, or can I somehow merge master (with the hotfix) into featureX?19:01
→ Kitana joined19:01
mezod I am not 100% if git rebase is precisely for this purpose19:01
→ Darcidride joined19:02
← Darcidride left19:02
thiago it is19:02
← Kitana left19:02
thiago but it's not going to simplify the conflicts. If there were conflicts in the merge, there will likely be conflicts in the rebase.19:03
mezod thiago: I see, but at least I get to fix the conflicts at the time I've "created them". I mean, otherwise, I get a bunch of conflicts (from the several hotfixes)when I do the merge19:04
→ raynold joined19:04
thiago right19:04
mezod I mean, I'm not sure, what's the normal way to go about this? :P19:04
← zzz left19:05
thiago rebase19:05
→ yobop_ joined19:06
→ Davey joined19:06
← Davey left19:06
→ Davey joined19:06
→ beastd joined19:06
← beastd left19:06
→ zzz joined19:07
→ weijin joined19:08
← harmaahylje left19:09
mezod thiago: ok, thanks19:09
→ harmaahylje joined19:11
← weijin left19:12
← learning left19:14
→ llorephie joined19:14
→ learning joined19:14
ProfMac can I have 2 different projects under git control in the same directory?19:15
← harmaahylje left19:16
→ phluks joined19:17
thiago git does not know what a "project" is19:18
→ energizer joined19:20
← minionofgozer_ left19:22
ProfMac Is that "yes" or "no"19:22
→ weijin joined19:23
thiago that's an "I can't answer because your question has nothing to do with Git"19:23
Git keeps files. However you organise them, that's your business.19:24
whether it's a good idea or not, I can't tell19:24
← brianrhude left19:25
ProfMac ok. thanks19:25
← weijin left19:27
→ dreiss joined19:27
→ shinnya joined19:28
→ widp joined19:28
→ harmaahylje joined19:29
← harmaahylje left19:31
→ harmaahylje joined19:33
← justanotheruser left19:33
← alezandro1 left19:34
→ fstd_ joined19:35
← dreiss left19:36
← xtheosirian_ left19:37
← SteffanW2 left19:37
← fstd left19:38
fstd_ → fstd19:38
→ weijin joined19:39
← energizer left19:40
→ energizer joined19:40
← energizer left19:40
→ energizer joined19:41
← chaosruler left19:43
← weijin left19:43
→ nimomo joined19:44
→ ToBeCloud joined19:45
gitinfo set mode: +v19:45
← robattila256 left19:46
← opalepatrick left19:46
← coco left19:47
← nimomo left19:49
→ IndianArya joined19:51
→ nimomo joined19:54
→ weijin joined19:55
← agowa338 left19:56
→ texinwien joined19:56
← star_prone left19:56
→ star_prone joined19:57
← star_prone left19:58
→ star_prone joined19:58
← star_prone left19:58
← nimomo left19:59
← weijin left20:00
→ dre_ joined20:00
→ nimomo joined20:04
← djb-irc left20:07
← nimomo left20:09
→ h12o joined20:09
→ IanMalcolm joined20:10
→ crobison_ joined20:11
← IanMalcolm left20:11
← crobison_ left20:11
← rokups left20:14
← h12o left20:14
← IndianArya left20:16
→ weijin joined20:16
→ GoBear joined20:19
← weijin left20:20
← mattcen left20:23
← Mattiaslndstrm left20:25
← M6HZ left20:29
→ weijin joined20:29
→ M6HZ joined20:30
← netj left20:32
← khisanth_ left20:32
→ netj joined20:32
← weijin left20:33
→ tt_ joined20:35
← nasd4 left20:38
← zzz left20:38
→ mattcen joined20:40
→ Copenhagen_Bram joined20:41
→ stutter_ joined20:45
→ khisanth_ joined20:45
→ i336_ joined20:46
→ tunekey joined20:48
→ h12o joined20:50
→ cfoch_ joined20:54
← h12o left20:55
→ weijin joined20:56
→ IanLiu joined20:58
← weijin left21:00
→ ocds joined21:01
→ ianmalcolm joined21:01
→ bolovanos joined21:03
→ jimmyrcom joined21:03
→ theoceaniscool joined21:03
→ dpyro joined21:03
→ nd- joined21:05
→ weijin joined21:07
← Nizumzen left21:07
→ sQVe joined21:08
← nd left21:08
→ kadoban joined21:11
← nowhere_man left21:11
← Mike11 left21:11
← weijin left21:11
← theoceaniscool left21:11
→ nowhere_man joined21:13
→ IndianArya joined21:14
→ borkr joined21:16
→ kneeki joined21:17
← mattcen left21:18
→ cagmz joined21:19
← ianmalcolm left21:22
→ piggah_ joined21:24
← Copenhagen_Bram left21:24
← fekir left21:24
→ Copenhagen_Bram joined21:25
← IndianArya left21:28
→ abec7 joined21:30
← IanLiu left21:30
← drodger left21:30
→ weijin joined21:32
← Kidd left21:32
→ drodger joined21:32
← Sonderblade left21:32
→ Sonderblade joined21:33
→ altendky joined21:33
→ mattcen joined21:35
→ [Kid] joined21:36
← weijin left21:36
→ alezandro joined21:37
← kneeki left21:40
← alezandro left21:41
→ nimomo joined21:43
→ Noldorin joined21:45
← learning left21:45
← drodger left21:45
→ weijin joined21:46
← wcpan left21:47
→ wcpan joined21:47
← weijin left21:50
→ drodger joined21:51
→ h12o joined21:52
← ToBeCloud left21:54
← h12o left21:56
→ learning joined21:57
← qaz left21:57
← cbreak left21:57
→ agac-kakan joined21:57
→ qaz joined21:57
→ Mattiaslndstrm joined21:58
← twopt left21:58
→ cbreak joined21:58
→ twopt joined21:59
← yobop_ left22:01
→ kostur86 joined22:02
→ antares9 joined22:04
← nimomo left22:05
→ weijin joined22:05
← pirocks left22:05
→ nimomo joined22:05
→ ixxie joined22:06
mezod if I have a master and a featureX branch, and I do some changes in a hotfix branch that I merge into master, and this changes are in local, what is the difference really between using git rebase and merging master into featureX ?22:06
← MaekSo left22:06
ixxie how do I do that thing when you pick one line from a file to add to a commit?22:06
→ MaekSo joined22:06
→ yobop joined22:07
← Plouescat left22:08
← weijin left22:09
← agac-kakan left22:09
← nimomo left22:09
j416 ixxie: man git-add look for -p22:10
gitinfo ixxie: the git-add manpage is available at https://gitirc.eu/git-add.html22:10
→ nimomo joined22:11
j416 mezod: rebasing makes for less tangled history22:11
mezod: rebasing breaks down any merge conflicts into smaller parts22:12
← widp left22:13
← Sonderblade left22:14
← cdown left22:14
→ joeyy_ joined22:14
← timewalker left22:14
mezod j416: what about if something goes wrong, doesn't having used merge make it easier to track the steps back?22:14
← abec7 left22:15
→ timewalker joined22:15
← nimomo left22:15
← joeyy left22:18
← ok91 left22:18
→ denete_ joined22:18
← [Kid] left22:19
→ fierymaelstrom joined22:19
antares9 hi !22:19
can some here pls suggest me if there exists a way to build git from source without running all the tests everytime I make changes to my fork of git locally before finalising a patch22:19
bc this seems to take a lot of time?22:19
gitinfo antares9: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.22:19
← sQVe left22:19
→ venmx joined22:20
ixxie j416: cheers j41622:20
← fierymaelstrom left22:20
← jnavila left22:21
→ nimomo joined22:21
→ [Kid] joined22:21
→ pirocks joined22:23
→ blah_ joined22:24
← nimomo left22:25
← learning left22:26
← blah_ left22:26
→ HcsOmot joined22:27
antares9 j416: hi! can you pls check my query above ^ if you are free :-)22:28
← xcm left22:28
→ xcm joined22:28
→ learning joined22:30
→ PaulePanter joined22:32
→ h12o joined22:33
← philipp64 left22:34
→ philipp64 joined22:35
← Forty-3 left22:35
→ rafasc joined22:35
← IchigoBlack left22:35
← h12o left22:38
→ weijin joined22:38
← ixxie left22:40
← ocds left22:41
← GoBear left22:42
← weijin left22:43
← denete_ left22:44
→ jimi_ joined22:44
→ denete_ joined22:45
→ abec7 joined22:48
← jimi_ left22:48
→ jimi_ joined22:48
← denete_ left22:49
← dre_ left22:49
→ kgrimes joined22:51
→ boombatower joined22:52
→ Chris_M joined22:53
← Amanas left22:53
← daynaskully left22:54
→ fx250_ joined22:54
← boombatower left22:55
→ boombatower joined22:55
← llorephie left22:55
→ cagomez joined22:55
→ daynaskully joined22:55
← fx250__ left22:57
← timewalker left22:57
→ timewalker joined22:57
← Chris_M left22:59
→ weijin joined23:01
← jimmyrcom left23:05
← weijin left23:05
→ figurehe4d joined23:08
→ cdown joined23:10
← luckman212 left23:11
→ mikecmpbll joined23:13
→ luckman212 joined23:13
→ Amanas joined23:14
jargan → jast23:14
→ h12o joined23:14
← mikecmpbll left23:16
→ Bobdude joined23:16
→ dreiss joined23:16
← dpyro left23:17
→ dpyro joined23:18
← afuentes left23:18
→ weijin joined23:18
← cdown left23:18
← h12o left23:19
→ wadeyi_qd joined23:19
→ zulutango joined23:19
← weijin left23:23
← \void left23:23
→ MattMaker joined23:25
← cbreak left23:26
→ cdown joined23:26
→ nocbreak joined23:26
nocbreak → cbreak23:30
← jimi_ left23:32
→ jimi_ joined23:33
← phluks left23:35
→ Bishop_Bautista joined23:35
← dave0x6d left23:36
→ alezandro joined23:38
← doug16k_ left23:39
→ mborgard joined23:40
← borkr left23:41
→ weijin joined23:42
← cbreak left23:42
← alezandro left23:42
→ cbreak joined23:42
← jimi_ left23:45
← weijin left23:46
← threenuc left23:46
→ jimi_ joined23:46
← venmx left23:54
→ mlopezviedma_ joined23:54
← tt_ left23:54
→ h12o joined23:56
→ gugah joined23:56
← mlopezviedma left23:58
← cssko left23:58
→ cssko joined23:59

Logs Search ←Prev date Next date→ Channels Documentation