IRCloggy #git 2018-07-25

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-07-25

→ durham_ joined00:00
→ __nd__ joined00:00
nedbat michael2: this isn't a git problem: this is an organizing your work problem.00:00
michael2: why are you starting on a new feature when there is old work unfinished?00:00
michael2 nedbat: you're right, git is doing everything right - its an operator issue00:01
nedbat michael2: but even if you ignore those old unfinished branches, can't you just start a new branch from master (or wherever), and start on the new work?00:01
← LiftLeft left00:02
michael2 the rate at which work comes in exceeds the rate at which I can put away residual pending changes onto branches and push to server00:02
← _nd_ left00:02
← durham left00:03
nedbat michael2: you say, "put changes onto branches." Don't you make the branch before you've made any changes? And your commits go onto the branches?00:03
michael2 nedbat: about 70% percent of time, I can't checkout back to development (the main "trunk" I work from ) becauuse of checkout conflicts00:04
nedbat michael2: conflicts with what? You want to get the latest development code, you just check it out.00:04
michael2: are you trying to get the latest development code and also keep your local changes?00:05
michael2 nedbat: thats one problem, I'm not making the branches _before_ I do the work - which I should be doing00:05
nedbat michael2: yes, make the branch first.00:05
michael2 nedbat: If I understand you , you're asking why I dont just checkout back to the main "trunk" branch - despite having a dirty working dir - is that right?00:06
nedbat michael2: no, i'm saying you should commit your changes to a branch.00:06
michael2: when work comes in, make a branch. all your changes get committed to the branch00:07
← ZyX-I left00:07
michael2 nedbat: yes, but in order to isolate the experimental commits I need to checkout from whatever branch I was on - back to the common trunk00:08
nedbat michael2: yes, when you start a new thing, you go back to development, and start a new branch00:08
← jp left00:09
→ jp joined00:09
nedbat michael2: why is your working tree dirty? Why not commit your changes?00:10
← applecrumble left00:11
tzo or stash them at least00:11
michael2 nedbat: thats the problem Im not commiting fast enough00:11
tzo: stash is no good00:12
tzo stash is bae00:12
nedbat michael2: ok. 1) make a new branch when you start new work. 2) commit your changes to the branch.00:12
michael2 tzo: because its indiscriminent00:12
→ vdamewood joined00:13
michael2 it stashes everythin - what you want is to caputure the branch specific changes as a commit - on that branch00:13
even if its only a "work in progress" commit00:14
tzo so why don't you commit before switching branches then00:14
→ LiftLeft joined00:14
michael2 tzo: im trying, im trying...00:14
tzo :p00:14
← gruetzkopf left00:14
→ gruetzkopf joined00:15
← jrnieder left00:15
← arecacea1 left00:15
← kerframil left00:15
→ arecacea1 joined00:16
→ akushner joined00:16
michael2 nedbat: yes, I think I need to develop a reflex or a habit - where _before_ I start work - I identify the branch - this work should be on - make the branch *then* start coding00:17
must make the branch - then start coding00:18
always make the branch before coding00:18
code with no branch bad00:18
← Enphuego left00:18
nedbat michael2: right00:19
← cagomez left00:20
michael2 so - solution one - If I dont have a branch to receive the code into - then I put the computer down and slowly step away from the keyboard - with my hands where nedbat can see them00:20
← m0viefreak left00:20
nedbat michael2: solution two: make a branch00:21
michael2 thats where my real sticking point actually is00:21
I have multiple models of branching00:21
nedbat michael2: models?00:22
michael2 and I get "paralysis by analysis"00:22
nedbat michael2: can you describe two different models?00:22
michael2 nedbat: 3 modiesl00:22
models00:22
nedbat: 1) hotfixes - that go straight onto master00:23
← jottr left00:23
→ Kaisyu joined00:23
parsnip nooooo00:23
michael2 major pain, because I need to rebase everything afterwards00:23
usually requiring `rebase --onto ...'00:24
tzo out of curiousity, how many people are working on this project00:24
michael2 parsnip: I know, right?00:24
tzo: just me00:25
parsnip i make lots of `scratch/<blah>` branches00:25
tzo ok00:25
parsnip i think i saw that in the emacs project.00:25
more than half of them are never pushed.00:26
i mean, mine.00:26
michael2 parsnip: but if you don't push you won't have backups of the work?00:26
parsnip michael2: i might start pushing really scratch branches to a private repo.00:27
michael2: i don't lose my laptop very often.00:27
→ BallChang-CN joined00:27
parsnip let's hear your other two mental models?00:28
michael2 nedbat: 2) model/strategy - is to commit direct to development branch 3) is the branching as we discusssed00:28
parsnip: ^^^00:28
I think parsnip's make a "scratch" branch is how I will start doing things00:29
nedbat michael2: you can push all your branches to your real repo00:31
michael2 the reason I like that approach is because - I think - if you create a branch - but it turns out a dedicated branch was overkill (e.g. was only a couple lines of edits) you always have the option of checking back to develpment and merging00:32
but if you didn't capture the work onto a dedicated branch its much harder to retract those commits onto a branch with history rewrites00:33
nedbat michael2: right. it's easy to merge branches00:33
→ g2anj joined00:35
michael2 nedbat: exactly - but very hard to "de-merge" a branch !00:35
nedbat michael2: i don't understand00:35
← Tobbi left00:35
→ tangmou joined00:37
michael2 nedbat: say your repo has only a single branch - with all of changes which serve different focuses/purposes all interspersed along that single history00:37
and intermingled amongst each other00:38
parsnip at worst, you can kind of unmerge with a rebase. but at best, it's often a quick reset.00:38
michael2 then you decide you want to take all the commits related to say some install and config code and put them onto a single branch00:39
parsnip i think he's often looking at fast forward as a merge.00:39
not sure actually00:39
michael2 nedbat: how would you identify and retract them out of the history into a single branch? thats what I meant by a "de-merge"00:40
parsnip i think of that as a lot rebasing.00:40
not a de-merge00:40
← Wetmelon left00:40
nedbat michael2: you are describing the thing you want to avoid: don't put all those commits on one branch in the first place00:40
← dpirch left00:40
michael2 nedbat: exactly00:40
parsnip well, often you are making many edits in succesion, but flipping topics. i don't think it's that unusual.00:41
nedbat michael2: i think we are all in agreement: you should start branches before making changes, and commit all your work00:41
parsnip though they're vaguely related.00:41
i mean, in a recent case for myself.00:41
i'm trying to remove a framework from a project. i have sort of two topics of regressions i would have to fix.00:42
i go back and forth, and they're not strictly split on divergent branches.00:42
← Singmyr left00:43
parsnip but usually when i'm in the hacking phase, i make extra scratch branches where things might split, until i pick the next winner to fast forward say `scratch/master`.00:43
i might be working on both topics in two branches, and whichever i make good progress on next, i fast forward to.00:43
then i rebase the other scratch branches to that.00:44
and i may even rebase _all of it_ before finally adding to master.00:44
→ dreiss joined00:44
parsnip like, if some commits were typo fixes for earlier commits.00:44
← bergice_ left00:44
→ oxguy3 joined00:45
← HZun left00:47
← durham_ left00:48
→ durham joined00:49
← unreal left00:49
← Guest73 left00:49
michael2 nedbat: just to finish our train of thought and move onto parsnips issue. Yes I think we are in agreement. I need to develop a habit/refex of always creating a branch _before_ opening a text editor (you literally can't go wrong if you do this) and in regard to the location the branch will be based off - I guess - always go off development - if thats not right - it can be fixed later- with a cherry pick or00:50
rebase - but as long as the code is contained into a branch - 1) its isolated from develpment 2) it clears uncommitted changes out of the working directory to free up more checkouts 3) it allows saving the work to remotes (pushing)00:50
nedbat michael2: right, right, and right.00:51
→ Guest73 joined00:52
← Guest73 left00:54
← m00sehead left00:57
→ fission6 joined00:58
→ Wetmelon joined00:58
→ m00sehead joined00:59
→ jakogut joined01:00
→ unreal joined01:01
→ CarlFK joined01:01
CarlFK ugh - commited and pushed, the realized I should have squashed.01:01
how do I squash the last 2 commits ?01:01
← fission6 left01:01
→ mud joined01:03
→ Utility joined01:04
← Utility left01:05
→ Vortex34 joined01:08
→ finalbeta joined01:10
→ UtilityDave joined01:10
← wizardedit left01:11
michael2 if you've already pushed, you'll have to rewrite history locally then push --force - and deal with backlash - if you have other devs01:11
← Vortex35 left01:12
→ infinite joined01:12
← netlar left01:12
→ netlar joined01:12
→ inkbottle joined01:13
CarlFK just me - trying to make a cleaner PR01:13
← Sasazuka left01:13
michael2 git probably has somme "squash" feature- but I would just git reset --soft HEAD^^ which should leave the index intact - then just git commit - then git push --force <remote>01:14
tzo git rebase -i HEAD^^01:14
michael2 tzo: what do you do with the commit/s CarlFK doesn't want? <delete> ?01:15
← Oatmeal left01:16
mud You can squash from the rebase -i interface. The reset --soft thing is quicker, but many people don't know that. rebase -i is easier to remember01:16
Or at least I end up using it more, it's more general for my usages than invocations of reset01:17
michael2 I guess I like the control of doing things manually, but I'd like to use rebase more, it just seems a nice convenience thing01:18
its gives you some automation01:18
CarlFK git rebase -i HEAD^^ I think that reverted my commit? (its fine, I deleted 2 lines of debugging code I can delete again)01:20
← thiago left01:20
CarlFK but that still leaves me with a commit with the debug code that I don't want included01:21
mud CarlFK: It should have brought up a text editor letting you choose what changes to make01:21
You can reorder and squash commits by using that editor interface thing.01:21
CarlFK it did, but I guess I didn't edit right01:21
so now I have uncommited changes - how do I .. make them part of the last commit?01:22
← m00sehead left01:23
nedbat CarlFK: git commit --amend01:23
mud CarlFK: If you have changes you just want to include in the most recent commit, that's 'git add .' (if they're not staged, stage them how you want) and then 'git commit --amend'01:23
CarlFK i've heard of that01:23
→ doubtful joined01:24
michael2 one other thing I like about rebase - is that when I do rewrites of a branch - I often create a temporary branch, so say the branch to do history rewrites was "foo" I would create a temporary branch - named "Foo" - then once the branch is fixed up - Im stuck with a branch named "Foo" or whatever the temporary branch was - rebase lets you keep your original branch name after the history rewrite01:24
← inovas left01:24
→ dsdeiz joined01:25
← dsdeiz left01:25
→ dsdeiz joined01:25
CarlFK arg. can someone figure out how my local repo and github are not in sync? :p01:28
http://paste.ubuntu.com/p/qhm7j5XZrs/01:28
← jakogut left01:28
CarlFK https://github.com/CarlFK/video-stack-deploy/commit/60d0373f34519850d5873f0b3f3e39ce307bea9901:28
→ dviola joined01:28
parsnip CarlFK: have you fetched?01:29
CarlFK 2 lines I am trying to get rid of +- debug: + msg: "foo {{ hostvars }}"01:29
→ jakogut joined01:29
CarlFK parsnip: no. just did, nothing happened.01:29
parsnip !lol01:29
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all01:29
parsnip !paste01:29
gitinfo Please use a pastebin for snippets longer than one line. Persistent and can be used with a GitHub account: https://gist.github.com/ - one hour auto-delete: https://upaste.de/01:29
→ inovas joined01:30
parsnip CarlFK: i'm guessing `git lol` will show the branches have diverged.01:30
CarlFK git: 'lol' is not a git command. See 'git --help'.01:30
parsnip so pushing would not be a simple fast-forward, and so is prevented.01:30
CarlFK: okay, try `git log --oneline --graph --decorate --all`01:30
CarlFK http://paste.ubuntu.com/p/nBw6GM32xp/01:31
→ strugee joined01:32
← _ADN_ left01:33
← RougeR left01:34
→ durham_ joined01:34
→ qrc joined01:35
parsnip CarlFK: what part are you looking at that is not in sync?01:36
← shah^ left01:36
CarlFK I see this in gh: +- debug: but not my local file01:36
← durham left01:37
→ cagomez joined01:37
→ hat^^ joined01:37
→ dstw joined01:38
CarlFK https://github.com/CarlFK/video-stack-deploy/blob/bm-connection/roles/voctomix/tasks/voctomix.yml#L201:38
← Sleepy63 left01:38
← durham_ left01:38
→ nickenchuggets joined01:39
← nickenchuggets left01:39
→ nickenchuggets joined01:39
parsnip git diff bm-connection -- bm-connection/roles/voctomix/tasks/voctomix.yml01:39
git diff bm-connection -- roles/voctomix/tasks/voctomix.yml01:40
CarlFK empyt01:40
parsnip okay, and if you open the file?01:40
CarlFK 2nd one shows a diff01:40
parsnip ah01:40
CarlFK I thought this commited it: git commit --amend01:41
parsnip did you add?01:41
commit only commits things in staging area01:41
CarlFK I need to add if it is already tracked?01:41
parsnip to get it from working tree to staging area, you have to add.01:41
being tracked doesn't continuously update things to the staging area.01:42
CarlFK k01:42
← monoprotic left01:43
CarlFK yay, all pretty now!01:43
thank you everyone01:43
parsnip :)01:43
← dreiss left01:43
← hat^^ left01:44
← akushner left01:45
→ hphat joined01:46
← negaduck left01:46
← Karyon left01:48
→ Sleepy63 joined01:48
→ Karyon joined01:48
→ dreiss joined01:48
→ JeffH joined01:49
JeffH I need some help. I freshly cloned a repo to my Mac. A ‘git status’ shows modifications. I suspect case issues but nothing I’ve tried seems to have and effect.01:52
→ negaduck joined01:53
tzo what does git diff say01:53
← fran__ left01:53
tzo or erm what files are changed01:54
→ fran__ joined01:54
tzo it might be permissions or something01:54
← upperdeck_ left01:54
→ upperdeck joined01:54
JeffH A diff seems to think the files are completely different.01:55
← fran__ left01:55
tzo :o01:55
git checkout -f # since it's a fresh clone01:56
→ Lyqyd joined01:56
JeffH Git shows the file purify-Results is modified. The file on disk is purify-results01:57
tzo hm, idk sorry01:58
I'm a windows so I've had different git vs filesystem weirdness >_>01:58
JeffH Anyone else here or just you?01:58
→ thiago joined01:59
← GreenJello left01:59
tzo 1174 others01:59
← veegee left01:59
parsnip what is git config --get core.ignoreCase02:00
JeffH parsnip: false02:02
→ Jackneill joined02:02
parsnip what if you `mkdir testthis && mkdir TestThis`?02:03
ah, or `diskutil info /`02:04
see if it says "Case-sensitive"02:04
i have `File System Personality: APFS`02:04
JeffH Don’t see anything about Case-sensitive02:05
→ GreenJello joined02:05
→ zlib_is_awesome joined02:06
← tzo left02:06
parsnip not sure. maybe something in .bashrc?02:06
JeffH Modify: TestThis: File exists02:07
parsnip maybe `mv purify-results temp && mv temp purify-Results`02:10
!backup02:10
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups02:10
→ MoziM joined02:11
← Praxi left02:15
→ swalladge joined02:15
← JeffH left02:15
→ veegee joined02:17
→ fission6 joined02:19
← dreiss left02:20
→ zumba_addict joined02:20
← swalladge left02:20
→ swalladge joined02:21
← CarlFK left02:22
← Karyon left02:23
← GreenJello left02:24
→ lagothri1 joined02:25
← konsolebox left02:27
← lagothrix left02:28
← Jackneill left02:28
→ Jackneill joined02:29
← cagomez left02:29
→ cagomez joined02:29
→ konsolebox joined02:30
← finalbeta left02:30
→ finalbeta joined02:31
← hussam left02:32
→ GreenJello joined02:33
→ braderhart joined02:33
← nahtnam left02:33
braderhart → Guest1367902:33
→ ManiacTwister joined02:33
← dilijev left02:34
← cagomez left02:34
→ Mrdoor joined02:34
→ vedu joined02:34
→ idmistir joined02:35
← idmistir left02:35
→ idmistir joined02:35
← Peng_ left02:35
→ hussam joined02:35
→ dilijev joined02:35
← rossome left02:35
← VSpike left02:35
→ msonntag joined02:35
→ ^MillerBoss joined02:36
→ fahadash joined02:36
← egc left02:36
← jakesyl_mobile left02:36
→ nahtnam joined02:36
→ MatthewAllan93 joined02:36
→ egc joined02:36
→ Peng_ joined02:36
← scarcry left02:37
→ jakesyl_mobile joined02:37
→ xPucTu4 joined02:38
→ scarcry joined02:39
→ dmarr joined02:39
→ angular_mike_2 joined02:39
→ Klumben joined02:40
→ linuxdaemon joined02:40
← fission6 left02:43
← GreenJello left02:43
→ GreenJello joined02:44
→ winny joined02:46
→ durham joined02:47
← gruetzkopf left02:49
→ gruetzkopf joined02:49
← strugee left02:49
← subroot left02:50
← plexigras left02:51
← a3Dman_ left02:52
→ cagomez joined02:53
← nikio_ left02:57
← dirtyroshi left02:58
→ m00sehead joined03:00
← m00sehead left03:01
→ VSpike joined03:02
→ rossome joined03:02
→ de-vri-es joined03:03
← durham left03:03
→ nuc joined03:05
→ JeffH joined03:09
← JeffH left03:11
→ profmac joined03:14
→ YuGiOhJCJ joined03:16
← MACscr left03:18
→ matlock joined03:20
← matlock left03:20
← netlar left03:23
→ netlar joined03:23
← cfoch left03:35
→ shicks_ joined03:36
→ maryo joined03:36
→ bergice_ joined03:49
→ mlopezviedma_ joined03:50
← cagomez left03:51
→ cagomez joined03:51
→ Guest73 joined03:52
← maryo left03:52
← mlopezviedma left03:53
← UtilityDave left03:54
← dsdeiz left03:54
← cagomez left03:56
→ matsaman joined03:58
← matsaman left03:58
← Gustavo6046 left04:00
← Lyqyd left04:01
→ dpyro joined04:02
← donofrio left04:15
← tangmou left04:17
← dviola left04:22
← yohnnyjoe left04:43
← vdamewood left04:46
← TheRuckus left04:51
← oxguy3 left04:51
← finalbeta left04:53
→ finalbeta joined04:54
→ bsaboia joined04:57
→ inxiti joined05:00
→ pks_ joined05:00
← pks left05:02
pks_ → pks05:02
← Wetmelon left05:04
→ howdoi joined05:08
← scrptktty left05:10
→ nolfie joined05:16
← graphene left05:19
→ graphene joined05:20
→ strugee joined05:21
← ferdna left05:22
→ venmx joined05:24
→ dreiss joined05:25
← Guest73 left05:25
→ Guest73 joined05:27
← floppydh left05:28
→ floppydh joined05:28
→ soee joined05:29
→ sauvin joined05:35
← venmx left05:36
← _joes_ left05:38
← inovas left05:40
→ jimmyrcom joined05:41
→ inovas joined05:44
← hphat left05:45
→ a0sc0tt joined05:47
← bsaboia left05:47
→ subhojit777 joined05:47
→ skisela joined05:48
→ a3Dman joined05:52
→ mikedd joined05:53
← doubtful left05:56
→ |DM| joined06:00
← inxiti left06:06
→ TheRuckus joined06:07
← scarcry left06:08
→ scarcry joined06:08
← Puffball left06:09
→ zais joined06:14
→ _joes_ joined06:14
→ DMmd joined06:15
→ rominronin joined06:15
← thiago left06:16
← |DM| left06:17
← rominronin left06:19
→ martinus__ joined06:19
→ rominron_ joined06:20
← speedmann left06:20
← rominron_ left06:20
→ speedmann joined06:20
← graphene left06:20
→ rominronin joined06:21
→ graphene joined06:21
← speedmann left06:21
→ speedmann joined06:21
← tomfarr left06:22
← speedmann left06:22
→ speedmann joined06:22
→ bsaboia joined06:23
← speedmann left06:23
→ speedmann joined06:23
← speedmann left06:24
→ speedmann joined06:24
← speedmann left06:25
← gxt left06:25
→ rchavik joined06:26
← xcm left06:32
→ JeroenT joined06:32
→ xcm joined06:32
← gruetzkopf left06:37
→ gruetzkopf joined06:37
← JeroenT left06:37
→ JeroenT joined06:38
→ yohnnyjoe joined06:40
← dreiss left06:41
← yohnnyjoe left06:44
→ wandering_vagran joined06:44
→ up_here joined06:48
← bergice_ left06:48
← Ayo left06:50
← GreenJello left06:50
→ Zarthus joined06:52
→ MACscr joined06:52
→ tangmou joined06:52
→ oxymoron93 joined06:53
← nolfie left06:54
← tangmou left06:54
→ tangmou joined06:54
← al-damiri left06:55
→ supernovah joined06:57
→ cagomez joined06:58
→ opalepatrick joined06:59
← graphene left06:59
← gruetzkopf left06:59
→ Oatmeal joined06:59
→ gruetzkopf joined06:59
→ graphene joined06:59
← subhojit777 left07:02
← cagomez left07:02
← a0sc0tt left07:03
→ ZyX-I joined07:07
→ tig_ joined07:07
→ staafl_ joined07:07
→ komonsterko joined07:08
← gruetzkopf left07:09
→ gruetzkopf joined07:09
← komonsterko left07:09
← ColeW_Picaro left07:09
→ sysvalve joined07:10
← infinite left07:10
← ZyX-I left07:11
← Arcatech left07:13
← gruetzkopf left07:13
→ gruetzkopf joined07:13
← jfr left07:14
→ gxt joined07:15
→ infinite joined07:15
→ TomyWork joined07:18
→ jfr joined07:20
→ charolastra joined07:28
← Mat001 left07:31
← gruetzkopf left07:31
→ gruetzkopf joined07:32
→ schleppel joined07:33
← gruetzkopf left07:33
→ gruetzkopf joined07:33
← gruetzkopf left07:34
→ gruetzkopf joined07:35
← moei left07:35
mikedd morning o/07:37
→ Mat001 joined07:37
← JeroenT left07:39
← schleppel left07:39
→ schleppel joined07:39
→ onecoder779981 joined07:40
← schleppel left07:41
→ JeroenT joined07:41
→ schleppel joined07:41
← jimmyrcom left07:43
← Guest73 left07:45
← opalepatrick left07:47
← monty left07:48
→ monty joined07:48
← Zarthus left07:48
→ j7k6 joined07:49
→ GeraldW joined07:49
→ Zarthus joined07:49
→ jimmyrcom joined07:50
→ styler2go joined07:52
→ doubtful joined07:52
→ dre_ joined07:54
→ Tobbi joined07:55
tafa2 hey guys, I'm fairly new to git and am trying to wrap my head around "the best" way to deploy my code. So for example I'm currently coding a small static site locally which I push to the repo, then login into the web hosting environment and pull the code down again - is this how you all do it too?07:56
bremner !deploy07:58
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html07:58
→ kes joined07:58
← JeroenT left07:59
← tangmou left08:01
→ mikecmpbll joined08:01
→ VladGh_ joined08:02
→ tangmou joined08:03
← nickenchuggets left08:06
→ mikemcowie joined08:07
← \void left08:08
← Mat001 left08:11
→ amosbird joined08:15
← dstw left08:15
→ dstw joined08:17
→ nolfie joined08:18
← _icantc_ left08:19
→ deathwishdave joined08:20
← zlib_is_awesome left08:22
← kegster left08:22
← raulp left08:22
→ kegster joined08:23
→ raulp joined08:24
→ moei joined08:25
← YuGiOhJCJ left08:25
→ muahah joined08:26
← Tobbi left08:27
→ hsn joined08:28
hsn how to undo staged changes without touching working copy?08:28
← crater2150 left08:29
up_here git reset -- file08:30
→ durre joined08:30
hsn yeah, thanks up_here08:30
j416 hsn: git status will also tell you this08:31
(if you forget)08:31
hsn i just converted repo from bzr after spend yesterday fixing bzr fast export08:31
converted nicely, tags, branches.08:32
← muahah left08:32
hsn what is difference between .gitinore and .git/info/exclude ?08:38
→ yohnnyjoe joined08:41
sitaram hsn: the former is part of the repo -- gets added, committed, pushed, etc.. The latter is purely local to your repo08:43
← yohnnyjoe left08:45
← foul_owl left08:45
← TinkerT left08:45
→ mescalinum joined08:46
→ TinkerT joined08:47
→ tomfarr joined08:47
→ RougeR joined08:52
← RougeR left08:52
→ RougeR joined08:52
→ venmx joined08:53
→ amirpro joined08:57
→ T_UNIX joined08:57
← gruetzkopf left08:59
→ gruetzkopf joined09:00
← xcm left09:00
→ foul_owl joined09:00
→ xcm joined09:00
→ dhollin3 joined09:01
← durre left09:03
← dhollinger left09:03
← goweol left09:04
← felixsanz left09:05
→ nimbleark joined09:06
→ rsrx joined09:09
→ kurkale6ka joined09:10
→ ZyX-I joined09:14
← catsup left09:15
→ kerframil joined09:15
→ catsup joined09:15
← kurkale6ka left09:15
→ smallville7123 joined09:16
← catsup left09:16
← dakar left09:16
→ catsup joined09:16
→ _ADN_ joined09:17
→ kurkale6ka joined09:17
→ nemesit|znc joined09:17
→ dakar joined09:18
→ Orphis joined09:21
← shinnya left09:23
→ felixsanz joined09:24
← tangmou left09:26
→ tangmou joined09:26
← tangmou left09:31
← ZyX-I left09:33
→ Darcidride joined09:34
← peepsalot left09:36
→ pR0Ps joined09:37
→ CodeSlingerPaul joined09:38
← Darcidride left09:39
→ leeN joined09:40
→ Darcidride joined09:41
← Darcidride left09:44
← deathwishdave left09:45
← smallville7123 left09:48
→ Darcidride joined09:49
→ zulutango joined09:51
→ nevodka joined09:53
← Darcidride left09:54
← inovas left09:54
→ Case_Of joined09:56
← ilmostro left09:58
→ inovas joined09:59
← lankanmon left10:01
→ plitter joined10:01
← dre_ left10:02
→ Regon joined10:02
← strugee left10:02
→ abba joined10:03
→ ilmostro joined10:03
← onecoder779981 left10:07
→ onecoder779981 joined10:08
→ strugee joined10:10
→ plexigras joined10:10
← xcm left10:11
← mikemcowie left10:12
← BallChang-CN left10:12
← beatzz left10:16
→ xcm joined10:18
← eblip left10:19
← skisela left10:19
← Kaisyu left10:20
← qrc left10:21
→ skisela joined10:22
← _joes_ left10:23
→ ruslangaripov joined10:26
← nolfie left10:26
← skisela left10:27
→ tangmou joined10:32
→ tvw joined10:33
← tangmou left10:36
← zulutango left10:36
← kes left10:38
← amirpro left10:39
→ w3stside| joined10:40
← dstw left10:40
→ muahah joined10:40
← w3stside| left10:41
← muahah left10:41
→ yohnnyjoe joined10:41
→ m00sehead joined10:42
→ lankanmon joined10:43
→ Guest16880 joined10:44
← Guest16880 left10:44
→ jesse| joined10:45
← jesse| left10:45
→ balrog| joined10:46
← yohnnyjoe left10:46
← balrog| left10:46
← rsrx left10:47
→ amirpro joined10:49
→ Guest23519 joined10:53
→ shinnya joined10:53
→ kes joined10:54
← Guest23519 left10:55
→ muahah joined10:56
← stoopkid left10:56
← TomyWork left10:57
← muahah left10:57
→ physpi| joined10:57
→ aLeSD_ joined10:58
← leeN left11:00
← physpi| left11:01
→ Guest49727 joined11:03
← fstd left11:03
← Guest49727 left11:04
→ fstd joined11:04
→ smallville7123 joined11:06
← xcm left11:07
→ eshlox joined11:11
← smallville7123 left11:12
→ yaewa joined11:12
← yaewa left11:12
→ mango__ joined11:12
← moei left11:13
→ crater2150 joined11:15
← DMmd left11:15
→ amrits_ joined11:15
→ xcm joined11:17
← TheRuckus left11:17
→ leeN joined11:20
← MrAureliusR left11:23
→ MrAureliusR joined11:23
← dpyro left11:28
→ blur48 joined11:28
← m00sehead left11:29
gitinfo set mode: +v11:29
blur48 I just initialised a new repo and tried to commit, but I keep getting "fatal: could not parse HEAD" errors. I have already tried removed .git and initialising again.11:30
← doubtful left11:30
← onecoder779981 left11:32
up_here can you `cat .git/HEAD` ?11:33
blur48 ref: refs/heads/master11:33
→ onecoder779981 joined11:33
up_here and `git show master`11:34
at least, does it exist?11:34
blur48 fatal: bad object master11:34
up_here That's not the error message I'd expect after initialising a repo...11:37
blur48 I already have files there, though. I just haven't committed.11:39
up_here how far do you get when you try git checkout -b master ; touch .gitignore ; git add .gitignore ; git commit11:40
blur48 fatal: A branch named 'master' already exists11:42
up_here and without the -b?11:43
blur48 fatal: reference is not a tree: master11:44
I can touch .gitignore and stage it, but not commit11:44
up_here I doubt your git directory is really empty... (or you've run out of disk space?)11:47
→ _joes_ joined11:49
→ fission6 joined11:50
blur48 the working dir has lots of files, but .git was just created and I have plenty of free space11:52
← MrAureliusR left11:52
_rgn 6alk11:52
→ cdown_ joined11:53
up_here Besides working on a branch other than master, I don't know what else to try.11:54
← cdown left11:55
cdown_ → cdown11:55
blur48 could reinstalling git do the trick?11:56
→ TheRuckus joined11:58
← MoziM left11:58
up_here Your error messages are different from mine, so one of us has an outdated version at best.11:58
→ dreiss joined12:00
→ dstw joined12:00
← TheRuckus left12:01
→ vdamewood joined12:01
→ rafasc joined12:02
→ Rashad_ joined12:02
→ muelleme joined12:04
← blur48 left12:04
← dstw left12:07
→ m00sehead joined12:08
← vdamewood left12:10
→ CheckDavid joined12:12
← zumba_addict left12:13
← fission6 left12:14
→ eblip joined12:14
→ Wetmelon joined12:18
← gruetzkopf left12:18
→ TomyWork joined12:19
→ gruetzkopf joined12:21
← onecoder779981 left12:22
→ TheRuckus joined12:23
← TheRuckus left12:24
→ TheRuckus joined12:24
Rashad_ → Rashad12:27
← TheRuckus left12:29
← dreiss left12:29
← howdoi left12:29
→ TheRuckus joined12:31
→ paws__ joined12:33
→ sdwrage joined12:34
← Rashad left12:35
→ yohnnyjoe joined12:42
→ emihir0 joined12:43
← emihir0 left12:43
← yohnnyjoe left12:46
→ vdamewood joined12:47
→ RoriconKnight joined12:48
← TomyWork left12:49
← RoriconKnight left12:49
→ RoriconKnight joined12:50
→ TomyWork joined12:50
← RoriconKnight left12:51
→ RoriconKnight joined12:51
→ tangmou joined12:51
→ smallville7123 joined12:55
→ Rashad joined12:55
→ dc13ff joined12:55
← tangmou left12:56
→ tangmou joined12:56
← gruetzkopf left12:56
→ gruetzkopf joined12:57
← Rashad left12:59
→ Rashad joined13:00
← gruetzkopf left13:00
→ gruetzkopf joined13:00
← m00sehead left13:00
← RoriconKnight left13:01
← smallville7123 left13:01
→ RoriconKnight joined13:01
← RoriconKnight left13:02
→ m00sehead joined13:02
→ RoriconKnight joined13:03
← gruetzkopf left13:03
→ gruetzkopf joined13:04
deepy I have a branch that contains a change to a bunch of XML files which is correct, but it also contains changes to some java files, is there any simple way to rewrite the history and discard the java changes so I can merge and get this up to date?13:05
← gruetzkopf left13:09
→ gruetzkopf joined13:09
← muelleme left13:09
rafasc deepy: yes. But 'simple' will depend on how your commits are made.13:10
deepy: are these java commits intermingled with the xml commits?13:10
← tangmou left13:10
rafasc or were they added separately?13:10
→ dstw joined13:11
← Perflosopher left13:11
→ Perflosopher joined13:11
→ gde33 joined13:12
← Perflosopher left13:12
→ Perflosopher joined13:13
rafasc If they're nice and isolated commits, you can rebase and drop the commits.13:14
deepy intermingled13:14
rafasc If they're not you'll need to do something along the lines of !remove_sensitive for those .xml files13:14
deepy I've found a commit which I think is the biggest offender, and I'm currently editing it :P13:15
← gruetzkopf left13:15
rafasc deepy: when I said intermingled I meant if you have commits that change both java and xml on the same commit.13:15
→ gruetzkopf joined13:15
→ staafl__ joined13:16
→ LionsMane joined13:16
→ bathtub_shark joined13:17
← staafl_ left13:18
→ Raed|Laptop joined13:18
→ Bob8989|2 joined13:18
← Perflosopher left13:19
→ Perflosopher joined13:19
→ muahah joined13:20
← RoriconKnight left13:21
← vdamewood left13:21
→ noteness joined13:22
← Perflosopher left13:22
→ Perflosopher joined13:22
← gxt left13:22
← muahah left13:24
← soee left13:24
→ JimmyRcom_ joined13:24
→ gxt joined13:24
→ RoriconKnight joined13:24
← Perflosopher left13:25
→ Perflosopher joined13:25
← JimmyRcom_ left13:25
← oxymoron93 left13:25
→ subroot joined13:26
← Wetmelon left13:26
← graphene left13:26
→ graphene joined13:26
← graphene left13:27
← Perflosopher left13:27
→ Mat001 joined13:27
→ graphene joined13:27
up_here I have origin/master and master pointing to A, then I do git commit --amend. Will git rebase origin/master "undo" the amend?13:27
← gruetzkopf left13:28
→ gruetzkopf joined13:28
→ Perflosopher joined13:29
→ PioneerAxon_ joined13:30
← PioneerAxon left13:30
← eshlox left13:31
→ crose joined13:34
→ Eryn_1983_FL joined13:35
→ partikkel joined13:41
→ Yoda| joined13:42
→ MyIgel joined13:42
← graphene left13:42
→ graphene joined13:42
→ fluxAeon joined13:43
← xcm left13:44
→ xcm joined13:44
← graphene left13:44
← MyIgel left13:45
← Yoda| left13:45
→ graphene joined13:45
← ruslangaripov left13:46
fuchstronaut how do i rebase everything after A to (including) B ontop of master?13:46
← TomyWork left13:48
up_here fuchstronaut,13:51
git rebase --onto master A B13:51
← rchavik left13:51
← subroot left13:51
→ greyline joined13:53
greyline hi all13:53
dhollin3 → dhollinger13:53
greyline how can I use sourcetree?13:53
it asks bitbucket server or atlassian account, but I just want to use this with aws git repo13:53
→ muelleme joined13:53
up_here doubleclick on the icon?13:53
← graphene left13:53
→ zys joined13:54
→ graphene joined13:54
← graphene left13:55
→ graphene joined13:55
← amirpro left13:56
→ amirpro joined13:56
← kurkale6ka left13:58
← amirpro left14:00
→ amirpro joined14:01
greyline "Please commit your changes or stash them before you merge."14:01
what the hell means "stash them"?14:01
→ Anticom joined14:01
← crater2150 left14:01
→ drot| joined14:02
← m1r4g3_ left14:02
fuchstronaut up_here: thank you !!14:02
nedbat greyline: git stash --help14:04
→ kurkale6ka joined14:04
← drot| left14:05
→ Mir4g3 joined14:05
← _joes_ left14:06
→ stoopkid joined14:06
greyline okay, I truly hate version control systems14:08
← bsaboia left14:08
greyline give me errors almost everytime for files I didn't change or commit14:08
→ stutter_ joined14:08
greyline not enough user friendly at all14:08
→ subroot joined14:09
greyline another informatic system which needs tons of hours reading forums, websites, etc. to learn and understand14:09
→ scrptktty joined14:09
→ michagogo| joined14:09
rafasc greyline: you may consider switching careers to something that doesn't involve coding.14:09
nedbat greyline: if you give us clear information about the problem, someone here can help14:09
← michagogo| left14:10
rafasc because that's the bread and butter of every programmer in the world.14:10
greyline rafasc: I know, but I always nervous and struggling about that14:10
nedbat: it says when pulling "error: Your local changes to the following files would be overwritten by merge:"14:11
→ dsdeiz joined14:11
← dsdeiz left14:11
→ dsdeiz joined14:11
greyline and "Please commit your changes or stash them before you merge."14:11
nedbat greyline: what files?14:11
greyline I have already committed everything...14:11
nedbat greyline: how did you commit them? What does "git status" show?14:12
greyline important files, containing work (not scripts)14:12
rafasc that means you have files locally with changes, but the merge wants to overwrite those files. So git aborts to give you a chance to deal with it.14:12
nedbat greyline: you seem to be saying scripts are not important files, which confuses me, but let's investigaste.14:12
doug16k greyline, he's right, this is one of the super-helpful rooms14:13
← Arcaelyx_ left14:13
doug16k I know approximately nothing about git compared to most of the people here :)14:14
← a3Dman left14:14
→ Arcaelyx joined14:14
greyline nedbat: unity files. scene files14:14
I have commited my scripts, tried to pull things and some meta and other files were in conflict (not my work)14:15
← mud left14:15
greyline then I deleted the conflicted files and without commit obviously I pulled again, but it says again and again that some files are in conflict14:16
which is weird, since I didn't commit those...14:16
→ rsrx joined14:16
rafasc greyline: how do you commit? are you using any flags like -a or -- . ?14:16
→ PedolordIV joined14:17
up_here If you are in conflict, you have to solve it or abort it. Try `git merge --abort`14:17
greyline and it asks me to commit...14:17
rafasc: nope, since I afraid from git console like fire and I use Sourcetree instead14:17
so I don't know what parameters use that for commiting and pulling, etc14:17
but I clone the whole project now instead14:18
maybe I commited accidently my other files also...14:18
and they're conflicting14:18
→ HarryS| joined14:18
← HarryS| left14:19
← PedolordIV left14:19
rafasc greyline: can you paste git status?14:20
← up_here left14:20
greyline rafasc: I don't even know how to ask that14:20
→ a3Dman joined14:20
greyline since sourcetree doesn't have that button...14:20
← RoriconKnight left14:20
→ greggerz joined14:20
→ up_here joined14:21
→ RoriconKnight joined14:21
→ fission6 joined14:21
← upperdeck left14:21
rafasc I don't use sourcetree, if you can deal with using the console, I and certainly others will probably help you.14:21
→ weird_error joined14:21
up_here hm... #sourcetree is pretty much empty, too.14:22
← PioneerAxon_ left14:22
rafasc because there's a couple of things we may need to check to make sure you do the correct thing.14:22
and it's hard to know the state of your repo, if you are not able to tell us information.14:23
→ PioneerAxon joined14:23
→ AndresInSpace joined14:24
→ roler joined14:26
← Bob8989|2 left14:27
→ smallville7123 joined14:29
→ LadyElusive| joined14:29
→ crater2150 joined14:29
← muelleme left14:30
→ donofrio joined14:30
→ Ayo joined14:30
← hsn left14:31
← LadyElusive| left14:31
← javlens left14:31
→ Connection joined14:32
→ KeyJoo joined14:34
← Connection left14:35
→ soee joined14:35
← roler left14:36
→ tjbp joined14:37
← crater2150 left14:38
→ ghost43 joined14:38
← smallville7123 left14:39
→ axsuul joined14:40
→ vdamewood joined14:41
← graphene left14:41
→ graphene joined14:42
← RoriconKnight left14:43
→ yohnnyjoe joined14:43
→ thiago joined14:44
→ crater2150 joined14:45
→ ABIX_Adamj joined14:46
← ABIX_Adamj left14:46
→ RoriconKnight joined14:47
← VladGh_ left14:48
← yohnnyjoe left14:48
← RoriconKnight left14:48
nedbat I want information that I usually get from git log, but i want it in machine-readable format. what other command do I use?14:48
→ VladGh joined14:49
greyline i have solved that14:51
I was afraid again more, than I should have14:52
→ rpage joined14:52
→ beefjoe joined14:52
← paws__ left14:52
← jhaenchen_temp left14:53
rafasc nedbat: depends on the information you want to get.14:53
→ jhaenchen_temp joined14:53
← Regon left14:53
nedbat rafasc: i want hash, message, author. i think rev-list is it?14:54
rafasc nedbat: usually, it's git rev-list --format14:54
but you may want to use log --format for that. rev-list is a bit harder to parse because it always prints the hash, even if you don't specify it on the format argument.14:55
nedbat rafasc: yeah, i'm seeing that....14:55
← zys left14:55
← xcm left14:57
→ xcm joined14:58
← jhaenchen_temp left14:58
← crater2150 left14:58
← mango__ left14:58
→ g00s joined14:58
→ crater2150 joined14:58
← kerframil left14:59
← TheRuckus left15:00
← graphene left15:01
→ graphene joined15:02
← zais left15:02
← nuc left15:02
← tig_ left15:03
→ nuc joined15:04
← Anticom left15:04
→ knownasilya__ joined15:04
← subroot left15:04
← dc13ff left15:05
→ durham joined15:05
→ wpcarro joined15:07
← durham left15:07
← Rashad left15:07
← m00sehead left15:08
→ durham joined15:08
← wpcarro left15:08
→ smallville7123 joined15:08
→ bsaboia joined15:08
→ m00sehead joined15:09
→ wpcarro joined15:09
→ jhaenchen_temp joined15:09
→ maryo joined15:09
→ Geminizer joined15:10
→ matsaman joined15:10
→ zsoc joined15:10
← zsoc left15:10
→ zsoc joined15:10
← matsaman left15:11
← amirpro left15:11
← graphene left15:13
→ graphene joined15:13
→ lanlink joined15:13
← maryo left15:14
→ Xoc3 joined15:16
← Xoc3 left15:16
← Tobbi_ left15:16
← thiago left15:16
← sdwrage left15:17
← smallville7123 left15:17
← ShockingIsntIt left15:18
← gruetzkopf left15:20
→ gruetzkopf joined15:21
→ Cory26 joined15:22
← Cory26 left15:22
← weird_error left15:23
← gruetzkopf left15:24
→ gruetzkopf joined15:24
← shinnya left15:25
→ weird_error joined15:25
← graphene left15:25
→ graphene joined15:26
→ muelleme joined15:26
→ cfoch joined15:27
← wpcarro left15:29
→ smallville7123 joined15:29
→ prepend joined15:31
→ wpcarro joined15:32
← muelleme left15:32
→ wizardedit joined15:32
← wizardedit left15:32
→ wizardedit joined15:32
← staafl__ left15:33
→ jesst joined15:35
← gruetzkopf left15:35
→ gruetzkopf joined15:36
→ jimi_ joined15:36
← wpcarro left15:38
← gruetzkopf left15:39
→ gruetzkopf joined15:40
→ muahah joined15:40
← muahah left15:41
→ Forty-3_ joined15:43
→ wpcarro joined15:43
→ a0sc0tt joined15:44
← erratic left15:45
← gruetzkopf left15:45
→ gruetzkopf joined15:45
← gruetzkopf left15:46
→ gruetzkopf joined15:46
← TinkerT left15:47
← wpcarro left15:47
← gruetzkopf left15:47
→ TinkerT joined15:47
→ gruetzkopf joined15:48
→ luke_penn joined15:48
← donofrio left15:50
→ lanlink_ joined15:50
← tvw left15:50
→ donofrio joined15:51
← jesst left15:51
← lanlink left15:52
← donofrio left15:52
← shicks_ left15:53
← foul_owl left15:53
← gruetzkopf left15:53
← hays left15:54
→ gruetzkopf joined15:54
→ donofrio joined15:54
→ patate4 joined15:54
← patate4 left15:54
→ hays joined15:55
← Dreamer3 left15:56
← gruetzkopf left15:56
→ gruetzkopf joined15:57
← graphene left15:57
→ shicks2525 joined15:57
← bsaboia left15:57
→ graphene joined15:57
→ thiago joined15:57
→ TehNut13 joined15:58
← TehNut13 left15:58
→ ekl- joined15:58
← ekl- left15:58
→ duckgoose7 joined15:58
← duckgoose7 left15:58
→ horse joined15:58
← horse left15:58
← T_UNIX left15:59
← Eryn_1983_FL left15:59
→ Madcotto6 joined15:59
← Madcotto6 left15:59
← dmone left15:59
← durham left16:00
← weird_error left16:00
← netj left16:00
→ netj joined16:00
→ durham joined16:00
→ Tobbi joined16:01
→ maestrojed joined16:02
← smallville7123 left16:02
→ cagomez joined16:02
← luke_penn left16:02
← sysvalve left16:03
← Ayo left16:04
→ Ayo joined16:04
← lanlink_ left16:05
← gruetzkopf left16:06
→ gruetzkopf joined16:06
→ Guest73 joined16:07
→ newbsie joined16:07
← graphene left16:08
→ graphene joined16:08
newbsie I have a question. I have recently merged a feature branch into master branch, the master branch then had several commits. Now I want to work on my feature branch, and need the changes from master. Is the only way to bring that in via merge or rebase?16:08
All my research seems to suggest that, but I wanted to make sure I understood the git process properly.16:09
← wandering_vagran left16:09
→ pd09041999 joined16:09
← gruetzkopf left16:09
→ gruetzkopf joined16:10
→ foul_owl joined16:10
→ applecrumble joined16:10
→ wandering_vagran joined16:10
← charolastra left16:12
rafasc newbsie: since you already merged, can't you just create a brand new branch from the new master tip?16:12
→ Eryn_1983_FL joined16:13
rafasc the alternative is to either merge master back into feature, or cherry-pick the commits that introduced the changes you need.16:13
both will make your history confusing if you use them too many times.16:13
newbsie rafasc: Frankly, I thought once I merged the branch is no more, but I tried to create the feature branch (with the same name), it just switched me over to the older branch stuck at the older merge commit16:14
← inovas left16:14
rafasc merging only affects the branch you have checked out.16:14
→ zais joined16:15
→ fairuz joined16:15
rafasc git checkout master; git merge dev; will bring the changes from dev into master, but dev is left alone.16:15
← stoopkid left16:16
→ Praxi joined16:17
newbsie rafasc: So do most developers just merge or rebase master into feature?16:17
← vdamewood left16:17
newbsie rafasc: I'm trying to understand the proper workflow with git.16:17
rafasc newbsie: that's the problem. There isn't a proper workflow for git.16:17
git supports multiple ways to do stuff.16:18
← applecrumble left16:18
→ applecrumble joined16:18
newbsie rafasc: So what do people do when they want to keep their feature branch up to date with master?16:18
rafasc newbsie: it depends.16:19
← stutter_ left16:19
rafasc newbsie: if it's a "private" branch, by private I mean a branch you know no one else will be using... You can rebase your private branch onto master.16:20
→ inovas joined16:20
← up_here left16:20
rafasc this will rewrite the branch commits, to make it look as if they were made on the most recent master.16:20
this is a form of history !rewrite16:21
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum16:21
← shicks2525 left16:22
rafasc Since you already merged into master, the commits from your branch are reachable from master. So rebase is a bit out of the question.16:22
→ hsn joined16:22
newbsie rafasc: Are there any reasons to keep branch history (as a separate branch)?16:23
→ wpcarro joined16:23
→ jesst joined16:23
→ amirpro joined16:23
← wandering_vagran left16:23
rafasc newbsie: can you reformulate your question? I am not sure what you mean by keep branch history as a separate branch..16:23
→ wandering_vagran joined16:24
hsn i have tags with numeric names like 20 if i reference it like 28^{tag}..HEAD i got error. expected tag type but object dereferences to tree type16:24
→ Regon joined16:24
newbsie rafasc: So when I look in the graph, I can see each branch commit and when it gets merged back into the master. With a rebase I remove all of that branch history, and it looks like I was working on the master branch all along.16:24
rafasc: by branch history, I mean it appears in the graph as a separate work, then remerged back.16:25
→ rorx2 joined16:26
← rorx2 left16:26
→ vdamewood joined16:26
← amirpro left16:26
→ TheRuckus joined16:26
→ amirpro joined16:27
rafasc newbsie: got it, It's mostly developer/project preference. You can do both actually. You can rebase your private branch on top of master, (that will essentially make it linear after master). Go to master and merge "private" with --no-ff16:27
newbsie: that way you force git to make a merge commit, registering that that work as done separately.16:28
← abba left16:28
→ upperdeck joined16:29
← Regon left16:30
← wpcarro left16:31
newbsie rafasc: So my research seems to indicate this --no-ff flag is to not do a fast forward merge and force a merge commit instead.16:31
rafasc hsn: $git for-each-ref refs/tags/28; say commit? If yes, you're using lightweight tags..16:32
→ stutter_ joined16:32
← mikecmpbll left16:33
hsn yes using refs/tags works16:33
newbsie rafasc: I guess I really should ask you, in my situation. I wanted to branch off head of master, but re-use my existing branch name (that was previously merged) and keep the branching history. Is that possible? I think a lot of small merges from master into feature makes it messy.16:33
rafasc hsn: you didn't answer my question.16:33
← Tobbi left16:33
hsn it say commit16:34
← lss8 left16:35
rafasc newbsie: to clarify what I said before, you can rebase your private branch, and it will write on top of the new master, if you tried to merge now, it would just fast foward. (no merge commit would be created).16:35
→ Regon joined16:36
rafasc newbsie: So you can get the best of both worlds by rebasing privately to keep it up to date, and force a merge commit with --no-ff to register the work was done in a separate branch.16:36
→ Enphuego joined16:37
← gruetzkopf left16:37
rafasc but once you merge, you shouldn't rebase again. Because those commits will be reachable from master. And you shouldn't rewrite public history.16:38
→ gruetzkopf joined16:38
rafasc hsn: git has two kinds of tags, annotated and lightweight. annotated are the ones considered ^{tag}. The other are just references to commits. If this is about versioning, you should be using annotated instead of lightweight tags..16:40
← Regon left16:40
← kurkale6ka left16:41
← jesst left16:42
← jimi_ left16:42
→ maryo_ joined16:43
rafasc newbsie: I agree with merging back from master makes a mess. If you already merged, you can delete the old branch and create a new with the same name at the new tip. (that may be unwise though, as it may be confusing if you ever need to refer back to this branch).16:44
← _ADN_ left16:44
← fairuz left16:44
→ salasrod joined16:44
← gxt left16:45
← korzq left16:49
newbsie rafasc: Thank you for your help. It went ahead and tried it on a copied repo to make sure it worked the way I intended it, and it looks great. Really appreciate your help! :)16:50
← flaviodesousa left16:50
← Geminizer left16:50
rafasc newbsie: which one did you choose?16:50
→ GreenJello joined16:50
→ Regon joined16:51
newbsie rafasc: I choose to merge, which fast forwards the branch. Then when I have changes in my branch, then I merge master into feature using --no-ff16:51
→ Ontaine joined16:51
→ \void joined16:52
← graphene left16:52
newbsie rafasc: I think will rebase when I don't want to keep the branch history.16:52
→ ams__ joined16:52
→ MrNePruM joined16:52
→ graphene joined16:53
→ Randy23 joined16:53
← Randy23 left16:53
← minionofgozer_ left16:53
← MrNePruM left16:53
→ MoziM joined16:54
rafasc !lol16:55
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all16:55
→ minionofgozer joined16:56
← floppydh left16:56
rafasc ^ this is handy when inspecting the history.16:56
← beefjoe left16:56
newbsie rafasc: My mind cannot comprehend that.16:57
rafasc newbsie: that means you're not being careful with your history. :P16:57
can you paste it?16:57
← Guest73 left16:58
→ Guest73 joined16:58
newbsie rafasc: It's not that advanced. It's just me. :)17:00
← graphene left17:00
newbsie rafasc: I use Sourcetree since I got a Bitbucket account and that does a good job of displaying the graph.17:00
rafasc newbsie: it does get confusing, especially if you merge back and forward.. (master to feature, feature to master)17:01
BrAsS_mO- → BrAss_mOnKEy17:01
→ dpirch joined17:01
→ graphene joined17:01
newbsie rafasc: In my case, I started with two separate repositories, that I merged into a new one to keep the history.17:01
→ jesst joined17:02
newbsie rafasc: So you have these two dangling branches that didn't start from master, but merged into master, and now branching out again.17:02
← dpirch left17:02
rafasc they're called root commits.17:03
→ dpirch joined17:03
rafasc not very usual, But I guess it makes sense in your case.17:03
← dpirch left17:04
→ dpirch joined17:04
newbsie rafasc: Did not know that. Yeah, I started with two repositories thinking it is better to keep them separate, but it was a pain to keep separate and there was little reason to do so other than try and keep them contained. To speed things up I just did root commits ;)17:05
rafasc I remember there was a email from the linux kernel mailing list where Linus was a bit angry because someone accidentally introduced a root commit. heh17:05
→ Gustavo6046 joined17:06
newbsie lol... He made the tool.17:06
rafasc root commits are the ones listed by: git rev-list --max-parents=0;17:06
← Gustavo6046 left17:07
← fission6 left17:07
→ Gustavo6046 joined17:07
newbsie That command didn't work for me.17:07
rafasc forgot --all;17:09
← jhaenchen_temp left17:13
→ jhaenchen_temp joined17:13
→ fission6 joined17:14
← leeN left17:15
← fission6 left17:20
→ kfoonamalik joined17:21
← maryo_ left17:22
rafasc newbsie: http://lkml.iu.edu/hypermail/linux/kernel/1603.2/01926.html17:22
heh17:22
← KeyJoo left17:23
→ KeyJoo joined17:25
← pd09041999 left17:26
→ muelleme joined17:26
← Ontaine left17:27
→ diamondjed joined17:29
→ fission6 joined17:29
← maestrojed left17:30
← muelleme left17:31
→ shinnya joined17:33
→ staafl__ joined17:33
← gruetzkopf left17:35
→ gruetzkopf joined17:35
→ khmarbaise joined17:35
→ gxt joined17:38
← polman left17:41
→ Kysia joined17:41
← shinnya left17:41
← venmx left17:42
← fission6 left17:42
newbsie rafasc: lol. "silly new root".17:45
rafasc: The irony is just too good!17:45
→ sveinse joined17:45
← gruetzkopf left17:46
→ gruetzkopf joined17:46
rafasc newbsie: http://lkml.iu.edu/hypermail/linux/kernel/1603.2/01906.html17:47
this part is better.17:47
← CheckDavid left17:47
→ lmartin9227 joined17:48
← lmartin9227 left17:48
sveinse I had expected that running git fetch and then git checkout master would get master in sync with origin/master, but apparently I'm mistaking17:49
_ikke_ yeah, just checking out a branch does not make it up-to-date17:51
← graycat left17:51
sveinse _ikke_: why?17:51
_ikke_ you either need to merge the changes in (and sometimes that can fast-forward), or you need to rebase your lcoal branch on top of the other17:51
if you checkout master, you do just that, check out master17:52
newbsie rafasc: That's hilarious. Pure comedy gold! What kind of insane tool? lmao! Intentional broken workflow by nvidia? XD17:52
→ fission6 joined17:52
→ shicks2525 joined17:52
sveinse What is the procedure of getting from a detached head state to head on a branch?17:53
_ikke_ sveinse: if you did not commit anything, you can just checkout the branch again17:53
sveinse _ikke_: no, it just stays in being behind origin/master. So perhaps I need to git fetch; git checkout master; git pull17:55
_ikke_ sveinse: git pull = git fetch + git merge17:56
→ pheizax joined17:56
← pheizax left17:56
_ikke_ git checkout master; git pull17:56
for example17:56
sveinse (because running the normal git pull to get to master on a detached head repo ends up being not what you want, since it runs git merge on the detached head)17:56
_ikke_ but doing a fetch first and inspect hwat you are merging is recommended17:56
→ yohnnyjoe joined18:00
← fission6 left18:00
← rominronin left18:01
→ Pilfers joined18:01
← Pilfers left18:01
→ avelardi22 joined18:01
← avelardi22 left18:01
← gruetzkopf left18:02
→ gruetzkopf joined18:02
← yohnnyjoe left18:05
→ Sasazuka joined18:08
← Regon left18:14
→ publio joined18:14
← Khisanth left18:17
→ Puffball joined18:17
→ shenglong11 joined18:17
← shenglong11 left18:17
← m00sehead left18:17
→ GHABFUW0 joined18:17
→ m00sehead joined18:18
← stutter_ left18:18
→ joebobjoe joined18:18
← elichai2 left18:18
joebobjoe anyone else think the documentation for git ls-files -i could be improved a tad?18:19
the second and third sentences could be merged18:20
→ al-damiri joined18:21
← gruetzkopf left18:21
← tombusby left18:21
→ maryo joined18:21
→ gruetzkopf joined18:22
← staafl__ left18:22
joebobjoe -i, --ignoredShow only ignored files in the output. When showing files in the index, print only those matched by an exclude pattern. When showing "other" files, show only those matched by an exclude pattern. Standard ignore rules are not automatically activated, therefore at least one of the --exclude* options is required.18:23
→ stoopkid joined18:23
joebobjoe is there a difference between "print" and "show"?18:24
← Salek left18:25
→ shakalaka joined18:25
← gruetzkopf left18:26
→ gruetzkopf joined18:26
→ TikityTik joined18:27
TikityTik How can I set my local repo to automatically add all untracked files in a certain directory?18:27
→ tombusby joined18:27
← veegee left18:28
← sauvin left18:28
joebobjoe git add directory/ ?18:29
→ Salek joined18:29
joebobjoe git add directory/\* ?18:29
← arecacea1 left18:32
→ bsanford joined18:32
TikityTik no, that will not automatically add new files, i want it permanently18:32
→ arecacea1 joined18:32
← amirpro left18:32
TikityTik so i don't have to type git add directory/ each time18:32
joebobjoe I mean you just want them added to the index?18:33
→ amirpro joined18:33
← bsanford left18:34
joebobjoe there is gitwatch but that is for automatically committing18:36
→ Khisanth joined18:37
← amirpro left18:37
→ veegee joined18:37
→ amirpro joined18:38
→ JellybeanCantrel joined18:38
← JellybeanCantrel left18:38
TikityTik ahh18:39
→ kerframil joined18:39
← dpirch left18:40
← rpage left18:42
→ x49F joined18:43
← x49F left18:43
→ dreiss joined18:47
← greyline left18:50
→ weird_error joined18:50
← netlar left18:50
→ Dreamer3 joined18:52
→ icantc joined18:52
← graphene left18:53
→ graphene joined18:53
→ netlar joined18:57
← jhaenchen_temp left18:58
→ jhaenchen_temp joined18:59
← icantc left18:59
→ Ontaine joined19:00
← gruetzkopf left19:01
→ gruetzkopf joined19:01
→ jhaenche_ joined19:01
← jhaenchen_temp left19:02
→ beefjoe joined19:04
← kerframil left19:05
← graphene left19:06
← fatalhalt left19:06
→ graphene joined19:06
← Ontaine left19:07
← soee left19:07
← wandering_vagran left19:07
→ brethil18 joined19:08
← brethil18 left19:08
→ dpyro joined19:08
← xcm left19:09
→ kerframil joined19:11
← kes left19:12
← dreiss left19:12
← cfoch left19:12
→ staafl_ joined19:13
→ xcm joined19:13
← graphene left19:13
→ graphene joined19:13
← joebobjoe left19:14
→ stutter_ joined19:21
← vdamewood left19:22
← knownasilya__ left19:24
← newbsie left19:26
← zais left19:26
← graphene left19:26
→ graphene joined19:27
← partikkel left19:28
→ venmx joined19:33
← Guest73 left19:36
→ Guest73 joined19:37
→ exezin1 joined19:37
← exezin1 left19:37
→ ptx024 joined19:38
← ptx024 left19:38
← thiago left19:39
→ silverballz joined19:40
→ graycat joined19:40
← netlar left19:40
→ Sitri6 joined19:44
← Sitri6 left19:44
← amrits_ left19:44
← crose left19:45
→ vdamewood joined19:47
← xcm left19:49
→ xcm joined19:49
← hsn left19:50
← dpyro left19:51
← Guest73 left19:51
→ netlar joined19:52
→ staafl__ joined19:54
← maryo left19:55
→ _joes_ joined19:56
← shicks2525 left19:58
← staafl_ left19:58
→ SpeakerToMeat joined20:00
← jhaenche_ left20:01
→ yohnnyjoe joined20:01
→ Ontaine joined20:01
→ jhaenchen_temp joined20:01
← Ontaine left20:01
→ Ontaine joined20:02
→ shicks2525 joined20:03
→ Guest73 joined20:03
← yohnnyjoe left20:05
← jhaenchen_temp left20:06
→ dpyro joined20:06
→ mallu joined20:06
gitinfo set mode: +v20:06
← m00sehead left20:07
mallu in .gitignore, do I need to specify the full path of the file or just file name?20:07
← Jackneill left20:07
→ Jackneill joined20:08
→ cfoch joined20:10
→ moei joined20:10
→ muelleme joined20:10
← zmt00 left20:11
→ erratic joined20:12
← Jackneill left20:12
→ Jackneill joined20:13
→ joebobjoe joined20:16
→ subroot joined20:16
← Guest73 left20:17
← staafl__ left20:17
→ shinnya joined20:17
→ staafl__ joined20:17
← JanC left20:18
→ rishi` joined20:19
→ JanC joined20:19
→ Guest73 joined20:19
← rishi left20:19
mallu in .gitignore, do I need to specify the full path of the file or just file name?20:20
→ fairuz joined20:20
← shicks2525 left20:20
→ shicks2525 joined20:21
→ jhaenchen_temp joined20:23
dzho the path relative to the given directory, I think20:23
nedbat mallu: if you give just a file name, it will be ignored no matter where it is found20:24
dzho eg, if the location of your .git directory is /home/mallu/project/.git and you have /home/mallu/project/library/boilerplate.py then you need a line in /home/mallu/project/.gitignore of 'library/boilerplate.py'20:25
but then I defer to nedbat on the general case20:25
← tuxd00d left20:25
mallu thanks nedbat.. I just wanted to confirm it20:25
nedbat i often need to cherry-pick changes from a github pull request that has (say) 3 commits. I can cherry-pick the individual commits, but is there an easier way to get all of them?20:31
← Ontaine left20:32
→ thiago joined20:32
→ bobe3 joined20:32
← bobe3 left20:32
→ __idiot__ joined20:32
← __idiot__ left20:32
← mikedd left20:34
← Guest73 left20:34
→ banisterfiend joined20:35
← Typhon left20:37
← mlopezviedma_ left20:37
→ fatalhalt joined20:37
← fluxAeon left20:37
→ avar joined20:39
→ bsaboia joined20:39
← avar left20:39
→ avar joined20:39
← mallu left20:39
← subroot left20:39
→ m00sehead joined20:40
← Puffball left20:40
→ bouncy joined20:41
→ Puffball joined20:42
_ikke_ !github_pr20:42
!pr20:42
← khmarbaise left20:42
_ikke_ !github_pull20:42
gitinfo To easily see Github Pull Requests in your local repo, use this fetchspec trick: https://gist.github.com/piscisaureus/334224720:42
→ _ADN_ joined20:49
→ Mikaela22 joined20:49
← Mikaela22 left20:49
→ sdwrage joined20:50
← netj left20:50
→ netj joined20:51
→ jnavila joined20:51
→ Typhon joined20:52
← graphene left20:54
→ mallu joined20:55
gitinfo set mode: +v20:55
→ graphene joined20:55
mallu I have a couple of config files in my repo I don't want anyone to edit/delete/modify. How can I lock those files?20:56
→ kurkale6ka joined20:56
_ikke_ because git is distributed, it has no concept of locks20:56
What you can do is to use git hooks for example to reject changes to these files (when comitting locally, or when pushing to a remote)20:57
→ edwardly joined20:57
← edwardly left20:57
→ edwardly joined20:57
→ c0c0 joined20:57
mallu _ikke_: is there any example you can provide?20:58
← muelleme left21:00
_ikke_ see man githooks21:02
gitinfo the githooks manpage is available at https://gitirc.eu/githooks.html21:02
_ikke_ If you want to prevent others from pushing changes, you'd need a pre-receive hook on the server21:02
→ troulouliou_div2 joined21:04
← troulouliou_div2 left21:04
← m00sehead left21:04
→ ZyX-I joined21:05
nedbat _ikke_: thanks, i have a way to get the pr branch (https://nedbatchelder.com/blog/201407/fetching_github_pull_requests.html), but the branch doesn't make clear what the commits are, or how to get N commits nicely into one cherry-pick.21:06
← jnavila left21:06
← plitter left21:07
← joebobjoe left21:07
→ jnavila joined21:09
→ m0viefreak joined21:13
← sdwrage left21:13
← jnavila left21:16
← dolphy left21:16
→ Tobbi joined21:17
→ phantombeta joined21:17
→ dolphy joined21:18
← publio left21:18
← amirpro left21:18
← phantombeta left21:18
→ phantombeta joined21:19
← phantombeta left21:19
← dsdeiz left21:20
← banisterfiend left21:21
→ phantombeta joined21:23
← phantombeta left21:23
← graphene left21:26
→ graphene joined21:26
→ Guest73 joined21:26
← staafl__ left21:26
→ mattcen joined21:27
→ syncretism_mbl5 joined21:28
← syncretism_mbl5 left21:28
← dolphy left21:30
← applecrumble left21:30
→ nickenchuggets joined21:31
← nickenchuggets left21:31
→ nickenchuggets joined21:31
→ doubtful joined21:32
→ beatzz joined21:33
← Ayo left21:34
→ Dougie187 joined21:34
← bsaboia left21:36
← CodeSlingerPaul left21:36
← gruetzkopf left21:37
→ fluxAeon joined21:37
→ gruetzkopf joined21:37
→ ffernand29 joined21:38
← ffernand29 left21:38
→ apollojustice21 joined21:38
← apollojustice21 left21:38
← Dreamer3 left21:38
Dougie187 Hopefully there is a `git notes` expert in the house... Does anyone know how to pull notes from a refspec and have them merge into your existing notes without overwriting the notes you currently have?21:39
→ dsdeiz joined21:40
← dsdeiz left21:40
→ dsdeiz joined21:40
← graphene left21:40
→ graphene joined21:40
→ muelleme joined21:41
→ Wetmelon joined21:47
← durham left21:49
← silverballz left21:49
→ durham joined21:49
→ banisterfiend joined21:50
← AndresInSpace left21:50
← c0c0 left21:51
→ matsaman joined21:52
← TheRuckus left21:52
← greggerz left21:54
→ bergice_ joined21:55
← muelleme left21:57
← fluxAeon left21:57
→ TheRuckus joined21:58
← doubtful left21:58
← martinus__ left21:59
→ yohnnyjoe joined22:02
← TheRuckus left22:02
→ Dreamer3 joined22:05
← vdamewood left22:05
← stutter_ left22:06
← yohnnyjoe left22:06
← Tobbi left22:07
← banisterfiend left22:11
← beatzz left22:12
→ sarp joined22:14
→ arooni joined22:14
← schleppel left22:14
← fairuz left22:14
→ TheRuckus joined22:15
← Dougie187 left22:15
→ applecrumble joined22:16
→ Ayo joined22:19
← beefjoe left22:20
← mattcen left22:23
→ Tobbi joined22:24
→ mattcen joined22:25
← mallu left22:25
← plexigras left22:26
→ silverballz joined22:29
← Forty-3_ left22:31
→ fstd_ joined22:31
→ Forty-3 joined22:32
→ fairuz joined22:32
→ r0bby9 joined22:32
← r0bby9 left22:32
← fairuz left22:34
← fstd left22:34
fstd_ → fstd22:34
→ valkyr2e joined22:37
← jcarpenter2 left22:39
← ams__ left22:42
→ FernandoBasso joined22:45
← TheRuckus left22:46
← Tobbi left22:48
← Wetmelon left22:48
→ pztrick joined22:50
← rafasc left22:55
→ TheRuckus joined22:55
← silverballz left22:56
→ eGGshke joined22:57
← prepend left22:57
← mmattice left23:00
← g00s left23:01
← graycat left23:02
→ sst6623 joined23:03
← sst6623 left23:03
→ joebobjoe joined23:04
← finalbeta left23:04
← dstw left23:04
← xcm left23:06
→ Cthalupa joined23:07
→ xcm joined23:07
→ mikecmpbll joined23:07
→ LewsThanThree0 joined23:08
← LewsThanThree0 left23:08
→ bolt4 joined23:08
← bolt4 left23:08
← KeyJoo left23:09
→ banisterfiend joined23:12
← netj left23:13
← mescalinum left23:13
→ netj joined23:13
← matsaman left23:13
→ Powielony joined23:13
→ goweol joined23:14
← Powielony left23:15
← TikityTik left23:19
→ Guest94814 joined23:22
← Guest94814 left23:22
→ wreed joined23:24
→ kus_ubuntui686 joined23:27
→ dendazen joined23:30
← rsrx left23:30
→ graycat joined23:31
← wizardedit left23:31
← Ayo left23:32
← graycat left23:36
← scrptktty left23:38
→ Kaisyu joined23:43
← _ADN_ left23:45
← m0viefreak left23:48
← applecrumble left23:49
→ RuckusBringer joined23:50
← TheRuckus left23:54
← diogenese left23:56
→ lanlink joined23:57
→ catch22 joined23:59

Logs Search ←Prev date Next date→ Channels Documentation