Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-18

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:01 cdown_ joined #git
00:04 Derperperd joined #git
00:11 eka joined #git
00:12 roko joined #git
00:14 cdown_ joined #git
00:14 ResidentBiscuit joined #git
00:16 danslo joined #git
00:17 Learath2 joined #git
00:18 mischat joined #git
00:18 geko joined #git
00:26 SwiftMatt joined #git
00:27 Levex joined #git
00:31 e14 joined #git
00:33 mizu_no_oto joined #git
00:35 sssilver joined #git
00:38 r3c0d3x joined #git
00:40 geko joined #git
00:41 Dohplay joined #git
00:42 ochorocho__ joined #git
00:45 metrixx joined #git
00:45 harish_ joined #git
00:48 Sasazuka joined #git
00:49 mischat joined #git
00:50 mischat joined #git
00:50 sl4v3 joined #git
00:50 mischat joined #git
00:52 Vinnie_win_u joined #git
00:52 Anja joined #git
00:53 brokensyntax joined #git
00:54 nettoweb joined #git
00:54 shaggycat joined #git
00:55 rockstar_ joined #git
00:58 Noldorin joined #git
00:59 malcon joined #git
01:00 Cork joined #git
01:00 fshp whitby: git merge --no-commit
01:02 fstd_ joined #git
01:06 Dougie187 joined #git
01:06 juicymooCA joined #git
01:07 pks joined #git
01:08 TacticalJoke joined #git
01:09 ekinmur joined #git
01:09 raspado joined #git
01:09 sunri5e joined #git
01:10 HoierM joined #git
01:10 TacticalJoke What is the purpose of the `--max-count` option for `git log`?  We can already say `git log -5` or `git log -n5`.
01:10 brokensyntax joined #git
01:10 thiago joined #git
01:13 Anja joined #git
01:14 rockstar___ joined #git
01:14 d^sh joined #git
01:15 brokensyntax joined #git
01:17 danslo joined #git
01:17 NeverDie joined #git
01:18 fshp TacticalJoke: Most options have long and short form.
01:20 Sasazuka__ joined #git
01:20 Wulf4 joined #git
01:21 t0n1c joined #git
01:22 re1 joined #git
01:22 morenoh149 joined #git
01:23 re1 joined #git
01:23 dk0r joined #git
01:23 dk0r Having trouble w/ the git instructions here: http://www.electrode.io/docs/deploy_app.html
01:24 dk0r Specifically "git remote add origin https://.../your-awesome-app.git"
01:24 dk0r dAfter which I get the the following error: "fatal: remote origin already exists."
01:29 finalbeta joined #git
01:31 ResidentBiscuit joined #git
01:32 xall joined #git
01:36 t0n1c joined #git
01:39 dimensiOn joined #git
01:39 TacticalJoke left #git
01:41 brokensyntax joined #git
01:41 Anja joined #git
01:41 Rodya_ joined #git
01:46 lxnch joined #git
01:46 richardlitt joined #git
01:46 jaguarmagenta joined #git
01:46 wizonesolutions joined #git
01:46 mehdi___ joined #git
01:46 dodobrain joined #git
01:46 Awesomecase joined #git
01:46 brokensyntax joined #git
01:46 Lipp joined #git
01:46 ToeSnacks_ left #git
01:46 somaReve1 hi, when using git submodule update to pull my git sub projects, they always end up in detached HEAD branch. How can I fix this?
01:46 Guest66634 joined #git
01:47 Lor_ joined #git
01:47 foist joined #git
01:49 barq joined #git
01:49 joseph_arnstein_ joined #git
01:49 ToeSnacks joined #git
01:49 Vampire0_ joined #git
01:51 kireevco_ joined #git
01:52 mischat joined #git
01:52 brokensyntax joined #git
01:52 virmitio joined #git
01:53 Ravana joined #git
01:55 jaguarmagenta joined #git
01:55 moop joined #git
01:56 jottr joined #git
01:57 CheckDavid joined #git
01:58 Lor_ joined #git
01:59 foist joined #git
01:59 Limes_ joined #git
01:59 boxrick1_ joined #git
02:04 cdg joined #git
02:06 cdg joined #git
02:07 Iacobus_ joined #git
02:07 durham_ joined #git
02:08 mizu_no_oto joined #git
02:12 evanwang joined #git
02:14 lagothri1 joined #git
02:14 Goplat joined #git
02:16 ochorocho__ joined #git
02:16 ResidentBiscuit joined #git
02:20 raijin joined #git
02:23 gfixler joined #git
02:23 liuzhen joined #git
02:24 da5id joined #git
02:24 Lor__ joined #git
02:26 Zeranoe joined #git
02:27 virmitio Unusual request for a git repo internal to my company:  Looking for a means to have branch-specific same-named files that are only commitable from the same branch.  Objective is to specify a file (in .gitattributes, maybe?) which will never merge or fast-forward when merging from a child/feature branch.
02:27 Zeranoe How could I search for a change made to a file, in order to find what commit a regression was introduced? I know the line in question if that helps
02:29 ResidentBiscuit joined #git
02:29 virmitio Zeranoe: I think you're looking for 'git blame', though I haven't used it enough to recall the syntax to find what you're wanting.
02:30 lungaro well there is a way to search a tree of changes to find when "X" fails. Is that when you mean Zeranoe ?
02:30 Zeranoe Probably not the right way to do it, but I came up with this: git log -p file | grep -C 10 'string'
02:30 johnmilton joined #git
02:31 xameada_ joined #git
02:31 virmitio Zeranoe: give this a try and see if it gets you close to what you're wanting:  'git blame -L<start_line_range>,<end_line_range> -- <file>'
02:32 lungaro oh. I wsa way off. git bisect is a way to do it too if you wanted to run a unit test to identify what commit broke it
02:32 hexagoxel joined #git
02:35 al-damiri joined #git
02:36 TacticalJoke joined #git
02:37 TacticalJoke Can't seem to find an answer in Google -- if I rebase `foo` onto `master`, can I automatically fast-forward-merge `master` into `foo`?
02:37 davimore_ joined #git
02:37 virmitio assuming that the rebase completes cleanly, I believe so, TacticalJoke
02:39 TacticalJoke virmitio: What I mean is -- can I do all that in one command?  It's tedious typing `git rebase master`, `git checkout master`, `git merge foo`, and `git branch -d foo`.
02:39 vincentor joined #git
02:42 henriquev joined #git
02:43 howdoi joined #git
02:44 jstimm joined #git
02:45 virmitio TacticalJoke: I've never tried doing that as a combined command, and I'm not seeing a single-command way to accomplish it as I look through the rebase or merge docs.  Anyone else have an idea?
02:46 TacticalJoke Hmm, maybe something like this alias will help: `ff = "!f() { git merge $1; git branch -d $1; }; f"`
02:46 TacticalJoke To combine fast-forwarding and removing the branch.
02:48 Lipp joined #git
02:48 virmitio actually, from branch 'master' (and assuming you know 'foo' branched at commit AA),  you could try something like 'git rebase --onto master AA foo', though even if that updates master, it won't remove branch foo afterward
02:48 virmitio Zeranoe: did you fine what you needed?
02:48 virmitio *find
02:49 malcon joined #git
02:49 chachasmooth joined #git
02:50 jstimm joined #git
02:51 brokensyntax joined #git
02:57 nilg joined #git
02:59 eka joined #git
02:59 Zeranoe virmitio: Yes thank you
03:01 watabou joined #git
03:05 Ravana joined #git
03:07 aavrug joined #git
03:07 f3r70rr35f joined #git
03:07 mehola joined #git
03:08 aavrug joined #git
03:09 Dougie187 left #git
03:09 raijin joined #git
03:10 ojacobson TacticalJoke: if you want it to fast-forward, say so
03:10 ojacobson git merge --ff --ff-only "$1"
03:10 ojacobson (--ff re-enables fast-forward merges even if no-ff would be applied by config, and --ff-only suppresses every other kind of merge)
03:11 morenoh149 joined #git
03:12 svm_invictvs joined #git
03:12 TacticalJoke ojacobson: Fast-forwarding is working fine.  I'm just trying to combine the rebase and the fast-forward.
03:12 TacticalJoke I think it's impossible without scripting, though.
03:12 Sudden_ joined #git
03:12 ojacobson git cherry-pick master..foo
03:12 ojacobson off the top of my head :)
03:13 ojacobson (That works for trivial rebases, which contain no merges and where you do not want to edit the rebase at all)
03:13 cyan__ joined #git
03:14 Vortex35 joined #git
03:16 DeltaHeavy joined #git
03:20 mangolisk joined #git
03:22 dreiss joined #git
03:22 NeverTired joined #git
03:24 vedharish joined #git
03:26 fedepad joined #git
03:26 vedharish joined #git
03:28 nowhereman joined #git
03:30 nilg joined #git
03:32 danlovesppipes joined #git
03:32 robotroll joined #git
03:37 f3r70rr35f joined #git
03:38 ResidentBiscuit joined #git
03:39 mizu_no_oto joined #git
03:42 PioneerAxon joined #git
03:42 kyan joined #git
03:45 durham joined #git
03:45 BSaboia joined #git
03:45 TacticalJoke left #git
03:46 durham joined #git
03:46 nilg joined #git
03:47 daynaskully joined #git
03:48 sdothum joined #git
03:49 lactose why doesn't Git have a default SMTP SSL port set :|
03:49 lactose then it just sits there if you didn't set one
03:49 Lipp joined #git
03:52 nilg joined #git
03:56 thiago lactose: blame your distro if it isn't in /etc/services
03:56 jottr joined #git
03:56 nwkj86 joined #git
03:56 thiago they'll blame further up, because that port is non-standard
03:59 lactose aw
04:01 lactose thiago, thank you
04:02 Orbitrix joined #git
04:02 Orbitrix joined #git
04:02 lactose thiago, they're actually set to another services "submission        587/tcp"
04:02 lactose it's*
04:02 thiago submission is not smtps
04:02 lactose -s
04:02 brokensyntax joined #git
04:02 lactose right
04:03 Zeranoe left #git
04:03 mrkake joined #git
04:07 phanimahesh joined #git
04:07 hariel joined #git
04:08 r3c0d3x joined #git
04:13 zivester joined #git
04:15 brillenfux joined #git
04:16 Andrew_K joined #git
04:17 jstimm joined #git
04:19 mischat joined #git
04:20 cagedwisdom joined #git
04:20 ki0 joined #git
04:27 eshlox joined #git
04:31 ResidentBiscuit joined #git
04:34 lindenle joined #git
04:37 grawity "smtps" was just vaguely "like port 25 but with implicit tls"
04:37 grawity "submission" instead uses starttls like regular smtp, but has functional differences
04:39 lafi joined #git
04:39 Cabanossi joined #git
04:43 littleforest joined #git
04:44 ferr joined #git
04:44 Raging_Hog joined #git
04:48 evanwang joined #git
04:48 daey_ joined #git
04:49 thierryp joined #git
04:51 Lipp joined #git
04:53 xall joined #git
04:53 ojacobson yeah, submission is plain SMTP (plus starttls, just like port 25) but intended for clients of a mail host to use when injecting mail to be sent onwards, rather than for other sites to deliver mail to the host
04:55 freimatz joined #git
04:57 cagedwisdom joined #git
04:58 subhojit777 joined #git
04:59 khfeng joined #git
05:00 morenoh149 joined #git
05:00 dermoth joined #git
05:02 Kaisyu joined #git
05:05 nds_ joined #git
05:06 durham joined #git
05:11 alhariel joined #git
05:16 justrohu joined #git
05:17 overlord_tm joined #git
05:17 ochorocho__ joined #git
05:17 cagedwisdom joined #git
05:18 justrohu Hello all I need help ... how do I create a repository into which my colleges can submit their work and then after verifying that I can push it on to github
05:19 justrohu sorry for bad english
05:20 mischat joined #git
05:21 mischat joined #git
05:22 Cabanossi joined #git
05:26 ResidentBiscuit joined #git
05:28 cagedwisdom joined #git
05:30 phroa justrohu: you might want to have them create 'pull requests', a feature of github
05:31 phroa https://help.github.com/categories/colla​borating-with-issues-and-pull-requests/
05:31 phroa a "pure" git solution might be having them email you patches (man git format-patch, man git request-pull) which you then commit yourself (man git am) if they're good
05:31 gitinfo the git-format-patch manpage is available at http://jk.gs/git-format-patch.html
05:31 gitinfo the git-request-pull manpage is available at http://jk.gs/git-request-pull.html
05:31 gitinfo the git-am manpage is available at http://jk.gs/git-am.html
05:32 phroa (by the way, it's confusing, but request-pull and "pull request" are not related)
05:34 justrohu phroa, thank you
05:39 ThomasLocke joined #git
05:40 acetakwas joined #git
05:42 Raging_Hog joined #git
05:45 kenden joined #git
05:49 qt-x joined #git
05:52 thierryp joined #git
05:52 Lipp joined #git
05:55 evanwang joined #git
05:55 bmahe joined #git
05:56 LucaTM joined #git
05:57 eka joined #git
05:57 jottr joined #git
05:58 brokensyntax joined #git
05:59 rscata joined #git
06:01 hahuang65 joined #git
06:01 satya4ever joined #git
06:02 Montu joined #git
06:02 scottbuckel joined #git
06:02 eka joined #git
06:03 Montu joined #git
06:05 SwiftMatt joined #git
06:05 liuzhen joined #git
06:06 eka joined #git
06:07 lb1c joined #git
06:09 bmahe joined #git
06:11 freimatz joined #git
06:12 overlord_tm joined #git
06:13 bmahe joined #git
06:14 metrixx joined #git
06:15 fedepad joined #git
06:17 jknetl joined #git
06:20 ResidentBiscuit joined #git
06:22 dan2k3k4 joined #git
06:22 phanimahesh joined #git
06:23 chele joined #git
06:23 JeroenT joined #git
06:23 fees joined #git
06:23 fedepad joined #git
06:24 barteks2x joined #git
06:24 nowhere_man joined #git
06:26 govg joined #git
06:33 [twistii] joined #git
06:34 [twistii] can i make a branch a part of a git url ? i have a plugin that auto commits config changes to git, but i can only supply a url, not specify a branch, and i dont want it to litter the master branch
06:34 _ikke_ no, git does not recognize refnames in the remote urls
06:34 _ikke_ You can take a look if that plugin recognizes it though
06:35 jnavila joined #git
06:39 gtristan joined #git
06:40 ShekharReddy joined #git
06:40 [twistii] not from what i can tell, and its not worth making a PR over since the project doesnt seem to be getting much attention in the last years
06:40 [twistii] i guess ill just set it to use a fresh bitbucket repo and live with the messy commit history
06:42 ayogi joined #git
06:42 evanwang_ joined #git
06:43 thierryp joined #git
06:49 morenoh149 joined #git
06:50 Anja joined #git
06:51 rendar joined #git
06:53 Lipp joined #git
06:54 acr4 joined #git
06:55 Fissure joined #git
06:58 rominronin joined #git
06:58 Balliad joined #git
06:58 nd joined #git
07:03 Ardethian\work joined #git
07:05 stuivi joined #git
07:05 jozwior joined #git
07:05 dreiss joined #git
07:06 Sceorem joined #git
07:06 rominron_ joined #git
07:07 Ardethian\work joined #git
07:09 fedepad joined #git
07:10 mindriot101 joined #git
07:13 sonvh joined #git
07:14 ayogi joined #git
07:14 timvishe` joined #git
07:14 Emperor_Earth joined #git
07:14 ResidentBiscuit joined #git
07:15 danslo_ joined #git
07:15 TomyWork joined #git
07:15 bruce_lee joined #git
07:15 bruce_lee joined #git
07:16 Vinnie_win joined #git
07:17 sorenb joined #git
07:18 elect joined #git
07:18 danslo_ joined #git
07:18 qpdb joined #git
07:19 noidea joined #git
07:19 noidea joined #git
07:21 cbreak auto committing sounds braindead :(
07:22 [twistii] its just to keep a backup of a configuration to see when what was changed
07:23 ronskisika joined #git
07:23 a3Dman joined #git
07:24 unforgiven512 joined #git
07:25 jozwior joined #git
07:26 cagedwisdom joined #git
07:30 djb-irc joined #git
07:30 moei joined #git
07:31 corsibu joined #git
07:32 shock- joined #git
07:33 Alienpruts joined #git
07:34 elastix joined #git
07:35 fiddlerwoaroof joined #git
07:36 thierryp joined #git
07:36 thierryp joined #git
07:38 lindenle joined #git
07:38 the_last joined #git
07:38 Haliucinas joined #git
07:39 the_last i'm getting ^M at the end of the lines on my git commits, any idea what's up with this? is it a vim problem? i don't see any weird characters in my actual files.
07:40 osse the_last: the files are using windows style line endings
07:40 bmahe joined #git
07:42 JeroenT joined #git
07:44 GavinMagnus joined #git
07:44 the_last osse, ah okay, must be because i downloaded them as html templates
07:45 the_last so is that \r\n instead of \n?
07:45 jozwior joined #git
07:45 carpii joined #git
07:46 carpii if i push to a bare repo from one machine, then git pull on my server, why is it that sometimes the server git says its XX commits ahead of origin/master? No changes are ever made directly on the server
07:47 osse the_last: yes
07:48 osse carpii: have you force-pushed? in that case the server may have done merges
07:48 carpii hm actually i did yes :/
07:48 carpii a few days ago
07:49 osse yup...
07:49 Alienpruts joined #git
07:49 osse the moral of the story is: don't pull in a script
07:49 osse !deploy
07:49 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.html
07:50 djb-irc joined #git
07:50 carpii i dont, ii deploy via rsync at the moment
07:50 carpii but my changes werent taking effect, at which point i noticed the git issue
07:50 osse ah
07:50 carpii can i hop onto server and just git reset origin/master --hard?
07:50 osse ok, the moral of the story then is: don't pull on a dumb server that just needs the newest data
07:51 osse yes
07:51 carpii ok thanks
07:51 xall joined #git
07:51 osse and use that from now on
07:51 carpii routinely ?
07:52 carpii its very rare i force push, but i was in a pickle that day :)
07:52 osse yes routinely
07:52 osse in this case pull has no advantages
07:52 serycjon joined #git
07:53 King_Hual joined #git
07:53 carpii oki, thanks
07:53 osse well i don't know your routines, but whenever you would have done pull
07:53 yqt joined #git
07:53 osse this is only for the server you don't develop on, btw.
07:53 carpii yep
07:53 carpii pull isnt actually necessary at all, i just prefer it not to be 1001 commits behind
07:54 finalbeta joined #git
07:55 encod3 joined #git
07:56 mikecmpbll joined #git
07:56 jhasse Hi! I'm in detached HEAD state and want to forward master to the current commit (not origin/master). How can I do that?
07:57 TomyWork joined #git
07:58 jottr joined #git
07:58 carpii forward?
07:58 osse jhasse: git checkout master; git merge HEAD@{1}
07:58 cagedwisdom joined #git
07:59 osse hmm, merge --ff-only I suppose
08:00 mischat_ joined #git
08:00 jhasse osse, thanks! :) What does @{1} mean?
08:01 osse jhasse: the previous value of HEAD according to the reflog
08:01 osse basically "what HEAD pointed to before what it points to now"
08:01 jhasse ah nice. Thanks :)
08:02 carpii couldnt he just use git reset --hard for that also?
08:02 govg joined #git
08:02 carpii nm, would assume he hasnt pushed
08:03 osse carpii: yes, and there are ways without even checking out first
08:04 osse git update-ref (a bit blunt)
08:04 osse or git push . HEAD:master (a bit magic, but does the ff check)
08:04 theskillwithin joined #git
08:06 fiddlerwoaroof joined #git
08:08 bongjovi joined #git
08:09 ResidentBiscuit joined #git
08:10 virmitio Been a few hours, so I'm going to toss up my question again:  Looking for a means to have branch-specific same-named files that are only commitable from the same branch.  Objective is to specify a file (in .gitattributes, maybe?) which will never merge or fast-forward when merging from a child/feature branch.  All possible solutions welcomed.
08:11 ^7heo wat?
08:12 carpii lets say you find a way to do this, how do you expect it to work when the branch is merged into master for example?
08:15 virmitio for file A, existing in both master and foo, a merge from foo to master should always leave A in master as before the merge.  I've tried making an empty custom merge driver (labelled 'ours') and assigned that to the file in .gitattributes.  This produces the desired effect as long as there has been a change to A in both master and foo since foo branched.
08:16 virmitio However, if foo changed A and master has remained the same, it fast-forwards A to content from foo, regardless of --no-fast-forward switch.
08:16 carpii oh my
08:16 _ikke_ virmitio: gits branch / merge model is not suited for this
08:17 carpii can you explain why its needs to be the same name?
08:17 halbomin joined #git
08:17 ki0 joined #git
08:17 clmsy joined #git
08:17 carpii you might be better just adding it to gitignore, and then have a git hook which takes a snapshot when the master copy is changed
08:17 virmitio The desired behaviour is exactly as strange and awkward as it sounds, but is likely still better than the many dozen unrelated and competing files that will end up in the tree via the other options the work team came up with.
08:17 chll_ joined #git
08:17 _ikke_ virmitio: merges that don't take changes from both sides are so called evil-merges
08:18 shaggycat joined #git
08:18 _ikke_ virmitio: Isn't this a deployment problem?
08:18 virmitio of a sort, it's an issue during build across multiple teams from same initial (and releasing) code repo
08:19 ochorocho__ joined #git
08:19 virmitio I have failed to convince my corporate overlords that the current arrangement should be broken out into many smaller repositories.  So now I get to solve the resulting build issue.
08:19 carpii what is this file, some sort of local config?
08:20 virmitio essentially, yes, carpii
08:20 carpii and the build tools absolutely have to use an identical name, no way to pass it as a cmdline param or anything?
08:21 ^7heo virmitio: isn't what you want a unionfs of sorts?
08:21 fuchstronaut joined #git
08:21 fuchstronaut joined #git
08:21 virmitio branches for dev, staging, and release all are supposed to be collecting build artfacts from different locations.  and every feature branch and private work branch has the same issue.  We could have the build system look at specific files for each branch, but that means we need a new build definition in the build system for every branch, including those feature and work branches
08:23 virmitio ^7heo: ideal would be that we have essentially config.txt and override.txt, where config.txt carries from branch to branch as normal, and override.txt contains replacement values and never transfers between branches (but may still need to commit branch-local changes, which is the rub)
08:23 marcogmonteiro joined #git
08:24 virmitio I'm reasonably convinced that what I'm looking for can't currently be done in a still-functional way, but I'm asking here in the vain hope that I
08:24 virmitio *that I'm wrong
08:24 _ikke_ virmitio: The issue is a result from combining a generic project with specific deployment targets
08:24 _ikke_ in the same repo
08:25 harish_ joined #git
08:25 leehambley joined #git
08:25 _ikke_ Which we see people often try, but as many times resulting in the same problems
08:25 virmitio again, you're not wrong.  But that's a battle I've already fought and lost for internal political reasons
08:25 carpii what if you had a master config, which stored all the various configs, lets say it was a json file or something
08:26 carpii what way you could merge it safely into master, and still keep branch specific commits
08:26 ^7heo virmitio: how about multiple repos with different content
08:26 carpii and then a git checkout hook which takes this master config, and writes out the local branch config
08:26 carpii what way / that way
08:26 _ikke_ virmitio: to be clear then, you cannot have files with different contents in different branches and not have git merge them
08:26 ^7heo and unionfs with the right ones?
08:27 theskillwithin in #web-social  a ton of people actually pm'd me their email for a resource list.  just copy and pasted it into a gist  https://gist.github.com/theskillwith​in/0b2ca6aa7767a7b227728ab65d36cc83
08:27 theskillwithin oh wow that looks like shite
08:27 _ikke_ virmitio: So any feasible git-only solution is to name each deployment target uniquely
08:27 theskillwithin too lazy to fix atm,  it did look good tho in the email!  https://i.imgur.com/O3Hswyf.png
08:27 carpii well, not necessarily
08:27 _ikke_ theskillwithin: What has this to do with #git?
08:28 theskillwithin well I am a major proponent of using git in the cli
08:28 _ikke_ theskillwithin: I'm missing a lot of context :-)
08:28 carpii great! whats this got to do with git?
08:28 virmitio honestly, _ikke_, the only part of the desired operation that I can't find a solution for is how to prevent a fast-forward change from being applied, as a ff commit doesn't appear to trip the custom merge driver
08:28 * theskillwithin hides behind an object that does not fully hide him
08:29 _ikke_ virmitio: there is no such thign as a ff commit
08:29 _ikke_ virmitio: fast-forward only means that git moves a branch
08:29 variuss joined #git
08:29 _ikke_ virmitio: and git only does that when branches haven't diverged
08:29 _ikke_ !ff
08:29 gitinfo A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf
08:29 virmitio _ikke_: I won't argue the terms with you, you're undoubtedly correct.  I'm just trying to describe observed behaviour
08:30 variuss left #git
08:30 carpii virmito if its just a case of preventing commits, you could do this with git hooks. But im not entirely sure who you want it to work.... seems you want to commit to local rbanches, but then do some magic when that branch gets merged
08:30 _ikke_ virmitio: I'm trying to explain why it does not execute the merge driver
08:30 _ikke_ virmitio: There is nothing being merged
08:30 JeroenT joined #git
08:30 serycjon joined #git
08:31 virmitio essentially, yes, carpii.
08:31 star_prone joined #git
08:31 carpii but can you explain the magic you want to happen?
08:31 carpii its still a bit muddy
08:31 virmitio _ikke_: any chance there's a way to force it to perform a merge with only one parent instead of the default ff?
08:31 theskillwithin joined #git
08:31 _ikke_ carpii: prevent certain files from being merged
08:31 fuchstronaut joined #git
08:32 finalbeta joined #git
08:32 carpii but still allow them to be commited, right ?
08:32 virmitio and _ikke_, I realize exactly how silly that last question sounds, but it would still solve my technical issue to a political problem
08:32 _ikke_ virmitio: Just to understand, why do you want the merge driver to kick in in this case?
08:32 kurkale6ka joined #git
08:33 virmitio _ikke_: in all cases where the merge driver I've assigned runs, it correctly retains the master version of A when merging foo to master
08:34 _ikke_ But when git fast-forwards when doing a merge, there should be no difference in A between the source and destination branch
08:34 ^7heo then create dummy content
08:34 virmitio hence, if I can break it badly enough that it will merge with only one parent (this sounds more silly every time I type it), it should produce the sought behaviour
08:34 ^7heo add comments to the lines in master
08:34 ^7heo so they change
08:34 _ikke_ ^7heo: You can prevent git to ff if you want
08:35 ^7heo _ikke_: yeah
08:35 carpii i dont think its going to materially affect the problem he has tho
08:35 _ikke_ virmitio: With only one parent, there is nothing to merge
08:35 _ikke_ virmitio: Don't you want a post-checkout hook?
08:36 carpii did you reject my idea of a master config containing all subconfigs?
08:36 carpii with a githook to do some housekeeping for the local branch config
08:36 ^7heo carpii: my understanding is that he has to avoid ff
08:36 _ikke_ virmitio: I'm trying to work with you, but not fully understanding why you need to merge driver in that specific case
08:36 carpii well thats what he thinks he wants, just trying to establish whether theres another way :)
08:36 virmitio carpii: I plan to pitch it to management, but I don't have high hopes of them accepting it from my past experiences
08:37 ^7heo adding dummy content to master with his custom driver will do that
08:37 virmitio hang on, I'm trying to think of a better way to display my issue
08:37 _ikke_ Always sad when you need to use bad technical solutions to fix social problems :-(
08:37 Jackneill_ joined #git
08:37 virmitio agreed, _ikke_
08:37 ^7heo _ikke_: well, it funds a lot of businesses
08:37 carpii to be fair, this is kinda a bad technical problem too :p
08:38 ^7heo _ikke_: if not most
08:38 ^7heo _ikke_: microsoft is a good example
08:38 morenoh149 joined #git
08:38 _ikke_ Doesn't make it less sad :-)
08:38 nettoweb joined #git
08:39 ^7heo true
08:39 carpii i guess you need to run some tests to see if git merge -no-ff actually solves your problem
08:40 mischat joined #git
08:41 davimore__ joined #git
08:42 virmitio alright, 2 scenarios:  1) [currently works as management wants] I branch from master as foo, file A is changed in master, I also change file A in foo (differently).  merge foo into master, master's version of A is retained.  2) [This one breaks me] I branch from master as bar, I change file A in bar, I merge bar into master.  Bar's version of A is now in master.  I need to retain master's old A.
08:42 Jameser joined #git
08:42 shaggycat joined #git
08:43 virmitio for the purpose of full disclosure, I work for the aforementioned evil empire, ^7heo  :p
08:43 ahmedelgabri joined #git
08:43 virmitio in scenario 2, it's also required that I still get all other changes from bar into master, just not file A
08:44 * virmitio waits to be told it can't be done.
08:44 carpii what have you done so far? you mentioend you have a custom merge handler?
08:46 xaa joined #git
08:46 xall joined #git
08:46 virmitio yep:  'git config --local merge.ours.driver true' and a line in .gitattributes equivalent to 'A  merge=ours'
08:47 virmitio driver command is empty
08:48 virmitio well, not-present, which I assume to be functionally equal to an empty string
08:48 carpii and this works, except when merging a branch actually results in a simple fast forward?
08:48 virmitio correct
08:48 WayToDoor joined #git
08:50 carpii i guess the problem is, you want to have a commit which represents a different sate, depending what branch youre on
08:51 carpii but git wants a commit to point to a specific state
08:51 carpii i cant even think of a way to do this with hooks
08:52 tvw joined #git
08:52 carpii once you merge branch A into master, then master HEAD and branch A HEAD both point to the same commit
08:52 aax joined #git
08:52 _joes__ joined #git
08:53 virmitio ok, alternate silly question:  is there a pre-merge hook?
08:53 canton7 man githooks ;)
08:53 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
08:54 systemovich joined #git
08:54 JeroenT joined #git
08:54 virmitio post-merge, but no pre-merge
08:54 virmitio that's really unfortunate for me. :/
08:54 carpii not afaik, problem is 'mit merge branch' does not automatically mean a git emrge is taking place
08:54 lolka joined #git
08:54 carpii 'git merge branch'
08:55 carpii left #git
08:55 carpii joined #git
08:55 nebg joined #git
08:55 virmitio fair enough
08:55 carpii could you store these configs outside of git?
08:56 carpii maybe in a database?
08:56 _ikke_ git merge --no-ff is the best way to force a merge
08:56 Gonzo89 joined #git
08:57 virmitio git merge --no-ff still doesn't trip the driver if the only thing in the merging branch is ff.  Though I guess that's an edge case I can document and just hope folks notice.
08:57 carpii you know thatll fuck up right? :p
08:58 virmitio oh yeah
08:58 _ikke_ virmitio: Idea!
08:58 _ikke_ virmitio: mark the file as binary
08:58 virmitio but if it's documented there's at least something to point at to explain why it broke today's builds
08:58 * virmitio blinks
08:58 virmitio I hadn't thought of that.
08:58 barteks2x joined #git
08:58 twb joined #git
08:59 _ikke_ Though, it forces people to deal with the file every time they merge
08:59 _ikke_ ie, it will cause a conflict
08:59 _ikke_ Doesn't handle the ff case though
08:59 twb upstream project is hg.  I want to get their commit history, and periodically do the equivalent of "git pull", but I don't ever care about sending patches back up to them.
08:59 virmitio _ikke_: the conflict will auto-resolve from the driver.  I'm trying it local to check ff
08:59 pa joined #git
08:59 pa hello
08:59 twb Is there a turnkey option to slurp hg into git?
08:59 pa question
08:59 acetakwas joined #git
09:00 pa if i run "git branch" i get a nice list of branches
09:00 pa is there a way to extract the commit message title from a specific branch?
09:00 carpii virmitio: is there any way to write a generator which can output the config given some parameters, without the raw config having to be in git necessarily?
09:00 pa so that i can write a script to nicely print all branches and next to them the commit message title
09:01 carpii pa, you looking for git log?
09:01 carpii ah latest commit per branch
09:01 virmitio carpii: I'll look into that and also see about pitching migration of the config to another repo or source
09:01 pa yes local branch
09:01 pa yes latest
09:01 Lunatrius` joined #git
09:01 pa just the title
09:01 pa first line of the log
09:01 mischat_ joined #git
09:02 lolka left #git
09:02 twb Hrm, https://git.wiki.kernel.org/index.php/In​terfaces,_frontends,_and_tools#Mercurial
09:02 twb Doing a fast-export | fast-import every week is probably least pain
09:03 ResidentBiscuit joined #git
09:03 twb Last time I had to deal with this crap, fast-import approach worked well
09:03 _ikke_ twb: There should be another option
09:03 _ikke_ twb: https://github.com/felipec/git-remote-hg
09:04 twb possibly github or something already slurps the repo into git for me
09:04 twb I'm talking about http://roundup-tracker.org/code.html
09:04 flaviodesousa joined #git
09:05 Cork joined #git
09:06 cdown joined #git
09:09 virmitio well, marking the file binary resulting in no change to existing behaviour.
09:09 virmitio *resulted
09:11 _ikke_ ok
09:12 ahr3n joined #git
09:13 virmitio assuming I can't convince folks to outsource the config info to another repo, I may look into doing black magic with the post-merge hook to checkout and commit previous versions of the file if changed.
09:14 JeroenT joined #git
09:14 virmitio can a reset --hard be limited to a specific file?
09:15 _ikke_ git checkout <file>
09:16 jbitdrop joined #git
09:16 virmitio ok, I think this is just going to be a long slog for me to figure out restorative action after-the-fact without breaking git flow or history too badly
09:16 maret joined #git
09:17 _ikke_ A good argument for management
09:17 _ikke_ If it's that difficult to do, are we trying to do the right thing
09:17 mchl_nix joined #git
09:17 _ikke_ But don't think they're easily convinced by such an argument
09:17 carpii i was trying to think if you can somehow utilise git-update-index --asume-unchanged
09:17 virmitio Thank you for helping me try to solve this cluster, regardless of outcome.
09:17 carpii but cant think of a place you could hook it
09:18 _ikke_ carpii: Nope
09:18 carpii assume
09:18 _ikke_ !assume
09:18 gitinfo [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.
09:18 _ikke_ carpii: And it's an index operation, has nothing to do what lives in what branch
09:18 carpii heh ok, thats the ned of that idea then :p
09:18 carpii end
09:19 virmitio carpii: if there was a pre-merge hook, that or a few other options already mentioned would probably work fine for the need.  sadly there's no such hook
09:19 Lunatrius joined #git
09:20 carpii i dont suppose you could insist everyone uses some alternative aliases for git merge, which allow you to run your own scripts
09:22 carpii welp, good luck with it anyway. its time for bed here
09:23 ELFrederich joined #git
09:23 virmitio unlikely, carpii.  many of the devs do all of their git operations from the Visual Studio git integration.  I may see if I can do hooking there, but I'm not going to hold my breath.  Convincing everyone they should use git from the command line (as is right and proper, of course) would be another of those battles that I've fought and lost.
09:23 carpii ah yeah, hadnt thought of non cmdline tools
09:24 carpii these heathens
09:24 virmitio agreed
09:24 carpii :)
09:25 virmitio but on that note.  I'm going to go idle and get some sleep.  If any sudden inspiration strikes you on my incredibly awkward problem, let me know and I'll read it in the morning.
09:25 aax joined #git
09:25 carpii gnite
09:25 mahendra_ joined #git
09:25 fuchstronaut joined #git
09:26 leeN joined #git
09:28 b100s joined #git
09:30 mischat joined #git
09:30 bjornar_ joined #git
09:31 mischat_ joined #git
09:36 qpdb joined #git
09:37 ismithers joined #git
09:38 JeroenT joined #git
09:40 xall joined #git
09:44 rbr joined #git
09:50 bakibour joined #git
09:52 maret joined #git
09:52 Orbitrix joined #git
09:52 Orbitrix joined #git
09:52 Orbitrix joined #git
09:53 brokensyntax joined #git
09:54 jozwior joined #git
09:55 mischat joined #git
09:55 aswen joined #git
09:55 a3Dman joined #git
09:56 corsibu joined #git
09:56 thebloggu joined #git
09:56 tvw joined #git
09:57 ResidentBiscuit joined #git
09:58 mindriot_ joined #git
10:00 cagedwisdom joined #git
10:01 mindriot101 joined #git
10:03 acetakwas joined #git
10:03 bakibour left #git
10:04 \du joined #git
10:04 \du joined #git
10:04 bourbaki joined #git
10:04 ayogi joined #git
10:04 pa left #git
10:05 hariel joined #git
10:05 jottr joined #git
10:05 ShapeShifter499 joined #git
10:08 cdown joined #git
10:11 Rahuak joined #git
10:11 Rahuak Hi all
10:11 gitinfo Rahuak: 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.
10:11 Serpent7776 joined #git
10:11 star_prone joined #git
10:12 manuels joined #git
10:13 bourbaki Hello
10:13 bourbaki I get an out of memory erroer when i want to agressively prune my repository
10:13 bourbaki What can i do to prevent this?
10:16 cagedwisdom joined #git
10:17 rockstar__ joined #git
10:17 rnsanchez joined #git
10:19 jottr joined #git
10:20 ochorocho__ joined #git
10:23 jottr_ joined #git
10:23 fuchstronaut joined #git
10:25 jozwior joined #git
10:25 daynaskully joined #git
10:26 corsibu joined #git
10:27 morenoh149 joined #git
10:27 Macaveli joined #git
10:27 watabou joined #git
10:28 amanuel2 joined #git
10:28 afuentes joined #git
10:28 PioneerAxon joined #git
10:29 rotia joined #git
10:31 mischat joined #git
10:32 corsibu joined #git
10:34 fuchstronaut I want to stash two files that are in .gitignore, but also  I want to keep them as they are in my working tree (stashing them for later use). Is "git stash save --keep-index --include-untracked --patch" the right way to do so? "--keep-index" don't alter working tree, "--include-untracked" to add ignored files and "--patch" to have control over what ignored files are beeing stashed
10:34 ismaris joined #git
10:34 vincento joined #git
10:35 rominronin-WORK joined #git
10:35 Macaveli_ joined #git
10:36 alhariel joined #git
10:37 omerzzz joined #git
10:37 shirty joined #git
10:37 jozwior joined #git
10:37 star_prone joined #git
10:39 corsibu joined #git
10:39 tcorneli joined #git
10:40 lmatteis joined #git
10:40 fuchstronaut git add -f filename; git stash save --keep-index; git rm --cached filename; it is
10:42 fmcgeough joined #git
10:42 kajnc joined #git
10:44 JeroenT joined #git
10:45 _ikke_ why add -f?
10:45 _ikke_ ah, you ignored the file
10:47 mindriot101 joined #git
10:48 eka joined #git
10:48 shock_ joined #git
10:49 jimi_ joined #git
10:51 FilipNortic joined #git
10:54 rorro joined #git
10:55 mehola joined #git
10:55 ocbtec joined #git
10:55 johnmilton joined #git
10:58 jaguarmagenta joined #git
10:58 ShekharReddy joined #git
10:59 chele anyone can point out some analysis of git-submodule vs git-subtree ?
10:59 acetakwas joined #git
11:00 tobiasvl chele: !git-subtree !submodule
11:00 gitinfo chele: git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/mas​ter/contrib/subtree/git-subtree.txt for more info.
11:00 gitinfo chele: git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
11:00 acetakwas joined #git
11:01 eka joined #git
11:04 kurkale6ka joined #git
11:04 mindriot101 joined #git
11:04 rominronin-WORK joined #git
11:05 mahendra_ joined #git
11:06 mindriot101 joined #git
11:10 jozwior joined #git
11:11 mizu_no_oto joined #git
11:12 CtrlC joined #git
11:12 CtrlC joined #git
11:15 Zinarch joined #git
11:17 alhariel joined #git
11:19 phanimahesh joined #git
11:19 finalbeta joined #git
11:19 kurkale6ka joined #git
11:22 ismaris joined #git
11:22 sdothum joined #git
11:25 rominronin-WORK joined #git
11:26 acetakwas joined #git
11:26 rominron_ joined #git
11:28 zeroed joined #git
11:28 zeroed joined #git
11:28 JeroenT joined #git
11:29 liuzhen joined #git
11:29 ojdo joined #git
11:31 qpdb joined #git
11:35 nuck joined #git
11:35 Snugglebash joined #git
11:36 timvishe` left #git
11:37 timvisher joined #git
11:38 irco joined #git
11:40 Macavel__ joined #git
11:42 lindenle joined #git
11:42 cdown joined #git
11:46 ouga_bouga joined #git
11:51 govg joined #git
11:51 tlaxkit joined #git
11:51 roelmonnens joined #git
11:59 ahmedelgabri joined #git
12:00 plos joined #git
12:01 DeltaHeavy joined #git
12:04 Endarked joined #git
12:06 blr joined #git
12:07 synthroid joined #git
12:16 morenoh149 joined #git
12:16 encod3 joined #git
12:16 Prisoner-2460_1 joined #git
12:18 Endarked joined #git
12:19 ochorocho__ joined #git
12:20 serycjon joined #git
12:21 zeroed joined #git
12:25 netj joined #git
12:26 fuchstronaut joined #git
12:26 navidr joined #git
12:27 mischat joined #git
12:27 Endarked joined #git
12:29 mindriot101 joined #git
12:32 rockstar___ joined #git
12:35 Snugglebash joined #git
12:35 Macaveli joined #git
12:35 jeffreylevesque joined #git
12:36 BSAlb joined #git
12:36 corsibu joined #git
12:37 dk0r joined #git
12:38 dsdeiz joined #git
12:38 dsdeiz joined #git
12:39 buffal0 joined #git
12:39 zivester joined #git
12:39 serycjon joined #git
12:42 fuchstronaut joined #git
12:42 sonvh joined #git
12:45 Endarked joined #git
12:46 Derperperd joined #git
12:46 WhiskerBiscuit joined #git
12:47 corsibu joined #git
12:47 King_Hual joined #git
12:47 chele !git-read-tree
12:48 canton7 chele, man git read-tree
12:48 gitinfo chele: the git-read-tree manpage is available at http://jk.gs/git-read-tree.html
12:48 canton7 also !msg
12:48 gitinfo [!privmsg] You can get gitinfo keyword expansion (e.g. !doc or this one) sent directly to you by sending a private message to me: /msg gitinfo !doc. This avoids spamming the channel. Also see http://jk.gs/git/bot/trigger.php
12:48 redeemed joined #git
12:49 mehola joined #git
12:49 fmcgeough joined #git
12:51 sonvh joined #git
12:53 dserodio joined #git
12:54 dserodio I have a repo with many submodules, and after running "git submodule update" they show "new commits" when I run "git diff". How can I reset them to the commited version so that my "git status" is clean?
12:55 jnavila joined #git
12:55 modlin joined #git
12:58 jaguarmagenta joined #git
12:59 martinbjeldbak joined #git
13:01 Rodya_ joined #git
13:02 rockstar__ joined #git
13:03 alaeri[m] joined #git
13:07 ash_workz joined #git
13:10 jaguarmagenta joined #git
13:10 ahmedelgabri joined #git
13:11 ekinmur joined #git
13:12 CEnnis91 joined #git
13:12 CheckDavid joined #git
13:17 WhiskerBiscuit joined #git
13:18 ExoUNX joined #git
13:19 leprechau joined #git
13:19 tom[] joined #git
13:20 ochorocho__ joined #git
13:20 Ipki joined #git
13:21 vuoto joined #git
13:22 doener joined #git
13:24 rorro joined #git
13:25 sonvh_ joined #git
13:26 maret joined #git
13:26 Jameser joined #git
13:27 JeroenT joined #git
13:29 tom[] joined #git
13:31 todd_dsm joined #git
13:31 LionsMane joined #git
13:32 liuzhen joined #git
13:34 fuchstronaut joined #git
13:36 elect joined #git
13:37 jnavila joined #git
13:39 davimore_ joined #git
13:39 al-damiri joined #git
13:39 gho5t joined #git
13:39 griffindy joined #git
13:40 boombatower joined #git
13:40 malcon joined #git
13:48 sangy joined #git
13:49 rnsanchez_ joined #git
13:50 mehola joined #git
13:50 cdown joined #git
13:51 malcon joined #git
13:53 Murii joined #git
13:54 anonymuse joined #git
13:55 rbern joined #git
13:55 Learath2 joined #git
13:56 mischat joined #git
13:58 Bigcheese joined #git
13:58 dreiss joined #git
13:59 thebope joined #git
13:59 fuchstronaut joined #git
14:02 Dougie187 joined #git
14:02 phanimahesh joined #git
14:02 e14 joined #git
14:03 phaleth joined #git
14:03 Rodya_ joined #git
14:03 thiago_ joined #git
14:04 AaronMT joined #git
14:05 morenoh149 joined #git
14:05 f3r70rr35f joined #git
14:08 jottr joined #git
14:09 wfq joined #git
14:09 wfq hi all
14:10 fuchstronaut joined #git
14:10 jottr_ joined #git
14:11 wfq guys while coding on my laptop, the hard drive just burst so I could not send over my changes to my remote repository. Luckily all changes I do locally are actually save remotely on our development sever. What is the best way to update my remote git repository given the scenario please?
14:12 cdown joined #git
14:12 wfq Should I git add, commit and push in the remote development server and then fetch the latest changes from the remote git repository, merge them and re-push it back to the remote repository? The remote development server may not even have the git repository initialised
14:13 Dougie187 left #git
14:13 ResidentBiscuit joined #git
14:13 enleeten joined #git
14:14 Alienpruts joined #git
14:14 Rodya_ joined #git
14:14 mischat joined #git
14:15 mlandoceansky joined #git
14:15 a_thakur joined #git
14:16 hariel joined #git
14:18 jaguarmagenta joined #git
14:18 Dougie187 joined #git
14:20 a_thakur joined #git
14:20 ochorocho__ joined #git
14:22 WayToDoor joined #git
14:22 ahmedelgabri joined #git
14:22 tyreld joined #git
14:23 cdown joined #git
14:23 govg joined #git
14:23 hashpuppy joined #git
14:25 mrwat joined #git
14:26 nilg joined #git
14:26 BSaboia joined #git
14:26 hariel joined #git
14:27 Learath2 joined #git
14:27 eduardas_m joined #git
14:28 jimi_ joined #git
14:28 jimi_ joined #git
14:29 mycyber joined #git
14:29 Rodya_ joined #git
14:31 sssilver joined #git
14:31 buddyq joined #git
14:32 buddyq hi guys. I am new to git and have been doing some tests and I am making spaghetti of things.
14:32 buddyq It's not the easiest concept to wrap my head around when things are getting complicated.
14:33 osse add sauce
14:33 buddyq yes. I need some amazing sauce right now
14:34 mikecmpb_ joined #git
14:34 osse im' your guy and/or girl
14:35 mrwat joined #git
14:36 buddyq I've been reading a long multi-part article tutorial and watched endless videos and realize I am dangerous with git. My host and remote are at two entirely different points and all of  sudden I do a merge and then I've got hundreds of files with <<<<HEAD conflicts. UGH! So I did a hard reset to back up. If I try a pull I get that its going to overwrite files and to move or remove them. If I try to fetch, nothing happens. It says there are
14:36 buddyq commits to 12 commits respectively....
14:36 buddyq i don't know which way is up.
14:36 buddyq can anyone help me out?
14:36 cdg joined #git
14:37 bcc joined #git
14:37 bcc joined #git
14:37 osse !repro
14:37 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
14:37 osse !lol
14:37 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
14:37 buddyq ok
14:38 osse !fetch
14:38 gitinfo When you work with remote repositories, Git stores copies of the remote's branches in !tracking_branches (basically mirrors). You can use 'git fetch' to update those. If you want to actually apply changes from the remote to your checked out branch, a second step is needed, usually 'git merge' or 'git rebase'. There's also 'git pull' which combines both steps.
14:39 osse IOW: "nothing happens" is normal and expected when you fetch. No worries about that one.
14:39 varx1 joined #git
14:40 buddyq https://gist.github.com/buddyq/3​b1b834e045b5cfc32b621ecae732d4d
14:40 littleforest joined #git
14:40 matsaman joined #git
14:41 buddyq the "host" is my live website.
14:41 buddyq I have created a branch on both the host and my local
14:41 isysd joined #git
14:41 buddyq called "Buddys_changes"
14:41 emg joined #git
14:42 osse that's fine. how about git status and the log graph thing
14:42 IrishPrime joined #git
14:42 buddyq both my host and my local laptop are on the Buddys_changes branch
14:42 IrishPrime joined #git
14:42 buddyq You want me to go git log on both and put thos in the gist file?
14:42 Ryanar joined #git
14:42 osse only the local is interesting
14:43 buddyq ok
14:43 gtristan joined #git
14:44 buddyq file updated.
14:44 buddyq It shows wordpress-seo plugin changes but I dont want to even track those. I thought that would have taken place with my new .gitignore file. So I dont know why those are being tracked.
14:44 buddyq I have a couple of custom plugins that I have allowed in my gitignore
14:44 Macaveli joined #git
14:46 emg joined #git
14:46 fuchstronaut joined #git
14:48 buddyq osse: do you see the updated file?
14:48 osse i do
14:48 osse you have uncommited changes. do you want to keep them or discard them?
14:48 buddyq I like all the changes I have done locally right now.
14:49 osse commit them
14:49 buddyq Okay. I'll do a commit right now. I just did one though before... but lemme do one now
14:50 buddyq okay committed.
14:50 gweodoo joined #git
14:50 osse no git status says you have 5 and 12 commits each
14:50 osse *now
14:50 buddyq yes
14:50 buddyq exactly
14:50 corsibu joined #git
14:51 osse have you used commit --amend or rebase -i lately ?
14:51 buddyq no
14:51 buddyq I have only used reset
14:51 Macaveli joined #git
14:51 osse ah
14:51 osse why did you reset ?
14:51 danlovesppipes joined #git
14:51 Lipp joined #git
14:51 corsibu joined #git
14:52 buddyq because I freaked out. I tried a merge and had HUNDREDS of files with <<<< HEAD stuff and I cant go through hundreds of files manually. Many of them which were plugins that I dont want to track.
14:52 corsibu joined #git
14:52 satya4ever joined #git
14:52 osse ah, so you did 'git reset --hard' or something like that. not 'git reset --hard sha1/othercommit/branchnamehere' ?
14:53 buddyq yes. reset --hard <hash>
14:53 osse which hash ?
14:53 osse the current one? a previous one?
14:53 buddyq A previous one because i have made a couple of commits since then.
14:54 osse is the local Buddys_changes branch on your computer good? Is that the one you want ?
14:54 al-damiri joined #git
14:54 buddyq Yes. I want any of my changes on my local to be pushed up to the host.
14:54 osse what about the 12 commits that are on the host? do you want to nuke them all to hell?
14:55 osse kill it with fire?
14:55 buddyq No. Can I keep those?
14:55 osse Maybe
14:55 osse you would have to merge those 12 commits with your 5 cvommits
14:56 chigang joined #git
14:56 twisted` joined #git
14:56 osse but aren't some of those 12 commits the ones you mentioned here: "A previous one because i have made a couple of commits since then." ?
14:56 Raging_Hog joined #git
14:56 henriquev joined #git
14:57 osse brb 5 minuts
14:57 osse 15
14:58 osse do the log. read your messages
14:58 buddyq reading...
14:58 bernardio joined #git
14:58 zeller joined #git
14:58 CEnnis91 joined #git
14:59 joco42 joined #git
14:59 crose joined #git
15:00 kpease joined #git
15:01 Macaveli joined #git
15:02 r00twrh joined #git
15:03 sasori joined #git
15:03 felowe joined #git
15:04 crayon joined #git
15:04 roelmonn_ joined #git
15:04 buddyq osse: let me know when you're back.
15:05 Iacobus_ joined #git
15:06 star_prone joined #git
15:07 Macaveli joined #git
15:08 Awesomecase joined #git
15:08 rymurphy joined #git
15:08 ToeSnacks joined #git
15:08 wizonesolutions joined #git
15:09 angular_mike_ joined #git
15:10 mlandoceansky joined #git
15:10 shinnya joined #git
15:10 rymurphy Hello, can I add another .git dir to a Git repo?
15:10 joco42 joined #git
15:11 cspotcode joined #git
15:11 rymurphy I have a test that uses a small .git dir with one commit, but git is giving me trouble trying to add it to the surrounding repo
15:11 twisted` joined #git
15:12 canton7 rymurphy, no, you can't
15:12 canton7 git treats it as a submodule
15:12 subhojit777 joined #git
15:12 HedgeWork rymurphy: git has protections against you accidentally adding one git repo to another, because it can explode in size VERY VERY FAST
15:12 zeller joined #git
15:12 rominronin-WORK joined #git
15:12 sonvh__ joined #git
15:13 rymurphy canton7: HedgeWork yes that makes sense. I'll just generate the repo in the test
15:13 mischat joined #git
15:13 CEnnis91 joined #git
15:13 mehdi___ joined #git
15:13 richardlitt joined #git
15:14 sonvh joined #git
15:15 Iacobus_ joined #git
15:15 thecomedian joined #git
15:18 raspado joined #git
15:18 patarr joined #git
15:19 fmcgeough joined #git
15:21 iamthad joined #git
15:22 Resident_ joined #git
15:22 boombatower joined #git
15:23 sssilver joined #git
15:24 khisanth__ joined #git
15:27 dlkd949fweijf joined #git
15:27 Jameser joined #git
15:27 jstimm joined #git
15:28 Dohplay joined #git
15:29 Dohplay joined #git
15:29 _jmleo joined #git
15:30 lep2 joined #git
15:30 k200 joined #git
15:30 k200 how can i discard all uncommited changes in specific file only?
15:30 cdown joined #git
15:30 buddyq joined #git
15:31 ^7heo k200: git checkout -- file
15:32 fuchstronaut joined #git
15:32 fuchstronaut joined #git
15:32 Impaloo Is it possible to interactively stage files/chunks that exists within a certain depth from root dir?
15:33 Impaloo Sort of like find(1) --max-depth
15:33 ^7heo you mean, find --max-depth --exec git add -p {}\; ?
15:34 Impaloo ^7heo: how performant would that be in directores with a large file tree?
15:34 ^7heo find is usually pretty performant.
15:34 sonvh joined #git
15:34 ^7heo but you might want to ignore .git
15:34 nettoweb joined #git
15:34 ^7heo to gain speed :)
15:35 k200 ok
15:35 buddyq osse: you there?
15:35 ^7heo Impaloo: on the other hand, that will add --patch ALL the files
15:35 ^7heo and let get ignore them if there's no change there.
15:36 ^7heo it might be faster to just add the files that are known to have changed.
15:36 nettoweb joined #git
15:37 cyan__ joined #git
15:38 TomyLobo joined #git
15:38 Impaloo ^7heo: Also wouldn't find --max-depth --exec git add -p {} + be more performant?
15:38 Impaloo ill try :P
15:39 ^7heo Impaloo: I don't know what the + means
15:39 ^7heo it's probably a GNU extension, isn't it?
15:39 ^7heo Impaloo: what you could do also is:
15:39 Dohplay_ joined #git
15:39 Impaloo ^7heo: BSD and GNU
15:39 Impaloo afaik
15:39 ^7heo but not busybox ;)
15:40 emg POSIX
15:40 ^7heo is + really posix?
15:40 emg yes
15:40 Impaloo ah yeah it is
15:40 emg and busybox does support it
15:41 ^7heo emg: I didn't know.
15:41 ^7heo never used it.
15:41 Impaloo ^7heo: https://xkcd.com/1053/
15:41 emg ^7heo: all good, you do now :-)
15:41 ^7heo yep
15:41 le_melomane joined #git
15:41 emg that being said max-depth is definitely GNU
15:41 ^7heo Impaloo: if you find a way to filter out text that contains more than N '/'
15:41 ^7heo you can use:
15:42 emg can git handle filenames with newlines?
15:42 ^7heo git diff --name-only | filter-out N '/' | xargs git add -p
15:42 ^7heo that would basically be faster anyway
15:42 emg yeah but xargs is devil spawn
15:42 ^7heo yeah well
15:42 emg :-D
15:42 Impaloo More relevant xkcds: https://xkcd.com/1319/
15:42 ^7heo xargs git add -p $(git diff --name-only | filter-out N '/')
15:42 ^7heo done
15:42 ^7heo oops
15:42 ^7heo git add -p $(git diff --name-only | filter-out N '/')
15:43 ^7heo better
15:43 subhojit_ joined #git
15:43 emg files with spaces in their names?
15:43 emg or glob characters?
15:43 ^7heo emg: shhht
15:43 ^7heo emg: just add double quotes around the $()
15:43 ^7heo emg: emergerd you're annoying :P
15:43 emg then it's a single file, which is definitely wrong
15:43 ^7heo true
15:43 ^7heo but shht
15:43 emg sorry, I'll keep the shell stuff in #bash
15:43 emg :-)
15:44 ^7heo nobody has spaces in their filenames
15:44 * ^7heo hides
15:44 ahmedelgabri joined #git
15:44 Impaloo grep -Ev '(.*\/.*){2,}'
15:44 Impaloo could suffice as filter-out right
15:44 re1 joined #git
15:44 Impaloo replace 2 with N
15:44 ^7heo not sure
15:45 anonymuse joined #git
15:45 ^7heo possibly
15:45 Impaloo it seems like it works like a charm
15:45 Impaloo nice nice ncie
15:45 ^7heo :)
15:45 ^7heo again
15:45 Derperperd joined #git
15:45 ^7heo keep in mind what emg pointed
15:45 ^7heo it's definitely true.
15:45 Impaloo *lalalalala*
15:45 ^7heo :D
15:45 lindenle joined #git
15:45 ^7heo I see we have the same reaction ;)
15:46 cyan__ joined #git
15:46 emg Impaloo: no need to escape a slash
15:46 emg unless you just wanted the evil eyebrows...
15:47 Darren_ joined #git
15:47 ^7heo emg: I wasn't sure, since he uses -E
15:47 ^7heo emg: but I think you're right yes.
15:48 emg -E just means you have + and ?, no back references, and parens and braces don't need to be escaped
15:48 supsup joined #git
15:48 emg oh, and you have | for alternation
15:48 ^7heo yeah
15:48 ^7heo which is the reason why I usually use -E
15:48 emg same here
15:49 ^7heo but honestly I prefer to keep away from it
15:49 supsup i tried to make a remote from a local source but when i try to check out from it it says it fails?
15:49 emg well it can often have a faster implementation because it doesn't need to support backreferences
15:49 ^7heo yeah but backreferences are useful
15:49 emg on occasion
15:49 ^7heo does -E support the & backreference?
15:50 supsup how do i checkout a file from a local remote ?
15:50 subhojit__ joined #git
15:50 Vinnie_win_j joined #git
15:50 ^7heo FATAL: Parser error at 'local remote' on line `17:50 <+supsup>` at character 32
15:50 emg & is not a backreference in either BRE or ERE, it is used as matched text in a sed s command's replacement text
15:50 Impaloo supsup: git fetch <remote> && git checkout FETCH_HEAD -- <file>
15:51 Impaloo that would default to default branch on the remote though, add ref after <remote> if you want a specific branch/ref
15:51 ^7heo emg: ah right, I am thinking too much `sed(1)`.
15:51 supsup how do i target the branch in FETCH_HEAD
15:52 ^7heo on other news, rsyslog is giving me headaches.
15:52 ^7heo so, laters.
15:52 Haliucinas joined #git
15:52 emg enjoy
15:52 Lipp joined #git
15:52 Haliucinas joined #git
15:52 e14 joined #git
15:53 nettoweb joined #git
15:53 morenoh149 joined #git
15:54 supsup @Impaloo is it litterally FETCH_HEAD or the name of my branch + _HEAD
15:54 anonymuse joined #git
15:56 _sjs_ joined #git
15:57 ochorocho__ joined #git
15:57 milki_ left #git
15:57 milki joined #git
15:58 gfixler joined #git
15:58 Jackneill_ joined #git
15:58 anonymuse joined #git
15:59 svm_invictvs joined #git
16:00 jfran joined #git
16:02 thiago joined #git
16:02 Impaloo supsup: literally FETCH_HEAD
16:03 lindenle joined #git
16:03 supsup yeah says it does not work
16:03 supsup i think because the fetch is being done on master of the remote not the branch
16:04 Impaloo supsup: `git fetch <remote> <remote_branch> && git checkout FETCH_HEAD -- <filepath>`
16:04 Impaloo note that it will discard local changes to that file
16:04 madewokherd joined #git
16:04 supsup different question: Someone keeps checking in files that cause files to be in the unstagged "modified" state when i do a pull --rebase.  we have carriage returns set, they are using git 1.9 should we tell them to use 2.x+?
16:04 mindriot_ joined #git
16:05 stevenspasbo joined #git
16:06 zivester joined #git
16:07 ieee joined #git
16:07 stevenspasbo joined #git
16:08 a_thakur joined #git
16:09 b100s joined #git
16:09 qpdb joined #git
16:09 supsup @Impaloo that works thank you
16:10 dviola joined #git
16:12 EvilPenguin joined #git
16:12 Dougie187 left #git
16:13 rominronin-WORK joined #git
16:13 Dougie1871 joined #git
16:14 ShekharReddy joined #git
16:15 eizua joined #git
16:15 Electrometro joined #git
16:15 serycjon joined #git
16:15 Resident_ joined #git
16:17 dreiss joined #git
16:18 _geoff joined #git
16:21 _cyril_ joined #git
16:22 buddyq help! My local branch and my host/branch have diverged, and have 5 and 12 different commits each, respectively. How do I solve this?
16:22 buddyq I want my local to be on the host branch.
16:23 synthroid joined #git
16:24 Seveas so you want to discard your 5 local commits?
16:24 ^7heo $ git nuke all the things
16:24 buddyq what is the correct way to resolve this?
16:25 ^7heo buddyq: I'd say "git rebase host/branch"
16:25 ^7heo buddyq: from what I got
16:25 ^7heo buddyq: but I'm not sure what you want.
16:25 Lipp joined #git
16:26 buddyq I dont know why it says 12 commits on host because when I do a git log, I see a bunch of commits but the first one's message is a small "Groups change", the one before that is "Buddy's branch first commit".
16:26 buddyq So I dont know why it says there are 12 commits
16:26 ^7heo buddyq: you haven't pulled the remote
16:26 ^7heo buddyq: it is on the remote
16:26 ^7heo buddyq: locally, you can't see it
16:26 govg joined #git
16:26 buddyq but I am doing git log FROM within the host itself.
16:26 Haliucinas joined #git
16:26 ^7heo buddyq: let's imagine your master branch is tracking the remote, and your work in on the 'foo' branch
16:27 buddyq I have two terminal windows open. one for local and one connected to host.
16:27 ^7heo buddyq: on your workstation you should:
16:27 ^7heo $ git pull
16:27 ^7heo $ git checkout foo
16:27 ^7heo $ git rebase master
16:27 ^7heo and here you are.
16:27 ^7heo (assuming you are on the 'master' branch before the `git pull`)
16:28 Seveas buddyq: also, try a !lol for a graphical overview of the differences
16:28 gitinfo buddyq: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
16:28 buddyq I am not on master branch. I am working on "Buddys_branch" on both local and remote
16:30 durham joined #git
16:30 buddyq Here is what I get when I "git pull" https://gist.github.com/buddyq/3​b1b834e045b5cfc32b621ecae732d4d
16:30 cdg_ joined #git
16:31 thiago buddyq: fix the conflict
16:31 thiago those files would be overwritten by the merge
16:31 thiago your tree is unclean. Clean it up before merging.
16:31 a_thakur_ joined #git
16:32 buddyq thiago: thank you. However, sorry for the noob question but... how?
16:32 buddyq I dont even want to track this plugin
16:33 buddyq I made a new gitignore that does not track any plugins except my own custom ones.
16:33 Dougie187 joined #git
16:33 buddyq I updated the gitignore through ftp on the remote
16:34 thiago buddyq: your upstream is tracking those files
16:34 thiago therefore, you must either delete them locally, or delete in the remote, or not remove
16:34 buddyq Okay. How do I make it stop tracking those files?
16:34 thiago checkout the branch and git rm
16:34 mindriot101 joined #git
16:35 buddyq is there a way to git rm all of those at once?
16:35 thiago clone again, checkout hte right branch, git rm, push
16:35 thiago then you can delete that new clone
16:35 thiago in the original clone, fetch again. Then you can merge.
16:36 buddyq thanks thiago but i dont follow. My understanding is when you clone, that is starting over?
16:36 buddyq I have the branch checkedout in both local and remote
16:36 Salander27_ joined #git
16:36 thiago then don't clone
16:37 thiago you need to check out the branch that has those files, so you can delete them
16:37 thiago in order to delete those files, you need to first remove the ones you have in your current branch that aren't tracked
16:38 xall joined #git
16:40 nitric joined #git
16:44 durham joined #git
16:45 buddyq do yo uhave to do a commit after removing files to track?
16:45 buddyq because I now see these files when I 'git status'
16:45 buddyq says deleted: filename
16:45 durham joined #git
16:45 jottr joined #git
16:46 jast buddyq: yeah, basically removing a file is like any other change
16:46 jast if you didn't use 'git rm', you may have to 'git add' the deletion (or 'git rm', doesn't matter, I think)
16:46 durham joined #git
16:47 PocketKiller joined #git
16:47 jbeeze joined #git
16:48 e14 joined #git
16:49 freimatz joined #git
16:50 buddyq woops. SO right now, my admin panel in wordpress is broken because it cant file these files I just removed!!! I thought I was just untracking them but it looks like it delted them??
16:51 buddyq I did git rm <filename" for about 10 files. Then did a commit. How do I undo that?
16:51 buddyq and then how do I just UNTRACK?
16:51 canton7 'git rm --cached' removes the file from git, but not from the disk
16:51 canton7 to get the file back, 'git checkout some_commit_which_has_the_file -- path/to/file'
16:52 canton7 e.g. if the previous commit has the file, 'git checkout HEAD^ -- path/to/file'
16:52 buddyq do that for each file?
16:52 canton7 or the directory containing them
16:52 buddyq cant I just undo the entire last commit?
16:52 canton7 (so long as the last commit didn't make any changes to that directory)
16:52 canton7 sure, 'git revert HEAD' to undo the whole of the last commit
16:52 buddyq Nope. All I did was rm those files
16:53 oskarkv joined #git
16:53 buddyq it opened up nano. How do I save exit that?
16:53 davimore joined #git
16:53 canton7 the instructions on how to use nano are at the bottom of the screen
16:54 canton7 I can't remember what nano uses. ctrl-X maybe?
16:54 * canton7 is off. good luck!
16:54 Unnecro joined #git
16:55 buddyq okay out of that.
16:55 sdlnv joined #git
16:56 Unnecro joined #git
16:56 sns joined #git
16:56 sns joined #git
16:58 Unnecro joined #git
16:59 MatthewAllan93 joined #git
16:59 Unnecro Hi guys, just a fast question. Is git pull or git checkout considered a good practice for deployments to prod/dev environments?
16:59 thiago Unnecro: no
16:59 thiago Unnecro: !deploy
16:59 gitinfo Unnecro: 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.html
17:00 nekooken joined #git
17:00 mikel joined #git
17:00 Unnecro wow, very handy
17:00 MatthewAllan93 joined #git
17:00 bjornar_ joined #git
17:01 fling_ joined #git
17:01 Unnecro afaik, tools like Jenkins uses git to deploy, right? also ansible does
17:01 Unnecro if you configure it, of course
17:02 buddyq okay, got my admin panel back. And the working directory clean
17:02 finalbeta joined #git
17:02 nekooken I've really screwed up by using: $ git checkout <hash> filename
17:03 nekooken let me explain ...
17:05 Unnecro thiago thanks a lot, of course
17:06 fahadash joined #git
17:07 nekooken so, I did a $git checkout <hash> filename. then a $git commit, to revert to a file's old status.
17:08 nekooken How can I get back to how it was prior to the git checkout?
17:08 SteffanW joined #git
17:08 mikecmpbll joined #git
17:09 JamesPharaoh joined #git
17:10 Resident_ joined #git
17:10 JamesPharaoh hi, is anyone able to point me to a resource with information about security implications of allowing GIT_* environment variables to be passed to an ssh server
17:10 JamesPharaoh i am assuming that GIT_* is likely to be problematic but that there are variables which are quite safe and useful
17:10 Unnecro nekooken maybe git log to find a commit where the file was in the state you want?
17:10 JamesPharaoh https://git-scm.com/book/en/v2/Gi​t-Internals-Environment-Variables
17:11 JamesPharaoh for context, i am creating a tool to be widely used and planning to include some git variables in my standard ssh server configuration
17:11 kpease joined #git
17:11 JamesPharaoh mainly i care about GIT_{COMMITTER|AUTHOR}_{NAME|EMAIL} but would like to add others if they are useful and safe
17:13 buddyq okay, I managed to finally do a git pull from my host to my local on the same branch.
17:13 josuebrunel joined #git
17:13 nekooken Unnecro: the oddity is that I did a git add "filename", then git commit for the file that I wanted to keep.
17:14 buddyq Now, I want to push some of the changes I have on my local to the host. I do a git push and now I get an error" refusing to update checked out branch <branch name> By default, updating the current branch in a non-bare repository..."
17:14 Learath2 joined #git
17:14 GavinMagnus left #git
17:14 hahuang65 joined #git
17:14 nekooken Unnecro: however, this other file had been modified, so I did a $git checkout <hash> filename, to go back to a previous state. As soon as I did that, the former file disappeared. I hope this makes sense.
17:15 jstimm joined #git
17:15 dreiss joined #git
17:16 josuebrunel left #git
17:17 WhiskerBiscuit joined #git
17:17 Cavallari joined #git
17:18 wizardedit joined #git
17:18 Rodya_ joined #git
17:18 nekooken I guess I'm just SOL, because the file that I want, eventhough I did a git add, git commit does not appear on my git log. But I
17:19 nekooken *I'm certain I commited it, since it appears in my  .zsh_history.
17:19 Unnecro nekooken I've never been in that situation. I hope some git guy can help you.
17:19 pikajude can I make git log use the --graph flag by default?
17:20 nekooken Unnecro: no problem. It's not a life or death situation. It's more for growing in my knowledge.
17:20 Unnecro If I were in your situation I'd try some graphical interface tool, like smartgit/sourcetree, to see if I can find the file somewhere
17:20 Unnecro oh, if thats for knowledge,then its better to keep with cli
17:20 Unnecro :)
17:21 mod joined #git
17:21 vannorden joined #git
17:21 nekooken Unnecro: Thanks. I'm not a developer. I'm just using it for some office files.
17:22 nekooken That other people alter rather than doing a "save as".
17:22 nekooken I think I need to first truly understand how git works, and work in a sanbox environment. Today, I was truly humbled by git. :)
17:22 pikajude turns out I can alias log to log --graph, ok, that'll fix the problem
17:22 osse buddyq: oui
17:22 jstimm joined #git
17:24 Lipp joined #git
17:24 jstimm joined #git
17:25 ochorocho__ joined #git
17:26 sdothum joined #git
17:27 mod I have a portion of an svn repo I want to move into git. The issue is that there's two branches which are not ready to merge (i'm tired of waiting) and I want each svn branch to get a git branch.  I'm thinking I can export the portion of trunk and import to master.  Then make a branch of master in git, delete everything but .git and export the svn branch into the git directory. Good idea? Bad idea?  My concern in using a tool is that this coming from just a portio
17:28 buddyq hey osse. Welcome back. With some help of the guys in here I have done a git pull...
17:28 buddyq I have untracked some files that I didnt need tracked.
17:28 buddyq I now need to do a push of some code I have on local to the host
17:29 buddyq however, I get denied because it's not a bare repository.
17:29 buddyq I guess this means, it's not like a GitHub repo. Since it's on the server, it can also push and pull as if it were another developers computer.
17:29 thierryp joined #git
17:30 buddyq So, how do I push my changes?
17:30 buddyq this was happening before and I was toggling core.bare flag to do what I needed.
17:30 buddyq I'm not sure if that is also why things could have gotten mixed up.
17:31 mod buddyq, so you want to untrack some changes?
17:31 osse buddyq: one does not usually push to non-bare repos
17:31 buddyq mod: I already did.
17:31 osse it is possible, but I'm not really sure how. I'd rather follow the advice in !deploy
17:31 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.html
17:31 buddyq okay, so what is the correct way to get my feature changes to my host?
17:31 buddyq if its a non-bare?
17:31 robotroll joined #git
17:32 osse in my opinion: replace it with a bare one, then read the link above
17:32 EvilPenguin joined #git
17:32 osse but I just say that because I don't really know how that push-to-non-bare thing works
17:32 ochorocho__ joined #git
17:33 cite_ joined #git
17:33 jantje joined #git
17:33 yazdmich joined #git
17:33 _W joined #git
17:33 dalias_ joined #git
17:33 Keridos_ joined #git
17:33 EisNerd joined #git
17:33 ujjain- joined #git
17:33 Knirch_ joined #git
17:33 traxo-xx- joined #git
17:33 Dandelock[Gone] joined #git
17:33 topi` joined #git
17:33 dzho_ joined #git
17:33 Narwhaal joined #git
17:33 Davey_ joined #git
17:33 tazle_ joined #git
17:33 Werring` joined #git
17:33 Vgr_ joined #git
17:33 quizzi joined #git
17:33 u1106 joined #git
17:33 `mx joined #git
17:33 adamm joined #git
17:33 Blkt joined #git
17:33 brewmaster joined #git
17:33 HedgeMage joined #git
17:33 xehbit joined #git
17:33 HedgeMage joined #git
17:33 sigjuice joined #git
17:33 BlackMaria joined #git
17:33 larrybolt joined #git
17:33 SupaHam joined #git
17:33 Bilge joined #git
17:33 loglaunc- joined #git
17:33 doppo_ joined #git
17:33 thekingofbandit joined #git
17:33 robins joined #git
17:33 preaction joined #git
17:33 souther joined #git
17:33 themill joined #git
17:33 Davey_ joined #git
17:33 Cabanossi joined #git
17:33 hanthings_ joined #git
17:33 autofly joined #git
17:33 Vgr_ joined #git
17:33 underpantz__ joined #git
17:33 buddyq So, also, we have this on a github repo. I read something about using a webhook and linking to a file to do a git pull. I have this implemented but wouldn't it need something more than that to work?
17:33 Don joined #git
17:33 c^ joined #git
17:33 larrybolt joined #git
17:33 dcpc007 joined #git
17:33 j416 joined #git
17:33 jwest joined #git
17:33 Kehet joined #git
17:33 jailbox joined #git
17:33 eggoez joined #git
17:33 mod joined #git
17:33 Bucciarati joined #git
17:33 same_ol_geez joined #git
17:33 ReenignE joined #git
17:33 tgummerer joined #git
17:33 wget joined #git
17:33 BooK joined #git
17:33 dmarr joined #git
17:33 heftig joined #git
17:33 chrysaor joined #git
17:34 marvi joined #git
17:34 quadz joined #git
17:34 kisonecat joined #git
17:34 fold4 joined #git
17:34 BlessJah joined #git
17:34 cwillu_at_work joined #git
17:34 omegak joined #git
17:34 roue joined #git
17:34 moritz joined #git
17:34 Eugene joined #git
17:34 Nevik_ joined #git
17:34 trobotham joined #git
17:34 rom1504 joined #git
17:34 synchronous joined #git
17:34 unreal joined #git
17:34 sim642 joined #git
17:34 Peng_ joined #git
17:34 Chaser joined #git
17:34 CustosLimen joined #git
17:34 wget joined #git
17:34 dhollinger joined #git
17:34 BlessJah joined #git
17:34 unreal joined #git
17:34 kba joined #git
17:34 Peng_ joined #git
17:34 antispaceman joined #git
17:34 slikts joined #git
17:34 tvl joined #git
17:34 Mir4g3 joined #git
17:34 VampiricPadraig joined #git
17:34 hexa- joined #git
17:34 coasterz joined #git
17:34 mafrasi2 joined #git
17:34 grawity joined #git
17:34 ReenignE joined #git
17:34 daurnimator joined #git
17:34 slikts joined #git
17:34 ahmedelgabri joined #git
17:34 Kulrak joined #git
17:34 VampiricPadraig joined #git
17:34 Cathy joined #git
17:34 buddyq push to non-bare... seems like the host is considered like another developer using git. So how would I sync up my branch with your branch? from programmer to programmer? By pushing it only to the main repo I guess?
17:34 Kulrak joined #git
17:34 AndrewAlexMac joined #git
17:34 LukeLR joined #git
17:34 ohcibi joined #git
17:34 jamick joined #git
17:34 TheBrayn joined #git
17:34 Forkk joined #git
17:34 drbean joined #git
17:34 AlexanderS joined #git
17:34 devster31 joined #git
17:34 c0ded joined #git
17:34 anbz joined #git
17:34 Guest13801 joined #git
17:34 i7c joined #git
17:34 dsdeiz joined #git
17:34 slick joined #git
17:34 enckse joined #git
17:34 montyboy joined #git
17:35 oxsyn joined #git
17:35 bittyx joined #git
17:35 Sigma joined #git
17:35 mquin joined #git
17:35 bket joined #git
17:35 harleyyyyymayes joined #git
17:35 maxorator joined #git
17:35 drawkula joined #git
17:35 osse :S
17:35 peepsalot joined #git
17:35 osse what is the purpose of the 'host' repo?
17:35 johnny56 joined #git
17:35 buddyq the live site
17:35 nellicus_ joined #git
17:36 CentaurWarchief joined #git
17:36 Haliucinas joined #git
17:36 dax joined #git
17:36 bket joined #git
17:37 osse and you say you already have set up so that when you push to github it will notify the host which will then pull ?
17:37 einnjo joined #git
17:37 saidelike joined #git
17:38 buddyq Yea, I have a webhook file in github that triggers a php file called github.php to run from the server. I can have it run whatever, but right now it runs git pull.
17:38 creppe joined #git
17:38 buddyq This is from something I saw on the internet
17:38 SegFaultAX joined #git
17:38 XDS2010 joined #git
17:38 timewalker joined #git
17:38 trondth joined #git
17:38 mar77i joined #git
17:38 mycelium joined #git
17:39 Xe joined #git
17:39 tobie joined #git
17:39 gyre007 joined #git
17:39 janx joined #git
17:39 aendrew joined #git
17:39 Siilwyn joined #git
17:39 shock_ joined #git
17:40 epic_ joined #git
17:40 [diecast] joined #git
17:40 aard_ joined #git
17:40 Neo joined #git
17:40 stealthii joined #git
17:41 belak joined #git
17:41 GameGamer43 joined #git
17:41 FritzLakritz joined #git
17:41 lebster joined #git
17:41 unholycrab joined #git
17:41 pizzaops joined #git
17:41 mroth joined #git
17:41 cmosguy joined #git
17:41 vcoinminer joined #git
17:41 DuncanT joined #git
17:41 daxroc joined #git
17:41 imdsm_ joined #git
17:41 ggherdov joined #git
17:41 contracode joined #git
17:42 kutenai_ joined #git
17:42 Lewix joined #git
17:42 Lowell joined #git
17:42 flupke joined #git
17:42 pfg_ joined #git
17:42 etcinit joined #git
17:42 ulkesh joined #git
17:42 rfv joined #git
17:42 fahadash joined #git
17:42 harry1 joined #git
17:42 bbhoss joined #git
17:42 johtso joined #git
17:43 ShekharReddy joined #git
17:43 amaged__ joined #git
17:43 ec joined #git
17:43 milkshoes joined #git
17:43 sfan786_ joined #git
17:43 sybariten joined #git
17:43 yoyoyo_____ joined #git
17:43 navidr joined #git
17:43 kline joined #git
17:44 mischat joined #git
17:44 jhasse joined #git
17:44 Guest66634 joined #git
17:44 ec joined #git
17:44 rominronin-WORK joined #git
17:44 yena joined #git
17:44 madknight joined #git
17:44 techntoke__ joined #git
17:45 linuxmodder joined #git
17:45 ixian joined #git
17:45 fuchstronaut joined #git
17:45 noahsussman joined #git
17:46 guampa joined #git
17:46 parliament joined #git
17:46 Bengi joined #git
17:46 zero7 joined #git
17:46 prosody joined #git
17:46 zeller joined #git
17:46 elmcrest joined #git
17:46 ToeSnacks joined #git
17:46 cspotcode joined #git
17:46 osse buddyq: i would replace pull with fetch + reset
17:46 Awesomecase joined #git
17:46 mehdi___ joined #git
17:46 osse other than that it sounds fine to me
17:46 bket joined #git
17:46 teadrop_ joined #git
17:46 lxnch joined #git
17:46 buddyq fetch + reset. Just like that?
17:47 angular_mike_ joined #git
17:47 buddyq so the command would be: git fetch + reset?
17:48 Awesomecase joined #git
17:48 brokensyntax Anyone tried out any of the mobile code apps that have SSH integration?
17:50 fuchstronaut joined #git
17:50 Guest42415 left #git
17:50 mod joined #git
17:51 mod fwiw, my svn->git idea work.  I did a new branch of master, deleted all of the data in the new branch, exported the analogus svn branch into the top of the bit emptied git branch.  Diffs look correct, commited. easy peasy.
17:51 quackgyver joined #git
17:51 buddyq osse: ??
17:51 anonymuse joined #git
17:51 bket joined #git
17:51 buddyq osse: so the command would be: git fetch + reset?
17:52 b100s joined #git
17:52 mehola joined #git
17:53 lus joined #git
17:54 kadoban joined #git
17:54 BinaryBench joined #git
17:56 Sasazuka joined #git
17:58 bket joined #git
17:58 littleforest joined #git
17:59 _geoff joined #git
18:01 Darcidride joined #git
18:04 Resident_ joined #git
18:04 howitdo joined #git
18:04 ruskie joined #git
18:05 sdlnv_ joined #git
18:05 _0xbadc0de joined #git
18:06 _0xbadc0de guy
18:06 _0xbadc0de s
18:06 _0xbadc0de WHY
18:06 _0xbadc0de DO
18:06 _0xbadc0de I
18:06 _0xbadc0de get git cmd line choosing user by myself
18:06 osse buddyq: git fetch; git reset --hard origin/master (e.g.)
18:07 osse buddyq: pull does a merge. that'll screw you over if you ever force push etc.
18:07 thierryp joined #git
18:07 buddyq okay. So fetch gets only changes right?
18:08 osse what else is there to get
18:08 buddyq and reset hard is does what?
18:08 osse resets the current checkout to match the argument you give
18:08 stevenspasbo joined #git
18:08 osse read the link above about deployment
18:09 buddyq ok
18:09 buddyq cool
18:11 Urbany joined #git
18:11 aswen joined #git
18:11 buddyq SO now... I need to sync my local with my github then!
18:11 _0xbadc0de remote: Permission to 0xbadc0de1/VmP_DBG.git denied to 0xbadc0de2.
18:12 _0xbadc0de WTF PEOPLE I AM 0xbadc0de1 NOT 2!!!!
18:12 _0xbadc0de GRRR
18:12 _0xbadc0de pls help
18:12 LBV_User joined #git
18:12 j416 joined #git
18:13 nilez joined #git
18:13 osse buddyq: That's just a matter of pushing
18:15 Sasazuka__ joined #git
18:17 cyan__ joined #git
18:18 buddyq okay...lets see if I can pull this off... no punn intended.
18:19 brokensyntax _0xbadc0de: nie handle :D
18:19 ghostlight joined #git
18:19 brokensyntax s/nie/nice
18:19 _0xbadc0de nice
18:19 _0xbadc0de ty
18:20 malcon joined #git
18:20 rorro joined #git
18:21 Rodya_ joined #git
18:21 kulelu88 joined #git
18:21 Seveas 0xabad1dea
18:22 eivarv joined #git
18:22 einnjo joined #git
18:22 WhiskerBiscuit joined #git
18:22 _0xbadc0de now seriously why the fuck is there a two in my handle instead of a 1
18:23 gentoo_ joined #git
18:23 lactose because you touch yourself at night
18:25 _0xbadc0de hmm interesting
18:25 _0xbadc0de I thought it was because you are a fucking slut and take it up the ass even when you don't work
18:25 bremner ok guys, that's enough
18:26 jost joined #git
18:27 buddyq how do I change my default remote to be origin instead of my host? I forgot how I did that before.
18:27 alhariel joined #git
18:28 amanuel2 joined #git
18:28 anonymuse joined #git
18:28 bremner origin is the default remote. Would you like to rephrase your question?
18:30 pikajude it's what you might call a universal remote
18:31 m0viefreak joined #git
18:31 leprechau joined #git
18:31 e14 joined #git
18:31 perlpilot buddyq: perhaps you want to read "git help remote" ?
18:33 buddyq yes, currently I have two remotes setup. One called "origin" which is github. And another called "host" which is my webserver. Right now, If I do a 'git status', it compares my local branch to the branch on "host". I would like it to automatically compare it to 'origin'.
18:33 LionsMane joined #git
18:34 xehbit joined #git
18:35 flavius joined #git
18:35 kadoban buddyq: You want --set-upstream from 'git branch', I believe
18:35 perlpilot buddyq: just change your upstream to host instead of origin
18:35 perlpilot er, the other way around
18:38 Dohplay_ joined #git
18:40 ki0 joined #git
18:42 fling joined #git
18:43 knittl joined #git
18:43 cagedwisdom joined #git
18:44 nettoweb1 joined #git
18:46 lykinsbd_ joined #git
18:46 jottr joined #git
18:47 thebloggu joined #git
18:48 Sasazuka joined #git
18:48 rbern joined #git
18:49 EvilPenguin joined #git
18:50 Balliad joined #git
18:51 finalbeta joined #git
18:51 Endarked joined #git
18:53 eshlox joined #git
18:53 mehola joined #git
18:57 synthroid joined #git
18:58 thebope joined #git
18:58 Resident_ joined #git
18:59 emg joined #git
19:00 DeltaHea_ joined #git
19:01 protn joined #git
19:01 thebloggu joined #git
19:02 lenswipe joined #git
19:03 lenswipe joined #git
19:03 lenswipe hey guys - can i merge a tag into my current working copy?
19:05 raspado joined #git
19:07 Impaloo joined #git
19:07 jstimm joined #git
19:10 kenden joined #git
19:13 jimi_ joined #git
19:14 jottr joined #git
19:14 bpna joined #git
19:15 rominronin-WORK joined #git
19:18 Ievh joined #git
19:19 ieee joined #git
19:20 Balliad_ joined #git
19:20 star_prone joined #git
19:21 buddyq It looks like my branch 'Buddys_branch' works on my local, but master does not. So I would like to maybe merge or push my changes from my branch to the master branch on my local machine. How would I do that?
19:21 pothepanda joined #git
19:21 kyan joined #git
19:22 denimsoft joined #git
19:23 lenswipe wut
19:23 lenswipe buddyq, what do you mean
19:24 e14 joined #git
19:24 Rodya_ joined #git
19:25 buddyq i have a website that works with my branch checked out. I've done all of my fixes on this branch. The master branch doesn't work on my local. There are errors, that are now fixed in my branch. I would like to now make the master include the branch changes and fixes so that I can switch to the master branch and it will work.
19:26 SporkWitch joined #git
19:28 buddyq should i switch to master and then git pull --rebase <branch>?
19:30 modlin joined #git
19:31 vannorden joined #git
19:31 harry1 joined #git
19:31 modlin_ joined #git
19:32 CussBot joined #git
19:32 nwkj86 joined #git
19:32 j416 joined #git
19:36 cdown_ joined #git
19:36 WhiskerBiscuit joined #git
19:37 e14 joined #git
19:37 synthroid joined #git
19:37 fraid joined #git
19:38 eindoofus joined #git
19:38 eindoofus hi, i was just wondering how i can merge a branch in but have a commit for some record of the merge. doing a "git merge some-branch" doesn't seem to leave any record of the merge in github
19:39 fraid joined #git
19:39 kadoban eindoofus: --no-ff
19:40 eindoofus kadoban, thanks. so it's "git merge some-branch --no-ff"?
19:40 kyan joined #git
19:40 lenswipe buddyq, so on your feature branch things work, but not on master? and you want to merge your feature into master?
19:41 eindoofus nm, found an example
19:41 kadoban eindoofus: Yep, should work. I usually put my arguments first though, 'git merge --no-ff whatever', but I dunno if it matters.
19:42 modlin joined #git
19:42 gfixler joined #git
19:42 jstimm joined #git
19:43 DrSlony joined #git
19:43 DrSlony Hello, how do I apply a patch from a gist without downloading it as raw?
19:43 lamont joined #git
19:44 kadoban DrSlony: At a guess, you don't.
19:45 preaction curl https://gist.github.com/whatever/commithash.patch | patch -p0
19:45 preaction since i'm sure you don't mean that you want to not download something, since the web requires you to download in order to even look at something
19:45 DrSlony "git apply < <(https://gist.blabla/raw/bla)" would work, was wondering whether there's a way without getting the raw url
19:46 cdown joined #git
19:46 yoyoyo_____ joined #git
19:46 lxnch joined #git
19:46 kadoban How often are you doing this that it matters? (and a followup: why? There's better ways to share sets of changes ... like using git)
19:46 DrSlony kadoban roughly twice in a lifetime... was just curious ;]
19:46 preaction how can you address web content with a url?
19:47 preaction sorry, without
19:47 kadoban Okay, just checking :)
19:47 DrSlony preaction: not without a url at all, but without the url to the "raw" version of the gisy
19:48 DrSlony *gist
19:48 preaction gist isn't integrated into git, if that's what you're asking
19:49 Guest66634 joined #git
19:49 DrSlony i was under the impression that there was an easy way to add a gist as a remote branch
19:50 bremner well, possibly as a remote. that sounds like a question for github docs
19:50 DrSlony ah, google wins where duckduckgo has failed...
19:50 DrSlony again
19:51 Macaveli joined #git
19:52 thecomedian joined #git
19:52 Resident_ joined #git
19:52 DrSlony ah found it, on the gits's page I saw a button "embed", but you can change it to "clone", and the rest is easy peasy
19:53 wizonesolutions joined #git
19:53 twisted` joined #git
19:56 CEnnis91 joined #git
19:57 richardlitt joined #git
19:57 felowe joined #git
19:58 cagedwisdom joined #git
19:59 nowox_ left #git
20:04 fedepad joined #git
20:08 apotry joined #git
20:13 hashpuppy joined #git
20:14 bpna joined #git
20:14 sea-gull_ joined #git
20:21 kyan joined #git
20:24 fedepad joined #git
20:27 protn left #git
20:31 teroshan joined #git
20:32 brokensyntax joined #git
20:34 patarr joined #git
20:36 raspado_ joined #git
20:37 cdown joined #git
20:40 brokensyntax joined #git
20:42 vannorden joined #git
20:42 reim joined #git
20:45 dviola "The bottom line is that we get a lot of great applicants for this position, which means that we can afford to be very picky in who we move forward with. And unfortunately, the submitted code was not enough to convince me that you are the backend developer we are currently looking for."
20:45 dviola suck pickiness...
20:46 dviola screw gitlab
20:46 ^7heo huhu
20:46 ^7heo popular positions
20:46 rominronin-WORK joined #git
20:46 ^7heo go for something good but less popular
20:47 fraid joined #git
20:48 impermanence joined #git
20:49 gho5t dviola: was it a ruby test
20:49 gho5t like what'
20:49 gho5t I've been looking for a remote job for a while
20:49 impermanence Could someone describe the basics of an appropriate git flow with tags?
20:49 gho5t seems that they get a ton of applicants
20:49 gho5t 99% of the time I never hear back
20:49 dviola gho5t: yes, ruby
20:50 dviola they want me to violate NDAs I have signed and show them private code for other companies I wrote
20:50 gho5t give me the test questions I'm going to apply now
20:50 gho5t jeez wtf
20:50 dviola I told them I'm not going to do this
20:53 thierryp joined #git
20:54 impermanence Let me be more specific: let's say I have some repo.  It has branches.  It also has tags.  Then...I clone this repo locally.  And I create a new branch.  So I'm modifying, modifying, modifying.  My question is: what do I do next?  I'd like to commit my changes and push my new local branch to the remote...and then...how do I tag this new branch to k
20:54 dviola then they asked this:
20:54 impermanence eep up with the correct versioning (if that makes sense...)?
20:54 dviola "If that is not an option, and if you really don’t mind potentially “wasting” 30-60 minutes, you could pick an issue from the public GitLab CE issue tracker at https://gitlab.com/gitlab-org/gitlab-ce/issues and you could work on that?"
20:54 dviola I said I'm not going to work without compensation
20:54 wrouesnel joined #git
20:55 dviola I'm really pissed over this process at gitlab
20:56 DrSlony they call fixing their shitty bugs "wasting" time?
20:57 davimore joined #git
20:58 impermanence joined #git
20:58 dviola I wonder how many of their super talented people actually contributed something of value to git
20:58 * dviola sighs
20:59 ShapeShifter499 joined #git
20:59 dviola this was the actual email I received from this idiot: http://pastie.org/10945686
20:59 dviola I never felt so belittled before
21:00 Anja_ joined #git
21:01 DrSlony That sounds polite and reasonable.
21:02 e14 joined #git
21:02 mischat joined #git
21:02 dviola DrSlony: I sent them code
21:04 LeBlaaanc joined #git
21:05 LeBlaaanc to remove untracked files and "reset" (or checkout HEAD version) for a specific folder and it's subfolders does this seem most concise? `git checkout HEAD -- ./ios && git clean -d -f ./ios`
21:07 _geoff joined #git
21:07 gho5t dviola: was that for the frontend position?
21:07 dsdeiz joined #git
21:07 dsdeiz joined #git
21:07 dviola gho5t: no, backend
21:08 gho5t gotcha
21:08 diget joined #git
21:09 dviola why do I have to dance like a monkey and solve their actual issues for free in order to get a chance to talk to them... this is BS
21:09 dviola git is great, but these companies aren't
21:10 gesker joined #git
21:10 HoierM joined #git
21:10 dviola fuckers
21:10 ahr3n joined #git
21:11 preaction because, like they said, they're the ones with all the power in this situation. that's why they can demand you work for free in order to get a chance to work for money
21:11 kenden joined #git
21:13 gesker joined #git
21:13 patarr joined #git
21:14 anonymuse joined #git
21:15 Sasazuka joined #git
21:16 pfg_ joined #git
21:16 yena joined #git
21:16 boxrick1_ joined #git
21:17 CheckDavid joined #git
21:17 GodEater` joined #git
21:17 holgersson joined #git
21:18 wcpan joined #git
21:18 dviola preaction: they should find another sucker
21:18 preaction as they said, they already have. many such, i expect
21:18 preaction but that doesn't help you get a job :(
21:18 dviola I bet
21:19 bremner joined #git
21:19 preaction i don't mind spending an hour or so on a code sample, provided it is a demonstration and not me doing _real actual work_. like, that's over the line
21:19 ShapeShifter499 joined #git
21:19 ojacobson joined #git
21:19 bremner joined #git
21:19 alaeri[m] joined #git
21:19 Salander27_ joined #git
21:19 dviola yeah, same here
21:19 LeBlaaanc anybody have insight on my questions
21:19 LeBlaaanc question*
21:20 de-vri-es joined #git
21:20 kjsage[m] joined #git
21:20 hallogallo[m] joined #git
21:20 Ineentho[m] joined #git
21:20 meZee joined #git
21:20 harry1 joined #git
21:20 alphor joined #git
21:20 saintaquinas[m] joined #git
21:20 POQDavid joined #git
21:20 SegFaultAX joined #git
21:21 r3c0d3x joined #git
21:21 matthiaskrgr joined #git
21:21 M-mistake joined #git
21:21 Fissure joined #git
21:21 asdofindia joined #git
21:21 geko joined #git
21:22 M-meznak joined #git
21:22 Guest68193 joined #git
21:22 Guest68193 joined #git
21:22 grumble joined #git
21:22 Remramm joined #git
21:22 aviraldg joined #git
21:22 kikijiki[m] joined #git
21:22 unclechu joined #git
21:22 M-shine joined #git
21:23 tvw joined #git
21:23 EvilPenguin joined #git
21:25 Electrometro joined #git
21:26 thebope joined #git
21:27 Skryll joined #git
21:27 r00twrh joined #git
21:28 Wulf git branch --contains <commit> shows me branches with a commit. Now I cherry-picked into another branch and the commit hash changed, so this branch is missing from the branch list. Can git somehow find those branches too?
21:28 Skryll I cloned a repo and changed its origin to my git server. How do I create the repo there so I can push now?
21:28 Wulf Skryll: depends on the server. Did you try git-push?
21:29 ghostlight joined #git
21:29 sdlnv joined #git
21:30 Skryll oh I think I remember, I have to announce it in the gitconfig and give my user access rights then I can push to it
21:31 ahr3n joined #git
21:32 Skryll now git push origin master worked. all good.
21:32 Wulf excellent
21:32 mycyber joined #git
21:32 jimi_ joined #git
21:32 brokensyntax joined #git
21:32 * Skryll is using gitolite3
21:32 r00twrh joined #git
21:33 Wulf yup, there's a special repo with configs
21:33 Skryll how does git-mirror work if the mirror destination is down for a few commits, does it just catch up when it comes back online ?
21:34 ayjay_t joined #git
21:35 kyan_ joined #git
21:35 cdown joined #git
21:36 Lor_ joined #git
21:37 cdown_ joined #git
21:38 kyan_ left #git
21:38 mikq joined #git
21:38 mikq hey guys, can you help me out
21:38 r00twrh joined #git
21:39 mikq i'm a novice with git, 've cloned a repo from github
21:39 mikq and i'm not interested in git history behind this point
21:40 mikq what I want - is to "branch" out of the master and start to do my own changes
21:40 Resident_ joined #git
21:40 mikq pulling out and merging some changes from upstream if needed from time to time
21:40 aidalgol joined #git
21:40 mikq what's my best tactic? I'm thinking about creating a new branch
21:41 mikq and squashing all the commits into one, is it viable turn for my case?
21:43 sdlnv joined #git
21:44 jimi_ joined #git
21:44 Sonderblade joined #git
21:44 sdlnv joined #git
21:44 Wulf mikq: are you sure that you want to delete the history?
21:44 Wulf mikq: it's a bit strange
21:44 mikq Wulf, I mean, I would keep the history at the "master" branch
21:44 mikq just for reference, and just to be able to pull new changes from upstream
21:45 Wulf mikq: why not in your new branch?
21:47 mikq Wulf, idk, there's not much point in that, I just feel like I don't need it cause it's too long
21:47 mikq there are too much records and I just like when my branch is sort of clean, with as few commits as possible
21:48 gesker joined #git
21:48 rymurphy joined #git
21:50 moestevens joined #git
21:51 r00twrh joined #git
21:52 Wulf mikq: git checkout --orphan newbranch; git commit -m initialcommit
21:53 Wulf mikq: but I strongly suggest you don't do it. Keep your history.
21:54 e14 joined #git
21:54 acetakwas joined #git
21:55 thiago joined #git
21:55 manjaro-kde5_ joined #git
21:57 jottr joined #git
21:57 mizu_no_oto joined #git
21:58 durham_ joined #git
21:59 serycjon joined #git
22:00 cagedwisdom joined #git
22:00 raijin joined #git
22:01 serycjon joined #git
22:01 durham__ joined #git
22:08 cdown joined #git
22:08 kenden joined #git
22:11 aax joined #git
22:13 Dougie187 left #git
22:14 Dougie187 joined #git
22:15 Dougie187 left #git
22:15 anonymuse joined #git
22:15 jimi_ joined #git
22:17 ISmithers joined #git
22:19 rominronin-WORK joined #git
22:19 jimi_ joined #git
22:21 impermanence joined #git
22:23 justanotheruser joined #git
22:26 diget joined #git
22:28 gfixler joined #git
22:29 joko joined #git
22:29 Darren_ joined #git
22:29 Muzer_ joined #git
22:30 joko joined #git
22:31 cagedwisdom joined #git
22:31 joko Hello, after doing a "git mv a b", editing a and doing "git add a", I did a "git reset HEAD .". Is it possible to enter the move in the history?
22:31 jeffreylevesque joined #git
22:33 Sasazuka joined #git
22:35 hahuang65 joined #git
22:42 anuxivm joined #git
22:42 mikecmpbll joined #git
22:43 brokensyntax joined #git
22:43 rorro joined #git
22:44 leTali joined #git
22:45 sangy joined #git
22:49 qws-user-1229 joined #git
22:51 mischat joined #git
22:55 qws-user-1228 joined #git
22:56 e14 joined #git
22:57 DJ_Spies joined #git
23:01 durham joined #git
23:02 Whisket joined #git
23:02 Whisket Can git pre-push hooks be added to a Git repo? I'm getting an 'Invalid path' error when I git add the file
23:03 Jameser joined #git
23:04 qws-user-1228 joined #git
23:05 Whisket Can anything under .git be added to a repo?
23:05 Whisket At all?
23:06 green_ranger joined #git
23:06 bremner no
23:07 Whisket bremner: is there any way for git hooks to be shared among multiple repo users or does git not provide support for that?
23:07 bremner Whisket: there is no built in support. You can script it (make a script in the repo that adds the hooks).
23:07 bremner gitolite also offers some support iirc
23:08 dan2k3k4 joined #git
23:09 harry1 joined #git
23:09 qws-user-1229 joined #git
23:10 durham joined #git
23:11 durham joined #git
23:13 ruby_ joined #git
23:15 qws-user-1228 joined #git
23:16 Sasazuka joined #git
23:16 moei joined #git
23:18 luke-jr joined #git
23:18 luke-jr Is it possible to get git-apply to use diff3 format?
23:19 cstrahan joined #git
23:20 jason237 joined #git
23:21 srcerer joined #git
23:23 AustinMatherne joined #git
23:25 pikajude joined #git
23:25 EvilPenguin joined #git
23:25 qws-user-1229 joined #git
23:26 a3Dman joined #git
23:28 lindenle joined #git
23:31 bernardio joined #git
23:31 Electrometro joined #git
23:31 _geoff joined #git
23:33 dsdeiz joined #git
23:34 thebope joined #git
23:38 dsdeiz joined #git
23:39 pikajude joined #git
23:40 BlueProtoman joined #git
23:40 BlueProtoman How do I configure Git to remember a password for a particular repo indefinitely?
23:42 jottr joined #git
23:43 anuxivm left #git
23:43 dsdeiz joined #git
23:43 dsdeiz joined #git
23:44 HedgeMage BlueProtoman: You can't.  You should be using key-based auth anyway.  Once you use an ssh key, you can use ssh-agent to only ask for the key's password once per session.
23:44 jimi_ joined #git
23:45 BlueProtoman HedgeMage: Can I do so even if I don't have control over the git server?
23:46 HedgeMage BlueProtoman: Depends on what the server is running.  For vanilla git, no, for gitlab yes, etc.
23:47 BlueProtoman HedgeMage: How can I check?
23:47 dreiss joined #git
23:47 gniourf joined #git
23:47 boombatower joined #git
23:48 HedgeMage BlueProtoman: So, there's not a canonical way to check, but if you feel like poking at it, we can try to narrow it down :)
23:48 green_ranger joined #git
23:49 HedgeMage BlueProtoman: i.e. one command won't do it, but we could check the features it's presenting and see what that tells us.
23:49 BlueProtoman HedgeMage: Okay, I'll tell you about my environment.  This is a Git server for a graduate computer science course; I can log in to the actual machine that's running the server, but I can't change the relevant configuration.
23:50 rominronin-WORK joined #git
23:50 * HedgeMage nods.
23:50 BlueProtoman I'm logged in now.  What else do you wanna know?
23:51 HedgeMage Okay, so on your local machine that you use to sync, what is the URL of the repo?  feel free to pm if you want
23:51 ojacobson Yeah, you can have git remember creds by URL (using the credentials cache mechanism, which I believe is enabled by default on recent git versions?) but not on a per-repo basis
23:51 ojacobson or, at least, very not easily
23:52 ojacobson The ssh transport does not have cred cache support because Git never handles ssh credentials
23:52 BlueProtoman The remote is "ssh://myrealname@scm.cs.stonybrook.edu:130/scm/​cse506git-f16/hw2-myrealname"
23:52 ojacobson oh, yeah, use an SSH key
23:52 qws-user-1228 joined #git
23:52 BlueProtoman I do, for GitHub.  I still use a password for some reason, but my commits are all GPG-signed.
23:52 mlandoceansky joined #git
23:53 mischat joined #git
23:53 e14 joined #git
23:55 Vampire0 joined #git
23:55 theskillwithin joined #git
23:56 HedgeMage BlueProtoman: piece of cake then
23:56 HedgeMage So, this shows that they are using your actual user account on the machine for access to the git repos
23:56 BlueProtoman HedgeMage: Right
23:56 HedgeMage BlueProtoman: So, now that you are logged in, just place your public ssh key at ~/.ssh/authorized_keys
23:57 HedgeMage then you can use that to auth instead of a pw
23:57 HedgeMage and it's more secure, btw
23:57 BlueProtoman Err, where is my SSH key stored again?
23:58 luke-jr ~/.ssh/id_* typically
23:58 luke-jr the .pub is the only one to share

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary