Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-21

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

All times shown according to UTC.

Time Nick Message
00:04 matoro joined #git
00:06 hvxgr joined #git
00:07 Some_Person joined #git
00:08 jstimm joined #git
00:08 daxroc joined #git
00:10 Isla_de_Muerte joined #git
00:11 Kaisyu joined #git
00:12 joshszep joined #git
00:12 Es0teric joined #git
00:13 joshszep joined #git
00:13 kbs joined #git
00:13 michal__ joined #git
00:14 a_thakur joined #git
00:17 anth0ny joined #git
00:17 nevodka joined #git
00:19 tvw joined #git
00:20 madewokherd joined #git
00:22 Nicmavr joined #git
00:23 cagedwisdom joined #git
00:27 Gsham joined #git
00:27 Rotaerk joined #git
00:29 a3Dman joined #git
00:33 raijin joined #git
00:33 Cabanossi joined #git
00:34 Goplat joined #git
00:39 pks joined #git
00:43 hvn0413 joined #git
00:44 brent__ joined #git
00:44 snowalpaca joined #git
00:44 safe joined #git
00:45 TbobbyZ_ joined #git
00:46 Sasazuka joined #git
00:49 seni joined #git
00:50 kasual joined #git
00:51 cqi joined #git
00:52 shgysk8zer0_ joined #git
00:52 chardan joined #git
00:54 TbobbyZ joined #git
00:56 mehola joined #git
00:57 dvaske joined #git
00:58 peterbecich joined #git
00:59 lenswipee joined #git
00:59 lenswipee hi, can git be used for backup?
01:00 Rotaerk lenswipee, of what?
01:01 lenswipee of folders/directories
01:01 Rotaerk containing what kinds of files?
01:01 rewt inb4 computer files
01:01 lenswipee web files
01:03 Vampire0 lenswipee, depends on what you expect for a backup system but basically I'd say yes
01:03 Cabanossi joined #git
01:04 lenswipee Vampire0, i think it's possible but some don't recommend it. possibly if the files are very large or if there are gigs of data to backup???
01:07 gugah joined #git
01:08 cdown joined #git
01:08 wxg joined #git
01:09 Vampire0 lenswipee, well, if you have binary files, Git like almost any VCS might not be the best choice as it is tailored to be super effective for source-code, i. e. text files mostly, not for binary files
01:09 nachoman joined #git
01:09 alexandre9099_ joined #git
01:10 NeverDie joined #git
01:12 nedbat lenswipee: what are "web files"?
01:12 arescorpio joined #git
01:13 lenswipee Vampire0, basically text files right? will it work for binary files but just not as effective?
01:13 robattila256 joined #git
01:13 Vampire0 yes
01:15 Rodya_ joined #git
01:15 shgysk8zer0 joined #git
01:16 MarioBranco joined #git
01:16 glebihan_ joined #git
01:17 cbreak joined #git
01:18 peterbecich joined #git
01:19 lenswipee Vampire0, Thanks. Are you a real vampire by any chance?
01:19 cdown joined #git
01:20 glebihan joined #git
01:20 skalpin ya Vampire0 were you in twilight?
01:22 marianina8 joined #git
01:22 lenswipee left #git
01:23 cdown_ joined #git
01:23 TbobbyZ joined #git
01:29 Gustavo6046 joined #git
01:30 pks_ joined #git
01:30 courrier joined #git
01:34 shinnya joined #git
01:35 peterbecich joined #git
01:36 fahadash joined #git
01:36 peterbecich joined #git
01:37 peterbecich joined #git
01:39 steeze joined #git
01:43 kbs joined #git
01:45 GT4066 joined #git
01:50 wxg joined #git
01:53 alexandre9099 joined #git
02:04 Saturn812 joined #git
02:05 dsdeiz joined #git
02:05 dsdeiz joined #git
02:06 pks joined #git
02:07 LeBlaaanc joined #git
02:08 nachoman joined #git
02:10 watabou joined #git
02:11 anuxivm left #git
02:13 Rodya_ joined #git
02:15 glebihan joined #git
02:18 Cabanossi joined #git
02:18 d^sh joined #git
02:18 Ryanar joined #git
02:19 om_henners joined #git
02:22 btree joined #git
02:23 btree left #git
02:25 jeffreylevesque joined #git
02:25 duderonomy joined #git
02:27 Rodya_ joined #git
02:28 orbyt_ joined #git
02:29 Lyqyd joined #git
02:31 a_thakur joined #git
02:31 raijin joined #git
02:31 finalbeta joined #git
02:32 durham_ joined #git
02:38 Rodya_ joined #git
02:40 govg joined #git
02:46 peterbecich joined #git
02:46 peeps[lappy] joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:49 jameser joined #git
02:50 dvaske joined #git
02:55 marianina8 joined #git
02:57 mehola joined #git
02:57 durham joined #git
03:03 peterbec` joined #git
03:05 pks joined #git
03:06 ojdo joined #git
03:10 jstimm joined #git
03:13 bitmod joined #git
03:13 alexandre9099 joined #git
03:15 mizu_no_oto joined #git
03:16 CEnnis91 joined #git
03:16 cqi joined #git
03:17 lagothrix joined #git
03:17 lagothrix joined #git
03:17 ajaXHorseman joined #git
03:18 anth0ny joined #git
03:18 chachasmooth joined #git
03:19 gopar joined #git
03:21 lagothrix joined #git
03:33 Cabanossi joined #git
03:33 robattila256 joined #git
03:35 TbobbyZ joined #git
03:39 matoro joined #git
03:41 brent__ joined #git
03:43 muhannad joined #git
03:45 rchavik joined #git
03:47 hexagoxel joined #git
03:50 rahul_chowdhury joined #git
03:51 platzhirsch joined #git
03:51 Rodya_ joined #git
03:51 platzhirsch How do you call the commit a submodule is pinpoint to?
03:51 platzhirsch Does it have a separate name? Like submodule HEAD
03:51 platzhirsch or state, or just commit
03:53 Vortex34 joined #git
03:53 seni joined #git
03:54 aghalarp joined #git
03:58 learning joined #git
03:58 jaith joined #git
03:59 jaith I have an utterly confusing problem involving a merge and stashed files. Every time I try and resolve the merge issue and add/commit/push, then when I do git stash pop, I get
03:59 jaith Auto-merging application/models/VLNT_event_reporter.php
03:59 jaith CONFLICT (content): Merge conflict in application/models/VLNT_event_reporter.php
04:00 jaith this is driving me NUTS
04:01 jaith I've tried git reset, git fetch, git mergetool, etc. i've added/committed/pushed changes for the one conflicted file, but every time I try to pop my (very important) changes from the stash, I get this damn merge conflict message
04:01 mehola joined #git
04:03 Cxcf joined #git
04:03 Cxcf joined #git
04:03 Cabanossi joined #git
04:05 Cxcf hey all, I keep getting "branch is x commits ahead and y commits behind" messages. Do you have any ideas or common workflow practices to avoid these errors?
04:06 justanotheruser joined #git
04:09 es7 joined #git
04:10 a_thakur joined #git
04:12 _ikke_ Cxcf: Those are not errors
04:12 _ikke_ Cxcf: Its just information for you
04:14 jaith can anyone tell me why I get "CONFLICT (content): Merge conflict in" when i try to stash pop?
04:15 bocaneri joined #git
04:15 i7c Because you’re trying to apply the patch on the stash to a file that is different from when you created the patch and git cannot figure out automatically how to merge the file.
04:20 exploitNoob joined #git
04:22 jaith i7c: i'm not familiar with your use of 'patch' in that sentence
04:22 jaith could you clarify?
04:22 jaith i7c: is there any way to avoid an auto-merge?
04:24 alexandre9099 joined #git
04:24 i7c Patch is just a set of changes to files
04:24 bitmod joined #git
04:25 i7c jaith, no, how should that work? When you git stash you tell git to remember the file as it is. When you then change the file and try to apply again, this is effectively a rebase.
04:25 jaith i7c: any suggestions on how to back up enough to apply my stashed changes without losing the changes on my stash? or can I pop a single file from the stash?
04:26 i7c So git has to figure out what changes where done in the stash and how they fit in with the now again changed files.
04:26 wickedwil joined #git
04:27 jaith i7c: so disappointing that the stash is in reference to the state of the files. i was always under the impression that a stash would store the file in its entirety
04:27 i7c jaith, with git stash apply you don’t lose the stash entry, as opposed to git stash pop.
04:27 wickedwil left #git
04:27 i7c It does.
04:29 Ranhir joined #git
04:29 i7c You can do git checkout stash -- path/to/file
04:30 fedepad_ joined #git
04:30 i7c Or refer to the third entry on stash e.g. with git checkout stash@{2} -- path/to/other/file
04:31 i7c You can recreate the files as you stashed them that way.
04:32 UTAN_dev joined #git
04:33 jaith jesus so confusing
04:34 i7c What do you find confusing?
04:34 i7c Stash behaves just like commits do. :p
04:35 jaith my grasp of rebase-vs-merge, etc. is not what it should be
04:35 jaith i was trying to preserve important local changes before pulling the latest from the remote
04:35 jaith i stashed them
04:35 jaith then i pulled
04:35 jaith now i can't pop stash
04:35 jaith only one file is holding things up
04:36 i7c Because the file changed in the pull.
04:37 i7c Just learn how to merge them.
04:39 dvaske joined #git
04:39 duderonomy joined #git
04:40 MineCoins joined #git
04:40 UTAN_dev_ joined #git
04:40 jaith i tried "git mergetool", the GUI came up, i've edited the one conflicted file and fixed it half a dozen times. Past 3 commits should have the repaired file, still can't pull git stash
04:43 acetakwas joined #git
04:45 Vampire0_ joined #git
04:46 sbulage joined #git
04:46 jailbox joined #git
04:47 Cabanossi joined #git
04:50 jaith i7c: I think I have it sorted now. the git checkout stash /file/path helped
04:50 jaith i7c: thank you
04:51 jaith i7c: I'll be studying up on merges I expect. will avoid stashing before a pull
04:53 venmx joined #git
04:55 bambams Err, I found myself lurking on the mailing list and noticed a patch thread, but instead of inlining or attaching patches it references some obscure address: 20170217082253.kxjezkxfqkfxjhzr@sigill.intra.peff.net. I have no idea what this means or how to see the patches, but it appears the maintainers do.[4~
04:56 bambams Can anybody shed some light on it for me?
04:57 i7c Probably this? https://public-inbox.org/git/20170217082253.kxjezkxfqkfxjhzr@sigill.intra.peff.net/
05:00 i7c jaith, I personally recommend to get used to merges/solving conflicts rather than avoid them. Makes you more productive in the long run.
05:00 jaith i7c: i usually get an auto-merge when I do a git pull and there's a conflict
05:00 jaith i immediately sort it out
05:00 jaith and it's usually minor stuff
05:01 jaith i7c: I think what lost me this time is a stash-then-pull that I did because I was afraid of losing very important changes
05:01 bambams Ah, it's a message ID... :-/ Not sure I've seen that done before. :-/
05:01 jaith i7c: I couldn't figure out how to get back into a footing where I could pull my important changes
05:03 i7c jaith, you can also consider simply making a commit with your changes and use git pull --rebase
05:03 i7c That way you have the chance to rebase --abort if something goes wrong and you want to start over. Furthermore you have reflog, so even if you fuck up massively, git still has your changes around.
05:04 jaith i7c: over my head for the time being. i have a git book i need to study more closely. i truly appreciate the help...will also look into rebase...another thing i know little about
05:04 peterbec` joined #git
05:05 ayogi joined #git
05:05 i7c :)
05:06 pks joined #git
05:08 jaith i7c: thank you :D
05:08 bambams jaith: First thing's first, pull is really a shortcut for fetch and merge. That's useful to know because you can separate them. That gives you the power to control what you do.[4~
05:08 i7c jaith, you’re welcome ^^
05:09 bambams jaith: The stash can be handy for really short term shenanigans, but committing to a temporary branch can be easier to understand if you're not going to get right back to it.
05:09 jaith bambams: ok interesting. i7c has me limping along for tonight's deadline. it's already 10pm here and I've still got quite a bit to finish
05:09 jaith bambams: thank you also
05:09 roentgen joined #git
05:09 bambams Ah, sorry, I haven't been here long so not sure what I've missed.
05:10 bambams As a side note, if you find yourself repeating the same merge resolutions over and over again, consider enabling rerere. It's a godsend. :)
05:12 TbobbyZ joined #git
05:15 bambams My preference: git config --global alias.reup 'pull --rebase'
05:15 bambams Commit first, even temporarily with garbage log like '!!wip' and then fetch and rebase.
05:15 bambams Commit often doesn't mean it's set in stone. Commit often means the data is there to manipulate.
05:16 bambams Not committing means an oops probably is unrecoverable.
05:17 Cabanossi joined #git
05:17 jaith bambambs: i'm familiar with global prefs, but much of what you say here is Greek to me. I'll need to study rebase concept first
05:20 lucido-cl joined #git
05:24 jaith good night all
05:24 jaith left #git
05:27 acln joined #git
05:30 pks joined #git
05:30 martinhez joined #git
05:34 muhannad joined #git
05:42 hexagoxel joined #git
05:43 peterbecich joined #git
05:48 TbobbyZ joined #git
05:53 rscata joined #git
05:55 kaushal joined #git
05:56 Vaelatern joined #git
05:57 freimatz joined #git
05:59 TbobbyZ joined #git
06:02 Lunatrius joined #git
06:04 durham joined #git
06:05 durham joined #git
06:06 dec0n joined #git
06:09 dminuoso_ left #git
06:11 overlord_tm joined #git
06:13 TbobbyZ joined #git
06:13 UTAN_dev joined #git
06:15 wxg joined #git
06:17 GodGinrai joined #git
06:22 Anja joined #git
06:26 TbobbyZ joined #git
06:29 moL-Ou joined #git
06:35 a_thakur joined #git
06:37 sparr sometimes when I move a file into a new directory, then add the directory, git sees a delete and new file. if I git add the parent directory, or add -A, then it sees the rename. can I trigger that recognition without adding files I don't want to ad?
06:38 TbobbyZ joined #git
06:39 kharloss joined #git
06:42 ToxicFrog joined #git
06:43 dersand joined #git
06:48 Skyfinn joined #git
06:48 martinklepsch|BN joined #git
06:48 vishal_ joined #git
06:49 Skyfinn joined #git
06:50 ThomasLocke joined #git
06:50 ThomasLocke joined #git
06:51 bambams sparr: Git does rename detection automatically based on the relative contents. Merely adding the old name and new name should come up as a rename if no other changes are made (but Git doesn't store the rename, it always detects it on the fly).
06:51 qt-x joined #git
06:51 RickyB98 joined #git
06:51 RickyB98 joined #git
06:51 go1111111 joined #git
06:52 leprechau joined #git
06:54 Raging_Hog joined #git
06:55 a_thakur joined #git
06:55 a_thakur joined #git
06:57 seni joined #git
07:02 muhannad joined #git
07:03 HurricaneHarry joined #git
07:03 jfr joined #git
07:05 peterbec` joined #git
07:07 dreiss joined #git
07:07 imack joined #git
07:10 freimatz joined #git
07:10 sarbs joined #git
07:11 rokups joined #git
07:11 watabou joined #git
07:12 bwn joined #git
07:13 irqq joined #git
07:14 kexmex joined #git
07:18 mda1 joined #git
07:19 roelmonnens joined #git
07:20 venmx joined #git
07:24 irqq_ joined #git
07:25 sbulage joined #git
07:25 pks joined #git
07:27 cqi joined #git
07:31 jnavila joined #git
07:31 chele joined #git
07:31 kristofferR joined #git
07:32 Cabanossi joined #git
07:33 irqq joined #git
07:34 JeroenT joined #git
07:36 taoqy joined #git
07:38 TbobbyZ joined #git
07:41 roelmonn_ joined #git
07:41 dhollinger joined #git
07:45 jnavila_ joined #git
07:46 learning joined #git
07:49 miczac joined #git
07:49 melkor joined #git
07:49 Chinggis6 joined #git
07:50 Brski joined #git
07:51 melkor left #git
07:51 melkor joined #git
07:51 melkor I have two branch, I was working on branch1 and I use git pull origin branch2 now branch1 is super littered with changes trying to merge the two. Is there anyway to get back?
07:53 Silenced joined #git
07:53 JeroenT joined #git
07:53 melkor I cannot checkout either banch because files need to be merged, but I don't want to merge them.
07:55 schleppel joined #git
07:57 bariscant joined #git
07:57 JeroenT joined #git
07:58 fedepad joined #git
07:59 ogny joined #git
07:59 ogny joined #git
07:59 venmx joined #git
08:00 Furai joined #git
08:01 tobiasvl melkor: if you don't want to merge, why can't you checkout?
08:01 tobiasvl oh you mean git won't let you. git checkout --force
08:02 tobiasvl that'll throw away local changes, so beware
08:02 Vampire0 joined #git
08:03 JeroenT joined #git
08:04 xsrpmx joined #git
08:04 jast melkor: git merge --abort
08:05 roelmonnens joined #git
08:07 dsdeiz joined #git
08:08 PCatinean joined #git
08:12 pks joined #git
08:13 hvn0413 joined #git
08:14 elect__ joined #git
08:17 GodGinrai joined #git
08:18 imack joined #git
08:18 melkor I just deleted everything and cloned the branch I wanted since I didn't need any local changes.
08:18 mrkake joined #git
08:19 melkor Ill look into this merge --abort next time though.
08:20 jast ... and https://xkcd.com/1597/ proves true once again :P
08:21 Muzer joined #git
08:22 psprint joined #git
08:22 aidalgol joined #git
08:23 psprint Hello. I got "[branch "master"]\n remote = origin\n ...". Then I have [remote "nab"] defined, for notabug.org. So doing "git push -u nab master" results in "error: RPC failed; HTTP 502 curl 22 The requested URL returned error: 502 Bad Gateway".  Is this the cause, the "remote = origin" assigned to "master" ? How to use two remotes with the same branches?
08:25 watabou joined #git
08:26 theoceaniscool joined #git
08:26 venmx joined #git
08:26 osse psprint: most likely no. usually there are no problems with two remotes with branches with same names
08:26 osse having master (local), origin/master and nab/master is fuine
08:26 osse fine
08:27 alcohol joined #git
08:28 psprint true, I've changed for a moment to "remote = nab" in the branch definition, and still 502 Bad Gateway
08:28 grumble joined #git
08:29 brillenfux joined #git
08:30 a_thakur joined #git
08:35 martinhez joined #git
08:36 solars joined #git
08:36 solars hey, I've got a dev and master branch workflow. I'm not allowed to merge/push master on fridays. I'd like to add a check that notifies me if I try to merge to master on a friday. What's the best way to do this?
08:36 solars afaik there is no pre-merge hook
08:37 Panacea joined #git
08:39 Furai Good guy topic. Has the information I've been looking for.
08:39 zxd joined #git
08:39 sbasso joined #git
08:39 _ikke_ :-)
08:39 jagob joined #git
08:39 _ikke_ Topic is happy today, usually he just is ignored
08:41 vuoto joined #git
08:42 markzen joined #git
08:42 osse solars: the easiest thing to implement is pre-push, and then undo the merge you did
08:42 ngladitz_ left #git
08:42 markzen hi
08:42 solars osse: thanks I'll look into that
08:42 osse solars: but I think you can (ab)use prepare-commit-msg
08:43 ngladitz joined #git
08:43 markzen i've a dir with some git-controlled files, and some untracked ones
08:43 Balliad joined #git
08:43 tvw joined #git
08:44 markzen i currently use ls-files to list them; is there an alternative, with more ls-like options?
08:44 solars osse: I guess a simple HOTFIX commit msg through prepare commit msg would be working as well
08:44 markzen eg. sorting, size, mtime etc.
08:44 zefferno joined #git
08:44 markzen basically a git-aware ls
08:45 osse markzen: read the list of files into an array and use ls on that array
08:46 markzen i'd need several arrays, one for tracked files, one for untracked ones
08:47 osse yup
08:47 Cabanossi joined #git
08:47 osse there is in fact a series of patches that implement a more ls-like git subcommand. but it's not part of git officially
08:48 markzen actually i would be happy if dircolors could know tracked files
08:48 markzen somehow
08:49 osse the trick is to always have close to zero untracked ones
08:49 osse or at least close to zero untracked ones that you care about
08:49 markzen yeah, that's the best practice i guess
08:49 markzen but like many i also use git to manage dotfiles
08:50 dvaske joined #git
08:51 masuberu joined #git
08:52 clmsy joined #git
08:52 osse markzen: What is the overall issue you're trying to solve?
08:54 markzen like i said, i'd like an ls-clone to know what's in git an what's not, to add a mark or highlight them differently
08:55 markzen with sort options, verbose output etc.
08:55 a_thakur joined #git
08:59 osse markzen: yes, but that's not happening any time soon. so I am asknig why you want it in the first place. maybe there's a different way of dealing with it
09:01 nowhereman joined #git
09:01 markzen i know why you ask, but i've not much more to add -- it's not some step in a bigger pb
09:01 zxd hi
09:01 osse ok
09:01 markzen some basic git-aware ls doesn't sound like impossible to do, though
09:02 zxd what happens when I do 'git stash'  , then continue working and commiting on the same branch then do git stash apply
09:02 zxd will it overwrite my changes?
09:02 osse markzen: it's already been done. it's just not in git (yet)
09:02 jast zxd: it will try to combine the new state with the changes in the stash, and possibly create conflict markers and such, same as in merging or rebasing
09:02 osse markzen: pick your favourite scripting language. read in two lists of files. run ls on them as you wish
09:03 Silmarilion joined #git
09:10 marksq joined #git
09:11 marcogmonteiro joined #git
09:12 markzen sorting is not distributive though
09:13 markzen i don't want to dwell on this too much, i can get by with eg. ls-files -cos
09:13 markzen just, that would have been some nice candy and i wondered if someone already wrote it
09:13 m0rdonez joined #git
09:13 markzen nvm
09:13 osse the answer to that is yes
09:15 osse http://public-inbox.org/git/1428328354-14897-1-git-send-email-pclouds@gmail.com/
09:16 zxd joined #git
09:18 Tantamounter joined #git
09:19 markzen not usable now i guess
09:19 osse https://github.com/pclouds/git/tree/lanh/ls-2
09:19 osse i would guess no
09:19 osse discussion on it seems to have suddenly stopped
09:20 Es0teric joined #git
09:20 osse if you rebase it and re-submit to the list you'll be a hero
09:22 MineCoins joined #git
09:24 Snugglebash joined #git
09:24 reactormonk I need to change the commit message of a commit before a merge commit (not a clean merge, got some changes there) - how do I do that?
09:25 sbasso joined #git
09:26 kurkale6ka joined #git
09:27 watabou joined #git
09:29 xaa joined #git
09:30 re1 joined #git
09:37 muhannad joined #git
09:37 ronator joined #git
09:39 Renter reactormonk: https://sethrobertson.github.io/GitFixUm/fixup.html
09:39 jast reactormonk: I think your best bet is 'git filter-branch --msg-filter' with an appropriate filter script comparing the commit ID. be aware that if anyone else already has a copy of the current merge, pain will be felt at some point.
09:40 Renter tl;dr have you pushed yet?
09:40 xujun joined #git
09:41 mikecmpbll joined #git
09:42 brent__ joined #git
09:42 reactormonk Renter, kinda, but nothing merge in yet.
09:42 Mike11 joined #git
09:43 ozmage joined #git
09:43 reactormonk I clunched it by checking out the old merge data into the new one...
09:44 jast ooh, nasty. I like it.
09:47 hexagoxel joined #git
09:48 UTAN_dev joined #git
09:50 acln joined #git
09:50 nowhereman joined #git
09:55 seni joined #git
09:58 denisMone joined #git
09:58 ankit01ojha joined #git
09:59 djb-irc joined #git
10:02 scoobertron joined #git
10:02 nextloop left #git
10:02 port0 joined #git
10:04 zxd joined #git
10:05 ferr1 joined #git
10:05 zxd whattt I did $ 'git clean -f -d' in my homedir by mistake and it deleted all my files !  Removing .bash_history Removing .bash_logout Removing .bash_profile...
10:06 cdown joined #git
10:06 cdown joined #git
10:09 selckin restore from backup
10:09 jast zxd: so you had your home dir as a git repository? working entirely as intended, then. ouch!
10:12 afuentes joined #git
10:13 vuoto joined #git
10:14 manuels joined #git
10:15 zxd joined #git
10:15 zxd selckin: what's the git command?
10:16 _ikke_ non-git backup
10:16 selckin git does not have your data
10:16 _ikke_ ackin to running rm * in your homedir
10:17 _ikke_ rm -rf .*
10:17 s17 yeah .* is dangerous
10:18 s17 I've been there before
10:18 markzen left #git
10:18 GodGinrai joined #git
10:19 tobiasvl rm -rf /$variable_that_might_not_be_set
10:20 tobiasvl zxd: you told git to remove all files it didn't have version controlled…
10:20 Vampire0 skalpin, no, I do not sparkle
10:21 Muzer joined #git
10:21 aax joined #git
10:24 aard_ joined #git
10:24 sespiros joined #git
10:28 kristofferR joined #git
10:29 minn joined #git
10:29 miczac joined #git
10:30 muhannad joined #git
10:32 lb jast you've got yourself a dirty mind
10:32 xujun joined #git
10:33 tvw joined #git
10:33 xujun left #git
10:34 marcogmonteiro joined #git
10:34 PetrSevcik[m] joined #git
10:36 jast lb: wat
10:36 miczac_ joined #git
10:37 peterbec` joined #git
10:38 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
10:38 __main__ joined #git
10:38 jast we do have a trigger for that, right? !sha1
10:38 gitinfo Git's usage of SHA1 hashes is resistant to most attack vectors. Additional mitigations and an eventual migration to other hash algorithms are planned. https://plus.google.com/+LinusTorvalds/posts/7tp2gYWQugL. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
10:38 jast seems sufficient to me now, after the hype has died down
10:38 melkor joined #git
10:40 dendazen joined #git
10:43 ozmage joined #git
10:43 jast Eugene: any reason you're not updating jokes in the topic anymore, other than lack of contributions?
10:45 courrier joined #git
10:45 notebox joined #git
10:46 strk joined #git
10:46 fahadash joined #git
10:47 strk is the information about who "merged" a pull-request anywhere in git database ?
10:47 djb-irc joined #git
10:47 strk git log --pretty=full # gives me Author and Committer, but at last on GitHub they are often the same name with the actual merger being not mentioned
10:48 miczac_ joined #git
10:48 jast strk: if GitHub falsifies the information in the merge commit, which is what I'm getting from your question, there isn't really anything that can be done
10:48 jast normal merges record the person performing the merge as the author of the merge commit
10:49 jast where 'normal' means using the 'git merge' command :)
10:49 sbasso joined #git
10:49 strk jast: that only works when "merge commit" are done
10:49 jast if no merge commit is made, no merge actually happened
10:50 jast fast-forwards don't really count as merges
10:50 ozmage joined #git
10:51 mehola joined #git
10:51 jast the GitHub UI implies that it doesn't do fast-forwarding, but it does do rebasing if you let it (it's an option in the repo's settings)
10:52 nowhere_man joined #git
10:53 Seveas .version
10:53 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.1 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
10:54 YuGiOhJCJ joined #git
10:55 strk I'm reported that the GitHub "Rebase" button does a fast-forward :/
10:56 sbasso joined #git
10:56 BrianBlaze joined #git
10:57 jast strk: yeah, so if you turn that off you should always get a merge or squash commit if someone uses the "merge" button
10:57 tojo joined #git
10:57 jast unless the UI is lying :)
10:58 theoceaniscool joined #git
10:59 theoceaniscool joined #git
10:59 MarioBranco joined #git
11:02 wget joined #git
11:02 wget joined #git
11:02 ftoulemon joined #git
11:04 sbasso joined #git
11:05 netj joined #git
11:05 cebor joined #git
11:06 Darcidride joined #git
11:09 sbasso joined #git
11:09 j08nY joined #git
11:10 kristofferR joined #git
11:10 Chinggis6 joined #git
11:12 rnsanchez joined #git
11:17 Cabanossi joined #git
11:18 zacts joined #git
11:19 acln joined #git
11:21 noecc joined #git
11:25 navidr joined #git
11:25 treehug88 joined #git
11:25 Tobbi joined #git
11:25 melkor joined #git
11:26 dsdeiz joined #git
11:26 dsdeiz joined #git
11:27 ozmage joined #git
11:27 hvn0413 joined #git
11:28 bariscant joined #git
11:28 watabou joined #git
11:29 m0rdonez joined #git
11:29 a_thakur joined #git
11:30 King_Hual joined #git
11:34 notebox joined #git
11:39 peterbec` joined #git
11:40 pinkkis joined #git
11:41 Keksike left #git
11:42 sarbs joined #git
11:44 BSab joined #git
11:45 chrnybo joined #git
11:48 djb-irc joined #git
11:49 a3Dman joined #git
11:49 a3Dman joined #git
11:49 reality404 joined #git
11:55 epmvuj joined #git
11:58 tmg joined #git
11:58 atomicb0mb joined #git
11:58 synthroid joined #git
12:00 ozmage joined #git
12:00 PetrSevcik[m] left #git
12:01 scottjl joined #git
12:01 ozmage joined #git
12:03 jameser joined #git
12:06 JeroenT_ joined #git
12:08 Ph_ joined #git
12:09 ToBeCloud joined #git
12:12 adamru joined #git
12:16 dviola joined #git
12:17 Stutters joined #git
12:17 thebird joined #git
12:17 tsdev joined #git
12:18 rafalcpp joined #git
12:18 kpease joined #git
12:19 GodGinrai joined #git
12:22 nebula_ joined #git
12:25 porsche944 joined #git
12:27 nebula_ Hey guys! I'm currently facing an issue and I seeking for help here :) So, I want to delete a file from a git repo but want to keep it in my local hosts, i mean, after delete the file from git repo, when i perform a git pull in my host I want to keep there the target file (previously deleted). Anyone can help me? Thanks in advance!
12:27 _ikke_ nebula_: This is not something git supports. You'd have to manually restore the file after the initial pull
12:27 _ikke_ (after that, git does not touch it anymore)
12:27 Snugglebash joined #git
12:28 _ikke_ Note that git is not a deployment system, so it's not expected to work like this
12:29 watabou joined #git
12:30 nebula_ Thanks mate! Really appreciate. Yeah I know, i just tough it have some kinda option like "git rm -r --cached <file>" that works for all hosts
12:30 _ikke_ nope, git does not store why a file was removed
12:30 _ikke_ or rather, not present
12:30 hurricanehrndz joined #git
12:30 qqx It doesn't even store that a file was removed.
12:31 _ikke_ Right, that's what I wanted to point out with my corrections
12:31 JeroenT joined #git
12:31 nebula_ Thanks once again mate! I was digging around for 2 days now, trying to figure it out how to possible do this
12:31 qqx The new commit is just a new snapshot of the files, with some changes (including a file no longer being there).
12:32 qqx _ikke_: Yeah, I thought so, but I didn't think it was clear for people that didn't know.
12:32 nebula_ It all make sense now. Thanks all!
12:33 achadwick joined #git
12:35 GodGinrai joined #git
12:35 JeroenT joined #git
12:37 SlashLife^m joined #git
12:38 SlashLife^m Morning. :) Would a tag on a HEAD commit of a former branch suffice to keep the commits of that former branch from being removed?
12:38 jast there's no such thing as a "HEAD commit" (HEAD refers to the tip of what is currently checked out), but yes
12:38 SlashLife^m Basically I'd like to be able to abandon feature branches and deleting the branch itself for cleanup, while not losing the commits that were made on that branch.
12:39 jast also, if the branch is merged, nothing special is needed to keep the commits around
12:39 SlashLife^m jast: Ah, okay. Thanks (for the reply and for clarifying)
12:39 a_thakur joined #git
12:39 jast right. one other trick you can use is create a 'hidden' ref so it doesn't clutter up your list of tags, either
12:39 osse SlashLife^m: why is a tag cleaner than a branch?
12:40 jast but it's a little low-level: git update-ref refs/abandoned/foo my-old-branch
12:40 SlashLife^m osse: Because we'd regularly switch between branches and thus look at the list of branches more ofthen than we would look at the list of tags.
12:40 a_thakur joined #git
12:40 jast now it doesn't show up in branches and tags, but you can get at it using, for example, git show-ref
12:40 osse i see
12:40 SlashLife^m I also want to make it hard to switch back to an old feature branch.
12:41 osse SlashLife^m: Makes sense to me, because separating it is just alittle bit of extra work, but trying to separate them at a later point when your project has grown to a point that you *need* them separate would be far more painful.
12:41 jast the advantage of this is that you're not going to accidentally push it, either... but arguably if you don't really use tags for anything else (like releases), it doesn't matter much
12:41 osse trololol
12:41 SlashLife^m osse: lol :P
12:41 SlashLife^m Sounds familiar. >:]
12:42 osse In my case at work we have our own forks of the main repo (at least I do *grrr*) so I sometimes push my features up there, but delete them locally
12:42 brent__ joined #git
12:42 SlashLife^m jast: Well, I'd name them accordingly. One tag when branching off a feature, one tag on the last commit before merging it back (or on the last commit before abandoning it); releases would likely get their separately named tags.
12:43 jast okay, but then you're going to have a huge list of tags with lots of clutter and personally I'd get annoyed quickly :)
12:43 pl left #git
12:44 SlashLife^m I don't care about having a huge list of tags, if I  don't have to look at it. :P
12:45 SlashLife^m The alternative would be to shift half the list of tags to the list of branches ... and as I said: I'd like to make it hard to switch to a merged or abandoned feature branch.
12:47 SlashLife^m ("hard" as in: You'd have to manually do a git feature-revive 12345)
12:47 ozmage joined #git
12:47 suttonwilliamd joined #git
12:48 Ranmaru joined #git
12:48 nikitasius joined #git
12:49 cyphase joined #git
12:50 buffal0 joined #git
12:50 jast SlashLife^m: well, as I mentioned, you can store these things in a different place altogether and have them show up in neither of the two lists
12:51 jast they wouldn't even get cloned/fetched by default, making it even harder to switch to them
12:51 jast and they wouldn't show up in typical web interfaces
12:52 thebird joined #git
12:53 JeroenT joined #git
12:54 jeffreylevesque joined #git
12:58 ExoUNX joined #git
13:00 Brando753-o_O_o joined #git
13:00 dviola joined #git
13:00 star_prone joined #git
13:01 lgff joined #git
13:01 SlashLife^m jast: Ahh, I completely missed that.
13:01 SlashLife^m I'll look into it, thanks.
13:01 howdoi joined #git
13:01 SlashLife^m I don'T mind plumbing work.
13:02 lmat joined #git
13:05 seni1 joined #git
13:07 dviola joined #git
13:09 eroux joined #git
13:09 cdown joined #git
13:09 avar Isn't there some way to copy a branch & its configuration under a new name? I.e. now I have a branch foo, to create a branch like it I need: git checkout -b bar foo && git branch --set-upstream-to <whatever the usptream of foo was set to>
13:09 Raging_Hog joined #git
13:10 zxd joined #git
13:10 jast I'm not aware of something that would copy the tracking info
13:11 zxd is there a shortcut to git clone -b tag , that will directly download a copy of the snapshot pointed by the tag without the .git directory?  similiar to what would git archive produce
13:12 osse zxd: git archive --remote  if the host allows it
13:12 osse zxd: otherwise maybe the host has a predictable download link. github and gitlab do
13:13 iffraff joined #git
13:13 Sound joined #git
13:13 Sound_ joined #git
13:13 gugah joined #git
13:14 c137 joined #git
13:16 a_thakur joined #git
13:16 chrnybo Hi, master branch has old hotfix(es), mostly cherry-picking them back requires changes to the commit, so length of git cherry does not improve.  What's your recommendation and/or keywords for googling/stack overflow for getting a dev branch in sync with master?
13:16 jameser joined #git
13:17 SlashLife^m jast: I'd then fetch refs/abandoned/* to something local not in origin or heads (so it won't show up as a branch), and I'd push with an explicit refspec to make the changes visible on the server?
13:17 CEnnis91 joined #git
13:17 ozmage joined #git
13:17 Sound_ joined #git
13:17 morfin joined #git
13:17 morfin hello how do you diff with stash?
13:17 morfin using reflog?
13:17 morfin i.e git diff stash@{1}
13:18 osse morfin: just stash, or refs/stash or stash@{0}
13:18 morfin *0
13:18 osse stash@{1} is the previous stash
13:18 morfin yes i forgot 0 is top element in "stack"
13:18 Gsham joined #git
13:19 umbSublime joined #git
13:19 jast SlashLife^m: yeah. in fact you don't even have to create refs/abandoned/* locally just for archiving, you can directly push your branch: git push origin my-magical-branch:refs/abandoned/old-magic
13:20 jast morfin: basically stashes are implemented as a reflog, that's why the syntax is the same
13:20 Karazhan joined #git
13:21 a_thakur joined #git
13:22 SlashLife^m Okay, but assuming the feature branch existed on origin (let's assume it has the same name as the local branch) would that still be the command? Or would I then use git push origin remotes/origin/my-magical-branch:refs/abandoned/old-magic?
13:23 JeroenT joined #git
13:23 osse SlashLife^m: your suggested push would create a new ref on the remote but not remove the old one
13:23 osse use push --delete for that
13:25 erebel55 joined #git
13:25 erebel55 lo
13:25 strk left #git
13:26 erebel55 I am using git config --global credential.helper store
13:26 erebel55 on windows
13:26 erebel55 does anyone know where I can find my credential file?
13:27 jeffreylevesque joined #git
13:27 venmx joined #git
13:27 jast erebel55: probably c:\users\yourname\.git-credentials
13:27 jast or wherever else your user directory lives
13:28 morfin Git on Windows use MinGW?
13:28 Maxvien joined #git
13:28 erebel55 hmm I see a .gitconfig there but that's it
13:28 morfin so home dir == user home dir
13:28 Karazhan joined #git
13:28 osse as the saying goes, "hoem is what $HOME expands to" <3
13:29 _ikke_ ~
13:29 morfin well, MinGW home is C:\Users\MyUser\
13:29 Derperperd joined #git
13:30 osse as the alternate saying goes: home is what $HOME expands to in "git bash"
13:30 erebel55 okay yeah that is returning C:\Users\mthornbu
13:30 erebel55 but I don't see the cred file there
13:30 _ikke_ it might be hidden
13:31 watabou joined #git
13:31 _ikke_ ls -al in the shell
13:31 osse what does man gitcredentials say about the issue
13:31 gitinfo the gitcredentials manpage is available at http://jk.gs/gitcredentials.html
13:31 osse It says ~/.git-credentials
13:32 _ikke_ Might be missing something, but is it possible to check if the changes from a branch are present in another branch, while ignoring the changes in the other branch?
13:32 erebel55 i'm showing hidden files, but ls -al doesn't show either
13:32 _ikke_ git diff A B shows both changes in A and B, git diff A..B shows changes from B to merge-base of A B
13:33 osse _ikke_: wrong. diff A B and diff A..B are the same. Do you mean A...B ?
13:33 _ikke_ yes, one . too little
13:34 _ikke_ My head typed it, but my fingers refused
13:34 osse "the spirit is willing but the flesh is weak"
13:34 _ikke_ hehe
13:35 BSAlb joined #git
13:35 ankit01ojha joined #git
13:36 pmoore|lunch joined #git
13:36 _ikke_ Just did a merge to check
13:36 _ikke_ Could not think of another way
13:36 puff Good morning.
13:36 mar77i_ joined #git
13:37 brillenfux joined #git
13:37 osse _ikke_: try to cherrypick the commit and see if you get "already applied"
13:37 _ikke_ They're multiple commits
13:37 pmoore joined #git
13:38 sarri joined #git
13:38 sarri joined #git
13:38 BSaboia joined #git
13:38 GodGinrai joined #git
13:40 peterbec` joined #git
13:42 eroux joined #git
13:42 pmoore hey guys, does anyone know of an arm6/arm7 build of git i can use that works on ubuntu core (for raspberry pi 3 model b) ?
13:43 SlashLife^m osse: Thanks so far ... I've thought about this and checked the docs; so I'd fetch from origin to get the most current data about the branch, possibly push any pending changes, then use the above command + "--delete" to "rename" the remote branch to a ref name that is not considered a branch?
13:43 erebel55 hmm pushing didn't make .git-credentials show up either\
13:43 plos joined #git
13:43 pmoore wondered if anyone has published an arm6/arm7 linux binary - i couldn't find any "snaps" for git (and it looks like ubuntu core doesn't come with the usual packaging tools like rpm, yum, apt-get, etc)
13:43 osse SlashLife^m: two pushes, first one to create the new ref, then one to delete the old
13:43 _ikke_ pmoore: archlinux arm has a build for arm7l
13:44 pmoore _ikke_: great, many thanks!
13:44 oaaao joined #git
13:44 SlashLife^m Ah, okay. I was wondering a bit about the "considered as having a prefixed :" part when the push already has a : in there. That makes a lot more sense then.
13:44 SlashLife^m Okay, I'll try implementing that. Thanks so far!
13:45 shtrb joined #git
13:45 sbulage joined #git
13:45 shtrb Is there a way I could get the repository size before doing clone (how much disk space I would need )  ?
13:46 avar jast: Behold the horror show!
13:46 avar $ git config --global alias.cp-branch
13:46 avar !f() { git checkout -b $2 $1 && for line in $(git config --list --file .git/config | grep "^branch\.$1"); do key=$(echo $line | cut -d= -f1); newkey=$(echo $key | sed "s!$1!$2!"); value=$(echo $line | cut -d= -f2); git config $newkey $value; done; }; f
13:46 Chrismeister joined #git
13:46 chigang joined #git
13:46 dviola joined #git
13:47 Cabanossi joined #git
13:47 JeroenT joined #git
13:48 Cavallari joined #git
13:49 al-damiri joined #git
13:52 nopf joined #git
13:52 graff joined #git
13:52 mage_ joined #git
13:52 mage_ left #git
13:52 graff hello, another question: I have been just using patches, and i finally figured that out.. now i have a developer who has submitted a pull request. what do i do?
13:52 mage_ joined #git
13:52 mage_ hello
13:53 JeroenT_ joined #git
13:53 mage_ is there a way to quickly remove all untracked files ?
13:53 _ikke_ git clean -f (use at your own risk)
13:53 graff i am pretty sure he is a bunch of commits behind too, but he is working on unique files...so maybe can hack around it?
13:53 mage_ I did something wrong so I issued a git reset --hard
13:53 mage_ _ikke_: thanks
13:53 graff _ikke_: :O
13:53 _ikke_ graff: That was not meant for you
13:54 morfin git clean -f #that's what i used last time when rsynced lots of stuff i don't need
13:54 graff _ikke_: i gathered that. but all git commands frighten me
13:54 _ikke_ graff: a pull request is just a branch that you can merge
13:54 graff :p
13:55 jast avar: my poor head :(
13:55 graff so, is it going to revert my upstream changes? I have a bunch of commits from another dev's patches i just finished
13:56 _ikke_ graff: No, a merge tries to incorporate changes from both sides of the merge
13:56 graff so i just type : git pull
13:56 graff right?
13:57 jameser joined #git
13:57 graff http://stackoverflow.com/questions/5725096/how-to-handle-your-first-pull-request-on-github
13:57 graff oh chtulu have mercy, here I go again
13:57 adamru joined #git
13:59 mar77i cthulhu is only relevant when you merge from multiple people in one go.
13:59 Es0teric joined #git
13:59 mage_ ok, I did a git reset --hard d443e80ff65320fe71444e8dcbae3113e84f6fcf, but then I can't push anymore, any idea why?
14:00 sbasso joined #git
14:00 mage_ and if I'm doing a pull the repository is fucked again :(
14:00 arooni joined #git
14:02 mage_ should I just use --force?
14:02 kharloss joined #git
14:02 graff could you guys give that stack overflow "top answer" a quick look and make sure it at least looks "close to right"
14:02 graff it has 90898231233 stars, but that means not much
14:03 graff they probably just overflowed their star chart int
14:03 lb jast "jastooh, nasty. I like it."
14:03 Es0teric joined #git
14:03 _ikke_ mage_: at least use --force-with-lease, makes it a tiny bit harder to shoot yourself in the foot
14:04 _ikke_ mage_: But know the consequences of pushing rewritten history
14:04 _ikke_ graff: The only thing the top answer does is linking to a github page (which is not a bad idea to follow)
14:04 pasky graff: answers don't have stars but upvotes
14:05 pasky graff: and the top answer just refers to a github help page, which yeah, is sane to follow
14:05 graff pasky: yeah, sorry i always call them stars by accident
14:06 mage_ one thing I'm wondering: what's the best workflow to merge "some" files from a branch to another one ?
14:06 graff they used to get mad as hell at me. i had a lot of stars, ahem upvotes, from answering all the various shell questions using POSIX shell
14:06 graff sort of a one size fits all approach
14:06 sonOfRa joined #git
14:07 mage_ in my case I have a website and I'm busy to implement a new template, so I created a new_template branch and from time to time I'd like to merge from the dev branch
14:07 graff oh right, github uses stars
14:08 mage_ but for unknow reasons some files from the dev overwrite those in my new_template branch
14:08 mage_ git doing: git checkout new_template ; git merge dev
14:08 mage_ s/^git/I'm
14:09 jast stackoverflow uses stars, too, but only as bookmarks for questions
14:09 _ikke_ mage_: that's not a workflow git supports, it does not facilitate 'partial' merges
14:09 _ikke_ You can do it manually, but it's a lot of work
14:10 graff oh github is telling me how to do everything. yay!
14:10 kexmex joined #git
14:10 mage_ _ikke_: I guess the "best" is to cherry-pick some commits?
14:11 cdg joined #git
14:11 buzzLightBeer joined #git
14:12 mage_ another thing I don't understand is why, on dev branch: git checkout -b new_template ; git rm somefile; git commit; git merge dev
14:12 jameser joined #git
14:12 mage_ somefile is being merged from dev
14:13 mage_ there is no way to "merge-except-files-which-have-been-deleted" ?
14:13 LeBlaaanc joined #git
14:13 todd_dsm joined #git
14:14 bgerber joined #git
14:14 _ikke_ mage_: your command sequence does not make sense. The last merge should not merge anything
14:14 _ikke_ (because dev does not contain anything new)
14:15 vuoto joined #git
14:15 mage_ mmh
14:16 e14 joined #git
14:16 mage_ and if I did some modifications in somefile on dev branch before the merge?
14:16 learning joined #git
14:16 _ikke_ and if dev would've contained a commit the updated the file, it would conflict
14:16 _ikke_ update/delete conflict
14:16 _ikke_ modify/delete*
14:16 mage_ even if it has been deleted from new_template ?
14:16 _ikke_ yes
14:16 mage_ strange
14:17 Cabanossi joined #git
14:17 shtrb left #git
14:17 AaronMT joined #git
14:17 dimi1947 joined #git
14:19 bsanford joined #git
14:19 DarkPsydeLord joined #git
14:21 thebird joined #git
14:24 bgerber joined #git
14:24 vuoto joined #git
14:26 port0 joined #git
14:26 star_prone joined #git
14:27 port0 joined #git
14:27 MarioBranco joined #git
14:29 cdg joined #git
14:29 Bennux joined #git
14:31 Khisanth joined #git
14:32 UrsoBranco joined #git
14:32 watabou joined #git
14:32 dimi1947 is it possible with git to undelete a file that was previously deleted?I want to be sure about this...
14:32 selckin !reflog
14:32 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`
14:33 _ikke_ dimi1947: if it has been comitted, you can check it out from the commit that last contained it
14:33 Vampire0 dimi1947, sure, if the file was versioned and checked in, you can revive it at any time
14:33 dimi1947 _ikke;I assume checking out that commit will revive the file
14:33 sword joined #git
14:34 vuoto joined #git
14:34 Vampire0 dimi1947, yes, also
14:34 synthroid joined #git
14:34 Vampire0 dimi1947, that is the sense of a VCS
14:35 notebox joined #git
14:35 dimi1947 Vampire0:well the thing is that so far I have not deleted it a file with a chance of restoring it later...it is an occasion that just appeared
14:37 gchristensen joined #git
14:37 c137 joined #git
14:38 a_thakur joined #git
14:38 Vampire0 dimi1947, in software development it is quite common that you delete files
14:38 gchristensen Hi, I'm using `git for-each-ref` to clean up branches. I specified `--merged origin/master` which, to my surprise, included origin/master and HEAD in the list of refs. is there a easy way to exclude this, or is my best bet to filter them out with grep? are there other ones I may want to remove, too?
14:40 publio joined #git
14:41 Snugglebash joined #git
14:41 zxd how does git verify signed tags? what does the key encrypt in the signing process?
14:42 shinnya joined #git
14:45 canton7 zxd, the signature is of the data in the tag: the tagger, date, message, etc, and the hash of the commit being tagged
14:45 jagob joined #git
14:45 livingstn joined #git
14:45 jstimm joined #git
14:46 Rusky_ joined #git
14:46 Derperperd joined #git
14:47 jstimm joined #git
14:48 oleo joined #git
14:48 qqx joined #git
14:49 cr34ton joined #git
14:49 Muzer joined #git
14:51 aw1 joined #git
14:52 TheMontyChrist joined #git
14:53 juvenal joined #git
14:53 TheMontyChrist joined #git
14:53 TheMontyChrist joined #git
14:53 TheMontyChrist I just created a branch , comitted some stuff and then pushed.
14:53 TheMontyChrist the repo that I pushed to now contain the new branch? right?
14:54 Vampire0 TheMontyChrist, if you pushed the branch, then yes. If you pushed that new branch to the likely named branch. If you had an upstream branch defined and didn't specify where to push to, you updated that branch. But the output should have told you
14:54 TheMontyChrist ehh apparently it doesn't
14:54 Vampire0 TheMontyChrist, what did the output say? !repro
14:54 gitinfo TheMontyChrist: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
14:55 TheMontyChrist local: git push (contains new branch)
14:55 TheMontyChrist remote: git branch (my new branch doesn't appear)
14:55 qqx joined #git
14:55 nikivi joined #git
14:56 Vampire0 TheMontyChrist, as I said, please provide the output of your push command
14:57 Oatmeal joined #git
14:57 TheMontyChrist https://gist.github.com/anonymous/0acca64c02b60159b6ce474e7a8f0aa4
14:57 dvaske joined #git
14:58 TheMontyChrist https://gist.github.com/anonymous/5979c21c698b9a5649941fccc4879c71
14:58 TheMontyChrist the last one is confirmation that I'm in the new branch
14:58 TheMontyChrist the previous shows that it only pushed "master"
14:59 TheMontyChrist https://gist.github.com/anonymous/0bbca29c4508a9ae4c5d2f112a384961
14:59 TheMontyChrist this one shows that "srr_bb" doesn't appaer
14:59 TheMontyChrist this one shows that "srr_bb" doesn't appear
14:59 TheMontyChrist on the remote
14:59 TheMontyChrist the "remote" is a thumb drive
15:00 Vampire0 TheMontyChrist, you didn't include the command you issued, what exactly was it?
15:02 cyberz joined #git
15:03 TheMontyChrist git push
15:03 thiago joined #git
15:03 TheMontyChrist git branch for the second and third
15:03 TheMontyChrist git push for the first gist that is...
15:03 Vampire0 TheMontyChrist, and you did read the output of the command? Because it answers your question
15:05 TheMontyChrist yeah, I never had to do this
15:05 TheMontyChrist or what it suggested  - as you can see by the "remote" git branch
15:05 TheMontyChrist it shows several branches that I've created in the past
15:05 bsanford joined #git
15:05 mage_ can I do something like: git diff new_template...dev -- _form.pt | git patch ... ?
15:06 TheMontyChrist seomthing like setupstream?
15:07 TheMontyChrist or something to that effect?
15:10 dave0x6d joined #git
15:10 Vampire0 TheMontyChrist, you have a very old Git version that has "push.default=matching" which means that if you do "git push" all local branches that have a matching remote branch already will be pushed, in your case you pushed the "master" branch
15:11 Vampire0 TheMontyChrist, if you would have set push.default to simple or specified explicitly what to push it would have worked
15:11 masuberu joined #git
15:11 Vampire0 TheMontyChrist, so `git push origin srr_bb` would have pushed that branch explicitly
15:12 synthroid joined #git
15:13 leeN joined #git
15:13 crose joined #git
15:13 TheMontyChrist interesting
15:14 TheMontyChrist so "git push origin srr_bb" pushed it
15:14 TheMontyChrist so "git push origin srr_bb -u" pushed it and added to my .git/config
15:14 cdg_ joined #git
15:14 TheMontyChrist is there a way to create a local branch and automagically create it in my .git/config?
15:14 TheMontyChrist I'm creating a branch w/ "git branch blah"
15:15 raynold joined #git
15:15 Vampire0 TheMontyChrist, if there is no remote branch to track yet, you cannot set it to track, as it does not exist yet
15:16 cyberz joined #git
15:16 Vampire0 TheMontyChrist, and even if the upstream information would have been set, as long as you have a value of "matching" for push.default, it doesn't matter I think, all matching branches are pushed if you do "git push"
15:17 mage_ _ikke_: isn't git format-patch / git am an elegant way to handle partial merges?
15:18 dreiss joined #git
15:20 ozmage joined #git
15:22 learning joined #git
15:24 netj joined #git
15:25 evanextreme joined #git
15:25 boombatower joined #git
15:27 Es0teric joined #git
15:27 Vampire0 mage_, how would you define a "partial merge"? I guess you are after man git cherry-pick actually
15:27 gitinfo mage_: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
15:28 _Vi joined #git
15:29 tang^ joined #git
15:29 sbasso joined #git
15:30 mage_ Vampire0: I like git format-patch better than git cherry-pick
15:30 Vampire0 mage_, why is this?
15:33 YuGiOhJCJ joined #git
15:34 watabou joined #git
15:34 brent__ joined #git
15:34 bariscant joined #git
15:36 brent__ joined #git
15:37 Vinnie_win joined #git
15:37 oaao joined #git
15:38 svm_invictvs joined #git
15:38 cqi joined #git
15:40 steeze joined #git
15:41 Gustavo6046 joined #git
15:42 peterbec` joined #git
15:42 buzzLightBeer joined #git
15:46 _ikke_ mage_: note that git cherry-pick basically uses git format-patch + git am
15:46 _ikke_ Just in an automated way
15:46 mage_ _ikke_: ah.. good to know :) thanks
15:47 robattila256 joined #git
15:49 jameser joined #git
15:50 kexmex joined #git
15:51 alwyn joined #git
15:51 Chinggis6 joined #git
15:51 alwyn Hey! Is it possible to have an alias for git diff HEAD~X where X can be passed after the alias?
15:51 imack joined #git
15:51 jstimm joined #git
15:54 cr34ton joined #git
15:55 Vampire0_ joined #git
15:55 _ikke_ git config alias.diffn "! f () { git diff HEAD~$1; }; f"
15:56 username2 joined #git
15:56 _ikke_ with default param 1: git config alias.diffn "! f () { git diff HEAD~${1-1}; }; f"
15:57 orbyt_ joined #git
15:57 tsdev joined #git
15:57 SpeakerToMeat joined #git
15:57 madewokherd joined #git
15:58 davidfetter_ge joined #git
15:59 qqx At least with my shell it's required to use single rather than double quotes when defining that to prevent $1 from being evaluated during the definition rather than when used.
15:59 Dougie187 joined #git
15:59 _ikke_ qqx: good one, missed that
16:00 _ikke_ alwyn: ^^
16:00 _ikke_ git config alias.diffn '! f () { git diff HEAD~${1-1}; }; f'
16:01 raspado joined #git
16:01 shgysk8zer0 joined #git
16:01 matoro joined #git
16:02 star_prone joined #git
16:03 alwyn Hmm
16:03 roelmonn_ joined #git
16:04 MarioBranco joined #git
16:05 svm_invictvs joined #git
16:06 alwyn It needs to be with double quotes in gitconfig at least :)
16:06 alwyn But it seems to work!
16:07 alwyn How does it work? You define a function to do the git diff and then run it, so you can optionall supply a parameter to it at the end
16:07 rogerraymond joined #git
16:07 TbobbyZ joined #git
16:07 alwyn But what does the ${1-1}; do exactly?
16:07 iamthad joined #git
16:08 lektrik joined #git
16:08 qqx alwyn: That expands to the first argument if there is one otherwise the part after the - (1 here) is substituted as the default.
16:09 qqx Could also be ${1-3} if you wanted to use 3 as the default.
16:09 vrach joined #git
16:09 MarioBranco joined #git
16:09 alwyn Ah, got it! Is that default shell behaviour?
16:10 kexmex joined #git
16:11 canton7 you could do git config alias.diffn '! sh -c "git diff HEAD~${1-1};"'
16:11 canton7 as well, if you'd rather
16:11 qqx Yes, I believe that's specified by the POSIX standard for shells. Or it's at least supported by dash, bash, and zsh.
16:12 durham joined #git
16:12 thebird joined #git
16:12 ResidentBiscuit joined #git
16:13 MarioBranco joined #git
16:13 thiago joined #git
16:13 learning joined #git
16:17 Cabanossi joined #git
16:18 denisMone joined #git
16:22 dviola joined #git
16:23 robotroll joined #git
16:25 finalbeta1 joined #git
16:28 mar77i joined #git
16:28 theoceaniscool joined #git
16:29 e14 joined #git
16:29 livingstn joined #git
16:31 davidfetter_ge_ joined #git
16:32 iamthad joined #git
16:32 star_prone joined #git
16:33 jjasinski joined #git
16:34 evanextreme joined #git
16:34 fahadash joined #git
16:35 watabou joined #git
16:35 j`ey joined #git
16:36 j`ey I enabled noprefix by default.. is there a way of getting the prefix on deman?
16:36 j`ey demand
16:38 livingstn joined #git
16:38 tyreld joined #git
16:40 theoceaniscool_ joined #git
16:40 livingstn joined #git
16:42 rivarun joined #git
16:43 Noldorin joined #git
16:44 learning joined #git
16:45 jeffreylevesque joined #git
16:45 Murii_ joined #git
16:47 iamthad joined #git
16:47 scoobertron joined #git
16:51 Derperperd joined #git
16:56 port0 joined #git
16:58 Es0teric joined #git
16:59 eihabarabia joined #git
17:00 durham joined #git
17:02 koko_ joined #git
17:04 WeiJunLi joined #git
17:05 danostrowski joined #git
17:06 e14 joined #git
17:08 danostrowski Hello. I have forked a repo and made commits. While I've been committing, I've also been fetching upstream and merging those changes in (probably dumb because I didn't rebase!). So now I have this fork that has my commits interlaced with these other commits. For various reasons, I can't do a pull request, I need to submit a patch via a different method. Is there a way to gather the commits that aren't in the upstream branch
17:08 danostrowski and like, squash them into a single commit?
17:08 m0viefreak joined #git
17:11 multi_io_ joined #git
17:11 iamthad joined #git
17:11 jrnieder joined #git
17:11 buzzLightBeer joined #git
17:12 finalbeta joined #git
17:12 raijin joined #git
17:13 _ikke_ danostrowski: git rebase -i can help you
17:13 danostrowski Ah, OK.
17:13 _ikke_ drop the commits you don't want, squash/fixup the rest
17:13 lordjancso joined #git
17:14 danostrowski I will read up about that. I found out I can `git cherry -v master upstream/master` to find the commits which is very helpful.
17:14 dreiss joined #git
17:17 Cabanossi joined #git
17:17 stewie925 joined #git
17:18 destino joined #git
17:18 stewie925 test
17:19 stewie925 hello guys I have an issue with setting up AllowUsers in /etc/ssh/sshd_config
17:19 stewie925 I do 'sudo service ssh restart' after changing the ssd_config file
17:20 cagomez joined #git
17:20 gugah_ joined #git
17:20 j`ey left #git
17:20 stewie925 but I use putty to access/edit the files in my vm - and I couldnt get in unless I remove AllowUsers from sshd_config file
17:21 diogenese joined #git
17:21 canton7 stewie925, sounds like an ssh question, rather than a git one?
17:21 stewie925 I mean I couldnt putty in
17:21 iamthad joined #git
17:21 stewie925 oh
17:23 stewie925 yeah youre right... which channel can I contact to address the ssh issue?
17:23 min_ joined #git
17:23 Anja joined #git
17:24 _ikke_ #ubuntu for example
17:24 _ikke_ there is an #openssh channel
17:24 hahuang62 joined #git
17:25 stewie925 thanks so much guys!
17:26 dave0x6d joined #git
17:26 hashtagstrashtag joined #git
17:27 robattila256 joined #git
17:28 matoro joined #git
17:28 venmx joined #git
17:30 jast joined #git
17:32 roentgen joined #git
17:33 durham joined #git
17:34 raijin joined #git
17:34 daddio joined #git
17:35 WeiJunLi_ joined #git
17:36 watabou joined #git
17:37 Dougie187 left #git
17:37 Es0teric joined #git
17:37 thiago joined #git
17:38 Es0teric_ joined #git
17:38 Murii_ joined #git
17:38 JanC_ joined #git
17:38 miczac joined #git
17:42 bitmod joined #git
17:43 peterbec` joined #git
17:44 orbyt_ joined #git
17:44 synthroid joined #git
17:44 peacememories joined #git
17:46 juvenal joined #git
17:50 kadoban joined #git
17:52 freimatz joined #git
17:52 e14 joined #git
17:52 matoro joined #git
17:53 dminuoso joined #git
17:54 dminuoso So a detached HEAD just means that my head pointer no longer points at a ref, but a commit hash directly right?
17:54 dminuoso Or is there a deeper meaning to it?
17:56 ozmage joined #git
17:56 TomyLobo2 joined #git
17:56 daddio @dminuoso yep. You can even make commits to a detached HEAD, but they are oh-so-easy to lose track of
17:57 theoceaniscool_ joined #git
17:57 rudi_s dminuoso: *no longer points at a branch
17:57 kevr how can i get the git diff of the current working tree not committed to HEAD yet?
17:58 kevr between HEAD and the current working tree*
17:58 rudi_s kevr: git diff
17:58 kevr is there a way to specifically say just look at HEAD and above? if i run git diff, it has to process all the diffs in the entire repo or something
17:58 kevr takes forever
17:58 kevr if i do something like git diff <commit>^ <commit> it's instant
17:59 rudi_s kevr: Because it doesn't look at the work tree.
17:59 kevr i see
17:59 kevr so it has to forcibly look at every file in the working tree to see
17:59 kevr gotcha
17:59 kevr makes sense
17:59 rudi_s kevr: Yes, how else should git know what the differences are? (It already uses many optimizations to make that as fast as possible.)
18:00 dminuoso rudi_s: A branch is just a ref in a special directory, but git is not detached if your HEAD is pointing at say refs/tags/v1.2.3
18:00 dminuoso rudi_s: So it cant be "just about branches"
18:00 kevr is there a way to just give it a directory to process instead of the entire tree?
18:01 daddio dminuso, no, rudi_s is right, if you check out a tag, it is a detached head
18:01 rudi_s kevr: Sure, git diff repo/to/diff
18:01 rudi_s s/repo/directory/
18:02 rudi_s dminuoso: Actuall I don't know what happens if you put a tag into ~/.git/HEAD, but that's not something you'd do normally.
18:03 durham joined #git
18:03 rudi_s But almost always .git/HEAD is either a branch or a commit (then it's a detached HEAD).
18:03 dminuoso rudi_s: I just tried it, it acts as if it was a branch.
18:04 re1 joined #git
18:04 rudi_s dminuoso: Then apparently it works, but it's not common usage and not something you'd do with git checkout (which is what you normally use to switch branches/detach a head).
18:04 joaorsbatista joined #git
18:05 Doginal joined #git
18:05 LeBlaaanc joined #git
18:06 re1 joined #git
18:07 daddio hmm. maybe its only anotated tags that are detached...
18:07 * daddio goes to check
18:07 re1 joined #git
18:08 dminuoso rudi_s: well you cant checkout the tag directly it seems
18:08 dminuoso rudi_s: If you checkout a tag, you checkout its commit hash.
18:08 re1 joined #git
18:08 dminuoso I just manipulated the HEAD pointer with a text editor.
18:08 dminuoso ;-)
18:09 rudi_s dminuoso: Yeah, that's why I said "not common usage" ;-) - I don't think you're supposed to do that.
18:10 dminuoso It's amazing to just have this "work" though.
18:10 roelmonnens joined #git
18:10 daddio git checkout 0.0.0.10
18:10 daddio Note: checking out '0.0.0.10'.
18:10 daddio
18:10 daddio You are in 'detached HEAD' state. You can look around, make experimental
18:10 * dminuoso wonders what happens if you commit to a tag..
18:10 jrnieder dminuoso: after running 'git checkout' or after editing files behind's git's back?
18:11 canton7 daddio, well checking out a tag detaches the HEAD, so the same as with any detached HEAD: you'll create a new commit just fine, but it won't have a branch pointing to it
18:11 ertesx joined #git
18:11 e14 joined #git
18:11 daddio right
18:12 lgff joined #git
18:12 daddio I came here 'cause I found an odd  bug in gitk, and hope to help fix it
18:13 LionsMane joined #git
18:13 daddio the diff view in gitk highlights the word <items> or </items> in red when they are in diff contec\xt lines
18:13 raijin joined #git
18:15 daddio the 12kloc tcl file is hurting my brain. Anybody with any gitk dev knowhow?
18:15 star_prone joined #git
18:16 livingstn joined #git
18:16 hahuang62 joined #git
18:17 Ryanar joined #git
18:17 hobodave joined #git
18:18 e14 joined #git
18:18 meister_ joined #git
18:19 chrnybo joined #git
18:19 juvenal joined #git
18:19 Starky joined #git
18:19 ramsub07 joined #git
18:20 d1z joined #git
18:20 meister_ left #git
18:20 ramsub07 hi, I by mistake saved a file which I did not intend to. I was in branch1 and i shifted to master and saved it there from sublime. Then, i tried git diff and saw nothing was displayed. How do i go about to clean up my master?
18:21 Sasazuka joined #git
18:22 [Brain] joined #git
18:22 roelmonnens joined #git
18:23 daddio ramsub0 if it just in your local repository, and it is the most recent commit,"git reset HEAD~1"
18:23 matoro joined #git
18:24 marcogmonteiro joined #git
18:28 luke_nukem joined #git
18:30 Es0teric joined #git
18:32 peterbec` joined #git
18:32 roelmonnens joined #git
18:33 AaronMT joined #git
18:34 iamthad joined #git
18:36 eroux joined #git
18:36 Phanes joined #git
18:36 Phanes joined #git
18:36 watabou joined #git
18:39 mar77i joined #git
18:39 juvenal joined #git
18:39 jjasinski joined #git
18:40 porsche944 joined #git
18:40 lgff_ joined #git
18:41 Discovery joined #git
18:45 nixjdm joined #git
18:47 davimore joined #git
18:48 lgff joined #git
18:49 roelmonnens joined #git
18:49 gugah__ joined #git
18:49 Bennux joined #git
18:49 Jellyg00se joined #git
18:51 roelmonnens joined #git
18:52 GT4066 joined #git
18:53 nowhere_man joined #git
18:54 nowhereman joined #git
18:54 KV joined #git
18:56 KV joined #git
18:57 tvw joined #git
18:57 theoceaniscool_ joined #git
18:58 snowalpaca joined #git
19:04 d5sx43 joined #git
19:07 raijin joined #git
19:07 Balliad joined #git
19:11 gchristensen left #git
19:13 e14 joined #git
19:14 Balliad joined #git
19:14 jnavila joined #git
19:16 MineCoins joined #git
19:17 SilverBe joined #git
19:17 irqq joined #git
19:17 Dougie187 joined #git
19:19 shgysk8zer0 joined #git
19:23 duderonomy joined #git
19:24 rominron_ joined #git
19:26 aidalgol joined #git
19:28 ReptilianBrain joined #git
19:29 ReptilianBrain joined #git
19:31 gfixler joined #git
19:34 Garen joined #git
19:37 Brski joined #git
19:37 watabou joined #git
19:40 yehowyada joined #git
19:44 Derperperd joined #git
19:45 mar77i joined #git
19:46 noecc left #git
19:46 marc_v92 joined #git
19:47 cdown joined #git
19:48 raijin joined #git
19:49 wizardedit joined #git
19:54 jagob joined #git
19:54 Es0teric joined #git
19:58 FUX80-10 joined #git
19:59 FUX80-10 left #git
19:59 finalbeta joined #git
19:59 min_ joined #git
20:00 danostrowski joined #git
20:01 cyberz joined #git
20:02 Junior joined #git
20:03 _Vi joined #git
20:03 Cabanossi joined #git
20:03 hahuang65 joined #git
20:04 dminuoso Holy.
20:04 dminuoso I managed to seg fault git.
20:04 Derperperd joined #git
20:05 * daddio slow claps
20:05 dminuoso If I do a deep copy of the entire repository including .git, will that produce a new viable repository?
20:05 hobodave joined #git
20:05 dminuoso Im asking because I need to fix this repo badly and cant be arsed to debug git, but I dont want to lose this buggy state to file a bug report if necessary.
20:06 danostrowski joined #git
20:06 daddio dminuoso, yes. the repository is the contents of the .git directory
20:06 lucido-cl joined #git
20:06 dminuoso daddio: mm kay.
20:06 dminuoso This is majorly bad though.
20:06 ExoUNX joined #git
20:07 dminuoso I was just about to unfuck my repository from the reflog..
20:07 hahuang65 joined #git
20:07 dminuoso I think I have an idea what has caused this though..
20:07 chrnybo joined #git
20:07 dminuoso Me fiddling with .git/HEAD and putting a refs/tags/somethign in there is exactly at the spot in the reflog where it segfaulted.
20:08 dminuoso How do I un-FUBAR the reflog? :S
20:08 daddio meh. Software has bugs.
20:09 cyberz joined #git
20:09 ojacobson dminuoso: delete the reflog, or edit it. it's just text.
20:09 daddio Your idea of copying the repo first is a good idea.
20:09 ojacobson the format's pretty straightforward, too.
20:10 ojacobson if you want to set HEAD to point to a tag for some reason, use `git symbolic-ref` to do it instead of editing the file directly. Symbolic refs aren't complex, but there's no benefit to editing the ref by hand
20:10 ojacobson (that is, no lie, a weird thing to want, but you can do it and it works fine)
20:12 dminuoso ojacobson: Is the reflog a single file, or is it composed of all the files in .git/logs ?
20:12 grawity yes
20:12 ojacobson the latter
20:12 ojacobson there's a reflog file per ref
20:12 star_prone joined #git
20:12 grawity well, each ref has its own reflog
20:12 grawity they're independent from each other
20:12 ojacobson ^ sorry, yes
20:13 dminuoso grawity: So what does git reflog do?
20:13 dminuoso Or do I only get to see the reflog of the current HEAD?
20:13 ojacobson summarize or manipulate the reflog for a given ref
20:13 dminuoso (or rather what HEAD points at)
20:13 ojacobson (by default HEAD)
20:13 dminuoso Ahhh okay.
20:13 grawity with no additional args, it shows the reflog of HEAD itself
20:13 ojacobson it defaults to _HEAD itself_
20:13 dminuoso Ahh
20:13 dminuoso So even HEAD is considered a ref
20:13 grawity which is not the same as the reflog of the pointed-to ref
20:14 ojacobson HEAD, ORIG_HEAD, FETCH_HEAD, etc are all implemented as refs
20:14 ojacobson FETCH_HEAD is a bit weird in as much as it can have multiple referrents
20:14 finalbeta joined #git
20:14 grawity so you also see branch checkouts in HEAD's reflog
20:14 Es0teric_ joined #git
20:15 cdown joined #git
20:15 dminuoso This is a little more concerning now, because its not crashing reliablye.
20:15 dminuoso So at different spots while showing the reflog.
20:16 ojacobson (oops, I lied, FETCH_HEAD is not a ref, though it does act like one in some ways)
20:16 scarcry joined #git
20:16 MineCoins joined #git
20:16 dreiss joined #git
20:16 thiago joined #git
20:17 hahuang65 joined #git
20:17 dminuoso grawity: I see. Suddenly the term "reflog" also makes sense. :)
20:19 anuxivm joined #git
20:20 cyberz joined #git
20:22 avar joined #git
20:23 Fallen0223 joined #git
20:25 cdown joined #git
20:26 matoro joined #git
20:27 livingstn joined #git
20:27 satifant joined #git
20:27 venmx joined #git
20:28 snowalpaca joined #git
20:29 cyberz joined #git
20:29 learning joined #git
20:31 scarcry joined #git
20:31 Teny joined #git
20:33 chadi joined #git
20:35 zivester joined #git
20:36 regedit joined #git
20:37 grayjoc joined #git
20:37 n0rtan joined #git
20:39 watabou joined #git
20:39 kbs joined #git
20:39 Vampire0 joined #git
20:40 cyberz joined #git
20:42 rnsanchez joined #git
20:42 MarioBranco joined #git
20:43 brent__ joined #git
20:43 alexandre9099 joined #git
20:43 bitmod joined #git
20:44 bwn joined #git
20:46 kexmex joined #git
20:48 hobodave_ joined #git
20:51 cyberz joined #git
20:51 timetrex joined #git
20:53 alexandre9099 joined #git
20:55 muhannad joined #git
20:56 sky joined #git
20:56 Es0teric_ joined #git
20:56 phelix joined #git
20:56 sky joined #git
20:57 sky hi there. i have some unstaged files marked typechange. how do i make sure they get committed?
20:57 phelix left #git
20:57 phelix joined #git
20:58 phelix I have a computer at home and a computer at work. When I am on my home computer and I want to check out a branch I was working on from work it always puts me in a detached head. Any idea how I can get it to check out the actual branch?
20:58 dminuoso Just checkout the branch name.
20:58 phelix I do
20:58 phelix and it puts me in a detached head of that branch
20:58 dminuoso phelix: I do not believe oyu.
20:58 sky cant find any docs related to staging/typechange
20:59 dminuoso phelix: Is it possible that you have a directory by the same name of that branch?
20:59 sky if i do commit -m -a will that add and delete and typechange all unstaCged files?
20:59 phelix gco origin/search-result
20:59 phelix Previous HEAD position was d16bfe1... DS-1466: returns propert city/state
20:59 phelix HEAD is now at 679d737... save work
20:59 _ikke_ sky: no
20:59 dminuoso phelix: Please tell us the command you used to trigger this.
20:59 _ikke_ commit -a will only stage modified changes
20:59 phelix and now it shows my branch name as 679d737 instead of search-results
21:00 phelix I did its at beginning of that paste.
21:00 phelix gco
21:00 _ikke_ phelix: do not checkout remote tracking branches
21:00 _ikke_ (prefixed with the remote name)
21:00 daddio phelix: lose the "origin/" at the start and it will create a local branch that tracks the remote
21:00 sky so I have three types of unstaged files: modified, deleted, and typechange. I want all the typechange ones as well as deleted ones comitted
21:01 phelix then it doesn't find it
21:01 cyberz joined #git
21:01 dminuoso phelix: Thats because you need to fetch it first.
21:01 phelix really weird. My other repositories work fine
21:01 phelix i did a git fetch origin
21:01 evanextreme joined #git
21:02 _ikke_ sky: git add -A
21:02 theoceaniscool_ joined #git
21:03 _ikke_ phelix: what does git branch -r return?
21:03 peterbec` joined #git
21:03 phelix I just ran git fetch origin search-result then tried to not use origin and it tells me error: pathspec did not match any files known to git
21:03 _ikke_ phelix: how many remotes do you have?
21:04 phelix I have 2
21:04 phelix upstream and origin
21:04 _ikke_ right
21:04 _ikke_ Then you have to be explicit: git checkout -b search-result origin/search-result
21:05 phelix I have to use -b  ? Even though this branch already exists?
21:05 dminuoso Is there a way to have git clear its internal caches?
21:05 _ikke_ phelix: a remote tracking branch exists, you do not have a local branch called search-result yet
21:05 dminuoso (Such as the cache it seems to be using for the reflog)
21:06 _ikke_ dminuoso: What do you want to achieve?
21:06 preaction dminuoso: git gc might be what you're looking for
21:06 phelix ohh, so when it checks out in a detached head of that then I just create the same branch name on my local?
21:06 dminuoso _ikke_: I have something in my reflog that keeps seg faulting git on the first time it tries to show the reflog
21:06 sky _ikke_: do I do git add -A instead of git rm for an unstaged 'deleted' file i want to commit?
21:06 dminuoso _ikke_: I want to forcibly trigger this for debugging.
21:06 phelix when i push it will autmatically update the original branch?
21:06 sky i see it says no-ignore-removal
21:06 bariscant joined #git
21:07 _ikke_ phelix: no need to detach your HEAD first, you can directly create the branch based on a remote tracking branch
21:07 dminuoso _ikke_: Based on when this seg fault happens it feels like it happens when git builds up some kind of cache for the reflog display.
21:07 thiago joined #git
21:08 _ikke_ dminuoso: git itself only has one 'cache', the indedx
21:08 _ikke_ index
21:08 _ikke_ the rest is linux filesystem cache
21:09 phelix git checkout -b features/DS-1045-pin-first-search-result origin/features/DS-1045-pin-first-search-result when I try this it tells me that this branch already exists.
21:09 _ikke_ and if you do git checkout features/DS-1045-pin-first-search-result
21:10 phelix wow, it worked this time. Super weird..
21:10 phelix well thank you.
21:10 roentgen joined #git
21:10 cyberz joined #git
21:10 hobodave joined #git
21:12 Cavallari joined #git
21:14 jost__ joined #git
21:20 cyberz joined #git
21:23 davimore_ joined #git
21:23 dsdeiz joined #git
21:31 sky _ikke_: thanks
21:31 sky left #git
21:32 scoobertron joined #git
21:34 cyberz joined #git
21:34 pwnz0r joined #git
21:35 bronson joined #git
21:36 danostrowski joined #git
21:36 Synthead joined #git
21:36 a3Dman joined #git
21:38 tmg joined #git
21:39 hobodave joined #git
21:39 watabou joined #git
21:39 cyberz joined #git
21:43 Nugget joined #git
21:43 thedudez0r joined #git
21:46 seni1 joined #git
21:48 mrkake joined #git
21:48 cyberz joined #git
21:49 Sample joined #git
21:50 masuberu joined #git
21:52 peeps joined #git
21:52 wagle joined #git
21:52 myqu joined #git
21:54 n0rtan left #git
21:56 chrnybo joined #git
21:56 mda1 joined #git
21:56 orbyt_ joined #git
21:56 juvenal joined #git
21:58 chrnybo joined #git
22:00 Vampire0_ joined #git
22:01 Ryanar joined #git
22:01 raspado joined #git
22:03 cyberz joined #git
22:10 masuberu joined #git
22:12 theoceaniscool_ joined #git
22:21 raspado joined #git
22:27 salamanderrake joined #git
22:28 dreiss joined #git
22:29 hahuang65 joined #git
22:35 Darcidride joined #git
22:41 watabou joined #git
22:45 StuartMI joined #git
22:45 Sasazuka_ joined #git
22:47 Cabanossi joined #git
22:48 felixjet joined #git
22:49 Dougie187 left #git
22:49 miczac joined #git
22:50 cyberz joined #git
22:52 min_ joined #git
22:52 ToBeCloud joined #git
22:54 Sasazuka joined #git
22:56 schleppel joined #git
22:57 dsdeiz joined #git
22:57 dsdeiz joined #git
22:57 dviola joined #git
22:57 buffal0 joined #git
23:02 crose joined #git
23:04 madewokherd joined #git
23:05 snowalpaca joined #git
23:05 snowalpaca joined #git
23:06 Tiberium_log_bot joined #git
23:06 kristofferR joined #git
23:09 kristofferR joined #git
23:10 dsdeiz_ joined #git
23:10 puff Good evening.
23:11 MrWoohoo joined #git
23:16 Ryanar joined #git
23:19 menip joined #git
23:23 Kaisyu joined #git
23:27 MrWoohoo joined #git
23:29 eh3 joined #git
23:29 matoro joined #git
23:30 raspado joined #git
23:31 TbobbyZ_ joined #git
23:31 mitzip joined #git
23:32 juvenal joined #git
23:33 hahuang65 joined #git
23:35 stoopkid joined #git
23:37 cyberz joined #git
23:41 watabou joined #git
23:43 cyberz joined #git
23:43 irqq_ joined #git
23:45 inflames joined #git
23:47 Cabanossi joined #git
23:47 hahuang65 joined #git
23:51 jimi_sanchez joined #git
23:55 askb joined #git
23:56 matoro joined #git
23:57 Lyqyd joined #git
23:58 cyberz joined #git

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