Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-11

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

All times shown according to UTC.

Time Nick Message
00:00 venmx joined #git
00:00 joshszep joined #git
00:00 jonwil joined #git
00:01 blackwind_123 joined #git
00:02 moestevens joined #git
00:04 shinnya joined #git
00:05 jonwil I have 2 branches in my repo, is there an easy way to see all the commits on one branch that are not on the other branch?
00:06 snthsnth joined #git
00:06 skyres joined #git
00:07 tang^ !man cherry
00:07 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
00:07 tang^ man git-cherry
00:07 gitinfo the git-cherry manpage is available at http://jk.gs/git-cherry.html
00:08 tang^ jonwil: ^
00:08 thiagoroshi[m] joined #git
00:08 pirate21994 joined #git
00:10 thiagoroshi[m] left #git
00:12 meauses joined #git
00:12 tang^_ joined #git
00:13 jonwil thanks, that gave me exactly what I needed
00:13 jonwil left #git
00:15 skyres joined #git
00:16 nilg joined #git
00:17 blackwind_123 joined #git
00:18 joshszep joined #git
00:20 on1x left #git
00:22 mda1 joined #git
00:23 blackwind_123 joined #git
00:23 anonymuse joined #git
00:24 skyres joined #git
00:24 anonymus_ joined #git
00:27 thebope joined #git
00:30 blueyed joined #git
00:31 anuxivm joined #git
00:32 lindenle joined #git
00:33 skyres joined #git
00:35 Darren_ joined #git
00:35 ayjay_t joined #git
00:36 cdown joined #git
00:39 programmer joined #git
00:39 nettoweb joined #git
00:41 Spec-Chum joined #git
00:42 skyres joined #git
00:43 blackwind_123 joined #git
00:49 cdown_ joined #git
00:51 skyres joined #git
00:53 chris2 joined #git
00:55 pothepanda joined #git
00:59 blackwind_123 joined #git
00:59 voidDotClass joined #git
00:59 skyres joined #git
01:02 JamesBaxter joined #git
01:04 Spec-Chum joined #git
01:05 blackwind_123 joined #git
01:06 Shentino joined #git
01:07 joshszep joined #git
01:08 skyres joined #git
01:09 joshszep joined #git
01:09 Gsham joined #git
01:10 jorj joined #git
01:12 programmer joined #git
01:14 fstd_ joined #git
01:15 star_prone joined #git
01:15 b1tchcakes joined #git
01:17 skyres joined #git
01:19 arescorpio joined #git
01:20 thiago joined #git
01:20 blackwind_123 joined #git
01:20 xcesariox joined #git
01:25 liuzhen joined #git
01:26 blackwind_123 joined #git
01:26 skyres joined #git
01:31 venmx joined #git
01:34 Jameser joined #git
01:35 skyres joined #git
01:38 dodobrain joined #git
01:40 Balthasar|EB840 joined #git
01:40 einnjo joined #git
01:42 sgtbigman joined #git
01:44 skyres joined #git
01:45 steelsw0rd joined #git
01:47 steelsw0rd joined #git
01:47 checkItOut joined #git
01:49 steelsw0rd joined #git
01:49 navidr joined #git
01:50 steelsw0rd joined #git
01:52 cagedwisdom joined #git
01:53 skyres joined #git
01:56 jason237 joined #git
02:00 webstrand left #git
02:02 skyres joined #git
02:03 CEnnis91 joined #git
02:05 pks joined #git
02:06 bernardio joined #git
02:10 railssmi_ joined #git
02:10 steelsw0rd joined #git
02:10 mwleeds left #git
02:10 skyres joined #git
02:13 JamesBaxter joined #git
02:13 meauses joined #git
02:14 netj joined #git
02:15 parrotriver joined #git
02:19 skyres joined #git
02:23 raijin joined #git
02:24 finalbeta joined #git
02:28 skyres joined #git
02:28 einnjo joined #git
02:32 realz joined #git
02:33 NeverDie joined #git
02:37 finalbeta joined #git
02:37 skyres joined #git
02:38 Random832 joined #git
02:39 austin987 joined #git
02:39 d^sh joined #git
02:40 mangolisk joined #git
02:40 Dougie187 joined #git
02:42 r00twrh joined #git
02:46 Gsham joined #git
02:46 fakenerd joined #git
02:46 skyres joined #git
02:48 jason237 joined #git
02:55 skyres joined #git
02:55 finalbeta joined #git
03:01 venmx joined #git
03:02 zhiwliu_ joined #git
03:04 skyres joined #git
03:04 Celmor joined #git
03:04 pks joined #git
03:04 Celmor after I modified a tracked file that exists in the 'head' (latest commit), how do I compare it against the git repository to see the changes made?
03:05 star_prone joined #git
03:05 Gsham joined #git
03:06 aavrug joined #git
03:07 aavrug joined #git
03:12 dreiss joined #git
03:12 skyres joined #git
03:20 fakenerd_ joined #git
03:21 skyres joined #git
03:22 sunri5e joined #git
03:29 chigang joined #git
03:29 thebope joined #git
03:30 skyres joined #git
03:30 _cyril_ joined #git
03:30 raijin joined #git
03:32 plasticle joined #git
03:32 John[Lisbeth] joined #git
03:33 Andrew_K joined #git
03:33 John[Lisbeth] I am typing git clone https://github.com/johmorrisbeck/freebsdboxconfig but then I get an error saying I need to specify a repository
03:34 ojacobson !repro
03:34 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
03:35 hexagoxel joined #git
03:35 satya4ever joined #git
03:36 John[Lisbeth] It was a problem with my copy/paste software never mind
03:38 Dougie187 left #git
03:39 skyres joined #git
03:41 Gsham joined #git
03:42 resurtm joined #git
03:44 ome joined #git
03:44 hahuang61 joined #git
03:46 cagmz joined #git
03:48 skyres joined #git
03:49 railssmith joined #git
03:52 aarobc joined #git
03:55 hhee joined #git
03:57 skyres joined #git
03:58 chachasmooth joined #git
03:59 fahadash joined #git
04:01 jost__ joined #git
04:05 star_prone joined #git
04:05 skyres joined #git
04:10 a_thakur joined #git
04:14 meauses joined #git
04:14 Vortex35 joined #git
04:14 skyres joined #git
04:14 ismithers joined #git
04:15 netj joined #git
04:19 fission6 joined #git
04:22 Goplat joined #git
04:22 fakenerd joined #git
04:23 skyres joined #git
04:24 dsantiago joined #git
04:26 lindenle joined #git
04:29 govg joined #git
04:31 mehola joined #git
04:31 nd joined #git
04:32 skyres joined #git
04:32 venmx joined #git
04:42 Guest55 joined #git
04:43 austin987 joined #git
04:43 safe joined #git
04:44 nilg joined #git
04:45 hahuang61 joined #git
04:48 a_thakur joined #git
04:48 skyres joined #git
04:50 ayogi joined #git
04:52 Guest55 joined #git
04:54 gfixler joined #git
04:55 _cyril_ joined #git
04:57 skyres joined #git
04:57 alex1a joined #git
04:57 OnBrokenWings joined #git
05:00 Nio joined #git
05:01 svm_invictvs joined #git
05:06 skyres joined #git
05:08 daey_ joined #git
05:09 subhojit777 joined #git
05:10 subhojit777 joined #git
05:14 skyres joined #git
05:14 meauses joined #git
05:18 robotroll joined #git
05:19 Guest66 joined #git
05:20 thebishop joined #git
05:23 skyres joined #git
05:24 Guest66 joined #git
05:27 Cabanossi joined #git
05:28 subhojit777 joined #git
05:31 moop joined #git
05:31 lindenle joined #git
05:32 skyres joined #git
05:33 netj joined #git
05:35 govg joined #git
05:38 Shentino joined #git
05:39 lindenle joined #git
05:40 aidalgol joined #git
05:41 skyres joined #git
05:46 subhojit777 joined #git
05:46 narendraj9 joined #git
05:46 hahuang61 joined #git
05:47 jason237 joined #git
05:49 lindenle joined #git
05:50 nilg joined #git
05:50 skyres joined #git
05:57 skyres joined #git
06:01 overlord_tm joined #git
06:02 venmx joined #git
06:03 skyres joined #git
06:03 satya4ever joined #git
06:07 moei joined #git
06:08 ayjay_t joined #git
06:09 skyres joined #git
06:10 joelsmith joined #git
06:11 UniFreak joined #git
06:12 checkItO_ joined #git
06:12 UniFreak my local branch is `anybag`, and now I'm in it. I did `git pull origin anybag`, and it said already up-to-date
06:12 UniFreak but the code is not the same with the gitlab
06:12 UniFreak why's that?
06:12 checkItO_ joined #git
06:13 netj joined #git
06:15 cyan__ joined #git
06:16 a_thakur_ joined #git
06:16 skyres joined #git
06:19 banana_pancakes joined #git
06:23 skyres joined #git
06:24 lordjancso joined #git
06:26 clemf joined #git
06:28 ngperfex joined #git
06:30 jfr joined #git
06:30 skyres joined #git
06:31 sarbs joined #git
06:35 checkItOut joined #git
06:37 skyres joined #git
06:39 zumba_addict joined #git
06:41 andrew710 joined #git
06:42 SteffanW joined #git
06:44 skyres joined #git
06:47 vuoto joined #git
06:48 stuh84 joined #git
06:48 ThomasLocke joined #git
06:50 pks joined #git
06:51 skyres joined #git
06:55 shubhnik joined #git
06:56 LucaTM joined #git
06:57 skyres joined #git
07:00 PCatinean joined #git
07:00 a_thakur joined #git
07:01 Raging_Hog joined #git
07:01 danslo joined #git
07:01 a_thakur joined #git
07:03 venmx joined #git
07:03 skyres joined #git
07:04 cqi joined #git
07:04 zeroed joined #git
07:04 osse UniFreak: are you sure it's anybag you're looking at on gitlab?
07:04 osse not master?
07:05 UniFreak osse: no
07:05 UniFreak osse: i solved it
07:05 UniFreak http://stackoverflow.com/questions/153762​41/why-does-git-say-my-master-branch-is-a​lready-up-to-date-even-though-it-is-not
07:05 UniFreak a very thorough answer
07:06 Oatmeal joined #git
07:08 a_thakur joined #git
07:08 dan2k3k4 joined #git
07:08 dan2k3k4 joined #git
07:09 freimatz joined #git
07:09 Darren_ joined #git
07:09 skyres joined #git
07:11 bmahe joined #git
07:12 zlg joined #git
07:13 zlg Let's say I have hooks defined in a remote repository. Is there a way to add those hooks to my local copy and propagate those to clones?
07:14 grawity no
07:14 osse you can add them to the repo and propagate them as files (regular content in the repo) but not as hooks
07:14 fakenerd_ joined #git
07:14 osse best you're gonna get is also supply a script that installs them
07:15 zlg osse: So adding e.g. a hooks dir and instructing any users to symlink in .git/hooks?
07:15 zlg It's mostly for my use so I really don't care; I just don't want to lose the hooks.
07:15 skyres joined #git
07:16 fakener__ joined #git
07:18 exxi joined #git
07:19 Ozymandy joined #git
07:19 osse zlg: yes, something like that
07:19 osse i'd symlink each file. maybe they have some extra hooks
07:20 zlg yeah, it makes sense to symlink so then it's more extensible.
07:20 zlg Thanks for the advice.
07:21 Andrew_K joined #git
07:21 skyres joined #git
07:22 a_thakur joined #git
07:23 sarbs joined #git
07:23 zeroed joined #git
07:23 zeroed joined #git
07:24 PCatinean joined #git
07:25 chele joined #git
07:27 skyres joined #git
07:28 thethorongil joined #git
07:30 jknetl joined #git
07:30 tvw joined #git
07:33 skyres joined #git
07:35 star_prone joined #git
07:38 fakenerd joined #git
07:39 qt-x joined #git
07:39 skyres joined #git
07:41 elect joined #git
07:46 skyres joined #git
07:50 govg joined #git
07:52 skyres joined #git
07:55 bocaneri joined #git
07:57 moop joined #git
07:58 skyres joined #git
07:59 a_thakur joined #git
08:00 mithenks joined #git
08:02 danslo joined #git
08:03 TomyWork joined #git
08:04 skyres joined #git
08:07 overlord_tm joined #git
08:09 flavius joined #git
08:10 skyres joined #git
08:12 Mo joined #git
08:14 lindenle joined #git
08:15 cyphase joined #git
08:15 danslo joined #git
08:16 skyres joined #git
08:17 jaguarmagenta joined #git
08:21 netj joined #git
08:22 thiago joined #git
08:22 dsdeiz__ joined #git
08:22 dan2k3k4 joined #git
08:22 skyres joined #git
08:23 venmx joined #git
08:27 pokalyis joined #git
08:28 skyres joined #git
08:33 _joes__ joined #git
08:33 G1eb joined #git
08:34 skyres joined #git
08:35 G1eb hi! quick question, when i use screen and git add -p, i'cant use backspace, instead screen prints ^?^C
08:35 G1eb anybody else had this problem before?
08:37 mozzarella joined #git
08:39 dsdeiz_ joined #git
08:41 skyres joined #git
08:41 MaggieC joined #git
08:42 MaggieC joined #git
08:45 brk_ joined #git
08:45 checkItOut joined #git
08:46 InfoTest joined #git
08:47 skyres joined #git
08:48 checkItOut joined #git
08:48 encod3 joined #git
08:49 renlo joined #git
08:49 dsdeiz_ joined #git
08:52 artisanIndia joined #git
08:53 skyres joined #git
08:55 Seveas smells like termcap issues.
08:56 Seveas what's TERM set to?
08:58 MaggieC joined #git
09:00 skyres joined #git
09:00 ahmedelgabri joined #git
09:01 lb1c joined #git
09:01 mikecmpbll joined #git
09:02 ocbtec joined #git
09:03 SwiftMatt joined #git
09:06 govg joined #git
09:06 skyres joined #git
09:12 skyres joined #git
09:13 Ozymandy joined #git
09:13 kurkale6ka joined #git
09:13 durham joined #git
09:14 Snugglebash joined #git
09:14 durham joined #git
09:15 zeroed joined #git
09:19 skyres joined #git
09:20 marcogmonteiro joined #git
09:21 star_prone joined #git
09:22 zlg left #git
09:25 skyres joined #git
09:31 dsdeiz_ joined #git
09:31 skyres joined #git
09:34 mischat joined #git
09:34 checkItOut joined #git
09:36 Victor1234 joined #git
09:36 thethorongil joined #git
09:37 thethorongil joined #git
09:38 skyres joined #git
09:40 kedare joined #git
09:41 jbitdrop joined #git
09:44 skyres joined #git
09:45 ieee joined #git
09:46 PCatinean joined #git
09:47 TomyWork "diff -u <(sort a) <(sort b)" works fine, "git diff --no-index <(sort a) <(sort b)" shows me some stuff about pipes. is there a workaround?
09:48 dan2k3k4 joined #git
09:48 osse use temporary files
09:48 hahuang61 joined #git
09:48 osse if you use zsh you can use =() instead of <()
09:48 cagedwisdom joined #git
09:49 TomyWork hmm, no "--read-the-damn-pipes-dammit" flag? :)
09:49 osse not that i'm aware of
09:50 osse maybe it needs to seek back and forth
09:50 rnsanchez joined #git
09:50 skyres joined #git
09:50 jstimm joined #git
09:51 TomyWork not infinitely though
09:52 osse nothnig is infinite
09:52 osse but you can't seek in a pipe at all
09:53 Stummi has git its own diff implementation? I always thought git diff and diff were backed by the same lib
09:53 sawk joined #git
09:53 TomyWork yeah but you could cache
09:53 grawity there's no "lib" for it, afiak
09:53 grawity and git-diff has a few more diff algorithms
09:53 TomyWork diff itself already caches
09:53 TomyWork it has to, in order to generate the hunk context
09:54 Stummi okay
09:56 skyres joined #git
09:57 TomyWork osse what i'm saying is that diff already refers to previous lines, so why wouldnt git diff be able to do the same?
09:57 pokalyis left #git
09:57 manuels joined #git
09:57 Siegfried joined #git
09:57 osse git does that
09:57 osse I was just guessing as to why git won't read the pipes
09:57 osse maybe the reason is somethign else
09:58 finalbeta joined #git
10:00 govg joined #git
10:01 finalbeta joined #git
10:01 achadwick joined #git
10:01 G1eb Seveas, TERM is set to screen-256color-bce
10:02 skyres joined #git
10:03 danslo_ joined #git
10:03 mozzarella joined #git
10:06 G1eb i should add that backspace works fine in general, only when using "git add -p" is it printing those weird question marks
10:06 G1eb and of course that "git add -p" works fine outside screen on the same machine
10:08 skyres joined #git
10:10 oskarkv joined #git
10:10 FilipNortic_ joined #git
10:12 dodobrain joined #git
10:13 snthsnth joined #git
10:15 skyres joined #git
10:16 cdown joined #git
10:17 tanuki joined #git
10:18 irco joined #git
10:19 Ozymandy joined #git
10:19 nicoulaj joined #git
10:21 skyres joined #git
10:23 nettoweb joined #git
10:25 rominronin joined #git
10:26 MrMojito joined #git
10:27 skyres joined #git
10:28 finalbeta joined #git
10:29 netj joined #git
10:30 Seveas G1eb: try export TERM=screen
10:30 Seveas if it works then, it's a termcap problem. If not, it's something else
10:31 G1eb do i need to restart the screen?
10:32 G1eb hm, does not seem to help :(
10:33 alhariel joined #git
10:34 skyres joined #git
10:34 pepijndevos joined #git
10:36 Seveas TomyWork: when git diff encounters a symlink, it will readlink() that symlink and uses that as content
10:37 danslo joined #git
10:37 Seveas <() passes /dev/fd/XXXX as argument, which is a symlink that, id readlink()'ed gives pipe:[XXXX]
10:38 Seveas And I don't see an option to make git diff follow symlinks
10:39 Jameser_ joined #git
10:40 TomyWork ah
10:40 skyres joined #git
10:40 TomyWork well that behaviour makes total sense for anything but --no-index mode
10:40 star_prone joined #git
10:40 TomyWork or let's say for anything tracked
10:41 Seveas git tracks symlinks as symlinks, so it makes sense for tracked files
10:42 alhariel so ive been modifying some files, but forgot to checkout the new branch those changes were intended to.. whats the best course of action?
10:42 grawity !float
10:42 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
10:42 jaguarmagenta joined #git
10:43 nilg joined #git
10:43 TomyWork didnt know it was called floating
10:44 alhariel i see, thank you
10:44 TomyWork but whatever floats your changes, i guess
10:45 tobiasvl I dunno to what extent it's "called" that, but gitinfo calls it that
10:45 tvw joined #git
10:45 thinkpad joined #git
10:45 tobiasvl simply put uncommitted changes don't belong to any branch yet and follow your working directory
10:45 TomyWork grawity shouldnt that be "git stash pop", since apply doesnt drop the topmost element, leading to unnecessary garbage?
10:46 skyres joined #git
10:47 multi_io_ joined #git
10:49 chachasmooth joined #git
10:53 skyres joined #git
10:57 zeroed joined #git
10:58 sawk joined #git
10:59 _cyril_ joined #git
11:00 skyres joined #git
11:02 ferr joined #git
11:05 narendraj9 joined #git
11:06 skyres joined #git
11:10 fission6 joined #git
11:13 skyres joined #git
11:14 gruwl joined #git
11:15 netj joined #git
11:20 skyres joined #git
11:23 gruwl left #git
11:23 lss8 joined #git
11:25 SteffanW joined #git
11:26 skyres joined #git
11:26 Seveas TomyWork: https://github.com/seveas/git/commit/5a​3cb4616301602b3e949fab5f6dcf1d2f796bc8
11:27 MarceColl joined #git
11:29 ToBeCloud joined #git
11:30 blackwind_123 joined #git
11:30 Seveas it won't be accepted as is, as the mmap/read change is not related to symlinks but to reading from pipes. Need to split that up.
11:32 Cavallari joined #git
11:33 skyres joined #git
11:33 nettoweb1 joined #git
11:36 TomyWork Seveas https://github.com/seveas/git/commit/882​749a04f828fccd795deec4d0bf10ba09ae549#di​ff-f38530a28aca37651f0f1f12aff72051L57
11:36 TomyWork that's how that became unused
11:37 TomyWork just in case it matters :)
11:39 skyres joined #git
11:39 virgil joined #git
11:40 Seveas TomyWork: it matters. If it hadn't become unused, I would have had to change that field from 32 to 64 bits :)
11:40 TomyWork heh
11:45 osse if symlink, check if symlink point to pipe
11:45 osse \o/
11:45 skyres joined #git
11:47 Seveas yeah
11:48 Seveas https://github.com/seveas/git/c​ommits/dk/diff-follow-symlinks
11:48 encod3 joined #git
11:50 Xethron joined #git
11:50 CussBot joined #git
11:52 skyres joined #git
11:55 pbrewczynski joined #git
11:56 Darcidride joined #git
11:58 skyres joined #git
11:58 King_Hual joined #git
11:58 Jameser joined #git
12:01 danslo joined #git
12:01 mischat joined #git
12:04 skyres joined #git
12:05 danslo_ joined #git
12:09 govg joined #git
12:11 skyres joined #git
12:15 byte512 joined #git
12:15 al-damiri joined #git
12:16 lindenle joined #git
12:17 skyres joined #git
12:17 Spec-Chum joined #git
12:18 Domhack joined #git
12:18 leeN joined #git
12:19 Snugglebash joined #git
12:20 bejeb joined #git
12:21 crs joined #git
12:22 crs Hey, I have just commited bunch of changes and realised that there was one line included in that commit which I didn't want to commit. How can I amend that commit and remove that single line?
12:22 tobiasvl crs: remove the line now, add the file, then git commit --amend
12:23 tobiasvl (assuming you didn't push the change)
12:23 skyres joined #git
12:24 crs tobiasvl: Oh, smart, thanks!
12:26 Ozymandy joined #git
12:27 crs tobiasvl: Worked, thank you very much.
12:27 tobiasvl np
12:28 sdothum joined #git
12:29 narendraj9 joined #git
12:30 star_prone joined #git
12:30 skyres joined #git
12:30 wrouesnel joined #git
12:31 gryffus joined #git
12:32 gryffus how do i move unpushed commit to another branch?
12:32 osse gryffus: rebase --onto does a good job
12:33 gryffus osse: ok
12:33 osse or cherry-picking them
12:34 encod3 joined #git
12:35 jaafar joined #git
12:36 skyres joined #git
12:37 dsdeiz_ joined #git
12:37 encod3 joined #git
12:39 encod3 joined #git
12:40 anonymuse joined #git
12:40 netj joined #git
12:40 moestevens joined #git
12:43 skyres joined #git
12:45 boz_v1 joined #git
12:45 encod3_ joined #git
12:45 Gloomy joined #git
12:46 xaa joined #git
12:47 venmx joined #git
12:49 skyres joined #git
12:49 ismithers joined #git
12:52 johnmilton joined #git
12:54 alcohol joined #git
12:55 venmx joined #git
12:55 usm4n joined #git
12:55 skyres joined #git
12:57 mindfart joined #git
12:59 _cyril_ joined #git
13:01 rbr joined #git
13:02 skyres joined #git
13:04 synthroid joined #git
13:06 danslo_ joined #git
13:08 skyres joined #git
13:10 rbr joined #git
13:11 star_prone joined #git
13:15 skyres joined #git
13:19 blackwind_123 joined #git
13:20 Learath2 joined #git
13:20 howitdo joined #git
13:21 skyres joined #git
13:21 p4trix joined #git
13:23 cdown joined #git
13:23 p4trix I want to do this: git reset --hard foo origin/bar;  // I want to reset a branch that is not checked out with a remote branch.
13:23 p4trix Is that possible?
13:24 tobiasvl why can't you check it out?
13:24 p4trix Becouse its in production
13:24 p4trix And I want to prepare another branch so I can switch branch later
13:24 p4trix In the deploy script
13:25 encod3 joined #git
13:27 osse p4trix: git branch -f foo origin/bar
13:27 p4trix Thx osse. Makes sense.
13:27 skyres joined #git
13:29 JamesBaxter joined #git
13:31 tchan joined #git
13:31 themill (2016 is in production but I'd still like to git reset --hard 2015)
13:34 skyres joined #git
13:34 blackwind_123 joined #git
13:35 tobiasvl hehe
13:39 Darren_ joined #git
13:41 bremner themill: nooo, then we'd have to relive 2016
13:41 skyres joined #git
13:42 overlord_tm joined #git
13:44 osse Isn't it time to get over it
13:44 jimi_ joined #git
13:45 tpreston joined #git
13:46 jmpp joined #git
13:46 jmpp joined #git
13:47 skyres joined #git
13:47 crs left #git
13:48 fmcgeough joined #git
13:48 oxsyn joined #git
13:49 tobiasvl git rebase -i 2015
13:49 tobiasvl edit 2016
13:50 cdown joined #git
13:50 guicc joined #git
13:52 d0nn1e joined #git
13:53 guicc Hey guys. I stumbled upon a weird thing on my git repo. We have a process which does a "merge-forward" of a change from a specific version to the newer versions of the product. This works fine and has been done quite a lot. But a specific change caused some trouble.
13:54 skyres joined #git
13:54 guicc one of us did a change in a single line in version A. The merge was done to versions B and C. On the merge commit from A->B it worked fine, changing that single line. But on the next merge from B->C it changed a whole lot of lines, removing them
13:55 guicc it did not complained of merge conflict, and automatically removed several lines. I have never seen this happen before
13:55 zivester joined #git
13:57 Starky joined #git
13:58 guicc When we do a git log on this file, it shows the commit that changed that single line. And then shows the merge commit without changes. But if we do a 'git show' of the merge commit, it shows removing several lines
14:00 cdown joined #git
14:00 skyres joined #git
14:04 overlord_tm joined #git
14:05 anonymuse joined #git
14:06 Zoxc joined #git
14:06 skyres joined #git
14:07 blackwind_123 joined #git
14:09 mischat_ joined #git
14:10 narendraj9 joined #git
14:10 ShekharReddy joined #git
14:10 Gsham joined #git
14:11 Snugglebash joined #git
14:13 skyres joined #git
14:14 jorjoro joined #git
14:16 Celmor after I modified a tracked file that exists in the 'head' (latest commit), how do I compare it against the git repository to see the changes made?
14:18 tobiasvl Celmor: git diff -- filename
14:18 ahmed_elgabri joined #git
14:19 tgies joined #git
14:19 narendraj9 joined #git
14:19 skyres joined #git
14:20 tgies joined #git
14:21 samtheknife joined #git
14:21 Celmor tobiasvl, thanks
14:24 artisanIndia joined #git
14:25 Dunsy joined #git
14:25 skyres joined #git
14:26 tgies joined #git
14:26 blackwind_123 joined #git
14:28 berndl joined #git
14:31 tgies joined #git
14:31 troulouliou_div2 joined #git
14:32 skyres joined #git
14:32 ExoUNX joined #git
14:32 CrazyBonz joined #git
14:33 todd_dsm joined #git
14:33 nicksloan joined #git
14:33 mischat joined #git
14:36 tgies joined #git
14:36 zumba_addict joined #git
14:36 overlord_tm joined #git
14:37 venmx joined #git
14:37 Darren_ joined #git
14:38 shaggycat joined #git
14:38 skyres joined #git
14:40 nettoweb joined #git
14:40 blackwind_123 joined #git
14:41 tgies joined #git
14:43 ilyaigpetrov joined #git
14:43 Gsham joined #git
14:43 shinnya joined #git
14:44 Zenith_ joined #git
14:44 d^sh_ joined #git
14:44 skyres joined #git
14:45 ash_workz joined #git
14:46 tgies joined #git
14:46 eivarv joined #git
14:46 vuoto joined #git
14:46 mischat_ joined #git
14:46 jatt joined #git
14:47 tcurdt joined #git
14:47 mischat_ joined #git
14:48 Zenith_ left #git
14:48 Es0teric joined #git
14:48 mischat__ joined #git
14:49 jatt` joined #git
14:50 EnchanterTim Hello, good morning. I am on a terrible connection, let's hope I don't lag out.
14:51 skyres joined #git
14:51 NeverDie joined #git
14:52 EnchanterTim I have a gitlab repository for my website. I develop locally and push my changes up to master origin. On my webserver, I pull down from gitlab and voila, the tested changes are live. I am now wondering, what would be the best way to add a testing place in here?
14:52 Noldorin joined #git
14:52 EnchanterTim Would I be looking at adding a branch? Or another remote?
14:52 nettoweb joined #git
14:53 PioneerAxon joined #git
14:53 boombatower joined #git
14:53 star_prone joined #git
14:54 ilyaigpetrov EnchanterTim: you may keep tests together with code. If you want to avoid it then you can use subrepository for tests. I'm not a pro in this question though.
14:54 jatt` joined #git
14:54 EnchanterTim Not actual unit tests, just to test the site before finally pushign the changes to production/lie
14:54 EnchanterTim live*
14:54 EnchanterTim I was thinking of adding a subdomain dev.stoned.io (for site, stoned.io)
14:55 thebope joined #git
14:55 EnchanterTim And then add a branch called 'testing' and push to testing, pull from testing on dev.stoned.io once it looks good and all, I can then do what? I'm confused
14:56 EnchanterTim I would have two remotes? One for testing and one for production
14:56 ilyaigpetrov EnchanterTim: you will have to branches
14:56 tgies joined #git
14:56 ilyaigpetrov two
14:56 EnchanterTim Oh ok
14:56 phanimahesh joined #git
14:56 EnchanterTim https://www.atlassian.com/gi​t/tutorials/using-branches/ I will be back to bother you later! :D
14:56 ilyaigpetrov usually master branch is not considered as a stable branch and contains latest fixes
14:57 ilyaigpetrov but you may do your own way
14:57 EnchanterTim And also I made a mistake while setting up my repository, I might have to reset the whole thing
14:57 skyres joined #git
14:57 satya4ever joined #git
14:58 EnchanterTim It's a static site generator called Hugo, and I push the whle repository up, inlcuding the generated html public directory
14:58 ilyaigpetrov EnchanterTim: once you reach a stable state you make a versioned branch called "tag"
14:58 EnchanterTim Now I'm thinking that I should only push up the content to the git repo, and generate on the server instead. I notice my repository size getting bigger and bigger as massive changes to the public/ html directory are made
14:58 mostlybadfly joined #git
14:59 EnchanterTim I don't know that either. I need to fully learn better project management
14:59 EnchanterTim Recommend any literature?
14:59 vuoto joined #git
14:59 EnchanterTim That way I don't waste your time
14:59 grawity sigh I don't get this
14:59 ilyaigpetrov I just look how other projects are organised on github, what branches they have, etc.
14:59 grawity logging HEAD..@{upstream} shouldn't include commits that are already in HEAD
14:59 grawity yet it does
15:00 EnchanterTim thanks mr. petrov! 10-4
15:00 _cyril_ joined #git
15:00 grawity oh wait.
15:01 overlord_tm joined #git
15:01 grawity I'm doing this on the wrong computer.
15:01 tgies joined #git
15:01 Es0teric joined #git
15:02 nettoweb joined #git
15:04 skyres joined #git
15:04 ilyaigpetrov I want to move changes made to master to other branch and then rollback master. Other way would be to rename master and recreate it from tag, but I guess the first way is better. Any tips?
15:05 treehug88 joined #git
15:05 ilyaigpetrov s/tips/hints
15:05 jorjoro left #git
15:05 exxi joined #git
15:06 liuzhen joined #git
15:07 osse ilyaigpetrov: if X is the newest commit on master you don't want to move:   git checkout otherbranch; git cherry-pick X..master; git branch -f master X
15:07 AaronMT joined #git
15:08 danslo_ joined #git
15:10 skyres joined #git
15:11 tgies joined #git
15:11 ilyaigpetrov osse: thanks, seems what I need
15:11 osse ilyaigpetrov: is the situation that you forgot to create a new branch ?
15:11 osse or does the other branch already exist somewhere?
15:13 ilyaigpetrov osse: I was pushing all recent changes to master then I realized the feature to be realized is too hard. So, yes, I should have created new branch for it, before I worked only with master and tags
15:13 osse ilyaigpetrov: in that case the procedure is simpler: git checkout -b newbranch; git branch -f master X
15:15 isysd joined #git
15:15 aarobc joined #git
15:16 AaronMT joined #git
15:16 skyres joined #git
15:18 mischat joined #git
15:18 anonymuse joined #git
15:19 fahadash joined #git
15:19 Dougie187 joined #git
15:20 jstein_ joined #git
15:20 cyphase joined #git
15:20 freimatz joined #git
15:21 tgies joined #git
15:21 Schrostfutz joined #git
15:23 skyres joined #git
15:23 Schrostfutz Hi, I have a feature-branch, that includes changes I want in my master branch even though the feature is not mergeable yet. It looks like cherry-picking would be the solution, except there are commits containing both changes I'd like include and those I don't (I know, bad practice, I'm still getting used to it). How can I include the chagnes anyway?
15:23 al-damiri joined #git
15:25 vlt Schrostfutz: Use rebase to split the commits, then cherry-pick.
15:25 Raging_Hog joined #git
15:26 Schrostfutz vlt: This does not work if I already pushed my feature branch to my repository, does it?
15:26 tgies joined #git
15:27 vlt Schrostfutz: It kind of works but anyone who has used your feature branch will hate you.
15:27 Es0teric joined #git
15:27 Thorn joined #git
15:28 vlt Schrostfutz: Maybe you can create a new branch.
15:28 osse Schrostfutz: you can also use git cherry-pick --no-commit then nuke the unwanted changes before committing
15:28 osse or use git checkout -p feature -- file  to selectively grab parts of files
15:29 skyres joined #git
15:30 Schrostfutz osse, vlt: I think I'll use the cherry-pick --no-commit solution, Creating a new branch looks like it'd be more work
15:31 tgies joined #git
15:31 speial joined #git
15:31 speial Hello! "git -A" keeps getting slower and slower for me.
15:31 speial I wonder what I can do.
15:31 speial Does it rehash all files in the repo all the time?
15:32 liuzhen joined #git
15:32 osse do you mean git add -A ?
15:32 speial osse: Yes, "git -A"
15:32 speial Ah no
15:32 speial "git add -A"
15:32 Gsham joined #git
15:32 speial So yes.
15:32 osse do you have huge files in the repo? maybe you've added something you shouldn't
15:32 osse do you have a reasonable .gitignore?
15:33 speial The whole repo is 33MB.
15:33 speial I don't ignore anything.
15:34 mablae joined #git
15:35 Exvi joined #git
15:35 skyres joined #git
15:36 tgies joined #git
15:36 osse i don't know then
15:36 osse yes git needs to rehash all the time
15:37 osse i suspect you've added somethig you shouldn't and that blows up the size, but I don't know
15:37 speial What happens whan Linus types "git add -A" after he changed a line of the linux kernel? Will he go on holiday for a week?
15:38 grawity he has more RAM than you do
15:38 grawity therefore a bigger directory cache
15:38 grawity and no, git doesn't rehash files unless their mtime has changed
15:38 speial But my mtimes do not change.
15:38 grawity if you have *a lot* of files, `git update-index --index-version 4` might help
15:38 speial I have only a hand full of files.
15:38 a3Dman joined #git
15:39 grawity well then
15:39 venmx joined #git
15:39 grawity perhaps go and check what `git add -A` hangs on
15:39 grawity e.g. using strace
15:39 osse I did git add -A in linux.git now and it was plenty fast
15:40 speial grawity: It has no debu switch?
15:40 speial debug
15:40 sangy joined #git
15:40 FloydJohn joined #git
15:41 osse there is GIT_TRACE env var, but that doesn't tell anything interesting (I tried)
15:42 skyres joined #git
15:42 speial Should I use "git add -p" instead?
15:43 osse if the problem is inherent in git add itself then it won't make a difference
15:43 osse but in general it's better to review what you're committing, so I say yes
15:45 aarobc joined #git
15:45 speial But I think "git add -p" does not detect new files, right?
15:45 speial I really want to keep things simple.
15:45 speial I always just do: git add -A;git commit -m "Yay, progress!";git push <myrepo>
15:45 speial That's my whole workflow.
15:45 Es0teric joined #git
15:45 ThiefMaster you can `git add -N ...` on a new file to add it, then it shows up in -p
15:46 osse how long does it take? try GIT_TRACE_PERFORMANCE=1 git add -A
15:46 ThiefMaster also, you should use proper commit mesasges :p
15:46 EmeraldExplorer joined #git
15:47 berndl I've yet to work on a project where the other devs all use proper commit messages...
15:47 Dougie187 Same here.
15:47 Dougie187 For the most part, people are really lazy about commit messages.
15:47 tmz joined #git
15:47 SteffanW joined #git
15:47 ResidentBiscuit Show them the light of proper messages
15:47 Dougie187 I have, many times.
15:48 ResidentBiscuit And then force it onto them
15:48 Dougie187 But they don't look at the history.
15:48 berndl There was one dev. here that detested them apparently. At one point, his commits where adfs asdf
15:48 Dougie187 So, they don't care.
15:48 berndl *were
15:48 ResidentBiscuit Don't even merge their shit
15:48 Dougie187 Well, I don;'
15:48 Dougie187 Well, I don't work with then anymore, so I won't be.
15:48 skyres joined #git
15:48 berndl I guess I can ask the reviewers to check the commit messages on pull request and NOT merge them if they are shit;
15:49 Dougie187 That's what I tried to do. But it didn't get much traction for me
15:49 Dougie187 If your reviewers are all really keen on the idea of a readable history though, it's not a bad suggestion
15:50 ResidentBiscuit Im a big fan of http://chris.beams.io/posts/git-commit/
15:50 berndl I don't they are. They are not keen on documentation in general.
15:50 ResidentBiscuit I pass this around the office, people seem to agree with it
15:50 berndl We pretty much have to reverse engineer stuff all the time.
15:51 berndl It's sad...
15:52 mmlb joined #git
15:52 dsdeiz joined #git
15:52 dsdeiz joined #git
15:53 hahuang61 joined #git
15:53 anonymuse joined #git
15:54 IrishPrime joined #git
15:54 zumba_addict joined #git
15:55 skyres joined #git
15:55 meauses joined #git
15:56 zumba_addict can we use git revert to rollback to a specific commit? it's because yesterday I tried it and looks like I saw conflicts
15:57 Dougie187 zumba_addict: `git revert` add's a new commit, that un-does another commit.
15:57 Dougie187 zumba_addict: `git reset` is what you want, to roll back exactly. But note, it rewrites history, so be careful.
15:58 berndl zumba_addict: how about fixing the problem and commiting the fix?
15:58 zumba_addict ok. Here is what happened. It was 3 commits back. I saw it from git log. I ran git revert commitsha
15:58 zumba_addict that's what I did berndl
15:58 zumba_addict but would just like to know why I got conflicts when I used git revert
15:58 Dougie187 And now it's 4 commits back (but you have conflicts) because it doesn't know how to undo the commit relative to the current heat
15:58 Dougie187 head*
15:58 zumba_addict k
15:59 zumba_addict so git revert should only be used when there is only 1 commit back?
15:59 zumba_addict i mean last commit that I did
15:59 Dougie187 Basically, the 2 commits after the one you're trying to revert, changed the same lines. So the revert doesn't apply cleanly.
15:59 Dougie187 zumba_addict: No, it's fine to revert anything
15:59 zumba_addict oh ok
15:59 Dougie187 zumba_addict: just like you can rebase / merge anything
15:59 Dougie187 you just need to be prepared to deal with conflicts.
15:59 kedare joined #git
15:59 zumba_addict got it
15:59 zumba_addict so what happened was normal
15:59 Dougie187 Yes
15:59 star_prone joined #git
15:59 Dougie187 zumba_addict: It might not happen all the time
16:00 zumba_addict i tried it before, git revert ran and no conflicts
16:00 zumba_addict it was my second time yesterday
16:00 Dougie187 zumba_addict: but conflicts are a natural part of trying to "change commits"
16:00 Dougie187 or maybe combine commits is a better thing to say.
16:00 anonymus_ joined #git
16:01 zumba_addict got it
16:01 skyres joined #git
16:02 lordjancso joined #git
16:03 zivester joined #git
16:03 lamflam joined #git
16:04 Lipp joined #git
16:07 mischat joined #git
16:07 clemf joined #git
16:08 skyres joined #git
16:08 rakk joined #git
16:08 mischat joined #git
16:08 danslo joined #git
16:09 clemf_ joined #git
16:09 venmx joined #git
16:09 rath joined #git
16:11 ojdo joined #git
16:11 danslo_ joined #git
16:13 Pulp joined #git
16:14 skyres joined #git
16:14 LionsMane joined #git
16:15 Learath2 joined #git
16:15 jimi_ joined #git
16:17 lindenle joined #git
16:18 svm_invictvs joined #git
16:20 ochorocho__ joined #git
16:20 lamflam joined #git
16:21 skyres joined #git
16:21 overlord_tm joined #git
16:22 lamflam joined #git
16:24 Ryanar joined #git
16:24 aax joined #git
16:25 gchristensen left #git
16:25 dan2k3k4 joined #git
16:25 converge joined #git
16:25 converge joined #git
16:27 skyres joined #git
16:27 multi_io joined #git
16:31 anonymuse joined #git
16:32 OnlineDater joined #git
16:33 _cyril_ joined #git
16:33 OnlineDater left #git
16:33 skyres joined #git
16:33 jason237 joined #git
16:35 Murii joined #git
16:35 dan2k3k4 joined #git
16:36 mischat_ joined #git
16:40 skyres joined #git
16:43 realz joined #git
16:44 nunchuck joined #git
16:46 skyres joined #git
16:47 kpease joined #git
16:47 vuoto joined #git
16:48 nunchuck joined #git
16:49 shaggycat joined #git
16:49 romerocesar joined #git
16:49 rbr joined #git
16:50 nunchuck joined #git
16:50 madewokherd joined #git
16:50 venmx joined #git
16:50 kpease joined #git
16:51 Celmor joined #git
16:53 skyres joined #git
16:55 rakk joined #git
16:55 _ADNWO_ joined #git
16:55 kpease_ joined #git
16:58 axlmad79 joined #git
16:58 ahmedelgabri joined #git
16:58 afuentes joined #git
16:59 skyres joined #git
17:00 Urbany joined #git
17:01 rakk joined #git
17:01 axlmad79 left #git
17:02 nunchuck joined #git
17:02 likewhoa joined #git
17:03 svm_invictvs joined #git
17:04 dreiss joined #git
17:04 lindenle joined #git
17:04 encod3 joined #git
17:05 Gsham joined #git
17:05 skyres joined #git
17:06 synthroid joined #git
17:06 MacWinner joined #git
17:08 kpease joined #git
17:08 Bombe I have made a number of commits using different author information; I can use filter-branch to rewrite them with the correct information but that strips the signature. Is there any way to re-sign using the new committer information, or do I have to process every commit manually=?
17:08 thethorongil joined #git
17:09 Ryanar joined #git
17:11 rakk joined #git
17:11 Bombe git-rebase -i with every commit in question set to “r” create all new signatures. In hindsight I think that git-rebase -i alone might have worked, too.
17:12 rakk joined #git
17:12 thethorongil joined #git
17:14 SwiftMatt joined #git
17:14 NimeshNeema joined #git
17:14 crayon joined #git
17:15 subhojit777 joined #git
17:15 thethorongil joined #git
17:18 crayon joined #git
17:18 nowhere_man joined #git
17:21 Lipp joined #git
17:23 a3Dman joined #git
17:24 aard_ joined #git
17:26 artisanIndia joined #git
17:27 mikecmpbll joined #git
17:27 CheckDavid joined #git
17:31 Cavallari joined #git
17:33 jimi_sanchez joined #git
17:34 OnBrokenWings joined #git
17:34 Goplat joined #git
17:37 Electrometro joined #git
17:39 mischat joined #git
17:41 Lipp joined #git
17:42 fahadash joined #git
17:44 meauses joined #git
17:45 Hailie_ joined #git
17:45 lucazz joined #git
17:45 Anja joined #git
17:47 crayon joined #git
17:47 jnewt joined #git
17:51 shgysk8zer0 joined #git
17:52 shgysk8zer0 joined #git
17:54 crayon joined #git
17:56 tmz joined #git
17:57 dhollinger joined #git
17:58 bipolar joined #git
17:58 bipolar joined #git
17:58 re1_ joined #git
18:00 meauses joined #git
18:00 cagedwisdom joined #git
18:00 rbr joined #git
18:00 Ryanar joined #git
18:01 hahuang61 joined #git
18:01 re1 joined #git
18:01 lacour joined #git
18:02 Lipp joined #git
18:03 re1_ joined #git
18:04 nicoulaj joined #git
18:05 p4trix joined #git
18:05 nicoulaj joined #git
18:05 emg joined #git
18:07 Exagone313 joined #git
18:08 hahuang61 joined #git
18:09 Faylite joined #git
18:09 hhee joined #git
18:10 anonymuse joined #git
18:12 Siegfried joined #git
18:14 re1 joined #git
18:17 aarobc joined #git
18:19 guampa joined #git
18:20 Electrometro joined #git
18:23 harrymoreno joined #git
18:23 austin987 joined #git
18:23 G1eb joined #git
18:24 G1eb Seveas still no clue about that screen issue :/ will look into it later
18:24 G1eb are you at de heeren atm? lol
18:27 Rodya_ joined #git
18:30 eivarv joined #git
18:32 robotroll joined #git
18:32 star_prone joined #git
18:42 Learath2 joined #git
18:42 Es0teric joined #git
18:44 meauses joined #git
18:44 Es0teric joined #git
18:45 artisanIndia joined #git
18:46 publio joined #git
18:47 kier joined #git
18:50 eivarv joined #git
18:50 KnownSyntax joined #git
18:50 KnownSyntax joined #git
18:51 aarobc joined #git
18:52 meauses joined #git
18:53 jordila joined #git
18:55 mischat joined #git
18:55 nbrogan joined #git
18:55 pandeiro joined #git
18:55 jordila say i have 'commit ...*a2a5' ¿how can  see what changed at this commit?
18:56 Sasazuka joined #git
18:56 alex1a joined #git
18:56 tobiasvl jordila: man git show
18:56 gitinfo jordila: the git-show manpage is available at http://jk.gs/git-show.html
18:57 jordila i love #git
18:58 f4 joined #git
18:59 jstimm joined #git
18:59 tobiasvl <3
19:00 kier joined #git
19:00 nowhere_man joined #git
19:00 Cavallari1 joined #git
19:01 Ryanar joined #git
19:01 jrnieder joined #git
19:02 phanimahesh joined #git
19:02 boombatower joined #git
19:03 adac joined #git
19:03 SpecChum joined #git
19:04 VampiricPadraig joined #git
19:04 VampiricPadraig joined #git
19:07 Cavallari joined #git
19:07 _ADNWO_ joined #git
19:08 [ADNWO] joined #git
19:08 idmistir joined #git
19:11 dsantiago joined #git
19:14 gfixler joined #git
19:14 nicksloan joined #git
19:18 thiago joined #git
19:18 thebope joined #git
19:19 Es0teric joined #git
19:19 sea-gull joined #git
19:19 Sasazuka joined #git
19:20 sdothum joined #git
19:21 kyan joined #git
19:23 rgrinberg joined #git
19:24 RominRonin joined #git
19:25 utuep joined #git
19:25 dviola joined #git
19:27 hhee1 joined #git
19:27 zeroed joined #git
19:29 zezba9000 joined #git
19:30 dsantiago joined #git
19:32 tyreld joined #git
19:33 PioneerAxon joined #git
19:34 ayjay_t joined #git
19:37 Gsham joined #git
19:39 Limes joined #git
19:40 jrnieder joined #git
19:41 aidalgol joined #git
19:42 ahmedelgabri joined #git
19:42 cyan__ joined #git
19:44 laumann joined #git
19:50 Rodya_ joined #git
19:50 venmx joined #git
19:53 rbr joined #git
19:54 robotroll joined #git
19:54 ocbtec joined #git
19:54 lamflam joined #git
19:55 mibr0 joined #git
19:56 davs joined #git
19:56 jmpp joined #git
19:58 nicksloan joined #git
19:59 shinnya joined #git
19:59 davs Hi! If I have 2 branches (master + develop) and I commit to both, then I merge develop into master, then I have to following topology: http://imgur.com/a/5qNXR  . However if I do git log, it shows 1 through 7. Does git log check both branches and orders the commits be date?
19:59 Es0teric joined #git
20:00 kyan joined #git
20:00 davs Also, the merge branch has 2 parents. Git has to walk both trees to get the history? (Trying to understand git history after merging)
20:01 _ikke_ davs: "By default, the commits are shown in reverse chronological order."
20:01 Doginal joined #git
20:01 phanimahesh joined #git
20:01 _ikke_ if you just type git log, it starts at the branch / commit that is currently checked out, and shows everything that is reachable
20:02 _ikke_ davs: Correct, it follows both parents
20:02 davs _ikke_: thanks for the clarification
20:03 austin987 joined #git
20:05 ResidentBiscuit You can run `git log develop..master` to see the commits just on develop
20:05 davs one more question: If I start doing `git checkout HEAD~1`, then I will walk only one of the trees, right?
20:05 osse ResidentBiscuit: you got that the wrong way around
20:05 ResidentBiscuit Oh whoops
20:05 davs assuming current HEAD is on the merge commit
20:05 osse davs: yes
20:06 ResidentBiscuit `git log master..develop`
20:06 osse davs: HEAD^1 is the first parent. HEAD^2 is the second
20:06 ResidentBiscuit Or just `git log master..`
20:06 osse davs: HEAD~1 = HEAD^1
20:06 davs oh nice, I did not know that :)
20:06 mustmodify joined #git
20:06 davs so a workflow, where you don't rebase, just merge things around is not bisect friendly
20:06 osse but HEAD~2 = (HEAD~1)~1
20:06 _ikke_ but HEAD~2 != HEAD^2
20:06 Ryanar joined #git
20:07 mustmodify if I add a 3 meg file to a repo, then delete it in a subsequent commit, and someone else pulls down that file... will they still pull down the 3.4MB? Presumably so...
20:07 tobiasvl yes
20:07 Atm0spher1c joined #git
20:07 _ikke_ correct
20:07 _ikke_ it's part of the history
20:07 cyphase joined #git
20:09 jmpp joined #git
20:09 thebope joined #git
20:11 sQVe joined #git
20:11 meauses joined #git
20:12 refried_ joined #git
20:13 star_prone joined #git
20:13 star_prone joined #git
20:14 vuoto joined #git
20:14 phanimahesh joined #git
20:21 JrCs joined #git
20:22 romerocesar joined #git
20:22 [twisti] joined #git
20:24 crayon joined #git
20:24 [twisti] i am familiar with using git to have a local repo that has a remote origin like bitbucket that i can push to. but now i would like to set up a scenario where i have a local repo that pushes to another local repo that is located elsewhere on the same machine. the reason i want that is so i have a local repo i can mess around and fuck up and still have the second 'origin' to restore from in case i
20:24 [twisti] mess up, as i am bound to at some point
20:24 satya4ever joined #git
20:24 [twisti] but the repo is huge, way too huge to put online
20:24 nowhere_man joined #git
20:24 romerocesar joined #git
20:25 tobiasvl not sure what the question is, but your scenario is unproblematic
20:26 _ikke_ git takes files paths to clone from
20:26 _ikke_ git clone file:///path/to/repo
20:26 [twisti] the question is how do i do that, or what is it called, so i can google it
20:26 _ikke_ ^^
20:26 mustmodify left #git
20:27 [twisti] i have the local repo set up and working, i dont think i want to clone it, that seems to be going in the wrong direction
20:27 tobiasvl huh? what do you want then?
20:27 [twisti] conceptually i want to add something 'above' my local repo, not 'below' it
20:27 zzz joined #git
20:27 tobiasvl I don't follow
20:27 _ikke_ [twisti]: You can create a bare repository where you can push to
20:28 _ikke_ git init --bare <name>
20:28 _ikke_ and then add a new remote to the first repo
20:28 [twisti] ok, say i have a local folder c:\a, and in a lives my repository. now i would like to set it up so that a 'git push' in a will push to c:\b
20:29 meauses joined #git
20:29 [twisti] it seems that all the solutions so far assume that i want to live in b and push to a, or am i misunderstanding ?
20:29 _ikke_ No
20:30 spacelord joined #git
20:30 _ikke_ git init --bare b; cd a; git remote add file:///c
20:30 [twisti] but say i go to b, do git init --bare origin, and then 'git remote add idontknowwhatgoeshere c:\a'
20:30 [twisti] ooooh
20:31 [twisti] i see now, i misunderstood how you meant that
20:34 tomaw_ joined #git
20:34 crayon joined #git
20:35 [twisti] thanks, it seems like this turned out exactly as i had hoped
20:35 meauses joined #git
20:36 nwkj86 joined #git
20:37 ochorocho__ joined #git
20:37 a3Dman joined #git
20:40 Faylite_ joined #git
20:43 hackel joined #git
20:43 ochorocho__ joined #git
20:46 lolmac joined #git
20:49 drmt joined #git
20:49 anonymuse joined #git
20:50 einnjo joined #git
20:51 fragMental joined #git
20:55 xocket joined #git
20:55 xocket hi
20:55 gitinfo xocket: 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.
20:55 xocket is there a friendly git software for debian?
20:56 xocket That run something like service/daemon to check if there is new commits for the repository i cloned?
21:02 crayon joined #git
21:06 adac joined #git
21:06 _cyril_ joined #git
21:08 zezba9000 Has anyone here worked on Git-GUI?
21:08 zezba9000 Does anyone know where the "Commit" and "Push" buttons are defined in the tk tcl files?
21:08 _ikke_ nop
21:09 zezba9000 where would I ask questions about Git-GUI? Is there a form? Or must I use GitHub?
21:09 crayon joined #git
21:09 tobiasvl no idea. !gui
21:09 gitinfo 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.
21:09 bremner zezba9000: this is as good a place as any.
21:09 bremner git-gui is part of git
21:09 bremner so, the gui blurb doesn't really apply, IMHO
21:09 Eugene !ask
21:09 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
21:10 jave joined #git
21:10 lolmac joined #git
21:10 zezba9000 Ya if I couldn't ask about Git-GUI here that would be odd
21:11 zezba9000 as it just invokes Git commands anyway
21:11 ieee joined #git
21:12 Domhack joined #git
21:12 zezba9000 Does anyone know who wrote Git-GUI? I just want to look into updating it.
21:12 RominRonin left #git
21:12 Eugene "the git developers". ;-)
21:12 _ikke_ Shawn Pearce
21:13 zezba9000 _ikke_: k tnx
21:13 _ikke_ It's developed and maintened by different persons
21:13 _ikke_ iirc, he does not work on it anymore
21:13 meauses joined #git
21:13 _ikke_ Pat something is maintaining it currently
21:14 zezba9000 I asume so but maybe someone can get me passed some basic stuff that doesn't make sense
21:14 [twisti] left #git
21:14 _ikke_ the mailing list would be the best place
21:14 _ikke_ Pat Thoyts
21:15 osse no help in grepping the source for the exact strings shown on the buttons?
21:16 zezba9000 osse: nope thats whats so odd
21:16 zezba9000 I searched every single tcl file for the values
21:16 zezba9000 and didn't find what I needed
21:17 _ikke_ Whatabout git-gui:2926 ?
21:18 osse is it not this? https://github.com/git/git/blob/​master/git-gui/git-gui.sh#L3303
21:21 venmx joined #git
21:21 zezba9000 osse: Thats a method and not the layout for the button
21:22 zezba9000 I want to fix up the UI. I would find the world "Commit" with a capitor C somewhere but don't
21:22 zezba9000 **word
21:22 zezba9000 **capital
21:23 zezba9000 ...if I could type
21:23 WayToDoor joined #git
21:24 m0viefreak joined #git
21:24 _ikke_ zezba9000: Not this? https://github.com/git/git/blob/​master/git-gui/git-gui.sh#L2664
21:25 sonOfRa joined #git
21:26 zezba9000 thats still a method. Also its the only place I find a "Commit" with a capital 'C'
21:28 eivarv joined #git
21:29 romerocesar joined #git
21:32 paulg joined #git
21:34 paulg anyone else seen recently where a git clone (kernel) does 99% of the work and I/O and then goes off in the weeds eating 100% CPU for about eight minutes?
21:34 paulg strace doesn't show anything interesting other than a smattering of brk() calls...
21:35 _ikke_ paulg: Look at the mailing list, I recall there being some others reporting problems
21:36 paulg _ikke_, thanks -  will take a look.
21:39 _ikke_ paulg: That was about pushing
21:40 _ikke_ https://public-inbox.org/git/CA+55aFyos78qODyw57​V=w13Ux5-8SvBqObJFAq22K+XKPWVbAA@mail.gmail.com/
21:40 zeroed joined #git
21:40 zeroed joined #git
21:40 buzzLightBeer joined #git
21:41 krsr joined #git
21:41 paulg yeah, this is on a fetch.
21:42 zezba9000 _ikke_: aww sweet I see where it is (somehow I missed this) On windows is uses the "git-gui.tcl" located in a different path
21:42 ochorocho__ joined #git
21:42 jmpp joined #git
21:42 jmpp joined #git
21:42 paulg I'd seen it on a vanilla kernel repo once or twice ; now someone handed me a reproducer based on yocto stuff which is based on the 4.8 kernel...
21:42 zezba9000 I was able to change the button text
21:44 paulg interestingly the delay of ~8 minutes seems independent of machine speed; same delay on a circa 2009 xeon as a modern 128 core xeon.
21:44 shgysk8zer0 joined #git
21:45 xock_stream joined #git
21:47 jimi_ joined #git
21:47 mauri7 joined #git
21:53 Spec-Chum joined #git
21:56 ke4nhw joined #git
22:01 venmx joined #git
22:12 anuxivm joined #git
22:15 anuxivm joined #git
22:18 anuxivm joined #git
22:19 mangolisk joined #git
22:20 nowhere_man joined #git
22:21 nilg joined #git
22:26 Sasazuka__ joined #git
22:28 refried_ joined #git
22:29 parasite joined #git
22:33 lindenle joined #git
22:33 Sasazuka joined #git
22:38 thebope joined #git
22:39 romerocesar joined #git
22:45 perlpilot joined #git
22:45 xocket joined #git
22:47 plasticle joined #git
22:48 Rodya_ joined #git
22:49 re1_ joined #git
22:49 Rodya__ joined #git
22:52 nicksloan joined #git
22:55 zeroed joined #git
22:55 zeroed joined #git
22:57 Electrom_ joined #git
22:59 steelsw0rd joined #git
22:59 davidfetter_ge joined #git
22:59 romerocesar joined #git
23:01 drmt joined #git
23:02 venmx joined #git
23:03 robattila256 joined #git
23:06 ruby joined #git
23:07 _cyril_ joined #git
23:11 mikecmpbll joined #git
23:13 kubrrick joined #git
23:13 pitastrudl HI
23:13 pitastrudl ops caps, sorry
23:14 pitastrudl anyways, im wondering how to use git with eclipse workspaces on win7/ubuntu
23:14 pitastrudl i used git bash on win7, made a repo and synced up, pulled it on ubuntu and i cant import it with eclipse
23:14 pitastrudl it does not detect it
23:14 pitastrudl im not sure if my gitignore file ignored too much
23:15 perlpilot joined #git
23:15 pitastrudl http://pastebin.com/ZKvFtHZD
23:17 perlpilot joined #git
23:17 f4 joined #git
23:19 cydrobolt joined #git
23:19 cydrobolt joined #git
23:20 qws-user-1228 joined #git
23:20 SwiftMatt joined #git
23:20 plouescat joined #git
23:21 Guest4243 !ping
23:21 gitinfo I only respond to !reply_time
23:21 Guest4243 !gui
23:21 gitinfo 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.
23:21 Guest4243 there
23:22 Xe joined #git
23:22 Guest4243 damn my nick Oo
23:22 zezba9000 pitastrudl: Eclipse is the worst IDE ever. Is this for Android?
23:22 ozymandias_ joined #git
23:22 pitastrudl java/ocaml
23:22 harrymoreno joined #git
23:22 pitastrudl what do you use zezba9000 ?
23:22 zezba9000 pitastrudl: For Android?
23:23 pitastrudl no
23:23 zezba9000 Well then it depends on what I'm doing
23:23 kubrrick joined #git
23:23 Guest4243 joined #git
23:23 pitastrudl okay
23:23 zezba9000 Visual Studios 2015 for C++ and C#. Android Studio for Java, xCode for iOS
23:23 zezba9000 MonoDevelope for C# on Linux and OSX
23:23 pitastrudl i wonder how intellij is
23:23 ochorocho__ joined #git
23:24 zezba9000 pitastrudl: Its much better
23:24 tcurdt joined #git
23:24 pitastrudl i should just manually compile my files and use vim
23:24 pitastrudl :D
23:24 ribasushi joined #git
23:25 lb pitastrudl https://www.xkcd.com/378/
23:25 pitastrudl :D
23:26 zezba9000 I'm glad gedit exists is all I have to say
23:29 eivarv joined #git
23:29 madebymarkca joined #git
23:32 ke4nhw left #git
23:33 Snugglebash joined #git
23:34 perlpilot joined #git
23:36 railssmith joined #git
23:37 qws-user-1228 joined #git
23:38 Marbug joined #git
23:39 thebope joined #git
23:40 refried_ joined #git
23:40 Siegfried joined #git
23:42 tonyj joined #git
23:43 austin987 joined #git
23:44 jstimm joined #git
23:45 xock_stream joined #git
23:48 sleepster joined #git
23:48 sleepster is there a way to say, I would like to keep only the last 100 log entries
23:48 sleepster revisions I guess
23:49 sleepster for a particular file
23:50 danielsh joined #git
23:50 Rodya_ joined #git
23:51 danielsh left #git
23:51 danielsh_ joined #git
23:51 danielsh_ How to prevent for-each-ref from sorting its output?
23:52 sonOfRa joined #git
23:52 danielsh_ I'd like to get some info on selected refs, in the order they are specified in argv.
23:52 ESphynx joined #git
23:52 ESphynx hey guys, why do I get a 'failed to create empty bundle'? seems I forgot how git bundle works
23:53 drmt joined #git
23:53 nettoweb joined #git
23:56 isysd joined #git
23:56 raijin joined #git
23:57 akurniawan joined #git
23:59 lb sleepster not possible

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