Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-03

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

All times shown according to UTC.

Time Nick Message
00:04 appleguru joined #git
00:05 appleguru ok, hopefully this is an easy one… created a new branch, made some changes, commited them, made some more changes, commited them…
00:05 appleguru would like to make a new branch from master, and incorporate all of my changes from master in a single commit
00:06 jagob joined #git
00:06 appleguru what’s the easiest way to do this?
00:08 Grievre joined #git
00:08 thiago to create a new branch starting off master: git branch branchname master
00:08 Grievre Hey I found a somewhat annoying behavior of the windows git client (at least the version I'm using)
00:08 Grievre if you run git clean in a directory, and one of the files it finds is a "pending deleted" file, it dies right there
00:08 Grievre even if you're in "dry run" mode
00:08 thiago you need to check it out before you can use it. You can create it and checkout in one go (read git-checkout's manpage)
00:09 Grievre correctly handling this probably requires git to be aware of win32-specific file attributes
00:09 Eugene Grievre - sounds like a bug. Report it to the msysgit maintainers
00:09 thiago appleguru: as for "incorporate all my changes from master", all of them will already be in that branch
00:09 Eugene https://github.com/git-for-windows/git
00:09 appleguru I made an accidental commit locally that I’d like to remove
00:09 appleguru is really what I’m trying to do
00:10 Eugene appleguru - 1) make a new branch from where you are(`git checkout -b mybranch HEAD`), then 2) `git rebase -i master` and de-select the commit you don't like.
00:11 Eugene appleguru - !sausage goes into more detail
00:11 gitinfo appleguru: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect
00:13 drodger joined #git
00:16 rkazak joined #git
00:18 hahuang65 joined #git
00:18 mellernoia joined #git
00:19 nanga joined #git
00:21 nardev joined #git
00:21 eletuchy joined #git
00:22 m1dnight1 joined #git
00:27 lindenle joined #git
00:28 discopatrick joined #git
00:29 BSAlb joined #git
00:30 jottr_ joined #git
00:30 ochorocho__ joined #git
00:30 choki joined #git
00:32 Gitzilla joined #git
00:35 d4rklit3 joined #git
00:43 zivester joined #git
00:43 rhubarbIsCrunchy left #git
00:47 fscala joined #git
00:48 droidicus joined #git
00:53 EvilPenguin joined #git
00:55 toothe left #git
00:56 livingstn joined #git
00:57 fedexo joined #git
00:58 interne7y joined #git
00:59 m1dnight1 joined #git
00:59 dmto joined #git
01:01 ceaucari joined #git
01:02 acetakwas joined #git
01:04 nevodka joined #git
01:05 dermoth joined #git
01:06 BombStrike joined #git
01:11 drodger joined #git
01:13 GandalfTheWizard joined #git
01:13 snufft joined #git
01:14 eletuchy joined #git
01:18 Smashcat joined #git
01:18 guesst joined #git
01:19 Smashcat Hi, I'm trying to pull updates to a PC which is set up with someone elses username. Is there a way to specify my username when doing a pull? (I'm pulling from github)
01:22 hiennaj joined #git
01:22 elastix joined #git
01:23 fstd_ joined #git
01:24 fuchstronaut joined #git
01:25 m1dnight1 joined #git
01:25 Noldorin joined #git
01:27 piling_ joined #git
01:29 Tanger_ joined #git
01:31 dmto joined #git
01:32 acetakwas joined #git
01:34 SteenJobs joined #git
01:35 pks joined #git
01:35 cd83x joined #git
01:35 MattMaker joined #git
01:37 fission6 joined #git
01:37 jaguarmagenta joined #git
01:38 dermoth joined #git
01:38 drodger joined #git
01:46 tjone270 joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and Thor's Day | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.3 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Asgardian! You are called to serve in the https://madeitwor.se/git-jokes crusade! Submit a PR or face the Hammer!
01:51 d4rklit3 joined #git
01:54 blackjid joined #git
01:56 dmto joined #git
01:57 blackjid joined #git
01:58 espindola joined #git
02:00 grassass joined #git
02:01 blackjid joined #git
02:01 fnodeuser joined #git
02:02 drbean_ joined #git
02:03 koro joined #git
02:03 blackjid joined #git
02:07 blackjid joined #git
02:08 eletuchy joined #git
02:10 koro Hi. I made some changes in a file in github using their online editor, and apparently I also made some change to the same file in my local clone. Now if I do git pull it says i'm already up-to-date, but it says I'm ahead of origin/master. How can I deal with this?
02:11 blackjid joined #git
02:12 blackjid joined #git
02:13 blackjid joined #git
02:14 mizu_no_oto joined #git
02:17 hexagoxel joined #git
02:18 realz_ joined #git
02:20 rewt koro: you probably want to git rebase
02:22 koro but i'm not sure what's going on actually. Why can't I merge my local changes with origin/master?
02:22 koro if I try to do that it says i'm up-to-date too
02:23 koro if i do git checkout origin/master I can see the files as the remote, everything is fine
02:24 koro and in master I have changes in this one file (which intersect with the remote ones). Shouldn't I be able to merge them?
02:24 rewt use `gitk --all` in the local repo dir to see what commits there are and where the branches are pointing to
02:26 fstd joined #git
02:28 koro I already checked the commits, and i'm not sure what you mean about the branches
02:28 rewt local master vs origin/master
02:28 rewt and where the branches diverged
02:30 cd83x joined #git
02:30 koro The last thing I see is a merge of master
02:31 MistahKurtz joined #git
02:31 koro I only see one branch at this point
02:31 rewt and where's origin/master ?
02:31 koro oh, i see it
02:32 koro it's before the merge?
02:32 koro how's that even possible?
02:32 jottr_ joined #git
02:32 rewt sounds like you merged it locally but didn't push it, then committed on the server
02:33 koro https://dl.dropboxusercontent.com/u/11552085/screenshot.png
02:33 koro ah
02:34 ribasushi joined #git
02:34 eletuchy joined #git
02:34 rewt if that's after a fetch, you should be able to just git push
02:35 koro but I have conflicting files, wouldn't a push just replace the remote version by my local one?
02:36 rewt a push would just push your local commits to the remote
02:36 rewt your local master appears to be a descendant of origin/master
02:36 mmlb joined #git
02:36 koro a descendant?
02:37 Lyqyd joined #git
02:37 rewt in your case a child of a child
02:37 koro yes, that's the problem
02:37 rewt why?
02:38 koro because when i do push it will assume that any differences are just new changes and there are no conflicts
02:38 rewt means your local master has everything origin/master has, and more
02:38 koro no, that's what I thought would be the case, but it's not
02:38 koro hence my whole confusion
02:38 SwiftMatt joined #git
02:39 rewt where/how do you see conflicts?
02:39 eletuchy_ joined #git
02:39 koro my CMakeLists file was edited both in my local and remote, almost at the same time
02:39 koro and I have different versions in each
02:39 rewt that's the 2 ends of the pink line, right?
02:39 MistahKurtz joined #git
02:40 koro so you're saying that I did a merge and then made more changes
02:40 rewt the next commit ("Merge branch 'master' of https...") is where the 2 got merged
02:40 koro I see
02:40 koro So I basically screwed up
02:40 rewt any conflicts should've been resolved at that commit
02:40 koro they weren't but maybe it was my fault somehow. I have no recollection of what I did and it was late...
02:41 rewt since you haven't pushed, it wouldn't be hard to rewind your history a bit and start over
02:41 koro yeah, that's what I just did more or less
02:41 koro actually I did a push and I will do the opposite
02:42 koro I was just a bit scared that this could happen for more substantial changes...
02:42 eletuchy joined #git
02:42 fnodeuser left #git
02:43 rewt this is why i like gitk -- it can show exactly how things are and where to reset to if needed
02:44 koro I still need to understand a little bit better the philosophy of git
02:44 koro I've been using it for two projects without major problems, but I confess I'm still a bit lost about how things work
02:44 koro the basics are clear, but some details...
02:45 chachasmooth joined #git
02:45 astrofog joined #git
02:45 koro is there a recommended text other than your typical tutorial that I could read?
02:45 devhoag joined #git
02:45 eletuchy_ joined #git
02:46 frogonwheels koro: !doc
02:46 gitinfo koro: A list of useful documentation of all kinds is here:  http://git-scm.com/documentation -- or try the wiki at  http://git.wiki.kernel.org/.  Also try typing "!book" "!cs" "!bottomup"  "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC.  !book is probably the most helpful.
02:46 koro since I plan on using git for actual work I need to be confident about it :P
02:46 frogonwheels !pm
02:46 gitinfo You can use a private chat with gitinfo triggers to avoid polluting the channel.  (eg /msg gitinfo !pm )
02:46 koro danke!
02:46 frogonwheels bitte
02:47 frogonwheels koro: Git is !simple ;)
02:47 gitinfo koro: At its heart git is made up of many concepts that are individually simple. Getting the whole picture right is often tricky, and it is usually about breaking up the complex concept into its simple, individual parts and grokking those. Both !bottomup and !cs will help with that.
02:50 eletuchy joined #git
02:53 david007 joined #git
02:57 Chunk joined #git
02:58 kadoban joined #git
02:58 dmto joined #git
02:59 espindola joined #git
03:00 interne7y joined #git
03:01 fracting joined #git
03:04 mizu_no_oto joined #git
03:04 aavrug joined #git
03:07 eletuchy_ joined #git
03:07 dmto joined #git
03:08 fedexo joined #git
03:10 Goplat joined #git
03:16 MistahKurtz joined #git
03:17 MattMaker joined #git
03:19 Lynxium joined #git
03:20 jstimm_ joined #git
03:20 mehola joined #git
03:20 k3rn31 joined #git
03:21 flopsec joined #git
03:22 devhoag joined #git
03:22 NeverDie joined #git
03:23 nilsi joined #git
03:24 cd83x joined #git
03:25 fuchstronaut joined #git
03:26 eletuchy joined #git
03:32 fracting joined #git
03:38 jaguarmagenta joined #git
03:40 drodger joined #git
03:42 dmto joined #git
03:42 SJr joined #git
03:42 MistahKurtz joined #git
03:44 arand joined #git
03:44 watabou joined #git
03:45 aavrug joined #git
03:45 illusionmedic joined #git
03:47 boombatower joined #git
03:48 ribasushi joined #git
03:50 dmto joined #git
03:51 jerematic joined #git
03:53 dimi1947 joined #git
03:53 d0nn1e joined #git
03:54 mmlb joined #git
03:55 devhoag joined #git
04:00 satbyy joined #git
04:00 espindola joined #git
04:01 interne7y joined #git
04:05 k3rn31 joined #git
04:07 faux___ joined #git
04:07 EduardoMartins joined #git
04:08 ribasushi joined #git
04:08 slipperd joined #git
04:09 slipper_ joined #git
04:11 a_thakur joined #git
04:12 Urbany joined #git
04:16 dmto joined #git
04:16 dimi1947 joined #git
04:18 cd83x joined #git
04:24 Limes__ joined #git
04:26 zivester joined #git
04:27 ribasushi joined #git
04:27 ensyde joined #git
04:27 Cabanossi joined #git
04:28 WizJin joined #git
04:28 devhoag joined #git
04:29 ManikM joined #git
04:29 drbean joined #git
04:32 dmto joined #git
04:32 eletuchy joined #git
04:33 jottr_ joined #git
04:34 watabou joined #git
04:34 m1dnight1 joined #git
04:35 etranger joined #git
04:36 dmto joined #git
04:38 watabou joined #git
04:39 etranger hi, i'm fairly new to git. i have two branches. i've just merged latest code from alpha 1 branch into master. when i switch to alpha 2 branch, the main index.html file doesn't show up in the file listing. i'm on ubuntu 16.04 on bash. am i doing something wrong?
04:41 etranger left #git
04:41 etranger joined #git
04:42 etranger sorry about dat. o_O
04:45 dmto joined #git
04:47 arooni joined #git
04:55 dmto joined #git
04:56 dmto joined #git
04:56 nnyk_ joined #git
04:57 King_Hual joined #git
04:59 johnnyfive joined #git
05:00 elsevero joined #git
05:00 fscala joined #git
05:02 darns` joined #git
05:02 interne7y joined #git
05:03 darns` ok i can't use git-worktree to replace git-workdir because it wont let me have the same branch checked out in two different worktrees
05:03 darns` clearly worktree is from the systemd dept
05:05 SwiftMatt joined #git
05:05 drodger joined #git
05:09 johnnyfive joined #git
05:10 t-mart joined #git
05:12 fahadash joined #git
05:12 gigq joined #git
05:12 cd83x joined #git
05:13 DistantStar joined #git
05:17 eletuchy joined #git
05:18 pungi-man joined #git
05:19 eletuchy_ joined #git
05:19 settermjd joined #git
05:20 qt-x joined #git
05:22 a_thakur joined #git
05:22 eletuchy joined #git
05:23 Raging_Hog joined #git
05:24 drodger joined #git
05:26 fuchstronaut joined #git
05:28 eletuchy joined #git
05:28 sauvin joined #git
05:30 mariuscc joined #git
05:30 subhojit777 joined #git
05:31 espindola joined #git
05:31 eletuchy_ joined #git
05:34 ochorocho__ joined #git
05:34 eletuchy joined #git
05:34 etranger will be back later
05:36 orbitphreak joined #git
05:36 dmto joined #git
05:36 eletuch__ joined #git
05:39 jaguarmagenta joined #git
05:39 grassass joined #git
05:39 t0by joined #git
05:39 d4rklit3 joined #git
05:40 UniFreak joined #git
05:40 eletuchy joined #git
05:41 UniFreak I find there a lots of file with the same name as the usual file but end with `~HEAD`
05:41 UniFreak are those files created by git? why?
05:43 eletuchy_ joined #git
05:43 Xethron joined #git
05:43 m1dnight1 joined #git
05:44 a_thakur joined #git
05:46 jaguarmagenta joined #git
05:47 eletuchy joined #git
05:48 ojacobson darns`: having two trees (and two staging areas) based on the same branch is semantically problematic for git
05:48 ojacobson any commit from either work tree will create a bunch of uncommitted changes exactly reversing the commit in the other work tree
05:48 ki0 joined #git
05:49 ojacobson _that_ limitation is inherent in the way git tracks uncommitted changes; i would argue it's a bad limitation but it is what it is
05:49 ojacobson (it's also why pushing to a checked-out branch causes trouble)
05:50 eletuchy_ joined #git
05:52 MDRXB95AP joined #git
05:54 jerematic joined #git
05:54 eletuchy joined #git
05:54 ki0 joined #git
05:54 muthu joined #git
05:55 darns` pls ojacobson the point of worktree is to have uncommitted changes
05:55 ojacobson darns`: I didn't suggest you had to _like_ the rationale
05:56 lukeer joined #git
05:56 durham joined #git
05:56 ojacobson but I rather doubt you want 'git commit' in work tree A to _create_ uncommitted changes in work tree B
05:56 lindenle joined #git
05:56 eletuch__ joined #git
05:56 ojacobson unfortunately, short of a full clone there's no way to avoid that, so git-worktree puts up a safety rail.
05:57 njbair joined #git
05:57 darns` more hitler policy
05:58 darns` instead of providing a mechanism for worktrees
05:58 preaction ... more _what_ policy?
05:58 ojacobson git has one; if you'd rather use it, use it.
05:58 njbair joined #git
05:59 eletuchy joined #git
05:59 ojacobson anyways, if you're going to be intentionally inflammatory, you'll find yourself out of the channel in short order. I'm finished trying to help.
06:00 Macaveli joined #git
06:00 qt-x joined #git
06:00 stonerfish joined #git
06:00 dimi1947 joined #git
06:01 darns` the problem is the "systemd dept" will remove the support for git-workdir in a scheduled manner, saying "use git-worktree instead, this is what git-worktree does" while git-worktree has been carefully engineered to prevent it from being useful
06:01 Repox joined #git
06:01 eletuchy_ joined #git
06:02 ojacobson If you can't assume good faith, then be silent.
06:02 darns` i admit i may be presumptous there
06:03 darns` but everything, including the manpages "smells" this way
06:03 eletuch__ joined #git
06:04 preaction i've been using git since 1.4, and the only thing that's ever actually changed about git that affected something i was doing was where submodules stored their data directory
06:04 preaction so i'm not sure what point you're trying to make here
06:04 stonerfish joined #git
06:04 preaction oh, the push defaults thing too
06:06 darns` when "cloning" a big repo, one thing that i could do to make it "restartable", or at least reduce subsequent transfers is to be able to fetch a specific commit
06:06 eletuchy joined #git
06:07 cd83x joined #git
06:08 freimatz joined #git
06:09 ojacobson Clones don't pass loose commits around, and an incomplete pack file may not be comprehensible due to broken delta chains (and, even where comprehensible, may not be a complete prefix of the repo without any breaks). If you want to redesign the remote format, you'd have to start lower than "it'd be nice to address specific commits".
06:09 eletuchy_ joined #git
06:10 ojacobson (I won't address the security implications of being able to address loose objects; those are already an issue, albiet one that's hard to exploit.)
06:11 fracting joined #git
06:13 eletuchy joined #git
06:14 tjone270_ joined #git
06:14 rscata joined #git
06:14 emPi joined #git
06:14 stonerfish joined #git
06:14 tjone270_ joined #git
06:15 roadgear joined #git
06:15 tjone270_ joined #git
06:16 eletuchy_ joined #git
06:16 tjone270_ joined #git
06:16 ojacobson I'd be inclined to go the other direction and give git-upload-pack/git-download-pack an extra field, to allow them to preserve incomplete packs from failed operations (at least temporarily), and resume them at a specific offset. There's some space management stuff, but I suspect it'd be a lot more reachable, if you wanted something to work on.
06:20 ciampix joined #git
06:20 darns` gotto go. later
06:21 stonerfish joined #git
06:27 texasmynsted joined #git
06:27 bhavik joined #git
06:29 exawatts joined #git
06:29 nnyk_ joined #git
06:30 quenode joined #git
06:31 sshine joined #git
06:32 SwiftMatt joined #git
06:32 PCatinean joined #git
06:33 sshine I have some GC problems for a huge git-svn repo, 18k commits and 3.1G of currently committed files. after just checking out and fetching the project, my .git/objects/pack dir has 13 pairs of .idx/.pack files taking 2.1G. when eventually gc'ing, I suspect that it packs this into one file and eventually I get gc warnings quite often.
06:34 jottr_ joined #git
06:34 yuhlw_ joined #git
06:35 sshine I guess my question is this: is there anything better to do in this situation than re-fetching the repo once in a while to avoid any cruft building up? calling 'git gc' doesn't really seem to solve anything in the long run, and the svn repo is authoritative anyways.
06:37 neanderslob joined #git
06:37 ribasushi joined #git
06:39 Peng Why do you say 'git gc' isn't accomplishing anything?
06:39 lb sshine could you provide more info on the "GC problems" ?
06:39 m1dnight1 joined #git
06:39 lb he doesn't said that
06:39 Sceorem joined #git
06:41 Kicer86 joined #git
06:42 settermjd joined #git
06:42 dmto joined #git
06:43 blackjid joined #git
06:44 slayerjain joined #git
06:44 Alienpruts joined #git
06:44 Juzzika joined #git
06:48 sword joined #git
06:49 Psych joined #git
06:51 bq joined #git
06:52 ribasushi joined #git
06:56 dmto joined #git
06:57 Vgr_ joined #git
06:57 rominronin joined #git
07:00 eletuchy joined #git
07:01 Repox joined #git
07:01 cd83x joined #git
07:01 jerematic joined #git
07:01 sshine Peng, it probably is accomplishing things. lb, once in a while after running 'git svn rebase', it complains about a .pack file being busy. I suspect there might be a conflict between whatever passive GC'ing is running in the background and whatever 'git svn rebase' is affecting the .pack files with. maybe it's because of the size of the file that there's a lock on the file for too long.
07:02 TomyWork joined #git
07:02 sshine I guess I'll let this newly fetched copy live for a while and see if not packing it all down to one huge .pack file will affect the frequency of this warning/error.
07:03 Rish joined #git
07:03 lb i see. sorry not my expertise (git-svn) i'd suggest, you configure GC to allow it to aquire more ressources so maybe it's finishing faster
07:03 jeffreylevesque_ joined #git
07:04 interne7y joined #git
07:04 Psych joined #git
07:04 sshine lb, hmm sounds good! not sure how to do that, but I'll investigate when I have a little time off. :) but I can only say that running 'git gc' manually still doesn't lower the frequency of that 'device or file is busy' warning I get on that huge 2.1G .pack file.
07:05 Vgr joined #git
07:05 Vgr joined #git
07:05 sshine lb, other than that, I guess I'm really just looking at duct-tape fixes, because this repo really is bigger than what I'd normally like inside a single git repo.
07:05 lb sshine i thought of this maybe (although it's not your special case) http://stackoverflow.com/questions/10292903/git-on-windows-out-of-memory-malloc-failed
07:09 dmto joined #git
07:09 sshine lb, thanks! this *is* Windows, and it *does* occur when "auto packing the repository ...". I'll try disabling delta compression for some files when the bug re-occurs on this newly checked out copy.
07:09 bhavik_ joined #git
07:09 lb hope it helps :)
07:10 settermjd_ joined #git
07:10 ribasushi joined #git
07:11 bhavik_ Hi, I need help to implement process ... we have two git repos .. let's say upstream and internal, right now we sync branches from upstream and publish to internal, as it is .. now got a requirement that get branch commits from upstream and route them to gerrit, for gerrit, commit message need to updated with 'Change-id: ***'. any help/suggestion/pointers appreciated.
07:11 bhavik_ I've wrote script to convert upstream commits to commit understand by gerrit at https://gist.github.com/anonymous/a9ea11803a1fa12cf06656e47d8b7a09
07:12 encod3 joined #git
07:14 JeroenT joined #git
07:15 ramsub07 joined #git
07:15 fracting joined #git
07:16 blackjid joined #git
07:17 SwiftMatt joined #git
07:17 Macaveli_ joined #git
07:21 Tee_Pee Hey guys, what does "deleted merge conflict for X" mean when using mergetool?
07:21 dmto joined #git
07:21 Tee_Pee That the file has been modified locally but deleted remotely?
07:22 pwnz0r joined #git
07:27 fuchstronaut joined #git
07:28 aidalgol joined #git
07:28 Balliad joined #git
07:30 mdw joined #git
07:31 nadim joined #git
07:32 espindola joined #git
07:32 ahmedelgabri joined #git
07:33 rochus joined #git
07:35 j416 Tee_Pee: that would depend on the merge tool
07:35 eletuchy_ joined #git
07:36 rochus hello everyone
07:37 kurkale6ka joined #git
07:37 j416 bhavik_: should work without change-id in historical commits.
07:37 DevAntoine joined #git
07:37 mablae joined #git
07:37 j416 bhavik_: afaik, it's only commits that are sent through gerrit that need change-id.
07:37 eletuch__ joined #git
07:39 GavinMagnus joined #git
07:40 intellix joined #git
07:41 eletuchy joined #git
07:41 _nadim joined #git
07:41 stuh84 joined #git
07:42 netj joined #git
07:44 eletuchy_ joined #git
07:45 tayfun joined #git
07:45 dmto joined #git
07:45 eletuch__ joined #git
07:46 bq joined #git
07:47 bq joined #git
07:49 eletuchy joined #git
07:49 clmsy joined #git
07:50 ToBeCloud joined #git
07:51 ToBeCloud joined #git
07:51 eletuchy_ joined #git
07:51 ToBeCloud joined #git
07:52 ToBeCloud joined #git
07:52 ToBeCloud joined #git
07:53 ToBeCloud joined #git
07:53 ToBeCloud joined #git
07:53 watersoul joined #git
07:53 ToBeCloud joined #git
07:53 ToBeCloud joined #git
07:54 eletuchy joined #git
07:55 cd83x joined #git
07:56 eletuch__ joined #git
07:58 lss8 joined #git
07:58 bhavik joined #git
07:59 dmto joined #git
07:59 nadim joined #git
07:59 zacsek joined #git
08:00 bhavik_ @j416 true
08:00 eletuchy joined #git
08:01 JeroenT joined #git
08:01 radsy joined #git
08:01 NeverDie_ joined #git
08:01 m1dnight1 joined #git
08:01 bongjovi joined #git
08:02 jerematic joined #git
08:03 eletuchy_ joined #git
08:03 realz_ joined #git
08:03 ocbtec joined #git
08:04 a-l-e joined #git
08:04 dmto joined #git
08:05 interne7y joined #git
08:05 fees joined #git
08:06 _pix joined #git
08:06 eletuchy joined #git
08:06 josuebrunel joined #git
08:06 nadim joined #git
08:07 chll joined #git
08:09 eletuchy_ joined #git
08:10 dmto joined #git
08:12 Dainiel joined #git
08:12 Fijit joined #git
08:13 Dainiel left #git
08:13 eletuchy joined #git
08:13 Samy__ joined #git
08:13 Samy__ Hey
08:14 muthu joined #git
08:15 dmto joined #git
08:15 Samy__ i did a git push but got the error https://paste.kde.org/pleerbr7i then i did git push origin HEAD:origin/branch ithat is branch where i was but got the error https://paste.kde.org/pojmm0i81
08:15 Samy__ then i did git config --global push.default matching but now though git log shows the commit but github doesnt :/
08:16 eletuchy_ joined #git
08:16 jhass Samy__: as the error indicates, it's HEAD:refs/origin/newbranch
08:16 jhass Samy__: alternatively git checkout -b newbranch; git push origin newbranch
08:17 Samy__ git config --global push.default matching i did this now git log shows the commit + there are no changes as shown by git status and github doesnt show this commit in the branch
08:18 eletuchy joined #git
08:18 nilsi joined #git
08:18 jhass git config itself does not push anything
08:19 Samy__ then where are the stages changes gone :/ nothing shows up in git status now
08:19 marcogmonteiro joined #git
08:19 jhass you committed them?
08:19 jhass git show
08:19 fwdit joined #git
08:20 eletuch__ joined #git
08:20 Samy__ git show shows up the changes
08:20 jhass so yeah, you committed them
08:20 Samy__ yes i commited them git log shows the commit
08:20 jhass tried any of my two suggestions yet?
08:21 Samy__ already on that branch
08:21 Samy__ so git push origin origin/branchname ?
08:21 jhass no, just branchname
08:21 jhass git push origin branchname
08:21 Samy__ i.e the branch i am on that git branch -r showed
08:22 jhass -r? :o
08:22 somaReverse joined #git
08:23 DevAntoine hi
08:23 eletuchy joined #git
08:23 elastix joined #git
08:23 Jellyg00se joined #git
08:23 davisonio joined #git
08:23 somaReverse Hello. Everytime I do a git rebase, cmake/make/ninja  will trigger a full project rebuild. How can I avoid this?
08:24 Samy__ jhass: i did git push origin branchname but still the condition is sam
08:24 grawity somaReverse: do rebasing in a separate clone, or maybe a separate worktree
08:24 jhass Samy__: what's the exact/real command you ran and its output now?
08:24 jhass Samy__: also your full git status output by now please
08:25 solf1re joined #git
08:25 a_thakur joined #git
08:26 Samy__ jhass: https://paste.kde.org/ppha3gnyb
08:26 somaReverse grawity: What do you mean?
08:26 eletuchy_ joined #git
08:26 jaguarmagenta joined #git
08:26 somaReverse How can I test that rebased project without building.
08:27 solf1re joined #git
08:27 nicechap_ joined #git
08:28 eletuch__ joined #git
08:28 solf1re joined #git
08:28 Samy__ jhass: i wonder if it has pushed anything
08:28 jhass Samy__: interesting that Github did that, anyway, run literally these commands, don't change anything about them: git checkout -b categorization_new; git push origin categorization_new
08:29 Samy__ jhass: so you creating a new branch?
08:29 Samy__ and pushing to it?
08:29 jhass yes
08:29 DARSCODE joined #git
08:29 Samy__ what hapened to the current one why its not working?
08:29 jhass easiest to back your stuff up and the we can figure out which branch you actually want  them to
08:29 jhass I suppose you committed while in a rebase or something like that
08:30 jhass or did git checkout origin/categorisation instead of git checkout categorization and committed there
08:31 eletuchy joined #git
08:31 Samy__ jhass: yes i did checkout /origin/categorisation because git branch -r showed me /origin/categorisation as the branch
08:31 jhass Samy__: git branch -r shows remote refs
08:31 jhass not local branches
08:31 jhass you can only commit to local branches (properly, anyway)
08:31 Samy__ jhass: i didnt have any local branch that time because i did a reinstall so i clone my repo
08:32 Panacea joined #git
08:32 Samy__ so i did a git checkout /origin/categorisation
08:32 jhass Samy__: git checkout foo with foo not existing as a local branch but as a remote branch somewhere will automatically create a new local branch based on it
08:32 offnode joined #git
08:32 jhass yes, you shouldn't have
08:32 endiruna joined #git
08:33 Samy__ i tried doing git checkout categorisation but that didnt work telling me it isnt a branch
08:33 dmto joined #git
08:34 Samy__ jhass: so what can be a solution to this now
08:34 jhass I'd start with what I said above
08:34 jhass so we make sure to not loose your commit in the process
08:34 DropItLikeItsHot joined #git
08:34 eletuchy_ joined #git
08:34 Sceorem_ joined #git
08:34 Samy__ creating a new branch or backing up my data?
08:35 jhass in this scenario that's the same for my tastes
08:35 jhass given you do push it as I said
08:35 son_ joined #git
08:35 AntiNoisyBot joined #git
08:35 Samy__ cant we do a git revert and then push again?
08:36 jhass Samy__: btw worked for me https://cloud.aeshna.de/u/mrzyx/screenshots/screenshot_20160603_103602.png
08:36 deepa joined #git
08:36 jhass Samy__: no? why?
08:36 jhass you don't want to keep your changes after all?
08:36 discopatrick_ joined #git
08:36 kutenai_ joined #git
08:36 paperziggurat_ joined #git
08:36 janx_ joined #git
08:36 akitada_ joined #git
08:36 Aerosonic_ joined #git
08:37 Samy__ jhass: the recent changes messed up so we can revert the commit then push again
08:37 jhass messed up what?
08:37 jhass revert will only make another commit
08:37 shennyg_ joined #git
08:37 jhass you didn't push anything to your github repo yet, nothing github shows anyway
08:37 gear4 joined #git
08:37 Neic0 joined #git
08:38 n-st_ joined #git
08:38 mukmuk_ joined #git
08:38 gravitron_ joined #git
08:38 tabakhase__ joined #git
08:38 heinrich5991_ joined #git
08:38 meZee- joined #git
08:38 tvl joined #git
08:38 BrianBla- joined #git
08:38 jhass also you didn't really answer my question
08:38 scarcry_ joined #git
08:38 slide23 joined #git
08:38 malesca_ joined #git
08:38 holodoc- joined #git
08:38 cerberii joined #git
08:38 cebor_ joined #git
08:38 souther_ joined #git
08:38 dsop_ joined #git
08:38 iveqy_ joined #git
08:39 forrestv_ joined #git
08:39 BombStrike joined #git
08:39 Keridos joined #git
08:39 johnny56_ joined #git
08:39 axisys_ joined #git
08:39 Samy__ which question? I did a git checkout categorisation and this time it worked
08:39 DTekk_ joined #git
08:39 uebera|| joined #git
08:39 uebera|| joined #git
08:39 Samy__ dont know why it didnt the previous time
08:39 synchron- joined #git
08:39 stuh84 joined #git
08:39 msonntag_ joined #git
08:39 Samy__ i can make the changes again and do git push i think it should work then?
08:39 Apasmara joined #git
08:39 Novitsh joined #git
08:39 jhass Samy__: yes, but your changes were still there, I wanted you to save the work of redoing them
08:40 courrier joined #git
08:40 jhass and perhaps understanding git a bit better in the process
08:40 creppe joined #git
08:40 jhass but since you ignored my advice, hf
08:40 jason237 joined #git
08:40 peepsalot joined #git
08:40 jhass (my question was whether why you wouldn't want to keep your changes)
08:40 nellicus_ joined #git
08:41 Internet13 joined #git
08:41 chrisml joined #git
08:41 Samy__ jhass: the changes were less only and i was ok doing them again
08:41 Tortoise joined #git
08:41 checkItOut joined #git
08:41 _flow_ joined #git
08:41 jhass Samy__: btw you got https://github.com/divyam3897/GCompris-qt/tree/categorisation and https://github.com/divyam3897/GCompris-qt/tree/categorization, might want to get rid of one in order to not further confuse yourself
08:41 Samy__ i did a git checkout origin/categorisation again but lost that commit though it was commited
08:42 jhass yes
08:42 ribasushi joined #git
08:42 jhass because a commit in detached HEAD state doesn't move any ref forward
08:42 jhass because there's no HEAD
08:42 Samy__ jhass: can i just delete this branch?
08:42 Samy__ didnt get the last line
08:43 jottr_ joined #git
08:43 rchavik joined #git
08:43 jhass hence I wanted to create a new branch from that state before you moved away from it
08:43 jhass "this branch" is what in your mind now?
08:43 King_Hual joined #git
08:43 son joined #git
08:43 matthiaskrgr joined #git
08:43 Samy__ the extra tree/categorization
08:43 jhass tree ?
08:43 VoidFox joined #git
08:44 Samy__ https://github.com/divyam3897/GCompris-qt/tree/categorization
08:44 jhass /tree/ is just github's URL
08:44 dunk joined #git
08:44 jhass the branch is called categorization
08:44 jhass https://github.com/divyam3897/GCompris-qt/branches
08:44 Samy__ yeah i had got your point of creating a new branch from there and pushing it to so that we can keep all the changes as they were :)
08:44 jhass there might be easier for you to just do it via GH
08:44 Samy__ what tree signifies in github url :D
08:45 Samy__ what would be easier?
08:45 SuperflyR6 joined #git
08:45 rancyd joined #git
08:45 jhass /tree/ is just there "directory listing" view
08:45 jhass *their
08:45 drodger joined #git
08:46 jhass deleting the branch would likely be easier for you via GH's interface since you're heavily confused about (remote) refs already
08:46 mda1 joined #git
08:47 weckl joined #git
08:47 Meteorhead_ joined #git
08:47 sybariten joined #git
08:47 [diecast] joined #git
08:47 Samy__ jhass: from where can i read about it?
08:48 JeroenT_ joined #git
08:48 Samy__ jhass: about remote and refs
08:48 Samy__ i havent encountered them before beacuse
08:48 jhass https://git-scm.com/book/en/v2/Git-Branching-Remote-Branches
08:48 satbyy joined #git
08:48 johtso joined #git
08:49 DarkMukke joined #git
08:49 cd83x joined #git
08:50 XDS2010 joined #git
08:50 tfnico joined #git
08:50 bcardarella joined #git
08:50 ELLIOTTCABLE joined #git
08:51 mischat joined #git
08:52 Samy__ jhass: thanks :)
08:53 kjnilsson joined #git
08:53 harleypig joined #git
08:53 vcoinminer joined #git
08:53 imdsm_ joined #git
08:53 liuzhen joined #git
08:54 djb-irc joined #git
08:54 Samy__ jhass: i made the changes again and did a git push but it shows everything is upto data :/
08:55 jhass you did commit them?
08:55 Samy__ git log shows the commit but again GH doesnt
08:55 Samy__ yes
08:55 jhass you wrote git push origin categorisation exactly?
08:55 Samy__ yes
08:56 Samy__ how can everything be uptodate
08:56 jhass show me git status & git log -1 and your git push please
08:56 angelsl joined #git
08:58 Samy__ jhass: https://paste.kde.org/pmd1i8aqy
08:58 jhass you again did git checkout origin/categorisation
08:58 jhass and committed there
08:58 Samy__ no i didnt :/
08:59 jhass yes you did
08:59 jhass git status shows
08:59 Samy__ ah may be when i got back to origin i forgot switching :O
09:00 jhass git checkout -b categorisation_bak; git checkout categorisation; git cherry-pick categorisation_bak; git push origin categorisation; git branch -D categorisation_bak
09:00 baraba joined #git
09:00 watabou joined #git
09:01 Samy__ cherry-pick?
09:01 jhass yes
09:01 jhass take a single commit and apply it to the current (local!) branch
09:02 liuzhen joined #git
09:02 nilg` joined #git
09:02 jerematic joined #git
09:03 slayerjain joined #git
09:05 infra-red joined #git
09:06 contracode joined #git
09:09 FritzLakritz joined #git
09:10 braderhart joined #git
09:11 paul424 joined #git
09:11 nezZario joined #git
09:12 angiebadillo joined #git
09:13 fscala joined #git
09:13 ajm203_ joined #git
09:14 cmosguy joined #git
09:14 t0by joined #git
09:15 kugel_ joined #git
09:15 exawatts joined #git
09:15 dmto joined #git
09:16 etcinit joined #git
09:16 sfan786 joined #git
09:19 grift left #git
09:20 mingrammer joined #git
09:23 Guest78611 joined #git
09:24 Kulrak joined #git
09:24 Kulrak joined #git
09:24 JohnBat26 joined #git
09:27 dmto joined #git
09:27 fuchstronaut joined #git
09:28 MrWoohoo joined #git
09:28 bhavik left #git
09:30 BSaboia joined #git
09:31 drodger joined #git
09:31 JeroenT joined #git
09:33 m1dnight1 joined #git
09:34 linduxed left #git
09:34 son joined #git
09:36 joki- joined #git
09:37 m1dnight1 joined #git
09:38 PSan joined #git
09:38 PSan is there an option I can pass to merge to delete the merged branch?
09:39 grawity no
09:43 cd83x joined #git
09:44 achadwick joined #git
09:52 testild joined #git
09:53 johnmilton joined #git
09:56 dmto joined #git
09:57 JeroenT joined #git
09:57 sonOfRa_ joined #git
09:57 tilpner_ joined #git
09:57 yx_ joined #git
09:57 Matrixiumn joined #git
09:57 dustinm` joined #git
09:57 JeroenT joined #git
09:58 fscala_ joined #git
09:58 Rish joined #git
09:59 pampeho_ joined #git
09:59 jhass joined #git
09:59 kenansul- joined #git
10:01 nilsi joined #git
10:01 nnyk_ joined #git
10:02 cbreak joined #git
10:02 drodger joined #git
10:02 shaggycat joined #git
10:02 sauvin_ joined #git
10:03 likewhoa joined #git
10:03 jerematic joined #git
10:03 JeroenT joined #git
10:04 blueyed joined #git
10:04 mase-tech joined #git
10:04 kfunk joined #git
10:05 Kenterfie joined #git
10:05 Gonzo89 joined #git
10:05 ffabi joined #git
10:05 rishi joined #git
10:05 prsn_ joined #git
10:05 shinnya joined #git
10:05 heftig joined #git
10:06 vagelis joined #git
10:06 ohcibi joined #git
10:06 VampiricPadraig joined #git
10:06 deepy joined #git
10:06 Blkt joined #git
10:06 Bucciarati joined #git
10:06 Chinorro joined #git
10:06 interne7y joined #git
10:06 WakiMiko joined #git
10:07 vagelis Hello, how can i copy the last commit(i just made it) from old branch(or tree path, im not familiar with terms) and "squeeze" it in my current tree path?
10:07 i7c joined #git
10:07 Rish joined #git
10:07 nyuszika7h joined #git
10:07 AlexanderS joined #git
10:08 vagelis In my current tree, i see from the graph that is based on master but im supposed to work on another branch, well i work on annother branch but is based on master.
10:08 dunk joined #git
10:08 [diecast] joined #git
10:09 D-Boy joined #git
10:09 johtso joined #git
10:09 clivejo joined #git
10:10 grift joined #git
10:10 Ram-Z joined #git
10:10 DarkMukke joined #git
10:10 bauruine joined #git
10:10 PSan vagelis, I think cherry pick is the term you're looking for
10:10 XDS2010 joined #git
10:10 artemisart joined #git
10:11 tfnico joined #git
10:11 bcardarella joined #git
10:11 ELLIOTTCABLE joined #git
10:11 fuchstronaut joined #git
10:12 offnode left #git
10:12 Neico joined #git
10:12 hexagoxel_ joined #git
10:13 ujjain joined #git
10:13 ujjain joined #git
10:13 kjnilsson joined #git
10:13 harleypig joined #git
10:13 vcoinminer joined #git
10:13 imdsm_ joined #git
10:13 eletuchy joined #git
10:15 nichi__ joined #git
10:15 haasn joined #git
10:15 APic joined #git
10:15 fiete joined #git
10:17 angelsl joined #git
10:17 mniip joined #git
10:19 Urbany joined #git
10:19 vagelis +PSan thanks i read a google result on stackoverflow but i think i found something(dont remember) and i realized i shouldnt use it but im not sure
10:20 mcptron joined #git
10:20 leeN joined #git
10:21 mcptron_ joined #git
10:21 tristanp joined #git
10:22 deepy joined #git
10:23 EY joined #git
10:24 rishi joined #git
10:25 ohcibi joined #git
10:25 VampiricPadraig joined #git
10:25 VampiricPadraig joined #git
10:25 drodger joined #git
10:25 Blkt joined #git
10:25 Chinorro joined #git
10:25 PaulePanter joined #git
10:26 Atlantic777 joined #git
10:26 Atlantic777 joined #git
10:26 AlexanderS joined #git
10:27 Thorn joined #git
10:27 pdgwien joined #git
10:28 slayerjain joined #git
10:28 a_thakur joined #git
10:29 Hobbyboy|BNC joined #git
10:30 muthu joined #git
10:31 contracode joined #git
10:31 haasn joined #git
10:31 bauruine joined #git
10:32 Urbany joined #git
10:33 asd5a joined #git
10:33 FritzLakritz joined #git
10:34 braderhart joined #git
10:35 danielsh joined #git
10:35 nezZario joined #git
10:36 clivejo joined #git
10:36 angiebadillo joined #git
10:37 ramsub07 joined #git
10:37 SteffanW joined #git
10:37 ajm203_ joined #git
10:37 qt-x joined #git
10:38 cmosguy joined #git
10:38 cd83x joined #git
10:40 exawatts joined #git
10:40 nilsi joined #git
10:40 etcinit joined #git
10:41 sfan786 joined #git
10:41 fission6 joined #git
10:42 infernix joined #git
10:45 mischat joined #git
10:45 diogenese joined #git
10:45 mingrammer joined #git
10:45 zacsek joined #git
10:45 subhojit777 joined #git
10:45 t0mex joined #git
10:45 ToxicFrog joined #git
10:45 vagelis +PSan if i cherry-pick it will add it as last commit, I want to squeeze it between previous/old commits
10:46 satbyy joined #git
10:46 rscata joined #git
10:47 jhass vagelis: just merge it?
10:47 watabou joined #git
10:49 ToBeFree joined #git
10:49 TomyWork joined #git
10:49 flopsec joined #git
10:49 achadwick joined #git
10:49 iveqy_ joined #git
10:49 kurkale6ka joined #git
10:49 Kicer86 joined #git
10:49 lukeer joined #git
10:49 McNozes joined #git
10:49 monoxane joined #git
10:49 Khisanth joined #git
10:49 SimonK joined #git
10:49 blr joined #git
10:49 Derega joined #git
10:49 krabat joined #git
10:49 larsrustand joined #git
10:49 monokrome joined #git
10:49 smithbone joined #git
10:49 tokkee joined #git
10:49 M-shine joined #git
10:49 gruetzkopf joined #git
10:49 Muzer joined #git
10:49 bond joined #git
10:49 hypnosb joined #git
10:49 forgot joined #git
10:49 siprbaum joined #git
10:50 ToBeFree joined #git
10:50 vagelis jhass: where i should be before i merge it? Should i be after the commit well that i want to squeeze in between?
10:51 monoxane joined #git
10:51 vagelis jhass: I think the whole history will change and i have to "inform" the newer commits that hey one new commit is in between
10:51 jhass so you're in a rebase?
10:51 jhass that'd be important context, you know
10:51 vagelis no i didnt touch anything yet
10:51 monokrome joined #git
10:51 vagelis jhass: ok let me draw it in a paste site
10:52 abra0 joined #git
10:52 jhass did you push the current history you want to "squeeze" your commit into anywhere yet and did other people clone it/check it out locally?
10:54 JeroenT joined #git
10:55 eletuchy joined #git
10:56 lss8 joined #git
10:58 ilmari joined #git
10:59 BrianBlaze420 joined #git
11:00 vagelis jhass: https://bpaste.net/show/973513bbf020
11:00 vagelis jhass: dont worry about other people
11:01 jhass why?
11:01 vagelis its me and another person who doesnt touch this code
11:02 jhass what we're going to do now will make them unable to git pull if  they already have B A from new_branch
11:03 jhass are you sure you're okay with that?
11:03 vagelis w8 im thinking
11:04 jhass tbh your paste is a bit confusing, you have three versions of A and two of B and C?
11:04 jerematic joined #git
11:04 vagelis jhass: Sry the AB from new branch are totally new commits different code i named them bad sry
11:04 jhass ok good
11:05 vagelis I just wanted to show that i made some new commits :|
11:05 jhass so you want new_branch to include wanted_commit from old_branch as first commit, you do not want to affect master or old_branch, correct?
11:06 jhass and nobody else has a local checkout of new_branch, also correct?
11:06 rnsanchez joined #git
11:07 vagelis The commit i want has a fix and i want it before master so my new branch takes account of it
11:07 vagelis So my new branch doesnt have bug
11:07 jhass second question?
11:07 vagelis yea ill ask :|
11:08 vagelis Ok we can continue :)
11:08 jhass the I suggest to cherry-pick wanted_commit to master, and then rebase new_branch onto master
11:09 vagelis why cherry pick to master and not before ? :/
11:09 diogenese joined #git
11:09 jhass yes
11:09 vagelis Im not git expert whatsoever and i dont understand even what people mean :|
11:10 jhass git checkout master; git cherry-pick old_branch # assumming its indeed the latest commit, else use its sha; git push origin master; git checkout new_branch; git rebase master; git push -f origin new_branch
11:10 jhass watch what git tells you in case there are any conflicts
11:10 vagelis I mean in my mind i have to checkout firs to a commit before master and squeeze it there somehow and then do the rebase which im familirar a bit :S
11:11 vagelis jhass: so i checkout master first right?
11:11 jhass like I wrote
11:11 ribasushi joined #git
11:11 jhass note that will do apply the commit to the master branch too
11:12 jhass but if it's important for your work I figured that's likely wanted
11:12 djb-irc joined #git
11:12 vagelis but if i checkout to master well master will now the changes im doing, no?
11:12 vagelis im not sure i understood 100%
11:12 jhass yes
11:12 vagelis then why u mention it?
11:13 jhass "it" is what now for you?
11:14 vagelis sry didnt understand the sentance :S
11:14 vagelis oh
11:14 drodger joined #git
11:14 vagelis anyway im confused so ill do what u said :D
11:16 eletuchy joined #git
11:18 jhass my suggestion will do this https://p.jhass.eu/2a.txt
11:18 fission6 joined #git
11:19 jhass wait https://p.jhass.eu/2b.txt is more correct
11:22 jhass vagelis: do you want this instead? https://p.jhass.eu/2c.txt
11:22 rahtgaz joined #git
11:22 vagelis i did it now ill read ur links
11:24 vagelis jhass: whats the difference with what u have said?
11:25 jhass for the latest? G (your wanted commit) would not land in master but only your branch. And it'll give conflict hell if multiple people do that
11:25 jaguarmagenta joined #git
11:25 jhass with my first suggestion others can just rebase their topic branches onto master too
11:25 vagelis well i did ur first suggestion already
11:26 jhass cool
11:26 jhass all good then?
11:26 vagelis imo seems what i wanted :S
11:26 vagelis yea no conflicts just 1 thing though
11:26 jhass I think so too ;)
11:27 vagelis before it was like this in 1 line: (HEAD -> master, origin/master, origin/HEAD)
11:27 vagelis Now master is one commit in front with my wanted commit
11:27 vagelis And i already git push -f
11:28 jhass you probably skipped the git push origin master
11:28 vagelis i dont even know how to push :( What do u mean i skipped? We have to push 2 times? :O
11:28 jhass yes, we changed two branches
11:28 vagelis im so dump with these programs
11:29 PSan joined #git
11:29 vagelis i know origin is the remote branch
11:29 jhass no, not branch
11:29 JeroenT joined #git
11:29 jhass just remote
11:29 vagelis ok :|
11:29 johnmilton joined #git
11:29 vagelis in my mind its the internet :D
11:29 jhass a remote is essentially (name,url) for a remote repository
11:29 vagelis ok cool
11:29 jhass which then has its own branches, distinct to yours
11:30 vagelis ok so master only means my local master
11:30 jhass git push updates the branch(es) of a remote repository, git pull updates your branch(es) from a remote repository
11:30 vagelis so i pushed that so i have to push origin/master too?
11:30 k3rn31 joined #git
11:30 TSS_ joined #git
11:30 jhass no
11:31 jhass git push origin master is a shortcut to git push origin master:refs/heads/origin/master
11:31 jhass which says take my local branch master and make the branch master of the remote origin the same
11:31 jhass so if git push origin master succeeded it should point to G' now
11:32 testuserguest joined #git
11:32 cd83x joined #git
11:33 vagelis i think im not supposed to do that but im not sure
11:33 vagelis ill ask
11:34 vagelis jhass: thank u very much jhass
11:35 Astero joined #git
11:36 grift joined #git
11:36 mizu_no_oto joined #git
11:37 jhass vagelis: https://p.jhass.eu/2d.txt here's the version for each step we did
11:39 led_belly joined #git
11:39 settermjd joined #git
11:41 xlegoman joined #git
11:43 JeroenT joined #git
11:45 sdothum joined #git
11:46 davisonio joined #git
11:46 grift joined #git
11:47 Astero joined #git
11:47 watabou joined #git
11:48 subhojit777 joined #git
11:50 dimi1947 joined #git
11:51 fission6 joined #git
11:54 endiruna joined #git
11:55 tvw joined #git
11:55 tlaxkit joined #git
11:57 eletuchy joined #git
11:58 maucar joined #git
11:58 FilipNortic joined #git
12:00 radsy joined #git
12:03 ribasushi joined #git
12:05 jerematic joined #git
12:06 mischat joined #git
12:06 nettoweb joined #git
12:06 MadHatter42 joined #git
12:08 vagelis jhass: i just came back, wow thanks for ur help man, thanks for ur time u spent to do this :O
12:08 vagelis jhass: im reading it now
12:08 interne7y joined #git
12:09 zeroed joined #git
12:09 zeroed joined #git
12:10 settermjd joined #git
12:10 Guest25029 joined #git
12:10 Guest25029 joined #git
12:11 synthroid joined #git
12:11 solars joined #git
12:11 rnsanchez joined #git
12:11 vagelis jhass: btw the new_branch it was already rebased to master before i do anything so instead of seperate paths, it was one path
12:12 Rish joined #git
12:12 ncd|leeN joined #git
12:12 jhass it's one path in my examples too
12:12 jhass until the cherry-pick
12:15 JeroenT joined #git
12:16 jeffreylevesque joined #git
12:17 rbr joined #git
12:17 sdothum joined #git
12:18 JanC_ joined #git
12:19 rwb joined #git
12:19 mmlb joined #git
12:20 leonarth joined #git
12:26 synthroi_ joined #git
12:26 cd83x joined #git
12:27 xlegoman joined #git
12:30 qt-x joined #git
12:31 synthroid joined #git
12:32 davisonio joined #git
12:34 deadnull_ joined #git
12:34 paul424 joined #git
12:34 Gloomy joined #git
12:34 endiruna joined #git
12:35 bruce_lee joined #git
12:36 fahadash joined #git
12:39 fmcgeough joined #git
12:41 thiago joined #git
12:43 LeMike joined #git
12:43 livingstn joined #git
12:46 dimi1947 joined #git
12:46 ahmedelgabri joined #git
12:48 leonarth joined #git
12:48 SteffanW joined #git
12:48 watabou joined #git
12:52 toogley joined #git
12:54 eletuchy joined #git
12:55 infra-red joined #git
12:56 zeroed joined #git
12:56 zeroed joined #git
12:57 FaTony joined #git
12:57 FaTony hi, how can I gitignore all dirs except one?
12:57 lolmac joined #git
12:58 bathtub_shark *\n!dir
12:58 marc_v92 joined #git
12:59 FaTony bathtub_shark, um but will it also ignore files?
13:00 bathtub_shark well yeah, that's what the star implies
13:00 jimi_ joined #git
13:00 Sendoushi joined #git
13:00 chll joined #git
13:00 bathtub_shark it might be possible to ignore all dirs with '*/*', i can't say i've ever tried or had an usecase that required that
13:01 infra-red joined #git
13:01 bathtub_shark personally i'd move all my ignored dirs in one bigger directory (ignored/*\n!ignored/donotignore)
13:01 liquidjamm joined #git
13:01 FaTony bathtub_shark, I have a debian packaging info. I need to not ignore ./debian/source dir and a bunch of files, but I need to ignore all other dirs under ./debian/
13:02 zivester joined #git
13:02 FaTony should I just put all dirs that I need to ignore manually?
13:02 bathtub_shark there may be better alternatives I don't know of, but in most cases it doesn't hurt
13:02 FaTony ok, ty
13:03 elsevero_ joined #git
13:05 jerematic joined #git
13:09 interne7y joined #git
13:10 sdothum joined #git
13:13 QUSpilPrgm joined #git
13:13 SteffanW joined #git
13:13 sdothum joined #git
13:13 happy-dude joined #git
13:14 solars joined #git
13:15 davisonio joined #git
13:15 zeroed joined #git
13:16 zeroed joined #git
13:20 cxz joined #git
13:20 k3rn31 joined #git
13:21 cd83x joined #git
13:21 mbrzuzy joined #git
13:23 FaTony left #git
13:23 sdothum joined #git
13:24 jbitdrop joined #git
13:24 CEnnis91 joined #git
13:25 Eryn_1983_FL hey any master git users here?
13:25 Eryn_1983_FL so i made some commits, and i want to revert to before those changes,
13:25 jaguarmagenta joined #git
13:26 Eryn_1983_FL should i use reset command?
13:26 fracting joined #git
13:26 i7c !revert
13:26 gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
13:26 Macaveli joined #git
13:28 italoacasas joined #git
13:29 Eryn_1983_FL god i love bots...
13:29 QUSpilPrgm left #git
13:30 jhass also consider whether anybody else has these commits already
13:30 rgrinberg joined #git
13:31 croberts joined #git
13:31 i7c ... in which case option a) would be the best.
13:32 Zighuatl joined #git
13:33 rgrinberg joined #git
13:34 lukeer Thank god and whoever he assigned to work on git for that incredible tool. And git-gui. And TortoiseGit.
13:34 lukeer Happy weekend. Bye.
13:34 bluj joined #git
13:35 Eryn_1983_FL nah it is just me..
13:35 Eryn_1983_FL i work alone..
13:36 bluj hi. does anyone know if there's some git-specific way of doing a git diff between two branches, but exclude a certain directory? i often pass '-- some_directory/' to the very end, to only show changes from that one directory. but i kind of want to do like an inverse here i guess
13:36 cdown joined #git
13:37 TheMontyChrist joined #git
13:37 TheMontyChrist recommend a good git viewer linux?
13:37 TheMontyChrist I like tortoise mercurial
13:37 TheMontyChrist something similar?
13:37 thiago joined #git
13:38 ribasushi joined #git
13:38 leonarth joined #git
13:38 lukeer TheMontyChrist: Since TortoiseSvn is similar, and created by the same people, I guess that's also valid for TortoiseMercurical.
13:39 dmto joined #git
13:39 Psychiatrist joined #git
13:39 lukeer left #git
13:39 ceaucari joined #git
13:39 cdown_ joined #git
13:39 zeroed joined #git
13:39 zeroed joined #git
13:41 jerematic joined #git
13:42 shymega joined #git
13:42 crose joined #git
13:44 i7c bluj, try git diff -- . ':!path/I/want/to/ignore'
13:45 Sendoushi joined #git
13:45 i7c bluj, you can also specify multiple of those ':!path' pathspecs.
13:45 prsn joined #git
13:46 i7c bluj, don't forget to include something first tho (in this case the . )
13:47 bluj i7c, great thanks
13:47 frem_ joined #git
13:47 leonarth_ joined #git
13:47 i7c :)
13:48 dodobrain joined #git
13:49 bluj git diff origin/branchA..branchB  -- . ':!tools' ---> fatal: Unimplemented pathspec magic '!' in ':!tools'
13:50 bluj :( .. is it a new feature perhaps? git --version just told me 1.8.3.1.. that seems old. i'll try upgrading
13:50 LeMike joined #git
13:50 i7c That's pretty darn old, yes.
13:50 bluj silly centos 7.
13:51 i7c 2.8.x is stable.
13:53 i7c bluj, it's available since 1.9.0
13:53 bluj awesome.. thanks. 2.8.3 is compiling now
13:53 AaronMT joined #git
13:56 CJKinni joined #git
13:57 bluj great, works. thx again
14:01 nnyk_ joined #git
14:02 eka joined #git
14:03 daveomcd joined #git
14:03 i7c You're welcome
14:04 realz_ joined #git
14:05 daveomcd I have been working off my master branch, but as I've discovered I should be building features/changes on branches and merging back to master. I currently have my master branch in a "clean" state, but have various different features on a branch- what way should I look into in order to piece those features out into different branches so I can organize them and then finish them?
14:08 jhass daveomcd: git checkout -b my_feature origin/master; git log various_features; git cherry-pick <sha>;
14:09 daveomcd jhass, thanks! I need to read up on the git cherry-pick, but the first part is just creating a new branch from the master & what's the git log for? Were you just showing that as how to look at it as I go? I've only ever used "git log" nothing after log
14:10 interne7y joined #git
14:10 jhass it's so you can look at your branch with the assorted stuff to pick the right commits to cherry pick
14:11 ahmedelgabri joined #git
14:11 djb-irc joined #git
14:11 unbalancedparen joined #git
14:12 daveomcd jhass, oh! i see thanks! anyway to reference the current status so i can revert back if I blow things up? Or would I just go back to a specific sha?
14:12 jhass not sure what you mean
14:12 SwiftMatt joined #git
14:13 jhass if you cherry-pick a wrong commit just git reset --hard before it
14:13 prsn joined #git
14:13 daveomcd ok, all of this has been very helpful thanks!
14:15 ribasushi joined #git
14:15 cd83x joined #git
14:15 floatingpoint joined #git
14:15 dmj joined #git
14:17 SteffanW2 joined #git
14:20 elsevero_ joined #git
14:20 nettoweb joined #git
14:21 exarch joined #git
14:21 Gamecubic joined #git
14:22 sLite joined #git
14:23 eletuchy joined #git
14:27 orbitphreak joined #git
14:27 jamiejackson joined #git
14:28 jamiejackson hi folks. i was on here the other day, and since i'm on windows, it was recommended that i have autocrlf=true, however....
14:29 zacsek joined #git
14:29 jamiejackson i've been working on an oss project and i ended up with some EOL problems: https://git.io/voeYm . see ValidateThis/unitTests/BOValidatorTest.cfc, for instance.
14:30 phaleth joined #git
14:30 jamiejackson i'd like to know if the problem was with the upstream repo, or if it's something on my end. if it's on my end, i'd like to know how to fix it before i submit a pull request.
14:31 rbr joined #git
14:33 dreiss joined #git
14:36 raijin joined #git
14:36 JZA joined #git
14:37 cdg joined #git
14:37 thiago_ joined #git
14:37 kpease joined #git
14:39 leonarth joined #git
14:42 Kulrak joined #git
14:42 Kulrak joined #git
14:43 annoymouse joined #git
14:44 wrouesnel joined #git
14:44 ribasushi joined #git
14:46 ash_workz joined #git
14:49 prsn left #git
14:50 clemf joined #git
14:51 leonarth joined #git
14:52 TheMontyChrist joined #git
14:52 shiriru joined #git
14:53 sweatsuit joined #git
14:54 t0by joined #git
14:54 TheMontyChrist whats the difference between a fetch and a pull?
14:55 TheMontyChrist oh wait
14:55 TheMontyChrist nvm
14:55 TheMontyChrist so if I add a remote
14:55 TheMontyChrist what does fetching buy mean
14:55 narendraj9 joined #git
14:55 TheMontyChrist mean -> me
14:56 koro as far as i understand, fetch updates your local copy of origin/master, while pull does fetch + merge (with your local master branch)
14:56 TheMontyChrist wait, no, pulling
14:56 koro that's what she said
14:56 koro sorry. it's instinct.
14:56 i7c Not with your local master branch
14:56 i7c but rather with HEAD
14:56 i7c oh
14:57 i7c nvm, it was an example.
14:57 * i7c shuts up.
14:58 TheMontyChrist okay, so if origin/branch1_0 @ repo2/branch1`
14:58 TheMontyChrist fetching repo2 will leave my branch1 untouched
14:58 TheMontyChrist ignore the _0 :P
14:59 TheMontyChrist ` indicate same branch name w/ a few more revs
14:59 TheMontyChrist @ -> and
14:59 atrus TheMontyChrist: it's kind of hard to tell what you're asking, especially when you keep using symbols and sentence fragments.
14:59 TheMontyChrist jesus
15:00 TheMontyChrist I know
15:00 TheMontyChrist lemme start again :P
15:00 i7c If you fetch, any local branch will remain untouched, yes.
15:00 i7c Only the ones like remoteXY/branchDerp will be updated.
15:00 TheMontyChrist if have remote repo2
15:00 TheMontyChrist ..I'm from mercurial so, please be patient
15:00 atrus also, the return key is not punctuation
15:01 i7c I'll put the mercurial one in my book of golden quotes.
15:01 TheMontyChrist I can have branch1, and repo2 can have branch1'.  when I fetch repo2, it just updates my copy of repo2
15:02 TheMontyChrist when I pull, it'll merge branch1 and branch1`?
15:02 i7c It'll update repo2/branch1
15:02 i7c TheMontyChrist, only if branch1 is checked out, i.e. is your HEAD.
15:02 TheMontyChrist anybody mercurial users?
15:03 neanderslob joined #git
15:03 neanderslob_ joined #git
15:03 TheMontyChrist so to me, remotes are like repositories
15:03 fedexo joined #git
15:03 atrus TheMontyChrist: you don't have a "copy" of a repository. you likely have branches that reference remote branches. you have branches in the form <remote>/<branchName>, which will get updated by 'git fetch'. you also generally have branches which are local, that aren't on remotes at all.
15:04 ciampix joined #git
15:04 fracting joined #git
15:04 neanderslob joined #git
15:04 atrus your local branches can be set up to "track" other branches. that means that when you run 'git pull' while you have one of those local branches checked out, the remote branch it tracks gets 1) fetched, and then 2) merged into your current branch.
15:05 koro that!
15:05 atrus (where "have one of those local branches checked out" means you ran 'git checkout <localBranch>')
15:05 madewokherd joined #git
15:06 TheMontyChrist and check out means make it a working copy
15:06 garethdaine joined #git
15:06 atrus TheMontyChrist: i'm not exactly sure I know what you mean by "working copy", but i think you're in the right area anyways :)
15:06 van joined #git
15:08 TheMontyChrist so if I checkout repos2/branch1 branch one will be loaded/editable/present etc
15:09 cd83x joined #git
15:09 koro does anyone here use git in combination with dropbox?
15:09 TheMontyChrist so remote repos2 doesn't reside in some hiddle .git dir?
15:09 TheMontyChrist it just points to a remote location and "fetch" updates some meta data assoc w/ it?
15:10 grawity koro: aka hosting git repos on Dropbox?
15:10 koro yes
15:10 grawity I'm using it for my own repos, it sorta works but wouldn't recommend, unless you like diving into .git/ occasionally
15:10 bango2 joined #git
15:11 grawity if you must host it on Dropbox, try https://github.com/anishathalye/git-remote-dropbox
15:11 koro I have my work files in a dropbox folder and I'm thinking of using git for them. I'm the only one who edits those files but I do it from multiple computers... the idea is that dropbox keeps everything in sync and git is just there to keep track of versions (unrelated to the fact that I work from different places)
15:11 CJKinni` joined #git
15:11 interne7y joined #git
15:11 koro I think I may have been unclear
15:11 koro I don't want to host a git repo, I want to use my own local repo from different computers.
15:12 grawity that still counts as 'hosting', really
15:12 grawity but, anyway
15:12 koro I guess so, but it won't have any remote set up
15:12 atrus TheMontyChrist: if you just "checkout" a remote branch, like git checkout <remote>/<branch>, you'll be in "detached head mode". if you use the -t option, it'll create a local branch that tracks the remote branch, and then check out that local branch.
15:12 koro I mean whenever I work git will assume it's just a local repo
15:12 grawity directly using a repo that's stored on Dropbox... probably works as long as you never edit it from two computers at once
15:13 koro I was a bit worried about possible conflicts
15:13 koro yeah, exactly
15:13 grawity those happen
15:13 rancyd joined #git
15:13 grawity it shouldn't lose any data, but like I said, sooner or later you'll probably have to fix something inside .git
15:13 TheMontyChrist git has alot of moving parts :P
15:13 koro when you mean edit it from two computers at once you mean make commits at precisely the same time, just?
15:13 grawity not to mention the occasional desyncs between .git/index and reality
15:13 TheMontyChrist I thought I'd be ahead knowing mercurial
15:13 TheMontyChrist kinda sorta
15:13 koro this is not likely to happen
15:14 sgfgdf left #git
15:14 koro since I'm the only one using it. What may happen is that I make local changes to files in one computer and forget to commit, then go back home and make other changes and then commit, put the work from the other computer wasn't yet synced by dropbox
15:15 atrus TheMontyChrist: i think that's fair to say. it does mean there's a lot of power exposed, but it can be tricky to figure out what all those things mean.
15:15 grawity anyway. I'd say use it if you want, but make sure to set up a "backup" remote *somewhere*, and push to it every now and then >_>
15:15 koro in that case I'm not sure what would happen :/
15:15 koro yeah, good idea
15:15 grawity also, the `dropbox status` CLI command is useful
15:15 lmat I would like to remove a commit from an history. Normally I would   git rebase --interactive REMOVE_HASH^
15:15 lmat (I think)
15:15 koro yeah I use it all the time
15:15 lmat Is this the right way?
15:15 grawity (i.e. don't work until it says "Up to date")
15:15 robotroll joined #git
15:15 koro no sorry, DROPBOX status?
15:15 grawity yes
15:15 koro i thought you meant git
15:16 koro I don't have that...
15:16 grawity well, I guess Windows/OSX has the systray icon instead
15:16 koro yeah, OSX here.
15:16 grawity for Linux, https://linux.dropbox.com/packages/dropbox.py
15:16 koro maybe I could make a wrapper for git, that first checks dropbox status and only commits if it's synced
15:16 koro otherwise throws a message or something
15:17 koro just a script
15:17 lmat The problem in my case is that my current HEAD is a merge commit. So I'm wanting to remove a commit from "behind" a merge commit. Does that change anything?
15:17 grawity lmat: you might need --preserve-merges then
15:18 diogenese joined #git
15:18 Lynxium joined #git
15:18 grawity (see also `man git rebase` "combining it with the --interactive option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)")
15:18 gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html
15:19 durham joined #git
15:20 lmat grawity: :-(   I'm doing it, but it's going to make me resolve all the merge conflicts as I go, looks like.
15:21 lmat grawity: Would you fix git and make it easier to "move" merge commits? ;-)
15:21 lmat All the merge conflict resolution is in the repository. rerere should not be necessary, etc.
15:22 paul424 joined #git
15:23 edude03 joined #git
15:23 troulouliou_div2 joined #git
15:23 guardian hello, why do I have to do git cherry-pick A^..B if I want A included?
15:23 guardian what's the reasoning?
15:23 osse guardian: because A..B doesn't include A
15:23 rath joined #git
15:23 osse because A..B means reachable from B but not from A
15:24 osse A is reachable from itself
15:24 remi joined #git
15:25 dmto joined #git
15:26 remi Will Linus call me a 'SVN scrub' if I use 'git blame', just like with 'git log --follow' because 'Git tracks content not files' or is blame an exception to that?
15:26 jaguarmagenta joined #git
15:28 remi (... and I should use the pickaxe instead of blame?)
15:28 achadwick joined #git
15:29 skapunker joined #git
15:29 guardian osse: thanks
15:31 garethdaine joined #git
15:31 NeverDie joined #git
15:32 osse remi: not sure I understand your point :p
15:33 Literphor joined #git
15:34 Ahmed90 joined #git
15:34 ojacobson remi: one, Linus does not know or care that you exist. two, who cares what Linus things?
15:34 ojacobson thinks?
15:35 osse guardian: so in math terms it's a half-open range.  Also, if it wasn't then A..B and B..C would overlap
15:35 osse yeah, listen to the californian
15:36 axelitus joined #git
15:36 garethdaine joined #git
15:38 cd83x joined #git
15:40 piling joined #git
15:41 NeverDie_ joined #git
15:41 Sasazuka joined #git
15:43 jeffreylevesque joined #git
15:45 cdown joined #git
15:45 garethdaine joined #git
15:46 eletuchy joined #git
15:47 infra-red joined #git
15:47 ojacobson oi :D
15:48 choki joined #git
15:50 espindola joined #git
15:51 watabou joined #git
15:53 Vauff joined #git
15:57 bonerzs joined #git
15:57 d4rklit3 joined #git
16:04 nnyk_ joined #git
16:04 Musok joined #git
16:07 sorenb_ joined #git
16:07 clemf joined #git
16:07 nebg joined #git
16:08 _vyscond joined #git
16:09 madewokherd joined #git
16:10 TheMontyChrist git checkout -b branch somebody/branch
16:10 zivester joined #git
16:10 TheMontyChrist what does this mean?
16:10 TheMontyChrist git checkout master
16:11 knutstrut joined #git
16:11 TheMontyChrist that shuold make master my local working copy, I'd assume
16:11 jrnieder joined #git
16:11 _vyscond joined #git
16:11 TheMontyChrist -b branch somebody/branch is this the "tracking" version?
16:12 interne7y joined #git
16:13 imachuchu joined #git
16:13 saedelaere joined #git
16:13 jstimm_ joined #git
16:15 ojacobson TheMontyChrist: the meaning of the -b option is spelled out in man git-checkout
16:15 gitinfo TheMontyChrist: the git-checkout manpage is available at http://jk.gs/git-checkout.html
16:15 fscala joined #git
16:15 _vyscond any tips on my questions? :/
16:15 ozzloy osse, A is not reachable from itself.  there's no pointer that starts at A and ends at A
16:15 IWishIKnew joined #git
16:16 lindenle joined #git
16:17 al-damiri joined #git
16:19 slipperd joined #git
16:20 orbitphreak joined #git
16:20 elsevero_ joined #git
16:22 FeyFre joined #git
16:23 wooy left #git
16:23 axiom_1 joined #git
16:23 FeyFre guys, what to do if while I doing bissection I meet commit which is not buildable(i.e. I cannot confirm good or bad)???
16:24 espindola joined #git
16:24 preaction confirm it manually. this is why i tend to rewrite history to fix build/test problems
16:24 preaction so, fix the build problem and see maybe?
16:25 ilmari FeyFre: git bisect skip
16:26 cdown joined #git
16:26 drodger joined #git
16:26 TheMontyChrist git checkout -b
16:26 TheMontyChrist what does it mean if there's no name?
16:27 FeyFre blah... tortosie has no such command ....
16:27 TheMontyChrist I'm under the impression that it creates some nameless branch
16:27 TheMontyChrist git checkout dist/stable; git checkout -b
16:27 TheMontyChrist is what I'm reading
16:28 Sonderblade joined #git
16:28 TheMontyChrist so it create "stable" branch in origin?
16:29 FeyFre TheMontyChrist: syntax error for me "error: switch `b' requires a value"
16:30 adrian_broher joined #git
16:30 osse ozzloy: I see your point. But nevertheless it is reachable from itself as far as Git is concerned
16:31 liquidjamm joined #git
16:31 charolastra___ joined #git
16:32 osse I mean in practice, in terms of how 'git branch --merged' works for example. To address your specific point one counter good be that there is no need for a pointer because you're already there :p
16:32 osse *could be that
16:32 sangy joined #git
16:33 k3rn31 joined #git
16:33 Literphor joined #git
16:34 BSaboia joined #git
16:34 Sonder joined #git
16:35 renoir joined #git
16:36 ramsub07 joined #git
16:36 slayerjain joined #git
16:36 blackwind_123 joined #git
16:36 ochorocho__ joined #git
16:37 deadnull_ joined #git
16:39 m0viefreak joined #git
16:40 sangy_ joined #git
16:44 pwnz0r joined #git
16:46 aardvark_ joined #git
16:46 Impaloo joined #git
16:47 aardvark_ hmm.. git merge has stop asking me for commit messages
16:47 aardvark_ it worked the last git merge branch; git push
16:47 aardvark_ this time around, it didn't ask anything
16:47 aardvark_ I happen to like that
16:47 aardvark_ but not sure where to look to make sure it comes up
16:48 aardvark_ anyone has an idea?
16:48 bremner probably depends if it is fast forward or not
16:48 aardvark_ ah it said fast forward on push
16:48 bremner no, that's different
16:48 bremner I mean fast forward merge
16:48 aardvark_ oh hmm
16:49 aardvark_ it's just a basic push after a merge, same as last time, but this time it didn't bring up my editor
16:49 mischat joined #git
16:49 aardvark_ no explicit config on merge or push
16:50 bremner push and merge are two seperate commands.
16:50 bremner forget push.
16:50 bremner it has nothing to do with whether an editor pops up or not.
16:51 boudiccas joined #git
16:51 aardvark_ ok, yeah I should have thought of that
16:52 aardvark_ I've been phrasing this wrong
16:52 aardvark_ so basically just coming from another branch, git checkout branch, then git merge
16:52 aardvark_ but no editor
16:52 aardvark_ nothing special
16:52 aardvark_ not sure what changed since that last time the editor came up
16:52 aardvark_ sorry I'm really new to this
16:54 _ikke_ aardvark_: What did it say when you executed git merge?
16:54 aardvark_ Updating d7a635d..18599d1
16:54 aardvark_ Fast-forward
16:55 aardvark_ then the file list
16:56 _ikke_ That's the issue: "Fast-forward"
16:56 neanderslob joined #git
16:56 neanderslob_ joined #git
16:56 _ikke_ Git, by defaut, will fastforward your branch when nothing diverged
16:56 _ikke_ So no actual merge happened
16:56 jamiejackson hi folks. i was on here the other day, and since i'm on windows, it was recommended that i have autocrlf=true, however....
16:56 jamiejackson i've been working on an oss project and i ended up with some EOL problems: https://git.io/voeYm . see ValidateThis/unitTests/BOValidatorTest.cfc, for instance.
16:56 jamiejackson i'd like to know if the problem was with the upstream repo, or if it's something on my end. if it's on my end, i'd like to know how to fix it before i submit a pull request.
16:57 aardvark_ so should i just --no-ff?
16:57 _ikke_ aardvark_: If you want to force a merge, then yes
16:57 aardvark_ i see
16:57 neanderslob joined #git
16:57 aardvark_ I suppose it defaulted to ff when I created a new branch locally
16:58 aardvark_ is that the case?
16:58 ojacobson git-merge will fast-forward unless it can't, or unless you tell it not to
16:58 eletuchy joined #git
16:59 ojacobson I have --no-ff set in my .gitconfig (and aliases that enable --ff --ff-only for cases that 'should' be fast-forwards)
16:59 aardvark_ @ojacobson: oh ok, so how I made the branch doesn't matter
17:00 ojacobson correct
17:01 aardvark_ thanks!
17:02 aardvark_ @ojacobson: what cases would ff be best for?
17:02 mase-tech joined #git
17:02 ojacobson updating a local branch whose role is to mirror some remote branch exactly
17:02 furnate joined #git
17:02 ojacobson I use it for local-master when I do feature branch merges locally
17:02 ojacobson (since local-master should mirror published master prior to the merge)
17:02 rgrinberg joined #git
17:03 hahuang65 joined #git
17:05 _ikke_ When an actual merge does not really make sense
17:05 aardvark_ ojacobson: i think i got some of that, I'll read up at least I know where to look now thanks!
17:05 aardvark_ _ikke_: ah i see, that clicks thanks
17:05 ojacobson git checkout master && git merge --ff --ff-only @{upstream} # make sure master is up to date and non-divergent before merging branches
17:05 ojacobson (I have `git update` as an alias for that merge)
17:06 aardvark_ and this is for before you merge a local branch, like git merge localbranch?
17:07 ojacobson yeah. 'git merge --no-ff some-feature'
17:07 ojacobson ('git accept' in my alias set :)
17:07 aardvark_ ahhhh
17:07 aardvark_ awesome ok got that
17:09 JJM joined #git
17:09 Sendoushi joined #git
17:11 ochorocho__ joined #git
17:11 Sendoushi joined #git
17:12 subhojit777 joined #git
17:13 interne7y joined #git
17:15 josuebrunel joined #git
17:16 ribasushi joined #git
17:17 ozzloy osse, oh, you're totally right.  derp
17:17 jost joined #git
17:20 EvilPenguin joined #git
17:21 m1dnight_ joined #git
17:22 eletuchy_ joined #git
17:24 lrvick joined #git
17:24 espindola joined #git
17:24 sharpy joined #git
17:24 pungi-man joined #git
17:25 khelkun joined #git
17:25 pungi-man joined #git
17:26 eletuchy joined #git
17:26 rgrinberg joined #git
17:26 pungi-man joined #git
17:27 m1dnight_ joined #git
17:27 pungi-man joined #git
17:27 drodger joined #git
17:27 eletuch__ joined #git
17:28 robotroll joined #git
17:28 pungi-man joined #git
17:28 Impaloo96 joined #git
17:29 Winter_ joined #git
17:29 mischat_ joined #git
17:31 elementalest joined #git
17:31 ochorocho__ joined #git
17:31 deadnull_ joined #git
17:33 Impaloo96 joined #git
17:35 Sasazuka joined #git
17:36 ochorocho__ joined #git
17:36 Psychiatrist joined #git
17:38 lmat ozzloy: osse: "There is no pointer that starts at A and ends at A"  What about "A"?
17:38 ozzloy A is not a pointer, but you're already at A if you start at A
17:39 TomyLobo joined #git
17:40 lmat I have a feature that is merged into master. At the base of the feature (the first diverging commit, I think) is a commit I don't want.
17:40 lmat How do I get rid of it?
17:41 jhass it's already merged though?
17:41 jhass locally only, I mean can you undo the merge?
17:41 sharpy joined #git
17:42 lmat jhass: Yes, I have full control.
17:42 jhass it's not about control
17:42 lmat jhass: Locally only.
17:42 jhass okay, so first let's revert your master to upstream
17:42 jhass git checkout master; git reset --hard origin/master
17:42 lmat jhass: yup.
17:43 jhass then just git checkout your_feature; git rebase -i master and throw any commit you don't want out
17:43 lmat jhass: The commit is on the feature branch (was that already clear?).
17:43 jhass yes
17:44 lmat git rebase -p -i ?
17:44 slick left #git
17:44 jhass if you need -p
17:44 jhass I usually just let it flatten merge commits out
17:44 lmat jhass: I did it. There is a conflict.
17:44 jhass can solve it in the rebase too
17:44 lmat jhass: The conflict has nothing to do with the commit I dropped.
17:45 lmat jhass: It's a conflict that was already resolved in the merge.
17:45 jhass happens
17:45 lmat jhass: I really can't redo all these conflicts :-)
17:45 Impaloo joined #git
17:45 lmat jhass: It took many hours.
17:45 lmat days
17:45 Impaloo joined #git
17:45 jhass https://git-scm.com/book/en/v2/Git-Tools-Rerere :P
17:46 lmat jhass: yeah yeah
17:46 lmat jhass: oh well. Thank you very much for your help.
17:46 lmat jhass: I think what I'll do is rebase the feature branch to get rid of that commit, then do the merge again...with rerere on I guess
17:46 jhass hf :)
17:46 lmat jhass: git rebase --abort
17:46 robotroll joined #git
17:46 lmat jhass: For what it's worth, I don't have a master branch. I only have origin/master.
17:47 jhass how did you merge anything into that?
17:47 jknetl joined #git
17:47 lmat jhass: git co origin/master;  git merge feature;
17:47 jhass did you try to say you merged master into your feature branch?
17:47 lmat jhass: same as always ;-)
17:47 lmat jhass: Not at all.
17:47 jhass that's detached HEAD, no?
17:47 lmat jhass: It is.
17:48 lmat jhass: Until after the merge ;-)
17:48 adamaN joined #git
17:48 jhass btw you don't need to highlight me with every message, especially since only we two are talking
17:48 jhass and even after the merge
17:48 lmat jhass: Well, I think even after the merge, it's still detatched...
17:48 lmat Feel free to type my name so that I'll know you said something if I change channels ;-)
17:49 lmat Yeah, then I    git co feature; git reset --hard <merge commit hash>
17:49 lmat jhass: I guess I should be    git co feature; git merge origin/master;  in this case.
17:49 jhass yes
17:49 jhass just was about to mention
17:49 moei joined #git
17:49 lmat Thanks again!
17:51 fstd_ joined #git
17:53 slick joined #git
17:53 digitalpeer joined #git
17:53 Fmqpj joined #git
17:56 toogley joined #git
17:57 netj joined #git
17:58 lmat What's the best way to watch the logs incessantly? I have  git lola   to show the graph, but I would like to show it "real-time" updating, etc.
17:58 jimi_ joined #git
17:58 AlexRussia joined #git
18:01 Sendoushi joined #git
18:03 floatingpoint joined #git
18:03 nofacade joined #git
18:03 Psychiatrist joined #git
18:05 artgoeshere joined #git
18:06 b1tchcakes joined #git
18:06 artgoeshere joined #git
18:07 sargas joined #git
18:08 choki joined #git
18:09 t0by joined #git
18:09 marc_v92 joined #git
18:10 ochorocho__ joined #git
18:12 Sendoushi joined #git
18:12 sargas joined #git
18:13 interne7y joined #git
18:14 kpease joined #git
18:14 Musok joined #git
18:15 Mowgli joined #git
18:16 drodger joined #git
18:16 kpease joined #git
18:16 edude03 joined #git
18:17 Sendoushi joined #git
18:17 KevinMGranger Is there a way to make git output patch files that will work the the vanilla patch command, not just git am or git apply?
18:17 grawity they already do
18:17 grawity and if git happens to output some of its specific features... those work with patch too, as long as it's up-to-date.
18:18 grawity other than that, they're regular unified diffs
18:19 Sendoushi joined #git
18:21 settermjd joined #git
18:22 Sendoushi joined #git
18:22 drbean_ joined #git
18:23 cdg joined #git
18:24 MattMaker joined #git
18:24 KevinMGranger Ah I needed --no-prefix on format-patch, that was it
18:24 MattMaker joined #git
18:25 ochorocho__ joined #git
18:27 dsantiago joined #git
18:30 nwkj86 joined #git
18:31 Musok joined #git
18:32 grawity no, you needed -p1 on `patch`
18:32 holodoc joined #git
18:34 AfroThundr joined #git
18:34 KevinMGranger Well it worked with --no-prefix and -p0, so almost the same thing. Now I need to figure out how to tell rpmbuild to pass along -p1, but that's not a git question
18:34 deryni joined #git
18:34 multi_io joined #git
18:35 mehola joined #git
18:36 dunpeal joined #git
18:36 ochorocho__ joined #git
18:36 dunpeal How do I check if a particular file is tracked?
18:36 grawity well, given that *most* patches (that I've seen, at least) have a path prefix, I'd expect rpmbuild to have an option for that
18:36 orbitphreak dunpeal: git status
18:36 nnyk_ joined #git
18:36 grawity I mean, even outside git, people do `diff -R -u foo.old/ foo/`
18:37 KevinMGranger Yes, but it seems to imply that you should just use %autosetup, I *don't* think you can specify, but I'm probably wrong
18:37 osse dunpeal: git ls-tree HEAD path/to/file  works
18:37 osse git log -- path/to/file
18:38 dunpeal osse: thanks, that worked.
18:38 satifant joined #git
18:40 ceaucari joined #git
18:40 drodger joined #git
18:41 dunpeal left #git
18:41 choki joined #git
18:42 crose joined #git
18:43 watabou joined #git
18:43 rgrinberg joined #git
18:43 settermjd joined #git
18:43 tvw joined #git
18:45 BoosterV2 joined #git
18:45 BoosterV2 left #git
18:46 howdoi joined #git
18:48 MattMaker joined #git
18:48 tmz joined #git
18:48 SwiftMatt joined #git
18:48 KevinMGranger (for those wondering, I was wrong, %autosetup itself has a -p option)
18:51 holodoc joined #git
18:52 AfroThundr joined #git
18:54 d0nn1e joined #git
18:55 chilversc joined #git
18:55 chilversc can I configure git to normalize the line endings in the working files when I commit changes to them?
18:56 ojacobson man gitattributes
18:56 gitinfo the gitattributes manpage is available at http://jk.gs/gitattributes.html
18:56 ahmedelgabri joined #git
18:56 mrkv joined #git
18:58 d4rklit3 joined #git
18:58 fracting joined #git
18:58 bittin joined #git
18:59 paul424 joined #git
19:01 pwnz0r joined #git
19:03 Matrixiumn joined #git
19:03 t0by joined #git
19:04 realz_ joined #git
19:04 MasterBob joined #git
19:07 chilversc right, I have '* text=auto' but if on windows I check in a file that is using LF it's not changed to use CRLF for consistency
19:07 chilversc even more annoying is when it have mixed line endings
19:08 eletuchy joined #git
19:10 Sendoushi joined #git
19:10 apricity joined #git
19:10 eletuchy_ joined #git
19:11 nevodka joined #git
19:12 apricity after i do a "git clone blah", how do I detect if anything new is available via "git pull". I was thinking git status, but i think that is only local changes.
19:13 _ikke_ correct
19:13 ojacobson immediately after git-clone, the new clone's origin/ remote-tracking branches will exactly match the original repo
19:13 ojacobson longer term, `git fetch origin` will keep the remote-tracking branches up to date
19:13 chilversc git fetch will download changes from the remote but it won't merge them in to your local
19:13 chilversc pull is a shortcut for fetch then merge
19:14 eletuchy joined #git
19:14 lmat apricity: git fetch --all ?
19:14 lmat apricity: Then see if your local branch is different from upstream.
19:14 interne7y joined #git
19:16 nnyk_ joined #git
19:16 axiom_1 joined #git
19:17 eletuchy_ joined #git
19:17 stuh84 joined #git
19:18 t0by joined #git
19:18 apricity ok so i do git fetch origin ... then i do git status and it says my branch is behind by 1 commit... any way to see what files are going to come over if i do the git pull
19:18 shinnya joined #git
19:19 Literphor joined #git
19:19 ojacobson git diff HEAD...@{upstream}
19:20 ojacobson and git diff @{upstream}...HEAD will show the converse (changes you haven't pushed yet)
19:20 ochorocho__ joined #git
19:20 ojacobson you could alias those as git incoming and git outgoing resp
19:20 basiclaser joined #git
19:20 eletuchy joined #git
19:20 ril joined #git
19:21 _MasterBob_ joined #git
19:21 Sendoushi joined #git
19:22 MasterBob left #git
19:22 nilg joined #git
19:23 kpease joined #git
19:24 eletuchy_ joined #git
19:25 apricity in a normal workflow do you have to 'git fetch origin'  before doing git diff HEAD...@{upstream}
19:26 preaction it sounds like a good idea to do that, yes
19:26 |meta joined #git
19:27 kpease joined #git
19:27 fees joined #git
19:27 SteffanW joined #git
19:27 eletuchy joined #git
19:28 dreiss joined #git
19:28 crose joined #git
19:29 pwnz0r joined #git
19:30 stuh84 joined #git
19:30 ojacobson apricity: if you want to compare HEAD to the latest state of the upstream branch, yes
19:30 ojacobson git never automatically consults a remote repo; there's always a fetch step
19:30 eletuchy_ joined #git
19:30 ojacobson even git-pull (which automatically runs git-fetch for you)
19:31 jstimm_ joined #git
19:32 eletuch__ joined #git
19:32 apricity cool so in git diff HEAD...@{upstream},  @{upstream} represents the latest remote repo and HEAD refers to the HEAD branch in your local repo?
19:32 [Brain] joined #git
19:33 ojacobson if master tracks origin/master, and you're on master, then @{upstream} resolves to origin/master
19:33 ojacobson if you're on some other branch, it may resolve to something else
19:34 GandalfTheWizard joined #git
19:35 eletuchy joined #git
19:36 apricity is there a difference between origin and origin/master?
19:37 ojacobson one names a repository, the other a branch within that repository (approximately)
19:37 eletuchy_ joined #git
19:38 tobiasvl well one is a remote repo and another is a remote-tracking branch fetched from that remote repo
19:39 tobiasvl at least the second part is kinda important to have straight
19:39 ojacobson fair
19:40 eletuch__ joined #git
19:41 apricity awesome, thanks
19:43 eletuchy joined #git
19:43 watabou joined #git
19:44 rgrinberg joined #git
19:44 eletuchy_ joined #git
19:44 arooni joined #git
19:45 xlegoman joined #git
19:46 neachdainn joined #git
19:47 floatingpoint joined #git
19:48 eletuchy joined #git
19:48 neachdainn Hey all. I have some sensitive information that was included in part of a file. Is filter-branch the best way to remove it or should I rebase?
19:48 neachdainn To be clear, the whole file shouldn't go, just a few lines
19:49 Sendoushi joined #git
19:50 eletuchy_ joined #git
19:50 MasterBob joined #git
19:51 _ikke_ How far ago?
19:51 _ikke_ recent or older?
19:51 eletuch__ joined #git
19:52 Matrixiumn joined #git
19:52 offlink joined #git
19:53 robotrolll joined #git
19:53 neachdainn About a year ago.
19:53 denimsoft joined #git
19:54 robotrolll_ joined #git
19:55 eletuchy joined #git
19:55 robotrolll__ joined #git
19:55 _ikke_ !bfg
19:55 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
19:56 neachdainn And that can remove just parts of files?
19:56 _ikke_ yes
19:56 neachdainn Awesome. I'll look into it. Thanks!
19:56 MasterBob left #git
19:57 _ikke_ Hmm
19:57 _ikke_ Looks like it can only replaces text, not remove it
19:57 _nwkj86 joined #git
19:58 eletuchy_ joined #git
19:59 Literphor joined #git
20:00 tyreld joined #git
20:00 _nwkj86 joined #git
20:01 eletuchy joined #git
20:01 NeverDie_ joined #git
20:02 eletuch__ joined #git
20:03 bittin joined #git
20:05 apricity I'm having a hard time getting sudo git clone ... to work with my ssh key. I get "Permission denied (publickey)" If I remove the sudo it works fine. and my private key is in ~/.ssh  called githun_rsa  and i have a config file ~/.ssh/config with the contents:
20:05 apricity Host github.com
20:05 apricity IdentityFile ~/.ssh/github_rsa
20:06 eletuchy_ joined #git
20:08 _ikke_ apricity: Not really recommended to pull with sudo in the first place, but ssh is picky about ssh key permissions
20:09 arooni_ joined #git
20:09 _ikke_ and if you run as sudo, you'll run as the root user, complete with homedir
20:09 eletuchy joined #git
20:11 apricity i see... well I would like to not use sudo I guess since it's not recommended, but how can i do this if i don't have permissions to write to the directory that i want to clone to without using sudo?
20:11 DrSlony joined #git
20:11 jhass apricity: clone to /tmp and sudo mv ?
20:12 DrSlony Hello, to check out four commits back I would use "git checkout HEAD~4", but how do I checkout 4 commits ahead?
20:12 _ikke_ who owns the directory?
20:12 _ikke_ usually better to fix permissions
20:12 _ikke_ DrSlony: git has no syntax for that
20:12 eletuchy_ joined #git
20:12 apricity drwxr-xr-x  8 root root 4096 Mar 18 13:29 scripts
20:12 DrSlony hm, so how do I go forward?
20:12 _ikke_ DrSlony: git log and find the hash
20:12 _ikke_ apricity: Does it need to be owned by root?
20:13 jhass DrSlony: also not possible since it a commit might have multiple childs
20:13 jhass which would it pick?
20:13 DrSlony _ikke_ but git log doesnt show me the commits ahead of the current one, even though im on a commit say 100 commits ago
20:13 apricity i dunno probably not, i have to talk to the server guy but i need to give him a reason why to change it probably
20:13 rivarun joined #git
20:14 jhass DrSlony: not for me :o
20:14 _ikke_ apricity: A reason being you need to be able to write to it
20:14 jhass which git log command do you use?
20:14 jhass git log master explicitly perhaps?
20:14 DrSlony jhass "git checkout HEAD~50" then do "git log"
20:14 DrSlony i didnt specify the branch
20:14 jhass yeah, doesn't do what you describe for me
20:14 DrSlony aah nice, "git log mastrer" shows all
20:15 thiago joined #git
20:15 jhass oh, I somehow read a "does show me" there
20:15 interne7y joined #git
20:16 eletuchy joined #git
20:16 DrSlony Another question, say I want to revert changes made to somefile.cc made by commit HEAD~50, how do I do that?
20:20 johnmilton joined #git
20:21 eletuchy_ joined #git
20:21 _ikke_ git apply $(git diff HEAD~50 HEAD~51 somefile.cc)
20:21 _ikke_ something like this
20:21 _ikke_ urg
20:22 jhass should just git checkout HEAD~50 -- somefile.cc work?
20:22 artem joined #git
20:22 _ikke_ no
20:22 jhass ah, yeah nvm
20:22 _ikke_ git diff HEAD~50 HEAD~51 somefile.cc | git apply -
20:23 eletuchy joined #git
20:23 artem left #git
20:25 tematibr joined #git
20:25 eletuch__ joined #git
20:26 jhass git revert -n HEAD~50; git reset; git checkout . ':!somefile.cc' perhaps
20:26 _ikke_ yeah, was thinking about that, but was thinking that just applying the reverse diff off that single file was easier
20:27 jhass yup, not too sure about it. I just can never remember the right order to pass to diff :P
20:27 _ikke_ normally it's <old> <new>
20:28 _ikke_ but now I did <new> <old>
20:28 arooni joined #git
20:28 eletuchy joined #git
20:28 ojacobson same order as cp
20:28 ojacobson from too
20:28 ojacobson s/too/to/
20:29 fscala joined #git
20:29 jhass git show -R HEAD~50 somefile.cc | git apply perhaps
20:30 livingstn joined #git
20:30 _ikke_ Don't forget the dash after apply
20:30 Oebele joined #git
20:30 DrSlony thanks you _ikke_ !
20:31 jhass mh, works without for me
20:32 _ikke_ ok
20:32 _ikke_ Does git apply also take the commit info git show gives you by default?
20:32 drodger joined #git
20:32 eletuchy_ joined #git
20:32 ribasushi joined #git
20:33 osse that's what git am is for!
20:33 osse i think
20:33 jhass yeah, doesn't for me
20:33 _ikke_ works for me
20:34 jason237 joined #git
20:34 eletuchy joined #git
20:35 chachasmooth joined #git
20:36 eletuch__ joined #git
20:38 johnmilton joined #git
20:39 ojdo joined #git
20:40 eletuchy joined #git
20:40 inflames joined #git
20:43 eletuchy_ joined #git
20:43 livingstn joined #git
20:43 settermjd joined #git
20:44 NeverDie joined #git
20:44 eletuch__ joined #git
20:46 tomog999 joined #git
20:46 alex1a joined #git
20:47 cyan__ joined #git
20:48 eletuchy joined #git
20:48 jeffreylevesque joined #git
20:49 natefur joined #git
20:49 eletuchy_ joined #git
20:52 fstd joined #git
20:53 eletuchy joined #git
20:54 yqt joined #git
20:54 codezomb joined #git
20:55 eletuch__ joined #git
20:57 thiago joined #git
20:58 eletuchy joined #git
20:58 tim joined #git
20:59 gigq_ joined #git
20:59 jstimm_ joined #git
21:00 eletuchy_ joined #git
21:00 e3 joined #git
21:00 e3 Hello, I am using gitk for viewing the commit tree. Is there an option to put all new commits which are not yet merged into my local master branch above my master branch?
21:00 neachdainn joined #git
21:01 _ikke_ git rebase master <branch>
21:01 _ikke_ (means you are rewriting history
21:02 alex1a_ joined #git
21:02 eletuchy_ joined #git
21:04 cd83x joined #git
21:05 cd83x joined #git
21:06 bruce_lee joined #git
21:06 bruce_lee joined #git
21:06 drodger joined #git
21:07 phy1729 There is a file in a repo that I need to make changes too and keep in a separate repo (that is unrelated except for this one file). Is there a good way to keep track of the file to make later merges (when upstream updates the file) easier?  (Actual situation is I need to make modifications to ansible's ec2 dynamic inventory script and keep that with my repo of ansible playbooks)
21:08 e3 _ikke_: Is that a kind of hack or an official work flow?
21:09 _ikke_ e3: official workflow
21:10 italoacasas joined #git
21:10 _ikke_ But it't not a good idea to rebase commits that you have already pushed
21:13 k3rn31 joined #git
21:14 italoacasas joined #git
21:14 sdothum joined #git
21:25 MacWinner joined #git
21:26 MacWinner hi, if I forked a repo a couple months ago from another project, and made no changes to my local copy, whats the best practice for pulling in all updates from the repo that I forked from?  basically making mine identitcal to theirs
21:26 MacWinner is it to create a pull request for myself for the differences between the repos?
21:27 bollullera joined #git
21:27 preaction MacWinner: add their repo as a remote, then pull from their remote and then push to yours
21:27 bollullera left #git
21:27 preaction generally, that remote is called "upstream"
21:28 MacWinner got it.. does this process pull in all their commits and logs as well?  or does it make it look like all the changes I pull in are just one big commit?
21:28 jaguarmagenta joined #git
21:28 preaction it pulls in commits as they are. unless you squash, which is a bad idea
21:32 tobiasvl MacWinner: !sync
21:32 gitinfo MacWinner: [!pull_upstream] To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/
21:33 rgrinberg joined #git
21:33 MacWinner perfect, thanks!
21:36 EvilPenguin joined #git
21:36 crayon joined #git
21:38 e3 _ikke_: Thank you very much.
21:39 mischat joined #git
21:42 mischat joined #git
21:45 eijk joined #git
21:45 drodger joined #git
21:46 italoacasas joined #git
21:49 Eoib joined #git
21:51 sdothum joined #git
21:52 zivester joined #git
21:57 drodger joined #git
22:00 TheVoid joined #git
22:03 clemf joined #git
22:04 boombatower joined #git
22:06 King_Hual joined #git
22:11 fstd_ joined #git
22:12 JJM joined #git
22:12 pwnz0r_ joined #git
22:16 sdothum joined #git
22:17 interne7y joined #git
22:18 nnyk_ joined #git
22:18 clemf joined #git
22:19 rgrinberg joined #git
22:22 cdown joined #git
22:28 sPiN joined #git
22:28 eletuchy joined #git
22:28 dreiss joined #git
22:29 morenoh149 joined #git
22:30 morenoh149 is there anyway to rebase but ensure the changes you make are applied at the top? when I rebase between two branches the changes I want end up in the middle (based off timestamp I presume)
22:31 hahuang65 joined #git
22:31 clemf_ joined #git
22:34 morenoh149 maybe I should rebase in the opposite direction
22:34 sPiN howdy all, i have a messy commit history.. i created a branch called development_cleanup and i now have a nice linear history over there...
22:35 sPiN what is the appropriate way to turn that temporary branches linear history into my development branches history?
22:35 ojacobson what do you want to do with the development branch's existing history?
22:35 sPiN i would like it overwritten with the linear one that resulted from rebasing
22:36 netj joined #git
22:37 sPiN im thinking i did this a bit backward, i should have make a backup branch and just rebased development directly and done a push -f
22:37 sPiN so do i need to sort delete development and rename this to development and push it with -uf or something?
22:40 hahuang65 joined #git
22:41 ribasushi joined #git
22:44 madewokherd joined #git
22:46 watabou joined #git
22:46 AfroThundr joined #git
22:49 jimi_ joined #git
22:53 ceaucari joined #git
22:54 xlegoman joined #git
22:56 hahuang65 joined #git
22:58 leonarth joined #git
23:04 ciampix joined #git
23:05 JJM joined #git
23:10 leonarth joined #git
23:11 jimi_ joined #git
23:13 cdg joined #git
23:13 ochorocho__ joined #git
23:14 diegoaguilar joined #git
23:14 EvilPenguin joined #git
23:15 diegoaguilar joined #git
23:18 interne7y joined #git
23:18 drodger joined #git
23:24 mablae_ joined #git
23:25 eletuchy joined #git
23:26 edude03 joined #git
23:29 jaguarmagenta joined #git
23:33 i7c morenoh149, rebase does not order anything by timestamp.
23:33 i7c You should read carefully how it works so you figure out which branch should be rebased onto which.
23:33 morenoh149 i7c: figured it out. you want to rebase in the right direction A -> B vs B -> A
23:34 i7c yes, indeed. Good.
23:38 Wotu joined #git
23:40 ffabi joined #git
23:41 b1tchcak_ joined #git
23:41 mattfoo joined #git
23:42 hahuang65 joined #git
23:44 www-bukolay-com joined #git
23:46 AfroThundr joined #git
23:47 zg joined #git
23:48 zg Let's say I clone a repository.  Then I make some changes to it.  But the repository that I cloned has updated, so now I'm behind the remote by a few commits.  How should I handle pulling in the latest changes from remote, and then applying my own changes?  What I currently do is `git stash`, then `git pull`, then `git stash pop`.  I'm wondering if this is appropriate, or if I should be doing something else instea
23:49 zg d.
23:50 i7c It's probably not because you might have done several commits while the remote repository (upstream) changed.
23:50 i7c So that's a quite messy way to handle this.
23:50 Noldorin joined #git
23:50 i7c There are basically two approaches: merging and rebasing.
23:50 i7c You can also configure pull to do either of those two, the default is merging.
23:51 zg I found `git rebase --autostash`
23:51 zg Is that what you're referring to?
23:51 ojacobson no; commit first
23:51 i7c zg, what ojacobson says. Commit your changes, fetch the remote, decide if you want to rebase or merge and do so.
23:52 ojacobson stash is a fancy way of committing your changes and uncommitting them later
23:52 i7c !rebase
23:52 gitinfo 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
23:52 i7c !merge
23:52 gitinfo 'git merge' takes two diverged lines of history (series of commits, e.g. on different branches), and recombines them with a "merge commit" on top. This creates an explicit record of you doing the merge, unless there were no local changes (which does a !fast_forward merge instead). If you don't need to keep a record like that, !rebase may produce easier-to-read history, but the two don't always mix well... see also !merge_vs_r
23:52 zg That's exactly what I'm looking for, rebasing
23:53 ojacobson rebasing your changes requires that you commit them first
23:53 ojacobson what you're doing with stash has a lot of the same results, but it's more awkward to work with
23:53 drodger joined #git
23:53 zg What's going on is that the remote is a central repository that includes work from several other people.  So when I finish my work, I can't simply push my changes to the central repo because others have committed their work.
23:54 i7c Yup
23:54 ojacobson yes; your project should have a policy on how best to integrate changes
23:54 ojacobson scm is not a replacement for communication or planning ;)
23:54 i7c https://git-scm.com/docs/git-rebase
23:54 ojacobson git has lots of tools; there's no one-right-way to do it
23:54 zg I'm reading that page now, thanks i7c
23:55 zg Thanks for the help guys/gals, I'll read up on rebase and merge
23:55 BIte_ joined #git
23:55 i7c good, read it, play around with it and come back with more questions. ;)
23:55 harleypig joined #git
23:55 ajm203_ joined #git
23:55 zg ;->
23:57 ffabi joined #git
23:57 mingrammer joined #git
23:57 kjnilsson joined #git
23:59 robinsmidsrod joined #git

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