Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-29

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

All times shown according to UTC.

Time Nick Message
00:01 de-facto joined #git
00:01 LeBlaaanc joined #git
00:02 drodger joined #git
00:02 thiago joined #git
00:08 thebope joined #git
00:10 Ryanar joined #git
00:12 kbs joined #git
00:12 darkbit joined #git
00:15 cqi joined #git
00:17 Anja_ joined #git
00:17 maroloccio joined #git
00:20 patarr joined #git
00:21 biotim left #git
00:21 TSS_ joined #git
00:32 patarr joined #git
00:33 MarioBranco joined #git
00:34 dionysus69 joined #git
00:35 Anja_ joined #git
00:35 aw1 joined #git
00:36 shgysk8zer0 joined #git
00:37 cyberz joined #git
00:41 Cabanossi joined #git
00:41 austin987 joined #git
00:44 aeontech joined #git
00:47 puff joined #git
00:47 oxguy3 joined #git
00:48 g0th joined #git
00:50 amdi_ joined #git
00:51 Rodya_ joined #git
00:51 mizu_no_oto joined #git
00:51 lavalamp joined #git
00:54 patarr joined #git
00:59 peepsalot joined #git
01:02 thebope joined #git
01:02 webdev007 joined #git
01:05 bdonnahue joined #git
01:06 bdonnahue hey guys. my committs are taking a long time. I think it is because i was previously committing binaries etc.
01:06 bdonnahue there are over a thousand objects to be counted
01:06 bdonnahue is there anything i can do to fix this?
01:06 cyberz joined #git
01:06 bdonnahue i am committing two .cs files now and its taking about 2 minutes so far
01:07 jameser joined #git
01:08 jimklo_ joined #git
01:09 Noodlewitt joined #git
01:11 MarioBranco joined #git
01:16 s2013 joined #git
01:21 Emperor_Earth joined #git
01:21 mizu_no_oto joined #git
01:21 ronin_work joined #git
01:22 deltab bdonnahue: are you adding the files separately, or as part of the commit command?
01:22 peterbec` joined #git
01:24 Kallis joined #git
01:24 deltab and how large are the files?
01:24 Sasazuka_ joined #git
01:24 gugah joined #git
01:26 Cabanossi joined #git
01:26 deltab which stage takes the time?
01:26 Doginal_ joined #git
01:26 mda1 joined #git
01:29 aw1 joined #git
01:32 fstd_ joined #git
01:33 dreiss joined #git
01:36 durham_ joined #git
01:41 unbalancedparen joined #git
01:46 peeps[lappy] joined #git
01:46 rwp bdonnahue, You didn't say... Is this on MS Windows? MS is known to be slow for working with large numbers of files. How much RAM does your system have? Enough? Too little ram on any system will slow things down.
01:46 sunri5e joined #git
01:49 ilbot3 joined #git
01:49 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.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:49 sunrunner20 joined #git
01:49 patarr joined #git
01:50 mizu_no_oto joined #git
01:56 thebope joined #git
01:56 ShapeShifter499 joined #git
02:01 d^sh joined #git
02:03 orbyt_ joined #git
02:07 neunon joined #git
02:09 Goplat joined #git
02:10 cyberz joined #git
02:10 AstralStorm joined #git
02:14 roelmonnens joined #git
02:16 MarioBranco joined #git
02:16 aeontech joined #git
02:17 MarioBranco joined #git
02:20 neunon joined #git
02:21 lagothrix joined #git
02:23 bdonnahue my system is CentOS and it has enough ram as far as i can tell. 2gb should be enough for a minimal install running X11
02:23 bdonnahue rwp: ^
02:23 peterbec` joined #git
02:24 drodger joined #git
02:26 Cabanossi joined #git
02:26 mizu_no_oto joined #git
02:26 cyberz joined #git
02:26 nuck joined #git
02:27 hexagoxel joined #git
02:28 MarioBranco joined #git
02:29 jimklo joined #git
02:31 andrew710 joined #git
02:35 wloncom joined #git
02:36 ayogi joined #git
02:37 JoshL joined #git
02:41 neunon joined #git
02:42 rwp bdonnahue, CentOS should be fine. 2G is certainly plenty for most git workstation use, but might be marginal when coupled with Firefox/Chromium which are piggy.
02:42 jeffreylevesque joined #git
02:44 bdonnahue i did a git gc --aggressive and it made things better
02:44 a_thakur joined #git
02:46 lavalamp joined #git
02:47 mizu_no_oto joined #git
02:47 chipotle joined #git
02:49 chigang joined #git
02:50 thebope joined #git
02:53 ronin_work joined #git
02:56 chovy joined #git
02:56 chovy anyone know why ~/.gitignore would be ignored?
02:56 Vortex34 joined #git
02:58 fakenerd joined #git
03:01 cyberz joined #git
03:02 cqi joined #git
03:02 deltab chovy: do you have a ~/.git ?
03:02 chachasmooth joined #git
03:03 ankit01ojha joined #git
03:05 aavrug joined #git
03:06 ojdo joined #git
03:09 neunon joined #git
03:10 Cabanossi joined #git
03:10 kbeflo joined #git
03:10 Noodlewitt joined #git
03:11 gugah joined #git
03:12 Doginal_ joined #git
03:14 kbeflo_ joined #git
03:15 theiostream joined #git
03:15 bratchley joined #git
03:15 gsingh93 joined #git
03:17 Gsham joined #git
03:17 Andrew_K|2 joined #git
03:19 qwerty joined #git
03:19 Andrew_K|2 joined #git
03:20 Guest51564 left #git
03:24 peterbec` joined #git
03:28 blunaxela joined #git
03:31 Andrew_K|2 left #git
03:31 safe joined #git
03:32 Andrew_K joined #git
03:32 dreiss joined #git
03:34 raulp joined #git
03:38 onehrxn_ joined #git
03:38 Emperor_Earth_ joined #git
03:39 onehrxn_ joined #git
03:39 dsdeiz joined #git
03:41 pks joined #git
03:44 dsdeiz joined #git
03:44 thebope joined #git
03:46 oskarkv joined #git
03:53 Kaisyu joined #git
03:53 inflames joined #git
03:54 peeps[lappy] joined #git
03:55 Cabanossi joined #git
03:56 onehrxn_ joined #git
03:58 dsdeiz joined #git
03:58 dsdeiz joined #git
03:58 wxg joined #git
03:58 mehola joined #git
03:59 JanC_ joined #git
04:02 roelmonnens joined #git
04:03 dnukem joined #git
04:04 dsdeiz joined #git
04:04 chovy deltab: no. of course not
04:05 gableroux joined #git
04:06 deltab .gitignore is directory-specific, but ~ isn't in a work tree
04:07 deltab did you want to affect all repositories?
04:07 chovy ~/.gitignore is a global ignore file.
04:08 chovy it doesn't work on this new machien for some reason
04:08 chovy works fine on my 2 other laptops
04:08 a_thakur joined #git
04:09 deltab I don't see it mentioned in man gitignore
04:09 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
04:09 deltab $HOME/.config/git/ignore and $GIT_DIR/info/exclude though
04:09 deltab and you can configure any file using the configuration variable core.excludesFile
04:10 deltab maybe you have core.excludesFile = ~/.gitignore
04:10 rchavik joined #git
04:10 chovy that was my problem. differnet username so the path was wrong. thanks!
04:11 deltab looks like $HOME/.config/git/ignore is the preferred thing for that
04:11 Andrew_K|2 joined #git
04:12 s2013 joined #git
04:13 shgysk8zer0 joined #git
04:14 chovy hmm
04:14 chovy is that standard?
04:14 a_thakur joined #git
04:14 chovy or do i still need to add to ~/.gitconfig
04:14 chovy i set this up like 4 years ago. just got a new laptop
04:15 deltab I think if you use $HOME/.config/git/ignore it's automatic
04:16 deltab it's mentioned as a default in the man page
04:17 moei joined #git
04:24 ronin_work joined #git
04:25 peterbec` joined #git
04:26 MutantMahesh joined #git
04:29 matoro joined #git
04:32 _August_ joined #git
04:32 TooLmaN joined #git
04:33 kegster joined #git
04:36 fakenerd joined #git
04:36 thebope joined #git
04:39 mda1 joined #git
04:39 _ikke_ $HOME/.config/git/ignore is a new standard (it uses the XDG_CONFIG dir
04:40 Cabanossi joined #git
04:40 _ikke_ And you don't have to explicitly set it
04:42 leeN joined #git
04:43 aeontech joined #git
04:44 chovy i see
04:44 chovy thnaks
04:45 ayogi joined #git
04:49 xall joined #git
04:51 zerow joined #git
04:52 MarioBranco joined #git
04:53 armyriad joined #git
04:55 fakenerd joined #git
04:56 NeverDie joined #git
04:57 onehrxn_ joined #git
04:57 _August_ joined #git
04:57 onehrxn_ joined #git
05:03 rscata joined #git
05:06 pbrewczynski joined #git
05:06 nkuttler_ joined #git
05:07 solution1 joined #git
05:07 anry_ joined #git
05:07 dec0n joined #git
05:07 markus-k_ joined #git
05:07 CalimeroTeknik_ joined #git
05:07 askb joined #git
05:08 a_thakur joined #git
05:08 pulec joined #git
05:10 a_thakur_ joined #git
05:12 h0m3 joined #git
05:13 Andrew_K joined #git
05:18 patarr joined #git
05:20 sbulage joined #git
05:21 robogoat joined #git
05:22 Wulf joined #git
05:23 hue joined #git
05:23 zerow joined #git
05:24 anbz joined #git
05:24 Brski joined #git
05:25 bket joined #git
05:26 TomyLobo2 joined #git
05:26 Brski_ joined #git
05:27 peterbec` joined #git
05:29 overlord_tm joined #git
05:29 jimklo joined #git
05:31 Raging_Hog joined #git
05:31 kbeflo_ joined #git
05:33 Bigcheese joined #git
05:33 freimatz joined #git
05:34 raspado joined #git
05:37 dreiss joined #git
05:39 noctux` joined #git
05:39 EgS joined #git
05:40 dersand joined #git
05:43 KamiRath joined #git
05:46 acetakwas joined #git
05:50 roelmonnens joined #git
05:52 aboccia joined #git
05:52 Karazhan joined #git
05:54 Cabanossi joined #git
05:55 MasterNayru joined #git
05:55 colona joined #git
05:56 a3Dman joined #git
05:56 a3Dman joined #git
05:57 ronin_work joined #git
05:57 _August_ joined #git
05:58 ThomasLocke joined #git
05:58 elinux joined #git
05:59 jfr joined #git
05:59 GT4066 joined #git
05:59 gableroux joined #git
05:59 Assault joined #git
06:00 Exagone313 joined #git
06:01 MarioBranco joined #git
06:02 qt-x joined #git
06:04 bwn joined #git
06:04 Silmarilion joined #git
06:07 wxg joined #git
06:08 mischat joined #git
06:08 Karazhan joined #git
06:08 _August_ joined #git
06:09 ronin_work joined #git
06:11 amosbird hello
06:11 darkbit joined #git
06:11 amosbird what state am I in when a merge conflict happens
06:12 amosbird https://paste.wentropy.com/JWe1
06:12 amosbird how can I revert that?
06:12 _ikke_ git merge --abort
06:12 amosbird it says no merge progress
06:12 amosbird in
06:16 amosbird ok, git reset --merge does the trick
06:17 visual does it
06:17 visual morning peeps
06:17 freimatz joined #git
06:17 peeps[lappy] morning visual
06:17 MineCoins joined #git
06:17 visual kek
06:18 roelmonnens joined #git
06:19 chigang joined #git
06:19 roelmonnens joined #git
06:19 lb1c joined #git
06:20 roelmonnens joined #git
06:21 visual do you know of any git automation software?
06:21 visual that pulls once every _n_ minutes/hours let's say?
06:22 svm_invictvs joined #git
06:22 Tobbi joined #git
06:24 preaction visual: cron
06:24 visual yeah, i was trying to avoid cron, idk
06:25 visual in favor of a more specialized approach
06:25 f0rks joined #git
06:25 visual i see there's git hooks, but they only apply to client (guy who does the push' machine), and server (where the repo is)
06:25 preaction git doesn't need a way to do this, because cron already does it
06:27 visual hot
06:28 visual thanks for your imput
06:28 peterbec` joined #git
06:28 visual altho git *does* have a way to do this, it's called hooks
06:28 visual they just dont apply to this particular scenario
06:28 preaction you said "once every X hours", which git does not do. hooks have nothing to do with that.
06:28 preaction hooks are event handlers. "every X hours" is not an event that git understands
06:29 visual tru tru tru
06:29 visual so invision this scenario
06:30 bronson joined #git
06:30 overlord_tm joined #git
06:31 visual dev machine has changes -> once every x hours these changes are sent to a backup server -> there's a trigger on that server to push these latest changes to a backup branch
06:31 Sasazuka joined #git
06:31 visual is that a good way to go about this? :I
06:31 preaction why not just put a cron job that fully backs-up the dev machine every X hours?
06:31 preaction backups are a solved problem and do not involve git in any way
06:33 cyberz joined #git
06:33 spb a git repository is just a bunch of files. backing up a bunch of files is, as preaction said, a solved problem and plenty of solutions exist that give far better functionality, reliability and flexibility than whatever you might cobble together
06:33 spb as well as taking less time and effort to set up and maintain
06:36 jast I'd tend to agree. specifically, if someone futzes around with history rewriting and your backups overwrite your backup branch with the newly rewritten history, the old history is gone. regular backups avoid that kind of thing and you don't have to figure out anything fancy
06:37 visual while true you can just set up a cron with rsync, it will not preserve history, will it?
06:37 preaction if you don't want history to die, don't allow force-pushes on the main branches
06:37 visual change history
06:37 visual that's where git comes in
06:37 preaction every clone is a "copy" of history
06:37 visual or am i missing something?
06:37 jast rsync is not really a backup
06:38 preaction and you can backup the .git directory, no problem
06:38 jast well it's *one* backup... but one backup isn't a real backup :)
06:38 govg joined #git
06:38 jast of course there's always rsnapshot or something fancier like borg to be more space-efficient
06:38 visual yeah but archiving a 200mb application every day and saving it each time separately will make you run out of space fairly quickly, wont it
06:38 dermoth joined #git
06:38 preaction rsync has a --hardlinks option
06:39 preaction also, 200mb is nothing...
06:39 jast anyway, if you do use git itself for backing up and you overwrite your backup branch with whatever someone else has screwed up in the main branch, your backup will be just as screwed up, so that's not gonna help you
06:40 visual what do you mean you 'overwrite your backup branch'
06:40 visual you dont force push and that's the end of that issue )
06:41 preaction if you don't force-push, why do you need a "backup" branch?
06:41 visual because of what happened yesterday with a borked merge and needing to restore from local, and re-do some work
06:41 visual not hot
06:42 preaction the commit that you reset to in order to clear the merge was still in the repository
06:42 preaction so, how does a backup branch solve the problem?
06:42 onehrxn_ joined #git
06:43 spb if you're not force pushing then all previous commits are still around, so you can always revert to anything you need to without any 'backup branch'
06:44 onehrxn_ joined #git
06:44 bwn joined #git
06:45 visual yeah but commits from local are usually done when an issue is resolved/a development thing is done
06:45 visual so it could be 1 commint in 2 days
06:45 visual the backup would contain more recent onees
06:45 chardan joined #git
06:45 jast if you don't force push and there's some kind of divergence, your backup branch simply won't be updated anymore, not sure that's so much better
06:46 preaction as soon as you fetch from dev, you have the commits locally
06:47 overlord_tm joined #git
06:49 rokups joined #git
06:49 visual preaction: what does that even mean
06:49 visual what dev
06:49 visual why would you fetch from it
06:50 visual what does that have to do with anything
06:50 zefferno joined #git
06:50 preaction because you need to push to dev, right?
06:50 visual dev branch or machine?
06:50 preaction machine...
06:50 visual no
06:50 visual you need to push *from* dev
06:50 preaction you all do your development on the same development server?
06:51 visual no
06:51 preaction where do you push to then?
06:51 visual to a backup server
06:51 visual wait what are these retarded questions, im blanking out
06:51 MonkOfCity joined #git
06:51 visual whatever man, nevermind, thank you for your time
06:52 chele joined #git
06:53 jast dunno, it seemed like a pretty standard misunderstanding to me
06:53 flaviodesousa joined #git
06:54 Assault I pushed a change a few commits ago which now I realized I do not need. What is the proper way to revert that commit, im guessing git revert?
06:54 preaction if dev is not a server, why are they mentioning "local" as though it is a distinct thing?
06:54 preaction Assault: !revert but probably yes
06:54 gitinfo Assault: 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]?
06:55 ionl joined #git
06:55 ionl left #git
06:56 visual jast: not denying that, and preaction sorry if that came out weird. im sick with a fever so didnt understand what you were asking half the time :^
06:56 visual like who's "they"
06:56 visual aahr nvm
06:56 preaction that's you, i just don't really care to address you anymore
06:57 jagob joined #git
06:57 visual what did you mean by this
06:57 visual one of us is fucked in the head man
06:57 jast sounds like a bit of rest and a bit less trying to set up important infrastructure would probably be healthier... ;)
06:58 Ardethian\work joined #git
06:58 visual right
06:59 zeroed joined #git
06:59 zeroed joined #git
06:59 Tobbi joined #git
06:59 gableroux joined #git
07:00 ionl joined #git
07:00 ionl left #git
07:00 elect joined #git
07:02 _August_ joined #git
07:08 cyberz joined #git
07:09 flaviodesousa joined #git
07:10 King_Hual joined #git
07:10 TomyWork joined #git
07:11 brent__ joined #git
07:12 kbeflo joined #git
07:14 _August_ joined #git
07:15 tvw joined #git
07:16 schleppel joined #git
07:17 no_gravity joined #git
07:17 no_gravity Good Morning
07:17 grayjoc joined #git
07:18 no_gravity Is there something like --color-chars for the diffs? --color-words is still missing the point for example when somebody changed "thisIsInQuotesBecauseItIsMeantLiterally" to 'thisIsInQuotesBecauseItIsMeantLiterally' the whole thing is printed twice. Once in red and once in green.
07:18 nlvkjq joined #git
07:19 jast I don't think so
07:19 patarr joined #git
07:20 no_gravity Strange. One would think such a highly used feature would get some love.
07:20 Endarked joined #git
07:20 MarioBranco joined #git
07:20 no_gravity My own diff that I wrote years ago in like a day or so produces more intelligent output.
07:21 jast no_gravity: actually I was wrong: --color-words=.
07:21 osse no_gravity: make it work with GIT_EXITERNAL_DIFF
07:21 osse GIT_EXTERNAL_DIFF
07:21 osse then everyone wins
07:21 jast and there's no diff algorithm that produces sensible output for all inputs
07:21 no_gravity Oh, --color-words=. looks promising.
07:23 Endarked joined #git
07:27 manuelschneid3r joined #git
07:28 rj1 joined #git
07:28 peterbec` joined #git
07:29 imrg joined #git
07:30 rj1 joined #git
07:31 t-mart joined #git
07:34 Raging_Hog joined #git
07:34 jameser_ joined #git
07:34 no_gravity How do you make git show changes done in merge commits?
07:35 jast depends on which part of the changes you want
07:35 karols146 joined #git
07:36 no_gravity Hmm... -m seems to show the code changes. How would I only see the names of the changed files?
07:36 karols146 /o/
07:36 no_gravity I mean the filenames.
07:36 jast --name-only
07:36 jast or --name-status
07:36 no_gravity Thanks
07:37 sotoz joined #git
07:40 no_gravity And if I want to see the changes done to a specific file in the merge commit?
07:40 Kurvivor joined #git
07:40 Kurvivor hello!
07:41 karols146 o/ Kurvivor
07:41 no_gravity yo Kurvivor
07:41 Kurvivor how do i check if a certain folder in the working tree is under version control?
07:41 Kurvivor during my work i have been moving some directories around
07:41 tobiasvl Kurvivor: as opposed to ignored?
07:41 _ikke_ git ls-index
07:41 imrg joined #git
07:41 Kurvivor but at another checked out copy, i still see some of moved directories at old locations
07:42 ExeciN joined #git
07:42 no_gravity How can I see the changes done to a specific file in a specific commit?
07:42 Kurvivor _ikke_: git: 'ls-index' is not a git command. See 'git --help'.
07:43 _ikke_ sorry, I mean git ls-files
07:43 Kurvivor tobiasvl: as opposed to not being part of the repository, i guess
07:43 tobiasvl Kurvivor: well in that case "git status" would tell you
07:43 tobiasvl but if it doesn't show up there it's either ignored or tracked, so ls-files is probably what you want
07:44 dvaske joined #git
07:44 lukasdboer joined #git
07:44 Kurvivor tobiasvl: well, git ls-files (with grep) has shown me what i wanted to know
07:44 Kurvivor old locations are no longer under version control
07:44 Kurvivor yet they are in the working tree
07:44 dvaske_ joined #git
07:44 Kurvivor guess i will delete them manually
07:45 elect_ joined #git
07:46 _ikke_ Kurvivor: if there are ignored files in the directory, git will not remove those
07:46 Kurvivor but rm -rf will
07:51 no_gravity For some reason I never encountered the need for the -f parameter. Is it a specific distro thing?
07:51 Kurvivor gets rid of confirmation
07:51 nowhere_man joined #git
07:52 dionysus69 joined #git
07:54 no_gravity I know. But I never get the confirmation message.
07:54 no_gravity Guess the default Debian setting is to not ask any question.
07:54 _ikke_ I think newer versions ask for more confirmation
07:55 no_gravity I'm on Debian 8.
07:55 no_gravity Not seen a confirmation message in my life.
07:55 _ikke_ What version do you have?
07:56 no_gravity How do I check?
07:56 kurkale6ka joined #git
07:56 _ikke_ rm --version
07:56 no_gravity rm (GNU coreutils) 8.23
07:56 sagittarian joined #git
07:56 no_gravity Written by good old Stallman.
07:57 tobiasvl you don't have an alias or something?
07:57 _ikke_ I think it also depends on your shell (for me it's zsh that asks for confirmation of you don't add zsh)
07:57 no_gravity tobiasvl: no
07:57 no_gravity _ikke_: Bash here.
07:57 _ikke_ right
07:57 _ikke_ rm -r * in bash just deletes everything
07:57 lukasdboer joined #git
07:57 _ikke_ for me
07:57 _ikke_ but in zsh it asks for confirmation
07:57 kexmex joined #git
07:57 no_gravity I like sharp swords.
07:58 no_gravity Dear universe - give me green tea and sharp swords and witness some serious productivity.
07:59 kadoban _ikke_: Really? For me it complains in bash, when it gets to a non-empty directory anyway. I believe it just refuses, I don't recall it asking anything.
07:59 no_gravity kadoban: Are you root?
07:59 kadoban No, never
07:59 no_gravity Then things might be different.
07:59 nkuttler i run git pull from a script, but that doesn't fetch new tags. any ideas what could cause this? v 2.1.4
08:01 no_gravity Everytime I pull to dev, I think of the term "pull to death" and wonder if it has some meaning.
08:01 nkuttler hm, maybe my teployment script doesn't push tags.. strange anyway
08:02 nkuttler yeah, that seems to be it..
08:03 IRQ` joined #git
08:03 lukasdboer joined #git
08:06 xall joined #git
08:09 mehola joined #git
08:10 cdown joined #git
08:10 mindfart joined #git
08:11 borkr joined #git
08:11 nevodka joined #git
08:11 mikecmpbll joined #git
08:11 a_thakur joined #git
08:11 roelmonn_ joined #git
08:18 theoceaniscool joined #git
08:18 armyriad joined #git
08:18 marcogmonteiro joined #git
08:19 thebope joined #git
08:23 plexigras joined #git
08:23 bongjovi joined #git
08:25 Assault_ joined #git
08:26 masuberu joined #git
08:28 no_gravity left #git
08:29 rivarun joined #git
08:29 Glooomy joined #git
08:29 Assault joined #git
08:29 peterbec` joined #git
08:30 gableroux joined #git
08:31 clmsy joined #git
08:31 jameser joined #git
08:32 acln joined #git
08:32 Assault_ joined #git
08:32 nivag joined #git
08:33 netj joined #git
08:34 Assault__ joined #git
08:39 Assault joined #git
08:41 b100s joined #git
08:41 tvw joined #git
08:43 notebox joined #git
08:43 trulycool joined #git
08:43 fbwnd joined #git
08:44 eb0t joined #git
08:45 peacememories joined #git
08:45 Assault_ joined #git
08:46 eblip joined #git
08:46 mischat joined #git
08:48 cyberz joined #git
08:48 thierryp joined #git
08:52 govg joined #git
08:52 SlashLife^m joined #git
08:54 Assault_ joined #git
08:54 jez joined #git
08:54 jez left #git
08:55 jez9999 joined #git
08:55 jez9999 hi, i'm having a problem with (i think) newlines
08:55 SlashLife^m Agh! No --dry-run on "git merge" :(
08:55 jez9999 so if I rm a particular file and then "git checkout" that file again, git immediately marks it as modified in the staging area
08:55 SlashLife^m Does anyone know whether it is possible to combine --ff-only and --no-ff?
08:55 jez9999 I've had this before and I can't remember how i resolved it
08:56 tobiasvl SlashLife^m: those are mutually exclusive. what do you want to achieve?
08:56 tobiasvl SlashLife^m: git merge --no-commit ?
08:56 kadoban You can use both options, IIRC, just the last one turns off the other one. But that's likely not useful information, even if true.
08:56 osse jez9999: what is the differnce, according to git ?
08:57 osse jez9999: (git diff --staged -- file)
08:57 SlashLife^m tobiasvl: Our process includes merging master into the feature branch at the end, to fix all quirks for merging inside of the feature branch rather than the master. Then the feature branch gets reviewed and merged back into master.
08:58 tobiasvl SlashLife^m: OK, but that doesn't explain what you want to achieve by combining the two mutually exclusive options --ff-only and --no-ff
08:58 tobiasvl and why not rebase feature on master
08:58 Darcidride joined #git
08:58 SlashLife^m Getting there. :)
08:59 jez9999 osse: git diff says the whole file content is deleted and added
08:59 tobiasvl jez9999: line endings then?
08:59 SlashLife^m I need an (empty) commit when merging back to document who reviewed the feature and for additional comments, however I don't want and additional code conflicts happen at that stage.
08:59 osse jez9999: most likely line endings
08:59 SlashLife^m So basically I'd want to enforce a fast forward merge, except I need a commit for documentation purposes.
08:59 osse maybe you have a .gitattributes file or soemthing
09:00 osse short answer: commit the change and forget about it
09:00 tobiasvl SlashLife^m: an empty commit? why? what's wrong with using the merge commit for documenting, you know, the merge?
09:00 SlashLife^m As I understand it, with a fast forward merge I won't get a commit.
09:00 tobiasvl that's right
09:01 tobiasvl but with --no-ff you will
09:01 jez9999 yeah, i thought it was line endings - but why?
09:01 SlashLife^m Yeah. But I want to make sure that this merge *could* be done as a ff.
09:01 jez9999 it only happens for a few files
09:01 kadoban You have the merge commit from merging master into feature though, that's not enough?
09:01 kadoban At least you could if you did --no-ff that way
09:02 tobiasvl SlashLife^m: then use --ff-only --no-commit, perhaps?
09:02 SlashLife^m kadoban: That may be followed by a bunch of commits to straighten out conflicts.
09:02 SlashLife^m tobiasvl: Oh; that might be an alternative to --dry-run, yes. I'll check that out, thanks!
09:02 tobiasvl a bunch of commits? shouldn't the merge commit straighten out the conflicts?
09:03 kadoban SlashLife^m: I'd probably do --ff-only followed by a manual empty commit I guess?
09:03 SlashLife^m Mhh.
09:03 eahmedshendy joined #git
09:03 jez9999 anyone??????
09:03 SlashLife^m Let me think about it for a moment, but I think once done that gets exactly the history I'm after.
09:04 kadoban Or really I'd personally probably just do --no-ff --no-commit and abort if there's conflicts or something. But I dunno.
09:04 kadoban But that's different from what you seem to want ^
09:04 tobiasvl jez9999: do you have a .gitattributes like osse asked?
09:04 SlashLife^m But yeah, those are a few options, thanks. I'll look into it. :)
09:04 jez9999 there is a .gitattributes
09:05 jez9999 it just has "* text=auto"
09:05 MonkOfCity joined #git
09:06 MonkOfCity joined #git
09:07 jez9999 why the hell is git getting confused on this
09:07 jez9999 what has changed about the file?
09:07 jez9999 it should realize that the CRLF newlines are equivalent to LF
09:07 MonkOfCity joined #git
09:08 SlashLife^m Ah, no. The ff + extra commit will pull the last part of the feature branch into the history of the master branch. It was a nice idea, though.
09:09 tobiasvl what's "the last part"
09:09 fbwnd joined #git
09:09 SlashLife^m The part between merging in from master for the last time, fixing all the conflicts, before then merging back.
09:10 Cabanossi joined #git
09:10 kadoban SlashLife^m: I guess you can just do something like ... git merge feature --ff-only --dry-run && git merge feature --no-ff    ? Assuming git merge uses exit codes like that, otherwise manually deciding if it succeeded or not
09:10 SlashLife^m Essentially each commit "on the master branch" (I do understand git branching, but when the time comes we'll build the tools to exclude the commits to feature branches from that history) signifies the merging in of one finalized feature.
09:11 SlashLife^m kadoban: Yeah, that's what I had hoped.
09:11 SlashLife^m Except - there is no --dry-run
09:11 kadoban Oh
09:11 SlashLife^m I'll look into the --ff-only --no-commit then. :)
09:11 kadoban Well, you can script one up I bet. Just  'git merge feature --ff-only' and if it succeeds, undo it using the reflog?
09:11 kadoban Oh, maybe ... if that works.
09:11 tobiasvl what would --dry-run do? git merge --no-commit; git merge --abort?
09:12 kadoban Does --no-commit go with --ff-only ? I suspect that's a no-op ...
09:13 SlashLife^m Question is: Can I find out with --no-commit what the reason for the failure was?
09:13 tobiasvl kadoban: haven't tested, but I'd hoped --ff-only aborted if it wasn't an ff, and if it was --no-commit would abort
09:13 tobiasvl maybe hard to discern between the two aborts though
09:14 SlashLife^m But meeeh, if everything else fails, I could just let the ff commit locally, then roll it back, do a --no-ff and push that.
09:14 tobiasvl unless the exit codes are different, man doesn't say
09:14 kadoban Yeah, the manpage doesn't seem to say anything about exit codes for merge ... which is maybe a bad sign.
09:14 SlashLife^m Yeah, but I'll check that and report back. :)
09:14 SlashLife^m Thanks for the pointers, though.
09:14 tobiasvl --ff-only gives a non-zero exit code, but --no-commit "pretends the merge failed" whatever that means for exit codes
09:15 a_thakur joined #git
09:15 kadoban Ya, it's not quite clear from the manpage to me.
09:15 SlashLife^m Mhh, rolling back a ff probably isn't trivial either. Better to branch off master locally, try to ff the new branch and just delete it afterwards.
09:16 * SlashLife^m sighs.
09:16 SlashLife^m Lots of work to do. \o/
09:16 kadoban SlashLife^m: It's pretty trivial with the reflog
09:16 kadoban But ya, creating another branch would also work.
09:16 tobiasvl rolling back an ff shouldn't be too bad? reset to ORIG_HEAD? I'd think
09:17 SlashLife^m Oh, right. I could use the origin. m(
09:17 SlashLife^m Thanks, that was stupid.
09:17 tobiasvl not the origin, ORIG_HEAD :)
09:18 jez9999 Does anyone have experience with git thinking a file has changed because of newlines??
09:18 kjsaihs joined #git
09:18 jez9999 and how to fix it?
09:18 * SlashLife^m goes and reads up what ORIG_HEAD is.
09:18 MonkOfCity joined #git
09:18 tobiasvl SlashLife^m: after a merge, ORIG_HEAD retains a pointer to the ref that was merged into
09:18 onehrxn_ joined #git
09:18 janat08 joined #git
09:19 tobiasvl so you don't have to rely on the remote-tracking branch (which could be different)
09:19 tobiasvl which is what I guess you meant by "origin"
09:19 SlashLife^m Yeah.
09:19 SlashLife^m Which should not be different, though.
09:19 janat08 I've screwed up git history it appears as git fails to open the repo now, can I just rebase the repo on top of history from bitbucket
09:19 tobiasvl but could be.
09:20 SlashLife^m As a matter of fact, I think I should pull master from origin before attempting to merge in a feature
09:20 kadoban jez9999: There should be a decent amount of info on a google search. Newline handling is messy and confusing in general, I always have to look it up personally.
09:20 Murii joined #git
09:20 chardan joined #git
09:20 tobiasvl janat08: what does git say when you try to open the repo?
09:20 jez9999 i curse Microsoft daily for their incredibly dumb decision to standardize on 2 byte newlines :-(
09:20 patarr joined #git
09:20 jez9999 they should've gone to LF with windows 95
09:20 SlashLife^m jez9999: But notepad.exe does not support \n :(
09:21 jez9999 SlashLife^m: that, i don't mind.  what is a huge problem is WinForms textboxes.
09:21 SlashLife^m I also wonder what kind of idiot would think it was a good idea to translate the font name "Courier New" to "Courier Neu" in the German wordpad.exe of that era.
09:21 jez9999 so the pre- and post- build event scripts in project properties in VS will lose their newlines
09:22 janat08 tobiasvl: I use gui software, it just can't process git file
09:23 kbeflo joined #git
09:23 varo joined #git
09:23 ionl joined #git
09:23 ionl left #git
09:24 pbrewczynski joined #git
09:25 Assault joined #git
09:26 bariscant joined #git
09:27 netj joined #git
09:27 latenite joined #git
09:28 latenite Hi folks, I had this working yesterday. Now I am re-doing it and I can't get the post-receive hook to run. It feels like it just is not executed.
09:28 latenite What could be the cause of this?
09:29 grayjoc joined #git
09:29 tobiasvl latenite: permissions?
09:29 aw1 joined #git
09:29 kbeflo joined #git
09:30 Silmarilion joined #git
09:30 peterbec` joined #git
09:31 latenite tobiasvl, I tested it: https://gist.github.com/anonymous/6292816e2f00cce1fb8bbdd11007f0db
09:31 jez9999 ok this is seriously weird.
09:31 jez9999 i removed "* text=auto" from my .gitattributes file, and git no longer thinks those files are modified.
09:32 jez9999 but why is this?  i still have core.autocrlf=true
09:32 tobiasvl jez9999: is that weird?
09:32 jez9999 so why has the behaviour changed?
09:32 lmatteis joined #git
09:34 sbasso joined #git
09:34 tobiasvl jez9999: they're not the same. core.autocrlf: "Setting this variable to "true" is almost the same as setting the text attribute to "auto" on all files except that text files are not guaranteed to be normalized: files that contain CRLF in the repository will not be touched. Use this setting if you want to have CRLF line endings in your working directory even though the repository does not have normalized
09:34 tobiasvl line endings. This variable can be set to input, in ...
09:34 tobiasvl ... which case no output conversion is performed."
09:34 tobiasvl while text=auto: "When text is set to "auto", the path is marked for automatic end-of-line normalization. If Git decides that the content is text, its line endings are normalized to LF on checkin."
09:35 latenite any ideas regarding my paste?
09:35 latenite :D
09:35 tobiasvl latenite: what am I looking at in the paste? I don't see anything wrong
09:36 raspado joined #git
09:36 latenite tobiasvl, it's a test and info about what is suppoed to run when I push to the repo.
09:37 latenite but it does not run
09:37 latenite the date file not written
09:37 Bennett joined #git
09:37 tobiasvl latenite: OK, isn't it then more useful to make a paste about what happens when it goes wrong, not what happens when it works?
09:37 onehrxn joined #git
09:38 latenite tobiasvl, what am I supposed to paste?
09:38 ToBeCloud joined #git
09:38 latenite What I pasted was a local test to show that the script actually works (localy)
09:38 tobiasvl which is not very useful information to me
09:38 tobiasvl I can verify that the paste looks like it works fine
09:38 tobiasvl so my diagnosis is that everything works
09:39 Cassiopaya joined #git
09:39 latenite remotely, I only see: https://gist.github.com/anonymous/0c565bc40e345aa8967915902f0f479d
09:39 tobiasvl and how does the hook and the written file look like on the remote?
09:40 tobiasvl s/does/do
09:40 NeverDie_ joined #git
09:40 latenite tobiasvl, that is in the paste!
09:41 varo left #git
09:41 latenite what exactly do you mean by "look like"... I pasted their content, and 'ls' output
09:41 tobiasvl the paths are not the same
09:41 NeverDie joined #git
09:42 tobiasvl is the first paste you made a hook in the repo you push to in the second paste?
09:42 latenite tobiasvl, which ones? Sorry ...
09:42 latenite yes
09:43 tobiasvl latenite: the hook is /srv/localfs/raid10-backup/data/user/user/data/version-control/git/script-tools/.git/hooks/post-receive and is owned and executable by user:user. you push to /srv/localfs/raid10-backup/data/user/poeritz-kai/data/version-control/git/bare/script-tools.git
09:43 tobiasvl so the second is a bare repo, while the former is a non-bare? do they both have the same hooks?
09:43 tobiasvl are they executed by "user" or a user in the "user" group?
09:44 latenite tobiasvl, I just changed my name to "user" and missed to do that in the second paste
09:44 tobiasvl aha…
09:44 latenite the receiving repo is bare
09:45 tobiasvl and the receiving bare repo has the same hook as the non-bare?
09:45 latenite it's owned my "me"
09:45 latenite the non-bare (sending end) has no hooks at all
09:45 latenite I only want the receiving repo to have a hook
09:45 gtristan joined #git
09:45 latenite also post-receive is server only, right?
09:46 tobiasvl yes, forget the sending end, it's not relevant for a post-receive hook. there are two repos on the remote, one bare and one non-bare. you showed the hook from the non-bare
09:46 tobiasvl git/script-tools/.git vs git/bare/script-tools.git
09:46 gtristan Hi, what is the return code of `git rev-parse` when an error does not occur, but the passed rev string is unrecognized ?
09:47 gtristan or alternatively, how does one safely check that a given string will be recognized as a rev ?
09:47 latenite tobiasvl, omg, this is so embaressing: https://gist.github.com/anonymous/2bc0a6c8b9f69e29145b87eade71f3e3
09:47 tobiasvl gtristan: it should give an error when it's unrecognized? "fatal: ambiguous argument 'fdsfs': unknown revision or path not in the working tree."
09:47 jast gtristan: normally it exits with code 128. I recommend git-rev-parse --verify -q <rev>, this will exit with either 0 or 1
09:47 latenite tobiasvl, you are so right...
09:47 tobiasvl latenite: haha. there you go
09:48 jast latenite: protip: don't make your repo names/paths so similar ;)
09:48 tobiasvl latenite: now you know why I needed more information than just you running a successful test ;)
09:48 latenite tobiasvl, also, I was wondereing where my 'post-receive' file was gone to :D ... I though the system update had whiped it.
09:49 jast system update of doom!
09:49 latenite tobiasvl, true :D thanks a lot ...
09:49 tobiasvl np
09:50 gtristan jast, so basically, use `--verify -q` and check stderr after, if stderr is empty, then the passed string is not a rev, if there is something in stderr, then an error occurred, basically ?
09:53 afuentes joined #git
09:55 Cabanossi joined #git
09:57 YuGiOhJCJ joined #git
09:57 Anja_ joined #git
09:58 Kurvivor left #git
10:00 sarri joined #git
10:00 sarri joined #git
10:02 sbasso joined #git
10:02 _Vi joined #git
10:03 peacememories joined #git
10:05 _rgn joined #git
10:07 thebope joined #git
10:08 kbeflo joined #git
10:10 kbeflo joined #git
10:11 bytefire joined #git
10:11 astrofog joined #git
10:12 kbeflo joined #git
10:13 bytefire hi, i have a pre-commit hook which checks and removes whitespace from files being committed. however the files get committed without those changes with the changes in unstaged area
10:13 bytefire all i want to do is remove whitespace and then commit them
10:14 ferr1 joined #git
10:14 kbeflo joined #git
10:14 theoceaniscool joined #git
10:15 roelmonnens joined #git
10:16 b100s joined #git
10:16 tobiasvl bytefire: what does the hook look like? it should exit non-zero to abort the commit, not go through with it
10:17 kbeflo joined #git
10:17 NeverDie joined #git
10:17 Gustavo6046 joined #git
10:20 bytefire tobiasvl: it's just one line after the shebang: remove-whitespace.sh
10:20 bytefire do i need to exit(0) or something?
10:20 roelmonn_ joined #git
10:20 tobiasvl bytefire: very well, then show remove-whitespace.sh
10:20 tobiasvl bytefire: you need to exit with anything else than 0
10:20 Bennett left #git
10:20 bytefire tobiasvl: ah i see
10:20 bytefire got it thanks!
10:22 _rgn joined #git
10:25 sotoz joined #git
10:28 no_gravity joined #git
10:28 no_gravity What is the difference between "git add ." and "git add -a"?
10:29 _ikke_ "git add ." also adds untracked files (if they are not ignored)
10:30 marianina8 joined #git
10:30 no_gravity git add -A won't?
10:30 Raging_Hog joined #git
10:30 Glooomy joined #git
10:30 _ikke_ sorry, the small -a threw me off (which is what commit takes). git add -A also stages removed files
10:31 no_gravity Yeah, my typo.
10:31 no_gravity Ok, thanks.
10:31 peterbec` joined #git
10:32 _ikke_ (in the future, git add . might also do that)
10:33 jost joined #git
10:34 PHPanos joined #git
10:34 mischat joined #git
10:36 basiclaser joined #git
10:39 sunri5e joined #git
10:39 bytefire tobiasvl: may be i wasnt clear. so i want to run the pre-commit hook which modifies the files being committed and then show message. after entering the message i want the changes made by my script to be committed
10:40 kbeflo joined #git
10:41 bytefire if the pre-commit script returns non-zero it just doesn't commit. if pre-commit returns zero, it completes the commit but without the changes made by pre-commit script
10:43 kbeflo joined #git
10:43 _ikke_ bytefire: Did you stage the changes
10:43 _ikke_ ?
10:43 _ikke_ exiting with non-zero just prevents comitting
10:44 ExpiredDev joined #git
10:45 bytefire _ikke_: so it's a new file. i stage it. then run git commit
10:45 masuberu joined #git
10:46 _ikke_ If you change the file in the hook, you need to stage that change also
10:46 bytefire pre-commit does modify the file but it doesn't commit those changes.
10:46 bytefire _ikke_: ah isee
10:46 bytefire basically execute git add -A
10:47 bytefire or maybe not. just add the modified files
10:47 kbeflo joined #git
10:48 bytefire is there an easy way to just get those files which were modified during pre-commit hook?
10:48 m1dnight_ joined #git
10:49 _ikke_ git ls-files -m
10:50 _ikke_ well, that will not list what you modified during the pre-commit hook
10:50 _ikke_ it will list all changes
10:51 tobiasvl yes, don't stage everything, that would be horrible
10:51 tobiasvl you need to keep track of what files you modify and only stage those
10:51 bytefire _ikke_: cool, that will do :)
10:51 bytefire tobiasvl: sure
10:51 _ikke_ (problem is when you do partial commits, this would still cause the entire file to be comitted)
10:51 tobiasvl mmmmm
10:51 _ikke_ ie, not staging all contents of a file
10:52 _ikke_ only solution I can think of is checking out a temporary work tree from the index, modified that, and stage that again
10:52 Browser joined #git
10:52 bytefire hmm
10:53 bytefire sounds more than i thought
10:53 m1dnight1 joined #git
10:53 bytefire okay thanks for the help
10:54 steven joined #git
10:55 theoceaniscool joined #git
10:56 sarri joined #git
10:56 sarri joined #git
10:56 raulp joined #git
10:57 dsdeiz joined #git
10:57 bytefire _ikke_: by partial commits you mean choosing specific chunks inside a file to commit?
10:58 jagob joined #git
10:59 a_thakur joined #git
10:59 Silmarilion joined #git
11:00 Tobbi joined #git
11:00 gableroux joined #git
11:00 a_thakur joined #git
11:01 fbwnd joined #git
11:01 _ikke_ correct
11:02 thebope joined #git
11:03 roelmonnens joined #git
11:08 xall_ joined #git
11:08 math-alpha joined #git
11:10 sspssptt joined #git
11:10 sbasso joined #git
11:11 Andrew_K|2 joined #git
11:15 dsdeiz joined #git
11:16 fakenerd joined #git
11:18 GodEater joined #git
11:19 currybullen joined #git
11:21 Andrew_K|2 left #git
11:21 patarr joined #git
11:24 DaveTaboola joined #git
11:25 noecc joined #git
11:26 steven joined #git
11:27 grayjoc joined #git
11:30 Silmarilion joined #git
11:32 peterbec` joined #git
11:33 Tobbi joined #git
11:34 Cassiopaya joined #git
11:34 Darcidride joined #git
11:35 sbulage joined #git
11:36 conmaxo joined #git
11:36 astrofog joined #git
11:37 MineCoins joined #git
11:38 plasticle joined #git
11:41 PHPanos joined #git
11:41 infernix joined #git
11:41 tlaxkit joined #git
11:42 sbasso joined #git
11:42 mkoskar joined #git
11:43 conmaxo left #git
11:43 DaveTaboola joined #git
11:44 brent__ joined #git
11:45 darkbit joined #git
11:50 jast gtristan: no, just check the exit code. ignore the output.
11:50 kexmex joined #git
11:53 chardan joined #git
11:53 Darcidride joined #git
11:54 latenite Hi folks, imagine you have a ton of scripts in a repo. Those scripts are used to extend functionality on all (say twenty) of you clients. How would you build a deployment chain starting from a 'post-receive' hook on the bare repo?
11:54 synthroid joined #git
11:54 netroxen joined #git
11:55 gtristan jast, so rev-parse will return something other than 1, if a different error occurs in quiet mode ?
11:55 gtristan alrighty, anyway I'll experiment
11:55 gtristan thanks for the tips
11:55 immae joined #git
11:56 steven joined #git
11:56 thebope joined #git
11:56 bariscant joined #git
11:58 immae Hey all! Is there any way to know whether a merge between two branches will have conflict, (1) without actually doing it and (2) without touching the index or the worktree? (say you have a dirty workdir in branch "foo" and you want to check whether branch "bar" merges into "master")
11:58 jast no... merge uses the index and worktree to figure out which things can be merged automatically
11:59 matumbo`` joined #git
11:59 jast you can try in a local clone, at the cost of having the worktree contents twice temporarily
12:00 dendazen joined #git
12:00 arunpyasi joined #git
12:01 User458764 joined #git
12:01 immae thanks jast. No way even if I accept to modify the index only? I could live with that, but a worktree is too much...
12:01 thebope joined #git
12:01 jast with the index you can figure out part of the merge but not all of it
12:02 jast merge tries what it calls a "trivial in-index merge", basically to see if the two side never touch the same files. if some files do get modified by both sides, the worktree is used.
12:02 immae I only need to know *wether* it's mergeable, I don't need to know whichfiles are conflicting
12:02 jast when it does use the worktree, you may end up with conflicts, but a worktree merge can work out completely automatically
12:03 immae I see
12:03 Jonno_FTW joined #git
12:03 immae for instance modifications of the same place at different places
12:04 immae of the same file*
12:04 jast yes
12:04 Jonno_FTW hello, I have a branch called master, how do I push my work in that to a remote branch called scalar-types ?
12:04 jast Jonno_FTW: git push origin master:scalar-types
12:04 jast in older versions you might get an error if the target branch doesn't exist, then try: git push origin master:refs/heads/scalar-types
12:04 steven joined #git
12:04 Jonno_FTW jast: I get an error: Updates were rejected because a pushed branch tip is behind its remote
12:05 jast okay, so scalar-types on the remote side has commits that you don't have in master
12:05 Jonno_FTW ok
12:05 synthroi_ joined #git
12:05 jast one way of dealing with that is merging the remote scalar-types into your master branch
12:05 Jonno_FTW but I have changes in master that I want to keep
12:05 jast sure, that's what merge does: try to combine changes from both sides
12:06 Jonno_FTW ok
12:07 Jonno_FTW hope I don't break everything
12:07 gableroux joined #git
12:07 p4trix joined #git
12:10 immae jast: There is actually a (not so clean) way to do what I wanted: git merge-tree $(git merge-base bar master) bar master, and then grep for "+<<<<"
12:10 xanadu_ joined #git
12:10 immae doesn't touch the index nor the worktree
12:11 brent__ joined #git
12:12 xall_ joined #git
12:13 Mo joined #git
12:14 jnavila joined #git
12:14 Mo Hi, in hg log I can see my current revision flagged with @. In git log --graph --full-history I can't see. How can I see which revision I currently have?
12:14 canton7 Mo, add --decorate
12:14 gugah joined #git
12:14 Mo Nice, thanks.
12:14 canton7 !lol
12:14 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
12:15 canton7 (lots of people set that as an alias)
12:15 marianina8 joined #git
12:15 Mo Nice like hg glog
12:16 PHPanos joined #git
12:16 dminca joined #git
12:16 dminca hit
12:16 dminca hi guys*
12:17 CheckDavid joined #git
12:17 Mo How can I see if there are new revisions? git pull already changes my repo to the latest.  On hg I do hg pull to see the new changes, and I need hg update to switch to the latest.
12:17 grawity the closest equivalent would be `git fetch` + `git merge`
12:17 dminca is there a way to keep git submodules with their origin master? (not the master from root project)
12:17 canton7 Mo, 'git fetch' updates the remote-tracking branch (e.g. origin/stuff) to the latest. 'git pull' does that, and then merges the remote-tracking branch for the current branch into the current branch
12:17 dminca keep them upadted*
12:17 grawity with `git log ..@{upstream}` as `hg in`
12:18 xanadu_ joined #git
12:18 grawity or @{u} or a specific remote branch instead
12:18 Mo canton7: I see, git pull does   fetch+merge? Thanks.
12:18 ankit01ojha joined #git
12:19 kpease joined #git
12:19 jast immae: oh, right. actually you can get an in-index result (and so you don't have to grep through the data), using 'git read-tree -m $(git merge-base bar master) bar master
12:19 canton7 yeah, !pull
12:19 gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009/04/16/git-fetch-and-merge/
12:19 patarr joined #git
12:19 deduped joined #git
12:20 immae jast: stdout is fine
12:20 jast yeah, but you won't be able to distinguish from legitimate data containing <<<< :}
12:21 immae yeah, that was the "not so clean" part of my sentence :p
12:21 Tobbi joined #git
12:21 gableroux joined #git
12:22 b100s joined #git
12:22 gableroux joined #git
12:26 gablerou_ joined #git
12:26 mda1 joined #git
12:27 nowhere_man joined #git
12:28 borkr joined #git
12:28 sbulage joined #git
12:30 bauruine joined #git
12:33 gableroux joined #git
12:33 peterbec` joined #git
12:34 MineCoins joined #git
12:36 maroloccio joined #git
12:38 nanga joined #git
12:39 buffal0 joined #git
12:39 digidog joined #git
12:40 bumpy joined #git
12:40 xanadu_ joined #git
12:42 mizu_no_oto joined #git
12:44 sbasso joined #git
12:45 MineCoins joined #git
12:45 jameser joined #git
12:46 Gill joined #git
12:47 DaveTaboola joined #git
12:48 chipotle joined #git
12:48 peacememories joined #git
12:48 PHPanos joined #git
12:50 marianina8 joined #git
12:53 exonintrendo joined #git
12:54 LEI joined #git
12:54 xanadu_ joined #git
12:54 bauruine joined #git
12:54 Cabanossi joined #git
12:55 exonintrendo I'm trying to clean up a git repo at work and after some research found that you can completely remove a directory from git's history (saving space on these unnecessary files) but running a 'git filter-branch' command. I did this but unfortunately found that some of the files that were outside of the directory intended to be deleted were missing commits. can someone explain if i did something wrong? is this an
12:55 exonintrendo unfortunate result of removing a directory from the history?
12:55 thebope joined #git
12:56 tobiasvl exonintrendo: what do you mean exactly? the files were missing commits?
12:56 tobiasvl what filter-branch command did you run?
12:57 arand__ joined #git
12:57 theoceaniscool joined #git
12:57 mrkake joined #git
12:59 dviola joined #git
12:59 sspssptt joined #git
12:59 jeffreylevesque joined #git
12:59 ExoUNX joined #git
13:00 sspssptt joined #git
13:01 sspssptt joined #git
13:04 maroloccio joined #git
13:04 _rgn joined #git
13:04 Gsham joined #git
13:04 marianina8 joined #git
13:05 tlaxkit joined #git
13:06 b100s joined #git
13:08 regedit joined #git
13:11 porsche944 joined #git
13:11 exonintrendo tobiasvl i ran:
13:12 exonintrendo git filter-branch --tag-name-filter cat --index-filter 'git rm -r --cached --ignore-unmatch source/applications/mobile' --prune-empty -f -- --all
13:12 exonintrendo we had broken out our 'mobile' subdirectory into its own repo, so i wanted to remove it from this current repo's history
13:12 MineCoins joined #git
13:13 PHPanos joined #git
13:14 maroloccio joined #git
13:14 Shahzad joined #git
13:16 plasticle joined #git
13:17 King_Hual joined #git
13:18 prg3 joined #git
13:19 elect joined #git
13:21 conmaxo joined #git
13:22 exonintrendo tobiasvl is it possible that it gets confused with commits to files where the commit also includes files in the directory to be deleted?
13:22 theoceaniscool joined #git
13:24 mda1 joined #git
13:25 a_thakur joined #git
13:26 aw1 joined #git
13:28 conmaxo left #git
13:29 _Vi joined #git
13:29 hs366 joined #git
13:31 Sound joined #git
13:34 peterbec` joined #git
13:35 Ryanar joined #git
13:35 publio joined #git
13:35 sspssptt joined #git
13:35 jagob joined #git
13:35 lavalamp joined #git
13:37 raspado joined #git
13:38 GodGinrai joined #git
13:43 chipotle joined #git
13:45 jameser_ joined #git
13:46 Dougie187 joined #git
13:48 sspssptt left #git
13:49 thebope joined #git
13:50 systemovich joined #git
13:52 Rodya_ joined #git
13:53 robotroll joined #git
13:54 bariscant joined #git
13:55 Cabanossi joined #git
13:55 oleo joined #git
13:55 lavalamp joined #git
13:55 jameser joined #git
13:56 gbfrow joined #git
13:57 ash_workz joined #git
13:58 dendazen joined #git
14:00 jtoy joined #git
14:01 fahadash joined #git
14:02 AaronMT joined #git
14:03 cdg joined #git
14:04 mischat joined #git
14:05 fbwnd joined #git
14:06 MineCoins joined #git
14:07 cdg joined #git
14:08 tcorneli joined #git
14:08 jstimm joined #git
14:13 jstimm joined #git
14:18 griffindy joined #git
14:18 patarr joined #git
14:19 elect_ joined #git
14:19 mda1 joined #git
14:20 thebope joined #git
14:23 PHPanos joined #git
14:26 DarkPsydeLord joined #git
14:27 Endarked joined #git
14:29 grayjoc joined #git
14:29 mda1 joined #git
14:32 LeBlaaanc joined #git
14:34 Karunamon|2 left #git
14:35 PHPanos joined #git
14:35 s2013 joined #git
14:35 xall_ joined #git
14:36 robotroll joined #git
14:36 troulouliou_div2 joined #git
14:36 peterbec` joined #git
14:37 ekinmur joined #git
14:37 oxguy3 joined #git
14:37 Gsham joined #git
14:38 unbalancedparen joined #git
14:41 kent\n joined #git
14:43 dglambert joined #git
14:43 dglambert yo
14:43 dglambert I just cloned a remote repo
14:43 robotroll joined #git
14:43 sbasso joined #git
14:43 dglambert But I am on the wrong branch, how do I (fetch?) the branch I want to work off of
14:43 shinnya joined #git
14:44 drodger joined #git
14:45 dglambert I tried, git fetch origin:branch
14:46 dglambert git remote -v  shows URLs for both fetch and push for origin
14:47 nedbat dglambert: you need to checkout the branch you want.
14:47 dglambert even if I don't have it locally
14:49 nedbat dglambert: try it
14:50 xall joined #git
14:51 dvaske joined #git
14:51 felixjet joined #git
14:51 ronin_work joined #git
14:52 dvaske_ joined #git
14:52 dglambert HEY! nedbat I remember you from when I first started programming
14:53 dglambert that name just like clicked
14:53 nedbat dglambert: hi :)
14:53 nedbat dglambert: i guess i haven't kicked the irc habit yet :)
14:53 dglambert I see you run the boston python group
14:54 dglambert We may have met in person, but its been so long I can't even remember
14:56 dglambert btw that works, thanks nedbat
14:56 mischat joined #git
14:56 dglambert I thought I tried it before but I must have missed it
14:56 nckpz joined #git
14:57 nedbat dglambert: i hope you come to a boston python event :)
14:57 dglambert well, funny you say that
14:57 dglambert I got one of these today, http://imgur.com/a/u5lxZ
14:58 dglambert And I haven't written python or java in years
14:58 Impaloo joined #git
14:58 huvber joined #git
14:58 dglambert However I keep feeling gravitational pull to python
14:58 oxguy3 joined #git
14:59 huvber joined #git
14:59 andrew710 joined #git
14:59 SteffanW joined #git
15:00 felixjet joined #git
15:00 nedbat i have never seen a thing like that from google
15:01 VladGh joined #git
15:01 dglambert http://www.ibtimes.co.uk/google-foobar-how-searching-web-earned-software-graduate-job-google-1517284
15:03 VladGh joined #git
15:04 roelmonnens joined #git
15:04 Ryanar joined #git
15:05 cdg_ joined #git
15:05 VladGh joined #git
15:06 str joined #git
15:09 Cabanossi joined #git
15:11 ResidentBiscuit joined #git
15:13 patarr_ joined #git
15:14 Tobbi joined #git
15:15 steeze joined #git
15:17 al-damiri joined #git
15:17 Glooomy joined #git
15:18 infernix joined #git
15:19 snowkidind joined #git
15:20 GodGinrai joined #git
15:20 thiago joined #git
15:20 gtristan joined #git
15:20 Chinggis6 joined #git
15:21 menip joined #git
15:22 Rodya_ joined #git
15:23 Murii joined #git
15:25 jstimm joined #git
15:27 onehrxn joined #git
15:30 brent__ joined #git
15:31 tang^ joined #git
15:34 zero85 joined #git
15:36 mischat joined #git
15:36 lavalamp joined #git
15:37 shgysk8zer0 joined #git
15:37 jagob joined #git
15:38 peterbec` joined #git
15:39 crose joined #git
15:40 Cabanossi joined #git
15:40 jtoy joined #git
15:41 sbasso joined #git
15:43 raspado joined #git
15:45 raspado_ joined #git
15:45 Gustavo6046 joined #git
15:45 govg joined #git
15:46 eroux joined #git
15:48 orbyt_ joined #git
15:48 NullableTruth joined #git
15:49 shgysk8zer0 joined #git
15:50 zero85 joined #git
15:51 snowalpaca joined #git
15:52 holodoc joined #git
15:53 TomyWork joined #git
15:53 ronin_work joined #git
15:55 aboccia_ joined #git
15:55 planigan joined #git
15:57 durham joined #git
15:58 porsche944 joined #git
15:58 Xenophon1 joined #git
15:58 durham joined #git
15:58 ertes joined #git
15:59 raulp joined #git
16:00 a_thakur joined #git
16:00 freimatz joined #git
16:00 snowkidind joined #git
16:01 holodoc joined #git
16:01 Noldorin joined #git
16:01 netj joined #git
16:02 scoobertron joined #git
16:02 oxguy3 joined #git
16:04 armyriad joined #git
16:05 TbobbyZ joined #git
16:06 qqx joined #git
16:06 shgysk8zer0 joined #git
16:06 mda1 joined #git
16:06 svm_invictvs joined #git
16:07 buzzLightBeer joined #git
16:09 notebox joined #git
16:09 shgysk8zer0_ joined #git
16:10 maroloccio joined #git
16:11 BrianBlaze https://drive.google.com/file/d/0B--JlZBmVrW4X21oby1jRVN5UGc/view?usp=sharing
16:11 BrianBlaze oh shit oops
16:11 BrianBlaze <3
16:11 madewokherd joined #git
16:13 Ryanar joined #git
16:14 jstimm joined #git
16:14 xall joined #git
16:15 m1dnight_ joined #git
16:15 lrochfort joined #git
16:18 a_thakur_ joined #git
16:18 bgamari joined #git
16:19 zsoc joined #git
16:20 lrochfort joined #git
16:20 lrochfort I want to inject an http link into either cover letter from format-patch --cover-letter or into the email created by send-email --compose. Are there hooks or support for template files to do that?
16:20 dglambert joined #git
16:22 zsoc disclaimer: github stuff ahead - Someone decided it would be a good idea to merge branches on their own. I'd like to revert their merge and submit a PR instead... but the issue is that if I revert a merge (maintaining history), then github will show there are no changes to submit in the PR (which is true, they were already merged.. albeit now reverted). How would I go about fixing this without the mortal sin of clobbering history?
16:24 kus_ubuntui686 joined #git
16:24 henriknj joined #git
16:26 dreiss joined #git
16:26 pbrewczynski joined #git
16:27 marianina8 joined #git
16:27 rchavik joined #git
16:30 marcogmonteiro joined #git
16:31 Guest55 joined #git
16:33 mischat joined #git
16:34 schleppel joined #git
16:35 kfoonamalik joined #git
16:35 madewokherd joined #git
16:36 sarbs joined #git
16:36 seemikehack joined #git
16:38 seemikehack Hi all! I added some changes to my index interactively with git add -i, but when editing a hunk I accidentally staged some lines I didn't mean to. Now I'm trying to figure out how to pull them out of the index, basically git add -i in reverse. I can't figure out what to Google for, either. Is the only way to do this to unstage the entire file and then interactively stage again?
16:38 durham joined #git
16:39 peterbec` joined #git
16:41 sbeller joined #git
16:44 t0by joined #git
16:44 t0by joined #git
16:44 Vampire0 seemikehack, `git reset -p` is like the patch mode of the interactive mode which is also accessible as `git add -p`
16:44 Rodya_ joined #git
16:45 HardlySeen joined #git
16:50 seemikehack Vampire0, that was it, thank you!
16:50 Vampire0 yw
16:51 marianina8 joined #git
16:51 zsoc left #git
16:51 jstimm joined #git
16:52 sathed joined #git
16:54 jstimm joined #git
16:54 dpl joined #git
16:55 dpl left #git
16:56 gopar joined #git
16:57 kexmex joined #git
16:58 aielima joined #git
16:59 fbwnd joined #git
16:59 acetakwas joined #git
17:00 Gsham joined #git
17:01 roelmonnens joined #git
17:02 LBV_User joined #git
17:04 Endarked joined #git
17:04 blackpajamas joined #git
17:05 mostlybadfly joined #git
17:07 hashtagstrashtag joined #git
17:08 myhau joined #git
17:09 Cavallari joined #git
17:11 matoro joined #git
17:12 svm_invictvs joined #git
17:12 myhau joined #git
17:12 p4trix joined #git
17:15 oxguy3 joined #git
17:16 synthroid joined #git
17:18 kbeflo_ joined #git
17:20 Rodya_ joined #git
17:20 holodoc joined #git
17:23 ronin_work joined #git
17:26 aboccia joined #git
17:31 roelmonnens joined #git
17:38 Es0teric joined #git
17:39 bt12 joined #git
17:41 MineCoins joined #git
17:44 matoro joined #git
17:47 GodGinrai joined #git
17:47 marianina8 joined #git
17:47 marianina8 joined #git
17:48 Es0teric joined #git
17:51 exonintrendo left #git
17:54 Anja joined #git
17:54 Endarked joined #git
17:56 Emperor_Earth joined #git
17:57 doener joined #git
17:59 sbasso joined #git
17:59 planigan joined #git
18:00 feodaron joined #git
18:01 Sasazuka joined #git
18:02 mikecmpbll joined #git
18:03 XenophonF joined #git
18:03 rafalcpp joined #git
18:06 gopar joined #git
18:08 peacememories joined #git
18:10 Cabanossi joined #git
18:10 _rgn joined #git
18:10 nanga joined #git
18:12 nanga joined #git
18:13 MineCoins joined #git
18:14 karols146 joined #git
18:14 xanadu_ joined #git
18:16 holodoc joined #git
18:17 scavenger joined #git
18:19 Sasazuka_ joined #git
18:19 scavenger left #git
18:21 raynold joined #git
18:21 fbwnd joined #git
18:21 satifant joined #git
18:22 LBV_User joined #git
18:22 TomyLobo2 joined #git
18:22 marianina8 joined #git
18:23 sbasso joined #git
18:26 Sasazuka joined #git
18:26 mischat joined #git
18:29 Ryanar joined #git
18:30 Guest55 joined #git
18:31 gregwork joined #git
18:31 hhee joined #git
18:32 rominronin joined #git
18:32 Vauff joined #git
18:32 mehwork joined #git
18:33 gregwork could anyone help me figure out how to get pre-commit in a tree to use https://github/herp/derp.git instead of git://github/herp/derp.git ?
18:33 GodGinrai why would a pre-commit hook be using a url in the first place?
18:34 mehwork i ran 'git mv' on something, and then need to work on something else in the branch that I want to commit first, but it's showing what I get mv'd in "changes to be committed: renamed foo newfolder/foo" and says "use "git reset HEAD <file>..." to unstage but how do i do that really?
18:34 mehwork do i git reset HEAD the old location or the new location i git mv'd ?
18:34 mehwork for <file>
18:35 gregwork nevermind .pre-commit-hooks.yaml had it hardcoded
18:36 jtoy joined #git
18:36 sbasso joined #git
18:37 Glooomy joined #git
18:37 str_ joined #git
18:37 skypuke joined #git
18:38 Glooomy joined #git
18:38 oxguy3 joined #git
18:38 Glooomy joined #git
18:39 Glooomy joined #git
18:40 Glooomy joined #git
18:40 roentgen joined #git
18:40 roentgen joined #git
18:41 xanadu_ joined #git
18:43 austin987 joined #git
18:43 planigan joined #git
18:44 tvw joined #git
18:49 lmatteis joined #git
18:50 drodger joined #git
18:52 peterbec` joined #git
18:52 IRCFrEAK joined #git
18:53 HoierM joined #git
18:53 kbeflo__ joined #git
18:54 oxguy3 joined #git
18:54 ronin_work joined #git
18:55 IRCFrEAK left #git
18:55 Cabanossi joined #git
18:56 planigan joined #git
18:56 Vampire0 mehwork, both
18:56 TbobbyZ_ joined #git
18:57 Vampire0 mehwork, Git does not know a move or copy explicitly but detects them dynamically
18:57 Vampire0 mehwork, actually technically it is a delete and an add
18:57 Vampire0 mehwork, if you would reset the old path, you would get a copy instead of a move, if you would reset the new path, you would get a delete instead of a move
19:01 MutantMahesh joined #git
19:01 todd_dsm joined #git
19:02 nowhere_man joined #git
19:03 nixjdm joined #git
19:04 sbasso joined #git
19:04 planigan joined #git
19:04 aw1 joined #git
19:05 Emperor_Earth joined #git
19:05 chardan joined #git
19:07 IRCFrEAK joined #git
19:10 IRCFrEAK left #git
19:11 planigan joined #git
19:12 MarioBranco joined #git
19:12 mmattice joined #git
19:13 m1dnight_ joined #git
19:15 m0viefreak joined #git
19:18 Bass10 joined #git
19:19 flavius joined #git
19:19 planigan joined #git
19:21 nd- joined #git
19:22 LionsMane joined #git
19:22 jimklo joined #git
19:23 mehwork Ok. Should i not use git rm --cached ?
19:23 Tobbi joined #git
19:23 skypuke_ joined #git
19:24 mehwork i was hoping to keep the git mv, but just not have it staged, but it doesn't sound like that's possible if it is a delete and an add
19:24 GOLDPANK joined #git
19:25 theiostream joined #git
19:26 mercy____ joined #git
19:26 cdown joined #git
19:26 Chinggis6 joined #git
19:26 fbwnd joined #git
19:27 GOLDPANK left #git
19:28 SilverBe joined #git
19:28 GodGinrai mehwork: `git mv` is `git add` + `git rm`.  It is not possible to "keep the git mv" and yet have it unstaged, since it is composed of 2 staging actions
19:29 yottabyte joined #git
19:29 yottabyte should one commit a lot & often?
19:30 zefferno joined #git
19:30 GodGinrai yottabyte: That's not a bad methodology.  I prefer to say "commit when it makes sense"
19:30 GodGinrai yottabyte: when you have something you are certain you want to track, go ahead and commit it
19:30 GodGinrai yottabyte: if not, wait until it reaches that critical mass at which it becomes important to track, then commit
19:31 yottabyte well what if it's just something incremental, but I don't want to lose my work if my workstation ignites
19:31 GodGinrai yottabyte: you will always lose your work if your workstation ignites, even if you commit often
19:31 yottabyte oh right, I have to push...
19:31 GodGinrai yottabyte: the only way to prevent that is to push your changes to a remote
19:31 yottabyte so when should I push
19:31 daivyk joined #git
19:32 GodGinrai I push only when I need another computer to see it.  Whether that be another one of mine, or a coworker's
19:32 mercy____ left #git
19:33 GodGinrai I generally trust my workstation to refrain from igniting
19:34 TbobbyZ joined #git
19:35 mehwork GodGinrai: ah that's unfortunate. since i did a git mv and then edited a lot of the moved files, but now i'm forced to commit them when they're not ready to comit some other file
19:35 mehwork unless i go thorugh a tedious process of copying those files to a tmp dir, resetting them and copying them back and git mving later
19:36 Duality joined #git
19:36 Duality hi
19:36 Gsham joined #git
19:37 Duality i have a small issue that i don't know how to fix, I am trying to merge some branch with master but when i do: 'git pull origin branch' it tells me that everything is uptodate while when i look through the sources it clearly isn't !
19:37 Duality any ideas ?
19:37 GodGinrai mehwork: you could git-reset the old path, copy the newpath over the oldpath, and then git-reset the new path.  Then you have your changes in the old path unstaged
19:38 mehwork thanks i'll try
19:40 _I_R_C_F_R_E_A_K joined #git
19:42 mehwork a safe way to try it is to cp the entire old project to another dir and that way i can do it on a different .git/ repo
19:43 theiostream joined #git
19:44 rebrec joined #git
19:45 Sammitch left #git
19:49 aidalgol joined #git
19:50 Guest55 joined #git
19:50 _I_R_C_F_R_E_A_K left #git
19:50 guiguistar joined #git
19:52 cdg joined #git
19:53 digidog joined #git
19:53 Rodya_ joined #git
19:53 peterbec` joined #git
19:53 shgysk8zer0 joined #git
19:55 drodger joined #git
19:56 dsteplight__ joined #git
19:56 sonOfRa joined #git
19:58 miczac joined #git
19:59 s2013 joined #git
20:00 gopar joined #git
20:04 r00t66 joined #git
20:04 oxguy3 joined #git
20:05 Darren_ joined #git
20:07 toydestroyer joined #git
20:10 daivyk joined #git
20:11 LionsMane joined #git
20:16 dendazen joined #git
20:17 chipotle joined #git
20:19 chachasmooth joined #git
20:21 paul424 joined #git
20:21 Atm0spher1c joined #git
20:22 daivyk joined #git
20:22 pietv joined #git
20:22 sbasso_ joined #git
20:25 planigan joined #git
20:26 ronin_work joined #git
20:26 digidog joined #git
20:29 bl0m1 joined #git
20:30 bl0m1 joined #git
20:30 jeffreylevesque joined #git
20:30 theiostream joined #git
20:33 Gsham joined #git
20:33 GT4066 joined #git
20:34 hhee joined #git
20:36 peterbec` joined #git
20:36 theiostream joined #git
20:38 miracle joined #git
20:40 alexandre9099 joined #git
20:40 miracle guys i need help with appveyor and git(bitbucket)  integration. are common scheme/way for taking version from file in git repo and push artifacts back ?
20:41 theiostream joined #git
20:44 sisaac joined #git
20:44 _ikke_ Sorry, your question is unclear to me
20:46 fatalhalt joined #git
20:50 miracle in newbie in opensource. i have forked project on biitbucket, i build it with appveyour but dont know common scheme for working with build version.
20:52 thiago miracle: not a Git question
20:52 zerow joined #git
20:52 miracle ok
20:52 chachasmooth joined #git
20:52 thiago please ask your Git question
20:52 miracle how delete git ?
20:52 miracle left #git
20:52 thiago do you want to uninstall Git?
20:53 _ikke_ thiago: he's gone
20:53 thiago or do you want ot remove this repository you cloned?
20:53 zerow hehe
20:53 thiago oh
20:53 zerow why u wanna do that :<
20:53 mda1 joined #git
20:53 zerow oh lol
20:53 _Vi joined #git
20:53 _ikke_ miracle was trolling
20:55 Cabanossi joined #git
20:55 zerow hehe
20:56 Rodya_ joined #git
20:57 duderonomy joined #git
20:59 drodger joined #git
20:59 nkuttler joined #git
20:59 mvensky joined #git
21:00 loglaunch joined #git
21:01 chachasmooth joined #git
21:02 duderono_ joined #git
21:03 duderono_ joined #git
21:03 anonnumberanon joined #git
21:03 molgrum joined #git
21:03 molgrum joined #git
21:03 GodGinrai joined #git
21:08 mvensky joined #git
21:08 luke_nukem joined #git
21:10 brent__ joined #git
21:12 chachasmooth joined #git
21:12 matoro joined #git
21:14 jost_ joined #git
21:17 brent__ joined #git
21:18 Endarked joined #git
21:19 Chinggis6 joined #git
21:19 mvensky joined #git
21:22 holodoc joined #git
21:25 ajpiano_ joined #git
21:26 rivarun joined #git
21:26 dirtyroshi joined #git
21:26 WakiMiko joined #git
21:26 roentgen joined #git
21:28 hashtagstrashtag left #git
21:28 hashtagstrashtag joined #git
21:28 hashtagstrashtag Question about git-lfs - is there an easy way to clone a repo w/lfs objects without downloading the files immediately?
21:29 orbyt_ joined #git
21:32 fletom joined #git
21:32 robattila256 joined #git
21:32 blackwind_123 joined #git
21:33 hashtagstrashtag "* `--skip-smudge`:
21:33 hashtagstrashtag Skips automatic downloading of objects on clone or pull. This requires a
21:33 hashtagstrashtag manual "git lfs pull" every time a new commit is checked out on your
21:33 hashtagstrashtag repository."
21:33 hashtagstrashtag https://github.com/git-lfs/git-lfs/blob/master/docs/man/git-lfs-install.1.ronn <-- figured out the right google.
21:35 ShapeShifter499 joined #git
21:36 nevodka joined #git
21:37 peterbec` joined #git
21:37 nevodka joined #git
21:38 MarioBranco joined #git
21:40 tyreld joined #git
21:41 Bennux joined #git
21:42 dsdeiz joined #git
21:42 dsdeiz joined #git
21:43 scoobertron joined #git
21:48 beaky joined #git
21:51 chipotle joined #git
21:52 boombatower joined #git
21:53 atomi joined #git
21:54 raspado joined #git
21:54 artgoeshere joined #git
21:56 Anja_ joined #git
21:57 jtoy joined #git
21:58 ronin_work joined #git
21:58 rancyd joined #git
22:00 buffal0 joined #git
22:03 jtoy joined #git
22:06 TikityTik joined #git
22:07 blackwind_123 joined #git
22:11 atomi joined #git
22:13 matoro joined #git
22:14 peterbec` joined #git
22:14 atomi joined #git
22:14 yehowyada joined #git
22:16 holodoc joined #git
22:22 dedondesta joined #git
22:23 JeremyD joined #git
22:25 dedondesta guys i reverted back to certain commit hash, now when i try to merge back this branch i get 'Already up-to-date'
22:25 dedondesta and no changes that are in the branch that i try to merge into
22:26 holodoc joined #git
22:26 dedondesta should i branch my branch and merge into master again? will i have changes then?
22:26 jtoy joined #git
22:29 cyberz joined #git
22:29 kadoban dedondesta: "reverted" in what sense?
22:29 dendazen joined #git
22:30 dedondesta kadoban: git branch backup_master; git reset --hard 56e05fce; git reset --soft backup_master ; git commit -a -m "Revert to 56e05fce"; git branch -d backup_master;
22:30 cjohnson If master has a b c d and your branch has a b c d e f g h, and you reset your branch to g
22:30 dedondesta kadoban: from this http://stackoverflow.com/questions/1895059/revert-to-a-commit-by-a-sha-hash-in-git
22:30 dedondesta kadoban: last answer
22:30 cjohnson to d**
22:30 cjohnson then merge to master, it will have no effect since master *is* up to date
22:31 chipotle_ joined #git
22:31 kadoban dedondesta: So you squashed the changes from a bunch of commits into one new, unrelated commit, changing history as you went, if I'm reading that right?
22:33 askb joined #git
22:33 dedondesta kadoban: probably ...
22:34 kadoban And then you're trying to do what and it's not working as you expect?
22:35 dedondesta kadoban: i hoped i "removed" that branch, reverted to certain commit, so that i'm in the state (i hoped) before i merged this brange
22:35 dedondesta kadoban: how do i make it so?
22:35 darkbit joined #git
22:36 kadoban It's pretty ambiguous, unfortunately. !revert should have some info on one of the several things that can mean.
22:36 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]?
22:36 kadoban I think you want either A or E
22:37 kadoban It's usually hard to tell which for an outsider, it usually depends on if this history is "public" (anyone else could be using it) and some other things.
22:37 peacememories joined #git
22:37 dedondesta kadoban: how do i do what i described, i pushed to master a master brange that has a certain branch merged into, i want master to be in the stat before i merged this 'certain' brange
22:37 cyberz joined #git
22:37 dedondesta kadoban: how do i do what i described, i pushed to master the master brange that has a certain branch merged into, i want master to be in the stat before i merged this 'certain' brange
22:38 kadoban Asking again hasn't disambiguated what you want any further.
22:40 zerow|afk joined #git
22:43 Gloomy joined #git
22:45 Rodya_ joined #git
22:46 salamanderrake joined #git
22:50 s2013 joined #git
22:51 dedondesta kadoban: farther i want to merge it again
22:51 dedondesta kadoban: and want to see changes that are in the 'certain' branch
22:51 dedondesta merge into master
22:51 Lunatrius joined #git
22:52 dedondesta i just want to remove everything above certain commit
22:52 dedondesta as it was before that
22:53 anuxivm joined #git
22:55 Noodlewitt joined #git
22:55 stoopkid joined #git
22:56 cdown joined #git
22:57 snowalpaca joined #git
22:57 amdi_ joined #git
22:58 snowalpa_ joined #git
22:59 dedondesta kadoban: i want that state in history
22:59 dedondesta kadoban: as the future (this merge and revert) never happened
23:00 kadoban dedondesta: You still haven't told me anything that makes it clear which of two options you want, and I've moved on to other things in my day, sorry.
23:03 jtoy joined #git
23:03 zumba_addict joined #git
23:06 cdown_ joined #git
23:07 matoro joined #git
23:07 Guest55 joined #git
23:10 systemovich joined #git
23:12 bulletmark joined #git
23:14 buffal0 joined #git
23:14 peeps[lappy] joined #git
23:16 kbs joined #git
23:17 navidr joined #git
23:19 dendazen joined #git
23:22 peterbec` joined #git
23:22 chipotle joined #git
23:23 cyphase joined #git
23:25 Cabanossi joined #git
23:26 cdown_ joined #git
23:27 gugah joined #git
23:27 MarioBranco joined #git
23:27 gugah joined #git
23:31 Lunatrius joined #git
23:33 Sasazuka joined #git
23:34 sbasso joined #git
23:36 a_thakur joined #git
23:37 lavalamp joined #git
23:41 matoro joined #git
23:42 TbobbyZ_ joined #git
23:42 cyphase joined #git
23:44 Guest54 joined #git
23:44 kbs left #git
23:45 holodoc joined #git
23:45 austin987 joined #git
23:46 Rodya_ joined #git
23:47 Lyqyd joined #git
23:51 trulycool joined #git
23:51 kristofferR joined #git
23:52 Gsham joined #git
23:53 sz0 joined #git
23:54 sunri5e joined #git
23:55 cyphase joined #git
23:56 chipotle joined #git
23:56 dglambert joined #git
23:56 dglambert yo
23:57 jtoy joined #git
23:58 morgan joined #git
23:58 madewokherd joined #git
23:58 cyberz joined #git
23:59 morgan_ joined #git

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