Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-20

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

All times shown according to UTC.

Time Nick Message
00:00 n-st joined #git
00:00 bjoe2k4 joined #git
00:00 peepsalot joined #git
00:00 fk joined #git
00:00 dilfridge joined #git
00:01 Cerise joined #git
00:01 Cerise joined #git
00:01 vassagus joined #git
00:03 gruetzkopf joined #git
00:05 mrBen2k2k2k joined #git
00:07 ljc joined #git
00:08 yitz With gitpython, is there a way to check if a branch exists?
00:09 lizzin joined #git
00:11 zacsek joined #git
00:12 nikio_ left #git
00:12 Didac joined #git
00:13 Manuel15 joined #git
00:13 Manuel15 joined #git
00:15 kus joined #git
00:16 lizzin i have a file tracked by git-lfs, but git push is failing because this tracked file is too large. why is git still trying to push this tracked file? https://gist.github.com/anonymous/04f081773762a16c74fcf38ce8c91231
00:16 fuchstronaut joined #git
00:23 Derperperd joined #git
00:24 avar because it's not tracked by git-lfs
00:26 lizzin `git lfs tracked` lists the file: libTwilioClient.a (.gitattributes)
00:26 lizzin avar: am i not tracking it properly?
00:29 maLukTuk joined #git
00:29 avar What is the output of: git log --reverse --oneline --stat @{u}.. -- Pods/TwilioSDK/Libraries/libTwilioClient.a ?
00:29 The_Phoenix joined #git
00:29 avar My guess is that you lfs'd it later in the history, and are trying to push an earlier commit where it's not lfs'd
00:30 osse i don't know much about lfs, but can it be tracked by both at the same time+
00:30 osse ?
00:31 avar no, lfs'd files are stubs that will get checked out by a scrub filter
00:31 avar just a text file with a sha1 with an accompanying gitattributes file
00:31 SporkWitch it's not so much large file support as it is "blobs that don't delta well" support, as i understand it.
00:32 lizzin avar: https://gist.github.com/anonymous/f7ab146e52c40557ccf17e09d8d27e06
00:32 * SporkWitch doesn't fully understand how it works.
00:32 avar lizzin: yeah, so you need to rebase your history so ecf6195 is also lfs'd, or alternatively just squash those two together
00:33 fk joined #git
00:33 osse avar: i get that, just wondering if it's possible to start tracking a file using lfs and forget about untracking it in git.
00:34 gruetzko- joined #git
00:34 avar osse: I think they're mutually exclusive, but I haven't used it myself, only read about it
00:35 sostenuto joined #git
00:36 lizzin avar: how do i "squash those two together"?
00:38 avar git rebase -i @{u}
00:38 avar change the second "pick" line to "squash", save
00:38 avar well, assuming you have two commits,
00:39 avar blindly following instructions from people on #git may ruin your history :)
00:39 avar also, I now sleep
00:39 lizzin ha
00:40 lizzin thanks for helping
00:40 Electrometro joined #git
00:40 thiago joined #git
00:40 M-shine joined #git
00:41 andersoldahl joined #git
00:43 linuxmint joined #git
00:45 d1z joined #git
00:45 stamina joined #git
00:46 linuxmint joined #git
00:46 d1z what pattern do I need to add to .gitignore if I want to ignore all .zip files in all directories (parent, subdir, subdirs of subdirs... etc)
00:47 bremner *.zip
00:47 d1z that's what I just did and it didn't work
00:47 bremner in what way did it not work?
00:48 d1z I added a folder that had .zip files and the zip files were added to the commit
00:48 d1z I only noticed it after I commited, as I didn't do git status after adding them (pre commit)
00:49 cbreak d1z: it works
00:50 cbreak d1z: but obviously git won't ignore files you explicitly tell it to track
00:50 cbreak d1z: remove them, with git rm --cached, then git commit --amend
00:50 durham_ joined #git
00:50 neeca joined #git
00:51 d1z nah they're too many
00:51 bremner hmm. according to the docs, it should skip ignored files reached by "directory recursion".
00:51 d1z I think I'm going to undo this last commit (disappear it forever)
00:51 d1z and workaround it
00:52 cbreak no need
00:52 cbreak what I told you will work no matter how many files
00:52 crayon joined #git
00:53 d1z I've done git rm --cached file
00:53 d1z never "git rm -cached" alone
00:53 d1z that will revert/undo the last commit?
00:53 d1z I was going to follow this: http://stackoverflow.com/questions/927358/how-to-undo-last-commits-in-git
00:54 tesuji_ joined #git
00:54 mingrammer joined #git
00:56 bremner d1z: see the discussion of <file> in man git-rm
00:56 gitinfo d1z: the git-rm manpage is available at http://jk.gs/git-rm.html
00:56 bremner you don't have to type out every file name...
00:57 cbreak d1z: you obviously have to tell it what to remove
00:57 cbreak for example, remove the whole directory
00:57 cbreak or use find
00:57 cbreak or what ever
00:58 d1z the problem was the following. I have a bunch of .zip, .exe, .rar, .dem files inside a folder called cstrike, but the cstrike folder itself is also in the .gitignore file. So, because I needed to add it for a specific purpose, I created a new branch, and did 'git add cstrike -f'. It added everything in cstrike including those zip,exe,rar files
00:58 d1z http://sprunge.us/hiiN
00:58 d1z that's my gitignore file
00:58 cbreak d1z: irrelevant
00:58 cbreak do what I told you.
00:58 d1z cbreak: I get it, that's not what bothers e
00:59 osse The purpose of -f is to override gitignore
00:59 d1z what bothers me is understanding why git added the zip exe and rar files even though they are in thegitignore file
00:59 bremner because you typed -f
00:59 cbreak d1z: because you told git to
00:59 d1z osse: that's it then. Ofc
00:59 * d1z is madness
01:00 jadew joined #git
01:00 osse cstrike eh
01:02 Anderson69s_Deb joined #git
01:02 d1z osse: yes, I'm trying a bunch of addons, and texture packs, and I want to easily uninstall them via git
01:02 osse Sounds old school
01:02 cbreak git doesn't do uninstalling
01:03 cbreak but git has git clean
01:03 d1z I commit a clean state, then extract and try, and if I like it I commit, if I don't, I git checkout
01:03 cbreak if you're happy with deleting stuff, that will do
01:03 d1z cbreak: well that's how I do it :), will look into that git clean
01:04 pks joined #git
01:06 vassagus joined #git
01:06 dandaman joined #git
01:08 hanthings_ joined #git
01:08 d^sh joined #git
01:10 shgysk8zer0 joined #git
01:11 d1z osse: yeah I'm in the top cs 1.6 team in my city, we're all oldschool cs players (circa 2001). No csgo bs, raw 1.6. I do server stuff and we play like 1-2 times a week on lan. I'm about to try some new textures for several maps but they'd be a nightmare to remove manually, so I let git do it for me
01:11 d1z it's not what git was intended to do but hey it works
01:14 clemf joined #git
01:14 Remram[m] joined #git
01:14 Ineentho[m] joined #git
01:14 M-mistake joined #git
01:14 M-meznak joined #git
01:17 monoprotic joined #git
01:17 fk joined #git
01:17 fuchstronaut joined #git
01:23 Vampire0_ joined #git
01:23 _xor joined #git
01:25 beyertech joined #git
01:26 beyertech joined #git
01:26 red__ joined #git
01:28 cdown joined #git
01:29 hahuang61 joined #git
01:31 HoierM joined #git
01:31 anuxivm joined #git
01:33 Goplat joined #git
01:35 gruetzkopf joined #git
01:37 cdown joined #git
01:37 Dougie187 joined #git
01:42 nandi_ge___ joined #git
01:46 cdown_ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and doorbells | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?
01:48 beyertech joined #git
01:48 cdown joined #git
01:49 mingrammer joined #git
01:50 EvilPeng1 joined #git
01:50 netj joined #git
01:53 darkbit joined #git
01:54 fk joined #git
01:54 dandaman joined #git
01:56 cyan__ joined #git
02:01 ytl joined #git
02:05 JeremyD joined #git
02:05 JeremyD joined #git
02:08 ASOLAr joined #git
02:09 bruce_lee joined #git
02:09 bruce_lee joined #git
02:10 vassagus joined #git
02:11 chachasmooth joined #git
02:11 _Vi joined #git
02:12 arescorpio joined #git
02:13 lightstalker joined #git
02:13 _Vi git-apply man page states that --whitespace=fix should output warnings. But in my case it silently succeeds. Any other whitespace option fails with "patch failed"/"patch does not apply" without any detailed messages.
02:16 _Vi By the way, should "git merge -s octopus" or " -s resolve" leave different content in working tree and in index?
02:17 gruetzkopf joined #git
02:18 fuchstronaut joined #git
02:19 Drugo joined #git
02:22 theskillwithin joined #git
02:23 jaguarmagenta joined #git
02:32 lagothri1 joined #git
02:32 hexagoxel joined #git
02:33 Derperperd joined #git
02:34 Derperperd joined #git
02:35 jaguarmagenta joined #git
02:36 compeman joined #git
02:37 gruetzko- joined #git
02:37 jimi_ joined #git
02:37 crayon joined #git
02:39 fk joined #git
02:44 cdown joined #git
02:44 cd-rum joined #git
02:49 jnewt__ joined #git
02:51 Lyqyd joined #git
02:52 rchavik joined #git
02:52 cd-rum joined #git
02:54 Oog joined #git
02:58 fstd_ joined #git
03:00 Dougie187 left #git
03:06 kadoban joined #git
03:07 ronny joined #git
03:08 dandaman joined #git
03:09 toogley joined #git
03:10 monoprotic joined #git
03:11 rchavik joined #git
03:16 vassagus joined #git
03:18 fuchstronaut joined #git
03:21 Darren_ joined #git
03:24 d1z left #git
03:27 mehola joined #git
03:29 rchavik joined #git
03:31 ahmedelgabri joined #git
03:31 hahuang61 joined #git
03:33 BSaboia joined #git
03:44 red__ joined #git
03:46 raijin joined #git
03:54 tesuji joined #git
03:55 RustyShackleford joined #git
03:56 cd-rum joined #git
03:58 JacobsLadd3r joined #git
03:59 jefus joined #git
04:00 Darren_ joined #git
04:02 thecomedian joined #git
04:03 jetpack_joe joined #git
04:06 hide joined #git
04:18 Cabanossi joined #git
04:19 fuchstronaut joined #git
04:20 dsdeiz joined #git
04:20 vassagus joined #git
04:23 dandaman joined #git
04:23 duderonomy joined #git
04:24 falkenb01 joined #git
04:31 Derperperd joined #git
04:31 rj1 joined #git
04:42 dandaman joined #git
04:51 offlim joined #git
04:52 daynaskully joined #git
04:55 dandaman joined #git
04:57 inflames joined #git
05:10 lizzin joined #git
05:16 phaleth joined #git
05:16 subhojit777 joined #git
05:16 hahuang61 joined #git
05:19 Sonderblade joined #git
05:20 JanC_ joined #git
05:20 fuchstronaut joined #git
05:21 jefus joined #git
05:23 Sonder joined #git
05:26 vassagus joined #git
05:27 Jon28 joined #git
05:27 lizzin_ joined #git
05:28 ljc joined #git
05:29 johnny56_ joined #git
05:37 watabou joined #git
05:40 ShekharReddy joined #git
05:41 johnmilton joined #git
05:43 jefus joined #git
05:47 nilg joined #git
05:48 lotus left #git
05:53 a_thakur joined #git
05:53 bocaneri joined #git
05:54 darkbit joined #git
05:54 mingrammer joined #git
05:55 superjamie joined #git
05:56 superjamie hi, i'm looking for some advice on which method to use to achieve something
05:56 superjamie there is a repo with commits abc
05:57 superjamie at some point that was forked, and a few changes were added, xyz
05:57 superjamie however, development continued on the original repo, def
05:57 thiago "I'm trying to achieve something" and "repo with commits" aren't terribly informative pieces of data
05:57 superjamie now i wish to apply def on top of xyz
05:58 phroa man git-rebase
05:58 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
05:58 superjamie should i use rebase --onto for this?
05:58 thiago yes
05:58 superjamie awesome, thank you very much for the confirmation. i'm good from here
05:58 superjamie left #git
06:00 xlegoman joined #git
06:05 Emperor_Earth joined #git
06:07 steven_a_s joined #git
06:10 hahuang61 joined #git
06:11 offlim_ joined #git
06:16 Grievre joined #git
06:16 Grievre How do I create a new branch with my un-pushed changes from the current branch, and remove those changes from the current branch?
06:17 dsantiago joined #git
06:18 emPi joined #git
06:18 offlim_ left #git
06:18 Grievre git checkout -b new_branch_name, then checkout the old branch and git reset
06:20 offlim joined #git
06:21 fuchstronaut joined #git
06:24 netj joined #git
06:26 a_thakur joined #git
06:28 phanimahesh joined #git
06:29 thiago Grievre: there's a commit missing there
06:31 Guest85553 joined #git
06:31 Manuel15 joined #git
06:31 Manuel15 joined #git
06:31 vassagus joined #git
06:37 circ-user-FePRT joined #git
06:38 nivag joined #git
06:40 thiago_ joined #git
06:40 Guest85553 joined #git
06:41 jetpack_joe joined #git
06:41 cqi joined #git
06:43 cqi joined #git
06:43 ncd|leeN joined #git
06:44 cqi joined #git
06:44 dsdeiz joined #git
06:47 rewt`` joined #git
06:48 duderono_ joined #git
06:48 Surfer2010 joined #git
06:48 Andre_work joined #git
06:48 holgersson_ joined #git
06:49 bakabakabaka joined #git
06:49 a_ joined #git
06:49 benbergm1n joined #git
06:49 liuzhen_ joined #git
06:49 etcinit_ joined #git
06:49 BlessJah_ joined #git
06:49 rez joined #git
06:49 styx__ joined #git
06:49 FilipNor1ic joined #git
06:49 davidstrauss_ joined #git
06:49 kappy_ joined #git
06:49 ilmari_ joined #git
06:49 angular_mike_ joined #git
06:49 koro_ joined #git
06:49 ffledgli1g joined #git
06:49 rasmusto_ joined #git
06:49 Smirnov_ joined #git
06:49 Smirnov_ joined #git
06:49 brewmast1r joined #git
06:49 vals_ joined #git
06:50 jkt__ joined #git
06:50 dpower_ joined #git
06:50 iota_pi_ joined #git
06:50 armenzg_ joined #git
06:50 axisys_ joined #git
06:50 Tee_Pee_ joined #git
06:50 boxrick1_ joined #git
06:50 apipkin__ joined #git
06:50 DuncanT_ joined #git
06:51 NightStrike_ joined #git
06:51 stealthii_ joined #git
06:51 Anupkumar_ joined #git
06:51 noahsussman_ joined #git
06:51 cmn_ joined #git
06:51 imanc_ joined #git
06:51 aubreypwd_ joined #git
06:51 ELLIOTTCABLE_ joined #git
06:51 zero7_ joined #git
06:51 Lewix_ joined #git
06:51 pizzaops_ joined #git
06:51 bbhoss_ joined #git
06:51 nyuszika7h joined #git
06:51 ealvarez_ joined #git
06:51 tesuji_ joined #git
06:51 raininja joined #git
06:52 chamunks joined #git
06:52 elmcrest_ joined #git
06:52 m0f0x joined #git
06:52 m0f0x joined #git
06:52 Neic0 joined #git
06:53 teadrop__ joined #git
06:53 braderhart_ joined #git
06:53 tcurdt_ joined #git
06:53 yazdmich joined #git
06:53 rxo_ joined #git
06:53 Darcy joined #git
06:53 Darcy joined #git
06:53 martinklepsch|BN joined #git
06:53 n-st_ joined #git
06:53 ybden- joined #git
06:53 trelane_ joined #git
06:53 trelane_ joined #git
06:53 SirFunk_ joined #git
06:53 jgornick_ joined #git
06:53 canton7_ joined #git
06:53 Sigma[Mtp] joined #git
06:53 ahf_ joined #git
06:53 larrybolt joined #git
06:53 ThiefMasterrr joined #git
06:53 alip_ joined #git
06:53 relgar- joined #git
06:53 Novitsh_ joined #git
06:53 benaiah` joined #git
06:53 kirb_ joined #git
06:54 ploop_ joined #git
06:54 yaiyan_ joined #git
06:54 Jeroen joined #git
06:54 sadmac joined #git
06:55 Rish joined #git
06:55 McKraken_zzzzz joined #git
06:56 rmrrn joined #git
06:56 rmrrn joined #git
06:56 JyZyXEL joined #git
06:57 MeltedLux joined #git
06:57 thecomedian joined #git
06:57 duarteper joined #git
06:59 mda1 joined #git
06:59 JackMc joined #git
06:59 discopatrick joined #git
07:01 Emperor_Earth joined #git
07:02 ToeSnacks joined #git
07:02 mehdi__ joined #git
07:02 Awesomecase joined #git
07:03 githogori joined #git
07:03 linuxmint joined #git
07:04 alansaul joined #git
07:04 dalias joined #git
07:04 drawkula joined #git
07:05 DolphinDream joined #git
07:05 vuoto joined #git
07:10 ojacobson joined #git
07:11 toogley joined #git
07:12 stfn joined #git
07:13 kline joined #git
07:14 chandu20 joined #git
07:15 ramsub07 joined #git
07:17 tmz joined #git
07:19 musl joined #git
07:19 jimi_ joined #git
07:20 CIAguy joined #git
07:22 fuchstronaut joined #git
07:22 fhackdroid joined #git
07:24 LucaTM joined #git
07:31 daurnimator joined #git
07:32 lagothrix joined #git
07:32 reactormonk joined #git
07:32 johntramp joined #git
07:32 wloncom joined #git
07:33 roflin joined #git
07:33 markmarkmark joined #git
07:33 dhollinger joined #git
07:33 MacGyver joined #git
07:34 Caelum joined #git
07:34 robotroll joined #git
07:35 wrouesnel joined #git
07:36 vassagus joined #git
07:36 foul_owl joined #git
07:38 dreiss joined #git
07:41 mehola joined #git
07:41 a_thakur joined #git
07:41 ojdo joined #git
07:45 MrMojito joined #git
07:45 MrMojito joined #git
07:46 sanketdg joined #git
07:46 Groscheri joined #git
07:46 cyan__ joined #git
07:47 sanketdg joined #git
07:52 Emperor_Earth_ joined #git
07:54 ojacobson joined #git
07:54 Emperor_Earth_ joined #git
07:55 SteffanW joined #git
07:57 Guest85553 joined #git
08:00 mingrammer joined #git
08:00 jost joined #git
08:05 Guest85553 left #git
08:10 falkenb0t joined #git
08:11 dodobrain joined #git
08:15 _August_ joined #git
08:18 dan2k3k4 joined #git
08:24 n-st joined #git
08:27 dodobrain joined #git
08:30 a_thakur joined #git
08:31 _ADN_ joined #git
08:38 bjoe2k4 joined #git
08:41 stuh84 joined #git
08:41 vassagus joined #git
08:43 Ozd joined #git
08:44 ahmedelgabri joined #git
08:45 triad joined #git
08:46 a3Dman joined #git
08:46 cdown_ joined #git
08:49 triad good morning guys
08:49 triad could someone please point me to a simple git tutorial ?
08:51 FunkyAss joined #git
08:52 cdown joined #git
08:53 a_thakur joined #git
08:54 Balliad joined #git
08:57 circ-user-pwm5l joined #git
09:00 _August_ triad, google.com and youtube.com
09:01 JacobsLadd3r joined #git
09:02 JacobsLadd3r joined #git
09:03 t0by joined #git
09:04 JacobsLadd3r joined #git
09:05 a3Dman joined #git
09:06 JacobsLadd3r joined #git
09:09 button joined #git
09:11 khmarbaise joined #git
09:11 triad left #git
09:13 toogley joined #git
09:14 eivarv joined #git
09:16 irco joined #git
09:19 phanimahesh joined #git
09:19 The_Phoenix joined #git
09:20 The_Phoenix joined #git
09:21 bjoe2k4 joined #git
09:22 rahtgaz joined #git
09:23 zeroed joined #git
09:23 zeroed joined #git
09:23 fuchstronaut joined #git
09:24 sync2k16 joined #git
09:25 moei joined #git
09:26 tmz joined #git
09:27 cbreak I'd use http://duckduckgo.com/
09:28 phanimahesh joined #git
09:29 aard_ joined #git
09:31 netj joined #git
09:32 dan2k3k4 joined #git
09:33 blackwind_123 joined #git
09:36 rahtgaz joined #git
09:39 vuoto joined #git
09:40 vuoto joined #git
09:42 ToBeCloud joined #git
09:43 vuoto_ joined #git
09:46 vassagus joined #git
09:47 Akimb joined #git
09:49 vuoto joined #git
09:50 jefus joined #git
09:51 vuoto joined #git
09:52 _August_ i made a commit before switching to another branch, how can i commit my changes to the branch that I switched to. For example if I made a commit to branch BLUE and switched to branch RED before pushing how can I push the changes to branch RED
09:52 vuoto joined #git
09:56 mingrammer joined #git
09:56 DJ_Spies joined #git
09:59 jaguarmagenta joined #git
09:59 ORiON-- joined #git
10:00 mohabaks joined #git
10:00 robotroll joined #git
10:02 rahtgaz joined #git
10:05 gusnan joined #git
10:06 jackweb left #git
10:08 Darcidride joined #git
10:10 cbreak _August_: just cherry-pick it
10:10 cbreak git cherry-pick thecommityouwant
10:15 up_the_irons joined #git
10:17 gmh joined #git
10:18 fhackdroid joined #git
10:18 m0viefreak joined #git
10:20 howdoi joined #git
10:22 pampeho joined #git
10:22 jadew joined #git
10:23 paws_ joined #git
10:24 fuchstronaut joined #git
10:24 lb joined #git
10:27 stfn joined #git
10:30 fahadash joined #git
10:31 m0ltar joined #git
10:37 jefus_ joined #git
10:39 WizJin joined #git
10:39 ljc joined #git
10:43 harleyyyyymayes joined #git
10:44 rahtgaz joined #git
10:46 saidelike joined #git
10:49 _August_ cbreak, that doesnt work
10:50 vassagus joined #git
10:50 mingrammer joined #git
10:51 LucaTM joined #git
10:54 osse !doesntwork
10:54 gitinfo Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...
10:55 sdothum joined #git
11:01 wrouesnel3 joined #git
11:03 netcarver joined #git
11:07 dhinojosa joined #git
11:09 falkenb01 joined #git
11:09 khmarbaise joined #git
11:10 shmoon joined #git
11:10 shmoon yo
11:11 shmoon when i do a git pull origin mastr or i do a git rebase -i master, the vim editor opens with commit msg and shit
11:11 shmoon when i save that (:wq) git is unable to actually commit it
11:11 shmoon i have to execite git commit -m 'msg' again
11:11 shmoon why does this happen ?
11:11 saidelike joined #git
11:11 stamina joined #git
11:14 osse shmoon: what does git say after you quit vim ?
11:16 JrCs joined #git
11:18 ojdo joined #git
11:21 grift joined #git
11:25 fuchstronaut joined #git
11:26 saidelike joined #git
11:28 _August_ i made a commit before switching to another branch, how can i commit my changes to the branch that I switched to. For example if I made a commit to branch BLUE and switched to branch RED before pushing how can I push the changes to branch RED
11:30 _August_ im reading that if i do a soft reset head that should let me checkout the branch and recommit
11:30 _August_ but when i do that i keep getting text that say "more"
11:30 _August_ wtf is more?
11:30 mostlybadfly joined #git
11:32 _ikke_ Perphas easiest is cherry-picking commit to the new branch, and then resetting the old branch one commit back
11:32 _ikke_ perhaps
11:33 _August_ I tried that
11:33 _August_ didnt work
11:33 _ikke_ What did you try exactly? And what didn't work?
11:34 _August_ I tried git cherry-pick "Cimmit notes in here"
11:34 _ikke_ You need to provide the commit hash
11:34 _ikke_ (or the branch name, which resolves to the last commit on the branch
11:34 aard_ joined #git
11:35 quackgyver joined #git
11:36 EisNerd_ joined #git
11:37 _August_ ok now what?
11:38 _ikke_ switch back to the previous branch (BLUE), and git reset --keep HEAD~
11:38 _August_ do checkout the previous branch?
11:38 hackingNerd joined #git
11:38 _ikke_ git checkout BLUE
11:39 _August_ ok i checked out and reset
11:39 _ikke_ Done
11:39 _ikke_ You should now have the commit on RED, and not in BLUE anymore
11:41 _August_ im getting an error
11:41 _ikke_ What error?
11:42 _August_ http://pastie.org/private/r1xpuzgvwhjwnkxsdfv6w
11:42 _ikke_ Ah
11:42 _ikke_ So you already pushed BLUE, right?
11:42 _August_ i think i need to pull and then push
11:42 _August_ nope
11:42 _August_ havent pushed it
11:42 _August_ just committed
11:43 _August_ is there a way to pull and keep my changes?
11:43 _ikke_ Hold on a sec
11:43 _August_ i think thats what i need to do
11:43 aard_ joined #git
11:44 _ikke_ git rev-parse --symbolic-full-name v1.2
11:44 _ikke_ Were you working on v1.2?
11:44 Darcidride_ joined #git
11:45 _August_ no
11:45 _August_ i forgot all about it
11:45 _ikke_ Just do what it says, git fetch
11:45 _ikke_ Looks like someone updated a tag (if that's a tag)
11:46 neunon joined #git
11:46 hackingNerd left #git
11:46 hackingNerd joined #git
11:47 _August_ is that going to undo my changes?
11:47 SrPx joined #git
11:47 _ikke_ No
11:47 _ikke_ git fetch never touches your local branches
11:48 _August_ ok
11:48 _ikke_ (unless you touch the default refspec)
11:48 _August_ ok that worked
11:48 SrPx You're on the middle of a huge commit. Then you see a small detail in a line that could be improved. Then you see something that could be implemented with small another line. What do you do? Do you keep working on the big commit and come back to those things later, so there are 3 commits for 3 different things...
11:49 SrPx or do you just implement them right there, and then explain the 3 things on the commit?
11:49 _ikke_ SrPx: I usually do the former
11:49 osse SrPx: i use git add (maybe with -p) to make separeate commits
11:50 _ikke_ If I'm in a feature branch, and it fixes a commit in that feature branch, I use git commit --fixup
11:50 SrPx _ikke_: so you have a place where you keep notes of things you must do in a future?
11:50 SrPx _ikke_: or do you just remember that line 379 had a typo?
11:50 _ikke_ SrPx: With git you can specify what comes in the next commit
11:50 _ikke_ So I can just commit that single line change without comitting everything else
11:50 SrPx osse: pardon?
11:50 osse SrPx: commit it immediately; then you don't have to remember
11:51 SrPx _ikke_: how so?
11:51 _ikke_ SrPx: with git add --patch, git allows you to select hunks to stage
11:51 liuzhen joined #git
11:51 _ikke_ Only staged hunks will be comitted
11:51 _ikke_ (a hunk is a part of a diff)
11:52 hackingNerd_ joined #git
11:52 _August_ alright so whats next?
11:52 SrPx good to know, thanks
11:52 _ikke_ _August_: Can you try to push now?
11:52 _August_ yeah i did
11:52 osse SrPx: you have huge changes in files file1 file2 and file3. you notice a typo in file4. What I'd do is fix that, go to my terminal, do  git add file4; git commit -m 'Fix typo'
11:52 _August_ same error
11:53 osse SrPx: if it's in one of the same files, but in a discrete location, I'd use git add -p file2 (for example)
11:53 SrPx osse: I mean a typo on the same file
11:53 _ikke_ _August_: Can you tell what the comand I gave you returns?
11:53 _August_ acrually
11:53 _ikke_ git rev-parse --symbolic-full-name v1.2
11:53 _August_ slightly differnt error
11:53 _ikke_ ok
11:53 SrPx osse I'll read about that -p
11:53 _ikke_ SrPx: also read up on commit --fixup + rebase --autosquash
11:54 SrPx looks neat though, I'll try it now, hope it won't mess things up
11:54 osse SrPx: but if it's a typo in the same part of the file you have other changes I'd just include it in the same commit and probably not even mention it.
11:54 _August_ http://pastie.org/private/bvoru48tqnfauwgiqbk1jg
11:54 SrPx on this case not a typo, but I noticed a "TODO: implement X" and X could be implemented in a single line so I just did it
11:54 SrPx and erased the TODO line
11:55 _ikke_ _August_: is v1.2 a branch or a tag?
11:55 _August_ i tried git push origin v1.2
11:55 SrPx and thought: that won't fit the commit for what I'm doing now
11:55 liuzhen joined #git
11:55 osse SrPx: that deserves a  separate commit in my opinion.
11:55 _August_ branch
11:55 fractalizator joined #git
11:55 _August_ definitely a branch
11:55 _ikke_ _August_: What branch is RED and what branch is BLUE?
11:55 saidelike joined #git
11:55 osse SrPx: in reality I'd probably do it after. but if you think you might forget then do it and commit it now
11:55 _August_ v1.2 is red, development is blue
11:56 _ikke_ ok
11:56 SrPx okay :)
11:56 SrPx lots of knowledge, thank you
11:56 _ikke_ and you are now in v1.2?
11:56 vassagus joined #git
11:56 _August_ yup i tried to checkout again just to be sure and it said i was already on it
11:56 _ikke_ ok
11:56 osse SrPx: make some changes in discrete locations, then run 'git add -p'. you'll get the hang of it pretty quickly.
11:56 tomog999 joined #git
11:57 _ikke_ What you could do is git rebase origin/v1.2, to apply your local commit on top of the latest commits in v1.2
11:57 _ikke_ Then you should be able to push
11:58 _ikke_ _August_: (This basically means soneone else pushed changes to v1.2, and you first need to incorporate those changes locally)
11:58 _August_ he basically merged development to v1.2 as a new branch
11:59 _August_ i dont know if that makes a difference since we have to go through rebase
11:59 osse SrPx: the real question is: how is that even a TODO when the implementation is a one-line change? Are you some sort of coding wizard or is the other guy just dumb? :P
11:59 SrPx osse I'm the same guy, it was time to sleep and I didn't want to even think in anything, just close my computer and go
11:59 jaguarmagenta joined #git
12:00 _ikke_ _August_: No, it does not make a difference
12:00 _August_ what about stash?
12:00 osse SrPx: that makes sense
12:00 _ikke_ _August_: irrelevant
12:00 _August_ hmm ok, trying rebase now
12:00 _ikke_ you use stash before you have committed)
12:00 _ikke_ _August_: In this case, rebase is an alternative to merging, preventing 'useless' merge commits'
12:01 hackingNerd_ I forked a repo `https://github.com/MohammadBilalArif/glutton` and contribute, now another contributor is asking me to rebase my fork `https://github.com/mushorg/glutton/pull/16` ... I have tried by myself but I think I messed up.. I need help
12:01 _August_ ok
12:02 _August_ First, rewinding head to replay your work on top of it...
12:02 jefus joined #git
12:02 _ikke_ Sounds good
12:02 _ikke_ It should only rebase your commit
12:02 _August_ under it says Applying: blah blah blah
12:02 _ikke_ should finish in an instant
12:02 _ikke_ also good
12:03 _August_ so try to push again?
12:03 _ikke_ yes
12:04 _ikke_ A shortcut for this workflow is git pull --rebase
12:04 hackingNerd_ * https://github.com/MohammadBilalArif/glutton   *  https://github.com/mushorg/glutton/pull/16
12:04 _August_ that did it
12:04 fished joined #git
12:05 _ikke_ _August_: nice
12:05 _August_ thanks man
12:05 _August_ i appreciate it
12:05 _ikke_ hackingNerd_: Can you paste a !transcript?
12:05 gitinfo hackingNerd_: Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
12:05 _ikke_ _August_: no problem
12:06 hackingNerd_ _ikke_: you can help me?
12:07 _ikke_ hackingNerd_: Sure, if you provide information about what you've done
12:08 MrMojito1 joined #git
12:08 hackingNerd_ _ikke_: I forked a repo https://github.com/MohammadBilalArif/glutton and contribute, now another contributor is asking me to rebase my fork https://github.com/mushorg/glutton/pull/16 ... I have tried by myself but I think I messed up.. I need help
12:09 _ikke_ hackingNerd_: Yes, that's what you mentioned earlier. What you have you done to cause this 'mess'?
12:10 hackingNerd_ Before rebasing my branch was 13 commits ahead but now it is 26 commits ahead ... why?
12:11 _ikke_ What command did you execute?
12:13 dhinojosa joined #git
12:14 hackingNerd_ _ikke_: https://gist.github.com/MohammadBilalArif/7e9bd01eaa62b08087b65204b33f8a1f
12:14 subhojit777 joined #git
12:17 hackingNerd_ At this point I just want to make my fork equal to remote
12:18 hackingNerd_ _ikke_: what will be the result of this command in my case? (git reset --hard origin/master)
12:19 mingrammer joined #git
12:19 osse hackingNerd_: the result is that those 26 commit will effectively be gone
12:19 osse (ie not on that branch anymore)
12:20 hackingNerd_ osse: You mean https://github.com/MohammadBilalArif/glutton  will be exactly equal to https://github.com/mushorg/glutton/pull/16 ?
12:21 hackingNerd_ * https://github.com/mushorg/glutton/
12:21 osse i don't know which is which
12:21 osse but in any case the answer is no until you push to your fork
12:23 mohabaks joined #git
12:23 osse hackingNerd_: i see now the PR is from master to master.  on your local computer, what is "origin"? your fork or the original repo ?
12:24 hackingNerd_ osse: origin is my fork
12:24 osse in that case, assuming you're on master locally then master will become equal to your fork's master
12:25 hackingNerd_ yes...
12:25 osse if you want it to be equal to the original you need git reset --hard upstream/master or something like that
12:25 bittin joined #git
12:26 fuchstronaut joined #git
12:27 _ikke_ hackingNerd_: protip when working with pull requests, work on separate branches
12:28 piling joined #git
12:28 tomboy65 joined #git
12:28 hackingNerd_ osse: So I should run:  $ remote add glutton https://github.com/mushorg/glutton.git          &&   $ git reset --hard glutton/master
12:29 osse hackingNerd_: yes
12:29 hackingNerd_ _ikke_: Thanks ) I will follow
12:29 osse if this is really what you want to d
12:29 osse but what about the code you wrote?
12:31 hackingNerd_ osse: My code has been merged by remote... I just made small changes, I could write them again...
12:32 fuchstronaut joined #git
12:34 hackingNerd_ osse: In result of $ git reset --hard glutton/master  I got this answer: HEAD is now at 2919a3f Can specify logging (#11)
12:35 Ozd joined #git
12:36 hackingNerd_ osse: Now I am at this stage: https://gist.github.com/MohammadBilalArif/7e9bd01eaa62b08087b65204b33f8a1f  , Now I need to commit of pull?
12:36 Lyqyd joined #git
12:39 _ikke_ hackingNerd_: git pull should be enough
12:41 tsia joined #git
12:45 hackingNerd_ _ikke_: I getting this error https://gist.github.com/MohammadBilalArif/7e9bd01eaa62b08087b65204b33f8a1f
12:45 phanimahesh did you pull first?
12:46 hackingNerd_ I dont want to pull my fork otherwise my local (which has been hard reseted) will again be equal and 26 commits ahead from remote
12:46 _ikke_ phanimahesh: wrong advise
12:46 osse hackingNerd_: if you pull you will just mix your old crap (the stuff you wanted to blow away) with a clean master.
12:46 _ikke_ advice*
12:46 osse hackingNerd_: you need to push --force in this case
12:47 hackingNerd_ osse: you are right
12:47 phanimahesh _ikke_: Sorry, should've seen the backlog.
12:47 _Vi joined #git
12:47 fahadash joined #git
12:47 phanimahesh osse: please recommend --force-with-lease instead of force
12:47 hackingNerd_ phanimahesh: why?
12:48 phanimahesh Saves accidental "loss" of commits when collaborating with multiple people.
12:48 _ikke_ yeah, I recommend force-with-lease too
12:48 phanimahesh force with lease will fail if someone else pushed something to that branch meanwhile and you haven't noticed it.
12:48 eivarv joined #git
12:48 _ikke_ At least, don't have it locally so you could restore it again
12:49 hackingNerd_ phanimahesh: ah... its great
12:49 phanimahesh force will overwrite unconditionally, with lease will overwrite only if your local copy of the branch matches remote.
12:49 _ikke_ but when pushing to your own fork, it wouldn't matter much, but it's a safe practice
12:49 phanimahesh with lease can do more fancy stuff, but it's the most common usecase
12:50 cdown joined #git
12:51 hackingNerd_ osse, _ikke_ , phanimahesh Thanks a lot to all of you. Now I have for what I was seeking :).
12:51 osse does --force-with-lease fetch first?
12:51 _ikke_ osse: it doesn't
12:52 osse hmm, thinking about it it makes more sense that it doesn't
12:52 _ikke_ correct
12:53 _ikke_ Would be surprising too, a push trigger a fetch
12:53 phanimahesh technically forcewithlease takes an expectation of the remote branch's commit before overwriting it.
12:53 _ikke_ yes
12:53 phanimahesh the default happens to be your local view of the remote branch
12:53 _ikke_ You can even specify it
12:55 osse I'd advocate they rename --force-with-lease to --force, and --force to --force-without-lease
12:55 osse but in my defense, it's not a big deal when you're pushing to your own personal fork
12:55 hexafraction left #git
12:55 _ikke_ osse: Would break a lot of scripts I guesss
12:55 _ikke_ gues
12:55 _ikke_ (on avarage it's correct :P)
12:56 osse I like breaking scripts
12:56 osse but if you have scripted a force push then it sounds weird to do manual pushes mixed in :O
12:58 _ikke_ yes, but still
12:58 _ikke_ took a few before I understood what you meant
12:59 osse yeah I'm enigmatic like that
12:59 osse still no response to the patch I sent in on a friday evening. I am disappoint
12:59 osse (kidding)
12:59 Gamecubic joined #git
13:00 _ikke_ What's it about?
13:00 osse add %(upstream:gone) to for-each-ref
13:01 osse seems to be no way of getting the equivalent information that branch -vv can show
13:01 osse (marking a missing tracked ref)
13:02 _ikke_ Cannot seem to find the thread
13:06 a_thakur joined #git
13:08 luxflow joined #git
13:11 _ikke_ Are you sure the list receive it?
13:12 vassagus joined #git
13:14 eivarv joined #git
13:14 jefus joined #git
13:16 CussBot joined #git
13:17 shinnya joined #git
13:17 neeca joined #git
13:25 bremner joined #git
13:25 bremner joined #git
13:25 HoierM joined #git
13:26 _ikke_ osse: I see it in an archive
13:29 osse _ikke_: an archive? :O I sent it in about 16 hours ago
13:29 _ikke_ I mean a mailing archive
13:29 _ikke_ https://public-inbox.org/git/20160819215023.10770-1-oystwa@gmail.com/T/#u
13:30 _ikke_ Not sure why I did not receive it
13:30 _Patrick_ joined #git
13:30 osse that's the one
13:30 _ikke_ Ok, located it
13:31 eivarv joined #git
13:31 osse good, now tear it to pieces.
13:32 _ikke_ I'm not nearly as competent enough yet to be able to do that :P
13:37 l4v2 joined #git
13:41 osse i suppose that's a good sign
13:41 nfk joined #git
13:50 atomicb0mb joined #git
13:51 HanClinto joined #git
13:52 eivarv joined #git
13:53 Kicer86 joined #git
13:54 tcsc joined #git
13:54 ToBeCloud joined #git
13:54 armenzg joined #git
13:54 cqi joined #git
13:55 rgrinberg joined #git
13:56 rgrinberg joined #git
13:58 phanimahesh joined #git
13:58 JanC_ joined #git
13:59 bittin joined #git
14:00 jaguarmagenta joined #git
14:02 dendazen joined #git
14:03 jimi_ joined #git
14:07 mingrammer joined #git
14:07 neeca joined #git
14:08 fuchstronaut joined #git
14:09 jimi_ joined #git
14:17 jefus joined #git
14:18 jeeqi joined #git
14:18 vassagus joined #git
14:18 jaafar joined #git
14:18 xlegoman joined #git
14:30 dandaman joined #git
14:31 liuzhen joined #git
14:32 RustyShackleford joined #git
14:36 cdown joined #git
14:36 jefus joined #git
14:39 rwb joined #git
14:41 cdown joined #git
14:42 eivarv joined #git
14:43 Darren_ joined #git
14:46 Darcidride_ joined #git
14:47 nydel07 joined #git
14:49 dreiss joined #git
14:50 mal__ joined #git
14:54 jefus joined #git
14:54 linuxmint joined #git
14:58 Seveas osse: s/git config/test_config/
14:59 Seveas then you don't need the test_when_finished
15:01 mingrammer joined #git
15:02 Mogget joined #git
15:08 CheckDavid joined #git
15:09 fuchstronaut joined #git
15:11 khmarbaise joined #git
15:13 bittin joined #git
15:15 Goplat joined #git
15:16 stuh84 joined #git
15:16 airdisa joined #git
15:20 rgrinberg joined #git
15:22 LeBlaaanc joined #git
15:23 vassagus joined #git
15:23 ShekharReddy joined #git
15:23 vuoto joined #git
15:24 Zoffix joined #git
15:26 Zoffix Hey. I tagged a commit, then did `git pull --rebase` and then pushed my stuff to the repo. Now it looks like this https://gist.github.com/zoffixznet/b55f9cef9ed82f27adaf73bc4dc939fb  and `git describe` doesn't see my tag. Is there a way to fix it? And what would be the ramifications of fixing it (the repo may have been cloned by other people by now)?
15:26 madewokherd joined #git
15:26 osse Seveas: Probably a good idea. To be honest I just copied the test above. I find writing those tests really confusing
15:31 jaguarmagenta joined #git
15:31 Ranhir joined #git
15:33 _ikke_ Zoffix: Rebasing does not move tags
15:34 _ikke_ So you have to basically recreate the tag
15:34 dviola joined #git
15:35 Zoffix It does seem to "work" if I view it on git; as in, it gives me the right stuff and points to the right commit: https://github.com/perl6/nqp/releases/tag/2016.08
15:35 spudowiar joined #git
15:35 _ikke_ Zoffix: Yes, but it points to the commit before it was rebased
15:36 sync2k16 left #git
15:36 _ikke_ That's why git describe doesn't see your tag, because it's point to another (unnamed) branch
15:37 Zoffix What if I delete the tag and create a new one. What happens to people who have cloned the branch with the incorrect tag?
15:37 _ikke_ Zoffix: A good question. Tags are kind of special as in they're not expecting to change (and git somewhat ignores changing tags from the remote)
15:38 _ikke_ Zoffix: man git tag has a section about it ("On retagging")
15:38 gitinfo Zoffix: the git-tag manpage is available at http://jk.gs/git-tag.html
15:38 Zoffix OK, then I think I'll leave it as it is, and wait for someone smarter than me to figure out a fix :P
15:39 LA-MJ joined #git
15:39 Zoffix Haha "Just admit you screwed up, and use a different name."  Yup, I'll go with that :P
15:39 Zoffix Thanks for the help!
15:39 ahmedelgabri joined #git
15:40 _ikke_ YW ;-)
15:41 boombatower joined #git
15:42 cyan__ joined #git
15:43 flavster joined #git
15:45 rorro joined #git
15:45 efco joined #git
15:46 dandaman joined #git
15:48 Bob8989 joined #git
15:49 Finnoloid joined #git
15:52 bauruine_ joined #git
15:52 InfoTest joined #git
15:54 ahmedelgabri joined #git
15:54 Khisanth joined #git
15:56 mingrammer joined #git
15:56 basiclaser joined #git
16:03 thiago joined #git
16:05 kadoban joined #git
16:05 osse Seveas: Also, I wanted to make one "common" call to stat_tracking_info and check the results in each branch instead of calling it within each.
16:06 osse But that was more work than my patience allowed at the time
16:10 fuchstronaut joined #git
16:21 Zoffix left #git
16:24 fuchstronaut joined #git
16:24 fuchstronaut joined #git
16:24 clemf joined #git
16:27 govg joined #git
16:34 paws_ joined #git
16:35 sin3t joined #git
16:36 kulelu88 joined #git
16:37 cyan__ joined #git
16:38 creeep joined #git
16:42 SteffanW joined #git
16:43 bauruine_ joined #git
16:47 dhinojosa joined #git
16:55 xaa joined #git
16:56 LucaTM joined #git
16:56 offlim joined #git
16:57 fahadash joined #git
16:59 jost_ joined #git
17:01 weckl_ joined #git
17:02 bronson joined #git
17:07 rgrinberg joined #git
17:09 skylite_ joined #git
17:10 jefus joined #git
17:10 sbeller joined #git
17:14 jstein_ joined #git
17:19 bawlr joined #git
17:21 Darcidride joined #git
17:25 weckl joined #git
17:25 Derperperd joined #git
17:28 steven_a_s joined #git
17:28 okapi joined #git
17:29 vuoto joined #git
17:29 dandaman joined #git
17:30 netj joined #git
17:32 jefus joined #git
17:36 aard_ joined #git
17:37 t-ask joined #git
17:38 steven_a_s joined #git
17:40 ytl joined #git
17:41 zacts joined #git
17:42 kbs joined #git
17:44 mingrammer joined #git
17:44 GingerGeek joined #git
17:45 GingerGeek joined #git
17:50 catsup joined #git
17:51 rahtgaz joined #git
17:54 filcab joined #git
17:59 bauruine_ joined #git
17:59 _Vi joined #git
18:00 ochorocho__ joined #git
18:01 tgunr joined #git
18:01 fuchstronaut joined #git
18:02 _Vi Is there any shorthand for "--force-with-lease" that is expected to be available in default setup (i.e. without aliases). "--force" has "-f" and "+". What's for "--force-with-lease"?
18:03 _ikke_ _Vi: as of this moment there is no shorthand yet
18:03 _ikke_ Do you have a proposal?
18:03 _Vi Maybe "git push my ++HEAD:qqq" can be made to mean "git push --force-with-lease my HEAD:qqq"?
18:03 grawity git config --global alias.fpush "push --force-with-lease"
18:03 grawity there is no shortcut
18:03 clemf joined #git
18:04 clemf joined #git
18:05 _Vi Another shortcut proposal: "git push my =HEAD:qqq". Mnemonics: '=' is a weaker '+', without the shift. Also feels like "assign qqq to HEAD".
18:06 clemf joined #git
18:06 Sadeukko joined #git
18:07 clemf joined #git
18:07 grawity propose that to the mailing list
18:07 grawity few devs lurk here
18:08 _ikke_ !mailing_list
18:08 gitinfo The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist
18:08 clemf joined #git
18:08 _ikke_ The only one I see frequenting here is jrnieder
18:08 _ikke_ (and still not that often
18:08 _Vi OK. Is there some official Git issue tracker to check for proposal duplicates in organized matter (i.e. not by searching though maillists)?
18:09 _Vi *manner
18:09 clemf joined #git
18:10 _ikke_ nope
18:10 clemf joined #git
18:11 vuoto joined #git
18:11 zincrokx joined #git
18:11 clemf_ joined #git
18:12 btree joined #git
18:16 cyan__ joined #git
18:16 vuoto joined #git
18:22 jstein_ joined #git
18:24 mohabaks joined #git
18:24 durham joined #git
18:26 dsdeiz joined #git
18:27 lizzin joined #git
18:31 dandaman joined #git
18:41 paul424 joined #git
18:41 dreiss joined #git
18:41 l4v2 joined #git
18:43 paul424 joined #git
18:47 d4rklit3 joined #git
18:48 nluther joined #git
18:49 t-ask left #git
18:52 Sonderblade joined #git
18:58 dandaman joined #git
18:59 t0by joined #git
19:00 xlegoman joined #git
19:02 johnmilton joined #git
19:04 stamina joined #git
19:09 codezomb joined #git
19:09 dandaman joined #git
19:09 eycsigfy joined #git
19:12 inflames joined #git
19:14 lizzin_ joined #git
19:16 bmahe joined #git
19:19 jstein Hi, I forked a repo, made a change and a PR: https://github.com/gentoo/gentoo/pull/2101, now I got suggestions to improve it. How can I improve my PR? I tried a lot with rebase with no success since 2 days. I would be very happy, if someone could help me.
19:22 jstein In principle I think I have to fetch the changes of the other developers from the last 2 days first. Then get my HEAD on the local PC to commit 2e7dfca and improve it. Then make git commit --ammend and push --force
19:24 jstein I am not sure, if that is the right strategy and second I could not get HEAD there.
19:27 jstein hmmm... I got the HEAD there with "git checkout 2e7dfca"
19:28 nilg joined #git
19:28 vuoto joined #git
19:30 jstein now I am in a detached HEAD and can not push anymore
19:31 _ikke_ nope/
19:31 _ikke_ oops
19:31 _ikke_ jstein: Do you have a branch you are working on for this PR?
19:32 CussBot joined #git
19:32 jstein http://bpaste.net/show/2cfb9198a574 I believe origin is my github repository and cpp2latex was a branch, where I wanted to work in
19:32 mingrammer joined #git
19:33 _ikke_ So the basic steps are correct: 1. Update your local changes with the latest changes from upstream, which reduces conflicts and other problems. 2: update your commits to contain the improvements
19:33 _ikke_ ok
19:33 _ikke_ So first git checkout mycpp2latex
19:33 testbot789789 joined #git
19:34 templetonpr joined #git
19:34 Lyqyd joined #git
19:35 okapi joined #git
19:36 javajoe joined #git
19:36 boombatower joined #git
19:36 jstein error: Your local changes to the following files would be overwritten by checkout:
19:37 jstein https://bpaste.net/show/27bcc19858f9
19:38 _ikke_ What are these changes?
19:39 jstein after git checkout 2e7dfca, I edited the cpp2latex-2.3-r1.ebuild as suggested in the comments of my old PR
19:40 jstein then git commit --amend
19:40 _ikke_ It's best to first to make sure your repo is in the right state
19:40 _ikke_ You can stash these changes
19:40 jstein ok
19:40 testbot789789 joined #git
19:40 ochorocho__ joined #git
19:41 jstein I can delete all and clone the repo from my gtihub fork again. Then it is sure that I have a clear state
19:41 _ikke_ That's not necessary
19:41 jstein ok, just stash the last edit?
19:41 _ikke_ yes
19:41 jstein $ git stash
19:41 jstein Saved working directory and index state WIP on (no branch): 8bca7eb dev-tex/cpp2latex: Rewrite for EAPI=6
19:41 jstein HEAD is now at 8bca7eb dev-tex/cpp2latex: Rewrite for EAPI=6
19:42 jstein and now?
19:42 _ikke_ checkout that branch
19:43 jstein ok $ git checkout mycpp2latex
19:43 jstein now edit the file?
19:43 _ikke_ Have you added the upstream repository as a remote
19:43 _ikke_ ?
19:45 jstein yes, as git remote add gentoo-readonly https://github.com/gentoo/gentoo.git
19:45 _ikke_ ok
19:46 _ikke_ And you have fetched from it?
19:46 _ikke_ git fetch gentoo-readonly
19:46 jstein yes, but I better do it again. I can not remember what I did.
19:46 _ikke_ ok
19:46 jstein I am fetching and rebasing since 2 days... %-)
19:47 _ikke_ hehe
19:47 jstein $ git fetch gentoo-readonly DONE
19:47 _ikke_ I'll walk you through it
19:47 jstein _ikke_: that is very kind of you
19:47 _ikke_ git checkout master && git merge --ff-only gentoo-readonly/master
19:47 dandaman joined #git
19:48 _ikke_ Make sure your local master is up-to-date, but this will abort when you have created commits on your local master
19:48 jstein OK it did some things...
19:49 lindenle joined #git
19:49 _ikke_ Did the merge succeed? (did it fast-forward)
19:50 _ikke_ If it mentioned fast-forward, it succeeded
19:50 paul424 joined #git
19:51 vuoto joined #git
19:51 jstein ah. No it did not say fast-forward http://bpaste.net/show/53ac90a771dc
19:51 jstein $ git status
19:51 jstein On branch master
19:51 jstein Your branch is ahead of 'origin/master' by 224 commits.
19:51 _ikke_ You can ignore that
19:52 jstein ok
19:52 p3m joined #git
19:52 tens0r joined #git
19:52 _ikke_ git branch --set-upstream-to gentoo-readonly/master is probably better
19:52 _ikke_ You basically want your local master to track upstream
19:53 jstein Branch master set up to track remote branch master from gentoo-readonly.
19:53 _ikke_ But your local master is up-to-date
19:53 _ikke_ Ok, next step
19:54 _ikke_ git rebase master cpp2latex
19:54 _ikke_ This can cause conflicts
19:55 raijin joined #git
19:55 nikivi joined #git
19:55 jstein fatal: no such branch: cpp2latex
19:55 jstein I use mycpp2latex?
19:56 jstein I had a cpp2latex in the past but lost it somehow
19:57 jstein when I sent the PR, I worked in cpp2latex. But I deleted my local folder and cloned the repo from github again. Since then I have no more cpp2latex branch
19:57 _ikke_ jstein: I think you called it dev-tex/cpp2latex
19:57 _ikke_ That's in the log output, where I copied it from
19:57 jstein but a mycpp2latex is there, I made this to prevent collisions with my old branch
19:58 _ikke_ AH o
19:58 _ikke_ ok
19:58 _ikke_ Just use the branch you want to update
19:58 jstein https://bpaste.net/show/505fb752f814
19:59 _ikke_ git rebase master mycpp2latex
19:59 jstein this was the output after TAB TAB. Is it now "origin/origin/cpp2latex "
19:59 trig-ger joined #git
19:59 jstein ok
19:59 jstein First, rewinding head to replay your work on top of it...
19:59 jstein Fast-forwarded mycpp2latex to master.
19:59 _ikke_ I assume that contains the commit(s) you want to update
20:00 _ikke_ alright
20:00 _ikke_ git log master..mycpp2latex
20:00 _ikke_ does that contain the commits you expect?
20:01 jstein nothing
20:02 HoierM joined #git
20:02 jstein $ git log master..remotes/origin/cpp2latex
20:02 jstein there it is
20:03 _ikke_ right
20:03 fuchstronaut joined #git
20:03 jstein http://bpaste.net/show/7b0dd9acda70
20:03 _ikke_ git checkout -B mycpp2latex origin/cpp2latex
20:03 _ikke_ I think the local branch got reset somewhere
20:03 jstein warning: refname 'origin/cpp2latex' is ambiguous.
20:03 jstein warning: refname 'origin/cpp2latex' is ambiguous.
20:03 jstein fatal: Ambiguous object name: 'origin/cpp2latex'.
20:04 _ikke_ jstein: right, because you created a heads/remotes/cpp2latex
20:04 _ikke_ git update-ref -d refs/heads/origin/cpp2latex
20:04 jstein ok
20:05 jstein https://bpaste.net/show/0675dd755d62
20:05 _ikke_ Where do these changes come from
20:05 jstein must come from the fetch I think
20:05 _ikke_ No
20:06 _ikke_ That does not make local changes
20:06 _ikke_ What does git status say?
20:06 lizzin_ joined #git
20:06 jstein http://bpaste.net/show/b433438e30c8
20:07 jstein I did not touch these files.
20:07 _ikke_ I don't think you made those changes, right?
20:07 _ikke_ right
20:07 grayjoc joined #git
20:07 _ikke_ git reset --hard HEAD # make sure you don't have any changes you want to keep
20:09 _ikke_ Your working tree should now be clean again
20:09 _ikke_ also git clean -fd
20:10 _ikke_ After those two commits, everything should be clean again
20:11 Dreamer3 joined #git
20:11 jstein HEAD is now at e530e4f app-forensics/afl: Version bump
20:12 jstein ok
20:13 _ikke_ now the checkout command again
20:13 jstein Branch mycpp2latex set up to track remote branch cpp2latex from origin.
20:13 jstein Reset branch 'mycpp2latex'
20:13 _ikke_ Alright
20:14 beyertech joined #git
20:14 _ikke_ so now git log --oneline master..mycpp2latex should return your commmit(s)
20:14 jstein jippieee! Yes!
20:15 jstein can I now change the file?
20:15 jstein and then commit amend?
20:15 _ikke_ I think you should still rebase on master
20:15 beyertech joined #git
20:15 _ikke_ git rebase master mycpp2latex
20:16 jstein does this mean mycpp2latex gets all changes from master?
20:17 _ikke_ yes
20:17 _ikke_ Not in the branch, but in the working tree
20:17 jstein First, rewinding head to replay your work on top of it...
20:17 jstein Applying: dev-tex/cpp2latex: HOMEPAGE moved..
20:17 _ikke_ That's your commit, right?
20:17 beyertech joined #git
20:18 stamina joined #git
20:18 jstein git log: * ba03388 (HEAD -> mycpp2latex) dev-tex/cpp2latex: Rewrite for EAPI=6
20:18 jstein looks good
20:18 jstein yes it was mine
20:19 rpad joined #git
20:19 jstein can I now change the file and then commit --amend?
20:19 _ikke_ git stash pop to get your changes back
20:19 _ikke_ yes, you can
20:20 jstein looks good, now I amend
20:20 rpad When doing a git clone with git://, it should simply use port 22, correct?
20:21 _ikke_ no
20:21 _ikke_ That uses the git protocol, not ssh
20:21 _ikke_ 9418
20:22 rpad Learn something new every day. Thanks _ikke_
20:22 _ikke_ yw
20:22 JacobsLadd3r joined #git
20:24 JacobsLadd3r joined #git
20:24 jstein _ikke_:  I popped the stash, and renamed two files with git mv, now status is http://bpaste.net/show/8274127474b6
20:24 jstein can I push now to github?
20:24 _ikke_ jstein: yes: git push --force origin mycpp2latex
20:24 _ikke_ (--force is necessary)
20:25 _ikke_ because of rebase and commit --amend
20:25 _ikke_ (usually I recommend --force-with-lease to make sure someone else hasn't pushed to that branch)
20:25 fahadash joined #git
20:26 jstein https://github.com/jonasstein/gentoo/commit/087711a2ceb91c297ee42bdf9f4106f32f14fdd9 looks good
20:27 mingrammer joined #git
20:27 Manuel15 joined #git
20:27 Manuel15 joined #git
20:27 _ikke_ If you used the same branch, then the PR should be updated too
20:28 fakenullie I wish github had public reflog
20:29 fakenullie oh, apparently it has something similar
20:29 _ikke_ what does it have?
20:29 fakenullie events in api
20:29 eivarv joined #git
20:30 ochorocho__ joined #git
20:30 sJCZPnWMfB joined #git
20:30 Dougie187 joined #git
20:31 jstein no, the branch name was different. But it is fine. Thank you very very much _ikke_
20:31 _ikke_ alright
20:32 _ikke_ Once you get the hang if this, it's just a couple of commands to do all this
20:35 jefus joined #git
20:37 israelzuniga joined #git
20:38 blackwind_123 joined #git
20:39 jstein In these situations I feel like this guy, but I am learning... http://xkcd.com/1597/
20:40 hdon joined #git
20:43 Lyqyd joined #git
20:44 beyertech joined #git
20:50 fakenullie hehe
20:50 rbern joined #git
20:51 vdv joined #git
20:53 l4v2 joined #git
20:55 duderonomy joined #git
21:01 clemf joined #git
21:01 groundnuty left #git
21:04 fuchstronaut joined #git
21:05 Daiwo joined #git
21:05 Daiwo Hi everyone
21:06 _ikke_ haio
21:06 javajoe joined #git
21:06 Daiwo I'm a bit confused right now.. i'm on windows, so I use the windows build of Git (https://git-for-windows.github.io/)
21:06 Daiwo could someone help me figuring what version of MinGW comes with Git-for-windows (Mingw-w64 or MinGW) both seems to be different project, with different devs...
21:06 Daiwo hi _ikke_
21:08 Daiwo _ikke_: can you help me figure this out
21:08 Daiwo :)
21:09 rbern joined #git
21:12 Electrometro joined #git
21:13 inflames joined #git
21:14 vuoto joined #git
21:15 neeca joined #git
21:15 jefus joined #git
21:15 clemf joined #git
21:18 JacobsLadd3r joined #git
21:19 unreal joined #git
21:20 Daiwo is this chan dead ?
21:21 fakenullie no
21:22 Daiwo k
21:22 Daiwo hmm I'm clueless to where I can find my answer
21:22 beyertech joined #git
21:24 beyertech joined #git
21:24 thiago Daiwo: you didn't ask a Git question
21:24 thiago you asked a MinGW question. Quite off-topic.
21:25 Daiwo I'm asking what version of MinGW comes in the Git-for-windows installer
21:25 thiago none
21:25 thiago if you want mingw, install ingw
21:25 Daiwo https://i.imgur.com/6ccGR5z.png
21:25 thiago assume you have none
21:26 Daiwo this is what I (and everyone else) get when running Git-bash
21:26 beyertech joined #git
21:26 Daiwo but no documention on implematation of MingW anywhere
21:26 thiago you have a partial bash environment. You don't have mingw.
21:26 Daiwo hmm ok
21:26 thiago to find out more: gcc -v
21:26 Daiwo ok thx
21:26 zacts joined #git
21:27 Daiwo lol --> bash: gcc: command not found
21:27 mattcen joined #git
21:27 thiago that answers your question
21:27 rj1 joined #git
21:27 thiago you don't have mingw
21:27 Daiwo how can document be so crappy to not even mention about that..
21:27 Daiwo thanks for your kind help
21:27 thiago why should it mention what it doesn't have?
21:27 Daiwo document*ation
21:27 beyertech joined #git
21:27 thiago does it mention that cdb.exe is not included?
21:28 Daiwo well it should mention why it default echoing MiNGW64
21:28 Daiwo anyway
21:28 thiago it shouldn't, you're right
21:29 thiago I don't know why it's doing that. The version I used to use didn't do it.
21:29 beyertech joined #git
21:29 Daiwo http://stackoverflow.com/questions/32356595/why-is-mingw64-appearing-on-my-git-bash
21:29 tristanp joined #git
21:29 Daiwo (not alone) ..
21:30 Daiwo the picked answer is ridiculous .. (it tells how to remove it.. lol)
21:30 rj1 joined #git
21:30 HanClinto joined #git
21:31 remi left #git
21:32 rj1 joined #git
21:33 rj1 joined #git
21:33 Daiwo I guess it has something to do with ConEmu
21:33 thiago it's not the application
21:33 Shentino joined #git
21:33 thiago but it may be connected to the fact that hte git-for-windows build switched to it and the updated msys2
21:34 rj1 joined #git
21:34 Shentino joined #git
21:34 Daiwo hmm ok
21:37 Daiwo https://i.imgur.com/IBP2wpo.png ref: https://goo.gl/UYdGB1
21:37 tens0r joined #git
21:37 clemf joined #git
21:37 Daiwo getting closer to some answer, thanks for ur help
21:40 spudowiar joined #git
21:43 clemf joined #git
21:45 justanotheruser joined #git
21:47 RustyShackleford joined #git
21:49 dandaman joined #git
21:50 ochorocho__ joined #git
21:50 monoprotic joined #git
21:51 SebastianFlyte joined #git
21:52 nivag joined #git
21:54 Derperperd joined #git
21:55 nivag joined #git
21:55 nivag_ joined #git
21:55 jmibanez joined #git
21:57 MattMaker joined #git
21:57 nivag joined #git
22:00 Fr0Master joined #git
22:00 HanClinto_ joined #git
22:00 duderono_ joined #git
22:00 dreamyspell_ joined #git
22:00 dandaman left #git
22:01 smithbone_ joined #git
22:01 Balliad joined #git
22:02 JacobsLadd3r joined #git
22:02 justanotheruser joined #git
22:03 israelzuniga_ joined #git
22:03 worstadmin_ joined #git
22:03 boshhead_ joined #git
22:03 addshore_ joined #git
22:03 twisted`_ joined #git
22:04 ggherdov_ joined #git
22:04 yalu joined #git
22:04 CrazyBonz joined #git
22:04 ELFrederich joined #git
22:04 joshc joined #git
22:05 GyrosGeier joined #git
22:05 fuchstronaut joined #git
22:05 cxreg joined #git
22:05 chid joined #git
22:05 unforgiven512 joined #git
22:06 inflames joined #git
22:07 msonntag joined #git
22:07 tesuji joined #git
22:07 Remram[m] joined #git
22:08 MattE joined #git
22:08 GingerGeek joined #git
22:08 GingerGeek joined #git
22:08 Karunamon joined #git
22:08 ldlework joined #git
22:08 cjbrambo joined #git
22:08 Hello71 joined #git
22:08 nebg joined #git
22:08 gravitron joined #git
22:08 jefus joined #git
22:08 Darren_ joined #git
22:08 XVar joined #git
22:08 woodruffw joined #git
22:08 fus joined #git
22:08 Vorisi joined #git
22:08 XVar joined #git
22:08 sweatsuit joined #git
22:08 canton7 joined #git
22:08 blahdodo joined #git
22:09 Manuel15 joined #git
22:09 Manuel15 joined #git
22:09 woodruffw joined #git
22:09 Ineentho[m] joined #git
22:09 artgoeshere joined #git
22:09 astaves joined #git
22:09 benbergman joined #git
22:09 rmrrn joined #git
22:09 rmrrn joined #git
22:10 rudycane joined #git
22:10 _Patrick_ joined #git
22:10 mrkake joined #git
22:10 thecomedian joined #git
22:10 sparetire joined #git
22:10 Chunk2 joined #git
22:12 Lyqyd_ joined #git
22:13 jrahmy joined #git
22:15 mingrammer joined #git
22:16 BenderRodriguez joined #git
22:16 vdv joined #git
22:16 obiwahn joined #git
22:17 catbeard joined #git
22:17 Caelum joined #git
22:17 underpantz joined #git
22:17 osse joined #git
22:17 p1k joined #git
22:18 monokrome joined #git
22:21 aidalgol joined #git
22:21 atomicb0mb joined #git
22:24 mrpackethead joined #git
22:24 n-st joined #git
22:24 RustyShackleford joined #git
22:25 Cerise joined #git
22:25 Cerise joined #git
22:25 Rodya_ joined #git
22:26 Lunatrius joined #git
22:26 Elv1313 joined #git
22:27 lizzin joined #git
22:29 Elv1313 Hello. I wonder. If I have a large branch and want to do multiple fixup at once, is there a way to "auto generate" the individual fixup commits from one big diff? I don't know, something taking the line above and below in git blame, if the commit match, then insert the code. In case of oneliner, just create a simple fixup
22:29 Finnoloid joined #git
22:29 jefus left #git
22:30 cdown joined #git
22:31 MattMaker joined #git
22:32 aard_ joined #git
22:32 dhinojosa joined #git
22:33 cdown_ joined #git
22:33 SwiftMatt joined #git
22:33 dsdeiz_ joined #git
22:35 chris2 joined #git
22:36 bauruine_ joined #git
22:40 Rodya_ joined #git
22:41 bauruine_ joined #git
22:43 ochorocho__ joined #git
22:43 bauruine_ joined #git
22:44 zacts joined #git
22:44 bauruine_ joined #git
22:48 FrostCandy joined #git
22:54 DarkAnHell joined #git
22:57 ShapeShifter499 joined #git
22:57 MattMaker joined #git
23:04 MattMaker joined #git
23:05 fuchstronaut joined #git
23:05 fuchstronaut joined #git
23:06 MattMaker joined #git
23:06 DarkAnHell joined #git
23:06 justanotheruser joined #git
23:09 mingrammer joined #git
23:10 mehola joined #git
23:12 justanot1eruser joined #git
23:12 DarkAnHell joined #git
23:13 DarkAnHell joined #git
23:14 M-shine joined #git
23:16 ochorocho__ joined #git
23:18 atrigent joined #git
23:21 leeN joined #git
23:21 tristanp joined #git
23:22 ffabi joined #git
23:24 mariuscc joined #git
23:26 MattMaker joined #git
23:27 Remram[m] joined #git
23:27 Remram[m] Ooooh I wondered about that as well
23:27 Remram[m] it's probably easy to script with git-blame
23:27 atrigent_ joined #git
23:28 red__ joined #git
23:29 rafalcpp joined #git
23:30 Rodya_ joined #git
23:30 angular_mike is it customary to include unit files and/or deployment scripts for scripts that are intended to be run as systemd units?
23:30 dsdeiz joined #git
23:31 clemf joined #git
23:31 bremner not sure about the git connection there.
23:32 ahmadassaf joined #git
23:32 angular_mike bremner: in git repos
23:33 ochorocho__ joined #git
23:34 kuldeep joined #git
23:35 waboose joined #git
23:36 mablae__ joined #git
23:38 ochorocho__ joined #git
23:41 waboose left #git
23:42 spudowiar angular_mike: is it a good idea to murder someone?
23:43 spudowiar angular_mike: in git repos
23:43 MattMaker joined #git
23:45 rafalcpp joined #git
23:45 qsx that escalated quickly
23:46 Sleepy63 joined #git
23:47 angular_mike spudowiar: you following me everywhere?
23:47 angular_mike also customary !- good idea
23:50 jadew joined #git
23:50 netj joined #git
23:52 linuxmint joined #git

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