Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-09

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

All times shown according to UTC.

Time Nick Message
00:02 Analogue joined #git
00:03 e14 joined #git
00:06 cqi joined #git
00:08 timvisher joined #git
00:10 moestevens joined #git
00:13 Kitty- joined #git
00:13 Analogue left #git
00:20 kyan joined #git
00:23 awestwell joined #git
00:23 awestwell hey all
00:23 gitinfo awestwell: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
00:23 xameada_ joined #git
00:25 awestwell I have a local repository... and I want to push it to a remote repository that exists but is empty. I tried saying....    git remote add remoteserver ssh://git/test
00:26 awestwell then git push --all remoteserver
00:26 awestwell git is defined in my .ssh/config with the following
00:26 awestwell host git
00:26 awestwell user gitolite
00:26 awestwell hostname 10.22.38.10
00:26 awestwell port 22
00:26 awestwell identityfile ~/.ssh/gitolite
00:27 awestwell I know I can connect and clone gitolite-admin
00:28 awestwell When I run git push --all remoteserver i get the following
00:28 awestwell ssh: connect to host 10.22.38.10 port 22: Connection refused
00:28 awestwell fatal: Could not read from remote repository.
00:29 drmt joined #git
00:30 DolphinDream joined #git
00:33 romerocesar joined #git
00:34 bulletmark joined #git
00:35 drmt joined #git
00:35 fuchstronaut joined #git
00:36 cspack_ left #git
00:37 romerocesar joined #git
00:38 mmmveggies joined #git
00:38 raijin joined #git
00:38 dsdeiz joined #git
00:38 dsdeiz joined #git
00:42 qwesste joined #git
00:46 qpdb joined #git
00:48 Sleepy63 joined #git
00:49 axisys joined #git
00:50 dreiss joined #git
00:50 skered joined #git
00:50 ekinmur joined #git
00:51 bulletmark_ joined #git
00:52 skered If I cloned a repo with --depth=1 I'm missing some of the changelog (in most cases this is true).  Can I update the repo to pull the reset of the history or do I have to reclone it?
00:52 bulletmark joined #git
00:53 milki skered: you can fetch the rest with git fetch --unshallow
00:53 greendo joined #git
00:54 skered Thanks.
00:55 anuxivm left #git
00:56 wrouesnel joined #git
01:01 xall joined #git
01:05 boombatower joined #git
01:05 realz joined #git
01:07 hacman joined #git
01:15 wxg joined #git
01:17 sunri5e joined #git
01:19 raijin joined #git
01:20 fstd_ joined #git
01:21 xall joined #git
01:21 aapaaal joined #git
01:22 d^sh joined #git
01:25 pks joined #git
01:27 harish joined #git
01:29 eizua joined #git
01:31 romerocesar joined #git
01:36 fuchstronaut joined #git
01:37 Electrometro joined #git
01:39 liuzhen joined #git
01:46 drbean_ joined #git
01:46 Goplat joined #git
01:46 NeXTSUN joined #git
01:46 Goplat joined #git
01:46 drbean- joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | 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.1 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:50 drbean joined #git
01:50 Jameser joined #git
01:52 drbean_ joined #git
01:54 drbean- joined #git
01:54 evanwang joined #git
01:55 raijin joined #git
01:56 Pursuit joined #git
01:56 drbean joined #git
01:57 drbean_ joined #git
01:58 Vampire0_ joined #git
01:59 drbean| joined #git
02:00 llamapixel joined #git
02:00 Opertus joined #git
02:01 f3r70rr35f joined #git
02:01 drbean joined #git
02:03 drbean_ joined #git
02:03 Opertus joined #git
02:05 Jameser joined #git
02:05 drbean- joined #git
02:06 drbean| joined #git
02:07 drbean joined #git
02:10 drbean_ joined #git
02:13 liuzhen joined #git
02:14 drbean joined #git
02:14 Jameser joined #git
02:15 e14 joined #git
02:16 drbean_ joined #git
02:18 SporkWitch joined #git
02:18 drbean- joined #git
02:22 spriz joined #git
02:24 lagothri1 joined #git
02:25 nevodka joined #git
02:26 arescorpio joined #git
02:27 FirewalkR joined #git
02:27 rgrinberg joined #git
02:28 shmuli joined #git
02:28 raijin joined #git
02:29 DolphinDream joined #git
02:31 TinkerTyper joined #git
02:33 DolphinDreamm joined #git
02:36 fuchstronaut joined #git
02:37 star_prone joined #git
02:38 hexagoxel joined #git
02:40 sangy joined #git
02:41 Electrometro joined #git
02:42 shmuli joined #git
02:42 timvisher joined #git
02:42 diogenese joined #git
02:43 e14 joined #git
02:45 e14 joined #git
02:47 liuzhen joined #git
02:49 dreiss joined #git
02:49 raijin joined #git
02:52 supaket joined #git
02:57 chachasmooth joined #git
02:59 constant joined #git
03:00 trobotham joined #git
03:01 blaster joined #git
03:01 blaster What's the best merge strategy when a branch has diverged rather significantly from origin/master?
03:02 dsdeiz joined #git
03:02 dsdeiz joined #git
03:03 e14 joined #git
03:04 nd joined #git
03:06 shmuli_ joined #git
03:12 fedepad joined #git
03:14 nettoweb joined #git
03:15 Vortex34 joined #git
03:16 jon-mac joined #git
03:17 cagedwisdom joined #git
03:21 rgrinberg joined #git
03:27 raijin joined #git
03:29 timvisher joined #git
03:31 aikuma joined #git
03:35 Lyqyd joined #git
03:35 anonymuse joined #git
03:36 t2mkn joined #git
03:37 fuchstronaut joined #git
03:37 fuchstronaut joined #git
03:38 nettoweb joined #git
03:38 mozzarella joined #git
03:38 red82 joined #git
03:44 diogenese joined #git
03:48 e14 joined #git
03:52 Limes left #git
03:52 Kitty- joined #git
03:52 parasite joined #git
03:52 Limes joined #git
03:57 sharkz joined #git
03:57 sharkz left #git
03:57 Limes joined #git
03:59 Limes left #git
04:00 Limes joined #git
04:02 DarkFox_ joined #git
04:03 shmuli joined #git
04:06 timvisher joined #git
04:07 kyan joined #git
04:08 mizu_no_oto joined #git
04:10 jstimm_ joined #git
04:11 afuentes joined #git
04:12 DarkFox_ joined #git
04:16 aikuma joined #git
04:17 navidr joined #git
04:23 cdg joined #git
04:24 Derperperd joined #git
04:25 star_prone joined #git
04:29 titankiller joined #git
04:30 xameada_ joined #git
04:33 Gloomy joined #git
04:36 nettoweb joined #git
04:38 fuchstronaut joined #git
04:46 offtopik joined #git
04:47 languitar joined #git
04:49 raijin joined #git
04:50 Cabanossi joined #git
04:51 Aces_Charles joined #git
04:52 moestevens joined #git
04:53 diogenese joined #git
04:58 daey_ joined #git
05:02 rnat_ joined #git
05:05 justanotheruser joined #git
05:06 Limes left #git
05:06 Limes joined #git
05:09 cqi joined #git
05:10 sharkz joined #git
05:11 Jameser_ joined #git
05:11 sharkz left #git
05:11 Limes joined #git
05:11 offtopik joined #git
05:13 Limes left #git
05:13 Limes joined #git
05:15 werdfriek joined #git
05:18 shmuli joined #git
05:18 werdfriek Hi, what is the best way to keep safe in maintaining / managing your repository when you have bitbucket on one end and QT on the other? Any tips or advice would be much appreciated as I am new to QT, Git, and Bitbucket (and this is my first - baby - project).
05:19 bmahe joined #git
05:20 timvisher joined #git
05:20 Jameser joined #git
05:20 littleforest joined #git
05:22 werdfriek I guess what I'm wondering is - does it have to be maintained on both ends? If so, how to distinguish each so that there's no overlap (and possibly create a mess because of it). So, is there some standard or pseudo / common practice standard that defines the parameters for managing each end then?
05:28 moritz werdfriek: uhm, what is QT in this context?
05:29 moritz I know it as a frontend library, nothing to do with git
05:29 phaleth joined #git
05:30 Rodya_ joined #git
05:32 fahadash joined #git
05:32 Motoko joined #git
05:32 rgrinberg joined #git
05:33 a_thakur joined #git
05:34 boombatower joined #git
05:35 liuzhen joined #git
05:36 cyphase joined #git
05:36 dreiss joined #git
05:45 Celelibi joined #git
05:46 cyphase joined #git
05:47 werdfriek moritz: QT Creator (an IDE with decent git integrations / management built in )
05:49 LucaTM joined #git
05:49 werdfriek So I'm the only developer, it's a ridiculously simple program / Project - just so I can putz around and learn some things.
05:49 moritz werdfriek: ah. !gui applies :-/
05:49 gitinfo werdfriek: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
05:50 werdfriek moritz: I'm not asking how to use qt or any interface for any thing. I'm asking about the concepts
05:51 werdfriek quit looking for reasons to alienate people (got that was fast!)
05:51 werdfriek The only reson I even mentioned it was for context
05:51 moritz werdfriek: I'm not trying to alienate people, merly saying that most of us don't have much experience with GUIs, much less then one specific you're asking about
05:51 moritz werdfriek: that said, what exactly do you mean with "maintaining"?
05:52 moritz werdfriek: in general, you push commits when you make them, and if you have collaborators, you pull before you start working
05:52 moritz there's not much in terms of maintenance
05:53 f3r70rr35f joined #git
05:54 justan0theruser joined #git
05:55 werdfriek moritz: Well it seems as if I have two roles to play and they may not do their job the same. One : as a developer of the program on my own computer (with a local git repository and whatever tools I use to write the code). Two : a project manager using both cloud repo storage (such as bitbucket, etc) as well and locally on the same computer. So, if I've never done it before, how do I define...
05:55 werdfriek ...the policies and understand the roles better for each of them ( considering it's just one person doing both ).
05:55 jaguarmagenta joined #git
05:55 llamapixel You can disable the integration on the QT side and just commit with terminal as my preferred option
05:56 moritz werdfriek: there's not much policy, except what I said before
05:56 moritz werdfriek: when you've made a commit, publish it
05:56 raijin joined #git
05:56 llamapixel [ Editor ] -= Project Data =- [ Terminal ] -= Online Repo
05:56 werdfriek moritz: right on
05:57 llamapixel worst ascii graph in history
05:57 moritz werdfriek: IMHO it's much more important to think about good commit messages, and making one commit for one feature/bugfix than about repo management
05:58 llamapixel A good git layout for log also helps https://coderwall.com/p/euwpig/a-better-git-log
05:58 werdfriek llamapixel: So you would pick one or the other and stick with that for everything?
05:58 werdfriek moritz: cool
05:58 llamapixel I would only stick with command line terminal.
05:59 llamapixel You will find that it is more robust in other environments if you pick up a job etc.
05:59 werdfriek Just a hobby right now but I'd love to work as a web developer one day
06:00 moritz best of luck
06:00 llamapixel There is always something that a UI app misses but terminal will never let you donw.
06:00 Anja joined #git
06:00 llamapixel http://rogerdudler.github.io/git-guide/  some content for you werdfriek
06:01 werdfriek moritz: thanks (sorry about the confusion - gunshy)
06:01 werdfriek llamapixel: right on
06:01 llamapixel http://learngitbranching.js.org/
06:01 moritz werdfriek: no worries
06:02 llamapixel https://www.atlassian.com/git/tutorials/
06:02 mmmveggies joined #git
06:03 raijin joined #git
06:03 werdfriek llamapixel: That second site is sooo cool!
06:04 dreiss joined #git
06:04 llamapixel http://danielkummer.github.io/git-flow-cheatsheet/
06:04 llamapixel werdfriek: As a starting developer I would definately have a project dedicated for testing git with, consider it MyGitTestProject.
06:04 moritz uhm, don't use git flow; it's too complicated for most use cases
06:05 moritz and antithetical to continuous integration/delivery
06:05 llamapixel You can visit that test project many times when learning new features. eg tagging or branching etc.
06:06 llamapixel Keep practising inside this test project werdfriek, break down the fear of the terminal and build up the experience of commiting to that test case project.
06:07 FirewalkR joined #git
06:07 llamapixel do you have some counter argument website links for me about that statement moritz I can read ?
06:08 lindenle joined #git
06:08 llamapixel I have deployed that method many times and use a DMZ style approach for my juniors at work at the moment, but happy to reduce complexity at any time. https://gist.github.com/djspiewak/9f2f91085607a4859a66
06:09 llamapixel I started with this. http://nvie.com/posts/a-successful-git-branching-model/
06:12 shmuli joined #git
06:14 star_prone joined #git
06:16 llamapixel What is the alternative argument moritz ?
06:18 Wulf joined #git
06:19 f3r70rr35f joined #git
06:22 llamapixel Whilst that question is in progress, werdfriek get used to adding, committing, and pushing, consider a simple text file that you update with each test change as simple as it can get.
06:24 theskillwithin joined #git
06:24 nettoweb joined #git
06:25 llamapixel One of the juniors at work has his git command list inside the git practice project ;)
06:25 llamapixel When he gets a new command he appends the text file and is forced to add/commit/push etc.
06:31 tvw joined #git
06:31 Jellyg00se joined #git
06:31 timvisher joined #git
06:31 nivag joined #git
06:32 dsdeiz joined #git
06:32 dsdeiz joined #git
06:35 nivag joined #git
06:36 a_thakur joined #git
06:39 fuchstronaut joined #git
06:40 shmuli joined #git
06:41 jaguarmagenta joined #git
06:44 wloncom joined #git
06:45 wloncom joined #git
06:45 f3r70rr35f joined #git
06:45 titankiller joined #git
06:48 [Brain] joined #git
06:49 ochorocho__ joined #git
06:54 FirewalkR joined #git
06:55 FirewalkR joined #git
06:56 FirewalkR joined #git
06:56 skam joined #git
06:57 FirewalkR joined #git
06:58 FirewalkR joined #git
06:58 shmuli joined #git
06:59 FirewalkR joined #git
06:59 FirewalkR joined #git
07:09 inflames joined #git
07:12 Jellyg00se joined #git
07:13 shmuli joined #git
07:14 mrmadcat joined #git
07:16 moritz llamapixel: you mean about git flow?
07:16 moritz I guess I should blog about that at one point
07:16 llamapixel Yes mate
07:17 llamapixel Please do
07:17 moritz the main argument is this: when you practice continuous integration/delivery in a git-flow like system, you have to do testing on the develop branch
07:17 moritz and merge/integrate often into it
07:18 moritz so, if you then build your releases from the master branch, you're releasing a different build artifact than the one you tested
07:18 Filiphe joined #git
07:18 moritz invalidating testing you did on the develop branch
07:18 zeroed joined #git
07:19 moritz the spirit of continuous delivery calls for testing a build artifact in your testing/staging environment(s), and if you're satisfied, use the exact same binary in production
07:20 TomyLobo joined #git
07:22 SteffanW joined #git
07:23 fahadash joined #git
07:24 bailon joined #git
07:25 jokester joined #git
07:26 jast joined #git
07:27 fedepad joined #git
07:30 madknight joined #git
07:40 fuchstronaut joined #git
07:40 shmuli joined #git
07:41 tjone270 joined #git
07:43 nilg joined #git
07:43 overlord_tm joined #git
07:52 magellanicloud joined #git
07:52 moritz llamapixel: https://perlgeek.de/blog-en/automating-deployments/2016-030-git-flow-vs-continuous-delivery.html now in more details, but the core principles remain the same
07:54 ss22ever22 joined #git
07:54 moritz submitted to reddit, if you want to discuss it there :-) https://www.reddit.com/r/programming/comments/56lbpz/git_flow_vs_continuous_delivery/
07:55 Gloomy joined #git
07:55 ss22ever22 Hello I am,having problems in git cloning from a website using fedora in vm
07:57 thiago joined #git
07:58 zeroed joined #git
07:58 zeroed joined #git
07:59 ss22ever22 When I do git clone http://gerrit.ovirt.org/p/vdsm.git it says unable to,access and could not resolve host
08:02 cyan__ joined #git
08:04 mmmveggies joined #git
08:05 King_Hual joined #git
08:05 Thorn__ joined #git
08:08 qws-user-1229 joined #git
08:08 timvisher joined #git
08:10 cqi joined #git
08:15 llamapixel moritz:  thanks will check it out.
08:17 moritz ss22ever22: that means either you don't have Internet access in the VM, or that the DNS is broken in there
08:18 Jellyg00se joined #git
08:20 moei joined #git
08:27 g5pw joined #git
08:28 spudowiar joined #git
08:28 llamapixel On first read moritz  I am not convinced but I am dull and oldie so thankyou for something to consider deeply. The DMZ article above might be pointing to something in the middle of flow and continuous however I will give it time to digest. I don’t have a reddit account but I will look at the link as well for educational purposes.
08:31 thiago joined #git
08:35 mikecmpbll joined #git
08:37 nettoweb joined #git
08:39 cdown_ joined #git
08:39 johnny56 joined #git
08:40 ediz__ joined #git
08:41 fuchstronaut joined #git
08:41 thiago joined #git
08:44 Jackneill joined #git
08:45 fscala joined #git
08:47 jozwior joined #git
08:47 Jameser joined #git
08:50 ss22ever22 joined #git
08:51 oskarkv joined #git
08:52 thiago joined #git
08:52 thiago joined #git
08:55 fedepad joined #git
08:57 MikeChernev joined #git
08:57 khmarbaise joined #git
08:58 liuzhen joined #git
09:02 jozwior_ joined #git
09:03 star_prone joined #git
09:03 boombatower joined #git
09:05 sea-gull_ joined #git
09:05 afuentes joined #git
09:06 elastix joined #git
09:10 Asido joined #git
09:11 lindenle joined #git
09:12 jargan joined #git
09:12 rishi`` joined #git
09:13 timvisher joined #git
09:15 sleezd joined #git
09:16 AlHafoudh joined #git
09:16 eizua joined #git
09:17 catsup joined #git
09:22 ss22ever22 joined #git
09:23 ss22ever22 joined #git
09:23 t0by joined #git
09:25 cagedwisdom joined #git
09:27 ss22ever22 remote end hung up while git cloning ..
09:28 ss22ever22 I even increased the postbuffer size ,any solutions?
09:28 cYmen joined #git
09:29 grawity the POST buffer size is only relevant when pushing, anyway
09:30 ss22ever22 So what can be done to sort this?
09:32 Wulf ss22ever22: check why this is happening
09:33 Wulf ss22ever22: ssh connection? Do you control the server?
09:36 ss22ever22 wulf/ No http,using it from vm on fedora changed sttings from nat to briged
09:36 ahmedelgabri joined #git
09:36 llamapixel ss22ever22:  what does push with -vvv show you?
09:37 llamapixel The most verbose message feedback would be the first task right? is it hanging at say 94% ?
09:37 Wulf llamapixel: they said "cloning"
09:38 llamapixel oops ;)
09:38 llamapixel does -vvv work in cloning?
09:38 llamapixel hehe
09:38 ss22ever22 Bash says push command not found :D
09:39 llamapixel try -v with clone
09:39 llamapixel https://git-scm.com/docs/git-clone
09:40 llamapixel I blame the Penfolds.
09:40 m0viefreak joined #git
09:40 ss22ever22 And it generallu halted at 18% I think before incrementing the postbuffer and after it with 54%
09:41 llamapixel Run it one more time and pipe the -v so you have that as data to review later.
09:41 multiproc joined #git
09:41 ss22ever22 -v is an unknown option it says
09:42 fuchstronaut joined #git
09:42 llamapixel https://www.irccloud.com/pastebin/7pPO3hDn/
09:44 llamapixel My GIT scope is narrow to a couple of Operating Systems. Ubuntu / OSX so I should not advise after this post and listen.
09:45 ss22ever22 Alright thanks fr advice :)
09:46 ss22ever22 Trying to clone again
09:46 ss22ever22 But it stops everytime
09:55 robotroll joined #git
09:58 barduck joined #git
09:59 dotmavriq joined #git
10:00 dotmavriq if I want to remove a line of code from a commit completely, how would I go about?
10:01 Lartza joined #git
10:02 timvisher joined #git
10:02 Impaloo joined #git
10:03 jim joined #git
10:05 mmmveggies joined #git
10:05 jim hi... I just did a git add . and it added about 40 files when I just wanted to add one... can I just reset it (empty the index) so I can add what I want?
10:05 jim in one shot that is
10:06 dodobrain joined #git
10:07 dodobrain joined #git
10:09 a_thakur joined #git
10:10 m0viefreak jim: git reset
10:10 jim just that?
10:10 m0viefreak yes
10:10 jim ok
10:11 Impaloo joined #git
10:11 dotmavriq I need to remove all commits before my latest
10:11 liuzhen joined #git
10:12 jim m0viefreak, great, thanks
10:13 dotmavriq How would I go about doing that?
10:13 dotmavriq is it a rebase function?
10:14 m0viefreak dotmavriq: can you explain what you are trying to do exactly?
10:14 m0viefreak why would you want to remove *all* commits except the latest?
10:15 dotmavriq m0viefreak: could you query me?
10:17 dotmavriq can you hear me?
10:19 theshitisay joined #git
10:22 dotmavriq m0viefreak: because everyone else is faulty and I don't want to share that information with my private repo on my Rpi
10:22 m0viefreak nobody wants you to share login information with anyone
10:22 jim lskeys
10:23 jim argh. sorry
10:23 SteffanW joined #git
10:23 jim lskeys
10:23 cdown joined #git
10:24 * jim falls down...
10:24 ss22ever22 joined #git
10:25 PioneerAxon joined #git
10:25 aapaaal joined #git
10:25 khfeng joined #git
10:26 ss22ever22 Can anybody please check running this command dnf install 'cat automation/check-patch.packages.f*'
10:26 f3r70rr35f joined #git
10:35 marlinc joined #git
10:39 bremner uh? wrong channel?
10:43 offtopik joined #git
10:43 multiproc joined #git
10:43 a_thakur joined #git
10:46 sagerdearia joined #git
10:46 xaa joined #git
10:52 llamapixel the guy got a response here and needs little extended help bremner
10:53 on1x joined #git
10:53 llamapixel debain the old new
10:53 f3r70rr35f joined #git
10:54 Murii joined #git
10:57 drbean joined #git
11:00 timvisher joined #git
11:01 DarkFox_ joined #git
11:03 jaguarmagenta joined #git
11:04 Faylite joined #git
11:09 jbitdrop joined #git
11:10 cdown joined #git
11:14 GT4066 joined #git
11:16 ss22ever22 joined #git
11:18 Phylock joined #git
11:27 treehug88 joined #git
11:29 ojdo joined #git
11:31 buffal0 joined #git
11:32 Jameser joined #git
11:36 nuck joined #git
11:37 Marbug_ joined #git
11:38 liuzhen joined #git
11:39 pothepanda joined #git
11:39 Shentino joined #git
11:42 manuel joined #git
11:43 fuchstronaut joined #git
11:44 sea-gull_ joined #git
11:44 manuel joined #git
11:45 lizzin joined #git
11:48 ss22ever22 joined #git
11:49 ieee joined #git
11:50 Cassiopaya joined #git
11:52 Orphis joined #git
11:52 durham joined #git
11:53 IlNominePatre joined #git
12:00 joki joined #git
12:00 durham joined #git
12:01 eivarv joined #git
12:02 rpg_ joined #git
12:02 manuel joined #git
12:03 timvisher joined #git
12:06 PCatinean joined #git
12:06 mmmveggies joined #git
12:07 thierryp joined #git
12:08 manuel joined #git
12:08 smithbone joined #git
12:09 manuel joined #git
12:10 manuel joined #git
12:11 manuel joined #git
12:13 manuel joined #git
12:13 mikecmpbll joined #git
12:13 lindenle joined #git
12:14 manuel joined #git
12:15 dave0x6d joined #git
12:18 acetakwas joined #git
12:18 bruce_lee joined #git
12:21 ieee joined #git
12:35 Ingu joined #git
12:38 mikecmpb_ joined #git
12:39 bulletmark joined #git
12:40 ok91 joined #git
12:41 a_thakur joined #git
12:41 NimeshNeema joined #git
12:45 fuchstronaut joined #git
12:46 rbern joined #git
12:47 sdothum joined #git
12:50 danslo joined #git
12:51 Shock_ joined #git
12:52 Zoxc joined #git
13:00 joki joined #git
13:00 aard_ joined #git
13:01 dsdeiz joined #git
13:01 buffal0 joined #git
13:01 bronson joined #git
13:03 timvisher joined #git
13:04 jaguarmagenta joined #git
13:11 eshlox joined #git
13:12 _ix joined #git
13:13 _Vi joined #git
13:13 re1 joined #git
13:14 re1 joined #git
13:15 mizu_no_oto joined #git
13:19 multiproc joined #git
13:24 anuxivm joined #git
13:32 Pqmy6 joined #git
13:33 fees joined #git
13:35 cdg joined #git
13:39 jimi_ joined #git
13:42 hexagoxel joined #git
13:45 fuchstronaut joined #git
13:45 TinkerTyper joined #git
13:45 jozwior joined #git
13:46 constant joined #git
13:48 robotroll joined #git
13:48 vuul joined #git
13:49 overlord_tm joined #git
13:52 ramsub07 joined #git
13:52 ramsub07 hello, can i change the time stamp of a commit ?
13:56 timvisher joined #git
13:56 grawity which one? use --date for the 'commiter' timestamp
13:57 _ikke_ You have to rewrite the commit
14:01 thesha joined #git
14:06 Murii joined #git
14:07 mmmveggies joined #git
14:07 souther joined #git
14:07 Lauven joined #git
14:08 Lauven joined #git
14:09 Murii joined #git
14:10 mehola joined #git
14:11 spudowiar joined #git
14:12 FirewalkR joined #git
14:13 Murii joined #git
14:15 SteffanW joined #git
14:16 lindenle joined #git
14:17 rgrinberg joined #git
14:17 e14 joined #git
14:18 khmarbaise_ joined #git
14:18 khmarbaise_ joined #git
14:20 luxPerpetua joined #git
14:21 liranp joined #git
14:22 HoierM joined #git
14:30 e14 joined #git
14:31 grayjoc joined #git
14:34 snowkidind joined #git
14:34 _ix joined #git
14:35 GenZai joined #git
14:39 xaa joined #git
14:42 acetakwas joined #git
14:45 qws-user-1228 joined #git
14:48 ramsub07 _ikke_: like ?
14:50 Endarked joined #git
14:51 thesha joined #git
14:52 danslo joined #git
14:54 buddyq joined #git
14:54 eivarv joined #git
14:58 fahadash joined #git
14:58 constant joined #git
14:58 dreiss joined #git
14:58 _ikke_ with either amend or rebase
14:59 _ikke_ Unless of course it's a new commit
15:00 dviola joined #git
15:00 diogenese joined #git
15:01 pikajude joined #git
15:05 jaguarmagenta joined #git
15:06 shinnya joined #git
15:07 barduck joined #git
15:07 Kitty- joined #git
15:08 Discovery joined #git
15:09 timvisher joined #git
15:09 anonymuse joined #git
15:09 star_prone joined #git
15:10 IlNominePatre joined #git
15:12 mehola joined #git
15:13 aax joined #git
15:14 pikajude joined #git
15:15 a3Dman joined #git
15:16 durham joined #git
15:23 aeae64ff8df64d2a joined #git
15:24 rpg joined #git
15:25 aolusr joined #git
15:25 acetakwas joined #git
15:28 eggoez joined #git
15:30 catsup joined #git
15:31 liquidjamm joined #git
15:36 madewokherd joined #git
15:36 hariel joined #git
15:37 FirewalkR joined #git
15:39 mllie joined #git
15:42 mllie left #git
15:42 Gambaroni joined #git
15:42 Gambaroni I have a lot of files where only ^M/newlines differs. How could I get the files that actually differs and discard all the other changes?
15:45 shgysk8zer0 joined #git
15:45 vlt Gambaroni: There are some options for diff like -w, -b or --color-words.
15:46 sangy joined #git
15:46 rgrinberg joined #git
15:46 fuchstronaut joined #git
15:46 Gambaroni vlt: Yeah, I tried git diff -w --name-only, but that also gave me all the files
15:47 buffal0 joined #git
15:50 f3r70rr35f joined #git
15:51 msonntag joined #git
15:52 publio joined #git
15:56 f3r70rr35f joined #git
15:57 harish joined #git
15:59 timvisher joined #git
16:03 buffal0 joined #git
16:04 dsdeiz joined #git
16:07 mmmveggies joined #git
16:09 SporkWitch joined #git
16:10 DeltaHeavy joined #git
16:11 GGMethos_ left #git
16:11 a_thakur joined #git
16:12 pikajude_ joined #git
16:12 pikajude_ joined #git
16:15 jaguarmagenta joined #git
16:16 kyan joined #git
16:18 GGMethos joined #git
16:24 anonymuse joined #git
16:24 _tpavel joined #git
16:26 salamanderrake in git diff what does ^M mean at the ends of lines?
16:27 eivarv joined #git
16:28 ieee salamanderrake: that the character '^M' (aka '\r') is at end of lines
16:29 zivester joined #git
16:30 Xethron joined #git
16:31 thiago joined #git
16:31 a_thakur_ joined #git
16:31 themayor joined #git
16:32 nikivi joined #git
16:33 noidea joined #git
16:33 noidea joined #git
16:37 franl joined #git
16:38 salamanderrake ok
16:38 OnBrokenWings joined #git
16:39 alex1a joined #git
16:43 Ahmed90 joined #git
16:45 meLon joined #git
16:46 mrmadcat joined #git
16:49 ekinmur joined #git
16:49 FirewalkR joined #git
16:50 star_prone joined #git
16:52 skyres joined #git
16:52 Cabanossi joined #git
16:52 Goplat joined #git
16:52 Goplat joined #git
16:53 dsdeiz joined #git
16:53 Cabanossi joined #git
16:54 danslo joined #git
16:54 kyan joined #git
16:54 grayjoc joined #git
16:55 timvisher joined #git
16:55 zidane_g joined #git
16:55 zidane_g joined #git
16:58 nettoweb joined #git
16:59 dreiss joined #git
16:59 overlord_tm joined #git
17:00 cbreak salamanderrake: evil CRLF
17:00 salamanderrake thats what I was thinking, that is what clang-format put at the end of some lines it changed.
17:00 BSaboia joined #git
17:00 lindenle joined #git
17:00 Eryn_1983_FL joined #git
17:01 brokensyntax joined #git
17:01 svm_invictvs joined #git
17:01 cbreak salamanderrake: it probably adds the same line endings that are everywhere in the file
17:02 cbreak convert them to LF before formating :)
17:02 BSaboia joined #git
17:04 Phylock joined #git
17:05 _main_ joined #git
17:05 khmarbaise joined #git
17:07 f3r70rr35f joined #git
17:07 thesha joined #git
17:10 meLon joined #git
17:10 lindenle joined #git
17:12 Darcidride joined #git
17:12 eivarv joined #git
17:13 mehola joined #git
17:15 salamanderrake ran dos2here(dos2unix) and it fixed all the ^M's that were in my files.
17:16 lindenle joined #git
17:17 Darcidride joined #git
17:22 f3r70rr35f joined #git
17:26 leftriver23 joined #git
17:29 roentgen joined #git
17:30 svm_invictvs joined #git
17:32 constant joined #git
17:32 CheckDavid joined #git
17:37 DolphinDream joined #git
17:37 bcc joined #git
17:37 bcc joined #git
17:37 star_prone joined #git
17:37 Xethron joined #git
17:38 diogenese joined #git
17:39 vuoto joined #git
17:40 raijin joined #git
17:41 multiproc joined #git
17:41 MrWoohoo joined #git
17:42 anuxivm left #git
17:42 anuxivm joined #git
17:42 jozwior joined #git
17:43 PioneerAxon joined #git
17:44 mrmadcat joined #git
17:44 dreiss joined #git
17:44 Anja joined #git
17:46 ok91 joined #git
17:46 jaguarmagenta joined #git
17:48 fuchstronaut joined #git
17:48 timvisher joined #git
17:48 thierryp joined #git
17:48 bmahe joined #git
17:49 multiproc joined #git
17:49 buffal0 joined #git
17:51 lizzin joined #git
17:51 cagmz joined #git
17:53 cagmz joined #git
17:53 TheOrangeOne joined #git
17:54 leftriver45 joined #git
17:55 OnBrokenWings joined #git
17:56 leftriver45 I asked this question about git log on SO: http://stackoverflow.com/questions/39946636/git-log-inconsistency-in-file-states -- if anyone could help that would be great.
17:56 whomp joined #git
17:57 FirewalkR joined #git
17:58 whomp hi, i want to merge the changes that have occurred in master for just one file. i want to do this because if i just do `git merge master`, then i'll invalidate the cache and rebuild the whole project from scratch. any ideas?
17:58 quickbrownfox joined #git
18:01 InfoTest joined #git
18:01 Endarked joined #git
18:03 vuoto joined #git
18:03 akanksha_ joined #git
18:03 JamesBaxter joined #git
18:04 xameada_ joined #git
18:05 f3r70rr35f joined #git
18:05 jknetl joined #git
18:05 multi_io joined #git
18:08 mmmveggies joined #git
18:09 grayjoc joined #git
18:11 RxMcDonald joined #git
18:12 RxMcDonald Hello, anyone knows how to disable the submodules functionality? I just want to have a single project and it tells me that the submodules are dirty when I'm trying to commit my changes and it's not staging the changes in the module
18:12 mycelium joined #git
18:13 thesha joined #git
18:13 RxMcDonald git commit -am "Message" it's not grabbing the changes in the "module" folder
18:14 mehola joined #git
18:14 whomp joined #git
18:15 RxMcDonald Anyone knows how to disable submodules functionality? I don't want any module/submodule crap just commit
18:16 inflames joined #git
18:16 Opertus joined #git
18:16 werdfriek joined #git
18:17 _Pj joined #git
18:20 joki joined #git
18:21 werdfriek joined #git
18:25 raijin joined #git
18:26 Raging_Hog joined #git
18:27 Guest40889 left #git
18:27 WayToDoor joined #git
18:27 jknetl joined #git
18:30 viper474 joined #git
18:31 thekrynn_ joined #git
18:32 cbreak RxMcDonald: don't bother
18:32 cbreak RxMcDonald: if you don't want submodules, just don't use them
18:32 cbreak there's no point in removing the functionality for it
18:33 m0viefreak joined #git
18:33 f3r70rr35f joined #git
18:34 shinnya joined #git
18:35 werdfriek is it possible to restrict certain commands with git? Generally speaking, can I enforce policy upon git? I'm just curious.
18:35 buffal0 joined #git
18:36 eivarv joined #git
18:36 RxMcDonald cbreak: thats exactly what i'm trying to do, but when I do git status it shows that it is excluding changes made to a submodule and also git commit isn't adding my changes to the "submodule", i dont know how to not use submodules, all im doing is git add -A and git commit
18:36 cbreak RxMcDonald: no
18:36 cbreak RxMcDonald: removing submodules is a bit more tricky
18:37 cbreak think about what you want
18:37 cbreak just the tree of the submodule
18:37 cbreak or all history of it?
18:37 RxMcDonald think about what you want? lol I said it 3 times already
18:38 RxMcDonald just work and commit as if I didn't have submodules
18:38 timvisher joined #git
18:38 RxMcDonald git commit -am "message" is not adding the changes to a folder that this stupid crap is treating like a submodule
18:39 cbreak RxMcDonald: think  harder
18:39 RxMcDonald all i want to do is git commit -am "message" and add all changes to my whole project, all files everything
18:39 cbreak RxMcDonald: and answer my question when you're done
18:39 cbreak RxMcDonald: do you want to lose history or not?
18:39 RxMcDonald the history of the submodule? it doesnt have any history
18:39 FirewalkR joined #git
18:40 RxMcDonald I just created it
18:40 Raging_Frog joined #git
18:40 cbreak RxMcDonald: then delete it
18:40 cbreak rm -rf path/to/.git
18:40 RxMcDonald delete what?
18:40 cbreak the submodule repository
18:40 cbreak the .git dir inside it to be exact
18:41 physikoi joined #git
18:41 cbreak then git rm --cached path/to
18:41 cbreak (for the submodule to)
18:41 RxMcDonald it doesnt have any .git dir
18:41 cbreak then you can add it as normal files)
18:41 cbreak RxMcDonald: of course it has
18:41 cbreak otherwise it wouldn't be a git repository
18:41 star_prone joined #git
18:41 cbreak and only git repositories can be submodules
18:43 RxMcDonald lol it didnt show in sublime file tree
18:44 cbreak directories that have a name that starts with a . are often invisible
18:44 cbreak files too
18:45 RxMcDonald not in sublime, it ignores .git tho
18:45 RxMcDonald didn't notice
18:48 RxMcDonald cbreak: and how do I add the changes now? It wont let me commit it doesnt see any difference and the freaking remote repo shows a symlink instead of the code in the submodule
18:48 physikoi Hello #git. I'm using hub, with sucess for the most part, but I'm confused about something. How do I go about merging two branches I created into a new third branch?
18:48 felixjet joined #git
18:48 cbreak RxMcDonald: do what I said above
18:48 cbreak delete the .git
18:48 cbreak then git rm --cached the submodule entry
18:48 RxMcDonald I already did
18:48 cbreak then git add the thing again
18:48 cbreak after that it'll just be plain files
18:49 RxMcDonald git rm cached?
18:49 cbreak --cached
18:49 cbreak the -- are significant
18:49 fuchstronaut joined #git
18:49 fuchstronaut joined #git
18:49 cbreak physikoi: git checkout third, git merge a, git merge b
18:50 physikoi cbreak: thanks. I'm gonna try that now!
18:50 RxMcDonald alright that worked i guess :(
18:50 bcc joined #git
18:50 bcc joined #git
18:50 RxMcDonald crap i meant happy face
18:50 star_prone joined #git
18:51 physikoi cbreak: I get "All-ready up to date," which is not the case. That said, I'm probably misinterpreting the message.
18:51 RxMcDonald yea it worked, ty cbreak
18:51 cbreak why do you think it's not the case?
18:51 cbreak !lol
18:51 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
18:51 cbreak physikoi: pastebin the result of that
18:52 physikoi Hi cbreak , what exactly is it that i should pastebin?
18:52 axisys joined #git
18:52 cbreak !lol
18:52 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
18:52 cbreak at least a page or two, so that I see the branches involved
18:52 bonhoeffer joined #git
18:53 raijin joined #git
18:54 werdfriek A tutorial on git that I'm following says: "Detaching HEAD just means attaching it to a commit instead of a branch. This is what it looks like beforehand:"  <---  Does that sound right to you guys?
18:55 physikoi Good command to know!
18:55 physikoi http://pastebin.com/RQLjkvfF
18:55 physikoi cbreak: to be clear, I want to merge "auxiliary-button" and "sets" into "sets+aux"
18:55 danslo_ joined #git
18:56 cbreak auxilary-buttons is already merged
18:56 cbreak I don't see sets
18:56 cbreak ah, there it is
18:56 cbreak it's also merged
18:56 thiago joined #git
18:56 ieee joined #git
18:56 cbreak physikoi: you're done
18:57 werdfriek I thought "detached head" meant the head was made inaccessible because is was detached from everything, isolated, alone ....
18:57 werdfriek no?
18:57 rgrinberg joined #git
18:58 physikoi cbreak: oh...don't tell me I only forgot to push...brb
19:01 physikoi cbreak: ok, after pushing, the branch sets+aux appears on github; however, code from auxiliary-button is not actually merged into it. I guess I'm still missing something?
19:01 raijin joined #git
19:01 cbreak physikoi: it is merged
19:01 cbreak af77677
19:02 dsdeiz joined #git
19:02 dsdeiz joined #git
19:02 barteks2x joined #git
19:03 thierryp joined #git
19:04 __main__ joined #git
19:04 eivarv joined #git
19:05 rpg joined #git
19:06 raijin joined #git
19:06 thierryp joined #git
19:07 buddyq joined #git
19:07 postitnoteninja joined #git
19:08 mikecmpbll joined #git
19:09 physikoi cbreak, you are right. I think I just muddled things accidentally. Thank you.
19:11 werdfriek Is it possible to alias a commit's hash and use that alias in place of the hash?
19:11 werdfriek to use it in place of the hash in any command that would require it  - I mean
19:12 tgummerer werdfriek: a lightweight tag could serve as the alias
19:12 tgummerer I think all commands that take a commit hash can also take a tag
19:13 werdfriek tgummerer: pretty cool. Seems like a guy could do a lot with that
19:13 barduck joined #git
19:14 werdfriek Then a tag is a pointer?
19:14 werdfriek the same way HEAD is a pointer right?
19:15 f3r70rr35f joined #git
19:15 bcc joined #git
19:15 bcc joined #git
19:16 tgummerer werdfriek: yeah, except that a tag is immutable
19:17 tgummerer (you can delete and re-create it, but it won't change when you check it out and add commits etc.)
19:17 werdfriek tgummerer: Immutable meaning can't be moved after it is created / stays where its created?
19:17 werdfriek right
19:19 Noldorin joined #git
19:19 werdfriek this is interesting. So I can use it like a marker (or markers with multiple tags) and make navigation and rebasing and everything easier? Then just delete the markers (tags) when I'm done?
19:20 werdfriek right on
19:20 tgummerer werdfriek: yep, you could definitely do that
19:21 cbreak werdfriek: HEAD is a symbolic ref
19:22 cbreak werdfriek: tags are not symbolic, they refer to a hash (of a commit, a tree or a blob)
19:22 cbreak tags and branches are mostly the same
19:22 werdfriek sweet
19:22 kfunk joined #git
19:22 cbreak just that tags live in refs/tags, and branches live in refs/heads
19:23 _ADN_ joined #git
19:23 cbreak werdfriek: type git show-ref on a repository
19:23 cbreak it'll show all refs it contains
19:23 timvisher joined #git
19:26 _ADN_ joined #git
19:27 raijin joined #git
19:27 werdfriek cbreak: That's pretty cool.
19:28 rahtgaz joined #git
19:28 eivarv joined #git
19:29 rahtgaz joined #git
19:29 Raging_Brok joined #git
19:30 daynaskully joined #git
19:30 werdfriek So if the order in a normal branch situation is: HEAD --> master --> commit  then what is the sequence of that chain when I add a tag to it?
19:31 werdfriek tag --> HEAD --> master --> commit?  or  HEAD --> tag --> master --> commit?
19:33 ieee werdfriek: whenever, you can tag any (existing) commit at any time
19:34 ieee 'git tag <tagname> <SHA of ancient commit>' will happily work
19:34 thiago joined #git
19:38 werdfriek I think this git stuff is finally starting to click. I'm one of these guys needs some image to visualize about a thing in order to make it work. To me HEAD is just like my mouse pointer now. Whatever I point at in my repo I can do something to if I want (get rid of it, move it, copy it, whatever). Friggin sweet!!!
19:38 durham joined #git
19:39 nidr0x joined #git
19:39 werdfriek Thats how it was with file manipulation through the gui 20 years ago. Once I learned how to navigate and save stuff in different formats the entire system unfolded for me.
19:40 werdfriek Hey thx for entertaining my rambling
19:41 star_prone joined #git
19:42 f3r70rr35f joined #git
19:44 luxPerpetua joined #git
19:45 nidr0x joined #git
19:46 raijin joined #git
19:46 cdown_ joined #git
19:50 fuchstronaut joined #git
19:53 kulelu88 joined #git
19:54 raijin joined #git
19:55 averell joined #git
19:55 luxPerpetua joined #git
19:57 cbreak werdfriek: the tag is a separate chain that directly points at the commit hash
19:57 cbreak (or any other hash)
19:58 cbreak !cs
19:58 gitinfo "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup
19:59 cbreak werdfriek: HEAD points to a branch (or a commit if you're detached), commit points to tree, tree points to other trees, or blobs. The commit also has parents if it's not a root commit, so it points to other commits
19:59 cbreak this whole structure is a directed acyclic graph.
19:59 cbreak directed because every edge in the graph has a direction, to the parent.
19:59 cbreak acyclic because there are no cycles
20:01 cagedwisdom joined #git
20:01 jstimm_ joined #git
20:02 spudowiar joined #git
20:03 ResidentBiscuit joined #git
20:03 leeN joined #git
20:04 raijin joined #git
20:06 timvisher joined #git
20:08 jaguarmagenta joined #git
20:10 drizztbsd joined #git
20:11 ResidentBiscuit joined #git
20:12 nilg joined #git
20:12 ramsub07 joined #git
20:13 werdfriek cool
20:14 ryez joined #git
20:14 mehola joined #git
20:15 ok91 joined #git
20:15 werdfriek takes me back to discrete math days
20:16 johnmilton joined #git
20:16 werdfriek I don't recall who it was but someone turned me on to : http://learngitbranching.js.org/   <--- totally rocks!
20:17 thierryp joined #git
20:17 durham joined #git
20:20 f3r70rr35f joined #git
20:21 Darcidride joined #git
20:22 Guest26 joined #git
20:24 mmmveggies joined #git
20:26 inflames joined #git
20:27 pothepanda joined #git
20:28 aard_ joined #git
20:29 mischat joined #git
20:29 fmcgeough joined #git
20:29 axisys joined #git
20:30 spudowiar joined #git
20:32 elastix joined #git
20:33 spudowiar joined #git
20:33 aidalgol joined #git
20:34 a3Dman joined #git
20:35 spudowiar joined #git
20:38 werdfriek so, if you want to ascend a branch you have upcaret ^ and tilde ~  but what if you want to "descend" ?
20:39 werdfriek Are there operators for that or do you have to use some totally different approach?
20:40 canton7 in git, each commit has a reference to its parent, but there's no reference going the other way. You can't say to a commit "ok, give me the commit that came after you"
20:40 spudowiar1 joined #git
20:41 werdfriek I guess I would rephrase that : 'Are there operators that enable using relative refs to descend a branch (rather than ascend)?'
20:41 mehola joined #git
20:41 canton7 sorry, I wasn't clear enough. No, there are no operators, because it's not an operation that git knows how to do
20:42 meLon joined #git
20:43 f3r70rr35f joined #git
20:45 spudowiar joined #git
20:45 cbreak it is impossible to say with certainity which commits follow any given commit
20:45 cbreak since no git repository has to know all of history
20:45 franl joined #git
20:46 cbreak at best you could get an incomplete picture by searching all refs for commits that decend from a given commit
20:47 ryez_ joined #git
20:47 ryez left #git
20:48 werdfriek cbreak: well that makes sense ( "directed " )
20:49 ryez joined #git
20:50 ryez not exactly what you want, but there's .. and ...
20:50 ryez https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection#Commit-Ranges
20:50 fuchstronaut joined #git
20:50 meLon joined #git
20:51 werdfriek But there must be some mechanism to know? If I git checkout HEAD~3; git log (linux bash shelll) - I still see the commit where HEAD was moved from in the results wouldn't I?
20:51 SwiftMatt joined #git
20:51 e14 joined #git
20:51 werdfriek I mean for git to know (internally)
20:51 werdfriek to look forward and discover children if they exist
20:52 shgysk8zer0 joined #git
20:52 nckpz joined #git
20:52 canton7 "I still see the commit where HEAD was moved from in the results wouldn't I" <-- nope.
20:53 canton7 if you 'git log --all', you'll see it (and other things) because it presumably still has a branch pointing to it
20:53 manuel joined #git
20:54 justanotheruser joined #git
20:54 manuel joined #git
20:54 timvisher joined #git
20:55 manuel joined #git
20:56 greendo joined #git
20:56 manuel joined #git
20:56 liquidjamm joined #git
20:57 manuel joined #git
20:58 manuel joined #git
20:58 spudowiar joined #git
20:58 drmt joined #git
20:59 manuel joined #git
20:59 meLon joined #git
20:59 A5101 joined #git
20:59 danslo_ joined #git
21:00 clemf joined #git
21:02 shgysk8zer0 left #git
21:03 Lipp joined #git
21:04 spudowiar joined #git
21:04 Kitty- joined #git
21:04 mizu_no_oto joined #git
21:05 clemf_ joined #git
21:06 Endarked joined #git
21:10 theskillwithin joined #git
21:12 AfterDarkness joined #git
21:13 xameada_ joined #git
21:13 AfterDarkness hello, got a question. I've used the following command `git stash save -u`
21:13 AfterDarkness but when I restore I only get the untraced files and not the tracked ones
21:13 AfterDarkness what's the problem?
21:14 mrcookienb joined #git
21:15 canton7 !repro ?
21:15 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
21:16 AfterDarkness https://ptpb.pw/Vbre
21:16 acetakwas joined #git
21:17 Kitty- joined #git
21:18 spudowiar joined #git
21:19 canton7 AfterDarkness, sorry, I'm not clear what that shows. the stash contained a couple of tracked files and a bunch of untracked files? when you tried to apply the stash, it refused to apply the untracked files. But there's no indication that it didn't restore the tracked files
21:19 Murii joined #git
21:19 moestevens joined #git
21:19 khmarbaise joined #git
21:20 canton7 not sure why 'git stash show' isn't showing the untracked files, but I see that behaviour too
21:20 lindenle joined #git
21:20 AfterDarkness yes it refuses because I've already applyed them, I am reapplying because my changes seems to be back to HEAD
21:20 AfterDarkness I used to have uncommitted files
21:20 canton7 I still haven't seen anything which suggests that the tracked changes weren't applied
21:21 AfterDarkness now i dont (besides the untracted files)
21:21 AfterDarkness why canton7 ?
21:21 canton7 there's nothing in your pastebin which shows what's in your working copy
21:21 canton7 'git status'?
21:21 AfterDarkness (ignoring the untracked files) git status shows nothing, I used to have 4 files before stashing
21:21 canton7 also, what do you mean by "I am reapplying because my changes seems to be back in HEAD"? What does "changes seems to be back in HEAD" refer to?
21:22 AfterDarkness https://ptpb.pw/HA6W
21:23 AfterDarkness does the status output answers your last question?
21:23 canton7 I'm assuming that was run straight after the 'git stash show'?
21:23 AfterDarkness https://ptpb.pw/KywY
21:23 AfterDarkness yes
21:24 AfterDarkness like there's quite a bit of my work is gone, but thankful not much
21:24 canton7 nah, your work's safe
21:25 canton7 yeah, looks like 'git stash apply' doesn't apply the tracked changes if it can't apply the untracked ones
21:25 AfterDarkness but why didn't it work the first time canton7 ? the first time it worked and no output was shown
21:25 AfterDarkness let me check again
21:26 canton7 not sure what you did the first time - that wasn't in your pastebin
21:26 canton7 483e6bd and 7fb0aa0 between them hold your tracked (and staged) changes, and f4444d7 holds the untracked files, so as long as you don't drop the stash those are safe: you won't need to redo them
21:27 AfterDarkness so i should checkout to those?
21:27 Celelibi joined #git
21:28 canton7 if it was me, I'd stash save -u again, then try applying stash@{1} again
21:28 AfterDarkness `git checkout 7fb0aa0` yup they were all there
21:28 fees joined #git
21:28 canton7 you can cherry-pick --no-commit 483e6bd or 7fb0aa0 though
21:28 canton7 yeah, but now you've !detached your HEAD
21:28 gitinfo 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
21:29 canton7 so make sure you know what you've done, or you'll end up in a stickier situation
21:30 AfterDarkness I'll try cleaning my working space and reapply the stash
21:30 kbdkode joined #git
21:31 canton7 make sure you checkout master again first
21:31 AfterDarkness yeah
21:33 AfterDarkness strange.. it worked after a clean
21:33 AfterDarkness got a bit worried here
21:33 AfterDarkness ty canton7
21:33 spudowiar joined #git
21:33 canton7 no worries
21:33 canton7 you wouldn't happen to have a log of what happened the first time around in your terminal's history?
21:33 mizu_no_oto joined #git
21:33 AfterDarkness my terminal buffer is infinite
21:34 AfterDarkness so i should but.. gonna be a headache
21:34 AfterDarkness can still look for it if you insist
21:34 canton7 it's just for interest's sake - don't worry if it's a pain
21:34 * canton7 is off to bed in a min anyway
21:34 aapaaal joined #git
21:35 spudowiar joined #git
21:36 timvisher joined #git
21:37 AfterDarkness the reason why I had to stash my work was because I wanted to edit a previous commit(the 2nd last one) didn't figure out how to do it and decided to just do another commit
21:37 canton7 rebase -i is the easiest way to edit a commit that's a couple of commits ago
21:38 AfterDarkness yeah I was doing that got confused in the process and just did a `git rebase --abort`
21:38 FirewalkR joined #git
21:38 AfterDarkness then faced that stash issue
21:39 canton7 which might have left the untracked files in your working dir?
21:39 canton7 since the rebase --abort will probably have ignored them
21:39 AfterDarkness hmm i did stash save -u
21:39 AfterDarkness doesnt that remove them?
21:40 canton7 you did that in the middle of the rebase?
21:40 canton7 and yeah it should remove them
21:40 AfterDarkness no before rebase
21:40 canton7 right, and did you try and apply the stash in the middle of the rebase?
21:41 AfterDarkness I don't believe so
21:41 canton7 hrm, fair enough
21:42 AfterDarkness canton7, just search my terminal is seems I actually did apply the stash before aborting
21:42 NwS joined #git
21:42 AfterDarkness my bad
21:42 canton7 righty, that all makes sense then, I think
21:42 canton7 the git rebase --abort will have removed the tracked changes applied by the stash, but left the untracked ones alone
21:43 AfterDarkness I see
21:43 nowhere_man joined #git
21:43 AfterDarkness anyhow gn canton7, ty again
21:43 canton7 no worries
21:43 canton7 it's a bit silly that stash apply doesn't try and apply the tracked changes if the untracked ones failed
21:44 canton7 but I have a suspicion that stash save -u might be slightly new
21:44 AfterDarkness true at least it should stop trying to apply the rest of the untracked files when one fails
21:44 AfterDarkness but your suggestion was better imo
21:45 canton7 not sure what it does if it fails to apply one tracked file, whether it tries to do the next
21:45 canton7 but either way, it was a bit confusing :P
21:45 canton7 'stash show' should show untracked stuff as well
21:45 canton7 oh well, something for them to work on :)
21:47 nowhereman joined #git
21:49 AfterDarkness canton7, do you pref committing multiple files at once or one at a time(so that every file has its message)?
21:50 ramsub07 joined #git
21:52 mangolisk joined #git
21:54 cagedwisdom joined #git
21:55 yqt joined #git
21:55 viper474 joined #git
21:56 jstimm_ joined #git
21:58 nikivi joined #git
21:59 postitnoteninja joined #git
22:00 bulletmark joined #git
22:01 drizztbsd joined #git
22:03 Ahmed90 joined #git
22:03 xall joined #git
22:04 Lor_ joined #git
22:07 hacman joined #git
22:08 thierryp joined #git
22:09 jaguarmagenta joined #git
22:10 timvisher joined #git
22:13 sucks joined #git
22:15 sentriz joined #git
22:23 dviola joined #git
22:25 mmmveggies joined #git
22:25 anonymuse joined #git
22:27 theskillwithin ahaha this guy is being totally sarcastic  https://youtu.be/o4PFDKIc2fs
22:31 Emperor_Earth joined #git
22:31 _ikke_ yes, that's a good one
22:36 Kitty- joined #git
22:37 jeffreylevesque joined #git
22:41 jab416171 joined #git
22:42 mizu_no_oto joined #git
22:45 jnewt_ joined #git
22:46 justan0theruser joined #git
22:49 nikivi joined #git
22:50 theskillwithin https://github.com/robbyrussell/oh-my-zsh/wiki/Cheatsheet#git   glog command FTW
22:52 fuchstronaut joined #git
22:52 zacts joined #git
22:52 timvisher joined #git
22:54 moo joined #git
22:56 FirewalkR joined #git
23:00 qws-user-1229 joined #git
23:01 danslo_ joined #git
23:19 Derperperd joined #git
23:19 red82 joined #git
23:20 jab416171 joined #git
23:21 FrostCandy joined #git
23:22 pothepanda joined #git
23:25 moestevens joined #git
23:27 timvisher joined #git
23:29 Tonkers joined #git
23:30 Tonkers Heylo. so I've cloned my remote git repository onto my local machine, made a test commit, and am trying to git push it back to the remote origin. I'm getting a "refusing to update checked out branch" error though. what does this mean?? I'm so used to just git push and work
23:32 mablae_ joined #git
23:34 ramsub07 joined #git
23:39 mizu_no_oto joined #git
23:40 nevodka joined #git
23:40 Vampire0 Tonkers, you are trying to push to the checked out branch of a non - !bare repository
23:40 gitinfo Tonkers: A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
23:40 zivester joined #git
23:42 jaguarmagenta joined #git
23:45 nettoweb joined #git
23:47 ramsub07 joined #git
23:47 diogenese joined #git
23:52 DeltaHeavy joined #git
23:53 fuchstronaut joined #git
23:56 Derperperd joined #git
23:56 dreiss joined #git
23:59 cqi joined #git

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