Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-16

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

All times shown according to UTC.

Time Nick Message
00:00 elsevero joined #git
00:01 fmcgeough joined #git
00:04 lbv-user joined #git
00:05 done joined #git
00:05 danslo joined #git
00:05 truetuna joined #git
00:07 madewokherd joined #git
00:08 mizu_no_oto joined #git
00:08 radsy joined #git
00:08 radsy joined #git
00:09 thierryp joined #git
00:10 overlord_tm joined #git
00:10 radsy joined #git
00:12 kenansulayman left #git
00:14 lbv-user joined #git
00:15 JanC_ joined #git
00:18 crayon joined #git
00:20 jimi_ joined #git
00:22 crayon joined #git
00:22 minimalism joined #git
00:23 clemf joined #git
00:25 lss8 joined #git
00:25 star_prone joined #git
00:27 Ice_Strike2 joined #git
00:32 LBV_User joined #git
00:33 snthsnth joined #git
00:35 Mixologic_ joined #git
00:37 Kaisyu joined #git
00:40 polyrob_ joined #git
00:43 prawnzy joined #git
00:43 ola left #git
00:44 thiago joined #git
00:45 leftriver92 joined #git
00:46 leftriver92 hellooo?
00:46 bremner !ask
00:46 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
00:47 leftriver92 how do i delete the last n commits on my private repo?
00:48 bremner !revert
00:48 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
00:48 bremner see option e
00:49 leftriver92 i've tried something similar to option e but i'll try again, give me a second
00:52 leftriver92 okay so i've done that and i'm at the commit i want to move back to
00:52 leftriver92 do i git push?
00:57 me joined #git
00:59 git368 joined #git
01:01 bremner you'll have to force push, probably, but you can try without first.
01:03 duvnell joined #git
01:04 fstd_ joined #git
01:05 nettoweb joined #git
01:05 Hello71 huh. git clone: error: index-pack died of signal 9
01:05 Hello71 4 GB not enough apparently
01:08 qsx *blinks*
01:08 qsx did you mistake git and darcs?
01:08 minimalism I'm fairly new to git, but is it possible to manage / with git with an explicit list of file names to manage? Like a system's configuration files you've listed.
01:09 kadoban minimalism: Doesn't sound like a good idea
01:09 minimalism kadoban: I'm trying to find out the best way to manage my entire system's config files (ones I have explicitly listed) without having to an rsync or something to a repository dir every time.'
01:10 qsx !etckeeper
01:10 gitinfo etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://etckeeper.branchable.com
01:10 qsx also, !best
01:10 gitinfo [!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)
01:11 minimalism Does that only work for /etc ?
01:13 cqi joined #git
01:14 hahuang65 joined #git
01:15 Hello71 qsx: https://github.com/gentoo/gentoo-gitmig-20150809-draft
01:16 Hello71 ulimit -m 4194304; git clone https://github.com/gentoo/gentoo-gitmig-20150809-draft.git
01:16 Hello71 probably fail
01:16 Kitty- joined #git
01:16 Hello71 at least with, uh... 2.7.3
01:18 Kitty- Hoping someone can help. When I click to create a fork, for some reason the repository of my fork is behind by a couple of months. I tried clicking fork again, but it still shows the 2 month old commits. Wondering if perhaps my repo is behind the latest commits because of a previous PR I did. Google fu wasn't of much help.
01:19 Hello71 er, I think I've got an extra 0 in there somewhere...
01:19 Hello71 !github
01:19 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
01:20 Kitty- Good to know, if anyone might have any hints, that'd be wonderful
01:21 a3Dman joined #git
01:22 gnoirzox joined #git
01:23 clemf joined #git
01:24 railssmi_ joined #git
01:24 flippo joined #git
01:25 lss8 joined #git
01:26 inflames joined #git
01:28 rominronin joined #git
01:28 tterrag anyone know of any utilities that can export a git graph (similar to gitk, but a bit nicer looking maybe) into an image, for presentation purposes?
01:28 clemf joined #git
01:30 a3Dman joined #git
01:31 gnoirzox joined #git
01:34 Hello71 !graph
01:34 gitinfo [!lol] A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
01:35 Siegfried joined #git
01:36 lss8_ joined #git
01:38 dodobrain joined #git
01:38 clemf joined #git
01:41 alyptik joined #git
01:41 tterrag Hello71: I know of the cmdline option. but like I said, this is for presentation purposes, and I'd like a nice image
01:43 Hello71 dunno. use google
01:43 fatalhalt joined #git
01:44 tterrag I've been doing that all day
01:44 rewt find a gui that you like, and take screenshots of it
01:48 Hello71 might be able to script something with graphviz
01:48 Hello71 or hell, just draw your own
01:48 Derperperd joined #git
01:49 tterrag one of the apps I tried used graphviz, but it wasn't quite what I was looking for
01:50 tterrag gitk would be perfect if it didn't look so bland/old
01:50 morenoh149 joined #git
01:52 austin987 joined #git
01:52 themill tterrag: qgit looks slightly nicer
01:59 duckinja joined #git
02:00 duckinja joined #git
02:05 hackel joined #git
02:06 danslo joined #git
02:07 Siegfried joined #git
02:08 jstimm joined #git
02:10 thierryp joined #git
02:11 bluezone joined #git
02:11 finalbeta joined #git
02:12 truetuna joined #git
02:13 Jameser joined #git
02:13 Infinite_182 joined #git
02:14 star_prone joined #git
02:14 nicksloan joined #git
02:21 rwb joined #git
02:25 railssmith joined #git
02:27 mangolisk joined #git
02:28 whitby joined #git
02:30 robattila256 joined #git
02:31 Infinite_182 joined #git
02:35 d^sh joined #git
02:38 ketas joined #git
02:42 ketas- joined #git
02:46 zerox2a joined #git
02:46 icedwater I like the new usage guide with git 2.7.4
02:46 icedwater At least it's not just a long list of commands...
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and Blurnsball | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-cherry-pick does not yield actual delicious cherries
02:49 JamesBaxter joined #git
02:53 khfeng_ joined #git
02:54 khfeng_ joined #git
02:54 m1911 joined #git
02:55 pks joined #git
02:56 durham_ joined #git
02:57 done joined #git
02:59 rominronin joined #git
03:01 MrWoohoo joined #git
03:02 prawnzy joined #git
03:02 khfeng_ joined #git
03:05 aavrug joined #git
03:07 nettoweb joined #git
03:07 SwiftMatt joined #git
03:09 Goplat joined #git
03:09 a_thakur joined #git
03:14 mizu_no_oto joined #git
03:14 dsdeiz joined #git
03:16 GT4066 joined #git
03:16 sunri5e joined #git
03:18 robattila256 joined #git
03:19 CussBot joined #git
03:25 hexagoxel joined #git
03:26 jeffreylevesque joined #git
03:29 Siegfried joined #git
03:31 chachasmooth joined #git
03:34 duvnell joined #git
03:36 stevenspasbo joined #git
03:38 mizu_no_oto joined #git
03:38 duckinja joined #git
03:39 morenoh149 joined #git
03:41 Rickmasta joined #git
03:49 Andrew_K joined #git
03:55 los joined #git
03:57 phanimahesh joined #git
03:57 ngperfex joined #git
03:59 dsantiago joined #git
04:03 easonlin joined #git
04:03 durham joined #git
04:04 durham joined #git
04:04 russ_za_ joined #git
04:04 done joined #git
04:07 danslo joined #git
04:08 railssmith joined #git
04:11 thierryp joined #git
04:14 danimal2 joined #git
04:16 Vortex34 joined #git
04:17 jeffreylevesque_ joined #git
04:20 duckinja joined #git
04:20 davimore joined #git
04:25 tristanp_ joined #git
04:27 a_thakur joined #git
04:31 rominronin joined #git
04:33 a3Dman joined #git
04:34 TylerEastman joined #git
04:36 mehola joined #git
04:40 ayogi joined #git
04:42 donmichelangelo joined #git
04:49 einnjo joined #git
04:52 Electrometro joined #git
04:55 cmn joined #git
04:57 subhojit777 joined #git
05:00 Ravana joined #git
05:01 govg joined #git
05:02 prawnzy joined #git
05:03 daey joined #git
05:03 svm_invictvs joined #git
05:03 robotroll joined #git
05:07 mehola joined #git
05:07 done joined #git
05:08 arescorpio joined #git
05:08 cdown joined #git
05:09 leTali joined #git
05:13 xall joined #git
05:17 robattil1 joined #git
05:18 rchavik joined #git
05:18 tyreld joined #git
05:19 joki joined #git
05:21 Cabanossi joined #git
05:26 ericho joined #git
05:28 morenoh149 joined #git
05:30 CussBot joined #git
05:30 flossie joined #git
05:30 sbulage joined #git
05:32 sbulage joined #git
05:42 bocaneri joined #git
05:42 waveclaw joined #git
05:42 Ravana joined #git
05:43 dreiss joined #git
05:46 exxi joined #git
05:46 diogenese joined #git
06:00 elsevero joined #git
06:01 a_thakur_ joined #git
06:03 rominronin joined #git
06:13 thierryp joined #git
06:13 aard_ joined #git
06:14 jpX joined #git
06:17 rscata joined #git
06:20 thierryp joined #git
06:21 done joined #git
06:22 pks joined #git
06:24 jpX joined #git
06:27 felixjet joined #git
06:27 infernix joined #git
06:28 cqi joined #git
06:29 lordjancso joined #git
06:33 dreiss joined #git
06:36 cyphase joined #git
06:36 jaguarmagenta joined #git
06:37 davidosomething joined #git
06:39 vdl joined #git
06:40 nd_ joined #git
06:41 jpX joined #git
06:44 jpX joined #git
06:45 Infinite_182 joined #git
06:46 danimal2 joined #git
06:47 tvw joined #git
06:49 jstimm joined #git
06:49 davidosomething joined #git
06:52 ThomasLocke joined #git
06:54 funfunctor joined #git
06:55 Raging_Hog joined #git
06:56 Electrometro joined #git
06:56 ArchNoob joined #git
06:58 govg joined #git
07:02 qt-x joined #git
07:02 sea-gull_ joined #git
07:03 prawnzy joined #git
07:04 romerocesar joined #git
07:04 raspado joined #git
07:05 pks joined #git
07:06 nilg` joined #git
07:06 cyphase joined #git
07:07 Andrew_K|2 joined #git
07:08 Infinite_182 joined #git
07:12 wrouesnel1 joined #git
07:13 a_thakur joined #git
07:14 LucaTM joined #git
07:14 barq How can I delete my last commit including the history if it's already pushed?
07:15 justan0theruser joined #git
07:16 Random832 joined #git
07:17 morenoh149 joined #git
07:18 a_thakur joined #git
07:18 freimatz joined #git
07:19 osse barq: same as you would if it wasn't, then add --force to the push
07:19 osse !rewrite
07:19 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
07:20 barq Noone has pulled it, it's my own repository.
07:20 osse then go forth and prosper
07:20 barq I did a hard reset and pushed --force
07:20 barq But it's still visible on github
07:21 cbreak barq: how?
07:21 osse web cache maybe
07:21 osse or a different branch
07:21 cbreak barq: did you try git ls-remote?
07:21 snthsnth joined #git
07:21 cbreak if that doesn't show it, then it's gone from history
07:21 cbreak it's normal that github shows outdated history
07:21 cbreak especially with things such as history rewriting
07:22 lindenle joined #git
07:22 cbreak and of course, even if commits are not in history, they aren't instantly collected but persist for a few weeks
07:22 thiago confirm with ls-remote
07:24 SwiftMatt joined #git
07:25 barq The code is still shown containing the commit, so probably missed something
07:25 cbreak what code?
07:26 barq It's gone in my local repo
07:26 vuoto joined #git
07:27 dodobrain joined #git
07:27 cyphase joined #git
07:28 chele joined #git
07:29 barq I pushed force to HEAD, should I have pushed to my branch intead?
07:30 ronskisika joined #git
07:31 adac joined #git
07:31 a_thakur joined #git
07:32 saigonshakes86 joined #git
07:32 johnkevinmbasco joined #git
07:32 nidr0x joined #git
07:33 acetakwas joined #git
07:34 rominronin joined #git
07:34 barq If I clone again it's gone, so seems to be some github caching
07:36 mehola joined #git
07:36 jnavila joined #git
07:37 overlord_tm joined #git
07:38 ashokrajar joined #git
07:39 brk_ joined #git
07:40 thiago never push to HEAD
07:40 thiago that may have adverse consequences
07:41 zeroed joined #git
07:41 zeroed joined #git
07:41 thiago and they may be unfixable without deleting the repository and recreating it.
07:43 heftig thiago: i assume pushing to HEAD really means pushing to the main branch?
07:43 a_thakur joined #git
07:43 thiago heftig: I don't
07:43 thiago and that is the entire problem: I don't know what happens when you push to a symbolic-ref
07:43 davidosomething joined #git
07:43 heftig yeah, my thoughts exactly
07:43 cbreak heftig: "Main" branch? what's that?
07:44 thiago does it push to the branch that the symref points to? Or does it create a non-symref ref in its place?
07:44 heftig what gets checked out if you clone without specifying a branch
07:44 cbreak heftig: there's a bunch of rules for that
07:44 thiago in other words, the branch HEAD points to
07:44 cbreak candidates are "master", or "the branch that has the same hash as HEAD"
07:44 cbreak but the rules are more complex
07:44 Sceorem joined #git
07:44 thiago not 'the same hash as HEAD'
07:44 thiago it's "the branch HEAD points to"
07:45 cbreak thiago: since when does the git protocol expose symrefs?
07:45 thiago only in this one case: telling during clone what branch to check out
07:46 thiago easy to test...
07:46 heftig it creates a branch named "HEAD"
07:47 heftig which is supremely unhelpful
07:47 barq How can I delete my fork?
07:47 heftig with a metal file and a lot of patience
07:47 thiago you're actually right, it is a simple hash comparison
07:47 Alienpruts joined #git
07:47 heftig barq: you mean your branch? or the entire repo?
07:48 snthsnth joined #git
07:48 thiago still, don't push to HEAD
07:48 barq either, the branch could be tried first
07:48 elect joined #git
07:49 jstimm joined #git
07:49 cbreak thiago: I just tested it
07:49 thiago me too
07:49 heftig barq: or are you speaking in github terms here?
07:49 cbreak thiago: git@github.com:cbreak-black/Sandbox.git has default branch "develop"
07:49 cbreak and I get that checked out
07:49 cbreak so somehow it knows it
07:49 cbreak despite all having the same hash
07:50 thiago now rename develop to something lexicographically later than master
07:50 cbreak I made an alpha branch too
07:50 mehola joined #git
07:51 thiago with the same hash?
07:51 cbreak yes
07:51 thiago interesting
07:51 cbreak I thought it was just a simple hash comparison
07:51 thiago well, I did a test too
07:51 cbreak but maybe they changed it in the last few years
07:51 jpX__ joined #git
07:51 thiago I created a repo, committed, then detached HEAD
07:51 thiago after cloning, it checked out "master" pointing to that commit
07:51 cbreak thiago: ls-remote git@github.com:cbreak-black/Sandbox.git shows remotes/origin/HEAD -> origin/develop so it seems to send symrefs over the protocol nowadays
07:52 thiago ls-remote doesn't show that
07:52 cbreak right...
07:52 cbreak hmm...
07:53 barq heftig: I am talking about github
07:53 heftig barq: you need to use the web interface for that
07:53 heftig try #github if you have problems
07:53 thiago ls-remote has a --symref argument, which would indicate that there's a way to deal with symrefs in remote repos
07:54 heftig anyway, "push origin HEAD" just resolves HEAD if it's a symref, then pushes the target if that's pushable. otherwise, it fails.
07:54 heftig "push origin HEAD:HEAD" creates a branch refs/heads/HEAD
07:54 nopf joined #git
07:54 InfoTest1 joined #git
07:55 jpX__ joined #git
07:55 JeroenT joined #git
07:56 Andrew_K joined #git
07:56 thiago cbreak: reading between the lines of the manpage, it looks like HEAD is treated specially
07:56 thiago no other symrefs are supported
07:57 cbreak when I read about it a few years ago, I thought it would use something like git name-rev
07:57 GavinMagnus joined #git
07:57 cbreak maybe they changed it, or they never did use name-rev and I misread
07:59 jknetl joined #git
08:02 thiago well, like you said, there are a bunch of complex rules
08:05 pks joined #git
08:06 Macaveli joined #git
08:07 babilen joined #git
08:08 jstimm joined #git
08:10 aax joined #git
08:10 danslo joined #git
08:11 cyphase joined #git
08:11 govg joined #git
08:12 macivy joined #git
08:13 TomyWork joined #git
08:14 mindriot101 joined #git
08:17 fees joined #git
08:18 BSaboia joined #git
08:18 tjone270 joined #git
08:18 JeroenT joined #git
08:24 achlys joined #git
08:25 JeroenT joined #git
08:25 macivy I applied 2 commits to master instead of the maintenance branch. How can I make it right?
08:26 tobiasvl macivy: you haven't pushed?
08:26 macivy no, not yet
08:26 tobiasvl macivy: good. is master and maintenance otherwise identical?
08:26 macivy yes
08:27 tobiasvl OK, so they are completely identical, except that maintenance has two extra commits at the tip
08:27 macivy yes
08:27 rivarun joined #git
08:28 tobiasvl on master, do this: git checkout -f maintenance; git checkout master; git reset --hard HEAD~2
08:28 tobiasvl this will lose uncommited changes though
08:28 tobiasvl so be aware
08:28 macivy means what? "uncommited changes"
08:28 tobiasvl if you have any uncommitted changes in your working directory
08:29 macivy that I don't have, but I have another issue which may be related
08:29 tobiasvl OK, shoot
08:29 macivy I have 2 commits to a personal branch that I have to do patch with maint branch
08:30 tobiasvl man git cherry-pick
08:30 gitinfo the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
08:30 tobiasvl you can use cherry-pick to move the commits from master to maintenance too if you want
08:31 macivy in otherwords, cherry pick allows me to move any branch to branch?
08:31 PHPanos joined #git
08:31 tobiasvl move commits from any branch to another branch, yes
08:31 tobiasvl (although the SHA will change
08:31 macivy that's okay
08:32 macivy but why did I start reading about squash instead of cherry pick?
08:32 macivy something in the manual sent me there
08:33 apotry joined #git
08:35 hariel joined #git
08:37 mattcen joined #git
08:37 acetakwas joined #git
08:37 achlys joined #git
08:38 a_thakur joined #git
08:38 a3Dman joined #git
08:39 easonlin_ joined #git
08:43 xall joined #git
08:43 brillenfux joined #git
08:47 adac joined #git
08:48 GavinMagnus left #git
08:48 delacosta456 joined #git
08:50 blackwind_123 joined #git
08:50 rominronin joined #git
08:51 a3Dman joined #git
08:54 ahmedelgabri joined #git
08:56 mehola joined #git
08:57 hanx joined #git
09:01 JeroenT joined #git
09:01 bongjovi joined #git
09:03 encod3 joined #git
09:03 thierryp joined #git
09:04 garethdaine joined #git
09:04 meauses joined #git
09:05 morenoh149 joined #git
09:06 PCatinean joined #git
09:09 xall_ joined #git
09:10 ismithers joined #git
09:10 mikecmpbll joined #git
09:12 jaguarmagenta joined #git
09:13 a_thakur joined #git
09:15 mehola joined #git
09:22 JeroenT joined #git
09:23 garethdaine joined #git
09:25 marcogmonteiro joined #git
09:26 claudiu04 joined #git
09:29 nettoweb joined #git
09:30 g_zen joined #git
09:30 derk0pf joined #git
09:31 Snugglebash joined #git
09:31 ferr joined #git
09:32 trebor_dki joined #git
09:32 rorro joined #git
09:32 Karazhan joined #git
09:32 trebor_dki hello. i am new to git and i am confused (i read the docs, but did not help here)
09:33 djb-irc joined #git
09:35 jstimm joined #git
09:35 trebor_dki i cloned a repo, builded the project and now want to "update": git pull --rebase    but git says that i am currently not on a branch, why? doing only git pull did not give me the newest version ...
09:36 easonlin_ joined #git
09:36 okdamn joined #git
09:37 done joined #git
09:37 okdamn Hey how do i move a bitbucket private repo to github? i followed this http://commandliners.com/2015/02/moving-a-repository-from-bitbucket-to-github/ but it only moves master i need all branches to be moved to github ....
09:37 Neon joined #git
09:38 freimatz joined #git
09:38 selckin !mirror
09:39 subhojit777 joined #git
09:39 selckin !migrate
09:39 gitinfo https://help.github.com/articles/importing-a-git-repository-using-the-command-line
09:39 Neon If I do git rebase foo --onto master while branch bar is checked out, foo won't be modified in any way, will it? Like commits being added or the like.
09:40 Atm0spher1c joined #git
09:41 okdamn selckin:  does that imports also all branches? what about issues, will import that too, do you know?
09:41 okdamn i would love to manually replicate issues :D
09:41 tobiasvl trebor_dki: !detached
09:41 gitinfo trebor_dki: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
09:42 chll_ joined #git
09:43 djb-irc joined #git
09:43 achlys joined #git
09:44 austin987 joined #git
09:44 selckin okdamn: issues are not in git
09:44 okdamn right sorry :)
09:44 Neon Or when I look at git log --graph --oneline --decorate, will the leftmost path always be the one checked out?
09:45 Neon Or passed to git log, if any.
09:47 Sceorem_ joined #git
09:48 leehambley joined #git
09:48 djb-irc joined #git
09:48 achlys joined #git
09:49 trebor_dki tobiasvl:  danke.
09:49 okdamn do you have any advice on how to import bitbucket issues into github ?
09:49 JeroenT joined #git
09:51 cdg joined #git
09:51 govg joined #git
09:52 rnsanchez joined #git
09:52 ocbtec joined #git
09:53 qt-x joined #git
09:54 cdg joined #git
09:54 JeroenT joined #git
09:54 mozzarella joined #git
09:55 JeroenT joined #git
09:55 ngperfex joined #git
09:55 okdamn i do it manually meh :D
09:55 okdamn thanks for the help
09:59 cyphase joined #git
09:59 GavinMagnus joined #git
10:00 bongjovi joined #git
10:00 mischat joined #git
10:05 Serpent7776 joined #git
10:06 Macaveli joined #git
10:08 intellix joined #git
10:08 djb-irc joined #git
10:10 ahmed_elgabri joined #git
10:12 clmsy joined #git
10:13 slick joined #git
10:13 overlord_tm joined #git
10:14 blackwind_123 joined #git
10:17 hanx joined #git
10:17 dogmatic69 joined #git
10:18 ws2k3 joined #git
10:18 ws2k3 joined #git
10:19 Anupkumar joined #git
10:19 ws2k3 joined #git
10:19 ws2k3 joined #git
10:20 ws2k3 joined #git
10:21 jstimm joined #git
10:24 a_thakur joined #git
10:25 mablae joined #git
10:26 mischat joined #git
10:30 JeroenT joined #git
10:31 DieguezZ joined #git
10:32 xall_ joined #git
10:32 mkoskar joined #git
10:35 King_Hual joined #git
10:35 King_Hual joined #git
10:36 ToBeCloud joined #git
10:37 ToBeCloud joined #git
10:38 thebope joined #git
10:38 shubhnik joined #git
10:38 shubhnik_ joined #git
10:38 ToBeCloud joined #git
10:39 achadwick joined #git
10:39 subhojit777 joined #git
10:39 ToBeCloud joined #git
10:41 ToBeCloud joined #git
10:41 xall joined #git
10:42 FeersumEndjinn joined #git
10:42 ToBeCloud joined #git
10:44 ToBeCloud joined #git
10:45 elsevero joined #git
10:46 jstimm joined #git
10:46 CheckDavid joined #git
10:47 yupvr joined #git
10:49 LiohAu joined #git
10:49 LiohAu hi guys
10:50 LiohAu I have an issue with cherry-picking (probably I'm not understand its behavior correctly)
10:51 blackwind_123 joined #git
10:52 LiohAu I have 2 branches : 1.0 and 2.0. The 2.0 has been created from 1.0 and new commits have been added expect on a specific folder. Now 1.0 has new commits in that same folder that I would like to apply on 2.0.
10:52 LiohAu I used git log to get the ids, but now when I use cherry pick on each commit, some of them make conflicts, why ?
10:54 shubhnik joined #git
10:54 morenoh149 joined #git
10:55 DieguezZ joined #git
10:59 wrouesnel1 joined #git
11:01 BadSnappa joined #git
11:01 raspado joined #git
11:01 felowe joined #git
11:03 nikivi joined #git
11:03 johnkevinmbasco joined #git
11:03 GavinMagnus left #git
11:04 mischat joined #git
11:04 Siegfried joined #git
11:05 romerocesar joined #git
11:06 JeroenT joined #git
11:06 qsx Hello71: er, okay, this counts as a „have you lost your mind“ case.
11:07 meauses joined #git
11:08 pbrewczynski joined #git
11:10 manuel_ joined #git
11:11 PCatinean joined #git
11:18 hariel joined #git
11:20 kesslerfrost joined #git
11:21 Rickmasta joined #git
11:21 yupvr joined #git
11:21 jstimm joined #git
11:21 p1ngarn joined #git
11:23 shubhnik joined #git
11:24 a_thakur joined #git
11:25 Lorcatar joined #git
11:25 garethdaine joined #git
11:25 Neon LiohAu: Well, it shows you the kind of conflicts, doesn't it? Wouldn't that answer your question?
11:26 LiohAu I had one because of a rename, this one is, from what I read, normal
11:26 dsdeiz joined #git
11:26 LiohAu but the other one, I did not understand it, it was saying the file were different, and a -X theirs solved the issue
11:28 weylin joined #git
11:29 blackwind_123 joined #git
11:30 sunri5e joined #git
11:30 p1k joined #git
11:34 JeroenT joined #git
11:35 hhee joined #git
11:36 Endarked joined #git
11:36 los1 joined #git
11:38 blackwind_123 joined #git
11:38 irco joined #git
11:42 earational joined #git
11:43 a_thakur joined #git
11:44 blackwind_123 joined #git
11:45 mischat joined #git
11:47 weylin joined #git
11:51 robattila256 joined #git
11:53 yupvr joined #git
11:54 ShapeShifter499 joined #git
11:55 johnkevi_ joined #git
11:56 GavinMagnus joined #git
11:56 noecc joined #git
11:59 a_thakur joined #git
12:01 mischat_ joined #git
12:05 mikecmpb_ joined #git
12:05 los1 joined #git
12:06 jaguarmagenta joined #git
12:07 lss8 joined #git
12:07 leehambley joined #git
12:08 ieee joined #git
12:08 rockfruit joined #git
12:11 rockfruit While I was playing I realised I don't have a dotfiles repo.  if I have to do all that again again I'll puke.  so I went to ~ and hit 'mkdir dotfiles; git init --separate-dir=dotfiles'.  Immediately in my ~ I see a prompt like '~ (master #) $'.  So, now there is no .git, how does git know which database applies to this working directory?
12:11 robattila256 joined #git
12:11 mizu_no_oto joined #git
12:11 nilg joined #git
12:12 rockfruit I once hit 'git init' in my home folder, quickly ended that experiment.  So I momentarily thought I could use separate git repos to control strata of content which I do want to revision, and let them have their own default remotes etc.
12:13 johnkevinmbasco joined #git
12:13 xall joined #git
12:13 phanimahesh rockfruit: try setting up a dotfiles repo at ~/dotfiles and using stow
12:15 Frede__ joined #git
12:15 ygeLN joined #git
12:15 moestevens joined #git
12:16 Nugget joined #git
12:16 SirCmpwn joined #git
12:16 derk0pf joined #git
12:17 Junior joined #git
12:17 saml joined #git
12:17 brandonw joined #git
12:18 rockfruit nice! thanks
12:18 ProbabilityMoon joined #git
12:19 oskarkv joined #git
12:19 rockfruit reminds me of nixos on a tiny tinier scale
12:19 Steelpan joined #git
12:20 grawity in general, the way Git finds the 'database' is by looking at .git (which might be either the database directory itself, or a gitfile containing the database's path)
12:20 grawity that's probably not very good in $HOME, so I'm guessing tools like stow explicitly specify GIT_DIR= or --git-dir= every time
12:24 Mement joined #git
12:24 Mement Is it possible to have a git pre-push hook receive the status of a Jenkins job?
12:26 osse Mement: not receive, literally. But the hook can do whatever it wants, such as discover the status
12:27 rockfruit now I see the little toffee.  I ignored the content of the 'cd .git' message like mentally hitting cancel on a popup.  I guess a script could create and delete that file around a git command
12:28 mizu_no_oto joined #git
12:28 finalbeta joined #git
12:29 Mement osse, Interesting. Thanks
12:31 jstimm joined #git
12:32 nilg joined #git
12:34 dzjustinli2 joined #git
12:34 ArchNoob joined #git
12:34 delacosta456 left #git
12:39 jknetl_ joined #git
12:41 fmcgeough joined #git
12:41 phanimahesh grawity: stow doesn't care or understand git. It just takes a directory, and creates symlinks in its parent directory. The source and target dirs can be configured. Essentially if your dotfiles has same structure as files would under home, that creates symlinks to all configs
12:42 ashokrajar joined #git
12:42 phanimahesh and you can stow from multiple locations to same target. Or do prettymuch anything with the target. stow only touches things it "owns" (symlinks pointing into the source stow was called from)
12:43 finalbeta joined #git
12:43 morenoh149 joined #git
12:44 phanimahesh so I have a dotfiles in git on github, a dotfiles.private that's gpg-crypted, in git, and backed up to a private drive, and a dotinstalls (no git, just shared drive) containing all random home dir installs and caches that I'd like to preserve between environments.
12:46 sdothum joined #git
12:46 phanimahesh And nice wrapper install/uninstall scripts around stow so that the implicit assumption of stowing to parent dir won't mess me up if I move my dotstuff elsewhere.
12:47 eizua joined #git
12:50 ashokrajar joined #git
12:50 rockfruit are the wrappers anywhere I can crib from?
12:52 trebor_dki joined #git
12:54 finalbeta joined #git
12:58 jstimm joined #git
13:00 ashokrajar joined #git
13:01 johnmilton joined #git
13:04 synthroid joined #git
13:05 bongjovi joined #git
13:05 ayogi joined #git
13:07 iuimr joined #git
13:08 archytek joined #git
13:10 jeffreylevesque joined #git
13:12 CubiK joined #git
13:13 afuentes joined #git
13:13 mischat joined #git
13:13 los1 joined #git
13:14 Darcidride joined #git
13:15 los2 joined #git
13:15 trebor_dki joined #git
13:16 cyphase joined #git
13:16 los2 joined #git
13:19 Darcidride joined #git
13:20 earational joined #git
13:21 Siegfried joined #git
13:21 tvw joined #git
13:22 Rickmasta joined #git
13:22 NeverDie joined #git
13:22 funfunctor left #git
13:24 lindenle joined #git
13:24 los1 joined #git
13:24 anonymuse joined #git
13:25 alyptik joined #git
13:27 exxi joined #git
13:28 paladinn joined #git
13:29 los1 joined #git
13:31 cyphase joined #git
13:32 dviola joined #git
13:33 mindriot101 joined #git
13:36 Gamecubic joined #git
13:36 a3Dman joined #git
13:36 NeverDie joined #git
13:37 Zumochi joined #git
13:37 Zumochi joined #git
13:37 blackwind_123 joined #git
13:39 lvns joined #git
13:41 Nilesh_ joined #git
13:42 Jameser joined #git
13:42 Ntemis joined #git
13:42 Ntemis hello
13:42 d0nn1e joined #git
13:42 Ntemis i come here for help about creating a sigle patch from a series of commits
13:43 Ntemis commits are inline from a..b one following the other and i want the commits in one patch so i can tranfer them to a repo that can apply kernel patches on the fly
13:44 Ntemis any help
13:44 Ntemis are more or less 30 commits i need squashed into one patch
13:44 selckin git diff a..b > ab.patch ?
13:45 Ntemis thank you
13:45 Ntemis let me try this
13:45 leeN joined #git
13:45 Ntemis two .. or three ... ?
13:45 selckin i always forget the difference between those
13:45 Ntemis :)
13:45 Ntemis ok
13:48 Learath2 joined #git
13:48 robattila256 joined #git
13:48 meauses joined #git
13:50 Ntemis worked
13:50 Ntemis thanks
13:52 Ntemis hmm
13:52 Ntemis nope
13:53 ShekharReddy joined #git
13:53 lvns joined #git
13:54 raspado joined #git
13:55 JeroenT joined #git
13:55 Ntemis didnt work
13:55 Ntemis first commit is not picked up
13:55 Ntemis but starts from there until the end so 1 is left behind
13:56 Ntemis so i have to diff from the previous one i guess
13:56 fees joined #git
13:56 Ntemis makes sense
13:56 Ntemis ?
13:58 sbulage joined #git
13:58 weltall joined #git
13:58 nickthetait joined #git
13:59 anonymuse joined #git
13:59 davimore_ joined #git
13:59 jstein__ joined #git
14:00 JeroenT joined #git
14:01 Mir4g3 joined #git
14:02 jimi_ joined #git
14:04 cdg joined #git
14:05 thesha joined #git
14:06 as_g5pw joined #git
14:07 lvns joined #git
14:08 JamesBaxter joined #git
14:08 brokensyntax joined #git
14:08 maret joined #git
14:09 a_thakur joined #git
14:13 zivester joined #git
14:13 Atm0spher1c joined #git
14:14 phanimahesh rockfruit: Sorry, missed the message. Yep. https://github.com/phanimahesh/dotfiles/blob/master/install
14:14 jstimm joined #git
14:14 aranea joined #git
14:15 idr0p joined #git
14:15 phanimahesh It uses zsh globbing syntax, since I use it primarily, but you can replace line 2 with a bash/sh variant ( either list all subfolders or use a glob expresion to iterate over folders you want to stow)
14:15 rockfruit <- zsh.  thanks!
14:16 osse in (bash):  for i on */
14:16 osse in (bash):  for i in */
14:17 bsanford joined #git
14:19 aranea Hi. I've got a git repo full of TeX documents; before today, it has only tracked the .tex files itself, but now I've decided I'd like to track the PDFs, too (for archival purposes; I frequently change the underlying TeX template, so old .tex files might no longer compile). I've decided to track them on a separate branch so that they don't create any merge conflicts. However, that means I now have to check out
14:19 aranea the 'pdf' branch whenever I want to access one of the files. Does anyone have a better idea for the repository layout?
14:19 lvns joined #git
14:22 b3kN joined #git
14:22 jstimm joined #git
14:23 trebor_dki joined #git
14:24 lvns joined #git
14:25 mischat joined #git
14:27 derk0pf joined #git
14:29 GavinMagnus left #git
14:30 t0by joined #git
14:30 cdown joined #git
14:30 icedwater aranea: maybe build the PDFs in their own build/ or pdf/ directory, so they can be on the same branch but not in the same folder?
14:31 rorro joined #git
14:31 icedwater It's been a while since I had to work with PDFs, but I remember writing a Makefile, if you have one of those, it should be easy to automatically shift them elsewhere once the compile is done.
14:31 mindfart joined #git
14:31 maret joined #git
14:32 Dougie187 joined #git
14:32 morenoh149 joined #git
14:32 aranea icedwater: That'd be easy to achieve in my workflow. But it wouldn't help preventing merge conflicts, would it?
14:32 todd_dsm joined #git
14:34 leftriver46 joined #git
14:34 fees joined #git
14:34 icedwater aranea: I suppose.
14:34 cdown joined #git
14:36 maret joined #git
14:36 aranea Meh, I guess I'll just add the PDFs to the master branch and live with the increased number of conflicts.
14:36 AlexP11223 joined #git
14:36 cdown_ joined #git
14:37 Gsham joined #git
14:37 Starky joined #git
14:38 icedwater l
14:38 dagerik joined #git
14:38 anonymuse joined #git
14:38 icedwater Oops. I don't think there's too much of a better way, but I hope you get a better answer later on, aranea.
14:39 aranea_ joined #git
14:39 dagerik I just downloaded a folder via ftp. Im gettings changes that seem to remove and then add the identical line. What is this
14:39 aranea dagerik: White space changes, I guess?
14:40 Dougie187 Or line endings
14:40 snowkidind joined #git
14:40 dagerik aranea: https://bpaste.net/show/8be9d2982bde
14:41 aranea Dougie187: Well yeah, that's included in my definition of "whitespace" :)
14:41 cdown joined #git
14:42 AlexP11223 hm. When I do git submodule add https://github.com/..../....git mypath/module will it always stay (when git clone + git submodule update) at the latest commit that existen during submodule add?
14:42 AlexP11223 I have read somewhere about it, but don't see commit hash .gitmodules
14:42 AlexP11223 existed*
14:44 aranea dagerik: Yes, those are changed linebreaks. The old file as a LF, the new one a CRLF.
14:44 Khisanth joined #git
14:45 Dougie187 AlexP11223: submodules only track a specific commit, until you commit a newer one.
14:45 Dougie187 so `git submodule update` will always checkout the currently committed submodule commit
14:45 trebor_dki joined #git
14:46 AlexP11223 how does it know? where does it store the commit?
14:46 mikecmpb_ joined #git
14:47 Dougie187 http://stackoverflow.com/questions/5033441/where-does-git-store-the-sha1-of-the-commit-for-a-submodule
14:47 icedwater aranea: would the merge conflicts come about from vastly differing versions of x.pdf in your 'pdf' branch? I am testing on my side and minor differences in the PDF file seem to just cause a rewrite.
14:49 ExoUNX joined #git
14:49 aranea icedwater: I haven't actually tested yet how many merge conflicts would occur. I just assumed 'uh-oh, binary files, that might be a problem".
14:50 icedwater I've never really committed substantial binary files, wouldn't look good as I chide people for doing so :p I suspect there will not be merge conflicts if diff dies on them...
14:50 icedwater l
14:50 icedwater Argh
14:52 cdown joined #git
14:53 earational joined #git
14:54 sangy joined #git
14:54 nicksloan joined #git
14:54 jast by default, binary changes on both sides always result in a conflict
14:54 kbs joined #git
14:55 jast even if it's just a single bit of different on different ends of the file
14:55 mischat joined #git
14:56 anonymuse joined #git
14:57 bsanford joined #git
14:57 thebope joined #git
14:58 icedwater OK, so what I'm doing is, I have a separate tex branch I just made in an old git repo I found with some tex files. I made some changes to x.tex there, added and commited it. I ran pdflatex, then created a new branch to add and commit x.pdf.
14:58 JeroenT joined #git
14:58 Es0teric joined #git
14:58 AaronMT joined #git
14:58 aranea Oh, while I'm here anyway, I've got another question:
14:59 nettoweb joined #git
14:59 selckin don't commit build artifacts
14:59 Lynxium joined #git
14:59 icedwater I checkout the tex branch again, modify x.tex a little, and repeat. The only hitch I see is I have to rename x.pdf to something else before checking out the pdf branch, as it is tracked on the pdf branch. Then I rename it back to x.pdf when I'm on the pdf branch, add and commit that.
15:00 icedwater selckin: check aranea's use case in the scrollback, please.
15:00 rodd left #git
15:01 aranea I'm tracking the config files in my ~ dir with git. There's one config whose contents are largely static, but there's one line (a timestamp) that changes very often. Is there a way to ignore this little change? It's a bit annoying that it always pops up in 'git diff' output.
15:01 icedwater aranea: so, I have different versions of x.pdf on the pdf branch that I can switch back and forth with (git checkout HEAD~1, etc etc) and I get different md5sums for each version, which suggests the files are different but there is no conflict.
15:01 e14 joined #git
15:02 fees joined #git
15:03 icedwater aranea: edge cases are delicious, eh.
15:03 nicksloan joined #git
15:03 matrixa1 joined #git
15:04 JeroenT joined #git
15:04 aranea icedwater: I'm worried about the conflicts that would ensue if I kept the pdfs on my master branch and then merged commits from different sources into that. But nevermind, I've decided to simply live with those.
15:04 selckin if both are committed there can be no conflicts since you just swap to the version in that branch, only uncommitte changes in working dir will conflcit
15:04 m1 joined #git
15:05 icedwater aranea: ah, right. OK. Maybe you should have a separate repo just for the PDFs? Well, that would also not prevent merge conflicts. Oh well.
15:06 krillr joined #git
15:06 selckin icedwater: welcome to my argument :)
15:07 maret_ joined #git
15:07 romerocesar joined #git
15:07 aranea selckin: You're absolutely right. I usually refrain from adding compiled stuff to my repos, too; but in this case it seemed like the lesser evil. :)
15:08 selckin you can also put the date in the filename maybe
15:08 aranea Regarding my second question: I guess I could use a clean filter which removes the timestamp?
15:09 aranea selckin: Yay, that's a good idea.
15:09 al-damiri joined #git
15:10 Endarked joined #git
15:10 r3c0d3x joined #git
15:11 trebor_dki joined #git
15:11 danimal2 joined #git
15:15 devhoag joined #git
15:15 blackjid joined #git
15:15 Puffball joined #git
15:16 Learath2 joined #git
15:18 mischat_ joined #git
15:18 nettoweb joined #git
15:19 anonymuse joined #git
15:19 jknetl joined #git
15:19 mischat__ joined #git
15:20 raspado joined #git
15:20 davimore__ joined #git
15:20 hhee joined #git
15:21 Puffball joined #git
15:22 earational joined #git
15:22 mischat joined #git
15:23 davimore joined #git
15:23 davidosomething joined #git
15:23 Rickmasta joined #git
15:23 mischat_ joined #git
15:23 mindriot101 joined #git
15:23 jstimm joined #git
15:26 JeroenT joined #git
15:27 thebope joined #git
15:28 mischat joined #git
15:29 a_thakur joined #git
15:29 fahadash joined #git
15:30 qws-user-1228 joined #git
15:33 jknetl joined #git
15:33 trebor_dki joined #git
15:35 jfr joined #git
15:40 jfr_ joined #git
15:40 angelsl joined #git
15:40 bcardarella joined #git
15:41 contracode joined #git
15:41 ELLIOTTCABLE joined #git
15:42 shinnya joined #git
15:42 artisanIndia joined #git
15:43 ansimation joined #git
15:43 artisanIndia I have commit 1 commit 2 commit 3 in my branch I have pushed it but did not merge how do I remove commit 2 an keep the remaining and merge ?
15:43 xall joined #git
15:44 morenoh149 joined #git
15:44 ocbtec joined #git
15:44 artisanIndia I have commit 1 commit 2 commit 3 in my branch I have pushed it but did not merge how do I remove commit 2 an keep the remaining and merge ?
15:45 jfr joined #git
15:45 selckin you can use rebase -i to remove commits
15:46 rwb joined #git
15:46 artisanIndia it will take me back to that commit right ?
15:46 madewokherd joined #git
15:46 artisanIndia selckin:
15:47 selckin don't understand what you mean
15:47 anonymuse joined #git
15:48 artisanIndia if I do rabase -i ^sha will I go back to that commit ?
15:48 selckin !interactive_rebase
15:48 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
15:48 Darren_ joined #git
15:50 ieee joined #git
15:50 c1pher joined #git
15:51 StuartMI joined #git
15:51 qws-user-1228 joined #git
15:51 InfoTest joined #git
15:51 StuartMI joined #git
15:52 eivarv joined #git
15:56 trebor_dki joined #git
15:57 virgil joined #git
16:00 jknetl joined #git
16:00 mischat joined #git
16:00 sssilver joined #git
16:03 zivester joined #git
16:03 vuoto joined #git
16:04 mischat joined #git
16:05 mischat_ joined #git
16:05 nicksloan joined #git
16:06 shubhnik joined #git
16:07 trebor_dki joined #git
16:07 HoierM joined #git
16:07 Bass10_ joined #git
16:08 clemf joined #git
16:08 benz00 joined #git
16:09 Noldorin joined #git
16:11 ojdo joined #git
16:11 danslo joined #git
16:13 jknetl joined #git
16:15 e14 joined #git
16:16 xall_ joined #git
16:16 ech0s7 joined #git
16:17 LionsMane joined #git
16:20 lindenle joined #git
16:21 ech0s7 i have checkout my working dir to an old commit and then revert few commits (using revert --no-commit). Can i create a new branch from current situation ?
16:21 lordjancso joined #git
16:22 osse ech0s7: sure git checkout -b newbrach
16:22 danslo ech0s7: I don't see why not
16:22 osse gti commit -m 'didstuff'
16:23 Anupkumar joined #git
16:23 adac joined #git
16:25 re1 joined #git
16:27 PaulCapestany joined #git
16:29 hackel joined #git
16:29 anonymuse joined #git
16:29 blackwind_123 joined #git
16:30 davimore_ joined #git
16:30 jnewt joined #git
16:30 cdown joined #git
16:30 thebope joined #git
16:30 kpease_ joined #git
16:31 VSpike joined #git
16:32 davimore__ joined #git
16:33 VSpike Hi. I made a diagram of my question. https://bpaste.net/show/0282d057986b ... what I have is on the left, what I'd like is on the right.
16:34 blackwind_123 joined #git
16:34 IrishPrime joined #git
16:34 VSpike In this project, you have to make some changes that are specific to your test environment, so I branched and committed them to keep track of them. Then I did some work which resulted in commits I now want to send upstream for a merge request
16:34 lordjancso joined #git
16:34 IrishPrime joined #git
16:34 VSpike I've done this by creating a new branch and then manually cherry picking the changes I want in order
16:34 VSpike But there must be a better way
16:34 Es0teric joined #git
16:35 kadoban VSpike: rebase -i is the usual way to muck about with commit orders and such in-depth
16:35 WoodLeg joined #git
16:35 VSpike It's a badly designed system, where what are essentially config values are scattered around the source rather than being in a single config file that you could gitignore
16:35 VSpike But I can't change that part
16:35 kadoban VSpike: So you'd do something like 'git checkout local && git rebase -i master' and then reorder the lines in the editor that comes up, and it does it for you.
16:35 kadoban Ew
16:36 VSpike kadoban: I had a feeling rebase might come in to it :)
16:37 VSpike kadoban: should I checkout -b new first, and work in that branch? Presumably even if I rebase -i in that branch it won't then affect local?
16:37 kadoban VSpike: Yes, if you want local to be unmodified, you'd do that
16:37 adamm joined #git
16:38 VSpike I do want to change local afterwards, but at least this gives me a change to try it first
16:40 kadoban VSpike: By the way, it's usually best to think of 'rebase -i' as almost a completely separate command from the usual rebase (where you actually want to change where a set of commits is attached/based from). It can change base too, but usually it's not used like that, it's just for reordering/merging/splitting/removing commits from recent history.
16:40 kadoban At least that's how I think of them.
16:41 VSpike Yeah, I've used rebase -i a few times, but cautiously
16:41 ech0s7 joined #git
16:42 p4trix joined #git
16:42 Salander27 joined #git
16:43 kadoban Probably a good way to use it, especially at first. But it's not as scary as it seems really. The big danger zone would be: don't use it when there's merges in the commits you're messing with (usually).
16:43 dreiss joined #git
16:45 exxi joined #git
16:45 alex1a joined #git
16:48 jccn joined #git
16:48 xall joined #git
16:49 Snugglebash joined #git
16:49 ayjay_t joined #git
16:50 meauses joined #git
16:50 synthroid joined #git
16:51 MissionCritical joined #git
16:52 svm_invictvs joined #git
16:53 Starky joined #git
16:57 thiago_ joined #git
16:58 ash_workz joined #git
17:00 thesha joined #git
17:01 blackwind_123 joined #git
17:01 aarobc joined #git
17:03 cjohnson and don't use it on long-lived branches that you have merged in somewhere else
17:03 cjohnson or branches others are working on
17:03 cjohnson I've made that mistake
17:04 osse and look at him now
17:04 osse hideous
17:04 jaguarmagenta joined #git
17:04 t-richards joined #git
17:05 emg joined #git
17:05 sssilver joined #git
17:07 blackwind_123 joined #git
17:07 TylerEastman joined #git
17:08 trebor_dki joined #git
17:08 griffindy joined #git
17:09 venmx joined #git
17:10 meauses joined #git
17:11 matsaman joined #git
17:11 NeverDie joined #git
17:11 VSpike Heh
17:12 VSpike Thanks, all worked out well
17:12 cjohnson osse: <3
17:12 venmx joined #git
17:13 e14 joined #git
17:13 blackwind_123 joined #git
17:14 davimore_ joined #git
17:14 subhojit777 joined #git
17:14 shgysk8zer0 joined #git
17:15 shgysk8zer0 joined #git
17:15 SwiftMatt joined #git
17:17 traxo-xx joined #git
17:20 sea-gull_ joined #git
17:21 adac joined #git
17:22 Electrometro joined #git
17:24 durham joined #git
17:24 romerocesar joined #git
17:24 Rickmasta joined #git
17:24 tyreld joined #git
17:25 jfr joined #git
17:26 timlyo[m] joined #git
17:26 krillr joined #git
17:26 elastix joined #git
17:29 r3c0d3x joined #git
17:30 Starky joined #git
17:30 aard_ joined #git
17:32 jaguarmagenta joined #git
17:32 russ_za_ left #git
17:33 blackjid joined #git
17:33 devhoag joined #git
17:34 austin987 joined #git
17:34 subhojit_ joined #git
17:35 vuoto joined #git
17:36 trebor_dki joined #git
17:36 TylerEastman joined #git
17:37 blackwind_123 joined #git
17:38 subhojit__ joined #git
17:39 zeroed joined #git
17:39 zeroed joined #git
17:40 joki- joined #git
17:43 thebope joined #git
17:44 blackwind_123 joined #git
17:46 sangy joined #git
17:48 WoodLeg joined #git
17:49 rominronin joined #git
17:50 rominronin joined #git
17:52 rorro joined #git
17:52 ochorocho__ joined #git
17:54 blackwind_123 joined #git
17:55 durham joined #git
17:56 Puffball joined #git
17:57 Peetz0r joined #git
17:57 Faylite joined #git
17:58 subhojit_ joined #git
17:59 mindriot101 joined #git
18:02 thierryp joined #git
18:03 trebor_dki joined #git
18:06 Vinnie_win Why is it, after I do a "git subtree add", that some of the files in the subtree are now marked modified in the working set?
18:06 ech0s7 joined #git
18:07 bongjovi joined #git
18:07 meauses joined #git
18:08 blackwind_123 joined #git
18:10 TylerEastman joined #git
18:11 DrSlony joined #git
18:11 DrSlony Hello. I made changes to one file which fix two bugs. Is it possible to commit each hunk separately?
18:12 ilmari DrSlony: git add -p
18:12 Knirch yes, git add -p will let you stage per hunk, just y/n/q will get you by there
18:12 dreiss joined #git
18:14 alhariel joined #git
18:15 ochorocho__ joined #git
18:16 xall joined #git
18:19 thebope joined #git
18:19 Starky joined #git
18:19 kriskropd joined #git
18:19 kriskropd joined #git
18:19 rorro joined #git
18:20 Caelum how do I get commit info on a file that is now gone?
18:20 grawity git log -- foo
18:20 Caelum wonderful, thank you
18:20 anonymuse joined #git
18:23 CubiK joined #git
18:23 trebor_dki joined #git
18:23 marc_v92 joined #git
18:23 hariel joined #git
18:25 thebloggu joined #git
18:25 Learath2 joined #git
18:25 xaa joined #git
18:26 cdown joined #git
18:26 DrSlony great, thanks ilmari and Knirch!
18:27 jimi_ joined #git
18:27 grawity https://i.imgur.com/DrpfUaa.png – does the whole gitlab site run on only a single server, or what?...
18:28 e14 joined #git
18:30 trebor_dki joined #git
18:30 Random832 grawity: maybe they really don't like having mixed versions of their software accessing their database
18:32 kriskropd joined #git
18:33 ResidentBiscuit joined #git
18:34 alhariel joined #git
18:35 jstimm joined #git
18:35 Es0teric joined #git
18:35 macivy joined #git
18:36 shgysk8zer0 joined #git
18:37 SuperSeriousCat joined #git
18:37 Peetz0r grawity: https://twitter.com/gitlabstatus/status/798949509825003520
18:37 govg joined #git
18:38 f3r70rr35f joined #git
18:38 Milos joined #git
18:38 macivy how can I make a patch file against maint branch but I'm on testing branch now
18:39 _ikke_ git diff maint <file>
18:40 UserOO7 joined #git
18:41 vuoto joined #git
18:43 JanC_ joined #git
18:45 ochorocho__ joined #git
18:46 macivy ty
18:47 DrSlony left #git
18:49 kriskropd joined #git
18:49 TylerEastman joined #git
18:50 rominronin joined #git
18:50 Mobutils joined #git
18:50 trebor_dki joined #git
18:51 kpease_ joined #git
18:51 kyan joined #git
18:52 btree joined #git
18:52 pikajude joined #git
18:53 btree left #git
18:54 ShekharReddy joined #git
18:56 R__ joined #git
18:57 R__ left #git
18:57 Sasazuka joined #git
18:58 manuel_ joined #git
19:00 morenoh149 joined #git
19:00 anbz joined #git
19:00 blackwind_123 joined #git
19:02 kumarsuraj joined #git
19:02 nicksloan joined #git
19:03 cagedwisdom joined #git
19:03 eivarv joined #git
19:05 dsantiago joined #git
19:06 SuperSeriousCat joined #git
19:06 blackwind_123 joined #git
19:07 nidr0x joined #git
19:07 ahmed_elgabri joined #git
19:09 hhee joined #git
19:09 davimore joined #git
19:09 meauses joined #git
19:12 hanetzer joined #git
19:12 GavinMagnus joined #git
19:13 hanetzer well crap. I've gotten myself in a fubar situation. decided to git pull prior to resubmitting changes to gerrit, and now my situation is all messed up.
19:15 snthsnth joined #git
19:15 cbreak isn't gerrit rebase based?
19:18 whomp joined #git
19:18 hanetzer honestly I have no idea. never used it before.
19:20 ashokrajar joined #git
19:20 cbreak hanetzer: you shouldn't git pull, you should git pull --rebase
19:23 hanetzer ah.
19:23 hanetzer well, I think I've figured it out, but I will keep that in mind for future purposes
19:25 sssilver joined #git
19:25 Rickmasta joined #git
19:26 blackwind_123 joined #git
19:27 v-y joined #git
19:29 TylerEastman joined #git
19:29 nicoulaj joined #git
19:31 romerocesar joined #git
19:31 chris123456 joined #git
19:32 sssilver joined #git
19:34 kamyl_ joined #git
19:34 cyphase joined #git
19:34 mindriot101 joined #git
19:36 blackwind_123 joined #git
19:39 meauses joined #git
19:43 anonymuse joined #git
19:44 venmx joined #git
19:44 rwb joined #git
19:47 blackwind_123 joined #git
19:49 artisanIndia I want to remove commit with id 123 from a push which had 15 other commits any help ?
19:49 Infinite_182 joined #git
19:49 artisanIndia can someone help me with this via teamviewer ? i can spare few $
19:49 emg joined #git
19:50 konrados joined #git
19:51 cbreak artisanIndia: just git revert it
19:52 cbreak if you actually want to remove it from history, take a look at git rebase -i
19:53 artisanIndia I want to remove it completely looked at rebase but is out of my league cbreak
19:53 hanetzer left #git
19:53 cbreak there are tutorials for it I am sure
19:53 artisanIndia can you do it via teamviewer cbreak I can pay few $ through paypal
19:54 cbreak git rebase -i somebase, then delete the line of the commit you want to remove, save, close, done. if everything works well :)
19:54 cbreak nope, I don't use that insecure pile of garbage
19:54 durham joined #git
19:55 artisanIndia I just did revrt and now I see a lot of un commited files in git status
19:55 Domhack joined #git
19:55 cbreak revert will not remove history
19:55 anonymus_ joined #git
19:55 cbreak it will create new history
19:55 artisanIndia how to undo this revert now ?
19:55 cbreak depends.
19:55 cbreak assuming you have nothing you want to keep uncommitted, git reset --hard HEAD will do
19:56 cbreak if you have something you want to keep, that will vanish too though
19:56 TylerEastman joined #git
19:56 artisanIndia this is risky
19:56 hackel joined #git
19:56 artisanIndia I have files from whole project un commited in this last revert
19:56 blackwind_123 joined #git
19:57 konrados Remember about making a backup first :)
19:57 zeroed joined #git
19:57 zeroed joined #git
19:58 artisanIndia what to do now :(
19:58 shgysk8zer0 joined #git
19:58 artisanIndia I am stuck
19:59 trebor_dki joined #git
19:59 _ikke_ How did you revert?
19:59 _ikke_ What command did you execute?
19:59 sssilver joined #git
20:00 NeverDie_ joined #git
20:01 SteffanW joined #git
20:01 hussam joined #git
20:02 nicksloan joined #git
20:02 Darren_ joined #git
20:02 durham joined #git
20:03 hussam hi. a twice disconnected git pull over https left me with ./objects/pack/tmp_pack_Co6UAX and ./objects/pack/tmp_pack_zT4fEe
20:03 Es0teric joined #git
20:03 hussam so far I ran git gc and now doing git fsck
20:03 hussam should I delete those files before doing git pull again?
20:03 jstimm joined #git
20:04 blackwind_123 joined #git
20:05 kadoban hussam: I probably wouldn't mess around with manually deleting stuff, unless it's causing some actual issue?
20:05 nicksloan joined #git
20:05 t-mart joined #git
20:06 hussam Ok
20:06 hussam 66% on git fsck now then I will try git pull again
20:07 tilpner g pl .
20:07 tilpner (Ignore this)
20:07 ochorocho__ joined #git
20:07 blackwind_123 joined #git
20:12 UserOO7 joined #git
20:12 nwkj86 joined #git
20:13 blackwind_123 joined #git
20:13 LiohAu joined #git
20:13 saml joined #git
20:13 noecc left #git
20:15 m1m3-50 joined #git
20:15 trebor_dki joined #git
20:17 inflames joined #git
20:17 nicksloan joined #git
20:20 _Patrick_ joined #git
20:20 Topic for #git is now Welcome to #git, the place for git help and contextual clues | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | QOTD: <tilpner> (Ignore this)
20:20 snthsnth joined #git
20:21 anonymuse joined #git
20:21 rominronin joined #git
20:23 Sonderblade joined #git
20:24 Sonderblade joined #git
20:26 jstimm joined #git
20:26 msonntag joined #git
20:26 blackwind_123 joined #git
20:27 railssmith joined #git
20:28 v-y left #git
20:28 benz00 joined #git
20:28 NeverDie joined #git
20:29 Karazhan joined #git
20:30 mutex joined #git
20:31 aidalgol joined #git
20:32 Karazhan joined #git
20:32 hussam third git pull worked. and it autocleaned the old tmp_ files. i was very lucky.
20:33 exxi joined #git
20:34 Siegfried joined #git
20:34 Derperperd joined #git
20:36 mikecmpbll joined #git
20:37 samtheknife joined #git
20:38 GavinMagnus left #git
20:42 Starky joined #git
20:45 Infinite_182 joined #git
20:50 jnewt joined #git
20:50 mindriot101 joined #git
20:50 mhitza joined #git
20:51 sea-gull_ joined #git
20:51 ochorocho__ joined #git
20:51 boombatower joined #git
20:53 mustmodify joined #git
20:54 svara1 joined #git
20:54 nettoweb joined #git
20:54 Jackneill_ joined #git
20:59 anonymuse joined #git
20:59 ochorocho__ joined #git
21:00 Karazhan joined #git
21:00 anonymuse joined #git
21:01 Electrometro joined #git
21:01 cdg joined #git
21:01 moop joined #git
21:02 bluezone joined #git
21:04 tvw joined #git
21:04 devhoag joined #git
21:06 Es0teric joined #git
21:07 ResidentBiscuit joined #git
21:07 done joined #git
21:08 leeN joined #git
21:09 rmbeer joined #git
21:09 jnewt_ joined #git
21:10 dsdeiz joined #git
21:10 dsdeiz joined #git
21:11 rwb joined #git
21:19 LaptopBrain joined #git
21:20 BlessJah I have server with very non-default $PATH setup (it's nixos), git-shell doesn't have access to git-annex-shell
21:21 BlessJah is there way to workaround this issue? config or sth where I could specify where to search for annex?
21:23 cdown joined #git
21:24 bshacklett joined #git
21:24 Karazhan joined #git
21:27 Rickmasta joined #git
21:27 ochorocho__ joined #git
21:27 Seveas well, you could change $PATH to make it work...
21:27 Electrometro joined #git
21:27 BlessJah with git-shell set as user's shell? how?
21:28 Seveas however you set $PATH on nixos...
21:29 bshacklett When I run `git status` I see that my branch is "ahead of 'origin/master' by 3 commits." Is there a command to find out which commits are in my branch, but not in origin/master?
21:29 Seveas bshacklett: git log @{u}..
21:29 mustmodify left #git
21:30 cdown_ joined #git
21:31 bshacklett Seveas: Sorry, I'm not sure I understand. Is that the full command?
21:32 BlessJah Seveas: I'm setting user's shell to git-shell, which doesn't seem to understant .bashrc
21:33 yupvr joined #git
21:33 Seveas bshacklett: it is :)
21:34 fractal_ joined #git
21:34 adac joined #git
21:35 jimi_ joined #git
21:36 ochorocho__ joined #git
21:37 jstimm joined #git
21:37 p4trix joined #git
21:39 Lor_ joined #git
21:41 WaReZ joined #git
21:41 courrier joined #git
21:43 BlessJah does git-shell accept any kind of config or env setup?
21:45 BSAlb joined #git
21:46 LiohAu joined #git
21:48 vdl joined #git
21:49 Sonderblade joined #git
21:50 ochorocho__ joined #git
21:53 rominronin joined #git
21:55 Schrostfutz_ joined #git
21:55 crayon joined #git
21:57 vdl joined #git
21:57 Gsham joined #git
21:58 bshacklett @Seveas: awesome!
21:58 ochorocho__ joined #git
21:58 bshacklett I was having an issue due to PowerShell seeing the @{u} as a broken hashtable
21:58 bshacklett Git bash worked like a champ
21:58 bshacklett Thank you
21:59 phox joined #git
21:59 bshacklett I don't suppose you'd be willing to explain what that command is doing, by chance, would you?
21:59 hashpuppy joined #git
21:59 garethdaine joined #git
22:00 snthsnth joined #git
22:00 Achylles joined #git
22:00 kadoban bshacklett: @{u} is shorthand for HEAD@{upstream}, you can see more in man gitrevisions
22:00 gitinfo bshacklett: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
22:02 mindriot101 joined #git
22:05 phox left #git
22:05 bshacklett @kadoban: Thank you very much
22:06 badcom joined #git
22:07 Learath2 joined #git
22:08 plankton joined #git
22:10 Ramen hi.... if I have a branch with commits a,b,c,d,e
22:10 Ramen and I want to create a new branch with commits a,b,d,e how do i do that?
22:12 anuxivm joined #git
22:13 thebope joined #git
22:14 Seveas git checkout -b new-branch; git rebase -i b; in the editor that pops up, drop the line for c
22:14 ilmari Ramen: git checkout new-branch; git rebase --interactive a # and drop commit c
22:14 Ramen cool thanks guys
22:14 rmbeer left #git
22:15 Cartonick joined #git
22:15 Seveas needs checkout -b, otherwise they're pretty much equivalent (mine doesn't rewrite b)
22:15 ilmari yeah
22:16 ilmari does it rewrite leading picked commits?
22:16 ochorocho__ joined #git
22:16 Seveas yuo
22:17 Seveas yup*
22:18 fractal_ Hi. Could someone help me understand the command: git log ^branchA branchB?
22:18 fractal_ I thought it should list those commits in branchB's history, but not branchA's. However, today I saw it return commits that are reachable from both branch heads.
22:18 fractal_ E.g. for some of the commits it outputs, git branch --contains SHA1 displays both branchA and branchB, which I wasn't expecting.
22:20 m0viefreak joined #git
22:20 Cartonick I have 2 accounts, I pushed to my repo on my 1st account (great), then days later I wanted to make some commits with my second account to that account's repos. I have changed all the global configs, and even verified .gitconfig is all good with the right account. Seemingly no matter what I do... when I git push... it errs saying my other account (the first one i don't want to use for this) doesn't have permissions... But, as stated a
22:20 Cartonick and the other account should not be getting used...
22:20 Cartonick thoughts?
22:20 Seveas fractal_: hmm, I though ^A B means what you say it does, so that puzzles me. Is this in a public repo?
22:21 Seveas Cartonick: .gitconfig is only relevant for creating commits, not for pushing.
22:21 Cartonick right, i changed all the global configs as well
22:21 Cartonick and local
22:21 Seveas same
22:21 Cartonick they are all set to the right account
22:21 Seveas all that matters for pushing is the url
22:21 Cartonick it still pushes as old acct
22:21 Seveas user.email / user.name is only used for creating commits.
22:22 fractal_ Seveas: Unfortunately, no. I did try to create a simple repository to test it, but that works as expected.
22:22 Seveas fractal_: the best I can offer in that case is !lol, maybe that clears things up
22:22 gitinfo fractal_: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
22:24 Cartonick so i am pushing to the right url. with the right account. and it errors saying the other account, to which i am not trying to use can't push to that repo.
22:25 Seveas Cartonick: so you're not using the right account.
22:25 NightMonkey joined #git
22:25 Cartonick lol
22:25 Seveas what's the url you push to?
22:25 Cartonick the url that i push to from my other system just fine
22:25 Cartonick the url is the right one.
22:25 Seveas not helpful
22:25 Seveas if you want to be helped, answer the question.
22:26 Cartonick what we have here is a failure to communicate. lol
22:27 Cartonick i can push to the url just fine from my other systems
22:27 stomplee joined #git
22:27 Cartonick this one system, same url, defaults to my other username
22:27 Cartonick whenever i push
22:27 Cartonick i am assuming it's ssh overriding
22:27 Seveas what we have here is someone who doesn't want to be helped apparently.
22:28 Seveas You get an error about using the wrong username, so I ask you to provide debug info. Without that, I can't possibly help. If you don't want to be helped, fine.
22:28 moestevens joined #git
22:29 BlessJah Seveas: FYI, I gave up looking for git-based solution, I'm experimenting with PATH=${PATH}:/run/current-system/sw/bin/ exec /run/current-system/sw/bin/git-annex-shell "${@}"
22:29 BlessJah finally I guess it will be regular bash as shell and command="" in authorized keys to limit the shell
22:30 Seveas BlessJah: that looks nasty :)
22:30 Snugglebash joined #git
22:30 fractal_ Seveas: OK. I presume that log command should work in cases where the history of those branches interleaves?
22:31 Seveas fractal_: yeah.
22:31 BlessJah I wanted to use /run/current-system/sw/bin/git-annex-shell as user's shell (drop-in replacement for git-shell), however bare binary doesn't get PATH
22:31 WoodLeg joined #git
22:31 baxter joined #git
22:32 kbs joined #git
22:32 Guest27369 joined #git
22:32 BlessJah the script I've created didn't get it as well, so I've added that PATH myself
22:32 Seveas BlessJah: nixos doesn't respect something like /etc/environment?
22:33 BlessJah it doesn't have /etc/environment, the question is if git will respect that
22:34 Seveas git doesn't read that file
22:34 BlessJah I will try
22:34 drmt joined #git
22:37 kbs (haven't gone to the effort of testing this :) but... correct to assume git disallows filenames with NULs in them?
22:37 nedbat kbs: no idea, but why are those useful filenames?
22:37 cagedwisdom joined #git
22:38 moestevens_ joined #git
22:38 fractal_ Seveas: Thank you for clarifying that it should work as I expect. If I can reproduce it in a test/public repo, I'll be back.
22:38 moestevens_ joined #git
22:38 Random832 filenames are null terminated inside trees, so you fundamentally cannot include a null character in a file
22:38 lucz joined #git
22:39 * Random832 wonders what would happen with a tree with a filename with a slash in it
22:39 isysd joined #git
22:39 Seveas kbs: yes.
22:39 Seveas Random832: those are not allowed either
22:40 kbs Seveas: *nod* - thanks
22:40 Random832 yes but in theory you could make one without the tree object being impossible to parse, unlike a null byte
22:40 Seveas and git would reject to operate on such trees
22:40 Seveas check read-cache.c:verify_path
22:47 nedbat kbs: if you don't mind me asking, what lead to that question?
22:50 Dougie187 left #git
22:50 Dougie187 joined #git
22:51 Rickmasta joined #git
22:51 cao__ joined #git
22:54 ochorocho__ joined #git
22:54 venmx joined #git
22:54 UTAN_dev joined #git
22:55 Anja joined #git
22:58 kbs nedbat: ah, just curiosity more than anything else. Was looking at some java code to parse git objects.
22:58 nedbat kbs: ok, cool
22:58 thebope joined #git
22:59 durham joined #git
23:01 ochorocho__ joined #git
23:02 Pulp joined #git
23:04 jimi_ joined #git
23:06 BlessJah Seveas: I give up, authorized_keys:command="" won't catch parameters and user shell has to be file, not command, it will stay like this: #!/bin/sh PATH=sth exec git-annex-shell "${@}"
23:06 enckse joined #git
23:07 ochorocho__ joined #git
23:08 Gsham joined #git
23:10 daithioc joined #git
23:12 Keridos joined #git
23:13 Infinite_182 joined #git
23:15 Samual joined #git
23:17 Jackneill_ joined #git
23:18 storrgie joined #git
23:19 chid joined #git
23:20 ochorocho__ joined #git
23:22 jnewt joined #git
23:23 Kitty- left #git
23:23 sangy joined #git
23:24 rominronin joined #git
23:25 Gsham joined #git
23:29 yupvr joined #git
23:30 Starky joined #git
23:31 pks joined #git
23:32 enckse joined #git
23:32 jnewt_ joined #git
23:34 Jameser joined #git
23:35 Oatmeal joined #git
23:35 YottaByte joined #git
23:36 YottaByte if I pushed something I want to undo, how do I do that? I don't want to lose the changes locally, either
23:36 YottaByte I just want to undo the push basically
23:36 dsantiag_ joined #git
23:36 ^7heo 1. do a branch
23:37 jnewt__ joined #git
23:37 ^7heo 2. hard reset your master to HEAD~
23:37 ^7heo 3. push -f
23:38 osse YottaByte: force push the old value of the ref:   git push --force origin abcd123:master
23:38 ^7heo 4. git rebase branch
23:38 fmcgeough joined #git
23:38 ^7heo or wat osse said
23:38 ^7heo it's simpler, faster, better
23:39 storrgie joined #git
23:40 osse stronger
23:40 osse hareder
23:40 osse shit
23:42 jnewt joined #git
23:42 YottaByte I am currently in a branch. I want to undo a commit in that branch. I don't want to get anything from master, because master is way behind this branch
23:42 YottaByte and hasn't been merged back into
23:42 Gsham joined #git
23:43 osse replace "master" with whatever is the correct name in my example
23:43 ^7heo osse: write it cut it paste it save it load it check it...
23:43 osse and replace abcd123 with the correct sha1 of the commit you want the remote branch to be at
23:46 fatalhalt joined #git
23:46 jnewt_ joined #git
23:47 YottaByte osse what if commits have been made AFTER my commit that I pushed?
23:48 osse YottaByte: local commits or commits by other people that they pushed?
23:48 dsdeiz joined #git
23:48 dsdeiz joined #git
23:49 YottaByte osse commits by other people that they pushed
23:50 Jameser joined #git
23:50 osse YottaByte: then i suggest you forget the whole thing
23:50 osse it's gonna be a clusterfuck
23:50 YottaByte so if I do the git push --force origin abcd123:master do my local changes remain intact?
23:51 YottaByte like I won't lose new files I created or the code I wrote?
23:51 osse second best thing is to use git revert to create new commits that undo the ones you wish you didn't push
23:51 osse yes, but you will screw over everyone else
23:51 osse !rewrite
23:51 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
23:51 ^7heo yeah you never mentionned it was a public repo.
23:51 ^7heo just use git revert
23:51 ^7heo !revert
23:51 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
23:51 Infinite_182 joined #git
23:52 ^7heo !git-revert
23:52 ^7heo stupid gitinfo
23:53 Zamerick joined #git
23:54 whitby joined #git
23:54 rwb joined #git
23:57 patrickr[m] joined #git
23:58 blackwind_123 joined #git
23:59 Gsham joined #git
23:59 Jameser_ joined #git

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