Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-26

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

All times shown according to UTC.

Time Nick Message
00:00 fstd joined #git
00:00 mellernoia joined #git
00:01 AbsurdTech joined #git
00:08 inflames joined #git
00:09 Lyqyd joined #git
00:11 neanderslob joined #git
00:14 mwhooker joined #git
00:18 LeBlaaanc joined #git
00:19 tristanp joined #git
00:20 bubba1 joined #git
00:22 tristanp_ joined #git
00:23 Winter_ joined #git
00:24 ochorocho__ joined #git
00:24 interne7y joined #git
00:25 madewokherd joined #git
00:26 mwhooker joined #git
00:26 BenderRodriguez joined #git
00:29 eletuchy joined #git
00:30 tomog999_ joined #git
00:32 mizu_no_oto joined #git
00:33 infernix joined #git
00:33 milki having resource problems on server side when fetching a repo with lots of small tiny commits. the pack-objects command spawns max threads and uses all cpu. any suggestions on tweaking the configs for packing with this repo type?
00:33 milki something something pack windows and depth?
00:39 BenderRodriguez joined #git
00:41 modocache joined #git
00:43 ceaucari joined #git
00:44 zalatovo joined #git
00:45 cworth joined #git
00:47 NightStrike joined #git
00:49 ash_workz joined #git
00:49 bronson joined #git
00:50 hobodave joined #git
00:50 tristanp joined #git
00:51 qpdb joined #git
00:52 DarkMukke joined #git
00:53 mwhooker joined #git
00:53 hobodave joined #git
00:53 hexagoxel joined #git
00:56 hobodave joined #git
00:58 L8D joined #git
00:58 drbean joined #git
01:01 tristanp_ joined #git
01:05 ensyde joined #git
01:05 dermoth_ joined #git
01:06 johnmilton joined #git
01:08 mwhooker joined #git
01:10 tristanp joined #git
01:12 Kev- joined #git
01:13 f3r70rr35f joined #git
01:14 BenderRodriguez joined #git
01:15 Kev- joined #git
01:15 xlegoman joined #git
01:16 fuchstronaut joined #git
01:19 bttf joined #git
01:19 sdothum joined #git
01:22 yohnnyjoe joined #git
01:23 tristanp joined #git
01:24 eletuchy joined #git
01:24 SwiftMatt joined #git
01:25 ochorocho__ joined #git
01:28 mizu_no_oto joined #git
01:28 Goplat joined #git
01:29 tristanp_ joined #git
01:30 jaguarmagenta joined #git
01:33 Tim-SEM joined #git
01:34 yohnnyjoe joined #git
01:35 dermoth_ joined #git
01:38 tristanp joined #git
01:39 Tanger_ joined #git
01:46 yohnnyjoe joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and zerg rushes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | YOU MUST SUBMIT ADDITIONAL JOKES https://madeitwor.se/git-jokes
01:51 pks joined #git
01:52 eletuchy joined #git
01:57 bluezone joined #git
01:59 toogley joined #git
02:00 tristanp joined #git
02:01 drbean_ joined #git
02:03 mwhooker joined #git
02:04 mwhooker joined #git
02:05 tristanp joined #git
02:11 Dougie187 joined #git
02:11 dmto joined #git
02:16 snowbound joined #git
02:16 arescorpio joined #git
02:21 ryez joined #git
02:21 rgrinberg joined #git
02:23 dmto joined #git
02:24 dodobrain joined #git
02:25 ryez is there anything like the following?
02:25 interne7y joined #git
02:27 ryez for a rebased branch, it's previous tip can be stored somewhere inside .git dir
02:28 ryez so that when a special option (e.g. --previous) is given, git log shows the log before the rebase of the same branch?
02:29 ryez ideally, a branch should be able to track all its rebase history
02:29 elastix joined #git
02:29 Havvy I know `git reflog` has that, but I don't think reflogs are sent to other remotes.
02:30 Havvy Actually, they can't be, since the reflog also contains branch switches.
02:30 ryez yeah, I know `git reflog`
02:30 LeBlaaanc joined #git
02:31 samson joined #git
02:31 ryez but `git reflog` is a mix of everything
02:31 clemf joined #git
02:33 Arahael ryez: it's not a mix at all.  it's whatever you've been on.
02:33 mwhooker joined #git
02:34 Arahael it's a log... of where you've been.
02:34 ryez yeah, I know
02:34 tristanp joined #git
02:35 hexagoxel joined #git
02:35 ryez or is it possible to have a filtered `git reflog` to just show commits of a certain branch?
02:35 Arahael ryez: for what purpose?
02:35 yohnnyjoe joined #git
02:36 joako joined #git
02:36 Arahael ryez: noting that commits that are not on a particular branch are well...  not in that branch.
02:36 Arahael ryez: in other words: noting that there isn't much metadata to speak of.
02:38 ryez say a long running branch is merged then rebased against master
02:38 tristanp joined #git
02:38 chachasmooth joined #git
02:39 ryez I want the ability to show commits solely "belongs to" that branch
02:41 Arahael ryez: right...  how do you define "belongs to"?
02:42 dreiss joined #git
02:42 ryez say I have branch commits b1, b2, which is merged to master
02:43 dmto joined #git
02:43 ryez then the branch rebased onto latest master, then some new commits b3, b4
02:44 ryez due to the rebase, commits b3 and b4 are having different parent commits
02:44 ryez I want an easier way to just show b1 b2 b3 b4
02:45 ryez assuming b1 b2 have been merged into master
02:46 Sonderblade wouldn't that make b1 and b2 appearing in two branches?
02:46 ryez so the commits would be b1 b2 m1 m2 m3 b3 b4
02:46 ryez yes Sonderblade
02:46 Rodya_ joined #git
02:46 tristanp_ joined #git
02:47 Sonderblade then they wouldn't fit your solely belongs to criteria, would they?
02:47 eletuchy joined #git
02:47 ryez surely, not "belongs to" in git terminology
02:48 ryez that's why I need this is more like a RFC
02:48 bronson joined #git
02:48 ryez need -> think
02:50 ryez if git tracks the previous tip, namely b2, before the rebase
02:50 Sonderblade so you want to see all committs in one branch EXCEPT those present in any other branch?
02:50 Brando753 joined #git
02:51 ryez no
02:52 ryez I understand for that there's ref1..ref2
02:52 livingstn joined #git
02:52 ryez I actually can tag my branch as BRANCH_B4_REBASE
02:52 dmto joined #git
02:52 ryez then simply `git log BRANCH_B4_REBASE`
02:52 sangy joined #git
02:53 ryez but I wish git can automatically keep this information during rebase
02:53 ryez so I don't have to explicitly maintain the tag
02:54 tristanp joined #git
02:55 Sonderblade git cherry can show you a branch's unmerged commits, is that what you want?
02:55 ryez no
02:56 ryez I don't know much about `git cherry`, though, the point is b1 b2 could already be merged into master
02:57 edude03 joined #git
02:58 ryez if git rebase automatically tracks the POINT_BEFORE_REBASE, then my imaginary `git log --before-last-rebase` could show b2 b1 ...
02:58 robbyoconnor joined #git
02:59 dreiss joined #git
02:59 Sonderblade so you want git to understand that b1 and b2 belongs to your side-branch, even though they are reachable from two branches?
03:00 tristanp joined #git
03:01 ryez yes, kind of, because upon the rebase, side-branch is my current branch, and b2 is where it points to
03:03 jrnieder joined #git
03:04 robbyoconnor joined #git
03:04 sargas joined #git
03:04 ryez I think with this addition, the pain of git rebase due to history rewriting could be at least slightly relieved :D
03:05 aavrug joined #git
03:06 ryez if such feature / request doesn't exist it I think we can post it as a feature request to the mailing list
03:08 gravitron joined #git
03:08 Sonderblade if you rebase your branch after b1 and b2 has been merged to master, then effectively, only b3 and b4 remains in your branch
03:09 ryez according to its manual, `git cherry` checks the diff
03:09 Sonderblade b1 and b2 are at that point just as much "natives" of the master branch as all other comitts in it
03:09 tristanp_ joined #git
03:11 ryez right, except they used to be only reachable from the side-branch before the merge/rebase
03:11 ryez i.e. the POINT_BEFORE_REBASE
03:12 blackwind_123 joined #git
03:12 tristanp_ joined #git
03:16 JZA hi whats the best way to browse between changes?
03:16 JZA if I want to test different iteration of my code, is there a way I can rollback and rollover, like I would do in a wiki for example or with undoo/redo?
03:17 Chill_Surf joined #git
03:17 david007 joined #git
03:17 ryez JZA: git-bisect
03:21 k3rn31 joined #git
03:22 tristanp joined #git
03:24 MattMaker joined #git
03:28 ochorocho__ joined #git
03:28 mwhooker joined #git
03:29 a_thakur joined #git
03:31 emPi joined #git
03:34 Dougie187 left #git
03:37 tristanp joined #git
03:39 Xano joined #git
03:41 mehola joined #git
03:41 LeBlaaanc joined #git
03:41 frogonwheels joined #git
03:42 nilg joined #git
03:42 MindfulMonk joined #git
03:43 jaequery joined #git
03:44 dolphinling joined #git
03:45 Mobutils joined #git
03:45 dolphinling Hi, after I create a new branch (with `git checkout -b newbranch start`), how can I tell what branch I was previously on?
03:45 milki dolphinling: git reflog
03:46 milki though it might not say it directly
03:46 milki i dont think it says your from branch name, but you at least get a sha
03:46 dolphinling milki: Awesome, thanks
03:46 martinklepsch joined #git
03:47 Forkk joined #git
03:47 wcpan joined #git
03:48 c0ded joined #git
03:48 TheVoid joined #git
03:49 diogenese joined #git
03:49 bronson joined #git
03:49 dodobrain umm.. how do i compare an entire subtree on one branch to one from another branch?
03:49 Shentino joined #git
03:50 ojacobson git diff branch-a:path/to/tree branch-b:path/to/other/tree
03:50 rxo joined #git
03:51 saul joined #git
03:51 saul hi, i'm having trouble pulling from a repo, it hangs on 100% compressing objects, i wonder if anyone has seen this
03:51 saul maybe it's a routing issue? i'm behind nat
03:51 saul but it sometimes works ....
03:52 saul ive been able to clone/pull inthe past anyway
03:52 saul left #git
03:54 josuebrunel joined #git
03:54 tristanp_ joined #git
03:56 ome joined #git
04:00 mehola joined #git
04:00 boingy joined #git
04:00 markelite joined #git
04:00 EY__ joined #git
04:02 bronson joined #git
04:02 dodobrain thanks ojacobson
04:02 kadoban joined #git
04:03 eletuchy joined #git
04:04 jaguarmagenta joined #git
04:04 clemf joined #git
04:05 tristanp joined #git
04:08 josue joined #git
04:09 tristanp joined #git
04:09 jaguarmagenta joined #git
04:12 rscata joined #git
04:13 tinajohnson___ joined #git
04:15 nnyk_ joined #git
04:19 italoacasas joined #git
04:20 a_thakur_ joined #git
04:21 d4rklit3 joined #git
04:22 a3Dman joined #git
04:22 tristanp_ joined #git
04:25 jaguarmagenta joined #git
04:26 interne7y joined #git
04:27 gsingh93 joined #git
04:28 Rodya_ joined #git
04:29 baba_ joined #git
04:31 boudicca joined #git
04:32 PaulCape_ joined #git
04:32 diegoaguilar joined #git
04:33 tristanp joined #git
04:34 mehola joined #git
04:36 s00pcan joined #git
04:37 Cabanossi joined #git
04:41 liuzhen joined #git
04:42 tristanp_ joined #git
04:43 Guest47 joined #git
04:44 dreiss joined #git
04:50 MutantMahesh joined #git
04:51 rkazak joined #git
04:53 jaguarmagenta joined #git
04:54 tristanp joined #git
04:54 josuebrunel joined #git
04:54 a_thakur joined #git
04:57 PaulCapestany joined #git
05:03 bronson joined #git
05:03 Terens joined #git
05:06 dmto joined #git
05:09 sauvin joined #git
05:11 jaguarmagenta joined #git
05:11 gniourf joined #git
05:18 nilg` joined #git
05:22 PCatinean joined #git
05:23 dmto joined #git
05:24 PaulCape_ joined #git
05:27 mwhooker joined #git
05:27 tristanp_ joined #git
05:28 ochorocho__ joined #git
05:29 MutantMa_ joined #git
05:31 tristanp joined #git
05:32 a_thakur joined #git
05:32 tango_ joined #git
05:32 Chunk2 joined #git
05:33 tango_ joined #git
05:34 subhojit777 joined #git
05:34 tristanp_ joined #git
05:35 glebihan joined #git
05:40 tristanp joined #git
05:42 Alienpruts joined #git
05:44 qt-x joined #git
05:45 harish_ joined #git
05:49 LucaTM joined #git
05:50 PaulCapestany joined #git
05:51 t2mkn joined #git
05:51 Raging_Hog joined #git
05:51 mohit7 left #git
05:54 Raging_Hog joined #git
05:54 muthu joined #git
05:55 circ-user-fbIZM joined #git
05:56 tristanp_ joined #git
05:57 SimonNa joined #git
05:57 Xano joined #git
06:00 tristanp joined #git
06:02 cdown joined #git
06:03 hahuang65 joined #git
06:04 bronson joined #git
06:05 mwhooker joined #git
06:05 Xano joined #git
06:05 tristanp joined #git
06:08 Macaveli joined #git
06:09 Jupelius joined #git
06:09 zeroed joined #git
06:09 zeroed joined #git
06:13 robotroll joined #git
06:17 lamppid joined #git
06:18 PaulCape_ joined #git
06:25 ImJune joined #git
06:25 baba_ joined #git
06:26 ImJune Hi I would like to push my bash scripts to my git account but I run the proper push command and they aren't showing up on the page
06:27 interne7y joined #git
06:27 tristanp joined #git
06:28 nnyk_ joined #git
06:29 ronskisika joined #git
06:30 harish_ joined #git
06:30 boudiccas joined #git
06:31 freimatz joined #git
06:33 akiva joined #git
06:34 wxg joined #git
06:35 tristanp_ joined #git
06:35 cyan__ joined #git
06:36 wxg joined #git
06:38 tristanp joined #git
06:38 Seveas ImJune: there's no such thing as a 'git account', or 'pushing bash scripts'.
06:39 ImJune ok troll
06:39 Seveas ImJune: so what are you actually doing? Pastebin'ing console logs helps...
06:39 ImJune I just did it
06:39 ImJune thanks for nothing
06:39 Seveas and with that attitude, you're better off in /dev/null...
06:40 ImJune the blackhole of linux
06:40 ImJune ?
06:40 ImJune nerd humor nice
06:40 JeroenT joined #git
06:41 Xano joined #git
06:43 milki huh
06:43 * milki kicks git pack-objects
06:43 Fijit joined #git
06:44 PaulCapestany joined #git
06:47 diogenese joined #git
06:48 macivy left #git
06:48 Seveas milki: you want git gift-wrap-objects instead? :)
06:49 diogenese joined #git
06:50 armyriad joined #git
06:51 Alienpruts joined #git
06:52 settermjd joined #git
06:52 Sceorem joined #git
06:52 armyriad joined #git
06:54 Ardethian\work joined #git
06:55 milki not if it takes a factory full of elves
06:57 lindenle joined #git
06:58 Dirkson left #git
07:01 kurkale6ka joined #git
07:02 [Brain] joined #git
07:02 hanthings joined #git
07:03 metastableB joined #git
07:03 clemf joined #git
07:05 eijk joined #git
07:07 encod3 joined #git
07:07 Neon1024x joined #git
07:08 tristanp_ joined #git
07:09 babilen Hello! Is there an easy way to find the a tag (if it exists) that comes after a given commit on the current branch? I essentially want to answer the question "Which release, if any, was this commit part of?"
07:10 PaulCape_ joined #git
07:11 selckin git branch --contains
07:11 Darcidride joined #git
07:11 tristanp joined #git
07:11 j416 babilen: git tag --contains <commit>
07:12 j416 babilen: but this is not restricted to the current branch.
07:12 j416 babilen: tags to not belong to branches.
07:13 babilen j416: It is exactly what I was looking for
07:13 j416 o/
07:13 babilen Thank you :)
07:13 compeman joined #git
07:13 nnyk_ joined #git
07:14 j416 babilen: git describe <commit> may also be useful.
07:14 babilen I use selckin's "git branch --contains <commit>" quite frequently, but wasn't aware that git tag also supports --contains
07:14 tristanp joined #git
07:14 babilen Very handy
07:14 ferr joined #git
07:16 ahmedelgabri joined #git
07:17 jceb joined #git
07:18 Guest88969 joined #git
07:19 MutantMahesh joined #git
07:21 saedelaere joined #git
07:22 mwhooker joined #git
07:23 JeroenT joined #git
07:26 JeroenT joined #git
07:26 ciampix joined #git
07:28 yuhlw_ joined #git
07:28 baba__ joined #git
07:28 boudicca joined #git
07:28 a_thakur joined #git
07:29 bayman joined #git
07:29 Balliad joined #git
07:29 ochorocho__ joined #git
07:30 xall joined #git
07:31 bayman tryin to do a git pull and it says i have local changes that needs to be commited or stashed.. if i don't care about the changes, how do i git pull and overwrite from repo?
07:31 JeroenT joined #git
07:32 selckin run git status, and follow its instruction to remove your local changes
07:33 TomyWork joined #git
07:33 GavinMagnus joined #git
07:33 ril joined #git
07:34 elastix joined #git
07:35 neurocroc joined #git
07:35 tobiasvl bayman: an easy way is to "git stash" like it asks you to, then pull, and later you can "git stash drop" if you're still sure you don't care about the changes.
07:37 tristanp joined #git
07:38 PaulCapestany joined #git
07:38 qt-x joined #git
07:39 neurocroc left #git
07:39 MrWoohoo joined #git
07:39 Arahael left #git
07:39 johnny56_ joined #git
07:40 tristanp joined #git
07:41 bayman ok thanks
07:41 Success joined #git
07:43 mrkat joined #git
07:44 fracting joined #git
07:45 compeman joined #git
07:47 _28_ria joined #git
07:48 Mobutils joined #git
07:50 jceb joined #git
07:51 bjpenn joined #git
07:53 mikecmpbll joined #git
07:55 sebhoss joined #git
07:56 PasiFist joined #git
07:57 ril joined #git
07:58 kronos joined #git
07:59 josuebrunel joined #git
08:00 bongjovi joined #git
08:01 fracting joined #git
08:02 _28_ria joined #git
08:02 tvw joined #git
08:02 tristanp_ joined #git
08:03 JeroenT joined #git
08:03 settermjd joined #git
08:03 a_thakur joined #git
08:04 Kicer86 joined #git
08:05 bronson joined #git
08:05 durham joined #git
08:05 PaulCape_ joined #git
08:05 tristanp joined #git
08:07 mikecmpbll joined #git
08:08 fscala joined #git
08:09 tristanp_ joined #git
08:11 weckl joined #git
08:12 yayapapaya joined #git
08:12 yayapapaya left #git
08:13 nadim joined #git
08:15 Gonzo89 joined #git
08:15 acetakwas joined #git
08:16 elastix joined #git
08:16 narendraj9 joined #git
08:18 mukmuk joined #git
08:21 boudiccas joined #git
08:21 Neon1024x joined #git
08:21 remi left #git
08:21 acetakwas joined #git
08:22 ahmed_elgabri joined #git
08:23 acetakwas joined #git
08:26 rafalcpp joined #git
08:27 acetakwas joined #git
08:28 settermjd joined #git
08:28 interne7y joined #git
08:29 PaulCapestany joined #git
08:31 Cabanossi joined #git
08:35 boudicca joined #git
08:35 kronos_ joined #git
08:36 aspiers joined #git
08:36 mwhooker joined #git
08:36 fwdit joined #git
08:37 Cabanossi joined #git
08:38 goweol joined #git
08:38 tristanp joined #git
08:39 jaguarmagenta joined #git
08:40 tristanp_ joined #git
08:41 radsy joined #git
08:41 baba_ joined #git
08:43 Cabanossi joined #git
08:45 King_Hual joined #git
08:49 a_thakur_ joined #git
08:49 jceb joined #git
08:49 mukmuk joined #git
08:52 acetakwas joined #git
08:53 benteight joined #git
08:53 clmsy joined #git
08:53 fees joined #git
08:55 settermjd joined #git
08:55 Thorn joined #git
08:55 acetakwas joined #git
08:56 PaulCape_ joined #git
08:57 narendra` joined #git
08:57 benteight7 joined #git
08:58 Neon1024x joined #git
08:58 xall_ joined #git
08:58 ferr joined #git
08:59 acetakwas joined #git
09:01 acetakwas joined #git
09:02 aspiers hi all, I'm about to write git-splice, unless anyone knows of an existing implementation? it would allow you to remove a range of commits from within a branch and/or cherry-pick commits at the same point - just like splice in Perl/PHP/Javascript
09:02 fracting joined #git
09:03 JuliusN joined #git
09:03 selckin rebase -i ?
09:04 acetakwas joined #git
09:04 aspiers no, this would wrap around rebase -i and make it non-interactive
09:05 selckin seems already simple enough, but have fun :)
09:05 aspiers selckin: if it's interactive, you can't build further operations on top of it, and that is the whole point
09:05 tristanp joined #git
09:05 bronson joined #git
09:06 aspiers selckin: the next step would be git-transplant (or maybe git-syphon), where you can extract commits from one branch and move them to another
09:06 selckin what use case do you have in mind that would require doing this frequently and automated?
09:06 xall joined #git
09:06 ronny hi
09:06 aspiers selckin: and the third step would be to combine git-transplant with git-deps and entirely automate use case #2 described here: https://github.com/aspiers/git-deps/
09:06 ronny anyone aware of a easy way to serve git repos to a local network
09:07 ronny (im looking for a peer 2 peer setup)
09:07 aspiers selckin: I might call that something like "git-explode" :-)
09:08 toogley joined #git
09:08 aspiers selckin: I find it hard to believe that noone ever automated git-splice before though, it seems like such a basic primitive which you could build all kinds of cool stuff on top of
09:08 tristanp_ joined #git
09:08 acetakwas joined #git
09:08 aspiers ronny: ssh?
09:08 gaen joined #git
09:09 Jellyg00se joined #git
09:10 ronny aspiers: that needs a running ssh server on all the involved boxes, i'd like to avoid that, nd instead just serve readonly via http
09:10 kronos joined #git
09:10 aspiers ronny: ok, so Apache then
09:10 aspiers or any other webserver
09:11 aspiers https://git-scm.com/book/en/v2​/Git-on-the-Server-Smart-HTTP
09:11 ronny aspiers: thats yet another server setup
09:12 aspiers ronny: machines can't talk to each other over IP without some kind of server which listens on sockets
09:12 ronny im loooking ofr something more ofa i as a non-priv user start soemthing discoverable in p2p fashion
09:12 aspiers ronny: I'm not sure what else you have in mind
09:12 aspiers that still requires a server on each machine
09:12 ronny so i have a repo, i run a serve-readonly command, and the other computer can find that one until i stop it
09:12 aspiers torrent clients are effectively servers
09:13 aspiers they serve data to other torrent clients
09:13 tristanp joined #git
09:13 aspiers you *have* to use some software on each host, so why not ssh which is probably already installed and requires zero setup?
09:14 ronny ssh needs a whole personal pki, set up
09:14 ronny (i do have distinct separate ssh private keys on each box, and none of them i use to ssh into)
09:15 acetakwas joined #git
09:15 benteight joined #git
09:16 david007 joined #git
09:16 tristanp_ joined #git
09:16 acetakwas joined #git
09:16 aspiers ssh doesn't require any private keys at all actually, you can just use passwords
09:16 aspiers but if you want to avoid that, then a webserver is the next simplest thing
09:17 Psan_ joined #git
09:17 acetakwas joined #git
09:18 Psan_ I'm trying to rename commit HEAD~2, but HEAD~1 is a merge commit and rebase -i gives errors
09:18 Psan_ how do I reword the commit without conflicts?
09:18 aspiers Psan_: you'll have to redo the merge after
09:19 acetakwas joined #git
09:19 Psan_ I solved all the conflicts already in the merge commit
09:19 aspiers Psan_: then you can take a shortcut when doing the merge - just git reset to the resolved commit
09:20 aspiers but rebase won't reapply merges
09:20 aspiers oh actually, there's --preserve-merges
09:20 aspiers interesting
09:21 Psan_ oh nice!
09:21 aspiers I never tried it though
09:21 fracting joined #git
09:21 aspiers you should also learn git-rerere
09:21 bibble joined #git
09:21 aspiers there is some magic worth enabling
09:21 aspiers git config --global rerere.enabled true
09:22 PaulCapestany joined #git
09:22 aspiers (IIRC)
09:22 MutantMahesh joined #git
09:22 Psan_ oh that's really cool
09:22 aspiers yes
09:22 ronny aspiers: i pretty much avoid any kind of remote password, im even unhappy that they are needed to protect the private keys, but there doesnt seem to be a alternative
09:23 Psan_ so --preserve-merges worked but it still couldn't resolve it
09:24 aspiers Psan_: too bad you didn't have rerere enabled *before* previously doing the merge
09:24 aspiers Psan_: however in your current situation, my git reset suggestion should work perfectly
09:24 MutantMa_ joined #git
09:25 Diabolik joined #git
09:25 aspiers Psan_: since you only want to reword the log message, so you can reuse the tree from the previous merge commit
09:25 aavrug joined #git
09:26 tristanp joined #git
09:26 Psan_ yeah you're right it worked, thanks aspiers
09:26 courrier joined #git
09:27 Ma5ter joined #git
09:27 simonjefford joined #git
09:28 Ma5t3r joined #git
09:28 Ma5ter joined #git
09:28 aspiers Psan_: btw I hope you didn't do a --hard reset, otherwise that would lose the edited commit :)
09:28 Ma5t3r joined #git
09:29 benteight joined #git
09:30 ochorocho__ joined #git
09:33 hexagoxel joined #git
09:34 simonjef` joined #git
09:35 gypsymauro left #git
09:35 kronos_ joined #git
09:40 Nilan joined #git
09:40 tristanp joined #git
09:41 Nilan Hi guys, i need a small help regarding git, anyone available?
09:43 a3Dman joined #git
09:43 BlessJah just ask the question
09:43 Psan_ aspiers, I didn't do a reset, just git checkout __fixed_commit__ .
09:43 filcab joined #git
09:46 Silenced joined #git
09:48 aspiers Psan_: hmm, I can't imagine how that would work without losing your edited log message
09:48 PaulCape_ joined #git
09:49 jceb joined #git
09:49 Psan_ aspiers, did you see the period at the end?
09:49 Psan_ "git checkout commit_hash ."
09:49 aspiers ohhhh :)
09:50 tlaxkit joined #git
09:50 aspiers ok, yes that works :)
09:51 mingwandroid joined #git
09:52 cdown joined #git
09:52 mdw joined #git
09:53 boudicca joined #git
09:56 a_thakur joined #git
09:57 tinajohnson___ joined #git
09:57 tristanp_ joined #git
09:58 JeroenT_ joined #git
09:58 afuentes joined #git
10:02 eletuchy joined #git
10:05 tristanp joined #git
10:07 zalatovo joined #git
10:11 LeMike joined #git
10:11 baba_ joined #git
10:12 sdothum joined #git
10:14 Orbitrix joined #git
10:14 Orbitrix joined #git
10:15 PaulCapestany joined #git
10:15 ceaucari joined #git
10:16 mdw joined #git
10:18 JeroenT joined #git
10:20 ochorocho__ joined #git
10:20 elastix joined #git
10:24 JeroenT joined #git
10:25 JeroenT joined #git
10:27 koltroll joined #git
10:27 MJ joined #git
10:29 interne7y joined #git
10:31 cyan__ joined #git
10:32 Guest39384 left #git
10:32 troulouliou_div2 joined #git
10:32 baba_ joined #git
10:33 tristanp_ joined #git
10:36 tristanp joined #git
10:40 jaguarmagenta joined #git
10:40 PaulCape_ joined #git
10:41 baba_ joined #git
10:43 cdown joined #git
10:46 acetakwas joined #git
10:47 mohabaks joined #git
10:48 MutantMahesh joined #git
10:53 heroux joined #git
10:54 ciampix joined #git
10:55 EY joined #git
10:57 tlaxkit joined #git
10:58 eijk_ joined #git
10:59 lindenle joined #git
11:00 tristanp joined #git
11:00 baba_ joined #git
11:01 mizu_no_oto joined #git
11:03 Silenced joined #git
11:03 harish_ joined #git
11:06 MutantMa_ joined #git
11:06 bronson joined #git
11:06 PaulCapestany joined #git
11:07 kellytk joined #git
11:07 kellytk What's your opinion of the point made in https://gradha.github.io/articles/2014/​01/the-tyranny-of-gitflow-defaults.html
11:08 jbitdrop joined #git
11:08 JeroenT joined #git
11:09 ocbtec joined #git
11:11 jceb joined #git
11:16 lamppid joined #git
11:17 son joined #git
11:17 lamppid joined #git
11:19 tristanp_ joined #git
11:20 _rht joined #git
11:21 tristanp joined #git
11:21 k3rn31 joined #git
11:22 zeroed joined #git
11:23 trista___ joined #git
11:23 johnmilton joined #git
11:24 acetakwas joined #git
11:25 dsdeiz joined #git
11:26 netj joined #git
11:28 elsevero joined #git
11:28 tristanp joined #git
11:29 realz joined #git
11:29 bjpenn joined #git
11:29 fracting joined #git
11:30 interne7y joined #git
11:30 dpower_ joined #git
11:31 moop joined #git
11:32 acetakwas joined #git
11:32 a_thakur joined #git
11:32 Eryn_1983_FL joined #git
11:32 noteness joined #git
11:32 DistantStar joined #git
11:33 PaulCape_ joined #git
11:34 JelmerD joined #git
11:34 k3rn31 joined #git
11:34 chachasmooth_ joined #git
11:35 noteness joined #git
11:35 digidog joined #git
11:35 m0nkmaster joined #git
11:36 alcohol joined #git
11:37 chris2 joined #git
11:37 nicechap joined #git
11:37 baba_ joined #git
11:37 Didac joined #git
11:38 Arsonide hey, I have a git repo here with three submodules, and apparently they aren't being updated when I checkout, or reset, or whatever
11:38 Arsonide how does this work
11:39 Arsonide they also do not appear to be showing any diffs when I change files
11:41 tristanp joined #git
11:41 m0nkmaster joined #git
11:44 MutantMahesh joined #git
11:44 DistantStar joined #git
11:45 baba_ joined #git
11:46 DistantStar joined #git
11:47 m8 joined #git
11:49 tristanp_ joined #git
11:52 Lunatrius` joined #git
11:52 tristanp joined #git
11:52 ferr joined #git
11:53 a_thakur_ joined #git
11:53 Sceorem joined #git
11:54 boudiccas joined #git
11:55 ojdo joined #git
11:57 tristanp_ joined #git
11:59 tristanp joined #git
12:00 PaulCapestany joined #git
12:00 baba_ joined #git
12:02 fstd joined #git
12:04 m0nkmaster joined #git
12:04 ncd|leeN joined #git
12:07 baba_ joined #git
12:07 PSan joined #git
12:08 rwb joined #git
12:08 wwwbukolaycom joined #git
12:09 synthroid joined #git
12:11 nadim joined #git
12:14 baba_ joined #git
12:15 mdw joined #git
12:17 mykespb joined #git
12:18 unbalancedparen joined #git
12:19 dcpc007 left #git
12:20 a_thakur joined #git
12:21 jaguarmagenta joined #git
12:22 fscala joined #git
12:24 PaulCape_ joined #git
12:26 justanotheruser joined #git
12:26 jstimm joined #git
12:27 jkt joined #git
12:28 knutstrut joined #git
12:28 knutstrut joined #git
12:28 tristanp joined #git
12:28 eletuchy joined #git
12:29 m0viefreak joined #git
12:31 interne7y joined #git
12:33 settermjd joined #git
12:34 sigma__ joined #git
12:36 sigma__ If I've got a commit in my project's history for a feature and there is a small change that should've been made, say 20 commits ago, for this feature, can I make the change on HEAD and then rebase HEAD on something like HEAD~20, squashing this new commit into the original commit for that feature?
12:36 sigma__ Assuming perfect linear history and also that these 20 commits aren't pushed to any remote repositories.
12:36 tobiasvl sigma__: !interactive_rebase
12:36 gitinfo sigma__: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
12:36 sigma__ Yes, I would use -i.
12:37 sigma__ I just didn't know if there were maybe some reason that this was a terrible idea. I just don't want scattered commits for the same feature in my history if I can avoid it.
12:37 CJKinni` joined #git
12:37 Gamecubic joined #git
12:39 SwiftMatt joined #git
12:40 liquidjamm joined #git
12:40 sigma__ A separate issue I'm having is files that used to be tracked and have since been git rm --cached'd, .gitignored, keep coming back while merging in some older branches where those files were not yet removed from version control.
12:40 sigma__ I thought I was beyond this issue today, but they just appeared again as "modified" in git status.
12:41 sigma__ Any clue as to why one may need to keep removing them with git rm --cache?
12:41 sigma__ Let me ask in another more specific way.
12:41 tristanp joined #git
12:41 sigma__ If branch2 has some files ignored and removed from version control, and it is rebased on branch1 which does not, should those files need to be removed from git again with git rm --cache?
12:42 sigma__ cached*
12:42 canton7 if the files were removed since branch2 diverged from branch1, no
12:42 canton7 (provided that the files weren't modified in branch1: if they were, you'll get a conflict)
12:42 subhojit777 joined #git
12:42 sigma__ That *might* be the case.
12:43 sigma__ I guess I'll just keep doing what I'm doing until the old diverge points are no longer around, and take better care next time.
12:44 roentgen joined #git
12:44 sigma__ What is the right way to handle this if I find myself with several feature/hotfix branches which were created before realizing that I needed to remove some files from version control?
12:45 rom1504 /wg #gitlab
12:45 canton7 depends whether you rebase or merge
12:45 sigma__ I try to rebase if I can.
12:45 canton7 if you want to remove the file from the main branch, do that, then rebase the other branches onto that branch to pick up the deletion
12:45 sigma__ That makes sense.
12:45 sigma__ Maybe I did not do that this time.
12:45 angular_mike is there a way to perform a rebase, ignoring unstaged changes(reset doesn't get rid of them)
12:46 angular_mike neither does stash
12:46 Steadfast joined #git
12:46 canton7 sigma__, something else must be doing on then, and I can't guess what. But try this simple scenario in a test repo, and verify that it does do what we expect
12:46 |2701 joined #git
12:46 zalatovo joined #git
12:46 sigma__ canton7: I'm sure it does. I must've done something oddly.
12:47 deadnull_ joined #git
12:47 tobiasvl angular_mike: reset or stash don't get rid of them? !repro please
12:47 ahmed_elgabri joined #git
12:47 gitinfo angular_mike: [!transcript] 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:47 tobiasvl git status
12:47 _rgn joined #git
12:47 _rgn joined #git
12:47 angular_mike tobiasvl: no can do, sorry
12:48 bremner !secret
12:48 gitinfo [!topsecret] If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust?  There are people with clearances even on #git but they may not want to identify themselves.  However, you are protected by the biggest secret of all:  We just don't care.
12:48 italoacasas joined #git
12:48 canton7 angular_mike, unfortunately we can't use information which you don't give us. Can you give us any more detail on what "doesn't get rid of them" means? Any other messags? Did they disappear and reappear?
12:48 baba_ joined #git
12:49 angular_mike !youcanifyouknowwhatimaskignabout
12:49 canton7 what's that supposed to mean?
12:50 angular_mike 3:48 PM <+bremner> !secret
12:50 gitinfo [!topsecret] If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust?  There are people with clearances even on #git but they may not want to identify themselves.  However, you are protected by the biggest secret of all:  We just don't care.
12:50 tobiasvl angular_mike: you can't even show the output of "git status"?
12:50 baba__ joined #git
12:50 tobiasvl angular_mike: btw, you don't need to apologize to me for that, it's not me who needs assistance :)
12:51 canton7 angular_mike, I'm afraid we can only help you if you give us the information we ask for. Why are making our life hard?
12:51 angular_mike canton7:  they  just remain in the same state they were in after stash or reset, but thats not what im asking about
12:51 angular_mike my question is about rebase
12:51 canton7 no, you can't perform a rebase with unstaged changes
12:51 canton7 the correct solution is to stash them
12:51 angular_mike ok, thanks
12:51 PaulCapestany joined #git
12:51 canton7 hence why we're trying to work out why stash "doesn't work" in your case
12:51 tobiasvl perhaps you already are in the middle of a merge resolution or a rebase or something. git status will tell you that. good luck!
12:52 tristanp joined #git
12:53 sigma__ left #git
12:55 JeroenT joined #git
12:57 baba_ joined #git
12:57 tristanp_ joined #git
13:00 tinanoo joined #git
13:00 zincrokx joined #git
13:07 ferr joined #git
13:08 a_thakur joined #git
13:10 baba_ joined #git
13:10 netj joined #git
13:11 sq-one joined #git
13:13 tristanp joined #git
13:13 baba_ joined #git
13:13 moriko joined #git
13:15 guardian I'm writing a pre-push hook. When the branch doesn't exist on remote, instead of examining all commits I want to examine commits not pushed already. Is there a more effective way to find all commits that don't exist on origin than calling git rev-list then looping over output and calling git branch -r --contains $commit ?
13:17 baba_ joined #git
13:19 PaulCape_ joined #git
13:21 rgrinberg joined #git
13:22 zalatovo joined #git
13:22 mbrzuzy joined #git
13:22 rgrinberg joined #git
13:22 jimi_ joined #git
13:22 jaguarmagenta joined #git
13:24 baba_ joined #git
13:26 tristanp joined #git
13:29 inflames joined #git
13:29 mdw joined #git
13:30 zalatovo joined #git
13:31 fmcgeough joined #git
13:31 inflames joined #git
13:32 interne7y joined #git
13:32 khmarbaise joined #git
13:32 baba_ joined #git
13:34 mmlb joined #git
13:34 zalatovo joined #git
13:34 import_this joined #git
13:35 raijin joined #git
13:38 al-damiri joined #git
13:40 baba_ joined #git
13:41 mangolisk joined #git
13:42 edude03 joined #git
13:43 tristanp_ joined #git
13:43 Arsonide This repository uses three submodules, is there some simple way to convert all the commits to just being one big repository, rather than one repository and three sub-repositories?
13:44 Gsham joined #git
13:44 Arsonide I'm trying to do something very complicated, merging code from a year ago at varying times in the history here, and the submodules are making that quite difficult.
13:44 baba_ joined #git
13:46 PaulCapestany joined #git
13:47 jfran joined #git
13:47 robotroll joined #git
13:47 baba_ joined #git
13:48 fakenullie Arsonide: maybe http://stackoverflow.com/questions/1​759587/un-submodule-a-git-submodule
13:49 fakenullie though I don't think it will make merge easier
13:50 tristanp joined #git
13:51 ntshetty joined #git
13:52 mase-tech joined #git
13:53 Arsonide for some reason my diffs are not showing up in the submodule
13:53 Arsonide I'm changing files
13:53 Arsonide but the changes are not there
13:55 Psychiatrist joined #git
13:56 Dougie187 joined #git
13:56 Arsonide it's somewhat frustrating. I know exactly what I need to do, I just can't do it because of the project's organization :|
13:57 selckin just do it 3 times?
13:57 mischat joined #git
13:57 AaronMT joined #git
13:58 tristanp joined #git
13:58 Arsonide Do what? Changing things doesn't show diffs, so I can't commit anything
13:59 Arsonide Theoretically the diffs should appear under the submodule, but git submodule foreach git diff etc does not show anything at all.
13:59 Raging_Hog joined #git
13:59 baba_ joined #git
14:00 k3rn31 joined #git
14:02 samson joined #git
14:04 phaleth joined #git
14:04 diogenese joined #git
14:05 fission6 joined #git
14:06 fission6 one line changed in my code which is breaking functionality (i know which line). I am trying to figure out which commit made the change, how would i do this
14:07 baba_ joined #git
14:07 mdw joined #git
14:08 heinrich5991 joined #git
14:09 Noldorin joined #git
14:10 osse fission6: git blame thefile.txt
14:10 osse see what hash it says next to the line
14:11 PaulCape_ joined #git
14:12 dsdeiz joined #git
14:12 dsdeiz joined #git
14:13 Balliad joined #git
14:13 tristanp joined #git
14:14 happy-dude joined #git
14:15 sargas joined #git
14:16 baba_ joined #git
14:17 mellernoia joined #git
14:17 canton7 fission6, (or 'git gui blame thefile.txt') if you want a more graphical approach
14:18 L8D joined #git
14:19 woodruffw joined #git
14:19 osse and if you already know the line nubmer you can do e.g.  git blame -L 50,50 thefile
14:20 fission6 osse: intersting thanks! and thanks everyone else
14:20 osse huh, that made git-gui crap its pants
14:21 osse fission6: of course there's an change that a particular line is in error because of changes elsewhere. gti blame will tell you how that line got there, nothing more
14:21 osse s/an change/a chance/
14:22 robotroll joined #git
14:22 Guest57 joined #git
14:24 Raging_Hog joined #git
14:25 boudiccas joined #git
14:26 eijk_ joined #git
14:26 tristanp_ joined #git
14:26 fission6 if i have a one to one field with User that needs to be created each time a user is created, whats the best way to ensure this
14:27 fission6 wrong channel
14:28 * osse tries to guess what the correct channel is
14:29 bjpenn joined #git
14:29 robotrolll joined #git
14:30 Macaveli joined #git
14:30 ncopa joined #git
14:30 ncopa hi
14:30 osse my name is
14:31 ncopa git 2.8.3 does not build in parallel if you have many cores
14:31 ncopa i think there was no problem with 2.8.2
14:32 ncopa feels kinda stupid to make -j1 and let 15 of 16 cores just idle
14:32 ncopa while i sit and wait...
14:32 osse not even -j2 ?
14:32 interne7y joined #git
14:33 ncopa that i havent tried
14:33 osse if you have 16 cores then it sounds like the kind of CPU where even one core should compile Git in a reasonable amount of time. If that's not the case I suggest watching trailers for upcoming movies on Youtube
14:34 ash_workz joined #git
14:34 osse You can also try bisecting the problem. Neat exercise in learning how to use bisect, in case you don't already know
14:34 baba_ joined #git
14:34 paul98 joined #git
14:35 paul98 hi, trying to do yum install git on centos 7.2 but getting Error: Package: perl-Git-1.8.3.1-6.el7_2.1.noarch (updates)
14:35 paul98 Requires: perl(Error)
14:35 ncopa a workaround is: make -j1 perl/perl.mak && make
14:36 bronson joined #git
14:36 cdg joined #git
14:37 PaulCapestany joined #git
14:38 Steadfast joined #git
14:39 ryez joined #git
14:40 M-sbts joined #git
14:41 joki joined #git
14:45 Gsham joined #git
14:46 Gitzilla joined #git
14:48 ncopa huh? git-2.8.2 also fails
14:49 ncopa it was just luck that build server didnt choke last time then
14:49 dreiss joined #git
14:51 LionsMane joined #git
14:52 ncopa hum
14:52 ncopa i think its make 4.2
14:55 samson joined #git
14:55 tristanp joined #git
14:55 Rish joined #git
14:55 nickm00 left #git
14:55 Raging_Hog joined #git
14:55 tristanp joined #git
14:57 EY joined #git
14:57 sq-one joined #git
14:59 Psychiatrist joined #git
15:00 mmlb joined #git
15:00 kilo_bravo joined #git
15:02 dmto joined #git
15:02 fizzgorilla joined #git
15:03 nilg joined #git
15:03 bruce_lee joined #git
15:04 PaulCape_ joined #git
15:06 SwiftMatt joined #git
15:06 ril joined #git
15:07 rkazak joined #git
15:09 elastix joined #git
15:10 quenode joined #git
15:11 crose joined #git
15:11 kpease joined #git
15:11 BSaboia joined #git
15:12 quenode joined #git
15:13 mmlb joined #git
15:14 paul98 joined #git
15:14 maucar joined #git
15:14 paul98 i've a user who has created a project, i'm a a dev within the project, when i run git clone git@gitlab.domain.com/hisusername/project.git
15:14 paul98 it prompts me for git@gitlab.domain.com password
15:14 paul98 what would this be?
15:15 paul98 as my own user i've a ssh key setup
15:15 sangy joined #git
15:15 guardian I'm writing a pre-push hook. When the branch doesn't exist on remote, instead of examining all commits I want to examine commits not pushed already. Is there a more effective way to find all commits that don't exist on origin than calling git rev-list then looping over output and calling git branch -r --contains $commit ?
15:15 guardian that question left you cold
15:15 guardian am I being stupid asking that ? :/
15:15 ryez paul98: ....com: <---
15:16 ryez try?
15:16 johnmilton joined #git
15:16 paul98 huh i don't get what you mean ryez
15:17 ryez replace first '/' with ':'
15:17 Gsham joined #git
15:18 tens0r joined #git
15:18 paul98 fatal: repository 'git@gitlab.asergis.in/ravikantmishra/myapp.git' does not exist
15:18 paul98 oh sorry didn't see that part
15:18 tens0r joined #git
15:19 paul98 that url was copied from the gitlab bit where it has ssh then the url
15:21 paul98 hmm
15:21 paul98 so if i glone my own project it works
15:21 paul98 i've set the project to public
15:22 nowhereman joined #git
15:23 samson joined #git
15:23 jaguarmagenta joined #git
15:23 bahamas joined #git
15:23 bahamas joined #git
15:24 bahamas hello. I want to undo changes made by a commit in my history. it's not the most recent one. will git rebase interactive do that for me?
15:24 bahamas changing history is not a problem
15:25 tristanp_ joined #git
15:25 eletuchy joined #git
15:26 CheckDavid joined #git
15:26 ahmedelgabri joined #git
15:26 ToxicFrog bahamas: yes.
15:26 ToxicFrog (if you wanted to do this without changing history, you'd "git revert" instead)
15:26 colona joined #git
15:27 bahamas ToxicFrog: thanks!
15:28 clemf joined #git
15:28 King_Hual joined #git
15:28 King_Hual joined #git
15:28 lindenle joined #git
15:28 mmlb joined #git
15:29 dreiss joined #git
15:29 tristanp joined #git
15:30 King_Hual joined #git
15:30 paul98 any one any ideas doing my nut in!
15:31 todd_dsm joined #git
15:31 PaulCapestany joined #git
15:31 tristanp_ joined #git
15:34 interne7y joined #git
15:35 edude03 joined #git
15:35 dsdeiz_ joined #git
15:35 mischat_ joined #git
15:36 nowhere_man joined #git
15:37 bjpenn joined #git
15:38 bronson joined #git
15:39 Rish joined #git
15:41 Raging_Hog joined #git
15:43 liamonade joined #git
15:43 dsdeiz joined #git
15:43 tristanp joined #git
15:44 tristanp joined #git
15:45 Rish_ joined #git
15:45 johnmilton joined #git
15:47 lindenle joined #git
15:47 sigma__ joined #git
15:47 sigma__ left #git
15:47 eijk joined #git
15:47 sigma__ joined #git
15:47 LionsMane I have an existing GitHub repo and I added svn remote to my local repo.  I would like to push the SVN trunk to the remote repo, perferably with the svn commits.  Do I simply use git push —set-upstream …. to push the svn trunk branch into the remote git repo?
15:49 sigma__ I have a perfectly linear project history now, with the exception of a single branch and merge operation from way back. Is there any good way to straighten that out?
15:49 sigma__ Just this little guy: http://i.imgur.com/hpVosge.png
15:49 sigma__ I know I'm being picky, but it bugs me. xD
15:50 LeBlaaanc joined #git
15:51 eletuchy joined #git
15:51 jumpman so, i was being inattentive and sleep deprived and i messed up my local git flow by accidentally making 3 or 4 new branches off of whatever branch i was currently in instead of origin/develop
15:51 _ikke_ sigma__: do you share your repository with others?
15:51 Eugene LionsMane - yup. git-svn creates a git history from your SVN repository, and a branch for it
15:52 sigma__ _ikke_: Nope.
15:52 jumpman all I need to do to dig myself out of this hole is rebase onto new branches taken from origin/develop, right?
15:52 norc joined #git
15:52 LionsMane Eugene: This is where I'd like to be super explicit… I have a remote branch called SVN.  How to do attach the svn commits to that for the push?
15:52 luke_penn joined #git
15:53 LionsMane I know I must sound super pedantic.
15:53 _ikke_ sigma__: It's possible with rebase to flatten in out
15:53 sigma__ Do I just sqaush the merge commit?
15:53 circ-user-sENoT joined #git
15:53 acetakwas joined #git
15:53 sigma__ squash*
15:53 _ikke_ git rebase already flattens history
15:54 sigma__ Oh. So just rebase right on over it?
15:54 paul98 fatal: 'ravikantmishra/myapp.git' does not appear to be a git repository
15:54 MutantMahesh joined #git
15:55 paul98 - how do i fix this, if i run it from ym own machine as my user which has a git user with username and ssh key, but from a remote server which has no user or ssh key i get following error
15:55 paul98 i go git clone git@gitlab.domain.com:/user/app.git /var/www/html/
15:55 sigma__ I've got to run, but I remain joined for a bit so I can check for responses when I return. Thanks in advance. :) afk
15:55 paul98 it prompts for git password which i enter in then i get that error
15:55 Twirl joined #git
15:55 osse paul98: does 'ssh -T git@gitlab.domain.com' work?
15:55 _ikke_ sigma__: git rebase <basecommit> should fix it
15:56 _ikke_ sigma__: where base commit is the commit where they both branched off
15:56 durham joined #git
15:56 Terens joined #git
15:57 tax joined #git
15:57 PaulCape_ joined #git
15:57 Guest57 joined #git
15:57 Twirl Hello, how do you force overwrite / send all the files to a bare repo that thinks it's up to date? because git push -f live master doesn't work, it's not sending the whole files/project, it was deleted afterwards from the bare repo manually so i need to send them again
15:58 _ikke_ Twirl: if git says it's up-to-date it's more often right then wrong
15:58 EY joined #git
15:58 _ikke_ note that git push pushes only new history
15:58 _ikke_ Twirl: What exactly did you remove from the bare repository?
15:59 paul98 gets to
15:59 paul98 debug1: Sending env LANG = en_GB.UTF-8
15:59 synthroid joined #git
15:59 paul98 but hangs so far
15:59 moriko joined #git
15:59 mwhooker joined #git
15:59 boudicca joined #git
16:00 LionsMane bbl
16:00 tax joined #git
16:00 Twirl _ikke_: what exactly you don't understand of what i said?
16:01 _ikke_ Twirl: A bare repository does not have any working tree, so what exactly did you remote from the bare repository?
16:01 _ikke_ "it was deleted": What was deleted and how?
16:02 paul98 osse: any ideas
16:02 Twirl _ikke_: oh yea, i have a post-receive hook that sends the files to a working tree
16:02 _ikke_ ncopa: hi
16:02 Twirl i'm seriously considering emptying the folder committing and adding the files again and committing again
16:02 osse paul98: add -vvv
16:03 AaronMT joined #git
16:03 paul98 yes it  does work
16:03 _ikke_ Twirl: Are you pushing the correct branch?
16:04 _ikke_ git push checks the refs the remote has, if it already has the latest commit you have locally, there is literally nothing to push
16:04 Twirl not the way i have it set up
16:04 osse paul98: adding -vvv shouldn't make a difference
16:04 _ikke_ How did you set it up then
16:04 Twirl anyways i'm going to do what i just said
16:04 _ikke_ you are explaining very little
16:04 madewokherd joined #git
16:04 paul98 i know if i removed -T it worked
16:04 osse paul98: does it say "Hello <your name>!" ?
16:04 paul98 or added -vvv i worked
16:04 paul98 nope just takes me to bash prompt
16:04 Twirl i just said i have a post-receive hook that sends the files to the working tree and i have deleted them manually
16:04 paul98 Last login: Thu May 26 16:02:47 2016 from 10.254.253.185
16:04 paul98 -sh-4.1$
16:04 ash_workz joined #git
16:05 _ikke_ Twirl: You didn't mention anything about a hook
16:05 Twirl (06:02:24 PM) Twirl: _ikke_: oh yea, i have a post-receive hook that sends the files to a working tree
16:05 _ikke_ Oh, I missed that part
16:05 osse paul98: so you have shell access to the gitlab instance?? :O
16:05 muthu joined #git
16:05 Twirl don't worry i will just do it manually
16:05 osse Anyway, SSH itself works. It must be a gitlab permissions issue
16:05 _ikke_ Twirl: just for your understanding, there is nothing new for git to push
16:06 tristanp_ joined #git
16:06 _ikke_ Twirl: What you want to solve is that you want to run the hook again
16:06 muthu joined #git
16:06 paul98 it's something to do with the gitlab
16:06 paul98 does it log connections etc on gitlab
16:06 paul98 i could look at
16:06 muthu joined #git
16:07 paul98 as if i run it as my user from my home machine, which has ssh key setup etc it works fine
16:07 trista___ joined #git
16:08 mohabaks joined #git
16:08 shinnya joined #git
16:08 Twirl alright my fix worked, emptied the directory, committed, then added everything again and committed again, which is silly
16:08 ferr joined #git
16:09 paul98 see if i do it from my machine which has user setup with ssh key
16:09 paul98 i get PTY allocation request failed on channel 0
16:09 paul98 Welcome to GitLab, Paul Warren!
16:09 paul98 Connection to gitlab.asergis.in closed.
16:10 _ikke_ Twirl: Even making an empty commit would've helped
16:10 _ikke_ git commit --alow-empty -m "need to push again"
16:10 tristanp joined #git
16:10 Twirl alright, nice tip for next time :)
16:10 _ikke_ Do you understand why you have to do this?
16:11 acetakwas joined #git
16:11 thiago joined #git
16:11 imachuchu joined #git
16:12 synthmeat joined #git
16:12 BlackMaria joined #git
16:12 elementalest joined #git
16:12 elementalest joined #git
16:12 tristanp_ joined #git
16:15 L8D joined #git
16:15 tristanp joined #git
16:18 Twirl left #git
16:19 nchambers left #git
16:19 harish joined #git
16:21 tristanp joined #git
16:22 eletuchy joined #git
16:23 PaulCapestany joined #git
16:23 fuchstronaut joined #git
16:23 fuchstronaut joined #git
16:25 clemf joined #git
16:27 tristanp joined #git
16:31 subhojit777 joined #git
16:32 algun joined #git
16:33 blackwind_123 joined #git
16:33 mdw joined #git
16:33 emPi joined #git
16:34 interne7y joined #git
16:34 import_this joined #git
16:37 d4rklit3 joined #git
16:37 fstd joined #git
16:39 bronson joined #git
16:42 mwhooker joined #git
16:44 boudiccas joined #git
16:45 puff Good afternoon.
16:46 _ikke_ hai
16:49 MasterBob left #git
16:49 jaequery joined #git
16:49 PaulCape_ joined #git
16:52 LeMike joined #git
16:53 tristanp_ joined #git
16:54 Paddy joined #git
16:55 boudiccas joined #git
16:55 trista___ joined #git
16:55 Paddy hello again, when i move my local directories around or accidently delete them can i clone from github and the old commit messages will come with it, right?
16:56 _ikke_ Anyhting you've pushed
16:56 Paddy ah, what a relief
16:56 _ikke_ If you haven't pushed something, it would be lost
16:56 Paddy thanks _ikke_
16:57 tristanp joined #git
16:58 cdown joined #git
16:59 baba_ joined #git
17:00 ceaucari joined #git
17:00 dreiss joined #git
17:01 tristanp_ joined #git
17:01 baba_ joined #git
17:02 DanZ3 joined #git
17:02 boudicca joined #git
17:03 16WAAAYSE joined #git
17:03 7YUAA7IYC joined #git
17:03 mikecmpbll joined #git
17:04 frem_ joined #git
17:04 SteffanW joined #git
17:05 clemf joined #git
17:06 boudiccas joined #git
17:06 ril joined #git
17:08 piling joined #git
17:08 rath joined #git
17:08 YoLoGrimm joined #git
17:11 boudicca joined #git
17:11 belak Is there a faster way to get blame information on every file than essentially doing git ls-files | xargs -n1 -0 git blame ?
17:12 _ikke_ I don't think so
17:13 pantsman- joined #git
17:14 durham joined #git
17:15 kpease joined #git
17:15 ceaucari joined #git
17:16 PaulCapestany joined #git
17:16 Darcidride joined #git
17:16 fission6 joined #git
17:17 PasiFist_ joined #git
17:18 sigma__ left #git
17:20 Psychiatrist joined #git
17:21 kpease joined #git
17:22 liuzhen joined #git
17:24 jaguarmagenta joined #git
17:24 ash_workz joined #git
17:25 IWishIKnew joined #git
17:26 blackwind_123 joined #git
17:26 peepsalot joined #git
17:26 hahuang65 joined #git
17:27 boudiccas joined #git
17:29 tristanp joined #git
17:30 kriskropd joined #git
17:32 tjbp joined #git
17:34 ochorocho__ joined #git
17:35 interne7y joined #git
17:37 mmlb joined #git
17:39 bronson joined #git
17:40 filter85 joined #git
17:40 Macaveli joined #git
17:40 clemf joined #git
17:42 PaulCape_ joined #git
17:42 Guest98793 joined #git
17:43 Guest57 joined #git
17:44 Sasazuka joined #git
17:45 ahmedelgabri joined #git
17:47 filter85 joined #git
17:49 filter85 joined #git
17:49 annoymouse joined #git
17:50 jstimm joined #git
17:51 nitin_ joined #git
17:51 elsevero What’s the quickest way to fork a project from github and merge all PRs ?
17:51 toogley joined #git
17:53 Seveas elsevero: fork it, fetch refs/pull/*/head, merge them all
17:53 filter85 joined #git
17:54 rom1504 it'll be quite amazing if you can merge everything without any conflict :)
17:55 LionsMane joined #git
17:55 texasmynsted left #git
17:55 filter85 joined #git
17:55 filter85 joined #git
17:57 tristanp_ joined #git
17:57 dodobrain joined #git
17:58 sandroqz joined #git
17:59 tristanp joined #git
18:01 CJKinni`` joined #git
18:01 tristanp joined #git
18:05 ciampix joined #git
18:06 bjpenn joined #git
18:06 irwiss joined #git
18:08 ashka` left #git
18:10 Dyonisos joined #git
18:10 robotroll joined #git
18:11 GavinMagnus joined #git
18:13 filter85 joined #git
18:14 DirtyCajun joined #git
18:14 jimi_ joined #git
18:15 L8D joined #git
18:15 Gsham joined #git
18:16 mylord joined #git
18:16 chachasmooth joined #git
18:16 mylord a prior commit has somethign my head is missing
18:16 mylord how can i merge with a prior commit?
18:16 rahtgaz joined #git
18:17 mylord when I do: git merge <commit-id> it says already updated
18:19 fstd joined #git
18:20 kronos joined #git
18:21 thiago joined #git
18:23 v0n joined #git
18:23 LeBlaaanc joined #git
18:23 LionsMane Anonther git svn fetch question: I did a git checkout -b SVN and then a git checkout remotes/origin/truck (to switch to my git svn fetch'ed revisions).  I would like to merge remotes/origin/trunk into SVN… do I just do a git merge remotes/origin/truck while in the SVN branch?
18:23 LionsMane The commit and push?
18:23 LionsMane the = then
18:24 circ-user-sENoT joined #git
18:25 rgrinberg joined #git
18:26 toogley joined #git
18:26 d4rklit3 joined #git
18:26 _ikke_ mylord: rebase -i HEAD~2
18:27 _ikke_ change the last pick into fixup
18:27 _ikke_ safe
18:27 _ikke_ LionsMane: No, svn doen't like git-style merges
18:27 _ikke_ You have to rebase
18:27 diegoviola joined #git
18:29 Guest57 joined #git
18:32 tristanp_ joined #git
18:33 multi_io joined #git
18:35 LionsMane _ikke_: OK, what does the rebase look like?
18:35 LionsMane I am really fuzzy on the rebase options and what it "means" to rebase.
18:36 interne7y joined #git
18:37 tristanp joined #git
18:39 xelxebar joined #git
18:39 fscala joined #git
18:39 akushner joined #git
18:40 fission6_ joined #git
18:40 bronson joined #git
18:41 MattMaker joined #git
18:44 LionsMane Ungh, so about the rebase… are there issues rebase'ing between git and svn branches?  And what does "svn doesn't like git merges" mean exactly?  In my use case, I plan on only fetching and merging into my git repo.  At this point we'll create a patch and commit into the SVN without git.
18:46 LeBlaaanc should i bump versions only on the release branch or should they bump in the develop branch?
18:47 LeBlaaanc (I basically have to bump it in package.json)
18:49 Stath joined #git
18:49 kronos_ joined #git
18:50 BlessJah /1/2
18:50 eletuchy joined #git
18:53 fuchstronaut joined #git
18:54 Gsham joined #git
18:54 dhollinger joined #git
18:56 efco joined #git
18:57 d4rklit3 joined #git
18:57 dsdeiz joined #git
18:58 _ikke_ LeBlaaanc: When using git with svn, it basically limits you in your workflow
18:58 DanZ3_ joined #git
18:58 _ikke_ You cannot push 'dcommit' git merges to svn
18:59 tristanp_ joined #git
18:59 josuebrunel joined #git
19:00 cdown joined #git
19:02 Cabanossi joined #git
19:02 LeBlaaanc not me
19:02 LeBlaaanc LionsMane ^
19:02 _ikke_ Euh, yeah
19:02 _ikke_ LeBlaaanc: Usually the release branch is the place to bump versions
19:02 _ikke_ And then when released, you merge the release branch back to develop
19:02 LeBlaaanc okay
19:03 _ikke_ (talking about git-flow here)
19:03 LeBlaaanc fair enough
19:03 m0viefreak joined #git
19:03 LeBlaaanc but ultimately the world doesn't implode one way or the other, just might look awkard
19:03 LeBlaaanc one way
19:03 _ikke_ correct
19:03 tristanp joined #git
19:03 LionsMane _ikke_: Can you expand on the comment No, svn doen't like "git-style merges, you have to rebase"
19:04 jondot joined #git
19:04 jondot hello
19:04 gitinfo jondot: 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.
19:04 LionsMane I am looking at the git svn rebase command and it simply says it rebases the svn parent to the current head.  I still don't know what the rebase does and what it implies.
19:04 settermjd joined #git
19:05 _ikke_ Instead of merging, it reapplies your new local commits on top of the svn commits
19:06 tristanp_ joined #git
19:09 _ikke_ LionsMane: I don't know the exact details, but it comes down to that the git-svn bridge does not know how to translate git merges into svn merges
19:10 LionsMane _ikke_: Ah the I am looking to merge FROM the svn branch INTO the git branch.  The svn bridge is only to FETCH svn commits.  We'll not be using dcommit.
19:10 SimonNa joined #git
19:11 LionsMane So with git rebase.. if I was IN the git branch SVN and I wanted to merge from the git svn fetched revisions, i would use git rebase remotes/origin/trunk while SVN is my current branch?
19:15 SonikBoom joined #git
19:22 nwkj86 joined #git
19:23 ncopa _ikke_: hi
19:23 GavinMagnus joined #git
19:23 _ikke_ :-)
19:25 jaguarmagenta joined #git
19:25 cdown joined #git
19:28 ochorocho__1 joined #git
19:30 ril joined #git
19:31 catbeard joined #git
19:31 fstd joined #git
19:31 catbeard ok so i've done git add -A and commit -m, but nothing else, i didn't mean to add everything lol, how do i undo it so i can instead add other files and add a more succint commit
19:32 maestrojed joined #git
19:33 _ikke_ git reset --soft HEAD~1
19:33 _ikke_ leave out --soft if you want to unstage everything too
19:34 catbeard so that basically undoes the last 2 commands, and doesn't touch local unchanged files?
19:34 catbeard or changed files from the last commit
19:34 arooni joined #git
19:35 _ikke_ nope
19:36 tristanp joined #git
19:37 interne7y joined #git
19:39 nitin joined #git
19:41 eletuchy joined #git
19:41 bronson joined #git
19:41 ochorocho__ joined #git
19:42 kulelu88 joined #git
19:42 skapunker joined #git
19:52 xall joined #git
19:54 sdothum joined #git
19:55 Vgr_ joined #git
19:56 Terens joined #git
19:57 thiago joined #git
20:00 GavinMagnus joined #git
20:00 tristanp joined #git
20:01 GavinMagnus joined #git
20:01 Havvy joined #git
20:03 Terens1 joined #git
20:03 NeverDie joined #git
20:06 tristanp_ joined #git
20:06 elastix joined #git
20:09 mdw joined #git
20:12 tristanp joined #git
20:14 ril joined #git
20:15 boudicca joined #git
20:15 astrofog joined #git
20:16 cdown joined #git
20:17 tristanp_ joined #git
20:18 boudiccas joined #git
20:18 IWishIKnew joined #git
20:21 import_t_ joined #git
20:21 Ahmed90 joined #git
20:23 Gsham joined #git
20:23 zumba_addict joined #git
20:25 import_this joined #git
20:29 dmto_ joined #git
20:30 boudicca joined #git
20:30 radsy joined #git
20:31 fuchstronaut joined #git
20:32 sandeepsihari joined #git
20:32 Dazzyp joined #git
20:33 cdg joined #git
20:33 GavinMagnus joined #git
20:34 nadim joined #git
20:35 tanuki joined #git
20:36 tanuki Just to confirm: 'git clone' copies the *entire* remote repository, not just the objects that the remote HEAD depends on, right?
20:36 mohabaks joined #git
20:36 boudiccas joined #git
20:37 Sonderblade tanuki: yes. as in all reachable objects are copied
20:38 tanuki Sonderblade: Even those on different branches?
20:38 Winter_ joined #git
20:38 interne7y joined #git
20:38 ilmari tanuki: yes, anything that's reachable from any tag or branch
20:38 tanuki Okay, just verifying. I had a disagreement with someone who claims it dynamically pulls branches as they're checked out
20:39 fstd joined #git
20:39 tanuki I'm trying to figure out why git on one server takes several minutes to switch branches
20:39 Mobutils joined #git
20:39 tanuki (my laptop takes appx. 1.9 seconds)
20:39 _ikke_ git checkout never fetches any branches
20:40 tanuki _ikke_: That's what I thought.
20:41 osse maybe the flywheel that keeps your disks turning is slowing down
20:42 bruce_lee joined #git
20:42 tanuki osse: Heh.
20:42 tanuki If memory serves, there's something like 12 disks RAIDed together
20:43 osse tanuki: but does your repo contain an equal number of GB of data?
20:43 tanuki osse: They're clones of the same repo.
20:43 tanuki Specifically, the opencv repo on github
20:44 nofacade joined #git
20:44 bjpenn joined #git
20:45 johnnyfive joined #git
20:45 tanuki Laptop: 1.9s Server: 5m12s
20:46 CaptainZero joined #git
20:48 CaptainZero Hi guys
20:48 gitinfo CaptainZero: 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:48 tanuki *headdesk* *headdesk* *headdesk*
20:49 tanuki /home on the server is mounted via NFS.
20:49 osse !nfs
20:49 gitinfo Git is a disk-intensive program. It's not recommended to use with network drives, it will be slower. Especially do not set up a "git server" that is shared over nfs, samba, etc.
20:49 tanuki Right. I just realized it was NFS.
20:50 Hedgework tanuki: my condolences.
20:50 Hedgework tanuki: Time to yell at a sysadmin. :)
20:50 osse At work for some reason my $HOME is N:\ or some such (I managed to change though)
20:50 tanuki Moving it to /tmp (which is local) made it similar in speed.
20:50 osse Git would shit its pants just running status on my dotfiles
20:50 tanuki That's the really sad part: I *am* a sysadmin.
20:50 fission6 joined #git
20:51 tanuki This is just a server I'm not familiar with
20:52 mbrzuzy joined #git
20:52 CaptainZero Can I ask you to fill this survey ? https://docs.google.com/forms/d/1gJcuhsQr​b3rHR3osT75gxUnGmySnFI8OQFZcv4BCp2k/viewf​orm?entry.1548374103&amp;entry.1251166294
20:52 Guest57 joined #git
20:52 CaptainZero It's about making a easier for developers
20:55 troulouliou_div2 joined #git
20:56 docnvk joined #git
20:56 diegoviola joined #git
20:57 diegoviola joined #git
20:57 Hedgework CaptainZero: Answered, but you may not like my answers. ;)
20:58 albel727 joined #git
20:59 fuchstronaut joined #git
21:01 ril joined #git
21:02 jason237 joined #git
21:03 CaptainZero Hedgework: Thank you very much. I accept every answer. My first attempt is to know if there is an interest. If there is, why and who is another question. :) But, again, thank you, the more feedback I receive the more I can help some people.
21:06 CaptainZero This is a start, I know I am currently aiming a userbase that use git very much (maybe too much ^^). I'll see what I'll get.
21:07 rahtgaz joined #git
21:08 tristanp joined #git
21:09 bronson joined #git
21:10 heroux joined #git
21:11 pandeiro joined #git
21:11 mischat joined #git
21:13 cdown joined #git
21:13 Ahmed-90 joined #git
21:13 kadoban joined #git
21:13 boudicca joined #git
21:14 johnmilton joined #git
21:14 MattMaker joined #git
21:15 tristanp_ joined #git
21:17 boudiccas joined #git
21:17 nickthetait joined #git
21:18 de-vri-es joined #git
21:18 GavinMagnus joined #git
21:18 neunon_ joined #git
21:20 Gsham joined #git
21:22 tristanp joined #git
21:23 Psychiatrist joined #git
21:23 marc_v92 joined #git
21:24 Impaloo joined #git
21:25 jaguarmagenta joined #git
21:28 vjacob joined #git
21:28 import_this joined #git
21:29 boudicca joined #git
21:32 |2701 joined #git
21:32 tristanp_ joined #git
21:33 domah joined #git
21:34 kellytk What's your opinion of the point made in https://gradha.github.io/articles/2014/​01/the-tyranny-of-gitflow-defaults.html
21:34 kellytk (The point made is to not use a "master" branch, but instead "stable" in addition to "master")
21:35 kellytk (The point made is to not use a "master" branch, but instead "stable" in addition to "develop")
21:35 kellytk Pardon the typo
21:35 import_this the article seems to present a fundamental misunderstanding of gitflow
21:35 kpease joined #git
21:35 import_this the most used git workflow is feature branching
21:36 import_this gitflow tends to be overcomplicated for most people or projects so i can see complexity leading to mistakes being an issue, but often times gitflow is overkill
21:39 interne7y joined #git
21:39 WaReZ joined #git
21:40 import_this master is production, release is a hardening branch prior to each branch, develop is branched off of like feature branching does with master, hot fix is for when you are making a change too small to warrant that level of complexity
21:40 import_this *each branch merging into master
21:41 CandyWife joined #git
21:41 spudowiar joined #git
21:42 _ikke_ hotfix is when you need to fix a released version without incorporating other fixes from develop
21:43 import_this right it branches off of master and then is merged into master and master into dev
21:43 import_this was the slimmed down version
21:43 dodobrain i use 'master' as the development branch personally. many people use 'master' as the production ready branch
21:43 nnyk_ joined #git
21:44 import_this master as the dev branch without other branches is a trunk workflow and doesn't work well in teams... subversion approach
21:44 shauna joined #git
21:44 aidalgol joined #git
21:44 dodobrain err.. who said there weren;t other branches?
21:45 import_this perhaps i misread, you mean you treat master as the dev branch in git flow and branch from that?
21:45 import_this aka feature branching/
21:45 dodobrain yeah
21:45 dodobrain and then staging and then individual branches for releases
21:45 dodobrain which get hotfixes onto them if necessary later on after release
21:46 import_this we use feature branching in my shop
21:46 import_this gitflow just too many layers of abstraction
21:46 import_this plus with lira its bad enough all the steps you have to take even with hooks and AITs
21:47 import_this *JIRA
21:48 tristanp joined #git
21:49 phy1729 depends on the size of your team
21:49 import_this and their skill level for sure
21:50 circ-user-plJrZ joined #git
21:50 import_this git is abstract to a lot of people who've come from sub version
21:51 import_this Linus said subversion deserves some credit for Git in that it gave him a model of what not to do
21:53 autofly joined #git
21:53 kellytk I don't see the complexity in Git flow.  It seems to have all of the structure software would need, and you can use which parts of it you want
21:54 kellytk Git flow overview aside, is the article incorrect that having and using a master branch with a repo hosting service can cause trouble?
21:54 Dougie187 left #git
21:54 jaequery joined #git
21:55 JosephFerano joined #git
21:55 elsevero joined #git
21:56 vjacob joined #git
21:56 JosephFerano hello, so I'm moving our team from a centralized source control to git with lfs. Our repo is quite large and most of the people who are cloning already have the repo with the other sc. Is there a way to init/clone/ the repo without having to download the whole repo? In particular with git lfs.
21:58 import_this joined #git
22:01 import_this joined #git
22:01 jstimm joined #git
22:02 JosephFerano crap, I have to leave, I'll reask later
22:03 boombatower joined #git
22:03 ril joined #git
22:04 CandyWife hello, is there any reason why since i installed git, explorer is really, REALLY slow?
22:05 mdw joined #git
22:05 bollullera joined #git
22:05 cdown joined #git
22:05 bollullera left #git
22:07 Winter_ joined #git
22:08 tristanp_ joined #git
22:09 adrian_broher joined #git
22:09 romrador left #git
22:09 btree joined #git
22:10 bronson joined #git
22:10 pks joined #git
22:12 Noldorin joined #git
22:15 afuentes joined #git
22:15 adrian_broher joined #git
22:16 italoacasas joined #git
22:20 adrian_broher joined #git
22:20 eijk joined #git
22:21 sargas joined #git
22:23 Grimm_ joined #git
22:23 L8D joined #git
22:23 adrian_broher joined #git
22:27 Mobutils joined #git
22:28 larsrustand joined #git
22:28 btree left #git
22:28 adrian_broher joined #git
22:30 MattMaker joined #git
22:31 cdown joined #git
22:33 import_this joined #git
22:35 MattMaker joined #git
22:36 johnwhitton joined #git
22:36 adrian_broher joined #git
22:36 PaulCapestany joined #git
22:37 tristanp joined #git
22:37 Stath joined #git
22:40 interne7y joined #git
22:40 GodusX joined #git
22:41 import_this joined #git
22:44 mykespb joined #git
22:45 adrian_broher joined #git
22:45 diegoaguilar joined #git
22:46 diegoaguilar joined #git
22:47 GavinMagnus joined #git
22:48 tristanp_ joined #git
22:49 sdothum joined #git
22:49 johnwhitton joined #git
22:49 mellernoia joined #git
22:50 eletuchy joined #git
22:52 gaen joined #git
22:52 adrian_broher joined #git
22:53 johnwhitton joined #git
22:53 MattMaker joined #git
22:57 adrian_broher joined #git
22:57 fahadash joined #git
22:58 cjsarette joined #git
22:58 CandyWife left #git
22:59 ajf- joined #git
23:00 tristanp joined #git
23:00 adrian_broher joined #git
23:00 m_antis joined #git
23:03 eletuchy joined #git
23:04 xlegoman joined #git
23:06 adrian_broher joined #git
23:07 adrian_broher joined #git
23:08 foul_owl joined #git
23:09 JanC joined #git
23:11 bronson joined #git
23:11 ImJune joined #git
23:11 sdothum joined #git
23:13 sdothum joined #git
23:14 Mobutils joined #git
23:15 adrian_broher joined #git
23:16 adrian_broher joined #git
23:22 adrian_broher joined #git
23:23 nwf left #git
23:25 madewokherd joined #git
23:26 jaguarmagenta joined #git
23:26 import_this left #git
23:27 adrian_broher joined #git
23:28 tristanp_ joined #git
23:28 MattMaker joined #git
23:30 whomp joined #git
23:31 whomp how can i see not the very last commit that affected a line, but also the commits that affected that line before that?
23:31 flaguy48 joined #git
23:31 Gsham joined #git
23:32 MattMaker joined #git
23:32 GavinMagnus joined #git
23:32 toothe joined #git
23:33 toothe I asked a question here yesterday about having multiple git sub-repos in a single git?
23:36 snowinferno Hi all, I'm tempted to force-push over a branch in a github repo that was created automatically for me by an internal tool to migrate my code from a separate repository. Will doing so pollute the history or cause any major problems?
23:36 Sonderblade whomp: what do you want in case there are commits that move the line?
23:37 neanderslob joined #git
23:37 MattMaker joined #git
23:37 whomp Sonderblade, true
23:37 netj joined #git
23:38 Narwhaal joined #git
23:38 diegoaguilar joined #git
23:38 toothe so, per the googles, submodules are bad. We should use sub trees.
23:39 bronson joined #git
23:40 tristanp joined #git
23:41 GavinMagnus joined #git
23:41 import_this joined #git
23:41 boudicca joined #git
23:42 ceaucari joined #git
23:44 Lunatrius` joined #git
23:44 boudiccas joined #git
23:44 toothe can someone give me a quick explanation what a subtree is?
23:44 fuchstronaut joined #git
23:45 irwiss left #git
23:48 Narwhaal joined #git
23:51 bronson joined #git
23:51 mattfoo joined #git
23:51 rgrinberg joined #git
23:52 jeffreylevesque joined #git
23:53 ochorocho__ joined #git
23:53 MattMaker joined #git
23:56 peepsalot joined #git
23:58 PaulCape_ joined #git
23:59 fstd joined #git

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