| 2016-07-15 |
| → nettoweb joined | 00:00 |
| ← Darren_ left | 00:01 |
| ← nwkj86 left | 00:01 |
| ← cdg left | 00:01 |
| ← m0viefreak left | 00:01 |
| ← mingle__ left | 00:02 |
| ← jwarren_ left | 00:03 |
| → f3r70rr35f joined | 00:03 |
| → devbug joined | 00:03 |
| → Peuc joined | 00:03 |
| → Darren_ joined | 00:04 |
| → xall_ joined | 00:04 |
| ← f3r70rr35f left | 00:08 |
| ← devbug left | 00:08 |
| ← yqt left | 00:08 |
| ← nnyk_ left | 00:09 |
| → inflames joined | 00:09 |
| → piling_ joined | 00:10 |
| → dilijev joined | 00:10 |
| → knittl joined | 00:10 |
| ← knittl left | 00:10 |
| → knittl joined | 00:10 |
| → mika joined | 00:10 |
| → fstd_ joined | 00:10 |
| ← dilijev left | 00:11 |
| ← Darren_ left | 00:11 |
| ← piling left | 00:11 |
| → zacts joined | 00:12 |
| → dilijev_ joined | 00:13 |
| ← fstd left | 00:14 |
| fstd_ → fstd | 00:14 |
| ← ag4ve_ left | 00:14 |
| ← kbs left | 00:16 |
| ← tristanp left | 00:19 |
|
Orion3k
| Hi, anyone know how to get a post-receive hook to work in a bare directory when pushing to a remote with a branch and not master? I am getting this error - remote: fatal: You are on a branch yet to be born | 00:20 |
| → romerocesar joined | 00:20 |
| ← mischat left | 00:21 |
| ← mikecmpbll left | 00:21 |
| → tristanp joined | 00:22 |
| ← Masterphi left | 00:23 |
| → mwhooker joined | 00:23 |
| ← romerocesar left | 00:25 |
| ← LeBlaaanc left | 00:28 |
| ← Literphor left | 00:31 |
| → Literphor joined | 00:32 |
| ← benwbooth left | 00:32 |
| ← foist left | 00:34 |
| Guest7243 → murph | 00:35 |
|
Orion3k
| nevermind, i forgot the branch name on the checkout command in the post-receive hook | 00:40 |
| ← harish_ left | 00:40 |
| → romerocesar joined | 00:40 |
|
codebam
| so I have a 3.4.10 kernel, how can I merge 3.4.12? | 00:42 |
| → Chiko joined | 00:42 |
|
codebam
| they are tags | 00:42 |
| ← dx left | 00:42 |
|
osse
| codebam: git merge <thing> | 00:43 |
|
codebam
| but its a tag, how do I merge tags? | 00:44 |
|
osse
| codebam: git merge <tag> | 00:44 |
| → f3r70rr35f joined | 00:44 |
|
codebam
| ohh okay | 00:45 |
|
| thanks lol | 00:45 |
|
| so I would add it as a remote right, like git remote add upstream <url> | 00:45 |
| ← romerocesar left | 00:45 |
|
codebam
| and then git merge upstream/tag? | 00:45 |
| → rominronin joined | 00:46 |
|
osse
| fetch first | 00:46 |
| ← stoopkid left | 00:46 |
|
osse
| and just git merge tag | 00:46 |
|
| because tags are global. | 00:46 |
|
| there is no tag versus upstream/tag like with branches | 00:46 |
| → cqi joined | 00:47 |
| ← SimonNa left | 00:47 |
| Vgr_ → Vgr | 00:47 |
| ← rahtgaz left | 00:48 |
| ← mrkat left | 00:49 |
| ← thiago left | 00:50 |
| ← rominronin left | 00:51 |
| → dx joined | 00:52 |
| → xlegoman joined | 00:52 |
|
codebam
| oh okay | 00:55 |
| ← nettoweb left | 00:56 |
| ← Duikb00t left | 00:56 |
| ← tristanp left | 00:56 |
| → demimeta joined | 00:57 |
| → tristanp joined | 00:59 |
| → romerocesar joined | 01:01 |
| ← dsantiago left | 01:01 |
| ← demimeta left | 01:02 |
| ← xall_ left | 01:02 |
|
dilijev_
| hello! | 01:03 |
|
gitinfo
| dilijev_: 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. | 01:03 |
|
dilijev_
| !backup | 01:04 |
|
gitinfo
| Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 01:04 |
|
dilijev_
| Ok looks like I can send messages to this channel now thanks to nickserv | 01:04 |
|
| I have a question. Do git --pretty="" format strings support date formatting? AFAICT they do not, and I've resorted to using backspace characters to chop off the parts I don't care about | 01:05 |
| ← romerocesar left | 01:05 |
|
osse
| dilijev_: there are a couple of different formats you can pick from, but nothing akin to strftime() | 01:06 |
|
| dilijev_: never mind, you can do exactly that :P | 01:07 |
| → xall_ joined | 01:07 |
|
osse
| dilijev_: --date=format:%c | 01:07 |
|
dilijev_
| oh | 01:07 |
|
osse
| dilijev_: then use the --pretty thingies that says "respects --date option" | 01:07 |
|
dilijev_
| ok how can i combine that with [pretty] format in the .gitcongfig? | 01:08 |
|
| so i guess I'll need to update my aliases to take the --date option as well as the date pretty format string? | 01:08 |
|
osse
| i suppose so | 01:08 |
|
dilijev_
| is there an eruivalent [date] .gitconfig option so I can refer to those formats by name? | 01:08 |
| → diprotic joined | 01:09 |
|
osse
| dilijev_: ehh, nope: git config log.date '%c blabla' | 01:09 |
|
dilijev_
| equivalent* | 01:09 |
| ← netj left | 01:09 |
|
dilijev_
| oh that's even better | 01:09 |
|
| i think | 01:09 |
| → netj joined | 01:09 |
|
dilijev_
| i don't usually care about more than one date format | 01:09 |
| → ome joined | 01:09 |
| ← pks left | 01:10 |
| ← Sasazuka left | 01:11 |
| ← monoprotic left | 01:12 |
|
dilijev_
| Using git version 2.8.2.windows.1 | 01:13 |
|
| git log --date=<anything> | 01:13 |
|
| fatal: unknown date format | 01:13 |
|
| any ideas? | 01:13 |
|
| osse: (tagging you) | 01:13 |
|
| Sorry; I'm new to IRC | 01:13 |
| diprotic → monoprotic | 01:13 |
|
osse
| what did you try | 01:13 |
|
dilijev_
| git log --date=short | 01:14 |
|
| fatal: unknown date format | 01:14 |
|
| http://linux.die.net/man/1/git-log | 01:14 |
| ← liquidjamm left | 01:14 |
|
osse
| try rfc | 01:15 |
| → pks joined | 01:15 |
|
dilijev_
| git log --date=rfc | 01:15 |
|
| fatal: unknown date format | 01:15 |
|
osse
| well then | 01:15 |
|
| i have no clue | 01:15 |
|
dilijev_
| osse: user error | 01:15 |
|
| osse: I had log.date set incorrectly in .gitconfig | 01:16 |
|
osse
| heh | 01:16 |
|
dilijev_
| it was using that first and failing | 01:16 |
|
osse
| i would think --date given on the CLI would override that, but... | 01:16 |
|
dilijev_
| osse: apparently no? | 01:17 |
|
osse
| apparently | 01:17 |
|
dilijev_
| maybe if the value in log.date was correct in the first place? | 01:17 |
|
| I set log.date=rfc and then did git log --date=short and it worked | 01:17 |
|
| i guess it validates the .gitconfig and then defers to command line arg first. that seems half broken | 01:18 |
|
osse
| usually CLI overrides the config files | 01:18 |
|
| so this is unexpected to me | 01:18 |
|
dilijev_
| right. it did so. but only when the config file was valid | 01:18 |
|
| from log given the above: [ a956dde ] 2016-07-11 | 01:19 |
| ← MattMaker left | 01:19 |
|
dilijev_
| it used short from the CLI and not the rfc from the gitconfig | 01:19 |
|
| short is generally the format I prefer | 01:19 |
|
| but even so | 01:19 |
| → MattMaker joined | 01:20 |
|
dilijev_
| how do I use strftime()-like formats? | 01:20 |
|
osse
| like i said | 01:20 |
|
| --date=format:... | 01:20 |
|
dilijev_
| looks like it only takes these:{relative,local,default,iso,rfc,short,raw} | 01:20 |
| ← happy-dude left | 01:21 |
| ← PaulCapestany left | 01:21 |
|
osse
| maybe it's a new feature | 01:22 |
|
dilijev_
| osse: thanks, it works when I use the right flags | 01:22 |
|
| git log --date=format:"%Y-%m-%d" | 01:22 |
|
| I was expecting to write something like yyyy-MM-dd but this works, too | 01:22 |
|
osse
| that doesn't work with strftime either | 01:22 |
| → PaulCapestany joined | 01:23 |
|
dilijev_
| right -- in truth I've never actually used that API and I assumed incorrectly about it's format. But this style of formatting makes more sense from a c API perspective | 01:23 |
|
| osse: Thanks for your help in showing me how to do this; it had been bothering me for months :P | 01:23 |
| → eizua joined | 01:24 |
| → fahadash joined | 01:24 |
| → Guest39441 joined | 01:25 |
| ← Noldorin left | 01:25 |
| ← mwhooker left | 01:26 |
| → dsantiago joined | 01:27 |
| → relgar joined | 01:27 |
| → nettoweb joined | 01:29 |
| ← Ph_ left | 01:29 |
| → dreiss joined | 01:31 |
| → romerocesar joined | 01:31 |
| ← xall_ left | 01:32 |
| → Ph_ joined | 01:32 |
| ← shaggycat left | 01:32 |
| → cyan__ joined | 01:33 |
| ← nettoweb left | 01:34 |
| ← LaptopBrain left | 01:34 |
| ← reim left | 01:35 |
| ← romerocesar left | 01:36 |
| → david007 joined | 01:38 |
| ← dreiss left | 01:39 |
| ← armenzg left | 01:41 |
| ← tcsc left | 01:41 |
| → romerocesar joined | 01:41 |
| ← tristanp left | 01:41 |
| → meloc joined | 01:43 |
| ← cyan__ left | 01:43 |
| → tristanp joined | 01:43 |
| ← meloc left | 01:44 |
| → meloc joined | 01:44 |
| ← ilbot3 left | 01:46 |
| ← romerocesar left | 01:46 |
| ← jamesd left | 01:46 |
| → mehola joined | 01:47 |
| → rominronin joined | 01:47 |
| ← cqi left | 01:47 |
| → aspiers joined | 01:48 |
| → jamesd joined | 01:48 |
| → ilbot3 joined | 01:48 |
| ← f3r70rr35f left | 01:49 |
| → stantonk joined | 01:49 |
| → unreal joined | 01:50 |
| → NimeshNeema joined | 01:50 |
| ← mehola left | 01:51 |
| → shaggycat joined | 01:52 |
| ← rominronin left | 01:52 |
| ← unreal_ left | 01:52 |
| ← BombStrike left | 01:53 |
| → thiago joined | 01:53 |
| → sangy joined | 01:53 |
| → xall_ joined | 01:54 |
| → armenzg joined | 01:55 |
| ← ryez left | 01:55 |
| ← justanotheruser left | 01:55 |
| → justanotheruser joined | 01:57 |
| ← dmj` left | 01:57 |
| → BombStrike joined | 01:57 |
| → martinium joined | 01:58 |
| → l4v2 joined | 01:58 |
| → tcsc joined | 01:59 |
| → Dougie187 joined | 01:59 |
| → f3r70rr35f joined | 01:59 |
| ← drbean_ left | 02:04 |
| → drbean joined | 02:05 |
| → p4trix joined | 02:07 |
|
p4trix
| Is there a channel to talk about bitbucket pipeline? | 02:07 |
| → harish_ joined | 02:08 |
| ← jstimm_ left | 02:09 |
| → Goplat joined | 02:10 |
| ← TSS_ left | 02:11 |
| → romerocesar joined | 02:12 |
| ← Guest39441 left | 02:12 |
| ← DeaTheAngel left | 02:13 |
| ← hexagoxel left | 02:13 |
| ← MattMaker left | 02:13 |
| ← Literphor left | 02:14 |
| ← tristanp left | 02:14 |
| → Meow-J joined | 02:14 |
| → MattMaker joined | 02:16 |
| ← romerocesar left | 02:16 |
| → Guest39441 joined | 02:16 |
| → tristanp joined | 02:17 |
| → danimal2 joined | 02:18 |
| → Noldorin joined | 02:19 |
| → hexagoxel joined | 02:19 |
| ← netj left | 02:19 |
| → netj joined | 02:19 |
| → Ankhers joined | 02:22 |
| ← inflames left | 02:22 |
| ← Ankhers left | 02:23 |
| → Masterphi joined | 02:24 |
| ← ShapeShifter499 left | 02:24 |
| ← Sadeukko left | 02:26 |
| ← Guest39441 left | 02:27 |
| → durham_ joined | 02:27 |
| ← Masterphi left | 02:28 |
| → Guest39441 joined | 02:28 |
| ← danimal2 left | 02:29 |
| ← f3r70rr35f left | 02:30 |
| ← durham left | 02:31 |
| → romerocesar joined | 02:31 |
| ← durham_ left | 02:32 |
| → Literphor joined | 02:32 |
| ← p4trix left | 02:33 |
| ← romerocesar left | 02:36 |
| → f3r70rr35f joined | 02:37 |
| → Limes_ joined | 02:38 |
| ← stantonk left | 02:39 |
| ← zacts left | 02:41 |
| → Lyqyd joined | 02:42 |
| → lotus joined | 02:42 |
|
lotus
| Hey, how can I leave a single file unmerged? | 02:42 |
| ← Guest39441 left | 02:43 |
|
lotus
| I want to pull in all of the changes on a branch, but one of the plugins is conflicting with my current development. I'd like to keep my plugin file in-tact but leave the option to resolve the conflicts for another time. | 02:43 |
| ← Limes_ left | 02:44 |
| ← harish_ left | 02:45 |
| → Guest39441 joined | 02:45 |
| ← leeN left | 02:46 |
| ← MattMaker left | 02:47 |
| ← shum left | 02:48 |
| → rominronin joined | 02:48 |
|
thiago
| lotus: ok, so don't fix the merge | 02:48 |
|
| you won't be able to commit the merge until you have, though | 02:48 |
|
| just disable the plugin in your tree | 02:49 |
|
| and don't make any further changes, because you can't commit anything | 02:49 |
|
lotus
| I want 99% of the changes in the merge though | 02:49 |
| → MattMaker joined | 02:49 |
|
thiago
| lotus: ok | 02:50 |
|
lotus
| I guess I need to resolve the conflict is what you're saying. | 02:50 |
|
thiago
| anything below 100% resolved can't be committed | 02:50 |
|
lotus
| makes sense. And leaving a file out doesn't really work because it's part of the HEAD of that branch and if the HEAD was merged that file would be assumed merged also | 02:51 |
|
thiago
| correct | 02:51 |
| ← xlegoman left | 02:52 |
|
| lotus gets to resolving the merge conflict... | 02:52 |
| → danimal2 joined | 02:53 |
| ← rominronin left | 02:53 |
| ← f3r70rr35f left | 02:55 |
| → f3r70rr35f joined | 02:56 |
| → arescorpio joined | 02:57 |
| ← azbarcea left | 02:57 |
| → cqi joined | 02:57 |
| → dmj` joined | 02:57 |
| ← Dougie187 left | 02:58 |
| → boombatower joined | 02:58 |
| ← chachasmooth left | 03:01 |
| → sanketdg joined | 03:01 |
| → chachasmooth joined | 03:01 |
| → stantonk joined | 03:02 |
| → romerocesar joined | 03:02 |
| ← MattMaker left | 03:03 |
| ← ArchNoob left | 03:04 |
| ← theskillwithin left | 03:04 |
| ← Literphor left | 03:05 |
| → MattMaker joined | 03:05 |
| → Sasazuka joined | 03:05 |
| ← hahuang61 left | 03:05 |
| → Literphor joined | 03:06 |
| ← stantonk left | 03:06 |
| → auzty joined | 03:06 |
| ← xall_ left | 03:07 |
| ← romerocesar left | 03:07 |
| → chrisshattuck joined | 03:07 |
| → xall joined | 03:07 |
| ← Noldorin left | 03:08 |
| ← Lyqyd left | 03:09 |
| ← MattMaker left | 03:10 |
| → shgysk8zer0_ joined | 03:11 |
| → MattMaker joined | 03:11 |
| ← danimal2 left | 03:12 |
| ← MattMaker left | 03:13 |
| → stantonk joined | 03:14 |
| ← Literphor left | 03:16 |
| → MattMaker joined | 03:16 |
| ← l4v2 left | 03:16 |
| → kbs joined | 03:16 |
| → hahuang61 joined | 03:17 |
| → d4rklit3 joined | 03:17 |
| ← stantonk left | 03:18 |
| → danimal2 joined | 03:19 |
| → theskillwithin joined | 03:20 |
| → romerocesar joined | 03:22 |
| ← xelxebar left | 03:24 |
| → pioiytr__ joined | 03:25 |
| ← diegoviola left | 03:26 |
| ← romerocesar left | 03:27 |
| → treaki__ joined | 03:27 |
| ← pioiytr_ left | 03:28 |
| ← Guest39441 left | 03:28 |
| → Guest39441 joined | 03:29 |
| ← MattMaker left | 03:31 |
| ← treaki_ left | 03:31 |
| → stantonk joined | 03:32 |
| → romerocesar joined | 03:32 |
| → MattMaker joined | 03:33 |
| ← Garen left | 03:35 |
| ← romerocesar left | 03:37 |
| → stoopkid joined | 03:40 |
| → Garen joined | 03:42 |
| ← danimal2 left | 03:46 |
| → mehola joined | 03:48 |
| → zacts joined | 03:48 |
| → danimal2 joined | 03:48 |
| ← shgysk8zer0_ left | 03:48 |
| ← tristanp left | 03:49 |
| → rominronin joined | 03:49 |
| → howdoi joined | 03:50 |
| → Masterphi joined | 03:52 |
| → tristanp joined | 03:52 |
| ← mehola left | 03:52 |
| → hk238 joined | 03:52 |
| → Literphor joined | 03:52 |
| ← kbs left | 03:53 |
| ← rominronin left | 03:54 |
| ← MattMaker left | 03:55 |
| → MattMaker joined | 03:55 |
| ← Masterphi left | 03:56 |
| ← danimal2 left | 03:57 |
| ← NimeshNeema left | 04:01 |
| → romerocesar joined | 04:03 |
| → armyriad joined | 04:03 |
| ← d4rklit3 left | 04:03 |
| → d4rklit3 joined | 04:06 |
| ← FuzzySockets left | 04:06 |
| ← zacts left | 04:06 |
| ← romerocesar left | 04:07 |
| ← Literphor left | 04:08 |
| ← Gamecubic left | 04:08 |
| → rscata joined | 04:10 |
| ← stantonk left | 04:11 |
| → stantonk joined | 04:12 |
| → drewo joined | 04:14 |
| ← Guest39441 left | 04:15 |
| ← stantonk left | 04:16 |
| → rchavik joined | 04:18 |
| → sctskw joined | 04:19 |
| → govg joined | 04:19 |
| → nilg joined | 04:21 |
| ← xall left | 04:21 |
| ← Garen left | 04:21 |
| ← theskillwithin left | 04:22 |
| ← cd-rum_ left | 04:22 |
| ← stonerfish left | 04:22 |
| ← fahadash left | 04:22 |
| → romerocesar joined | 04:22 |
| → Rodya_ joined | 04:24 |
| → stonerfish joined | 04:24 |
| ← hk238 left | 04:25 |
|
aidalgol
| In gitk, what is the difference between "Reload" and "Update"? | 04:25 |
| → stantonk joined | 04:25 |
| ← sylario left | 04:26 |
| → JanC_ joined | 04:26 |
| → mehola joined | 04:27 |
| JanC → Guest89629 | 04:27 |
| JanC_ → JanC | 04:27 |
| ← romerocesar left | 04:27 |
| ← Guest89629 left | 04:28 |
| ← drewo left | 04:29 |
| → Literphor joined | 04:29 |
| → rchavik_ joined | 04:30 |
| ← rgrinberg left | 04:30 |
| ← rchavik_ left | 04:31 |
| ← MattMaker left | 04:33 |
| → drewo joined | 04:34 |
| → theskillwithin joined | 04:34 |
| → lordjancso joined | 04:34 |
| ← chrisshattuck left | 04:35 |
| → chrisshattuck joined | 04:36 |
| ← chrisshattuck left | 04:37 |
| → MattMaker joined | 04:37 |
| ← Cabanossi left | 04:37 |
| → chrisshattuck joined | 04:38 |
| ← sctskw left | 04:39 |
| → rgrinberg joined | 04:39 |
| ← chrisshattuck left | 04:40 |
| → Cabanossi joined | 04:40 |
| → chrisshattuck joined | 04:42 |
| ← chrisshattuck left | 04:43 |
| → chrisshattuck joined | 04:44 |
| → FuzzySockets joined | 04:47 |
| ← MattMaker left | 04:47 |
| ← stantonk left | 04:48 |
| → rominronin joined | 04:50 |
| → xall joined | 04:50 |
| → danimal2 joined | 04:52 |
| → romerocesar joined | 04:53 |
| ← xall left | 04:55 |
| ← rominronin left | 04:55 |
| ← unbalancedparen left | 04:57 |
| ← cuebix-wk left | 04:57 |
| → freimatz joined | 04:57 |
| ← romerocesar left | 04:58 |
| ← Rodya_ left | 04:58 |
| ← aidalgol left | 04:58 |
| → mariuscc joined | 05:01 |
| ← tristanp left | 05:02 |
| ← danimal2 left | 05:02 |
| ← chrisshattuck left | 05:02 |
| → chrisshattuck joined | 05:03 |
| → romerocesar joined | 05:03 |
| → Duder9999 joined | 05:04 |
| arooni → arooni__ | 05:05 |
| ← shgysk8zer0 left | 05:05 |
| → phanimahesh joined | 05:06 |
| ← romerocesar left | 05:08 |
| ← dmj` left | 05:11 |
| → tristanp joined | 05:11 |
| ← Sasazuka left | 05:12 |
| ← MZAWeb left | 05:14 |
| ← rgrinberg left | 05:14 |
| ← phanimahesh left | 05:15 |
| → cd-rum joined | 05:16 |
| → phanimahesh joined | 05:16 |
| ← chrisshattuck left | 05:19 |
| → cdown joined | 05:19 |
| → chrisshattuck joined | 05:21 |
| → romerocesar joined | 05:23 |
| ← BrianBlaze420 left | 05:24 |
| ← arescorpio left | 05:27 |
| → ThomasLocke joined | 05:27 |
| → f3r70rr36f joined | 05:28 |
| → BrianBlaze420 joined | 05:29 |
| → xall joined | 05:29 |
| ← chrisshattuck left | 05:30 |
| ← ThomasLocke left | 05:31 |
| ← f3r70rr35f left | 05:31 |
| ← drewo left | 05:33 |
| → Dragon535 joined | 05:34 |
|
milki
| no clue! | 05:34 |
|
| what does it look like? | 05:34 |
| → danimal2 joined | 05:35 |
| → drewo joined | 05:35 |
| ← NeverDie left | 05:36 |
| ← sangy left | 05:37 |
| → OnBrokenWings joined | 05:40 |
| → jungsubk joined | 05:41 |
| → emPi joined | 05:42 |
| ← danimal2 left | 05:43 |
| → danimal2 joined | 05:43 |
| ← drewo left | 05:44 |
| → jstimm_ joined | 05:46 |
| → drewo joined | 05:46 |
| ← freimatz left | 05:46 |
| → qt-x joined | 05:46 |
| → zeroed joined | 05:46 |
| → jceb joined | 05:47 |
| ← OnBrokenWings left | 05:48 |
| → stantonk joined | 05:49 |
| ← nilg left | 05:49 |
| → Alienpruts joined | 05:51 |
| ← jceb left | 05:51 |
| → rominronin joined | 05:51 |
| ← stantonk left | 05:53 |
| → tobiasBora joined | 05:55 |
| ← danimal2 left | 05:55 |
| ← rominronin left | 05:56 |
| ← drewo left | 05:59 |
| → drewo joined | 05:59 |
| → xlegoman joined | 06:00 |
| ← mehola left | 06:01 |
| → leeN joined | 06:01 |
| ← pioiytr__ left | 06:02 |
| ← CheckDavid left | 06:02 |
| → LeBlaaanc joined | 06:03 |
| → pioiytr joined | 06:04 |
| → jceb joined | 06:05 |
| → Darren_ joined | 06:06 |
| → romerocesar_ joined | 06:06 |
| ← romerocesar left | 06:08 |
| ← zeroed left | 06:08 |
| → DieguezZ joined | 06:09 |
| ← ahr3n left | 06:09 |
| → romerocesar joined | 06:09 |
| ← ome left | 06:09 |
| ← b_rare left | 06:10 |
| ← romerocesar_ left | 06:11 |
| → circ-user-foXmx joined | 06:11 |
| → b_rare joined | 06:12 |
| ← phanimahesh left | 06:12 |
| → mehola joined | 06:14 |
| ← romerocesar left | 06:14 |
| ← DieguezZ left | 06:15 |
| ← emPi left | 06:16 |
| → zeroed joined | 06:17 |
| ← zeroed left | 06:17 |
| → zeroed joined | 06:17 |
| → romerocesar joined | 06:17 |
| → mkoskar_ joined | 06:21 |
| ← mkoskar left | 06:21 |
| → mwhooker joined | 06:21 |
| → hendry joined | 06:23 |
| ← mwhooker left | 06:23 |
| ← Alienpruts left | 06:23 |
| ← Khisanth left | 06:23 |
| → zlg joined | 06:23 |
|
hendry
| hi i am on a branch "foobar" and I want to push that to "aremote" to master. What's the syntax for that? | 06:24 |
| → kimon joined | 06:24 |
| → mwhooker joined | 06:24 |
|
grawity
| git push aremote foobar:master | 06:24 |
| → pioiytr_ joined | 06:24 |
| ← hahuang61 left | 06:24 |
|
hendry
| grawity: thank you | 06:25 |
|
zlg
| I have two files with changes that I want to commit, but only after a rebase. I need to commit them one at a time. git-stash seems like the right solution, but don't I need to put both into the index first? If I do that, then 'git stash pop' after my pull, can I remove the second file from the index and commit (with un-added changes) like expected? | 06:25 |
| → phanimahesh joined | 06:25 |
|
grawity
| stash, rebase, reset, re-add | 06:26 |
|
| both `git add` and `git reset` take filenames, and even have -p | 06:26 |
|
| alternatively, stash --include-untracked | 06:26 |
| → freimatz joined | 06:26 |
|
zlg
| grawity: perfect, thanks for the reassurance. | 06:26 |
| ← pioiytr left | 06:26 |
| ← mkoskar_ left | 06:27 |
| → mkoskar_ joined | 06:29 |
|
hendry
| grawity: how do i specify the local branch to push in .git/config | 06:29 |
| ← tristanp left | 06:30 |
| → ynanm joined | 06:35 |
| → muelli joined | 06:36 |
| ← madewokherd left | 06:36 |
| → Khisanth joined | 06:37 |
| → Alienpruts joined | 06:37 |
|
grawity
| hendry: I think `git branch -u aremote/master` also applies to pushing | 06:38 |
|
| hendry: as long as push.default is 'upstream' | 06:38 |
|
| see also `man git-config` for branch.*.{remote,pushRemote,merge} | 06:39 |
|
gitinfo
| the git-config manpage is available at http://jk.gs/git-config.html | 06:39 |
|
grawity
| also remote.pushDefault | 06:39 |
| → tristanp joined | 06:41 |
| ← Literphor left | 06:42 |
| ← TomyLobo left | 06:42 |
| → JeroenT joined | 06:43 |
| → usm4n joined | 06:43 |
| ← tobiasBora left | 06:44 |
| ← drewo left | 06:44 |
| → drewo joined | 06:45 |
| ← kimon left | 06:48 |
| → infinite_ joined | 06:49 |
| → romerocesar_ joined | 06:50 |
| → rominronin joined | 06:52 |
| → CausaMortis joined | 06:53 |
| ← romerocesar left | 06:53 |
| ← usm4n left | 06:53 |
| ← Duder9999 left | 06:53 |
| → romerocesar joined | 06:54 |
| ← ynanm left | 06:55 |
| ← infinite_ left | 06:55 |
| ← romerocesar_ left | 06:55 |
| ← thiago left | 06:55 |
| ← muelli left | 06:56 |
| ← d4rklit3 left | 06:57 |
| → tobiasBora joined | 06:57 |
| ← rominronin left | 06:57 |
| ← qt-x left | 06:59 |
| → qt-x1 joined | 06:59 |
| ← JeroenT left | 06:59 |
| → Repox joined | 07:00 |
| ← xlegoman left | 07:00 |
| ← drewo left | 07:00 |
| → romerocesar_ joined | 07:01 |
| qt-x1 → qt-x | 07:01 |
| ← romerocesar left | 07:03 |
| → infinite_ joined | 07:04 |
| → ahmed_elgabri joined | 07:04 |
| → djb-irc joined | 07:04 |
| ← infinite_ left | 07:04 |
| → _Patrick_ joined | 07:04 |
| ← MrWoohoo left | 07:05 |
| → deBase joined | 07:06 |
| → usm4n joined | 07:06 |
| ← magicbit left | 07:07 |
| ← shaggycat left | 07:08 |
| → gfixler joined | 07:08 |
| → JeroenT joined | 07:09 |
| ← jungsubk left | 07:09 |
| ← ahmed_elgabri left | 07:09 |
| ← rchavik left | 07:09 |
| ← lindenle left | 07:10 |
| → lindenle joined | 07:12 |
| → k3rn31 joined | 07:13 |
| → TomyWork joined | 07:13 |
| ← stoopkid left | 07:13 |
| → usm4n_ joined | 07:14 |
| ← _Patrick_ left | 07:14 |
| → Hounddog joined | 07:15 |
| → _Patrick_ joined | 07:16 |
| → dsrtrck joined | 07:17 |
| → Juri_Agarin joined | 07:17 |
| → Fijit joined | 07:17 |
| ← usm4n left | 07:17 |
| → encod3 joined | 07:17 |
| → hahuang61 joined | 07:21 |
| ← encod3 left | 07:21 |
| ← mwhooker left | 07:22 |
| ← JeroenT left | 07:23 |
| → JeroenT joined | 07:24 |
| ← hahuang61 left | 07:25 |
| ← theskillwithin left | 07:26 |
| ← zeroed left | 07:26 |
|
antranigv
| how can I set the `project name` of a git repo? :) right now it's showing `.git` :) | 07:27 |
| → thekingofbandit joined | 07:27 |
| → Balliad joined | 07:28 |
| ← jceb left | 07:29 |
| → OnBrokenWings joined | 07:30 |
| ← OnBrokenWings left | 07:30 |
| ← usm4n_ left | 07:31 |
| → aswen joined | 07:34 |
| ← lindenle left | 07:34 |
| mkoskar_ → mkoskar | 07:34 |
| ← tobiasBora left | 07:36 |
| ← Goplat left | 07:36 |
| → lindenle joined | 07:38 |
| ← deBase left | 07:38 |
|
grawity
| you can try writing it into .git/description | 07:39 |
| → tobiasBora joined | 07:40 |
| ← djb-irc left | 07:40 |
|
codebam
| my last commit was a merge, I messed it up (missed some stuff), fixed that, how do I rewrite the commit with the things I fixed inside? | 07:40 |
|
| or well I don't want to change the commit message, just want to add the changes | 07:41 |
| → rominronin joined | 07:41 |
|
grawity
| git commit --amend | 07:42 |
|
| you can add -C/--reuse-message HEAD | 07:42 |
| ← lindenle left | 07:43 |
|
codebam
| oh cool. thank you | 07:43 |
| ← romerocesar_ left | 07:43 |
| → jceb joined | 07:43 |
| → djb-irc joined | 07:44 |
| ← aswen left | 07:44 |
| → Macaveli joined | 07:46 |
| → devbug joined | 07:46 |
| → mikecmpbll joined | 07:47 |
| ← Dragon535 left | 07:47 |
| ← zlg left | 07:48 |
| → cyan__ joined | 07:48 |
| ← multi_io left | 07:48 |
| → romerocesar joined | 07:49 |
| → kupad joined | 07:49 |
| → drewo joined | 07:49 |
|
codebam
| if I have a file like a png file, that isn't code. how can I merge those conflicts? | 07:49 |
| → multi_io joined | 07:50 |
|
grawity
| you can choose one version with `git checkout --ours/--theirs <file>` | 07:50 |
| → theskillwithin joined | 07:51 |
|
codebam
| oh okay thats cool, thanks | 07:52 |
| → lugzer joined | 07:53 |
| ← Darren_ left | 07:54 |
| ← romerocesar left | 07:54 |
| ← drewo left | 07:55 |
| ← kupad left | 07:55 |
|
grawity
| ah I suppose if you want to keep both there's `git show :2:data/foo.png > data/foo-ours.png; git show :3:data/foo.png > data/foo-theirs.png` | 07:55 |
| → Silenced joined | 07:57 |
| ← FuzzySockets left | 07:57 |
| ← Silenced left | 07:58 |
| → Silenced joined | 07:58 |
| ← mikecmpbll left | 07:58 |
| ← ajf- left | 07:58 |
| → mischat joined | 08:01 |
| → Repox_ joined | 08:02 |
| ← Repox left | 08:03 |
| → geoff-codes joined | 08:04 |
| → lindenle joined | 08:04 |
| ← Repox_ left | 08:05 |
| → mikecmpbll joined | 08:05 |
| → Repox joined | 08:06 |
| ← Macaveli left | 08:06 |
| → bongjovi joined | 08:06 |
| ← pioiytr_ left | 08:06 |
| → shirty joined | 08:07 |
| → pioiytr joined | 08:07 |
| ← Meow-J left | 08:09 |
| → romerocesar joined | 08:10 |
| → kurkale6ka joined | 08:11 |
| ← lindenle left | 08:12 |
| → muelli joined | 08:12 |
| ← theskillwithin left | 08:13 |
| → stoopkid joined | 08:14 |
| ← stoopkid left | 08:14 |
| → stoopkid joined | 08:14 |
| → King_DuckZ joined | 08:14 |
| ← LeBlaaanc left | 08:14 |
| ← romerocesar left | 08:15 |
| ← jceb left | 08:15 |
| → aswen joined | 08:17 |
|
King_DuckZ
| hi, is there a way to list the remote url of each submodule without initializing them first? | 08:17 |
| → theskillwithin joined | 08:18 |
| → Beams joined | 08:20 |
| → Andrew_K joined | 08:20 |
| → Duikb00t joined | 08:21 |
|
Duikb00t
| o/ | 08:21 |
| → CausaMortis-Work joined | 08:21 |
| → hahuang61 joined | 08:21 |
| → apotry joined | 08:22 |
| ← CausaMortis left | 08:24 |
| ← theskillwithin left | 08:24 |
| ← hahuang61 left | 08:27 |
| → theskillwithin joined | 08:27 |
| ← tristanp left | 08:27 |
| → jceb joined | 08:28 |
| ← theskillwithin left | 08:29 |
| ← f3r70rr36f left | 08:29 |
| → romerocesar joined | 08:30 |
| → f3r70rr35f joined | 08:30 |
| → Jellyg00se joined | 08:32 |
| → t0by joined | 08:32 |
| → tristanp joined | 08:34 |
| → clmsy joined | 08:34 |
| ← romerocesar left | 08:35 |
| → kab joined | 08:35 |
| → mikecmpb_ joined | 08:36 |
| → kedare joined | 08:37 |
| → DieguezZ joined | 08:38 |
| ← mikecmpbll left | 08:39 |
|
codebam
| how do I pull in one file from a remote tracking branch? | 08:39 |
| → OnkelTem joined | 08:40 |
| gitinfo set mode: +v | 08:40 |
| → theskillwithin joined | 08:41 |
|
OnkelTem
| Hi all. Need urgent help. I wanted to join two last commits and for this I launched: git rebase -i HEAD~2 | 08:41 |
|
codebam
| never mind, got it | 08:41 |
|
OnkelTem
| but for some strange reason it opened editor with a bunch of commits to squash | 08:42 |
|
| Now I don't konw what to do! If I exit the editor it would probably fuck up my repository | 08:42 |
|
| how to cancel the action? kill the process? | 08:43 |
| → drewo joined | 08:43 |
| gitinfo set mode: +v | 08:46 |
| → PCatinean joined | 08:46 |
|
kab
| Just comment lines | 08:47 |
|
| it'll do nothing | 08:47 |
|
alcohol
| OnkelTem: which editor? | 08:48 |
| ← drewo left | 08:48 |
|
OnkelTem
| alcohol: I have mcedit here | 08:48 |
|
alcohol
| world editor for minecraft? o_O | 08:49 |
|
OnkelTem
| kab: oh, thanks, I'll try | 08:49 |
|
| alcohol: lol | 08:49 |
|
alcohol
| well thats the first google result.. http://www.mcedit.net/ | 08:49 |
| → dreiss joined | 08:49 |
|
OnkelTem
| alcohol: Midnight Commander | 08:50 |
| ← mischat left | 08:50 |
|
alcohol
| ah | 08:50 |
| ← cd-rum left | 08:51 |
|
OnkelTem
| kab: many thanks it worked! | 08:51 |
| → GenZai joined | 08:51 |
|
kab
| <OnkelTem> now analyse why it has happened and tell us ) | 08:52 |
| → FunkyAss joined | 08:55 |
| ← kab left | 08:56 |
| ← jceb left | 08:56 |
| → Limes_ joined | 08:56 |
| → Masterphi joined | 08:58 |
| → kab joined | 08:58 |
| gitinfo set mode: +v | 08:59 |
|
alcohol
| kab: it happened cause he did an interactive rebase | 09:01 |
|
| kab: i think he just didnt read up on how it works | 09:01 |
|
kab
| his command should show onle two commits for rebase, not a bunch as he has | 09:01 |
|
| i use that command every day though | 09:02 |
| ← Masterphi left | 09:02 |
|
kab
| maybe his head was not he expected | 09:02 |
| → tvw joined | 09:03 |
|
alcohol
| OnkelTem: what did you see exactly? | 09:03 |
| → achadwick joined | 09:03 |
|
alcohol
| OnkelTem: if you saw 2 commits prefixed with "pick", then that was exactly what you should have expected | 09:03 |
|
kab
| yep it should be like that in normal state ) | 09:04 |
|
alcohol
| OnkelTem: and you probably would have wanted to change one of those to fixup or squash | 09:04 |
| → pioiytr_ joined | 09:06 |
| ← theskillwithin left | 09:06 |
| → ikmaak joined | 09:06 |
| ← pioiytr left | 09:09 |
| ← JeroenT left | 09:09 |
| ← devbug left | 09:10 |
| ← kab left | 09:10 |
| → theskillwithin joined | 09:10 |
| → kab joined | 09:10 |
| → chll_ joined | 09:11 |
| ← armyriad left | 09:11 |
| ← kab left | 09:13 |
| → kab joined | 09:13 |
| → sdothum joined | 09:13 |
| ← ikmaak left | 09:13 |
| ← dreiss left | 09:13 |
| → jceb joined | 09:14 |
| → ikmaak joined | 09:14 |
| → nnyk_ joined | 09:15 |
| → ncd|leeN joined | 09:17 |
| → troulouliou_div2 joined | 09:18 |
| gitinfo set mode: +v | 09:18 |
| → JeroenT joined | 09:19 |
| ← Beams left | 09:20 |
| ← leeN left | 09:21 |
| → pcre_ joined | 09:22 |
| → notebox joined | 09:22 |
| ← notebox left | 09:22 |
| → lindenle joined | 09:22 |
|
King_DuckZ
| I need to get the default remote exactly as asked in this question http://stackoverflow.com/questions/34099451/get-default-remote-push-and-default-remote-branch is there anybody with an answer for it? | 09:23 |
| → Beams joined | 09:23 |
|
King_DuckZ
| I would also like to avoid any manual splitting, as the guy in that thread asked | 09:23 |
| → hahuang61 joined | 09:24 |
| → notebox joined | 09:24 |
| → durham joined | 09:26 |
| ← lindenle left | 09:27 |
| → armyriad joined | 09:27 |
| ← johnny56 left | 09:28 |
| → johnny56_ joined | 09:28 |
| ← hahuang61 left | 09:28 |
| → solf1re joined | 09:29 |
| ← solf1re left | 09:29 |
| → solf1re joined | 09:30 |
| ← solf1re left | 09:30 |
| ← theskillwithin left | 09:30 |
| ← akiva left | 09:30 |
| → solf1re joined | 09:30 |
| ← solf1re left | 09:30 |
| → solf1re joined | 09:31 |
| ← solf1re left | 09:31 |
| ← armyriad left | 09:31 |
| → solf1re joined | 09:32 |
| ← solf1re left | 09:32 |
| → liamonade joined | 09:32 |
| ← liamonade left | 09:32 |
| → theskillwithin joined | 09:32 |
| → solf1re joined | 09:33 |
| ← solf1re left | 09:33 |
| → solf1re joined | 09:33 |
| ← solf1re left | 09:33 |
| ← mehola left | 09:35 |
| ← theskillwithin left | 09:37 |
| → drewo joined | 09:38 |
| → white_gecko joined | 09:41 |
| ← drewo left | 09:42 |
| ← Silenced left | 09:43 |
|
des_consolado
| Hey if I use a hard link from a directory within my repo to another directory within my repo, will git be okay with that or no? | 09:43 |
|
white_gecko
| Hello, I have two questions: | 09:43 |
|
| Is there any scientific literature about git, especially something like a formal mathematical model about commits, merges, diffs, rebase, … ? | 09:43 |
|
| In which cases is it not enought for a three way merge to take the latest common acestor of two commits? When do you actually need recursive three way merge? | 09:43 |
|
j416
| des_consolado: git will treat them as any other file | 09:44 |
|
des_consolado
| Basically I'm building a repo for a docker build of one of our projects, and there are many dependencies, for this particular dependency there is another repo of ours, so I include the repo as a submodule and it's part of this repo, but for the docker container itself when it is ran, it mounts a dir in the repo called lib/, so I'd like to use a hardlink to have a file in a dir in lib be linked to a | 09:44 |
|
| file in the submodule | 09:45 |
| ← phanimahesh left | 09:45 |
| → nuc joined | 09:45 |
|
des_consolado
| but if another user clones this repo and updates the file that is the hard link, will that also update the file in the sub repository? | 09:45 |
|
j416
| no | 09:46 |
|
| des_consolado: ^ | 09:46 |
|
des_consolado
| (i.e. will the hard link be maintained through push/pull to and from remote, is git aware of inodes and all that?) | 09:46 |
|
| ah, okay | 09:46 |
|
j416
| des_consolado: git treats it as a regular file, nothing special, it does not care | 09:46 |
| → phanimahesh joined | 09:46 |
|
j416
| des_consolado: it does do symlinks, though | 09:46 |
|
des_consolado
| yeah docker doesn't do symlinks :P | 09:51 |
|
| it's cool though, just done some extra docker mounts | 09:51 |
| → stantonk joined | 09:52 |
| ← mikecmpb_ left | 09:53 |
| → mikecmpbll joined | 09:54 |
| ← stantonk left | 09:57 |
| ← cyan__ left | 09:58 |
| ← cdown left | 09:59 |
| ← CausaMortis-Work left | 09:59 |
|
LiohAu
| If I do a "git merge develop -X theirs", does it takes "develop" version? or current branch version? develop right? | 10:01 |
| ← cqi left | 10:02 |
|
canton7
| yes | 10:02 |
|
LiohAu
| ok, so why does git tells me there's nothing to commit after that? | 10:02 |
|
| I should have to commit the changes coming from develop, no? | 10:02 |
|
canton7
| because the merge completed, created the merge commit, and you haven't made any changes since the merge? | 10:02 |
|
LiohAu
| no, only the merge | 10:03 |
|
canton7
| ok, so the merge completed. why do you expect there to be uncommitted changes? | 10:03 |
|
| 'git log' will show it | 10:03 |
|
LiohAu
| so basically I have a PR open with 1 changed file. That PR cannot automaticlaly merged because someone changed the same file and pushed to develop | 10:03 |
|
| I only want to make that PR automatically mergeable agian | 10:03 |
|
| again* | 10:04 |
|
canton7
| ok, so you'll need to merge develop into your PR branch | 10:04 |
|
| you probably don't want to use -X theirs - that will override your changes in the case that there's a conflict | 10:04 |
|
LiohAu
| ok, so what I did with a "git merge develop -X theirs" + "git checkout --HEAD my_change_file" | 10:04 |
| → cdown joined | 10:04 |
|
LiohAu
| but I don't have any other change to make, so how do I push that new "state" | 10:05 |
|
canton7
| why the checkout? that will just remove an uncommitted changes to my_change_file | 10:05 |
|
| *remove any | 10:05 |
|
| ... but since there shouldn't be any uncommitted changes anyway, it won't do anything | 10:05 |
|
LiohAu
| because that file I want to keep "ours" version | 10:05 |
|
| I read on S.O. that it is the same as "git checkout --ours -- <filename>" | 10:06 |
| ← JeroenT left | 10:06 |
|
canton7
| 1) you don't combine two sets of changes by completely replacing what the other person did, and 2) like I said, that won't have done what you wanted it to do | 10:06 |
|
| that checkout only does something if you're stopped in the middle of a conflicted merge | 10:06 |
|
| your merge won't have conflicted, because -X theirs automatically resolves all conflicts in favour of them | 10:06 |
| ← jceb left | 10:07 |
|
LiohAu
| Well in this case I want to replace its changes for that file, because he changed things without knowing that the whole file was being refactored.. | 10:07 |
|
| so, then how do I get all the new things from develop, and keep my changed file? | 10:07 |
|
canton7
| then you'll remove all of the changes he made, don't forget | 10:07 |
|
| undo your merge, do it again *without* -X theirs, when the merge stops because of a conflict, use 'git checkout --ours <filename>', then 'git commit' to complete the merge | 10:08 |
|
| ... then you'll have to re-do the changes he made by hand | 10:08 |
| → cyan__ joined | 10:09 |
|
LiohAu
| "then you'll remove all of the changes he made" => On that specific file yes, but I want to keep all the other changes he did. | 10:09 |
| ← ikmaak left | 10:09 |
| → Meow-J joined | 10:09 |
|
LiohAu
| what? so if he changed 100 files, and we have a conflict on 1 file, I have to redo all the 100 changes? | 10:09 |
|
canton7
| yeah, I was refererring to that particular file | 10:09 |
|
| no | 10:09 |
| → LeMike joined | 10:09 |
|
canton7
| just on that one file | 10:09 |
|
LiohAu
| oh ok, but as I said i don't get anything from him on that file | 10:10 |
| → ArchNoob joined | 10:10 |
| ← GT4066 left | 10:10 |
|
canton7
| you're saying he didn't change '<filename>'? | 10:10 |
|
LiohAu
| he did, but he should have undo when I told him that file was being deeply changed/refactored. And he forgot to undo, and pushed that file with the other changes.. | 10:11 |
| → ikmaak joined | 10:11 |
|
canton7
| ok | 10:11 |
|
| the commands I gave above still apply then | 10:11 |
| ← pcre_ left | 10:11 |
|
LiohAu
| ok so right now, "git reset --hard ORIG_HEAD" to cancel my "invalid merge" right? | 10:12 |
|
| and your commands | 10:12 |
| → pcre joined | 10:12 |
|
canton7
| yeah, unless you've done something since to reset ORIG_HEAD | 10:12 |
|
| do you understand why what you were trying to do was failing? | 10:12 |
|
LiohAu
| I think that the file I was trying to checkout with --ours, was not in a conflict state, so the checkout was doing nothing, right? | 10:13 |
| → noidea joined | 10:14 |
| → Beams_ joined | 10:14 |
|
canton7
| it's not just the file that wasn't in a conflict state: nothing was. If you use -X theirs, the merge will not conflict - the point of -X theirs is to automatically resolve conflicts. So nothing was conflicted. You just run a command to replace the contents of the file with what was in the previous commit (i.e. replace the result of the merge with the result of the merge) | 10:14 |
|
LiohAu
| actually I think I have a problem in the way conflicts are handled in git. | 10:15 |
|
canton7
| I doubt that, but go on | 10:15 |
| ← Beams left | 10:16 |
| → p4trix joined | 10:17 |
| ← mika left | 10:18 |
| → mika joined | 10:18 |
|
King_DuckZ
| I want to parse the output of git submodule status to get the current state of each submodule (the +/- first char), is there a more scripting-friendly command to achieve the same? initialized submodules will have a trailing (heads/maste) which is causing extra work | 10:19 |
| ← geoff-codes left | 10:19 |
| ← indieross left | 10:19 |
| → CrazyBonz joined | 10:20 |
| → indieross joined | 10:20 |
| → romerocesar joined | 10:21 |
| → thalleralexander joined | 10:21 |
| ← thalleralexander left | 10:22 |
| ← nnyk_ left | 10:22 |
| ← msonntag left | 10:23 |
| → thalleralexander joined | 10:24 |
| → hahuang61 joined | 10:24 |
| ← thalleralexander left | 10:24 |
| ← pcre left | 10:25 |
| → pcre joined | 10:25 |
| → nellicus_ joined | 10:25 |
| ← romerocesar left | 10:26 |
|
LiohAu
| canton7, sorry got a call. So, I was saying that I may have misunderstood something, because when I merge without using ours/theirs what I see in the list of changes always makes me thing that my branch is taken in priority over the develop one. | 10:26 |
| → nnyk_ joined | 10:26 |
|
LiohAu
| this is why I wanted to use the -theirs | 10:26 |
|
canton7
| a merge combines your changes with theirs - neither takes priority | 10:28 |
|
| if you reach a case where both yours and theirs make the same change, so there's a question about which has priority, git creates a conflict | 10:29 |
| ← ikmaak left | 10:29 |
| ← hahuang61 left | 10:29 |
| ← boombatower left | 10:30 |
| → msonntag joined | 10:30 |
| → boombatower joined | 10:31 |
| ← xall left | 10:31 |
| → drewo joined | 10:32 |
| → waveclaw joined | 10:32 |
| → ikmaak joined | 10:32 |
|
LiohAu
| oh fuck | 10:33 |
| ← netj left | 10:33 |
| → netj joined | 10:34 |
|
LiohAu
| git made an automatic merge on a file which is automatically generated from the one I told him to take my version | 10:34 |
|
canton7
| you probably shouldn't be tracking generated files | 10:34 |
|
| ... but anyway, you can fix that file up, and git commit --amend to change the outcome of the merge | 10:34 |
| → fahadash joined | 10:34 |
|
LiohAu
| yeah I know, we are going to generate them in the build process soon :( | 10:35 |
|
canton7
| ... but be sure to never edit a merge commit so that it contains changes which didn't come from either parent - those are so-called evil merges, and it's really hard to track down where the change was introduced | 10:35 |
| → mehola joined | 10:35 |
| → pcre___ joined | 10:36 |
| → rchavik joined | 10:36 |
| ← pcre left | 10:36 |
|
LiohAu
| I don't even know how to fix my mistake | 10:36 |
|
canton7
| 1) run the script which generates the build output, 2) 'git add generatedfile', 3) 'git commit --amend' | 10:36 |
| ← drewo left | 10:36 |
|
LiohAu
| I used the "git checkout --ours -- " as you said | 10:37 |
|
canton7
| wait, stop | 10:37 |
|
| are you still in the middle of a conflicted merge | 10:37 |
|
| wait, you ran 'git checkout --ours --' and not 'git checkout --ours thefile'? | 10:37 |
|
LiohAu
| git checkout --ours -- thefile | 10:37 |
|
| no i'm not in the middle of the conflicted merge anymore | 10:38 |
|
canton7
| you scared me there | 10:38 |
|
| ok, then the instructions I gave still hold | 10:38 |
| → johnmilton joined | 10:38 |
| ← johnmilton left | 10:40 |
| → johnmilton joined | 10:40 |
| → JeroenT joined | 10:41 |
| ← mehola left | 10:41 |
| ← pcre___ left | 10:42 |
| ← johnmilton left | 10:42 |
| → pcre_ joined | 10:42 |
|
LiohAu
| canton7: https://gist.github.com/LiohAu/4dff682428a92538c857532b85d8a7ce | 10:42 |
| → johnmilton joined | 10:42 |
|
LiohAu
| this is the log of what I did | 10:42 |
|
| canton7 reads | 10:43 |
| → xall joined | 10:43 |
|
canton7
| About_Page_Mobile_64256.feature.cs is the file which you both modified? | 10:43 |
|
LiohAu
| the .feature file is the file we both modified. The .feature.cs is an automatically generated one from the associated .feature | 10:43 |
| ← johnmilton left | 10:43 |
|
canton7
| ok, but you ran 'git checkout --ours' on the generated file? | 10:44 |
| → johnmilton joined | 10:44 |
|
canton7
| hmm, About_Page_Mobile_64256.feature didn't conflict | 10:44 |
|
| so you didn't edit the same lines in it | 10:44 |
|
LiohAu
| that's what is weird, you see, when I pulled with "git pull origin feature_file-about", it was like if the merge I did before was still there | 10:44 |
| ← tvw left | 10:45 |
|
canton7
| I don't know whether it was... | 10:45 |
| → tvw joined | 10:45 |
|
canton7
| output of !lol ? | 10:45 |
|
gitinfo
| A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 10:45 |
| ← auzty left | 10:46 |
| ← johnmilton left | 10:46 |
|
LiohAu
| updated gist : https://gist.github.com/LiohAu/4dff682428a92538c857532b85d8a7ce | 10:46 |
| → johnmilton joined | 10:47 |
| ← johnmilton left | 10:47 |
| ← tristanp left | 10:47 |
| → johnmilton joined | 10:47 |
|
canton7
| ok right, so you did the merge twice by the looks of it | 10:47 |
|
LiohAu
| how do you see it? | 10:47 |
|
| oh the two "comments" saying the same thing | 10:48 |
|
| what does a star and a line means ? | 10:48 |
| → yqt joined | 10:49 |
|
canton7
| stars and commits. the line next to a star is the "commit_hash (branch name) commit message" | 10:49 |
| → Codfection joined | 10:49 |
| ← rafalcpp left | 10:49 |
| → mrkat joined | 10:49 |
|
canton7
| lines join commits together - they show which commits are the parents and children of which other commits | 10:49 |
|
| time begins at the bottom, with the newer stuff on top | 10:49 |
|
| so af0387d merges together 6cc1fbf and 167387a | 10:50 |
|
| and 9dbcb99 does the same thing | 10:50 |
| → vls-xy joined | 10:50 |
|
canton7
| so it looks like you did a merge, pushed it, then undid it locally and did it again | 10:50 |
|
| ... which is fine | 10:50 |
| ← notebox left | 10:50 |
| ← Impaloo left | 10:50 |
|
canton7
| but merging in origin/feature_file-about (which contains your first attempt to do the merge, which you later undid) would be a mistake | 10:50 |
| → Impaloo joined | 10:50 |
|
canton7
| ... being able to visualise git history is the first step to learning how to use git. The ascii output is useful for pasting over IRC, but is slightly cryptic to interpret. There are much better graphicaly tools: gitk is often distributed with git, or there are others | 10:51 |
| ← johnmilton left | 10:51 |
| ← JeroenT left | 10:51 |
| → JeroenT joined | 10:51 |
|
LiohAu
| i'm on osx :( | 10:51 |
| → johnmilton joined | 10:51 |
| → romerocesar joined | 10:52 |
|
canton7
| I've got gitk on osx - can't remember whether it came pre-installed, with the homebrew git version, or whether it was in a separate homebrew package... | 10:52 |
|
| there are other visualisers for mac as well | 10:52 |
|
vls-xy
| perhaps gitx suits your fancy: http://rowanj.github.io/gitx/ | 10:53 |
| → MrWoohoo joined | 10:53 |
| → tristanp joined | 10:53 |
|
LiohAu
| Just installed the homebrew version, and its comes with it (default apple git does not have it) | 10:53 |
| → CheckDavid joined | 10:53 |
| → acetakwas joined | 10:54 |
|
canton7
| cool | 10:54 |
|
LiohAu
| yeah gitk looks a little bit like 90's software :P | 10:54 |
|
canton7
| 'gitk --all &' in a git repo is a good way to launch it | 10:54 |
|
| yeah, it's not pretty on osx - it's tcl/tk iirc, which gets rendered pretty badly | 10:55 |
|
| it's better on windows, or even better on linux :P | 10:55 |
|
bremner
| it's not _pretty_ anywhere, but mac people seem to care more ;) | 10:55 |
|
canton7
| it *is* worse-looking on mac though | 10:55 |
|
bremner
| haha | 10:55 |
|
| justice! | 10:55 |
|
canton7
| >< | 10:55 |
| ← cdown left | 10:56 |
| ← romerocesar left | 10:56 |
| → cdown joined | 10:56 |
|
LiohAu
| well maybe because we are used to see pretty things :P | 10:56 |
| → Beams joined | 10:56 |
|
LiohAu
| I would say that linux is for working stuff, windows is for beautilfull stuff, and osx is for having both :P | 10:56 |
| ← CussBot left | 10:58 |
| → theskillwithin joined | 10:59 |
| ← Beams_ left | 11:00 |
| ← acetakwas left | 11:00 |
| ← pcre_ left | 11:01 |
| ← ArchNoob left | 11:01 |
| ← boombatower left | 11:01 |
| → pcre__ joined | 11:01 |
| → CussBot joined | 11:01 |
| → rnsanchez joined | 11:02 |
| ← rchavik left | 11:03 |
| → dimi1947 joined | 11:04 |
| ← Impaloo left | 11:04 |
| → Impaloo joined | 11:04 |
| ← white_gecko left | 11:08 |
| ← theskillwithin left | 11:09 |
|
LiohAu
| canton7: I feel like if I were a variable in an infinite loop :'( | 11:09 |
|
| tried to push, was rejected because : hint: Updates were rejected because the tip of your current branch is behind... | 11:10 |
| ← ojdo left | 11:10 |
|
canton7
| yep, because you changed a commit which you'd already pushed. you !rewrote public history | 11:10 |
|
LiohAu
| so I pulled, and the same conflict as the one I solved just before | 11:10 |
|
canton7
| nooo don't pull here! | 11:10 |
|
| bleh, !rewrite | 11:10 |
|
gitinfo
| Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum | 11:10 |
|
LiohAu
| :'( | 11:11 |
|
canton7
| normally, force-pushing is a bad idea. However it's very useful with PR branches: noone else is working from them, and github knows how to handle them, in order to change which commits are part of the PR | 11:11 |
|
| so in this case you want to fix up your local branch so it has just the right merge in, the force-push it | 11:11 |
| → theskillwithin joined | 11:12 |
|
LiohAu
| so how do I cancel my pull ? without an rm -rf :P | 11:12 |
|
canton7
| let's see that !lol output again | 11:12 |
|
gitinfo
| A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 11:12 |
|
canton7
| we'll find a suitable commit to reset back to, and reset to it | 11:12 |
| ← theskillwithin left | 11:13 |
|
LiohAu
| https://gist.github.com/LiohAu/4dff682428a92538c857532b85d8a7ce | 11:13 |
|
| you have both the previous log, and the new one | 11:13 |
|
canton7
| right, so we can see what the merge commit af0387d was merged into the merge commit 9dbcb99 | 11:14 |
|
| wait, no it doesn't | 11:14 |
|
| ignore that | 11:14 |
| → ArchNoob joined | 11:14 |
| ← PCatinean left | 11:15 |
|
canton7
| right, so merge merged together 167387a and 6cc1fbf to make 9dbcb99, then edited that to make a7a44e4? | 11:15 |
|
LiohAu
| basically I want to keep 167387a | 11:15 |
|
| yeah I want to keep 167387a + 6cc1fbf | 11:15 |
| → ojdo joined | 11:16 |
|
canton7
| so what's wrong with a7a44e4? | 11:16 |
| → Beams_ joined | 11:17 |
|
LiohAu
| I don't know, I don't even know how to know what is inside :( | 11:18 |
|
canton7
| I'll reword: is there anything wrong with a7a44e4? | 11:18 |
|
| 'git show' will show you its diff | 11:18 |
|
| the "inside" of it is currently checked out in your working directory | 11:18 |
| → acetakwas joined | 11:19 |
|
LiohAu
| on the remote repo, there is af0387 which is half of what I wanted. The develop content is correctly integrated in the feature_file-about branch, the .feature file content is ok. Only the .feature.cs file is not. | 11:19 |
|
TomyWork
| Does the "tag" in "git pull $url tag $tag" make any sense there? | 11:19 |
|
canton7
| Tomno | 11:20 |
|
| *TomyWork, no | 11:20 |
|
TomyWork
| Jenkins writes that and I think it's an error on its behalf. | 11:20 |
|
| git pull failed | 11:20 |
|
| no further info, unfortunately | 11:20 |
| ← cdown left | 11:20 |
|
canton7
| LiohAu, shall we start over? Get this right first time, no confusion? | 11:20 |
| ← Beams left | 11:21 |
|
LiohAu
| git show of a7a44e4 looks ok (If what is green is what is in this commit, then its what I want) | 11:21 |
|
canton7
| what is green is what was introduced in that commit | 11:21 |
| → HoierM joined | 11:22 |
| → romerocesar joined | 11:22 |
|
canton7
| anyway, if a7a44e4 contains what you want to keep, then you can replace what's on origin with it, by using 'git push -f origin feature_file-about' | 11:22 |
| → rahtgaz joined | 11:22 |
|
canton7
| note that force-pushing is usually a VERY BAD IDEA. But it's fine in some cases, and PR branches is one of those | 11:22 |
| → white_gecko joined | 11:23 |
| → notebox joined | 11:23 |
|
LiohAu
| ok, but right now I can't push | 11:24 |
|
| because my repo is in a conflicted state | 11:24 |
|
| (I don't know why git log shows nothing about this) | 11:24 |
|
canton7
| wait, you're in the middle of a merge commit? ok | 11:24 |
|
| abort that: 'git merge --abort' | 11:24 |
|
LiohAu
| y | 11:25 |
| ← durham left | 11:25 |
| ← mkoskar left | 11:25 |
|
LiohAu
| ok | 11:25 |
| → xpk joined | 11:25 |
|
LiohAu
| what happens when I do that? ok, it cancel the merge, but what happens to the pull that raised the conflict ? | 11:25 |
| → hahuang61 joined | 11:25 |
|
white_gecko
| Is there any scientific literature about git? | 11:26 |
| → drewo joined | 11:26 |
|
canton7
| LiohAu, hmm? do you know that 'pull' is just shorthand for 'fetch + merge'? | 11:26 |
| ← romerocesar left | 11:26 |
|
LiohAu
| white_gecko: is this scientific : https://git-scm.com/doc ? | 11:26 |
|
canton7
| so 'git pull origin master' is shorthand for 'git fetch origin; git merge origin/masteer' | 11:26 |
|
LiohAu
| canton7: no, but know I do :P | 11:27 |
|
canton7
| so the 'git merge --abort' aborts the merge portion, but the fetch portion is left untouched | 11:27 |
| → NeonSynth joined | 11:27 |
|
LiohAu
| ok, so you tell me to push -f | 11:28 |
|
canton7
| yep | 11:28 |
|
LiohAu
| but git status tells there's no pending commit | 11:28 |
|
canton7
| pastebin? | 11:28 |
|
LiohAu
| $ git status | 11:28 |
|
| On branch feature_file-about nothing to commit, working directory clean | 11:28 |
|
canton7
| that means you have no uncommitted changes | 11:29 |
|
| that means that a 'git commit' would be pointless | 11:29 |
|
| but you still have local *commits* which origin doesn't have | 11:29 |
|
| so you can push stuff | 11:29 |
| → rchavik joined | 11:29 |
|
LiohAu
| shouldn't git says something like "my branch is 1 commit ahead" or something like this? | 11:29 |
|
canton7
| it'll probably say 2 ahead / 1 behind, if you've got tracking set up | 11:29 |
| → hk238 joined | 11:29 |
|
canton7
| but you probably don't have tracking set up for that branch. Don't worry about it | 11:30 |
|
white_gecko
| LiohAu: It is a technical documentation so for computerscience, yes partially. | 11:30 |
| ← hahuang61 left | 11:30 |
|
osse
| white_gecko: !bottomup | 11:30 |
|
gitinfo
| white_gecko: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf) | 11:30 |
|
white_gecko
| but i was especially looking for something like a formal mathematical model about commits, merges, diffs, rebase, … ? | 11:30 |
| acetakwas → abstract | 11:31 |
| → jatin30 joined | 11:31 |
| ← david007 left | 11:31 |
| ← drewo left | 11:31 |
| → david joined | 11:31 |
|
LiohAu
| canton7: https://gist.github.com/LiohAu/4dff682428a92538c857532b85d8a7ce | 11:31 |
| abstract → Guest2274 | 11:31 |
| david → Guest40527 | 11:31 |
|
canton7
| LiohAu, yes? | 11:31 |
|
LiohAu
| the feature_file-about has no arrow like the HEAD one, this means there's no tracking setup ? | 11:32 |
| → cdown joined | 11:32 |
|
canton7
| yes | 11:32 |
|
| 'git branch --set-upstream-to origin/feature_file-about' | 11:32 |
| ← Guest40527 left | 11:32 |
|
canton7
| 'git branch --set-upstream-to=origin/feature_file-about' | 11:32 |
| → david007 joined | 11:32 |
| Guest2274 → whatsapp | 11:32 |
|
LiohAu
| I thought tracking was automatically setup when you make a "git checkout -b branch_name" and then "git push origin branch_name" | 11:32 |
| whatsapp → google | 11:33 |
|
canton7
| LiohAu, it's automatically set by 'git checkout -b branch_name origin/branch_name' | 11:33 |
|
| 'push' doesn't set it unless you pass it -u | 11:33 |
| google → googledocs | 11:33 |
|
jatin30
| when I cherry-pick and get merge conflicts I resolve them manually using mergetool, meld. I do not read on the whole code I just add anything which is extra and kindof resolve the merge conflicts randomly which just does not seem right. Any correct way of doing it? Should I use git pull --rebase ? | 11:33 |
|
LiohAu
| so I should change my habits when I create a feature branch and use "git checkout -b branch_name origin/branch_name" instead of "git checkout -b branch_name" ? | 11:34 |
|
white_gecko
| osse: I need a password for the newartisans, but is the ikke.info link the official one? | 11:34 |
|
canton7
| LiohAu, no! they do completely different things | 11:34 |
|
| 'git checkout -b branch_name' creates a new local branch, branch_name, based off your currently-checked-out branch | 11:34 |
|
| 'git checkout -b branch_name origin/branch_name' creates a new local branch, branch_name, based off the remote branch origin/branch_name | 11:34 |
|
| you use the former to create a new branch, and the latter to start working on a branch which someone else created | 11:35 |
| ← PioneerAxon left | 11:35 |
|
osse
| white_gecko: I don't know. _ikke_ is the guy hosting it. | 11:35 |
|
| but it seems to be the exact same document | 11:35 |
| → PioneerAxon joined | 11:35 |
|
_ikke_
| I' | 11:36 |
|
| I'm mirroring it because it was down some time ago | 11:36 |
| → mehola joined | 11:37 |
|
_ikke_
| The ftp one works for me though | 11:37 |
|
osse
| it's not a dead link, but I have to log in | 11:38 |
|
_ikke_
| Hmm, I don't get a login prompt | 11:39 |
|
jatin30
| why does this not work https://bpaste.net/show/82bdda582874 ? | 11:40 |
| → Beams joined | 11:41 |
| ← mehola left | 11:41 |
|
_ikke_
| You have a conflict | 11:42 |
|
osse
| jatin30: the patch doesn't apply cleanly | 11:42 |
|
_ikke_
| You need to fix the conflict | 11:42 |
|
white_gecko
| is there a repo with the sources of thei pdf? | 11:42 |
|
osse
| unfortunate, but not unexpected | 11:42 |
|
jatin30
| osse, what should I do to fix this? | 11:43 |
|
osse
| jatin30: !eek | 11:43 |
|
gitinfo
| jatin30: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II | 11:43 |
| ← flaguy48 left | 11:43 |
|
osse
| 'git status' and 'git diff' are good starting points also | 11:43 |
| → raindev joined | 11:43 |
| → MrMojito joined | 11:44 |
| ← Beams_ left | 11:44 |
| ← JeroenT left | 11:45 |
|
jatin30
| osse, there are good chances that I might have randomly resolved some previous merge conflicts by no proper judgement as to which part of file is more relevant. I just made the three copies exactly similar using mergetool and finished the cherry-pick. what is the worst thing that could happen? | 11:45 |
| → mdw joined | 11:46 |
| → Noldorin joined | 11:46 |
| ← mdw left | 11:46 |
| ← rchavik left | 11:47 |
|
osse
| jatin30: the worst that could happen is that the source code in the mentioned file won't compile, or will do something else than intended | 11:47 |
| → mdw joined | 11:47 |
| ← DieguezZ left | 11:48 |
| ← circ-user-foXmx left | 11:49 |
| ← jatin30 left | 11:50 |
| → jatin30 joined | 11:50 |
|
jatin30
| sorry my system hung. osse, could you please copy your ans to my last question please, if you did ans. | 11:51 |
|
| !eek | 11:51 |
|
gitinfo
| [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II | 11:51 |
| ← cdown left | 11:51 |
|
osse
| jatin30: the worst that could happen is that the source code in the mentioned file won't compile, or will do something else than intended | 11:51 |
| → cdown joined | 11:51 |
|
jatin30
| osse, I was afraid of that! any way I could stop that? | 11:51 |
|
osse
| jatin30: either fix the conflict or abort the cherry-pick | 11:52 |
| → JeroenT joined | 11:52 |
| → stratos joined | 11:52 |
|
white_gecko
| In which cases is it not enought for a three way merge to take the latest common acestor of two commits? When do you actually need recursive three way merge? | 11:53 |
|
jatin30
| osse, conflicts are fixed. cherry picking is done | 11:54 |
|
| let me test it on my phone and see what happens | 11:54 |
| → mahendra_ joined | 11:55 |
| ← aswen left | 11:56 |
| → bruce_lee joined | 11:56 |
| ← bruce_lee left | 11:56 |
| → bruce_lee joined | 11:56 |
|
jatin30
| but after every cherry-pick I do a repo sync before the next cherry-pick and it runs fine. as repo sync runs fine I am guessing Its compiling properly right? | 11:57 |
| → rchavik joined | 11:57 |
|
osse
| whether it compiles properly only javac can tell you | 11:57 |
|
| not git, and certainly not me | 11:58 |
| ← tvw left | 11:58 |
|
jatin30
| oh yes | 11:58 |
|
| that was so lame | 11:58 |
|
| ok thanks | 11:58 |
| ← mahendra_ left | 11:58 |
|
osse
| i don't know what a "repo sync" is, but why are you doing all these cehrry picks? | 11:58 |
| → synthroid joined | 11:59 |
| ← notebox left | 12:00 |
| ← akitada left | 12:00 |
|
jatin30
| we are building on cyanogenmod for making an OS | 12:00 |
|
| so cherry picking basic features for that | 12:00 |
| → synthroi_ joined | 12:01 |
| ← kedare left | 12:01 |
| ← jatin30 left | 12:01 |
| → notebox joined | 12:01 |
| → flaguy48 joined | 12:01 |
| → tvw joined | 12:01 |
| → DieguezZ joined | 12:02 |
| ← yqt left | 12:02 |
| → tomog999_ joined | 12:03 |
| ← synthroid left | 12:03 |
| ← Andrew_K left | 12:04 |
| ← tomog999 left | 12:06 |
| → pioiytr joined | 12:06 |
|
wspider
| I have two branches with folder 'foo', I deleted that folder from branch A because I want both to have the foo content of B, so I deleted foo from A and tried to merge with B | 12:06 |
| ← xall left | 12:06 |
|
wspider
| mergin A with B or B with A, the result doesn't have the foo folder so i 'git reflog' and reset --hard according and am up to trying new things until I get what I wanted | 12:07 |
| → liquidjamm joined | 12:07 |
|
wspider
| any hint ? | 12:07 |
|
LiohAu
| wspider: canton7 will help you :P | 12:07 |
| ← pioiytr_ left | 12:07 |
| ← rchavik left | 12:09 |
|
canton7
| hey, I'm eating lunch: give me a break :) | 12:09 |
|
bremner
| /kick canton7 | 12:09 |
|
| as requested ;) | 12:09 |
|
wspider
| LiohAu: haha :> | 12:09 |
|
LiohAu
| :D | 12:10 |
|
| i'm gonna eat too | 12:10 |
|
| canton7: are you in CET area ? | 12:10 |
|
canton7
| ish - GMT | 12:10 |
| → TestUser joined | 12:10 |
| ← jeffreylevesque left | 12:11 |
|
LiohAu
| hm I see you're on c# and iphonedev channels, are you a xamarin user ? | 12:11 |
|
| (or a polyglot :P) | 12:12 |
| → NeverDie joined | 12:12 |
| ← tristanp left | 12:13 |
| ← NeverDie left | 12:14 |
| → NeverDie joined | 12:14 |
|
wspider
| halp | 12:14 |
|
| xd | 12:15 |
| ← NeverDie left | 12:15 |
| → NeverDie joined | 12:15 |
| → maaarghk joined | 12:15 |
|
canton7
| LiohAu, I work at a consultancy, so a bit of everything | 12:16 |
|
maaarghk
| Hello. In 2.9 --allow-unrelated-histories was added as an option to "git merge". The release note below taht says that "git pull" has been taught to pass that option to the underlying git merge. However, git rebase does not appear to have been taught the same thing. Is there a way to pass that option from rebase? | 12:17 |
|
canton7
| there's no 'underlying merge' for a rebase | 12:17 |
|
| rebase and merge are separate things | 12:17 |
| ← M-mistake left | 12:18 |
| ← M-meznak left | 12:18 |
| ← M-shine left | 12:18 |
|
maaarghk
| git rebase uses merge, right? hence -s and -X options being passed down. | 12:18 |
| → mdw_ joined | 12:18 |
| ← qknight left | 12:19 |
| → rwb joined | 12:19 |
|
canton7
| sort of. git rebase takes a set of commits, and one-by-one cherry-picks them onto a branch (well it's not exactly cherry-pick, but close enough) | 12:19 |
|
| so rebase doesn't take two histories and creates a single merge commit | 12:19 |
|
| it takes a set of commits, and individually merges each one (effectively) onto a given branch | 12:20 |
| → drewo joined | 12:20 |
| ← mdw left | 12:21 |
| → Asenar joined | 12:21 |
|
maaarghk
| yeah, I should have been clearer though and mentioned that I have --preserve-merges as an option to git rebase, which means that merge commits are being created | 12:21 |
|
| However they are currently failing with 'refusing to merge unrelated histories' error, and I am trying to work out how to use the git merge --allow-unrelated-histories switch to get past that | 12:22 |
| → romerocesar joined | 12:22 |
|
wspider
| LiohAu: I already figured out, thanks !! | 12:24 |
| → tristanp joined | 12:25 |
| → jeffreylevesque joined | 12:25 |
| ← drewo left | 12:25 |
| → lindenle joined | 12:25 |
| → deadnull joined | 12:25 |
| ← raindev left | 12:25 |
| → hahuang61 joined | 12:26 |
| ← toogley left | 12:27 |
| ← romerocesar left | 12:27 |
| → toogley joined | 12:27 |
| → aswen joined | 12:28 |
| ← lindenle left | 12:29 |
| ← hahuang61 left | 12:31 |
| → romerocesar joined | 12:33 |
| ← tvw left | 12:33 |
| → encod3 joined | 12:35 |
| ← romerocesar left | 12:37 |
| → mehola joined | 12:38 |
| → ThomasLocke joined | 12:38 |
| ← liquidjamm left | 12:38 |
| → raindev joined | 12:40 |
| → rafalcpp joined | 12:40 |
| → adrianoc joined | 12:41 |
| → AaronF joined | 12:41 |
| ← raindev left | 12:42 |
| → rchavik joined | 12:42 |
| ← mehola left | 12:42 |
| → umbSublime joined | 12:43 |
| ← umbSublime left | 12:43 |
| → umbSublime joined | 12:43 |
| ← DieguezZ left | 12:43 |
|
adrianoc
| hi all ... how i can authenticate git clone http://... with ssh key (git clone ssh://) | 12:47 |
| → BlackMaria joined | 12:48 |
| → liquidjamm joined | 12:51 |
| → rgrinberg joined | 12:51 |
|
spb
| adrianoc: by using an ssh URL | 12:51 |
| ← qpdb left | 12:51 |
| ← liquidjamm left | 12:52 |
| ← CheckDavid left | 12:52 |
|
adrianoc
| sbp, ssh is blocked. | 12:52 |
|
Bombe
| Then you obviously can not use it for authentication. | 12:53 |
| → daniel_rose joined | 12:53 |
| → stantonk joined | 12:54 |
|
adrianoc
| i want to make with a gitHub | 12:54 |
| → TooLmaN joined | 12:55 |
| → M-shine joined | 12:55 |
| → liquidjamm joined | 12:55 |
| ← Eryn_1983_FL left | 12:56 |
| → harish joined | 12:56 |
| → zhbc joined | 12:57 |
| → espindola joined | 12:57 |
|
grawity
| adrianoc: neither HTTP nor HTTPS uses ssh keys | 12:57 |
|
| adrianoc: you can however use ssh://git@ssh.github.com:443/ | 12:57 |
|
| adrianoc: see https://help.github.com/articles/using-ssh-over-the-https-port/ | 12:57 |
| → cuebix-wk joined | 12:58 |
| → Eryn_1983_FL joined | 12:59 |
| → Masterphi joined | 12:59 |
|
adrianoc
| grawity, it's better. | 13:00 |
| ← stantonk left | 13:00 |
|
grawity
| ? | 13:00 |
| → stantonk_ joined | 13:00 |
|
CalimeroTeknik
| oh, .git folders are ignored by default? I know this is git abuse, but I'm running incremental backups of folders containing git repos using git | 13:02 |
| → jimi_ joined | 13:02 |
| ← zhbc left | 13:02 |
|
CalimeroTeknik
| using add -Af works even for gitignored files, but not for .git folders | 13:02 |
|
| s/folders/directories/ | 13:03 |
| → mikecmpb_ joined | 13:03 |
| ← david007 left | 13:04 |
| ← Masterphi left | 13:04 |
| → tjone270_ joined | 13:05 |
|
grawity
| they're *always* ignored | 13:05 |
| ← tjone270 left | 13:06 |
|
adrianoc
| grawity, i try this way. thanks. | 13:06 |
| ← rgrinberg left | 13:06 |
|
adrianoc
| no now, because my server have not http configured. | 13:07 |
| ← mikecmpbll left | 13:07 |
| → rgrinberg joined | 13:07 |
|
adrianoc
| and how i can't access ssh, just the night to test. | 13:07 |
| → tchan joined | 13:08 |
| ← dimi1947 left | 13:08 |
| → ExoUNX joined | 13:08 |
| ← ExoUNX left | 13:08 |
| → ExoUNX joined | 13:08 |
|
grawity
| what server | 13:10 |
| ← daniel_rose left | 13:10 |
| → crose joined | 13:12 |
| ← notebox left | 13:13 |
| → dimi1947 joined | 13:14 |
| → notebox joined | 13:14 |
| → drewo joined | 13:14 |
| → livingstn joined | 13:15 |
| ← pcre__ left | 13:17 |
| ← ThomasLocke left | 13:17 |
| → usm4n joined | 13:17 |
|
adrianoc
| grawity, my server, deskfacil.com | 13:18 |
|
grawity
| you were talking about github minutes ago | 13:18 |
|
adrianoc
| i cant access ssh inside my work. | 13:18 |
| ← usm4n left | 13:18 |
| ← phanimahesh left | 13:18 |
| → Klipp joined | 13:18 |
|
adrianoc
| grawity, yes, as example. | 13:18 |
| → ThomasLocke joined | 13:18 |
|
grawity
| well, if it's not github, then you're out of luck | 13:19 |
| → DieguezZ joined | 13:19 |
| ← drewo left | 13:20 |
|
adrianoc
| grawity, thanks, you helpe much. | 13:20 |
|
| later i tell you if worked :) | 13:20 |
|
perlpilot
| adrianoc: or ... configure your server to handle http(s) | 13:20 |
| → M-mistake joined | 13:21 |
| → M-meznak joined | 13:21 |
| ← clmsy left | 13:23 |
| → ash_workz joined | 13:23 |
| ← freimatz left | 13:24 |
| → usm4n joined | 13:24 |
| ← DieguezZ left | 13:24 |
|
adrianoc
| perlpilot, bu i want using one password. | 13:25 |
| ← raijin left | 13:25 |
|
grawity
| configure your server to use TLS certificate auth | 13:25 |
|
osse
| King_DuckZ: the more complex parts of that question are probably best asked on the mailing list. As for the superficial parts it seems he answered his own question in that post | 13:26 |
| → kedare joined | 13:28 |
| ← adrianoc left | 13:29 |
| ← Dro left | 13:29 |
| → pmst joined | 13:30 |
| → todd_dsm joined | 13:30 |
| → SteffanW joined | 13:30 |
| → daniel_rose joined | 13:30 |
| ← aswen left | 13:31 |
| → g105b joined | 13:31 |
| → marc_v92 joined | 13:32 |
| ← SteffanW left | 13:32 |
| → circ-user-foXmx joined | 13:32 |
|
g105b
| I know the answer is going to be "it depends", but I'm struggling to make my own opinion and I'd appreciate it if someone could point me to some recommended reading or their own advice on this. My company automatically deploys the master branch to live, whenever there's a commit. We branch away from master for each issue, or for big changes, introduce | 13:35 |
|
| another branch to branch from for sub-issues. My question is whether we should be rebasing the child branch on the parent branch before each merge? I can't make any sense of why this is regarded as beneficial by some people, but there are many people itching to use rebase over simple merging. Thanks. | 13:35 |
| ← stratos left | 13:35 |
| ← Duikb00t left | 13:36 |
| → cqi joined | 13:38 |
| → GodGinrai joined | 13:40 |
| ← rchavik left | 13:41 |
| ← rahtgaz left | 13:41 |
| → HanClinto joined | 13:42 |
| → rahtgaz joined | 13:42 |
|
osse
| !merge_vs_rebase > g105b | 13:43 |
|
gitinfo
| [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html | 13:43 |
|
osse
| g105b: a major part of it is preference. some like the log being a straight line | 13:43 |
|
g105b
| Thanks! | 13:44 |
| ← todd_dsm left | 13:45 |
|
perlpilot
| I suspect those people come from svn or some svn-like system | 13:45 |
| ← hwoarang left | 13:45 |
| → DieguezZ joined | 13:46 |
| ← DieguezZ left | 13:46 |
| ← arooni__ left | 13:46 |
| → kbs joined | 13:46 |
|
wodim
| is it possible to push to all remotes at once? | 13:46 |
|
madknight
| wodim, https://stackoverflow.com/questions/5785549/able-to-push-to-all-git-remotes-with-the-one-command | 13:47 |
|
wodim
| yeah that's what I was reading. ugly tho | 13:47 |
|
| but ok fair enough | 13:47 |
|
perlpilot
| xargs is ugly? | 13:48 |
|
wodim
| no, I just thought there would be a git command for it by now--usually stackoverflow answers are outdated | 13:48 |
| → hwoarang joined | 13:48 |
| → raijin joined | 13:49 |
|
madknight
| wodim, you can alias it, there is also no command "git squash" but cool aliases | 13:50 |
| ← pmst left | 13:55 |
| → Gsham joined | 13:57 |
| → Gamecubic joined | 13:58 |
| ← notebox left | 13:58 |
| → Rodya_ joined | 13:58 |
| ← tristanp left | 13:59 |
| ← rscata left | 13:59 |
|
GodGinrai
| wodim: pushing to all remotes at once is an edge-case, which is probably why there isn't a command for it | 14:00 |
| ← marc_v92 left | 14:00 |
|
wodim
| not an edge case for me :P | 14:00 |
|
| but ok | 14:01 |
| → phaleth joined | 14:01 |
| → cdg joined | 14:02 |
| → moriko joined | 14:03 |
| → diegoviola joined | 14:03 |
| ← stantonk_ left | 14:04 |
| → usm4n_ joined | 14:04 |
| → unbalancedparen joined | 14:05 |
| → Darren_ joined | 14:05 |
| → marc_v92 joined | 14:05 |
| → tristanp joined | 14:07 |
| ← usm4n left | 14:07 |
| ← D-Boy left | 14:07 |
| → drewo joined | 14:08 |
| → al-damiri joined | 14:09 |
| ← cdg left | 14:09 |
| ← qt-x left | 14:10 |
| → gduine joined | 14:10 |
| ← ThomasLocke left | 14:11 |
| → fmcgeough joined | 14:12 |
| ← drewo left | 14:13 |
| ← marc_v92 left | 14:14 |
| → D-Boy joined | 14:14 |
| ← circ-user-foXmx left | 14:14 |
| → dreiss joined | 14:18 |
| → qpdb joined | 14:18 |
| → stantonk joined | 14:19 |
| ← usm4n_ left | 14:19 |
| ← ArchNoob left | 14:20 |
| → Vinnie_win_a joined | 14:21 |
| ← Vinnie_win left | 14:21 |
| ← johnny56_ left | 14:22 |
| ← NeverDie left | 14:23 |
| ← stantonk left | 14:23 |
| ← Rodya_ left | 14:23 |
| ← cdown left | 14:25 |
| → dmj` joined | 14:25 |
| → cdown joined | 14:26 |
| ← bremner left | 14:26 |
| → bremner joined | 14:26 |
| ← bremner left | 14:26 |
| → bremner joined | 14:26 |
| ← moriko left | 14:26 |
| → Passe_a_Manteiga joined | 14:26 |
| → l0rdPE joined | 14:27 |
| → hahuang61 joined | 14:27 |
| → mikecmpbll joined | 14:28 |
| → catag87 joined | 14:28 |
| → Asiajey joined | 14:29 |
| ← lugzer left | 14:31 |
| ← mikecmpb_ left | 14:31 |
| → LionsMane joined | 14:32 |
| → circ-user-foXmx joined | 14:32 |
| → hwoarang_ joined | 14:32 |
| ← hahuang61 left | 14:32 |
| → thiago joined | 14:32 |
| → moriko joined | 14:33 |
| ← crose left | 14:34 |
| ← Repox left | 14:34 |
| → Rodya_ joined | 14:34 |
| ← kbs left | 14:34 |
| → phanimahesh joined | 14:35 |
| ← cqi left | 14:35 |
| ← lordjancso left | 14:35 |
| ← hwoarang left | 14:35 |
| → notebox joined | 14:35 |
| ← tvon left | 14:36 |
| → yqt joined | 14:36 |
| ← JeroenT left | 14:36 |
| ← daniel_rose left | 14:36 |
| → MadHatter42 joined | 14:37 |
| ← rominronin left | 14:37 |
|
phanimahesh
| CalimeroTeknik: Using git to "backup" folders containing git repos is definitely way more than git abuse. please don't do it. :P | 14:38 |
|
CalimeroTeknik
| well, I can do tarballs | 14:40 |
|
| but that's going to be even worse since it uses up a lot of space | 14:40 |
|
phanimahesh
| Push to a git remote. | 14:40 |
| → daniel_rose joined | 14:40 |
|
phanimahesh
| And disable gc on server. | 14:40 |
|
| You'll have as good a backup as you can get. | 14:40 |
| ← mariuscc left | 14:41 |
|
CalimeroTeknik
| push from what? | 14:41 |
| ← ncd|leeN left | 14:41 |
|
CalimeroTeknik
| what about the gitignored files? | 14:41 |
| → rantic_work joined | 14:42 |
|
CalimeroTeknik
| and it's not one but dozens of repos that are in there | 14:42 |
| → johnny56_ joined | 14:43 |
|
CalimeroTeknik
| I know it's a mindset problem, but from your answer I can only derive one, even worse monstrosity: since git won't add all files, I can follow tarballs of that all these files with git | 14:43 |
|
| which is highly inconvenient | 14:43 |
| → kbs joined | 14:43 |
|
phanimahesh
| Oh. so you have multiple git repos, and you want to have backups to be able to restore to the exact state, including ignored files. | 14:44 |
|
CalimeroTeknik
| yeah, I could do tarballs every day, and even deal with the trouble of making incremental tarballs | 14:44 |
|
| but git sounded like a cool revision history tool, except it refuses to follow everything | 14:44 |
| → ribasushi joined | 14:44 |
|
phanimahesh
| Is some scripting an option? | 14:45 |
|
| The contents of .git are not supposed to be version controlled. Trying to do that will end in a monstrosity worse than tarballs. | 14:45 |
|
CalimeroTeknik
| a tailor-made solution? that's more likely to leave some stuff out than a bulky solution | 14:45 |
|
GodGinrai
| CalimeroTeknik: dozens of what kind of repos? git repos? | 14:45 |
|
CalimeroTeknik
| yes | 14:45 |
|
GodGinrai
| Why not just push all of those repos to another server | 14:46 |
|
phanimahesh
| Two .git directories can be equivalent even when they are wildly different from the view of file system. | 14:46 |
|
CalimeroTeknik
| what about ignored files? (data files) | 14:46 |
|
phanimahesh
| Have you seen !config | 14:46 |
|
gitinfo
| [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas | 14:46 |
|
ToxicFrog
| CalimeroTeknik: if you want a backup/sync tool that uses git as the backend/transport format, there are a bunch; bup and sparkleshare come to mind | 14:46 |
|
GodGinrai
| CalimeroTeknik: if they are ignored, then they don't belong in the repo in the first place, so you shouldn't need to back them up. | 14:46 |
| ← cdown left | 14:47 |
|
CalimeroTeknik
| they don't belong in the repository for sure, but when I backup the whole thing I want them in | 14:47 |
|
GodGinrai
| CalimeroTeknik: why, what are they? Build Artifacts? | 14:47 |
| ← rgrinberg left | 14:47 |
|
CalimeroTeknik
| config and dictionary data | 14:47 |
|
| the code in the multiple repos is the application code for accessing the dictionary, or using that, etc | 14:48 |
| → stantonk joined | 14:48 |
|
bremner
| the thing about backups is you don't want them to be a special hack only you understamd | 14:48 |
|
CalimeroTeknik
| absolutely | 14:48 |
|
| thanks for the pointers, I'll see if bup/sparkleshare can do that for me | 14:48 |
|
bremner
| so just use a "normal" backup software, there are many choices | 14:48 |
|
GodGinrai
| I think you should just backup with rsync or something | 14:48 |
| → lindenle joined | 14:49 |
| ← livingstn left | 14:49 |
|
GodGinrai
| rather than trying to shoehorn git | 14:49 |
|
CalimeroTeknik
| `rsync log` doesn't exist and makes no sense, right? | 14:49 |
|
| git log does | 14:49 |
|
GodGinrai
| No, your comment just now made no sense | 14:49 |
|
| if you want a log of backups, you can easily make that | 14:50 |
| ← diegoviola left | 14:50 |
|
GodGinrai
| git is a source control tool, not a backup tool | 14:50 |
|
ToxicFrog
| GodGinrai: rsync is a sychronization tool but doesn't really make a good backup tool, although you can hack together one on top of it | 14:51 |
|
| CalimeroTeknik: FWIW I've been using bup in production for a few years now, storing 2-300GB of backed up data, without issues | 14:51 |
|
GodGinrai
| ToxicFrog: it makes for a better one than git does. | 14:51 |
|
bremner
| sure. But there are still _many_ backup tools. | 14:51 |
| → ShekharReddy joined | 14:51 |
|
ToxicFrog
| GodGinrai: oh, certainly | 14:51 |
| → baraba joined | 14:51 |
|
bremner
| duplicity, obnam, bup, ... | 14:51 |
|
maaarghk
| rsync [...] > /some/git/repo | 14:52 |
|
| if you must | 14:52 |
|
| but i agree with everyone else just use a proper backup package | 14:52 |
| ← lindenle left | 14:53 |
| ← Rodya_ left | 14:53 |
| → leeN joined | 14:54 |
| → clemf joined | 14:56 |
| ← kbs left | 14:56 |
|
CalimeroTeknik
| ToxicFrog, do you get functionality equivalent to git diff / git log with bup? | 14:56 |
|
| being able to see line by line diffs between snapshots | 14:57 |
|
grawity
| wonder if you could 'subtree-merge' all the repos you're trying to back up | 14:57 |
| ← MrMojito left | 14:58 |
| ← thiago left | 14:58 |
|
ToxicFrog
| CalimeroTeknik: "git log", yes. "git diff" only if your backups are small enough for git to compute the diff without crashing. | 14:58 |
|
| In my case they aren't. | 14:58 |
|
| (you can access bup repos with normal "git" tools, but a lot of git commands don't work well when the repo is hundreds of GB in size) | 14:59 |
|
CalimeroTeknik
| nice! I'm not backing up more than a few hundred MBs anyway | 14:59 |
| → tvon joined | 15:00 |
| → ferr joined | 15:02 |
| → drewo joined | 15:03 |
| ← catag87 left | 15:03 |
|
GodGinrai
| grawity: he's trying to backup non-tracked files as well | 15:04 |
| ← ferr left | 15:04 |
| → catag87 joined | 15:04 |
| → SwiftMatt joined | 15:05 |
| googledocs → acetakwas | 15:05 |
| → rgrinberg joined | 15:05 |
| → diegoviola joined | 15:06 |
| ← drewo left | 15:07 |
| → ferr joined | 15:09 |
| → pcre_ joined | 15:09 |
| ← GodGinrai left | 15:10 |
| ← apathor left | 15:10 |
| ← maaarghk left | 15:11 |
| ← chachasmooth left | 15:12 |
| → GodGinrai joined | 15:12 |
| ← GodGinrai left | 15:12 |
| → GodGinrai joined | 15:12 |
| ← dmj` left | 15:12 |
| ← nuc left | 15:13 |
| → GT4066 joined | 15:13 |
| → chachasmooth joined | 15:14 |
| ← moriko left | 15:15 |
| ← ShekharReddy left | 15:15 |
| → Masterphi joined | 15:15 |
| ← pcre_ left | 15:16 |
| → pcre_ joined | 15:16 |
| ← MadHatter42 left | 15:17 |
| ← Balliad left | 15:18 |
|
King_DuckZ
| in my script I want to get the full absolute remote address to a git submodule, in a way that git clone understands - so if current branch is tracking origin/master and origin is github:KingDuckZ/blah.git, and the submodule's path is ../foo.git, I want to get github:KingDuckZ/foo.git | 15:19 |
| ← AaronF left | 15:19 |
|
King_DuckZ
| I'm not sure how to handle that in my ruby script, so I'm wondering if git can already provide that info | 15:19 |
| ← tristanp left | 15:20 |
| → zivester joined | 15:20 |
| ← johnmilton left | 15:21 |
| ← ash_workz left | 15:21 |
| → DieguezZ joined | 15:22 |
| ← Alienpruts left | 15:23 |
| → MZAWeb joined | 15:23 |
| → romerocesar joined | 15:24 |
| ← Asiajey left | 15:24 |
| → gkatsev joined | 15:25 |
| → ash_workz joined | 15:25 |
| → stuh84 joined | 15:25 |
| → Asiajey joined | 15:26 |
| ← Asiajey left | 15:26 |
| → Asiajey joined | 15:26 |
| → tristanp joined | 15:27 |
| → hahuang61 joined | 15:28 |
| ← pcre_ left | 15:29 |
| ← romerocesar left | 15:29 |
| ← DieguezZ left | 15:30 |
| → Rodya_ joined | 15:30 |
| ← stuh84 left | 15:31 |
| → lugzer joined | 15:31 |
| ← BombStrike left | 15:31 |
| → ajf- joined | 15:32 |
| ← hahuang61 left | 15:33 |
| ← gduine left | 15:33 |
| → romerocesar joined | 15:34 |
| → hmdkny joined | 15:36 |
| ← lugzer left | 15:36 |
| → cdown joined | 15:36 |
| → lindenle joined | 15:36 |
| → shinnya joined | 15:36 |
| → chrisshattuck joined | 15:38 |
| ← daniel_rose left | 15:38 |
| → TheodoreBe joined | 15:38 |
| ← romerocesar left | 15:39 |
| ← Masterphi left | 15:40 |
| → InfoTest joined | 15:40 |
| ← deadnull left | 15:40 |
| ← stantonk left | 15:40 |
| ← ferr left | 15:40 |
| ← white_gecko left | 15:40 |
| → Masterphi joined | 15:41 |
| → stantonk joined | 15:41 |
| ← baraba left | 15:41 |
| ← dreiss left | 15:43 |
| → thiago joined | 15:45 |
| ← cyan__ left | 15:45 |
| → EvilPenguin joined | 15:46 |
| ← cdown left | 15:46 |
| → kpease joined | 15:46 |
| ← circ-user-foXmx left | 15:47 |
| → dreiss joined | 15:49 |
| ← Passe_a_Manteiga left | 15:49 |
| → cdown joined | 15:51 |
| ← hmdkny left | 15:51 |
| → crameth joined | 15:54 |
| ← dreiss left | 15:54 |
| → cxybeb joined | 15:55 |
| → dmj` joined | 15:55 |
| → D[4]ni joined | 15:55 |
| ← spriz left | 15:56 |
| ← Jellyg00se left | 15:56 |
| → hashpuppy joined | 15:56 |
| → UncleCJ joined | 15:57 |
| → drewo joined | 15:57 |
| ← Rodya_ left | 15:57 |
| → ArchNoob joined | 15:58 |
| → elosz joined | 15:58 |
| → spriz joined | 15:58 |
| ← stantonk left | 15:59 |
| → SteffanW joined | 16:00 |
| ← acetakwas left | 16:00 |
| → stantonk joined | 16:00 |
| ← drewo left | 16:01 |
| → acetakwas joined | 16:02 |
| ← kedare left | 16:03 |
| ← mikecmpbll left | 16:03 |
| → sangy joined | 16:04 |
| ← acetakwas left | 16:06 |
| → acetakwas joined | 16:06 |
| → circ-user-foXmx joined | 16:06 |
| ← jimi_ left | 16:07 |
| → PabloR joined | 16:08 |
| → jimi_ joined | 16:10 |
| ← TheodoreBe left | 16:10 |
| ← jimi_ left | 16:10 |
| ← muelli left | 16:11 |
| → daniel_rose joined | 16:11 |
| ← yqt left | 16:11 |
| → arooni_ joined | 16:12 |
| → zeroed joined | 16:13 |
| ← Orbitrix left | 16:13 |
| → madewokherd joined | 16:13 |
| ← UncleCJ left | 16:16 |
| → xlegoman joined | 16:17 |
| ← Vgr left | 16:17 |
| ← arooni_ left | 16:17 |
| → Ranhir joined | 16:18 |
| → ImJune joined | 16:18 |
| → arooni joined | 16:19 |
| → NeXTSUN joined | 16:21 |
| ← stantonk left | 16:22 |
| → stantonk joined | 16:23 |
| → romerocesar joined | 16:24 |
| → emPi joined | 16:25 |
| ← tristanp left | 16:25 |
| ← PioneerAxon left | 16:26 |
| → PioneerAxon joined | 16:28 |
| ← crameth left | 16:28 |
| ← stantonk left | 16:28 |
| ← catag87 left | 16:28 |
| ← ImJune left | 16:28 |
| ← Chiko left | 16:29 |
| → tristanp joined | 16:29 |
| → hahuang61 joined | 16:29 |
| → dmto joined | 16:29 |
| ← romerocesar left | 16:29 |
| ← chll_ left | 16:30 |
| ← LeMike left | 16:30 |
| ← PioneerAxon left | 16:30 |
| ← kurkale6ka left | 16:30 |
| → PioneerAxon joined | 16:30 |
| ← encod3 left | 16:31 |
| → encod3 joined | 16:32 |
| → lugzer joined | 16:32 |
| → ascarter joined | 16:32 |
| → stantonk joined | 16:32 |
| ← TomyWork left | 16:33 |
| → preyalone joined | 16:33 |
| ← hahuang61 left | 16:34 |
| → Matrixiumn joined | 16:34 |
| → DieguezZ joined | 16:35 |
| maxb_ → maxb | 16:36 |
| → catag87 joined | 16:36 |
| ← encod3 left | 16:36 |
| ← lugzer left | 16:37 |
| ← LionsMane left | 16:37 |
| → IWishIKnew joined | 16:37 |
| → OnBrokenWings joined | 16:38 |
| → jwarren_ joined | 16:39 |
| → texinwien joined | 16:39 |
| ← achadwick left | 16:39 |
| ← DieguezZ left | 16:40 |
| → mrkat- joined | 16:40 |
|
jwarren_
| Howdy folks. I'm migrating a heafty repo from GitHub to Bitbucket. Of course migrating the code is easy, but I'm also trying to migrate closed and open pull requests, which seems to be more difficult. I found https://gist.github.com/piscisaureus/3342247 which describes how to pull PRs to your local machine, but is it possible to push PRs to a remote? IE the new Bitbucket repo? I'm guessing that the answer is no, and I probably need to | 16:41 |
|
| Thoughts? | 16:42 |
|
PabloR
| I have git 2.6.2 on my OSX 10.9.5 Somebody helped me and I don’t recall installation method. Should I update thru homebrew or other method is preferable? Should I delete Git and start from scratch? | 16:42 |
| → dangerousdave joined | 16:42 |
|
jwarren_
| I prefer to update through Homebrew, but I know others don't care for that method. | 16:42 |
| ← mrkat left | 16:43 |
| → drewo joined | 16:43 |
|
PabloR
| If homebrew wasn't the original method, does it matter if I use it now? Should I delete git altogether and start from scratch? | 16:43 |
| → cdg joined | 16:46 |
| ← rgrinberg left | 16:46 |
| → mdw joined | 16:47 |
| ← mdw_ left | 16:47 |
| → TheVoid- joined | 16:48 |
|
jwarren_
| PabloR If homebrew wasn't the original installation, it'll just install a new Git and add it to the system path, I believe. That's the way I prefer to do it, I don't like writing over system default stuff generally. | 16:49 |
| ← thiago left | 16:49 |
| → tango_ joined | 16:49 |
|
PabloR
| jwarren_ ok thanks | 16:49 |
| ← pioiytr left | 16:50 |
| → pioiytr joined | 16:50 |
|
jwarren_
| I don't know Homebrew super well, but there's a way you can look up what's been installed with it. Try brew --help or something. | 16:50 |
|
PabloR
| great. thanks | 16:50 |
| → TomyLobo joined | 16:51 |
|
jwarren_
| Looks like the command is "brew list" @PabloR | 16:51 |
|
PabloR
| Ah, git came up :p | 16:52 |
| ← Masterphi left | 16:52 |
| → jimi_ joined | 16:52 |
| ← synthroi_ left | 16:52 |
|
jwarren_
| PabloR: Then I think you can do something like "brew upgrade git". | 16:53 |
|
PabloR
| jwarren_ Yes. I got to this page https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/FAQ.md | 16:54 |
| ← tristanp left | 16:54 |
| → thiago joined | 16:55 |
| → romerocesar joined | 16:55 |
| ← Beams left | 16:56 |
|
jwarren_
| PabloR: Awesome, good luck with the upgrade! | 16:56 |
|
PabloR
| it's upgrading. Thanks | 16:56 |
| → cyan__ joined | 16:57 |
| ← ArchNoob left | 16:58 |
| → nwkj86 joined | 16:58 |
| ← romerocesar left | 16:59 |
| ← aguimaraes1986 left | 17:00 |
| ← kab left | 17:01 |
| → Masterphi joined | 17:01 |
| → aguimaraes1986 joined | 17:02 |
| ← stantonk left | 17:02 |
| ← EvilPenguin left | 17:02 |
| ← ajf- left | 17:03 |
| → freimatz joined | 17:03 |
| ← troulouliou_div2 left | 17:03 |
| → stantonk joined | 17:04 |
| ← stantonk left | 17:04 |
| ← cdown left | 17:04 |
| ← vls-xy left | 17:04 |
| → cdown_ joined | 17:04 |
| ← jwarren_ left | 17:04 |
| ← blackwind_123 left | 17:05 |
| ← OnBrokenWings left | 17:05 |
| ← nwkj86 left | 17:06 |
| ← notebox left | 17:06 |
| → blackwind_123 joined | 17:06 |
| ← King_DuckZ left | 17:08 |
| → usm4n joined | 17:08 |
| → tristanp joined | 17:08 |
| → OnBrokenWings joined | 17:09 |
| → stuh84 joined | 17:09 |
| → mariuscc joined | 17:10 |
| ← OnBrokenWings left | 17:11 |
| → Rodya_ joined | 17:12 |
| → kbs joined | 17:12 |
| → stantonk joined | 17:12 |
| ← ascarter left | 17:13 |
| ← cdown_ left | 17:13 |
| ← usm4n left | 17:14 |
| → tristanp_ joined | 17:14 |
| ← nnyk_ left | 17:15 |
| ← tristanp left | 17:15 |
| → dunpeal joined | 17:17 |
| ← catag87 left | 17:17 |
| → irco joined | 17:17 |
|
dunpeal
| How do I control the "Committer Name" field of a commit from the command line? I can control the Author with --author, is there anything similar for the committer name? | 17:18 |
| → nnyk_ joined | 17:18 |
| → Doginal joined | 17:19 |
| ← pioiytr left | 17:19 |
| ← NeXTSUN left | 17:20 |
| ← dimi1947 left | 17:20 |
| → pioiytr joined | 17:21 |
| → dimi1947 joined | 17:21 |
| ← stuh84 left | 17:22 |
| ← FunkyAss left | 17:22 |
| → EvilPenguin joined | 17:23 |
| → pwnz0r joined | 17:23 |
| → NeXTSUN joined | 17:23 |
| ← circ-user-foXmx left | 17:24 |
| → sfjohansson joined | 17:24 |
| → mathewdgardner joined | 17:24 |
| ← SwiftMatt left | 17:25 |
|
sfjohansson
| Hey guys, I would like to get rid of alot of old history in my git repo, I’m using sourcetreee as my client | 17:25 |
| → mehola joined | 17:25 |
|
ojacobson
| Read as: "I would like to author a completely new, shorter history" | 17:25 |
| → romerocesar joined | 17:26 |
|
ojacobson
| because that's the only way to do that, in Git. | 17:26 |
| → usm4n joined | 17:26 |
| ← mathewdgardner left | 17:27 |
|
sfjohansson
| sounds like that would be it :) | 17:27 |
| → OnBrokenWings joined | 17:27 |
| ← mehola left | 17:28 |
| ← OnBrokenWings left | 17:28 |
| → durham joined | 17:28 |
| → manizzle joined | 17:28 |
|
manizzle
| hey guys. I do git remote add $BLAHBLAH | 17:28 |
|
| but I only want to add it for fetchs, not push | 17:29 |
|
| I dont want to accidentally push to that remote ever | 17:29 |
| ← zeroed left | 17:29 |
|
manizzle
| http://stackoverflow.com/questions/7556155/git-set-up-a-fetch-only-remote | 17:29 |
|
| nvm found | 17:29 |
| → hahuang61 joined | 17:30 |
| ← romerocesar left | 17:30 |
|
GodGinrai
| manizzle: you can use quotes to make that url something more legible | 17:31 |
|
| so that you get an error message that makes sense | 17:31 |
|
| as seen here: http://stackoverflow.com/questions/10270027/can-i-mark-a-git-remote-as-read-only | 17:31 |
| → Silenced_v2 joined | 17:31 |
| ← bremner left | 17:31 |
| ← blackwind_123 left | 17:32 |
|
PabloR
| jwarren_ or anybody. I had an issue with updating git thru homebrew. Can anybody help? | 17:32 |
|
| upgrade: Error: The `brew link` step did not complete successfully. The formula built, but is not symlinked into /usr/local. Could not symlink bin/git”. | 17:32 |
|
manizzle
| GodGinrai, thanks! | 17:32 |
| → TheodoreBe joined | 17:32 |
| → bremner joined | 17:33 |
| ← bremner left | 17:33 |
| → bremner joined | 17:33 |
|
PabloR
| Seems that I had git installed with 2 different methods because when I first run “git version” gave me back 2.6.2. However brew list gave me 2.4.3 and upgraded to 2.9.1. There was an error during the brew upgrade: Error: The `brew link` step did not complete successfully. The formula built, but is not symlinked into /usr/local. Could not symlink bin/git”. | 17:33 |
| → circ-user-foXmx joined | 17:33 |
| → lugzer joined | 17:33 |
| ← Rodya_ left | 17:33 |
| → troulouliou_div2 joined | 17:33 |
| ← usm4n left | 17:34 |
| ← Silenced_v2 left | 17:34 |
| → Silenced_v2 joined | 17:34 |
| → Rodya_ joined | 17:34 |
| ← TheodoreBe left | 17:34 |
| ← jimi_ left | 17:34 |
| → hahuang65 joined | 17:34 |
|
PabloR
| I have a bit more info. I really appreciate the help | 17:35 |
| ← hahuang61 left | 17:35 |
|
kbs
| dunpeal: dunno about args, but GIT_COMMITTER_NAME='a' GIT_COMMITTER_EMAIL='b' git commit -m 'foo' should work ? | 17:36 |
| → rgrinberg joined | 17:36 |
| → mwhooker joined | 17:36 |
| → usm4n joined | 17:36 |
| ← usm4n left | 17:36 |
| → blackwind_123 joined | 17:36 |
| ← NeXTSUN left | 17:37 |
| ← lugzer left | 17:38 |
| → FunkyAss joined | 17:39 |
| → TheodoreBe joined | 17:40 |
| ← PioneerAxon left | 17:40 |
| ← tristanp_ left | 17:40 |
| → kulelu88 joined | 17:40 |
| → PioneerAxon joined | 17:41 |
| ← troulouliou_div2 left | 17:42 |
| → tristanp joined | 17:43 |
|
sfjohansson
| ojacobson what would be the workflow for writeing a new shorter history? | 17:43 |
| → bronson joined | 17:45 |
| arooni → arooni__ | 17:45 |
| → anth0ny joined | 17:45 |
| ← realz left | 17:45 |
| → snowkidind joined | 17:46 |
|
dunpeal
| kbs: thanks. | 17:46 |
|
snowkidind
| I have an xcode project which contains two targets: a osx shell and a static library | 17:46 |
| → Repox joined | 17:46 |
|
snowkidind
| what is the recommended repo structure for something like that | 17:46 |
|
| (i'm developing the library from within the workspace) | 17:47 |
|
dunpeal
| Github question: I'm trying to create a simple PR, but when I review it, I see changes in addition to the ones I made, specifically: CHANGELOG.md is modified. How do I control/prevent these additional changes? | 17:48 |
|
ojacobson
| sfjohansson: I'd start with man git-filter-branch personally, but there's no easy way to do it | 17:48 |
|
gitinfo
| sfjohansson: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html | 17:48 |
|
ojacobson
| dunpeal: that change must have been introduced by some commit in `git log origin/target-branch...your-branch` | 17:48 |
|
| (three dots) | 17:48 |
|
| Rewrite your branch to not include that change (and probably put it on another branch) | 17:49 |
|
PabloR
| Any help with my git installation issue? | 17:50 |
| ← djb-irc left | 17:50 |
|
| kbs wonders if git commit-tree is the crude answer for sfjohansson :-) | 17:50 |
| ← dmj` left | 17:50 |
| ← blackwind_123 left | 17:52 |
| ← Repox left | 17:53 |
|
sfjohansson
| hmm… so I’ve been using git quite basically… what is the idea cocnept with these rewriting of history…how should I look at it? | 17:54 |
|
| so now i prettymuch have jsut one ver very long branch | 17:54 |
| ← Silenced_v2 left | 17:55 |
|
sfjohansson
| do I create a new bracnh and sort of copy over “grouped commits” and moving back and forth deleting etc… =O | 17:55 |
|
preaction
| PabloR: that's a homebrew issue, not a git issue. look for help from the homebrew folks | 17:55 |
|
PabloR
| preaction ok thanks | 17:56 |
|
kbs
| sfjohansson: the underlying data model is very simple - a commit is literally a data structure with a pointer to a tree, and zero or more commit objects (its parents.) You can invent a new commit object (for instance) that points to your latest tree and no parent, and this will look like a branch with zero history, but with all the files of interest. | 17:56 |
| ← tvon left | 17:57 |
| Matrixiumn → Xack | 17:57 |
| → Sasazuka joined | 17:57 |
|
kbs
| there aren't really any semantics about a commit other than this - all git does is provide (endlelly confusing?) ways to manipulate them ;-) | 17:58 |
| → usm4n joined | 17:58 |
|
sfjohansson
| kbs it certianly seem to work on confusing me…..=O | 17:58 |
|
dunpeal
| ojacobson: It doesn't look like it. I just forked origin, made a simple change to master, and now trying to merge back to origin/master. | 17:58 |
|
| It looks like some sort of automated change... | 17:58 |
| ← rahtgaz left | 17:59 |
|
kbs
| sfjohansson: haha. I've found much zen in just doing "git cat-file -p HEAD" and looking at what it means | 17:59 |
|
dunpeal
| autogenerated by the pull request? Is that something Github supports? | 17:59 |
| → mathewdgardner joined | 17:59 |
| ← daniel_rose left | 17:59 |
| → LionsMane joined | 18:00 |
| → johnmilton joined | 18:00 |
| → Silenced_v2 joined | 18:01 |
| ← Silenced_v2 left | 18:01 |
| → Silenced_v2 joined | 18:01 |
|
ojacobson
| No. | 18:01 |
| ← stantonk left | 18:02 |
| → deBase joined | 18:02 |
| → stantonk joined | 18:03 |
|
sfjohansson
| kbs hmm..at least I odnt feel closer on how to solve this this…. =O | 18:03 |
| → azbarcea joined | 18:04 |
| → davisonio joined | 18:05 |
|
dunpeal
| ojacobson: d'oh. I amended a remote commit by mistake :/ | 18:05 |
| ← johnmilton left | 18:05 |
| ← cxybeb left | 18:05 |
| → kaldoran joined | 18:06 |
| ← Asenar left | 18:06 |
| → romerocesar joined | 18:06 |
| ← mdw left | 18:06 |
| → SwiftMatt joined | 18:08 |
| ← InfoTest left | 18:08 |
| → realz joined | 18:09 |
| ← rwb left | 18:09 |
| ← Doginal left | 18:09 |
| ← romerocesar left | 18:10 |
| → mikecmpbll joined | 18:11 |
| ← Gsham left | 18:12 |
| → daniel_rose joined | 18:13 |
| ← daniel_rose left | 18:13 |
| → daniel_rose joined | 18:13 |
|
kbs
| sfjohansson: dunno if there's a cookbook tutorial that does exactly what you want. But should you feel that (essentially) you want to invent a commit history that picks selected states of the code in some suitable way, with an invented commit messages - a crude hint might be http://paste.debian.net/hidden/77c2ac19/ but it's probably needs understanding what git does at the low level | 18:14 |
|
| (that said, I personally think the only way git makes sense to me is at the low level :) | 18:14 |
|
| s/git makes sense to me/I make sense of git/ | 18:14 |
| ← nnyk_ left | 18:15 |
| ← cuebix-wk left | 18:15 |
| → cuebix-wk joined | 18:15 |
| ← stantonk left | 18:17 |
| → johnmilton joined | 18:17 |
| → Doginal joined | 18:18 |
| ← Silenced_v2 left | 18:19 |
|
sfjohansson
| kbs I guess thats always the thing with using a GUI for anything =O now it feelsl ike my old solution with just deleting the repo and initializing a new one was pretty straightfroward but I can’t relly do it this time as I already have a few commits…that I need to keep =( | 18:20 |
| ← mathewdgardner left | 18:21 |
| → quetz joined | 18:22 |
| ← SwiftMatt left | 18:22 |
|
kbs
| *nod* fwiw, I sorta slowly came realize that dealing with git is actually considerably easier without the guis, and spending an hour or two figuring out the low-level bits (which is actually fairly simple.) Then, the guis and commands made much more sense to me, and I could make git work for me (than vice-versa :) | 18:22 |
| ← mariuscc left | 18:22 |
| → jost__ joined | 18:23 |
| → SwiftMatt joined | 18:23 |
| → tristanp_ joined | 18:24 |
| ← tristanp left | 18:24 |
|
sfjohansson
| kbs sounds like the better approach…and is more cross platofrm :) | 18:24 |
| → rwb joined | 18:24 |
|
_ikke_
| kbs: could not agree more | 18:25 |
| → stantonk joined | 18:25 |
| → mathewdgardner joined | 18:26 |
| → ArchNoob joined | 18:26 |
| ← jost_ left | 18:27 |
| ← Rodya_ left | 18:27 |
| → dmj` joined | 18:28 |
| ← azbarcea left | 18:28 |
| → Rodya_ joined | 18:28 |
| → jason237 joined | 18:28 |
| → Timvde joined | 18:28 |
| ← tristanp_ left | 18:28 |
| ← g105b left | 18:28 |
| ← hk238 left | 18:29 |
| ← Rodya_ left | 18:29 |
| ← mikecmpbll left | 18:30 |
| → tristanp joined | 18:30 |
| → Silenced_v2 joined | 18:30 |
| ← Silenced_v2 left | 18:30 |
| → Silenced_v2 joined | 18:30 |
| → xall joined | 18:31 |
| ← StuartMI left | 18:31 |
| ← deBase left | 18:32 |
| → mariuscc joined | 18:32 |
| ← drewo left | 18:32 |
| → TheSpiderPig joined | 18:32 |
| → hck89 joined | 18:32 |
| → Rodya_ joined | 18:32 |
| → drewo joined | 18:32 |
| → yohnnyjoe joined | 18:33 |
| → pcre_ joined | 18:33 |
| → ZenWalker joined | 18:34 |
|
ZenWalker
| hello, how to search a commit ignoring the caps? | 18:34 |
| → lugzer joined | 18:35 |
|
i7c
| git log -i --grep='pattern' | 18:35 |
| ← PabloR left | 18:36 |
| → d4rklit3 joined | 18:36 |
| → mikecmpbll joined | 18:36 |
| gitinfo set mode: +v | 18:36 |
|
TheSpiderPig
| grep takex a regex | 18:36 |
|
| afaik | 18:36 |
| ← f3r70rr35f left | 18:36 |
|
i7c
| yup | 18:36 |
|
| But you'll have a hard time doing --grep='[tT]his [iI]s [wW]hat [iI]m [lL]ooking [fF]or' :) | 18:37 |
|
| Dunno if it understands some case insensitive directive like some regex do. | 18:37 |
| → pioiytr_ joined | 18:37 |
| ← mathewdgardner left | 18:37 |
| ← Silenced_v2 left | 18:37 |
|
TheSpiderPig
| cant you use a /i | 18:38 |
|
| it *is* regex | 18:38 |
| → f3r70rr35f joined | 18:38 |
|
TheSpiderPig
| oh fuck, yeah use -i | 18:38 |
|
| or --ignore-case | 18:38 |
|
| wait that's for gitr grep | 18:39 |
|
i7c
| So --grep='/something/i' does not work if that’s what you meant. | 18:39 |
| ← Rodya_ left | 18:39 |
| ← lugzer left | 18:40 |
| ← ArchNoob left | 18:40 |
| ← pioiytr left | 18:40 |
| ← bronson left | 18:41 |
| → guampa joined | 18:41 |
| → Literphor joined | 18:41 |
| ← stonerfish left | 18:41 |
| ← Masterphi left | 18:42 |
| → Masterphi joined | 18:43 |
| ← acetakwas left | 18:43 |
| → sargas joined | 18:44 |
| → stonerfish joined | 18:44 |
| ← yohnnyjoe left | 18:44 |
| ← TheSpiderPig left | 18:44 |
| → mathewdgardner joined | 18:44 |
| → mutex joined | 18:44 |
| ← GT4066 left | 18:45 |
| → Rodya_ joined | 18:46 |
| ← circ-user-foXmx left | 18:48 |
| ← SwiftMatt left | 18:48 |
| ← shinnya left | 18:48 |
| ← p4trix left | 18:49 |
| ← howdoi left | 18:49 |
| → SwiftMatt joined | 18:50 |
| ← usm4n left | 18:50 |
| ← chachasmooth left | 18:50 |
| ← Rodya_ left | 18:50 |
| → Silenced_v2 joined | 18:51 |
|
sfjohansson
| kbs Im ight have done it…at least it looks like it…but maybe everything is there but hidden =O | 18:51 |
| ← Silenced_v2 left | 18:51 |
| → Silenced_v2 joined | 18:51 |
| ← elosz left | 18:51 |
| → ekinmur joined | 18:52 |
| → l4v2 joined | 18:52 |
| → chachasmooth joined | 18:53 |
| ← eizua left | 18:53 |
|
sfjohansson
| ojacobson I did try a graft and git filter-branch ..it looks fine in my git client…would this have actually thrown away history too or is it just “represented” in cleaner way | 18:53 |
|
ojacobson
| Without seeing what you actually did, I have no idea. | 18:54 |
| ← EvilPenguin left | 18:54 |
| → Sasazuka__ joined | 18:54 |
|
ojacobson
| (That wasn't an invitation; I'm busy right now, but if you paste a !transcript I'm sure someone can add commentary. :) | 18:54 |
|
gitinfo
| Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see | 18:54 |
| → tvon joined | 18:55 |
| → bronson joined | 18:55 |
| ← tristanp left | 18:55 |
| → jungsubk joined | 18:55 |
| ← govg left | 18:56 |
| ← ekinmur left | 18:56 |
| → mischat joined | 18:57 |
| ← Sasazuka left | 18:57 |
| ← mwhooker left | 18:57 |
| ← TooLmaN left | 18:57 |
| → pioiytr__ joined | 18:58 |
| → p4trix joined | 18:58 |
| → mwhooker joined | 18:58 |
| ← dimi1947 left | 18:58 |
| ← sargas left | 19:00 |
| → NeXTSUN joined | 19:00 |
|
ZenWalker
| -i works, thanks | 19:00 |
| ← ZenWalker left | 19:00 |
| ← drewo left | 19:01 |
|
sfjohansson
| ojacobson Cheers…here is the link http://hastebin.com/letewitifo.vbs :) | 19:01 |
| → drewo joined | 19:01 |
| → catag87 joined | 19:01 |
| ← pioiytr_ left | 19:01 |
| ← catag87 left | 19:01 |
| → circ-user-8eXFL joined | 19:01 |
| → catag87 joined | 19:02 |
| ← tvon left | 19:02 |
| ← TheodoreBe left | 19:03 |
| → EvilPenguin joined | 19:03 |
| ← jason237 left | 19:03 |
| → tristanp joined | 19:03 |
| ← l4v2 left | 19:05 |
| → spudowiar joined | 19:05 |
| → blackwind_123 joined | 19:05 |
| ← dunpeal left | 19:05 |
| ← pwnz0r left | 19:06 |
| ← SteffanW left | 19:06 |
| ← Waskeend left | 19:07 |
| → Waskeend joined | 19:08 |
| → Repox joined | 19:09 |
| ← mwhooker left | 19:09 |
| ← p4trix left | 19:11 |
| → timmu joined | 19:11 |
| → govg joined | 19:12 |
| ← preyalone left | 19:14 |
| ← IWishIKnew left | 19:15 |
| → paul424 joined | 19:15 |
| → dunpeal joined | 19:15 |
| ← timmu left | 19:16 |
| → vF3hNGxc47h8 joined | 19:17 |
| → UncleCJ joined | 19:18 |
| → ynanm joined | 19:20 |
| → nnyk_ joined | 19:20 |
| → NeverDie joined | 19:20 |
| → astrofog joined | 19:20 |
| → Rodya_ joined | 19:23 |
| ← dunpeal left | 19:25 |
| ← chachasmooth left | 19:25 |
| ← catag87 left | 19:25 |
| ← jungsubk left | 19:27 |
| → chachasmooth joined | 19:27 |
| ← EvilPenguin left | 19:27 |
| → troulouliou_div2 joined | 19:27 |
| ← troulouliou_div2 left | 19:27 |
| ← phaleth left | 19:28 |
| → muelli joined | 19:28 |
| → editshare-ericf joined | 19:28 |
|
BlaXpirit
| I want to see whether I can push to a remote without needing -f. is there something like --dry-run and will it do this? | 19:29 |
| ← Rodya_ left | 19:29 |
| → troulouliou_div2 joined | 19:30 |
| ← Silenced_v2 left | 19:30 |
| ← stantonk left | 19:31 |
| → weox joined | 19:31 |
|
BlaXpirit
| nevermind, I don't really need to check, I can just do it | 19:31 |
| → Darcidride joined | 19:31 |
| ← tristanp left | 19:32 |
| → hahuang61 joined | 19:32 |
| → invisbl joined | 19:32 |
| → timmu joined | 19:33 |
| → stantonk joined | 19:34 |
| ← stantonk left | 19:34 |
| → jungsubk joined | 19:34 |
| → lugzer joined | 19:36 |
| → jimi_ joined | 19:36 |
| → Rodya_ joined | 19:36 |
| ← hahuang61 left | 19:37 |
| → satifant joined | 19:37 |
| → l4v2 joined | 19:37 |
| → slayerjain joined | 19:38 |
| → stantonk joined | 19:38 |
| → tristanp_ joined | 19:38 |
| → hunter2 joined | 19:39 |
| ← lugzer left | 19:40 |
| → mwhooker joined | 19:40 |
| ← Rodya_ left | 19:41 |
| gitinfo set mode: +v | 19:41 |
|
hunter2
| hello all. i have much to learn. can someone tell me how you identify a file by its revision number? | 19:41 |
|
ojacobson
| files don't have revision numbers in git | 19:41 |
|
| there's a hash for each distinct blob (file contents), but the same blob can appear in multiple paths or in multiple revisions, so asking "what's the path to this blob" is a bit complex | 19:42 |
| → elastix joined | 19:43 |
| ← t0by left | 19:43 |
| → Lynxium joined | 19:44 |
| → Bennux joined | 19:44 |
|
hunter2
| supposing i commit a.txt and it's hash is 4f9542d.. how do i show that revision? | 19:44 |
| ← mikecmpbll left | 19:44 |
|
preaction
| git show 4f9542d | 19:45 |
|
hunter2
| tried, a@4f... a@{4f} ... i'm missing something | 19:45 |
| → mikecmpbll joined | 19:45 |
|
hunter2
| i just want a.txt though | 19:45 |
| ← GodGinrai left | 19:45 |
| → djensen joined | 19:45 |
|
i7c
| git show 4f9542d:a.txt | 19:45 |
|
preaction
| git show 4f9542d -- a.txt | 19:45 |
|
hunter2
| oh ffs, it goes after | 19:45 |
|
spudowiar
| bloob | 19:46 |
|
i7c
| preaction, that shows the diff. | 19:46 |
|
spudowiar
| blobby bob | 19:46 |
| → rahtgaz joined | 19:46 |
| SpeakerToMeat → DieInAFire | 19:46 |
| ← vF3hNGxc47h8 left | 19:46 |
|
spudowiar
| i7c: well, that's what that blob is :) | 19:46 |
| DieInAFire → SpeakerToMeat | 19:46 |
| → EvilPenguin joined | 19:47 |
|
i7c
| Not what hunter2 asked, if I understood him right tho. | 19:47 |
| → shuaib joined | 19:47 |
| → GodGinrai joined | 19:47 |
|
spudowiar
| well, yeah | 19:47 |
|
| but :) | 19:47 |
|
| I'm just here to trollll | 19:48 |
|
| don't mind me | 19:48 |
|
i7c
| spudowiar, besides that’s wrong. | 19:48 |
|
hunter2
| another question, suppose i'm going round adding a copyright boiler plate, i commit that to a.txt, how do i take that commit's diff and apply that to b | 19:48 |
|
i7c
| The blob will contain the entire file not just the diff. | 19:48 |
| ← shuaib left | 19:48 |
| ← djensen left | 19:48 |
|
spudowiar
| i7c: but that'd be inefficient o_O | 19:48 |
|
i7c
| Not really. | 19:48 |
| ← D[4]ni left | 19:49 |
|
spudowiar
| well, if you add 1 line to a 100MB file, it'd be two 100MB blobs? | 19:49 |
| ← Hounddog left | 19:49 |
|
i7c
| At first, yes. At some point they'll be delta compressed and whatnot. | 19:49 |
|
ojacobson
| spudowiar: git's logical model is purely snapshot based, so, initially, yes - there will. | 19:50 |
|
spudowiar
| :O | 19:50 |
|
| TIL | 19:50 |
|
ojacobson
| however, git optimizes that by delta-encoding similar objects when packing loose objects | 19:50 |
|
spudowiar
| thanks | 19:50 |
|
ojacobson
| The encoded deltas have nothing to do with commit diffs, exactly - it's more like "find me the most similar, and diff from that" | 19:50 |
|
i7c
| And it's not really "inefficient" that way. If it all just were diffs you’d have to apply diffs for hours if the history is long enough. | 19:51 |
| ← mwhooker left | 19:51 |
| → sargas joined | 19:52 |
| ← bronson left | 19:52 |
| ← pcre_ left | 19:53 |
| → TheodoreBe joined | 19:53 |
| ← GodGinrai left | 19:54 |
| → GodGinrai joined | 19:54 |
| → mwhooker joined | 19:54 |
| → pcre_ joined | 19:54 |
| ← Atrumx left | 19:55 |
| ← aguimaraes1986 left | 19:56 |
|
hunter2
| so, i was thinking something like this: git merge-file b.txt 4f1af:a.txt 8a8a8a:a.txt | 19:56 |
| → lugzer joined | 19:57 |
| ← Bennux left | 19:58 |
| → usm4n joined | 19:58 |
|
hunter2
| ... but that doesn't work. i've much to learn so any pointers would be appreciated! | 19:59 |
| ← muelli left | 19:59 |
| ← thiago left | 20:00 |
| ← Asiajey left | 20:00 |
| ← lugzer left | 20:01 |
| ← Masterphi left | 20:01 |
| → Silenced joined | 20:01 |
| → Masterphi joined | 20:01 |
| ← Silenced left | 20:02 |
| → synthroid joined | 20:02 |
| → thiago joined | 20:02 |
| ← texinwien left | 20:03 |
| ← spudowiar left | 20:04 |
| → Asiajey joined | 20:04 |
| ← Asiajey left | 20:04 |
| → Asiajey joined | 20:04 |
|
rpd
| hunter2: what error does that give? | 20:05 |
| ← HoierM left | 20:05 |
| ← bongjovi left | 20:06 |
|
rpd
| I guess merge-file doesn't take a commit-ish argument and doesn't resolve the file | 20:06 |
| → Cooler1 joined | 20:06 |
|
hunter2
| Could not stat 4f954...:a | 20:06 |
|
| which is fair enough, its not on disk as that name .. but was hoping git would work it out as a point in the repos | 20:07 |
|
rpd
| yeah, well... you could do something like git cat-file ... > a_file etc | 20:07 |
| ← chachasmooth left | 20:07 |
|
rpd
| and then use merge file to merge the results of those cat-file operations | 20:07 |
| → alexruf_ joined | 20:08 |
| ← pcre_ left | 20:08 |
| → tristanp joined | 20:08 |
| → pcre_ joined | 20:08 |
| ← usm4n left | 20:09 |
|
rpd
| yeah, the user-manual gives that as an example for using merge-file to merge files from different trees | 20:10 |
| → ArchNoob joined | 20:10 |
| ← tristanp_ left | 20:11 |
| → alexruf joined | 20:11 |
| ← TheodoreBe left | 20:11 |
| ← alexruf_ left | 20:11 |
| ← elastix left | 20:11 |
| → elastix joined | 20:11 |
| → chachasmooth joined | 20:12 |
| → yqt joined | 20:12 |
| → fus joined | 20:12 |
| → usm4n joined | 20:12 |
| ← rnsanchez left | 20:13 |
| ← fus left | 20:13 |
| ← tristanp left | 20:13 |
| ← mathewdgardner left | 20:13 |
| ← pcre_ left | 20:13 |
| → tristanp joined | 20:14 |
| → pcre joined | 20:14 |
| → DeJoker joined | 20:14 |
|
DeJoker
| Test ? | 20:14 |
| ← usm4n left | 20:14 |
|
DeJoker
| Any knowledgable folks here ? | 20:15 |
|
selckin
| just jokers | 20:15 |
|
DeJoker
| Great :) | 20:15 |
|
preaction
| also space cowboys. but no gangsters of love | 20:16 |
|
GodGinrai
| and some battle programmers | 20:16 |
| → romerocesar joined | 20:17 |
| → lugzer joined | 20:17 |
| → mariuscc2 joined | 20:17 |
| ← mariuscc left | 20:18 |
|
preaction
| what about Maurice? | 20:18 |
|
DeJoker
| Okay I have a Source.pgm in git — that another team works on — and I have some changes that I make to that Source.pgm to turn it into Ultimate.pgm which changes a few lines in a few files, deletes a few files, replaces a few files, and add some new files — can I have a repository of just those alterations that I can then Merge into the Source.pgm to make my Ultimate.pgm ?? Or must I regrettably have all the content in my development repository ??? | 20:18 |
| ← chrisshattuck left | 20:19 |
| → MaximusColourum joined | 20:19 |
| ← xall left | 20:20 |
| → fedya___ joined | 20:20 |
| ← Waskeend left | 20:21 |
| → fus joined | 20:21 |
| ← jungsubk left | 20:21 |
| ← romerocesar left | 20:21 |
|
fedya___
| Hi, I made a huge mistake just now. I meant to commit to a new branch, but accidentally committed to master and pushed to remote. I reverted the commit with "git reset HEAD^ --hard" and "git push origin -f" –– now all my work is gone... I wasn't thinking... Is there anyway to restore the commit? | 20:21 |
| → Waskeend joined | 20:22 |
| ← lugzer left | 20:22 |
|
preaction
| fedya___: check the git reflog | 20:23 |
|
| or if you remember the sha of the commit, it's likely still there | 20:23 |
| → Cease joined | 20:23 |
| ← rwb left | 20:25 |
| ← blackwind_123 left | 20:27 |
| → dmj`` joined | 20:28 |
| ← fmcgeough left | 20:28 |
| → wagle joined | 20:28 |
|
DeJoker
| Okay I have a Source.pgm in git — that another team works on — and I have some changes that I make to that Source.pgm to turn it into Ultimate.pgm which changes a few lines in a few files, deletes a few files, replaces a few files, and add some new files — can I have a repository of just those alterations that I can then Merge into the Source.pgm to make my Ultimate.pgm ?? Or must I regrettably have all the content in my development repository ??? Not | 20:28 |
|
| looked into SubModules but this did not seem to be the correct tool but then again maybe I did not look deep enough as of yet | 20:28 |
| ← Cease left | 20:29 |
| ← noidea left | 20:29 |
| → blackwind_123 joined | 20:29 |
| ← dmj` left | 20:31 |
|
DeJoker
| Hmmm okay just Jokers, Smokers and Tokers I guess :) as I was told | 20:31 |
| → usm4n joined | 20:31 |
| → danimal2 joined | 20:32 |
| → muelli joined | 20:32 |
| → texinwien joined | 20:33 |
|
fedya___
| preaction: I looked at .git directory and it looks like it's still there: | 20:33 |
|
| e4b5738 HEAD@{0}: reset: moving to HEAD^ | 20:33 |
|
| 6ca57e2 HEAD@{1}: commit: [PLAT-2832] Daily cronjob at 10am to send final changes notice for orders shipping in 45 days | 20:33 |
|
| how do I restore it? and put it in a new branch? I currently have master checked out | 20:33 |
| → mand0 joined | 20:33 |
|
preaction
| !reflog | 20:34 |
|
gitinfo
| The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H` | 20:34 |
| ← stantonk left | 20:35 |
| → mathewdgardner joined | 20:36 |
|
fedya___
| sorry, I'm a bit confused, worried about doing another hard reset. I'm following the part with checking out into new branch using the SHA I grabbed from reflog, what will the git reset --hard OLDSHA do? | 20:37 |
| ← GodGinrai left | 20:37 |
| → stantonk_ joined | 20:37 |
| ← stantonk_ left | 20:38 |
| → neurodrone_ joined | 20:38 |
| → lugzer joined | 20:38 |
| → stantonk_ joined | 20:38 |
|
preaction
| fedya___: those are two different things. one makes a new branch, the other changes the current branch | 20:40 |
|
| see the link | 20:40 |
| ← pcre left | 20:42 |
| ← Orion3k left | 20:42 |
|
fedya___
| there's only one file with M flag there, there should be 4... | 20:43 |
|
| could I have lost that commit completely since I did a reset --hard? | 20:43 |
| ← lugzer left | 20:43 |
| ← Doginal left | 20:45 |
| ← mwhooker left | 20:45 |
| → bronson joined | 20:45 |
|
preaction
| no | 20:45 |
| → dunpeal joined | 20:46 |
| ← wagle left | 20:47 |
| → TheodoreBe joined | 20:47 |
| ← TheodoreBe left | 20:47 |
|
DeJoker
| Okay I have a Source.pgm in git — that another team works on — and I have some changes that I make to that Source.pgm to turn it into Ultimate.pgm which changes a few lines in a few files, deletes a few files, replaces a few files, and add some new files — can I have a repository of just those alterations that I can then Merge into the Source.pgm to make my Ultimate.pgm ?? Or must I regrettably have all the content in my development repository ??? Not I | 20:47 |
|
| looked into SubModules but this did not seem to be the correct tool but then again maybe I did not look deep enough as of yet — So nobody can help me with this ?? | 20:47 |
| → TheodoreBe joined | 20:48 |
| ← jeffreylevesque left | 20:48 |
| ← TheodoreBe left | 20:49 |
| → nnyk joined | 20:49 |
| → mwhooker joined | 20:49 |
| ← nnyk_ left | 20:49 |
| ← sargas left | 20:49 |
| ← ash_workz left | 20:51 |
| → Kulrak joined | 20:51 |
| ← Kulrak left | 20:51 |
| → Kulrak joined | 20:51 |
| ← DeJoker left | 20:52 |
| ← madewokherd left | 20:54 |
| → DeJoker joined | 20:54 |
| ← jimi_ left | 20:54 |
| → Sadeukko joined | 20:55 |
| ← Klipp left | 20:55 |
| ← DeJoker left | 20:55 |
| → DeJoker joined | 20:55 |
| ← DeJoker left | 20:56 |
| ← tristanp left | 20:56 |
| ← drewo left | 20:57 |
| → drewo joined | 20:57 |
| ← drewo left | 20:57 |
| → white_gecko joined | 20:57 |
| → drewo joined | 20:58 |
| → Doginal joined | 20:58 |
| ← Doginal left | 20:58 |
| ← LionsMane left | 20:59 |
| → pioiytr_ joined | 20:59 |
| ← apotry left | 21:00 |
| ← diogenese left | 21:00 |
| ← mariuscc2 left | 21:01 |
| → Rodya_ joined | 21:01 |
| → FuzzySockets joined | 21:01 |
| → tristanp joined | 21:02 |
| ← pioiytr__ left | 21:02 |
| ← mwhooker left | 21:03 |
| → Silenced joined | 21:03 |
| → nilg joined | 21:04 |
| → sapiens_vector joined | 21:04 |
| ← daniel_rose left | 21:04 |
| → daniel_rose joined | 21:05 |
| ← Silenced left | 21:05 |
| → Silenced joined | 21:05 |
| → jagob joined | 21:07 |
| → Orion3k joined | 21:08 |
| → Sucks joined | 21:08 |
| ← shirty left | 21:09 |
| ← daniel_rose left | 21:10 |
| → wagle joined | 21:10 |
| → NeonSynth_ joined | 21:11 |
| ← synthroid left | 21:11 |
| ← raijin left | 21:14 |
| ← NeonSynth left | 21:14 |
| ← cyan__ left | 21:15 |
| → xall joined | 21:17 |
| ← white_gecko left | 21:17 |
| ← tgunr left | 21:17 |
| gitinfo set mode: +v | 21:17 |
| ← freimatz left | 21:17 |
| ← sanketdg left | 21:17 |
| → tgunr joined | 21:18 |
| ← ynanm left | 21:19 |
| → ajf- joined | 21:19 |
| ← FunkyAss left | 21:19 |
| → bunniez joined | 21:21 |
| ← hunter2 left | 21:21 |
| ← Darcidride left | 21:22 |
|
bunniez
| hello friends, i need help unsetting an alias. somehow the alias in question("ci") got defined twice, shows up twice in the list "git config --get-regexp alias". when i run "git config --global --unset alias.ci", i get the message "warning: alias.ci has multiple values" and it does not do it. how do i force it to remove this alias? | 21:22 |
| ← mathewdgardner left | 21:22 |
| ← espindola left | 21:24 |
|
rpd
| bunniez: you can't manually remove it? | 21:25 |
| → diogenese joined | 21:25 |
| → mwhooker joined | 21:26 |
|
bunniez
| rpd: i thought that "git config --global --unset alias.ci" was the way to do that. is there another way? | 21:27 |
| ← UncleCJ left | 21:27 |
|
rpd
| I mean, if it's giving you an error because it's defined twice, just edit the file and remove both references to make that command work again | 21:28 |
| ← rahtgaz left | 21:28 |
|
bunniez
| rpd: thanks, sounds like that would work. where do i locate the file containing global aliases? | 21:28 |
|
rpd
| ~/.gitconfig probably | 21:28 |
| ← nilg left | 21:29 |
|
bunniez
| rpd: thank you. i'm on a windows machine, do you figure ~ would probably be the C:/ drive? | 21:29 |
| → mathewdgardner joined | 21:29 |
|
rpd
| For windows I'm not sure. You can go look at what HOME is defined as in C:\Program Files\Git. It's probably something like C:\Users\Something\.gitconfig | 21:31 |
| → ahmed_elgabri joined | 21:31 |
| → UncleCJ joined | 21:31 |
| → ShekharReddy joined | 21:31 |
| → synthroid joined | 21:31 |
| ← tristanp left | 21:32 |
|
bunniez
| rpd: you're right, it was in Users, thanks!! | 21:33 |
| ← weox left | 21:33 |
| ← Asiajey left | 21:34 |
| ← bruce_lee left | 21:34 |
| ← satifant left | 21:34 |
| → hahuang61 joined | 21:34 |
| ← stantonk_ left | 21:34 |
| → Dreamer3 joined | 21:34 |
| → bruce_lee joined | 21:35 |
| ← bruce_lee left | 21:35 |
| → bruce_lee joined | 21:35 |
| ← bunniez left | 21:35 |
| ← EvilPenguin left | 21:35 |
| ← mwhooker left | 21:35 |
| → stantonk joined | 21:36 |
| → tristanp joined | 21:36 |
| ← editshare-ericf left | 21:36 |
| → spudowiar joined | 21:37 |
| ← MaximusColourum left | 21:37 |
| → mwhooker joined | 21:37 |
| → SimonNa joined | 21:38 |
| ← hahuang61 left | 21:39 |
| ← ahmed_elgabri left | 21:40 |
| ← Silenced left | 21:40 |
| → EvilPenguin joined | 21:41 |
| ← NeXTSUN left | 21:42 |
| → aidalgol joined | 21:42 |
| aidalgol → Guest2960 | 21:42 |
| ← hashpuppy left | 21:42 |
| → usm4n_ joined | 21:43 |
| → ahmed_elgabri joined | 21:43 |
| ← mand0 left | 21:45 |
| → white_gecko joined | 21:45 |
| ← usm4n left | 21:46 |
| ← danimal2 left | 21:46 |
| → Brain joined | 21:46 |
| → azbarcea joined | 21:46 |
| → jason237 joined | 21:46 |
| ← GenZai left | 21:46 |
| → Muzer joined | 21:48 |
| ← drewo left | 21:48 |
| ← xlegoman left | 21:49 |
| ← usm4n_ left | 21:49 |
| ← Literphor left | 21:49 |
| ← kaldoran left | 21:50 |
| ← ExoUNX left | 21:51 |
| ← f3r70rr35f left | 21:51 |
| → drewo joined | 21:52 |
| ← stantonk left | 21:52 |
| Guest2960 → aidalgol | 21:53 |
| → stantonk joined | 21:53 |
| → f3r70rr35f joined | 21:53 |
| → DieguezZ joined | 21:54 |
| → Gsham joined | 21:54 |
| → HoierM joined | 21:54 |
| ← Brain left | 21:54 |
| → pneuma joined | 21:55 |
| ← ahmed_elgabri left | 21:55 |
| ← jagob left | 21:56 |
| ← TestUser left | 21:57 |
| ← UncleCJ left | 21:57 |
| ← davisonio left | 21:57 |
| → romerocesar joined | 21:58 |
| ← drewo left | 21:58 |
| ← joki left | 22:00 |
| ← xpk left | 22:00 |
| ← f3r70rr35f left | 22:01 |
| ← spudowiar left | 22:01 |
| → raijin joined | 22:02 |
| ← romerocesar left | 22:03 |
| ← stantonk left | 22:04 |
| ← Masterphi left | 22:04 |
| → Literphor joined | 22:04 |
| → joki joined | 22:05 |
| → Masterphi joined | 22:05 |
| ← stonerfish left | 22:06 |
| ← Gsham left | 22:07 |
| ← slayerjain left | 22:08 |
| → stonerfish joined | 22:09 |
| ← k3rn31 left | 22:10 |
| → jimi_ joined | 22:10 |
| ← tristanp left | 22:11 |
| → tristanp joined | 22:11 |
| ← Sucks left | 22:11 |
| → Atrumx joined | 22:11 |
| → nettoweb joined | 22:13 |
| ← fedya___ left | 22:14 |
| → Sucks joined | 22:15 |
| ← bronson left | 22:15 |
| → romerocesar joined | 22:18 |
| ← synthroid left | 22:19 |
| ← Rodya_ left | 22:19 |
| ← Sucks left | 22:20 |
| → a_n_d_y joined | 22:20 |
| gitinfo set mode: +v | 22:21 |
| → Guest55 joined | 22:21 |
| ← LiohAu left | 22:21 |
|
a_n_d_y
| i have a usage question. it feels like i'm being stupid | 22:21 |
|
| will anyone help? | 22:21 |
| → devbug joined | 22:21 |
|
ojacobson
| Only one way to find out | 22:21 |
|
a_n_d_y
| :) | 22:21 |
| → Rodya_ joined | 22:22 |
|
a_n_d_y
| I'm working with a few guys on a server using git. a lot of the time, changes need to be made live on the server. is there any way to all work ont he server at the same time, using git branches, without conflicting or committing directly to master all the time? | 22:22 |
| ← romerocesar left | 22:23 |
| ← Darren_ left | 22:24 |
| ← azbarcea left | 22:24 |
| ← paul424 left | 22:25 |
|
manizzle
| a_n_d_y, make a branch called dev. Everyone works in their own branches, merging against dev. Then 1 person is in charge of taking dev and merging with master | 22:25 |
| ← EvilPenguin left | 22:26 |
|
ojacobson
| "a lot of the time, changes need to be made live on the server" first things first: _no matter what source control tool you use_, this is going to cause bottlenecks. | 22:26 |
| → EvilPenguin joined | 22:26 |
|
ojacobson
| Make it possible to run at least a cut-down version of your service locally, or in docker, or in a VM, or something and you will fix a lot of this | 22:26 |
| ← thiago left | 22:26 |
|
a_n_d_y
| thanks manizzle, makes sense. like git flow or something i guess | 22:27 |
| ← mwhooker left | 22:27 |
|
a_n_d_y
| ojacobson, yeah it feels like we're working wrong | 22:27 |
| ← astrofog left | 22:27 |
|
ojacobson
| Second, more specifically, no - git assumes a work tree belongs to a single workflow at a time. | 22:27 |
|
| You could _in principle_ have multiple repos, but share a work tree, but it's not worth doing | 22:28 |
|
a_n_d_y
| i dunno if we can create cutdown servers locally. there's so many it would take a lot of effort. would individual directories on the server for each user work? | 22:28 |
| → Sucks joined | 22:28 |
| ← Sucks left | 22:28 |
|
ojacobson
| you won't get what you want and you will get a bunch of headaches | 22:28 |
|
a_n_d_y
| andy-dev dir | 22:28 |
| → tristanp_ joined | 22:28 |
| → mwhooker joined | 22:28 |
| ← tristanp left | 22:29 |
| ← Gamecubic left | 22:30 |
| ← FuzzySockets left | 22:30 |
| → bronson joined | 22:31 |
| → Brain joined | 22:31 |
| ← mathewdgardner left | 22:31 |
| ← sangy left | 22:32 |
| ← fahadash left | 22:32 |
| ← tristanp_ left | 22:33 |
| → tristanp joined | 22:35 |
| → madewokherd joined | 22:36 |
| ← white_gecko left | 22:36 |
| → dreiss joined | 22:37 |
| ← Brain left | 22:39 |
| ← jstimm_ left | 22:40 |
| → p4trix joined | 22:40 |
| → Jellyg00se joined | 22:40 |
| ← Masterphi left | 22:41 |
| → Masterphi joined | 22:41 |
| → FuzzySockets joined | 22:42 |
| ← Fijit left | 22:42 |
| → magicbit joined | 22:42 |
| → cd-rum joined | 22:43 |
| ← quetz left | 22:45 |
| → cd-rum_ joined | 22:45 |
| ← bronson left | 22:45 |
| ← kpease left | 22:46 |
| → bronson joined | 22:47 |
| ← raijin left | 22:47 |
| ← cd-rum left | 22:47 |
| → Vinnie_win joined | 22:48 |
| ← xall left | 22:49 |
| → romerocesar joined | 22:49 |
| ← Vinnie_win_a left | 22:49 |
| ← a_n_d_y left | 22:51 |
| ← yqt left | 22:51 |
| → stantonk joined | 22:51 |
| ← mischat left | 22:51 |
| ← dreiss left | 22:51 |
| → mischat joined | 22:51 |
| → xall joined | 22:53 |
| ← romerocesar left | 22:53 |
| → apotry joined | 22:53 |
| → Ahmed90 joined | 22:57 |
| → Ahmed-90 joined | 22:57 |
| ← Ahmed-90 left | 22:57 |
| → barteks2x joined | 22:57 |
| ← unbalancedparen left | 22:58 |
| ← Limes_ left | 22:58 |
| ← Masterphi left | 22:59 |
| → Masterphi joined | 22:59 |
| ← tristanp left | 23:00 |
| ← Masterphi left | 23:00 |
| → drewo joined | 23:00 |
| → tristanp joined | 23:01 |
| ← elastix left | 23:01 |
| → Masterphi joined | 23:01 |
| → cdown joined | 23:02 |
| ← Literphor left | 23:02 |
| → Literphor joined | 23:03 |
| → nwkj86 joined | 23:04 |
| ← dangerousdave left | 23:05 |
| ← EvilPenguin left | 23:06 |
| ← Masterphi left | 23:08 |
| → Masterphi joined | 23:08 |
| ← FuzzySockets left | 23:08 |
| → FuzzySockets joined | 23:09 |
| ← HanClinto left | 23:10 |
| ← Masterphi left | 23:11 |
| ← apotry left | 23:11 |
| → HanClinto joined | 23:11 |
| ← stantonk left | 23:12 |
| ← nnyk left | 23:12 |
| → stantonk joined | 23:12 |
| ← mischat left | 23:13 |
| → m0viefreak joined | 23:14 |
| ← Rodya_ left | 23:16 |
| ← stantonk left | 23:17 |
| ← emPi left | 23:18 |
| → akiva joined | 23:19 |
| → romerocesar joined | 23:19 |
| ← cdown left | 23:21 |
| → Cassiopaya joined | 23:22 |
| → mathewdgardner joined | 23:22 |
| → mrBen2k2k2k joined | 23:23 |
| → cdown joined | 23:23 |
| ← tristanp left | 23:23 |
| ← nettoweb left | 23:23 |
| ← romerocesar left | 23:23 |
| → nettoweb joined | 23:24 |
| ← sfjohansson left | 23:25 |
| → sfjohansson_ joined | 23:25 |
| ← nettoweb left | 23:25 |
| → IlNominePatre joined | 23:25 |
| → thiago joined | 23:25 |
| → tristanp joined | 23:25 |
| ← mrBen2k2k2k left | 23:26 |
| → anuxivm1 joined | 23:28 |
| → Gamecubic joined | 23:29 |
| ← anuxivm1 left | 23:30 |
| ← rgrinberg left | 23:31 |
| → anuxivm joined | 23:32 |
| → stantonk joined | 23:32 |
| ← mathewdgardner left | 23:32 |
| → EvilPenguin joined | 23:33 |
| ← stantonk left | 23:33 |
| ← cuebix-wk left | 23:33 |
| → stantonk joined | 23:35 |
| ← sfjohansson_ left | 23:37 |
| → rgrinberg joined | 23:38 |
| ← tristanp left | 23:39 |
| ← stantonk left | 23:39 |
| ← liquidjamm left | 23:39 |
| → mrBen2k2k2k joined | 23:40 |
| ← muelli left | 23:40 |
| → synthroid joined | 23:41 |
| ← EvilPenguin left | 23:41 |
| ← ajf- left | 23:41 |
| ← synthroid left | 23:42 |
| → tristanp joined | 23:42 |
| → catag87 joined | 23:42 |
| → ravi joined | 23:43 |
| ← devbug left | 23:47 |
| → rahtgaz joined | 23:47 |
| ← harish left | 23:47 |
| → romerocesar joined | 23:49 |
| → Rodya_ joined | 23:50 |
| ← drewo left | 23:50 |
| ← Sadeukko left | 23:50 |
| ← FuzzySockets left | 23:50 |
| ← mrBen2k2k2k left | 23:50 |
| ← romerocesar left | 23:54 |
| ← nwkj86 left | 23:56 |
| → FuzzySockets joined | 23:56 |
| ← HanClinto left | 23:57 |
| ← ravi left | 23:58 |
| → HanClinto joined | 23:59 |