Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-12

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

All times shown according to UTC.

Time Nick Message
00:00 s2013 joined #git
00:02 madewokherd joined #git
00:02 Orphis joined #git
00:04 Gsham joined #git
00:05 druonysus joined #git
00:05 dhollinger joined #git
00:07 theskillwithin joined #git
00:08 Kaisyu joined #git
00:09 g38 joined #git
00:10 Pluppz ah
00:10 gugah joined #git
00:12 g38 hello. I have a local git repo. I've run "git clean -f -x" and "git gc --aggressive" and all similar commands that I could find. Still the repo occupies significantly more disk space than a new local repo that I obtain by cloning this one (with "git clone --no-local myrepo myrepocloned"). And indeed "git rev-list --objects --no-walk -g --all" lists more objects in my original repo than in the clone. Can somebody explain this to me? and how do I get rid of the addi
00:12 g38 tional objects?
00:12 dsdeiz joined #git
00:12 dsdeiz joined #git
00:12 cyan__ joined #git
00:13 Goplat joined #git
00:16 astrofog joined #git
00:16 watabou joined #git
00:17 xaa joined #git
00:17 CheckDavid joined #git
00:20 Thorn joined #git
00:25 shgysk8zer0 joined #git
00:28 thiago joined #git
00:32 andrew710 joined #git
00:33 sonOfRa joined #git
00:34 Ryanar joined #git
00:38 gugah joined #git
00:39 rivarun joined #git
00:39 nanga joined #git
00:39 rwp joined #git
00:41 mehola joined #git
00:41 rwp left #git
00:41 krillr joined #git
00:44 Gsham joined #git
00:45 nanga joined #git
00:46 g38 left #git
00:48 blackjid joined #git
00:48 Gsham_ joined #git
00:49 mrpackethead joined #git
00:55 steven joined #git
00:57 Eugene Step 1: don't /quit
00:57 adino joined #git
01:01 rominronin joined #git
01:05 Noodlewitt joined #git
01:06 rizonz it seems I have no tree ?
01:06 rizonz # git merge upstream/master master
01:06 rizonz fatal: This operation must be run in a work tree
01:06 Derperperd joined #git
01:07 Gsham joined #git
01:07 thiago yes, it seems you have no tree
01:07 menip joined #git
01:08 cqi joined #git
01:09 jameser joined #git
01:09 rizonz ok, so erm, what now ?
01:09 Sasazuka joined #git
01:12 thiago how did you get that repository?
01:13 rizonz svn2git and then foked it
01:13 rizonz *forked
01:13 thiago how did you fork on the command-line?
01:14 rizonz no using gitlab
01:14 * rizonz checks now gitlab
01:14 thiago are you doing this on the server that runs gitlab?
01:14 rizonz yap
01:14 thiago ok, don't
01:14 rizonz ok
01:14 thiago next problem?
01:15 rizonz err ?
01:15 mmlb joined #git
01:15 Gsham joined #git
01:15 rizonz I need to get my fork on the git(*lab) server in sync
01:15 rizonz so that is why I do that
01:15 thiago ok, then do it
01:15 thiago just don't do it *on* the server
01:18 watabou joined #git
01:18 mmlb joined #git
01:18 rizonz ok, but where then ?
01:18 rizonz as the repo is there
01:18 rizonz my fork
01:19 rizonz so I want to update my own fork, check it out on my client and go from there
01:19 thiago clone it, operate, then push as necessary
01:19 rizonz yes, but again, if it's merged I want to update my fork on my git server
01:19 rizonz so I can checkout from there again and push... create merge, etc
01:19 mmlb joined #git
01:20 durham joined #git
01:21 thiago rizonz: clone, operate, push as necessary
01:23 rizonz thiago: ok, I think you don't understand me, check... I have some link for you where it's explained https://gitlab.com/gitlab-org/git​lab-ce/issues/18332#note_20855999
01:23 d1z joined #git
01:23 rizonz scroll on top as there is the request for what everyone likes to have
01:23 rizonz but is manual possible
01:24 thiago I'm not going to read gitlab documentation
01:25 thiago the point is: if you want to make any modification to the repository, first you have to clone it
01:25 rizonz thiago: no it's a situation
01:25 thiago what situation?
01:26 rizonz thiago: I already did that please read as you see there in the top posting what is happening, we want to have a fork that is up-to-date with it's master
01:26 rizonz upstream
01:26 rizonz on the git server
01:26 rizonz so I came across that one
01:27 thiago ok
01:27 thiago understood
01:27 thiago do you have a repository that is already up to date?
01:27 Rodya_ joined #git
01:27 hahuang61 joined #git
01:28 rizonz what I did, I forked it, I cloned it, changted it, pushed it, created a merge request to upstream (so where I forked from) and merged it... now I want to update my fork again on the git server
01:28 rizonz as it's upstream is changed
01:28 thiago push from the up to date to the server
01:28 rizonz I did
01:28 forrestv joined #git
01:28 thiago then it's now up to date, if you pushed correctly
01:28 rizonz but someone else could have made a MR too and I'm out of syn on my own repo
01:29 mellernoia joined #git
01:29 thiago that's out of our control
01:29 thiago is it up to date?
01:29 warthog9 joined #git
01:29 rizonz thiago: doesn't matter if it's out of control, I want to update my fork from it's upstream
01:29 ReptilianBrain joined #git
01:30 thiago clone upstream, then push it to your fork
01:30 rizonz but can't that be done on the git server itself ?
01:30 thiago not a good idea
01:30 rizonz I want to :P
01:30 rizonz as that will be way I work
01:30 thiago then change the way you work
01:31 todd_dsm joined #git
01:32 thiago why do you need a fork if you want it up-to-date with upstream?
01:32 thiago why can't you use upstream only?
01:32 adino joined #git
01:32 rizonz because I want to work on it's latest releases but from my own fork so I can see what has been changed
01:32 rizonz form there
01:33 rizonz *from
01:33 mmlb joined #git
01:34 durham joined #git
01:34 Nilesh_ joined #git
01:35 thiago sorry, I didn't understand that
01:35 thiago why do you need a fork that is equal to another repository?
01:35 mmlb joined #git
01:35 rizonz thiago: because administrative wise I like that
01:36 n-st joined #git
01:36 thiago why can't you push to your fork when you want to update it?
01:36 rizonz because I only want to push my own changed
01:36 rizonz *changes
01:37 thiago choose one: a) you want to push to your fork; or b) you want your fork to be up-to-date with the upstream
01:37 thiago one only, not both
01:38 rizonz why not ? I like to have my fork being synced with the upstream so I'm on the right track when I create a new branche to do some other things again
01:39 thiago because if you push, it's not up-to-date. It's diverged.
01:39 Sasazuka joined #git
01:39 thiago so when the script runs to make it up-to-date again, it'll discard your changes
01:39 thiago or it'll fail
01:39 thiago so you have to choose one only
01:39 yohnnyjoe joined #git
01:39 rizonz no againu... I want to update my fork, checkout locally and pushg
01:39 rizonz might need a rebase
01:40 thiago if you push to your fork, then a script on the server can't keep it up to date with the upstream
01:40 mmlb joined #git
01:40 rizonz why not ? I checked out after I sycned my fork
01:41 thiago because once you push your changes, the script either has to stop updating or it will discard your changes
01:41 UnnamedPlayer joined #git
01:41 thiago choose one of those options: a) keep up to date, but can't push; b) if you push, it won't update; or c) if you push, some time soon your changes will be lost
01:41 mmlb joined #git
01:41 rizonz thiago: no script, just one manual update
01:42 rizonz it doesn't do it constantly
01:42 bobdel joined #git
01:42 thiago the manual update is the same as the script
01:42 thiago git fetch /path/to/upstream +refs/heads/*:refs/heads/*
01:42 rizonz just when I decide to do some work, I sync my fork from it's upstream and gfo from there
01:42 rizonz whichj script ?
01:42 thiago that sript
01:42 thiago better yet: make your fork's origin remote exist, so you can run:
01:43 thiago git fetch origin; git prune origin
01:43 rizonz that ?
01:43 thiago ok, even better:
01:43 thiago delete your fork, and then recreate it with: git clone --mirror /path/to/upstream
01:43 thiago so you can update with a simple "git fetch"
01:44 rizonz yes and I lose all my earlier pushes
01:45 thiago yes
01:45 thiago just like you wanted
01:46 Ryanar joined #git
01:46 rizonz when I update I won't lose my pushes so my history
01:47 rchavik joined #git
01:47 thiago you said you wanted to
01:48 thiago when you update, you lose all your pushes because it updates to match upstream
01:48 nettoweb joined #git
01:48 thiago we've been over this
01:48 romerocesar joined #git
01:49 rizonz yeah I might have found something
01:49 rizonz thanks so far!
01:50 darkbit joined #git
01:50 nettoweb joined #git
01:53 ome joined #git
01:53 Xethron joined #git
01:54 mmlb joined #git
01:55 mrpackethead joined #git
01:56 mizu_no_oto joined #git
02:00 rewt how about a single local repo with both upstream and fork set as remotes; just have to make sure to not confuse which remotes each local branch is tracking
02:01 rewt that way you can fetch from upstream and push all to fork to keep it up to date with upstream
02:01 luhem joined #git
02:02 sbko joined #git
02:02 rewt rizonz ^
02:03 jwmann joined #git
02:03 jameser_ joined #git
02:03 rominronin joined #git
02:04 g__k__ joined #git
02:05 dodobrain joined #git
02:05 stick-sh_ joined #git
02:13 dreiss joined #git
02:16 luhem joined #git
02:17 luhem joined #git
02:17 thiago joined #git
02:18 Darren_ joined #git
02:19 watabou joined #git
02:20 svm_invictvs joined #git
02:20 burningBinary joined #git
02:23 finalbeta joined #git
02:24 dreaddymck joined #git
02:25 strugee joined #git
02:26 axisys joined #git
02:32 axisys joined #git
02:34 rizonz rewt: he mate!
02:34 rizonz yes doing that but I'm unsuire
02:34 rizonz I fetched upstream
02:35 rizonz rebased upstream/master
02:35 rizonz git pull
02:35 rizonz but I can't push to my own fork
02:35 Vampire0 joined #git
02:36 ubuntu-mate_ joined #git
02:36 rewt why not?
02:37 rizonz I get error occurred during unpacking on the remote end: unpack-objects abnormal exit
02:37 rewt that doesn't sound good
02:38 rizonz rewt: I did this http://www.matmoz.si/?p=487&lang=en
02:39 Sonderblade joined #git
02:40 todd_dsm joined #git
02:40 Vasistha joined #git
02:41 Vasistha I have specified a .gitattributes file, with one entry: testdir/ -merge
02:41 aw1 joined #git
02:41 Vasistha my expectation is that, any file within the directory testdir/ or any of its subdirectories, will be treated as a binary file, so merge operations will be marked as conflicted and no text merge should take place.
02:42 Vasistha However when I did a basic test, my text file testdir/foo/bar was merged as a text file with no conflicts.
02:46 danslo joined #git
02:46 d^sh joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:49 dave0x6d joined #git
02:50 Vasistha maybe I need to use ** instead - perhaps the manual's use of "paths underneath it" does not refer to subdirectories?
02:50 Derperperd joined #git
02:52 duderonomy joined #git
02:52 Vasistha testdir/** also does not match testdir/foo/bar :(
02:53 pks joined #git
02:54 axisys joined #git
02:55 zyrb joined #git
02:56 aavrug joined #git
02:57 aavrug joined #git
02:58 jameser joined #git
02:59 dreiss joined #git
03:00 hhee joined #git
03:01 jailbox joined #git
03:02 sdothum joined #git
03:04 rizonz rewt: should you always be able to push without commit ?
03:05 thiago you can only push a commit
03:05 thiago if you don't have any commits, it's an empty repository
03:06 rewt yeah, push just sends all your local commits that are not on the remote to the remote
03:06 rizonz yeah that is what I thought but how can you pulls push an upstream to your own repo then ?
03:06 rewt but as thiago said, if you don't have any unpushed commits, you can't really push anything
03:06 rizonz rewt: like here http://www.matmoz.si/?p=487&lang=en
03:07 thiago you can force-push, of course
03:07 rewt fetch is grabbing all commits that are on the remote to the local repo
03:07 thiago it's not pushing data, just changing the refs
03:07 rewt that ends up having commits locally that are not on the other remote
03:07 rewt pushing to the other remote ends up pushing those
03:08 ndim joined #git
03:09 Gsham joined #git
03:09 rewt force-push is pushing data; it's pushing a new commit that may not be a descendant of the tip of the branch on the remote and moving the ref to the tip of the pushed branch
03:09 drbean joined #git
03:10 rewt hmm, yeah, i suppose that doesn't need to be a new commit
03:10 rewt could be an ancestor of the tip
03:10 rizonz rewt: then he is missing the -f
03:10 rewt who?
03:10 rizonz rewt: guy of my link
03:10 rewt why?
03:11 DaniG2k joined #git
03:11 rewt the force-push mentioned here is a tangent
03:11 rewt the linked process is ok; it's merging the 2 branches and pushes the result
03:11 rizonz rewt: if you want to update your own repo @ gitlab you need to force that push
03:11 DaniG2k hello all, I have a question. I though I had created a branch for project I was working on but I didn't. I am wondering if I can move commit n to m to another branch somehow?
03:11 rewt rizonz, no
03:12 rizonz rewt: how can you push when there is no commit ?
03:12 rewt the fetch grabbed new commits
03:12 DaniG2k right now they are in the master breanch
03:12 thiago DaniG2k: sure. that's cherry-pick
03:12 dsantiago joined #git
03:12 rizonz ok
03:12 rewt those are now new commits in your local that are not in the remote
03:12 thiago then delete it from the old branch by resetting back
03:13 rewt DaniG2k, or create your branch at the tip, and reset master back to where it should be, and no need to cherry-pick
03:14 DaniG2k hmm I will try cherry picking
03:14 DaniG2k worried I'll mess it up
03:14 DaniG2k do I give it the full SHA?
03:15 rewt that's more steps to achieve the same end result
03:16 rewt you can shorten the SHA as long as it's unique in the repo
03:16 rewt first 5 or 6 characters should be plenty
03:17 wagle joined #git
03:17 ayjay_t joined #git
03:20 DaniG2k I am getting the error error: Cherry-picking is not possible because you have unmerged files.
03:21 DaniG2k what files do I need to merge?
03:21 watabou joined #git
03:21 rewt DaniG2k: git status
03:22 DaniG2k rewt so every time I cherry pick I need to git add .; git commit -m "Some message" ?
03:23 rewt no, that would commit all files, even ones you may not want to commit
03:23 Gsham joined #git
03:23 hexagoxel joined #git
03:24 rizonz rewt: ok trying again
03:24 rizonz cloning my own fork
03:24 rizonz fetch from upstream
03:24 rizonz then rebase
03:25 rizonz but I can't rebase to master ?
03:25 rizonz from baster i mean
03:25 rizonz *master
03:25 rizonz oh no I can
03:26 DaniG2k does cherry picking place the commit at the tail of a branch?
03:27 DaniG2k or can it be done by date
03:27 fahadash joined #git
03:27 Vortex35 joined #git
03:27 rizonz hell this takes some more work git :P
03:28 rewt DaniG2k, it copies the commit as is, including the author date, but with a new commit date, and puts it at the tip of the branch
03:28 rizonz rewt: why do I need to pull again after rebasing ?
03:28 DaniG2k jeez
03:29 DaniG2k so there's no way to put the git commits in order by date?
03:29 rewt rizonz, in case there's more commits in the forked repo, so it won't say your branch diverged
03:29 rewt rizonz, which would require a force-push, losing those other commits
03:29 rizonz rewt: e but pull doesn overwrite my rebase ?
03:29 rizonz otherwise it wants to merge >
03:30 rewt DaniG2k, they go in the order you cherry-pick them
03:30 jameser joined #git
03:30 rizonz meh I again get that error
03:30 rewt rizonz, pull is just fetch+merge; it fetches from fork-remote, and merges it in
03:30 hahuang61 joined #git
03:30 rizonz rewt: ah ok
03:31 rizonz rewt: when my own repo is the same as the upstream could it be that that error is normal ?
03:31 rizonz I think so
03:31 rizonz so the upstream has only my MR
03:32 wagle joined #git
03:32 Gsham joined #git
03:32 rewt rizonz, try a git fetch then a git status and see what that says
03:33 Vasistha I'm trying to test patterns in the .gitattributes file. Can anyone recommend an attribute that is really easy to use for testing patterns?
03:34 JamLau joined #git
03:34 JamLau left #git
03:35 rizonz rok
03:35 rizonz rewt: ^
03:35 sunri5e joined #git
03:35 rizonz rewt: need to install commandline tool
03:35 rizonz I'm using netbeans
03:35 mmlb joined #git
03:35 Vasistha oh ... I think I can use git-check-attr for this :)
03:35 a_thakur joined #git
03:35 rominronin joined #git
03:36 rizonz is git-scm the base of git ?
03:36 rewt rizonz, so all this time you were translating git commands to a gui tool and using that instead?
03:36 a_thakur_ joined #git
03:36 rewt https://git-scm.com/
03:36 Vasistha oh drat, it's not available in my git 1.7.10.4 ... uh maybe I should find that documentation for this git version
03:37 rizonz rewt: checking out what it does and how
03:38 rizonz rewt: why not ? :)
03:39 rewt you could've mentioned it in the beginning
03:40 rewt saying that a git command is giving errors when you're using something else is quite misleading to others trying to help
03:41 DaniG2k rewt: ok I think I got it. I ended up downloading Tower and doing it visually :)
03:41 DaniG2k I need to send this to someone. Do I git bundle it and send it as a .bundle file?
03:42 rewt that's an option
03:43 DaniG2k if I bundle, does it bundle master and my branch?
03:43 DaniG2k or just a branch?
03:44 Rodya_ joined #git
03:45 rewt not sure; i haven't used that before
03:45 rizonz rewt: it's up-to-date
03:45 rizonz so it cannot commit :)
03:45 rizonz erm push
03:46 Gsham joined #git
03:46 mizu_no_oto joined #git
03:51 Derperperd joined #git
03:52 fstd_ joined #git
03:53 chachasmooth joined #git
03:54 _0xbadc0de joined #git
03:54 thiago joined #git
03:56 rizonz I need a shower
03:57 Gsham joined #git
03:58 andrew710 joined #git
03:59 mizu_no_oto joined #git
04:01 jameser joined #git
04:02 subhojit777 joined #git
04:02 sargas joined #git
04:02 davimore__ joined #git
04:05 mehola joined #git
04:10 g__k__ joined #git
04:13 raspado joined #git
04:15 dreiss joined #git
04:17 mizu_no_oto joined #git
04:18 jeffreylevesque joined #git
04:18 fatalhalt joined #git
04:18 phanimahesh joined #git
04:22 watabou joined #git
04:22 justanotheruser joined #git
04:25 bill99 joined #git
04:26 duderonomy joined #git
04:27 Limes__ joined #git
04:27 Motoko joined #git
04:29 Peuc joined #git
04:31 joshszep joined #git
04:31 sdothum joined #git
04:36 axisys joined #git
04:37 dreiss joined #git
04:38 ahr3n joined #git
04:46 rewt joined #git
04:50 mgedmin joined #git
04:51 sdothum joined #git
04:52 Derperperd joined #git
04:54 luhem7 joined #git
04:59 mrpackethead joined #git
05:01 davimore_ joined #git
05:03 raspado joined #git
05:06 rominronin joined #git
05:08 sbulage joined #git
05:09 Mowgli joined #git
05:12 romerocesar_ joined #git
05:15 lindenle joined #git
05:15 wagle joined #git
05:16 romerocesar joined #git
05:18 star_prone joined #git
05:20 n-st joined #git
05:20 subhojit777 joined #git
05:25 d1z joined #git
05:25 sdothum joined #git
05:27 icey joined #git
05:27 icey joined #git
05:30 wagle joined #git
05:30 elsevero joined #git
05:31 hahuang61 joined #git
05:34 wagle joined #git
05:36 thiago joined #git
05:37 MrWoohoo joined #git
05:37 bket joined #git
05:37 JanC_ joined #git
05:38 theoceaniscool joined #git
05:45 Cabanossi joined #git
05:46 luhem joined #git
05:52 axisys joined #git
05:52 rkazak joined #git
05:52 romerocesar joined #git
05:54 Derperperd joined #git
05:54 Wulf joined #git
05:55 ayogi joined #git
05:55 safe joined #git
05:55 wagle joined #git
05:59 seitensei joined #git
06:00 wagle joined #git
06:02 jon-mac joined #git
06:06 drbean_ joined #git
06:07 Derperperd joined #git
06:08 drbean- joined #git
06:08 seitensei joined #git
06:09 Gloomy joined #git
06:10 drbean joined #git
06:14 cqi joined #git
06:15 drbean_ joined #git
06:16 qt-x joined #git
06:22 drbean joined #git
06:26 drbean_ joined #git
06:27 rscata joined #git
06:27 jfr joined #git
06:28 drbean- joined #git
06:28 brent__ joined #git
06:29 drbean| joined #git
06:32 drbean joined #git
06:32 hahuang61 joined #git
06:34 overlord_tm joined #git
06:35 axisys joined #git
06:35 ki0 joined #git
06:35 tuor joined #git
06:36 drbean_ joined #git
06:38 marchelly joined #git
06:38 rominronin joined #git
06:38 durham joined #git
06:39 drbean joined #git
06:41 tuor joined #git
06:42 drbean- joined #git
06:42 phanimahesh joined #git
06:43 blackwind_123 joined #git
06:43 sbulage joined #git
06:43 drbean_ joined #git
06:44 drbean joined #git
06:45 axisys joined #git
06:46 ThomasLocke joined #git
06:46 ThomasLocke joined #git
06:48 tuor joined #git
06:49 drbean_ joined #git
06:50 n-st joined #git
06:50 [0xAA] joined #git
06:51 drbean joined #git
06:51 arnas joined #git
06:51 diogenese joined #git
06:51 arnas hey guys
06:52 arnas I've accidently pushed changes to the wrong branch, how can I revert this?
06:53 foliage checkout branch -> reset to before push -> force push branch
06:53 foliage assuming the branch your pushing to isn't shared, then you would likely not want to rewrite the history
06:53 arnas foliage, I tried git reset <commit id> and then git push, but then it says I need to do git pull first
06:53 BlessJah git push --force-with-lease <remote> <before>:<branch>
06:54 arnas BlessJah, what's remote and before?
06:54 drbean_ joined #git
06:55 BlessJah before is what was on branch (hash) and remote is usually origin
06:55 foliage interesting
06:55 foliage arnas, `git remote -v`
06:56 arnas BlessJah, so before is commit id?
06:56 BlessJah yep
06:56 arnas BlessJah, ok, let's see
06:56 Noodlewitt joined #git
06:57 drbean joined #git
06:57 BlessJah foliage: the : notation allows you to push arbitrary commit to arbitrary branch, without need to fix local branches
06:57 arnas BlessJah, you sure you wrote it correctly? because it says 'commit id' does not appear to be a git repository
06:58 Noodlewitt joined #git
06:58 BlessJah remote commit:branch
06:58 BlessJah you must have typed 'commit branch' or sth
06:58 cyan__ joined #git
06:58 drbean- joined #git
06:59 arnas BlessJah, git push --force-with-lease remote c22486d7bf2a075bfceb804a567​597e0d323b611:myBranchName
06:59 arnas BlessJah, now it says that remove isn't a repo
06:59 Raging_Hog joined #git
07:00 BlessJah run 'git remote -v' and pick actual remote name
07:00 foliage great
07:00 arnas BlessJah, ok, I think that worked
07:00 BlessJah i.e. origin
07:00 dermoth joined #git
07:01 arnas BlessJah, yeah
07:01 dreiss joined #git
07:02 BlessJah now use foliage resets to fix your local branches
07:02 arnas BlessJah, I have one more problem. I have made commit 1 and then commit 2 and then pushed them. What I need to do now is remove the "commit 1" changes from that repo
07:02 arnas is it possible?
07:02 drbean joined #git
07:03 spacelord_ joined #git
07:03 BlessJah is commit1 or commit2 merge?
07:04 drbean_ joined #git
07:04 ayogi joined #git
07:05 Mowgli joined #git
07:05 arnas BlessJah, no, new features
07:06 BlessJah git rebase --interactive commit1^
07:07 zefferno joined #git
07:07 arnas what does that ^ do?
07:07 BlessJah parent, the commit that was before
07:07 BlessJah ofc checkout branch first
07:07 drbean joined #git
07:07 arnas BlessJah, hm, wait
07:08 star_prone joined #git
07:08 arnas BlessJah, so commit1 parent will be the commit before. What I need is to remove commit1 and only leave commit2 (which was AFTER commit1)
07:09 BlessJah yep
07:09 drbean_ joined #git
07:10 arnas BlessJah, I don't think it changed anything
07:10 BlessJah what did it say after you saved/closed?
07:11 arnas BlessJah, Successfully rebased and updated refs/heads/<branch name>.
07:11 arnas but commit1 is still there
07:11 arnas so is commit2
07:12 BlessJah then you made sth wrong
07:12 cdown joined #git
07:13 drbean- joined #git
07:13 arnas BlessJah, I did git rebase --interactive <commit1 id>
07:13 arnas BlessJah, oh, and I added ^ at the end
07:13 BlessJah commtid1^, the ^ is important
07:13 arnas BlessJah, yea, I didn't forget that
07:13 arnas BlessJah, git rebase --interactive c22486d7bf2a075bfceb804a567597e0d323b611^
07:13 arnas Successfully rebased and updated refs/heads/B2017-110-shopping-cart-request-stock.
07:14 BlessJah you had both commit1 and commit2, removed commit1 and saved?
07:14 bocaneri joined #git
07:14 yohnnyjoe joined #git
07:14 arnas BlessJah, noo, that's what I want to do - remove commit1 :D
07:15 BlessJah then do it, removing commit1 in editor that pops up will remove it frombranch
07:15 SwiftMatt joined #git
07:16 arnas BlessJah, ohh
07:17 arnas BlessJah, yea, that removed commit1
07:17 arnas BlessJah, but it's asking for git pull again
07:17 drbean joined #git
07:18 JeroenT joined #git
07:19 BlessJah run git fetch and git log --graph --oneline <branch> origin/<branch>
07:19 BlessJah and check why
07:19 arnas BlessJah, can't I just do force push?
07:19 drbean_ joined #git
07:20 zeroed joined #git
07:20 zeroed joined #git
07:20 arnas BlessJah, that line didn't give me any output
07:20 drbean- joined #git
07:21 gugah joined #git
07:21 romerocesar_ joined #git
07:21 lb1c joined #git
07:22 BlessJah you should find out why you need to force push first
07:22 * BlessJah has to go to work
07:22 arnas BlessJah, :(((
07:22 arnas not sure how to do it
07:23 drbean joined #git
07:23 bocaneri joined #git
07:24 jfr joined #git
07:24 jnewt joined #git
07:25 drbean_ joined #git
07:25 BlessJah others will help you, be patient
07:25 BlessJah it's 7AM in europe
07:26 arnas BlessJah, if I do git pull, then git rebase --interactive c22486d7bf2a075bfceb804a567597e0d323b611^ and then remove 2 commits, it's asking to git pull again
07:26 arnas BlessJah, it's 9:30 here, and I am in europe :D
07:27 thiago joined #git
07:28 drbean- joined #git
07:28 rominronin joined #git
07:29 akkad joined #git
07:29 BlessJah arnas: is this the same branch that we've fixed earlier?
07:30 sbulage joined #git
07:30 arnas BlessJah, well, I "copied" that branch to a new branch with a different name, then we fixed that first branch, now I'm fixing this copied branch
07:30 arnas BlessJah, it's like... I had branch1 and made commit1 and commit2 to it. Then I made branch2 out of branch1, then we fixed branch1, now I need to fix branch2
07:31 drbean joined #git
07:31 BlessJah then use push --force-with-lease trick again, now with new branch
07:31 navidr joined #git
07:31 arnas BlessJah, so do that git rebase thing and then force with lease?
07:32 Nilesh_ joined #git
07:33 wagle joined #git
07:34 BlessJah yep
07:34 drbean_ joined #git
07:35 Gloomy joined #git
07:35 arnas BlessJah, yay, I think it worked. Thank you!!!
07:35 FSadino joined #git
07:36 AndChat|513876 joined #git
07:37 jknetl joined #git
07:37 drbean joined #git
07:40 drbean_ joined #git
07:41 Arguggi joined #git
07:42 drbean joined #git
07:43 JeroenT_ joined #git
07:44 drbean- joined #git
07:46 drbean| joined #git
07:46 Arguggi joined #git
07:46 stick-shift joined #git
07:47 star_prone joined #git
07:49 ihradek joined #git
07:49 Rodya_ joined #git
07:50 drbean joined #git
07:51 Sceorem joined #git
07:51 Mowgli joined #git
07:52 drbean_ joined #git
07:54 drbean- joined #git
07:56 Arguggi joined #git
07:57 drbean joined #git
07:57 rorro joined #git
07:58 JeroenT joined #git
07:59 jagob joined #git
07:59 drbean_ joined #git
08:00 Tobbi joined #git
08:01 silnp joined #git
08:01 rivarun joined #git
08:02 wagle joined #git
08:02 theoceaniscool joined #git
08:03 luhem joined #git
08:04 a_thakur joined #git
08:06 drbean joined #git
08:07 a_thaku__ joined #git
08:07 drbean_ joined #git
08:09 drbean- joined #git
08:11 Thorn joined #git
08:12 jnavila joined #git
08:12 drbean joined #git
08:12 csk157 joined #git
08:13 wrouesnel2 joined #git
08:14 danslo joined #git
08:16 PHPanos joined #git
08:16 drbean_ joined #git
08:17 howitdo joined #git
08:17 drbean joined #git
08:19 TomyWork joined #git
08:19 drbean- joined #git
08:20 eduardas_m joined #git
08:21 drbean_ joined #git
08:22 drbean joined #git
08:22 maret joined #git
08:24 drbean- joined #git
08:25 drbean| joined #git
08:28 drbean joined #git
08:30 drbean_ joined #git
08:30 mahakal joined #git
08:30 Snugglebash joined #git
08:32 PHPanos joined #git
08:32 hahuang61 joined #git
08:33 kexmex joined #git
08:33 djb-irc joined #git
08:34 drbean joined #git
08:37 drbean_ joined #git
08:40 drbean joined #git
08:41 acetakwas joined #git
08:42 drbean_ joined #git
08:43 Balliad joined #git
08:43 kurkale6ka joined #git
08:43 drbean- joined #git
08:44 d1z joined #git
08:45 drbean| joined #git
08:46 lindenle joined #git
08:46 drbean joined #git
08:50 aidalgol joined #git
08:50 djb-irc joined #git
08:51 Alienpruts joined #git
08:51 sea-gull joined #git
08:53 elect joined #git
08:53 govg joined #git
08:55 aarobc joined #git
08:56 rockfruit left #git
08:58 elsevero joined #git
09:00 thierryp joined #git
09:01 Alienpruts joined #git
09:01 moei joined #git
09:08 thiago joined #git
09:09 PHPanos joined #git
09:09 deepy joined #git
09:12 finalbeta joined #git
09:12 Panacea joined #git
09:14 ahr3n joined #git
09:15 garethdaine joined #git
09:15 troulouliou_div2 joined #git
09:21 romerocesar joined #git
09:22 borkr joined #git
09:22 borkr joined #git
09:24 zeroed joined #git
09:24 zeroed joined #git
09:24 Brando753-o_O_o joined #git
09:24 marcogmonteiro joined #git
09:25 Saturn812 joined #git
09:25 PioneerAxon joined #git
09:27 donught joined #git
09:27 star_prone joined #git
09:28 hhee2 joined #git
09:32 mikecmpbll joined #git
09:32 star_prone joined #git
09:33 mehola joined #git
09:33 mehola joined #git
09:34 ki0 joined #git
09:34 dersand joined #git
09:36 bongjovi joined #git
09:37 Snugglebash joined #git
09:38 astrofog joined #git
09:39 _xor joined #git
09:39 Shashikant86 joined #git
09:39 Darcidride joined #git
09:41 midnightmagic joined #git
09:43 xaa joined #git
09:49 nostrora joined #git
09:49 csk157 joined #git
09:50 hhee joined #git
09:51 robmozart_____ left #git
09:51 mehola joined #git
09:53 manuelschneid3r joined #git
09:53 chll_ joined #git
09:57 jknetl joined #git
09:58 netj joined #git
09:59 mischat joined #git
09:59 cbegin joined #git
10:02 ferr1 joined #git
10:03 krs93 joined #git
10:03 zeroed joined #git
10:03 zeroed joined #git
10:07 wrouesnel2 joined #git
10:10 maret joined #git
10:10 Serpent7776 joined #git
10:12 afuentes joined #git
10:19 dodobrain joined #git
10:20 navidr joined #git
10:20 bobsterman joined #git
10:22 medeirosthiiago joined #git
10:23 elect joined #git
10:24 ph88^ joined #git
10:24 ph88^ does git have an api for programmers ?
10:26 BlessJah git is a tool, not a library, but you may be interested in plumbing commands
10:29 tirej joined #git
10:29 nettoweb joined #git
10:30 brent__ joined #git
10:30 maret joined #git
10:31 heftig I wish @{u} had an easier-to-type alias
10:31 heftig perhaps i need to add a global alias to my shell...
10:32 rnsanchez joined #git
10:33 hahuang61 joined #git
10:34 a_thakur joined #git
10:34 timlyo[m] left #git
10:34 mtso[m] left #git
10:34 Mher[m] left #git
10:34 Tiaan[m] left #git
10:34 Carlos[m] left #git
10:34 scrambo[m] left #git
10:34 eltopo[m] left #git
10:34 samwise[m] left #git
10:34 Ineentho[m] left #git
10:34 WillianPaiva[m] left #git
10:34 M-mistake left #git
10:34 malo[m] left #git
10:34 mei[m] left #git
10:34 Start[m] left #git
10:34 M64137[m] left #git
10:34 kjsage[m] left #git
10:34 davix[matrix] left #git
10:34 govg joined #git
10:36 zeroed joined #git
10:36 zeroed joined #git
10:36 Anja_ joined #git
10:40 donught joined #git
10:42 aw1 joined #git
10:45 a_thakur_ joined #git
10:48 done joined #git
10:50 sawk joined #git
10:53 gajus joined #git
10:55 Impaloo joined #git
10:57 thiago joined #git
10:58 medeirosthiiago joined #git
10:59 YuGiOhJCJ joined #git
10:59 FaTony joined #git
10:59 govg joined #git
11:00 FaTony does Git understand Unix symbolic links on Windows?
11:02 donught joined #git
11:08 mgedmin joined #git
11:08 grawity the native NTFS kind? not yet, no
11:09 tvw joined #git
11:09 nicknight joined #git
11:09 Mikerhinos joined #git
11:10 serialoverflow joined #git
11:12 IndigoTiger joined #git
11:12 Darcidride joined #git
11:16 Guest33068 left #git
11:17 JeroenT joined #git
11:18 SwiftMatt joined #git
11:19 FaTony left #git
11:20 mischat joined #git
11:21 mischat joined #git
11:23 romerocesar joined #git
11:26 n-st joined #git
11:26 Snugglebash joined #git
11:26 csk157 joined #git
11:28 _ikke_ It requires admin privileges by default to use
11:28 jknetl joined #git
11:31 zeroed joined #git
11:31 dsdeiz joined #git
11:31 dsdeiz joined #git
11:31 diogenese joined #git
11:35 platzhirsch joined #git
11:36 wendelmineiro joined #git
11:41 jameser joined #git
11:42 joki joined #git
11:43 Dazzyp joined #git
11:47 JeroenT joined #git
11:48 shashin joined #git
11:49 nicknight joined #git
11:49 mohabaks joined #git
11:50 maret joined #git
11:51 ertesx joined #git
11:54 lordjancso joined #git
11:55 nicknight joined #git
11:57 luhem joined #git
12:00 mgedmin but it's possible to turn that off somewhere and then it's _awesome_
12:00 mgedmin just add export MSYS=winsymlinks:nativestrict to ~/.bashrc and wheeee
12:01 nd joined #git
12:01 mgedmin (after the Local Security Policy -> Local Policies -> User Rights Assignment -> Create Symbolic links tweak)
12:02 mgedmin (might need a reboot or two because ~~windows~~)
12:03 marchelly Hi, I've decided to recreate bare repo for one web project and does next: rm -rf /home/git/myproject.git && cd webroot-dir && rm -rf .git && git init && git add . && git commit && git clone --bare --shared .git /home/git/myproject.git Next I'm running on another server git clone git@remoteserver:myproject.git and getting error http://pastebin.com/4cAMJrew Is there any cache pr so?
12:04 Darcidride joined #git
12:05 Guus_ joined #git
12:06 nostrora joined #git
12:06 Fabricio20 joined #git
12:08 rorro joined #git
12:08 Snugglebash joined #git
12:09 cdown joined #git
12:11 mischat_ joined #git
12:14 mohabaks joined #git
12:18 anitecki joined #git
12:19 anitecki Hello.
12:19 gitinfo anitecki: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
12:19 anitecki I've done git checkout --orphan HEAD, while I meant git checkout --detach HEAD
12:19 eihabarabia joined #git
12:20 anitecki My problem right now is that it really did created .git/refs/heads/HEAD
12:20 anitecki How can I undo this mess?
12:20 anitecki (It creae)
12:20 jast git update-ref -d refs/heads/HEAD; git checkout --detach HEAD
12:21 jast it goes without saying that update-ref -d should be used carefully :}
12:21 jast (but I said it anyway...)
12:22 jast actually, the second step might be meaningless, now. you might have to checkout --detach <branch you were on>
12:22 bauruine joined #git
12:23 anitecki jast: Thank you! It worked :)
12:23 jast great
12:24 anitecki It shouldn't have any more unexpected side-effects, right?
12:24 jast for future reference, you can use 'git checkout HEAD^0' to detach to save some typing
12:24 jast well, I can't think of any
12:24 davimore joined #git
12:25 anitecki Ok, thank you then. Have a nice day :)
12:25 jast you might want to have a quick look at 'git status' and check that it doesn't look really weird
12:25 anitecki \o
12:25 jast you too!
12:26 anitecki Looks alright, thanks
12:26 anitecki bye
12:26 anitecki left #git
12:27 noecc joined #git
12:28 zeroed joined #git
12:28 zeroed joined #git
12:30 mikecmpbll joined #git
12:30 n-st joined #git
12:32 cdown joined #git
12:32 mikecmpbll joined #git
12:34 hahuang61 joined #git
12:36 CussBot joined #git
12:37 Panacea joined #git
12:37 cao_ joined #git
12:39 JeroenT joined #git
12:41 jozwior_ joined #git
12:41 danslo joined #git
12:42 PHPanos joined #git
12:42 thiago joined #git
12:45 brent__ joined #git
12:52 maret joined #git
12:52 csk157 joined #git
12:53 sdothum joined #git
12:55 mischat joined #git
12:57 jameser joined #git
12:57 ojdo joined #git
12:58 byte512 joined #git
13:00 mischat_ joined #git
13:01 mischat joined #git
13:03 zeorin joined #git
13:03 zeorin !config
13:03 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
13:03 zeorin left #git
13:05 jozwior joined #git
13:06 Nilesh_ joined #git
13:07 synthroid joined #git
13:08 Gloomy joined #git
13:09 mischat_ joined #git
13:09 anonymuse joined #git
13:10 synthroi_ joined #git
13:10 marcogmonteiro joined #git
13:10 mischat_ joined #git
13:10 GodGinrai joined #git
13:13 csk157 joined #git
13:15 zyrb joined #git
13:15 Guest54781 joined #git
13:15 tristanp_ joined #git
13:15 mikecmpb_ joined #git
13:16 cyan__ joined #git
13:16 mutex__ joined #git
13:16 Nugget_ joined #git
13:16 jameser joined #git
13:17 Mobutils_ joined #git
13:17 rchavik joined #git
13:18 jrm joined #git
13:19 Neico joined #git
13:19 rt joined #git
13:20 TheOrangeOne joined #git
13:22 Brando753-o_O_o joined #git
13:23 pinkisntwell joined #git
13:24 pinkisntwell how do i get "git status" to show untracked files? I tried with "-u all" but it still doesn't show them
13:25 Serious8 joined #git
13:26 osse pinkisntwell: could it be that all your untracked files are ignored?
13:26 pinkisntwell osse: how do i check that? i tried "touch foobar242" and the file is now shown
13:27 jameser joined #git
13:27 pinkisntwell osse: ah, .gitignore has /*
13:27 pinkisntwell osse: wtf
13:27 osse pinkisntwell: try  'git check-ignore -v foobar242'
13:27 pinkisntwell anyway
13:27 osse ahh, ther eyou go
13:28 Mowgli joined #git
13:28 zivester joined #git
13:28 acetakwas joined #git
13:28 jozwior_ joined #git
13:30 _ikke_ also git ls-files -i --exlude-standard
13:31 osse pinkisntwell: what's wrong with pink? :(
13:31 osse she ded?
13:31 csk157 joined #git
13:31 pinkisntwell he's back in the hotel
13:31 pinkisntwell it's a song lyric
13:32 osse hmm
13:32 osse it was the band i thoguht it would be :p
13:32 osse but not the song
13:35 jameser joined #git
13:36 achadwick joined #git
13:38 King_Hual joined #git
13:38 King_Hual joined #git
13:38 zeroed joined #git
13:38 zeroed joined #git
13:41 _Patrick_ joined #git
13:43 cdleonard joined #git
13:43 Fabricio20_ joined #git
13:43 King_Hual` joined #git
13:44 Snugglebash joined #git
13:44 Guest41906 joined #git
13:44 Random832 joined #git
13:44 siddart joined #git
13:47 mohabaks joined #git
13:48 ShapeShifter499 joined #git
13:49 kexmex joined #git
13:49 RxMcDonald joined #git
13:49 RxMcDonald Hello, how do you add commit to someone else pull request?
13:50 RxMcDonald and push?
13:50 lindenle joined #git
13:50 maret joined #git
13:50 osse RxMcDonald: get permission to push to the branch the PR is created from
13:50 RxMcDonald So, I checked out the commit locally to a new branch
13:50 Rdc joined #git
13:50 Xatenev joined #git
13:50 Xatenev Hi
13:51 Xatenev We have a standard git repo and a deployment tool that just performs "git pull" on the server
13:51 Xatenev on the server it always says "git is ahead of origin/master 1290 commits"
13:51 Xatenev Why could that be?
13:51 RxMcDonald asse it's master
13:51 theoceaniscool joined #git
13:52 RxMcDonald osse: so just git push origin master?
13:53 RxMcDonald I'm on pr1 branch tho
13:53 osse RxMcDonald: git push origin pr1:master
13:53 RxMcDonald I just want to add a commit to this guy's pull request on master
13:53 RxMcDonald i checked out the pull request as pr1 locally
13:54 zeroed joined #git
13:54 zeroed joined #git
13:54 RxMcDonald osse: you sure it's going to work?
13:55 jeffreylevesque joined #git
13:55 jameser joined #git
13:55 osse RxMcDonald: if origin refers to "this guy"'s fork on github, and master is the branch the PR is from, and you are allowed to push to it, then yes
13:55 bauruine joined #git
13:56 RxMcDonald osse: I'm not allowed to push to it
13:56 osse then you cannot do it
13:56 RxMcDonald osse: I just want to add something to his pull request
13:56 RxMcDonald Yea it says it denied to my username
13:57 noecc joined #git
13:57 RxMcDonald Should I submit a new PR?
13:57 osse push your alternative branch somewhere, make him pull it a nd push to his fork
13:57 RxMcDonald osse: so just git push origin pr1 ?
13:57 osse no
13:57 RxMcDonald won't that submit a pull request?
13:57 osse not if origin refers to his repo
13:58 RxMcDonald Yes, shouldn't that submit a new PR?
13:58 Gsham joined #git
13:58 RxMcDonald So, where do you mean with somewhere else?
13:58 osse RxMcDonald: create your own fork
13:59 jameser joined #git
13:59 RxMcDonald And then submit a pull request of the whole fork?
14:00 osse basically you have to send him a PR
14:00 osse so he can update his own PR
14:00 RxMcDonald osse: yes but how do I do that from my fork?
14:00 RxMcDonald Can I just add another remote url and it will work?
14:00 osse yes
14:01 osse RxMcDonald: when you create your fork on github there will be instructions on how to add it as a remote to your existing local repo
14:01 King_Hual joined #git
14:02 RxMcDonald osse: but first merge it with master right?
14:02 osse yes sure
14:02 tirej joined #git
14:02 osse you have to send a PR to his master which where the only new commit is the one you want to add to his master
14:03 RxMcDonald How ?
14:03 RxMcDonald I don't want to add a merge commit
14:03 RxMcDonald Just my commit with the changes
14:04 alwyn joined #git
14:04 gaut85 joined #git
14:04 osse put that commit on top then
14:04 osse use rebase for that
14:04 alwyn Hi, is "git branch -a --list "branchname" supposed to not work for branches that aren't checked out locally?
14:04 alwyn Or am I doing it wrong? :)
14:04 RxMcDonald osse: can you be a little bit more specific?
14:04 Xatenev bump my question
14:04 alwyn Basically, I'm trying to see if a remote branch exists
14:05 Xatenev We have a standard git repo and a deployment tool that just performs "git pull" on the server
14:05 Xatenev on the server it always says "git is ahead of origin/master 1290 commits"
14:05 Xatenev Why could that be?
14:05 mgedmin afaiu git branch ignores remote branches if you don't ask for them (with -r)
14:05 osse Xatenev: maybe because pull has created 1290 merge commits
14:05 Xatenev osse: You mean conflicted commits?
14:05 Xatenev Otherwise I don't understand your sentence
14:05 osse RxMcDonald: how did you create the pr1 branch initially?
14:05 danslo joined #git
14:06 osse Xatenev: pull = fetch + merge
14:06 Xatenev Exactly
14:06 osse Xatenev: which means it might need to create a merge commit
14:06 Xatenev yea
14:06 Xatenev Oh
14:06 Xatenev I got you
14:06 csk157 joined #git
14:06 Xatenev It adds another commit on the stack that is not known to the local ones
14:06 alwyn mgedmin: shouldn't -a do that though? -a                      -- list both remote-tracking branches and local branches
14:06 RxMcDonald osse: nvm
14:06 osse Xatenev: simple to see the 1290 commits:  git log origin/master..master
14:07 Xatenev osse: So should we do a git push after performing a `git pull` in case a merge commit has been created?
14:07 mgedmin oh right
14:07 Xatenev osse: So the server is 'clean'
14:07 RxMcDonald osse: so, now that I did that, how do I submit a PR from my fork to his PR?
14:07 mgedmin alwyn: so does your pattern match the remote branches?
14:08 osse RxMcDonald: you submit a PR to his master
14:08 mgedmin alwyn: e.g. 'git branch -a --list foo' will match a local branch foo but not remotes/origin/foo
14:08 mgedmin git branch -a --list '*/foo' will match both
14:08 RxMcDonald osse: how ?
14:08 mgedmin er, no
14:08 rnsanchez_ joined #git
14:08 mgedmin the local one doesn't have a /
14:09 danslo joined #git
14:09 osse RxMcDonald: https://help.github.com/artic​les/creating-a-pull-request/
14:09 RxMcDonald osse: I'm on his repo and it asks me to select a different branch or fork
14:09 Ediz joined #git
14:09 mgedmin alwyn: what problem are you trying to solve?
14:10 RxMcDonald osse: Man I only have one branch, master, in my own repo
14:10 RxMcDonald I don't know how to specify that as pull request
14:10 Zamerick joined #git
14:10 osse read the guide
14:10 RxMcDonald osse: oh alright found it
14:10 Xatenev osse: Can you answer me quick on my question? I'll definetly leave you alone then. :P
14:10 Xatenev Sorry
14:10 sdothum joined #git
14:11 osse Xatenev: you should not pull automatically
14:11 osse Xatenev: pull is for humans
14:11 osse Xatenev: !deploy
14:11 gitinfo Xatenev: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
14:11 RxMcDonald it deosn't say forked from... though
14:11 alwyn mgedmin: I'm trying to make a simple bash script that checks out a user-specified branch (from remote) and runs some commands. In the script, I'm trying to verify if the branch specified on the command line actually exists on the remote.
14:11 Sceorem joined #git
14:11 RxMcDonald osse: man you didn't say I had to click fork this repo
14:12 mizu_no_oto joined #git
14:12 Xatenev osse: Well somewhere you have to do a git pull automatically
14:12 d1z joined #git
14:12 Xatenev osse: With a deployment tool.
14:12 osse RxMcDonald: "osse | RxMcDonald: create your own fork"
14:12 osse Xatenev: there are better alternatives. see the link
14:12 Xatenev Also what is stated in the link is not correct imho
14:13 Xatenev "merges cannot be guaranteed to complete without manual fixups"
14:13 mgedmin alwyn: perhaps if ! git rev-parse -q --verify remotes/origin/$branchname; then echo "no such branch"; fi
14:13 sdothum joined #git
14:13 Xatenev When pushing to the repo from a local environment f.e. you'd get a conflict if the merge couldnt be completed without manual fixups.
14:13 RxMcDonald osse: and wich one should I select for head and base?
14:14 alwyn mgedmin: for example if I do "git branch -r | grep "branchname" it works, but if I add --list it doesn't
14:14 alwyn mgedmin: that seems more complex than doing a grep :)
14:14 alwyn Let's see
14:14 Xatenev osse: I'll read the link on my way home today.
14:14 Xatenev osse: thank you for your help!
14:15 osse RxMcDonald: "Drop-down menus for choosing the base and compare branchesUse the base branch dropdown menu to select the branch you'd like to merge your changes into, then use the compare branch drop-down menu to choose the topic branch you made your changes in."
14:16 osse Xatenev: eg.   git fetch && git reest --hard origin/master  is already much better
14:16 RxMcDonald osse: cool, thanks
14:16 Ryanar joined #git
14:17 lordjancso joined #git
14:17 Xatenev osse: That would atleast make sure the live server is >always< and >definetly< on the branch state
14:17 osse yes
14:17 alwyn mgedmin: actually it's not that complex. Thanks!
14:17 Xatenev osse: thanks man
14:17 ExoUNX joined #git
14:18 sdothum joined #git
14:20 Xatenev left #git
14:22 snowkidind joined #git
14:22 sdothum joined #git
14:22 busta joined #git
14:27 csk157 joined #git
14:28 glnz joined #git
14:29 elvin|coder joined #git
14:29 thiago joined #git
14:29 Shentino joined #git
14:29 lss8 joined #git
14:29 lss8 joined #git
14:30 elvin|coder in "git flow" do I need to actually push the local changes to the remote server if I'm already done with the feature/hotfix and am ready to "git flow hotfix finish" it?
14:31 siuq joined #git
14:32 todd_dsm joined #git
14:32 RxMcDonald osse: didn't work btw, it created a new PR
14:32 canton7 elvin|coder, depends on your internal process. It's unlikely to be required, as the temporary feature/hotfix branches are typically deleted from the remote when you're done with them
14:32 RxMcDonald but it's ok I guess it wasn't possible
14:32 canton7 elvin|coder, ... but you may have a process which requires that those branches are reviewed before being merged
14:32 astrofog joined #git
14:32 osse RxMcDonald: that was my plan all along
14:33 osse RxMcDonald: you cannot update his PR, so you need to ask him to update his master. How do you do that? With a PR
14:33 RxMcDonald osse: alright, yea I guess it's not possible to add a commit to a PR
14:34 osse it is possible, but you don't have permission
14:35 hahuang61 joined #git
14:35 RxMcDonald alright
14:35 tobiasvl you need to have permission to push to the branch the PR is on
14:35 bschindler joined #git
14:36 maret joined #git
14:36 mischat joined #git
14:36 Panacea joined #git
14:37 bschindler Hi - is there a way to tell git to commit line endings as-is? I have data that needs to stay the way it is and there is no universal rule for what should have crlf or lf line endings
14:37 jimi_ joined #git
14:37 bremner bschindler: afaik that's the default
14:38 bremner at least on linux. Maybe there is some "smart" thing on windows
14:38 cdg joined #git
14:38 aavrug joined #git
14:38 bschindler I thought default is commit as lf... - I'm confused
14:38 bremner default is commit bytes as is
14:38 ianmethyst joined #git
14:40 cdown joined #git
14:41 chridal left #git
14:43 AaronMT joined #git
14:43 mischat joined #git
14:44 mohabaks joined #git
14:44 Serious8 joined #git
14:44 mischat joined #git
14:46 al-damiri joined #git
14:47 bschindler bremner: you are indeed right. So how can I use .gitattributes to make sure automatic line conversion is disabled for all files for all machines cloning it?
14:47 csk157 joined #git
14:48 maret joined #git
14:48 manuelschneid3r joined #git
14:49 bremner I don't know if that's possible. I rarely use gitattributes, maybe someone else knows better.
14:49 shinnya joined #git
14:50 danslo joined #git
14:51 rorro joined #git
14:51 netj joined #git
14:52 theoceaniscool joined #git
14:52 maret joined #git
14:54 gaut85 joined #git
14:54 r00twrh joined #git
14:54 manuelschneid3r joined #git
14:56 marchelly joined #git
14:57 Seveas bremner: the default on windows is to mess with your files
14:57 yehowyada joined #git
14:58 Seveas bschindler: look in the git-config documentation for core.autocrlf
14:58 elect joined #git
14:58 zeroed joined #git
14:58 zeroed joined #git
14:58 Seveas I believe you want to set it to false in that repo
14:59 Seveas (disclaimer: not a windows user, and I subscribe to the death-to-crlf way of thinking)
15:00 maret joined #git
15:01 ikelso joined #git
15:02 mikecmpbll joined #git
15:02 eihabarabia joined #git
15:03 cyberz joined #git
15:04 mindfart joined #git
15:04 Es0teric joined #git
15:05 Dougie187 joined #git
15:05 cousteau joined #git
15:06 mischat joined #git
15:07 tuantran joined #git
15:08 cousteau Say I decide to make experimental changes in my code.  I guess the way to go is to `git branch experiment; git checkout experiment`, then go crazy with the changes, test them, and eventually `git commit -a` them.
15:09 cdg_ joined #git
15:09 Murii joined #git
15:09 cousteau Then, if I want my original system as it was before this crazy idea I had... is it as simple as doing `git checkout master`?
15:09 mmlb joined #git
15:09 cousteau And that'll revert all the crazy changes I did, so that if I open the affected files in a code editor I'll see them as they were before the change?
15:10 newbie1 joined #git
15:10 canton7 yep
15:10 canton7 all correct
15:10 canton7 (although you can 'git checkout -b experiment', instead of separately creating the branch and checking it out)
15:11 zyrb joined #git
15:11 supercoolCode joined #git
15:11 cousteau ah nice :)  that need for two commands seemed a bit weird
15:12 osse you need the two commands if you ever want to create a branch but not check it out, or check out a branch that already exists :p
15:12 aghalarp joined #git
15:12 * cousteau has an `mkcd` function in his .bashrc because he's too lazy to mkdir and cd in two separate commands)
15:12 ash_workz joined #git
15:13 osse same
15:13 aghalarp joined #git
15:13 cousteau osse, yeah I'm not saying it doesn't make sense
15:14 LeBlaaanc joined #git
15:15 mptnt1988 joined #git
15:15 bannakaffalatta joined #git
15:15 mischat_ joined #git
15:16 efakj joined #git
15:16 cousteau damn, I must have some sort of dyslexia with the letters n and h or something... I just typed `mah git` in the command line
15:17 medeirosthiiago joined #git
15:18 yohnnyjoe joined #git
15:18 LionsMane joined #git
15:18 mischat_ joined #git
15:20 Es0teric joined #git
15:23 GuestTri joined #git
15:23 eduardas_m joined #git
15:26 GuestTri joined #git
15:26 star_prone joined #git
15:27 alhariel joined #git
15:27 GuestTri joined #git
15:29 HardlySeen joined #git
15:30 e14 joined #git
15:31 brent__ joined #git
15:33 Es0teric joined #git
15:35 VladGh joined #git
15:36 zivester joined #git
15:36 Gloomy joined #git
15:37 inovas joined #git
15:37 VladGh joined #git
15:37 mda1 joined #git
15:39 Es0teric joined #git
15:39 mohabaks joined #git
15:40 zyrb left #git
15:41 cjohnson I made a branch but I don't think I've made any commits in it. How can I tell where the branch came from?
15:41 cjohnson which branch I branched it from
15:42 osse cjohnson: you can't
15:42 nettoweb joined #git
15:42 cjohnson ok
15:43 canton7 you can look at the history visually, and it's often pretty obvious
15:43 canton7 see gitk, tig, or !lol
15:43 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:43 cjohnson if I haven't made a commit though I don't think it will show up will it
15:44 osse yes it will
15:44 canton7 yeah, it's there
15:44 aax joined #git
15:44 mischat joined #git
15:45 cjohnson cool got it figured out
15:45 mischat joined #git
15:49 Ryanar joined #git
15:50 Ryanar joined #git
15:53 guardian joined #git
15:55 Domhack joined #git
15:56 NYTimes joined #git
15:56 siddart_ joined #git
15:56 NYTimes hey
15:56 gitinfo NYTimes: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
15:56 NYTimes people
15:56 Es0teric joined #git
15:57 NYTimes git svn rebase => Checksum mismatch
15:57 NYTimes how would you fix that ?
15:58 cdleonard joined #git
15:59 inflames joined #git
15:59 overlord_tm joined #git
15:59 Travis-42 is there a way to clean up remote repositories that no longer exist (not branches, but repositories)?
16:01 mischat_ joined #git
16:04 GodGinrai joined #git
16:05 harry1 joined #git
16:05 harry1 left #git
16:05 morenoh149 joined #git
16:06 Es0teric joined #git
16:08 dreiss joined #git
16:08 cdown joined #git
16:14 GodGinrai joined #git
16:14 Seveas Travis-42: for remote in $(git remote); do git ls-remote $remote >/dev/null || echo git remote rm $remote; done
16:14 Seveas (remove the echo once happy with what it would do)
16:14 Travis-42 I guess that works, thank you Seveas!
16:15 s2013 joined #git
16:16 Tobbi joined #git
16:17 Darren_ joined #git
16:17 grilled-cheese joined #git
16:18 thiago joined #git
16:18 eduardas_m joined #git
16:19 hasc joined #git
16:19 morenoh149 how can I selectively merge several commits from one branch into another?
16:19 _ikke_ morenoh149: man git cherry-pick
16:19 gitinfo morenoh149: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html
16:21 MarkFletcher joined #git
16:22 Es0teric joined #git
16:22 brent___ joined #git
16:22 InfoTest joined #git
16:24 Es0teric joined #git
16:24 MapMan joined #git
16:25 morenoh149 _ikke_: this may be github related. But how would I open a PR that proposes to merge some commits of a branch into another branch?
16:26 Silox| joined #git
16:26 osse morenoh149: that sounds like a regular PR
16:26 MapMan Hi! Can someone help me troubleshoot this. I have a repo with a submodule on bitbucket. I have ssh key set up and linked with my bitbucket account. I can clone the repo using the key but not the submodule (says permission denieded (publickey)). If I try to clone the submodule outside of the repo, I can also clone it. So it only fails if I want to clone it as a submodule.
16:27 morenoh149 I guess I've never thought too deeply about this: What is a PR from gits point of view? I feel like git has no concept of a PR
16:27 _ikke_ morenoh149: I would create a new branch and cherry-pick all the commits you want to merge on that branch
16:27 osse morenoh149: correct
16:27 osse morenoh149: a PR is simply a "please merge this branch into that one".
16:28 _ikke_ man git request-pull
16:28 gitinfo the git-request-pull manpage is available at http://jk.gs/git-request-pull.html
16:28 _ikke_ (which does exactly what osse said)
16:30 Oebele joined #git
16:30 Mathieu_` left #git
16:31 Snugglebash joined #git
16:33 Es0teric joined #git
16:34 nevodka joined #git
16:35 hahuang61 joined #git
16:36 mohabaks joined #git
16:37 crose joined #git
16:38 Darcidride joined #git
16:39 madewokherd joined #git
16:43 iae joined #git
16:43 dviola joined #git
16:46 RxMcDonald left #git
16:46 invisbl_ joined #git
16:47 nevodka joined #git
16:51 thebope joined #git
16:51 Es0teric joined #git
16:51 svm_invictvs joined #git
16:52 PHPanos joined #git
16:53 cdown joined #git
16:53 z1haze_work joined #git
16:54 z1haze_work what does NO HEAD mean next to projects that I have cloned in git?
16:54 _ikke_ What do you mean with "next to projects"
16:55 star_prone joined #git
16:58 nevodka joined #git
16:58 boombatower joined #git
16:58 z1haze_work well in eclipse
16:58 z1haze_work but i guess that part isnt relavent
16:58 gugah joined #git
16:58 z1haze_work I guess it just stays no head until i commit and push to a branch?
16:59 jagob joined #git
16:59 qt-x joined #git
17:06 zeroed_ joined #git
17:07 jeffreylevesque_ joined #git
17:07 robotroll joined #git
17:07 Xarodon joined #git
17:07 durham joined #git
17:08 duderonomy joined #git
17:09 synthroid joined #git
17:09 rt joined #git
17:09 cjohnson what does git status say?
17:09 matsaman joined #git
17:10 JuliusN joined #git
17:10 spacemud joined #git
17:10 ski7777 joined #git
17:10 raspado joined #git
17:10 thinkpad joined #git
17:10 Khisanth joined #git
17:11 leeN joined #git
17:11 PHPanos joined #git
17:12 aavrug joined #git
17:12 Motoko joined #git
17:12 relrod_ joined #git
17:12 relrod_ joined #git
17:13 z1haze_work nothing added to commit but untracked files present
17:14 theoceaniscool joined #git
17:14 doener joined #git
17:15 mehola joined #git
17:16 ihradek joined #git
17:17 jccn joined #git
17:17 mischat joined #git
17:18 imachuchu joined #git
17:21 Jackneilll joined #git
17:22 minikN joined #git
17:22 moritz might happen if you have cloned an empty repo
17:23 chosafine joined #git
17:23 chosafine joined #git
17:24 cjohnson z1haze_work: if git status says it's fine I'd say it's fine. can't speak to eclipse
17:25 z1haze_work alright
17:25 anjen joined #git
17:28 cdg joined #git
17:29 multi_io joined #git
17:30 multi_io I want to create a commit and take all the metadata from another commit. Has someone written a utility/script to do that?
17:31 multi_io (all metadata except the sha1 of course)
17:31 canton7 multi_io, man git commit -C
17:31 gitinfo multi_io: the git-commit manpage is available at http://jk.gs/git-commit.html
17:31 canton7 iirc
17:32 multi_io canton7: ah
17:32 canton7 ok, so I don't think that'll take the committed name or date, but it'll take the message and author name/date
17:32 multi_io thanks
17:32 pks joined #git
17:32 multi_io hm
17:35 multi_io it doesn't take the committer name and time, apparently
17:35 multi_io it doesn take the committer name and time.
17:35 canton7 yep, like I said 3 mins ago :)
17:35 multi_io ah, yeah :)
17:36 multi_io it's good enough for my purposes
17:36 invisbl joined #git
17:36 invisbl joined #git
17:36 siddart_ joined #git
17:37 e14 joined #git
17:38 dhollinger joined #git
17:39 mehola joined #git
17:39 tang^ joined #git
17:40 romerocesar joined #git
17:41 sargas joined #git
17:41 svm_invictvs joined #git
17:46 GT4066 joined #git
17:47 zeroed joined #git
17:47 zeroed joined #git
17:48 dreiss joined #git
17:48 rivarun joined #git
17:49 cdown joined #git
17:49 z1haze_work i need a lesson in git i guess.. i have never really used via command line
17:49 z1haze_work I have cloned a specific branch of my repository
17:49 z1haze_work and now I have to work on something, and from what i can tell, every time there isa new 'ticket' to work on a new part of something, they branch it
17:50 z1haze_work My question is now that i have cloned the main 'develop' branch.. how do i get to/checkout the branch that i need to be on to work on this ticket
17:51 nedbat z1haze_work: first, you don't clone a branch, you clone a repo, and checkout the branch.  You have all the branches, it's just a matter of which one you are using at the moment
17:51 Tobbi joined #git
17:52 z1haze_work nedbat: thanks--but I ran git clone -b develop http://....
17:53 bamb joined #git
17:53 bamb left #git
17:53 nedbat z1haze_work: ok, i don't use that flag, but it looks like it just does a clone, and then a checkout.
17:53 neilthereildeil joined #git
17:53 lindenle joined #git
17:53 z1haze_work ah ok, maybe its shorthand
17:54 z1haze_work ok cool. So after I do this.. lets say i have a ticket im working on, am i supposed to create another branch for this specific ticket, then merge the branches?
17:54 neilthereildeil if there are many subsystems in a large project, what is the recommended way to deal with git? have multiple git repos, with a repo per subsystem, or have one large git with a branch for each subsystem?
17:54 z1haze_work it seems excessive to me - like we'd have 100 branches in a week
17:55 nedbat z1haze_work: first, git branches are really cheap, and lots of places work that way: a branch per task.
17:55 perlpilot neilthereildeil: the recommended way is that which works for you and your team  ;)
17:55 tang^ ^^
17:55 nedbat z1haze_work: you need to talk to your collaborators to see what their workflow is.
17:55 neilthereildeil im asking from your guys' experience :)
17:55 neilthereildeil what are the pros and cons of each?
17:55 tang^ we went with multiple repos
17:55 z1haze_work no one knows
17:55 tang^ that can work fine if you have a good project management solution (say maven or gradle) connecting all the pieces together
17:56 z1haze_work im probably the most experienced one with git her - we've inherited this project from another shop - we usually work with tfs
17:56 perlpilot neilthereildeil: I tend to favor multiple repos, but that's just me.
17:56 tang^ but really? you need to evaluate the project on your terms and decide which is better. there's no easy solution
17:56 Noldorin joined #git
17:56 neilthereildeil why do you all favor multiple repos?
17:57 nedbat z1haze_work: ok, then you can decide. know that git is fine with many branches.
17:57 neilthereildeil what usecase does multiple repos allow that multiple branches in a amonolithic repo doesnt?
17:57 nidr0x joined #git
17:57 dave0x6d joined #git
17:57 zeroed joined #git
17:58 perlpilot neilthereildeil: makes mixing and matching easier later.   Also, it's much easier to add a repo into another repo if you need it than it is to turn one repo into 2.
17:58 perlpilot neilthereildeil: but, multiple repos set nice clear boundaries.  that's why I favor them.
17:58 z1haze_work when i am trying to checkout the branch i need i get you are on a branch yet to be born
17:59 neilthereildeil what about releases?
17:59 nedbat z1haze_work: this is my main work repo: https://github.com/edx/edx-platform/branches  421 active branches
18:00 neilthereildeil im guessing releases would be easier because you can have a branch for v1 in each repo, and track the same release that way, right?
18:00 z1haze_work ok, well i think its fine with having lots of branches then :)
18:00 youser joined #git
18:00 perlpilot neilthereildeil: easier except for the coordination across repos, but yeah.
18:00 z1haze_work but i have cloned and checked out the develop branch, it says NO HEAD .. but now i realized what i need to have checked out is the branch associated to my ticket - how do i get to that?
18:01 thiago neilthereildeil: multiple repositories of the same codebase?
18:01 neilthereildeil otherwise in a monolithic repo, you'd have branch componenta-v1, componentb-v1. that wouldbe confuding
18:01 thiago z1haze_work: what is the branch's name?
18:02 neilthereildeil thiago: im thinking about using a repo for each subsystem of the same codebase rather than 1 monolithic rpo with a breach for each subsystem
18:02 neilthereildeil branch*
18:02 thiago neilthereildeil: so like the kernel does: each subsystem keeps their development trees in separate repos.
18:02 neilthereildeil yea exactly
18:02 thiago neilthereildeil: then linus pulls from them to make the release
18:02 _Cyclone_ joined #git
18:02 neilthereildeil yea thats prolly the best
18:02 thiago but they're different people
18:03 thiago people working on networking are not likely to work on SCSI
18:03 neilthereildeil but it has the issue of collisions found months after they are committed when linus is making a relaease
18:03 neilthereildeil the other way if a monolithic build where everyone commits to
18:03 thiago linus fixes them
18:03 neilthereildeil and if 1 engineer breaks it, everryone has to back out their changes
18:03 perlpilot neilthereildeil: like we said ... there are no easy answers.  :)
18:04 neilthereildeil yea, this is software engineering :)
18:04 z1haze_work do i need to include origin/branch name?
18:07 Discovery joined #git
18:08 multi_io z1haze_work: no
18:08 marchelly joined #git
18:08 multi_io z1haze_work: instead if git checkout origin/foo, just git checkout foo
18:08 thiago joined #git
18:09 multi_io (if that's what you're asking, I didn't follow the entire conversation)
18:09 multi_io *instead of
18:12 vdv joined #git
18:12 voldz1tic3n joined #git
18:13 strixx joined #git
18:13 adino joined #git
18:13 multi_io I want to checkout all files from a commit without checkout out the commit itself. How does that work? git checkout foo -- .   does nothing, strangely.
18:14 multi_io even though "git checkout foo -- something" works for any file or subdirectory "something"
18:16 multi_io hm, no wait, scratch that
18:17 z1haze_work another question :( i have created my new branch, commited a files, but now i want to push it i tried git push origin/my-new-branch and it tells me no upstream branch
18:17 lindenle joined #git
18:17 multi_io z1haze_work: git push origin my-new-branch
18:18 zeroed joined #git
18:18 kyan joined #git
18:18 z1haze_work origin does not appear to be a git repository
18:18 z1haze_work i feel like im almost getting it, just missing a couple things
18:18 invisbl joined #git
18:19 multi_io z1haze_work: git remote -v
18:19 z1haze_work its empty
18:19 multi_io does origin appear in that list?
18:19 z1haze_work doesnt git clone add it for you though
18:19 multi_io ok
18:19 Es0teric joined #git
18:19 multi_io yeah, it does
18:19 z1haze_work weird
18:19 morenoh149 left #git
18:19 z1haze_work because tahts what i started with
18:20 multi_io maybe you did something strange in between
18:20 z1haze_work i did a git clone -b develop https://..
18:20 z1haze_work then i did git checkout my-new-branch
18:20 z1haze_work i mean
18:20 multi_io you can add origin afterwards
18:20 z1haze_work git checkout -b my-new
18:20 z1haze_work ah
18:20 multi_io git remote add origin https://
18:20 z1haze_work like git remote add origin https://?
18:20 z1haze_work ok thank you
18:21 z1haze_work and thats just to the main repo right?
18:21 crayon joined #git
18:21 crayon joined #git
18:22 multi_io the https://... is the same thing you gave to git clone
18:23 z1haze_work and git push origin/my-branch?
18:23 kexmex left #git
18:23 sdothum joined #git
18:23 multi_io after the "git remote add https://...",  "git push origin my-branch" should work
18:24 multi_io if the remote allows write access, that is :)
18:24 z1haze_work says updates were rejected because my current branch is behind
18:24 z1haze_work but that doesnt make any sense because i just now made it
18:24 multi_io hm
18:25 multi_io git status
18:25 mikeric joined #git
18:25 z1haze_work im running git reset --hard origin/my-new-branch
18:25 z1haze_work now it looks like i have it
18:26 multi_io well, whatever :)
18:26 z1haze_work wish i had a clear understanding on it though
18:26 z1haze_work haha
18:26 z1haze_work i want to be able to help the others here
18:26 z1haze_work can I share my process to see what i have done wrong /missed?
18:26 multi_io you shouldn't have a origin/my-new-branch if you just created my-new-branch and never pushed it
18:27 refried_ joined #git
18:27 z1haze_work i do git init, git remote add origin https://
18:27 z1haze_work then git checkout -b my-new-branch
18:27 z1haze_work i know why now
18:27 Mobutils joined #git
18:27 z1haze_work it looks like the branch already existed, it was just previously merged
18:28 ispn joined #git
18:28 multi_io um... those three commands work locally only
18:28 z1haze_work right but is that the correct way to do those things?
18:29 multi_io git init you do only if you're starting a new repository from scratch, rather than cloning an existing remote repository
18:30 Urbany joined #git
18:30 multi_io for cloning: git clone https:///...; cd <repo>;
18:30 multi_io you should now be on the master branch (check vit git status)
18:31 GodGinrai well, assuming the repo you're cloning didn't do something weird with its default branches
18:31 cust joined #git
18:32 spacelord_ joined #git
18:32 multi_io you should have a remote named "origin" that points to the https://... you cloned from (check with git remote -v)
18:33 multi_io to checkout another, existing branch: git checkout branchnamae (not origin/branchname). that'll create a branch branchname which "tracks" origin/branchname
18:33 multi_io to create a new branch that branches off from where you are currently: git checkout -b newbranch
18:33 rkazak joined #git
18:33 chosafine joined #git
18:34 multi_io in both cases, you then make your edits, git add ....; git commit ...
18:34 multi_io and then git push origin branchname
18:35 treia joined #git
18:36 hahuang61 joined #git
18:37 causasui joined #git
18:38 causasui joined #git
18:38 quizzi joined #git
18:38 Bizkit joined #git
18:38 rivarun joined #git
18:39 jstein_ joined #git
18:39 LionsMane joined #git
18:40 e14 joined #git
18:40 bannakaffalatta joined #git
18:42 aw1 joined #git
18:42 invisbl joined #git
18:43 jimi_ joined #git
18:44 mrpackethead joined #git
18:45 invisbl joined #git
18:46 dreiss joined #git
18:47 jost__ joined #git
18:49 Fabricio20 joined #git
18:49 archaic joined #git
18:54 elsevero joined #git
18:55 druonysus joined #git
18:55 druonysus joined #git
19:01 manuelschneid3r joined #git
19:01 satifant joined #git
19:02 cdown joined #git
19:02 m0viefreak joined #git
19:02 wrkrcoop joined #git
19:03 setuid left #git
19:03 gugah joined #git
19:03 jnavila joined #git
19:04 z1haze_work i seem to have found a problem.. someone has committed the .git folder so when you clone the repo your .git gets overwritten
19:04 z1haze_work how can I delete this
19:04 wrkrcoop how can i view the history of a particular file? is there a command to just view the hunks/
19:06 Walex wrkrcoop: yes, but most people use nice GUI modes to explore history.
19:06 wrkrcoop oh
19:06 thiago Walex: git log filename
19:06 svm_invictvs wrkrcoop git log path/to/file.txt
19:06 thiago git log -p filename to see the patches
19:06 wrkrcoop sweet, thanks yo :)
19:06 wrkrcoop patches?
19:07 romerocesar joined #git
19:07 Walex wrkrcoop: try 'gitk' or 'qgit'
19:08 Limes__ joined #git
19:08 Sasazuka joined #git
19:08 svm_invictvs joined #git
19:10 sargas joined #git
19:11 invisbl joined #git
19:12 TomyLobo joined #git
19:13 WayToDoor joined #git
19:14 hahuang65 joined #git
19:16 NYTimes joined #git
19:16 Serious8 joined #git
19:16 adino joined #git
19:17 rorro joined #git
19:18 robotroll joined #git
19:18 mikecmpbll joined #git
19:19 ahr3n joined #git
19:19 yohnnyjoe joined #git
19:20 svm_invictvs joined #git
19:20 ahr3n_ joined #git
19:21 csk157 joined #git
19:21 mischat joined #git
19:26 duderonomy joined #git
19:27 mrpackethead joined #git
19:29 _cyril_ joined #git
19:30 PaulCapestany joined #git
19:30 rizonz do you always push to upstream or can yoiu push to origin ?
19:30 tubaman joined #git
19:30 rizonz as my upstream is my repo where I forked from
19:31 dminuoso rizonz: That depends entirely on a lot of things.
19:31 rizonz dminuoso: blow me away
19:31 dminuoso rizonz: "do you always push to upstream or can you push to origin" does not make much sense.
19:32 dminuoso rizonz: "origin" is the conventional name for your default remote, maybe your fork on github.
19:32 dminuoso which you would always be pushing to.
19:32 rizonz yes true
19:32 dminuoso Whether you can or do push to upstream depends on the upstream repository.
19:32 rizonz butr to fetrch from the real upstream of my fork I need to have it in my remotes
19:32 dminuoso Unless you have commit access, you usually use merge/pull requests.
19:33 rizonz yes I do
19:33 rizonz but I always need to fetch from the upstream again
19:35 dminuoso rizonz: Yeah.
19:36 dminuoso rizonz: You would just do something like: git fetch upstream; git checkout master; git merge upstream/master
19:36 dminuoso Or maybe rebase, depending on what you are doing.
19:37 jnavila joined #git
19:39 PioneerAxon joined #git
19:39 causasui I'm messing around with dulwich (a python implementation of git) and I may have borked an important repo. git status gives 'fatal: empty filename in tree entry': any way I can troubleshoot this?
19:39 rizonz dminuoso: yeah need a rebase
19:40 rizonz but how do I push to my origin ?
19:41 rizonz git push --set-upstream origin mybranche
19:42 shgysk8zer0 joined #git
19:43 thiago like that
19:46 Balliad joined #git
19:47 kulelu88 joined #git
19:50 Es0teric joined #git
19:52 mrpackethead joined #git
19:53 multi_io_ joined #git
19:54 voldz1tic3n joined #git
19:54 thiago joined #git
19:55 borkr joined #git
19:56 marchelly joined #git
19:56 neilthereildeil left #git
19:57 youser joined #git
19:57 csk157 joined #git
19:58 kadoban joined #git
19:58 zzz joined #git
19:59 madewokherd causasui: I think you can use git show to with --format=raw to read an object
19:59 madewokherd so you could inspect the current commit to find the tree object, then look at that
20:00 madewokherd but I'm just guessing and I don't have the time or knowledge to really help with this
20:00 jccn joined #git
20:02 SpeakerToMeat joined #git
20:04 mischat joined #git
20:05 Es0teric joined #git
20:06 causasui madewokherd: thanks, I'll try it
20:06 causasui madewokherd: I cant run that command either due to the same error. thanks anyway
20:06 wagle_ joined #git
20:06 madewokherd that's weird
20:07 mischat joined #git
20:08 romerocesar joined #git
20:08 netj joined #git
20:08 mischat joined #git
20:10 davimore joined #git
20:11 Es0teric joined #git
20:12 ayjay_t joined #git
20:13 Ardethian\ joined #git
20:13 Mous joined #git
20:15 chardan joined #git
20:17 ayjay_t joined #git
20:18 mischat joined #git
20:18 doadet joined #git
20:19 Mous hello i need with commit-filter i need to change all commit authors name to upper case and all email address domains, this is what i have so far (i am not sure about the quotes around the sed) and is says "empty indent name (for <>) not allowed" any help is welcome
20:19 Mous *need help
20:19 Atm0spher1c joined #git
20:19 Mous and the link would be great too http://dpaste.com/2X0WRWF
20:21 thiago GIT_COMMITTER_NAME='"${GIT_COMMITTER_NAME^}"';
20:21 thiago do you want to set the name to what is in the current shell's variable?
20:21 thiago note in your paste how it's coloured differently. Not red.
20:22 fatalhalt joined #git
20:22 thiago the ' there closed the ' that you opened on the line before, so the value was interpreted by the launching shell
20:22 SpeakerToMeat joined #git
20:22 thiago drop the '
20:23 jnavila joined #git
20:25 refried_ joined #git
20:25 Ardethian\ joined #git
20:26 Es0teric joined #git
20:27 Mous ok now it says bad substitution i assume i have bad quotes around the sed too
20:28 busta joined #git
20:28 YuGiOhJCJ joined #git
20:29 romerocesar joined #git
20:29 thebope joined #git
20:32 thiago show me what it looks like now
20:33 nwkj86 joined #git
20:33 zyrb joined #git
20:33 csk157 joined #git
20:34 phos1 joined #git
20:35 phos1 When running a get push i am getting “Out of memory, malloc failed (tried to allocate 477667629 bytes)”. It’s a magento site so it has a lot of files, it’s about 900MB repository. How do I fix it?
20:36 cdown joined #git
20:36 dsantiago joined #git
20:38 govg joined #git
20:38 rkazak joined #git
20:38 Mous sry thiago here is the link to the current http://dpaste.com/0QPWT23
20:41 adino joined #git
20:42 aidalgol joined #git
20:42 Mous thiago, this should make more sense but is says bad substitution
20:43 thiago Mous: you still have ' to remove
20:43 SwiftMatt joined #git
20:43 Gsham joined #git
20:43 Mous around the seds?
20:43 thiago ALL of them, except the first and the last
20:43 kpease joined #git
20:44 Mous removed all of them and still bad substitution
20:45 Mous want to see?
20:45 thiago did you quote the > ?
20:45 _ikke_ phos1: !big_repository
20:45 _ikke_ !large_repository
20:45 thiago or escape
20:45 thiago write a script without ' that works (and without the commit-tree)
20:45 thiago once you have that working, put it in side the '
20:45 nettoweb joined #git
20:45 _ikke_ phos1: !large_repos
20:45 gitinfo phos1: Git can be slow in the face of large repositories.  There are git-config options which can help.  pack.threads=1; pack.deltaCacheSize=1; pack.windowMemory=512m; core.packedGitWindowSize=16m; core.packedGitLimit=128m. Other likely ones exist.
20:46 Mous ok so without ' got it
20:46 thiago Mous: alternative, write a script
20:49 sq-one joined #git
20:49 Derperperd joined #git
20:50 ahr3n joined #git
20:53 cagomez joined #git
20:55 Fabricio20 joined #git
20:59 theoceaniscool joined #git
21:00 mathematic-alpha joined #git
21:04 jarshvor joined #git
21:07 Vampire0_ joined #git
21:09 bakers joined #git
21:09 anonymuse joined #git
21:09 gnoirzox1 joined #git
21:09 csk157 joined #git
21:10 bakers Did newer git change the syntax for https? I'm getting fatal: Unable to find remote helper for 'https'
21:10 bakers but if I change it to git:// it works fine (on github)
21:10 bakers This is on a clone https://github.com... URL
21:10 dsdeiz joined #git
21:10 dsdeiz joined #git
21:11 noecc left #git
21:12 mischat joined #git
21:16 ki0 joined #git
21:17 njbair joined #git
21:18 _ikke_ bakers: no, it didn't
21:18 _ikke_ Looks like an installation issue
21:20 mischat joined #git
21:20 mischat joined #git
21:21 mischat joined #git
21:21 rivarun joined #git
21:24 cdg joined #git
21:26 rizonz this is happening on my own fork: remote: error: insufficient permission for adding an object to repository database ./objects
21:26 rizonz when I push
21:26 ToBeCloud joined #git
21:28 Es0teric joined #git
21:28 NaN joined #git
21:29 NaN I created a tag and publish it (git push --tag) but I missed a file so I did a new commit, how can I point that last tag to that last commit?
21:30 matsaman joined #git
21:31 judson_ joined #git
21:32 thiago NaN: yes, you can override the tag
21:32 thiago please note that anyone who has downloaded it already will not see the update
21:33 NaN that's exactly why I need to update it
21:34 kadoban joined #git
21:34 NaN so $git push --tag --force ?
21:34 netj joined #git
21:35 mgoodwin do you think a "snapshot" alias of `git stash -k -u && git stash apply` is a valid use or is there a better way to encapsulate a point in time without a commit
21:36 Mous thiago, i figured it out finally
21:37 NaN nevermind
21:38 NaN left #git
21:38 bannakaf_ joined #git
21:41 sargas joined #git
21:41 thiago joined #git
21:41 Mous not really the names change but not the email
21:41 Serious8 joined #git
21:42 ikelso joined #git
21:43 ikelso joined #git
21:44 mischat joined #git
21:45 marchelly joined #git
21:45 marchelly Hi, I have web project and made git init && git add . and git commit. Then I've madegit clone --bare to /home/git/myproject.git. Next I've added hooks to that bare repo to make checkout to this web root on every push. Everything works fine but here is the problem: I have .gitignore on that webroot with something like * !*.php and init commit was made with this .gitignore. So now, when I want to get *.html files for examle I have to mannualy go to this w eb
21:45 marchelly root and make git fetch, git push and so merge. What is solution for this? What to add to post-receive hook?
21:45 bket joined #git
21:46 csk157 joined #git
21:46 rivarun joined #git
21:46 thiago marchelly: you're wrong
21:46 dhollinger joined #git
21:46 thiago your analysis is wrong
21:46 marchelly thiago, okay. what is my new methodology?
21:46 thiago if you want to add an .html file, you add it (probably with -f). Then you commit and push, normally.
21:47 _ikke_ rizonz: simple file / dir permission error
21:47 marchelly thiago, I do not want to add it to webroot. I want to get it from there
21:47 mischat joined #git
21:48 thiago same answer
21:48 thiago you git add -f, commit, then push
21:49 thiago also, you must have nothing in the web root that is not part of the repository, or ignored
21:49 thiago you must never modify it directly
21:49 rizonz _ikke_: yap saw that
21:49 rizonz thanks anyways
21:50 marchelly thiago, sure. no edits from somewhere, direct or so. just git. moment...
21:51 Synthead joined #git
21:51 ToBeFree joined #git
21:51 gugah joined #git
21:52 askb joined #git
21:53 ProbabilityMoon joined #git
21:53 ikelso joined #git
21:55 marchelly thiago, I still did not understand. I'm on local end. I have only php files here. I'm editing local .gitignore and adding !*.html here, then git add -f . && git commit && git push. Right?
21:55 marchelly so how the html files from remote whould appear here on local end?
21:55 thiago marchelly: no
21:55 thiago marchelly: don't ignore stuff you want to add
21:55 thiago start by writing a proper .gitignore file
21:55 thiago don't ignore *
21:56 jccn joined #git
21:56 Ryanar joined #git
21:57 fatalhalt joined #git
21:57 marchelly thiago, let me explain. I have webroot 800gb size (images, pdf and so on). I'm going to work with php. So I'm creating .gitignore like * !*.php on remote, add . and commiting init commit.
21:57 marchelly then creating bare repo
21:57 gambl0re joined #git
21:57 gambl0re hello?
21:57 osse hi
21:58 gambl0re so im starting to use git a lot at my work
21:58 marchelly thiago, so adding 800Gb is not good idea, even not talking about pulling it
21:58 gambl0re we have a develop branch and then we will create seperate branches for each feature we want to implement
21:58 gambl0re is that the usual way?
21:58 ikelso joined #git
21:59 gambl0re and then after we're done with the feature branch we merge the feature branch into the develop branch...
21:59 osse gambl0re: it's not *the* usual way, but it's *a* usual way
22:02 PCDX joined #git
22:02 raspado_ joined #git
22:04 voldz1tic3n joined #git
22:07 brent__ joined #git
22:09 tvw joined #git
22:10 marchelly thiago, hello
22:12 romerocesar joined #git
22:13 strixx joined #git
22:14 NaN joined #git
22:15 anuxivm joined #git
22:15 NaN is it possible to search a text in all the files throught the history?
22:15 osse NaN: yes
22:16 NaN how? :B
22:16 osse i thought man git-grep had an example
22:16 gitinfo the git-grep manpage is available at http://jk.gs/git-grep.html
22:16 NaN nice, thanks osse
22:16 dminuoso Is there a way to pull out a commit from history far far into the past without a rebase interactive?
22:16 osse NaN: git rev-list --all | while read hash; do git grep -e pattern $hash; done
22:17 dminuoso (I dont care about rewriting public history)
22:17 osse NaN: but depending on what you need it for git log -S might be more useful
22:17 osse dminuoso: filter-branch
22:17 osse dminuoso: with a suitable --commit-filter
22:18 dminuoso osse: Ahh brilliant. That seems to be exactly what I was looking for. Thanks.
22:19 NaN osse: I'm searching a pattern but I don't know where or when it was used so git rev-list could help
22:19 NaN osse: thanks :)
22:19 osse NaN: but that pattern might occur in hundreds of commits. git log -S will show you the commit(s) that the pattern appeared or disappeared in
22:20 NaN osse: you are right
22:21 csk157 joined #git
22:26 thebope joined #git
22:26 TrentonDAdams joined #git
22:27 TrentonDAdams So I've created a script that runs "git diff ${@} $(git merge-base master HEAD)..HEAD" in order to diff from my last branch point.  Is there a way of turning this into an alias?
22:28 osse TrentonDAdams: why turn it into an alias?
22:29 osse try:  git config alias.mydiff '!git diff "$@" $(git merge-base master HEAD)..HEAD && :'
22:29 TrentonDAdams osse, lol.  I've wondered that myself.  But the inverse might be a good question too, why turn it into a script?
22:29 osse TrentonDAdams: just FỲI if you have a script named 'git-foo' in PATH, you can invoke it as
22:29 osse you can invoke it as 'git foo', just as if it was a builtin or an alias
22:30 TrentonDAdams osse, Yep, that's the way I'm doing it now.  I called it "git-diffbranch"
22:30 TrentonDAdams I've been debating with myself, I find myself quite a challenge to convince.
22:30 osse TrentonDAdams: I find that my !-aliases get quite complicated fast. a script is much easier to read
22:31 TrentonDAdams on one hand, our organization can have standards on this by simply installing all the git-* scripts, with no local changes needed.
22:31 osse in this particular case i think my alias gets the job done
22:31 TrentonDAdams On the other, more scripts is more to manage too.  But it becomes a more central management though.
22:32 TrentonDAdams Fixes for example, can go to everyone just by installing the latest.
22:32 TrentonDAdams So yeah, maybe a script would be better, as that's what it is now.  Thoughts?
22:32 TrentonDAdams osse, ^^
22:32 osse i have no experience with the organizational stuff
22:33 osse my rule is simple: when !-aliases get long, make them scripts
22:33 osse i don't know much about distributing scripts or hooks to a team
22:33 WayToDoor joined #git
22:33 anonymuse joined #git
22:34 TrentonDAdams Yeah, that might be a good rule.
22:34 PHPanos joined #git
22:34 Noodlewitt joined #git
22:35 osse TrentonDAdams: for instance, i have an alias similar to yours that uses merge-base. but i decided to use the configured upstream instead of master. then i wanted to use master as a fallback
22:35 osse that became a script
22:36 newbie1 joined #git
22:37 jccn joined #git
22:38 mrpackethead joined #git
22:38 d1z joined #git
22:38 Gsham joined #git
22:40 TrentonDAdams if I do a merge with no commit, what diff command should give me the same diff as the HEAD would be at now?
22:40 TrentonDAdams I mean the local copy, not HEAD
22:40 osse i don't understand the question
22:42 dreiss joined #git
22:42 rkazak joined #git
22:42 TrentonDAdams osse, Me neither. :P
22:43 TrentonDAdams git merge master --no-commit # to get the current branch up to date
22:43 TrentonDAdams git diff HEAD > patch1
22:43 TrentonDAdams which diff from the master to the HEAD would give the same patch?
22:44 osse there is only one diff between master and HEAD, and that's git diff master HEAD
22:44 osse I *think* you want 'git diff HEAD...master'
22:44 osse but that might be slightly accurate, depending on conflicts and resolutions
22:45 TrentonDAdams Interesting, now I'm confused why that one works.  Two seconds...
22:45 osse TrentonDAdams: https://raw.githubusercontent.co​m/Osse/git-stuff/master/dots.txt
22:45 osse triple dot = merge-base magick
22:46 mischat joined #git
22:46 TrentonDAdams Yes, the man page says "Changes that occurred on the master branch since when the topic branch was started off it."
22:47 TrentonDAdams But I'm still confused.  what if I've updated that branch with master before?
22:47 TrentonDAdams Will the branch point essentially change?
22:47 osse yes
22:47 TrentonDAdams Okay, so why would "git diff master..HEAD" not be effectively the same?
22:48 osse because that will show any and all changes between them
22:48 TrentonDAdams Oh, shit
22:48 osse instead of just showing those that would be applied by a merge
22:48 TrentonDAdams Right, cause I've committed on this branch.
22:48 TrentonDAdams This was all basic git, not sure why I got confused, lol
22:48 TrentonDAdams DUH
22:49 TrentonDAdams I've known that for a long time.  Apparently having a bad day
22:49 osse download more coffee
22:49 TrentonDAdams I just got to keep the word "raw" in mind in terms of ".."
22:49 TrentonDAdams Thanks for prodding me.  Bring a cattle prod next time
22:50 TrentonDAdams coffee improves processing performance while decreasing memory access and storage performance
22:53 robattila256 joined #git
22:54 judson_ joined #git
22:57 csk157 joined #git
22:59 nettoweb joined #git
22:59 Keridos_ left #git
23:01 fmeerkoetter joined #git
23:02 NaN osse: with -S how can I see the change? I only see commit messages :(
23:02 osse NaN: add -p
23:02 NaN cool
23:02 NaN Thanks :D
23:04 osse NaN: but once you've run it you might as well do 'git show {copy sha1 from log}
23:04 NaN why that?
23:05 osse i mean if git log -S takes a long time to re-run
23:05 NaN ooh! I get it
23:05 NaN so like a pipe to git show?
23:05 osse no
23:05 osse i actually mean copying and pasting the sha1 after git log has already run
23:06 NaN oups hehehe I get it
23:06 NaN xD
23:06 osse if git log -S doesn't take a lot of time, just re-run it with -p
23:07 NaN -p did the trick, it only shows where was that pattern and not the whole commit/files
23:08 osse --full-diff
23:09 cagomez joined #git
23:10 diogenese joined #git
23:11 d5sx43 joined #git
23:13 TrentonDAdams Now that I've updated my topic branch with the latest master stuff, I would have expected git diff master...topic would not show any changes.  No?
23:14 osse how did you update it?
23:18 osse if you did 'git merge master' then the merge-base between them hasn't changed
23:20 dreiss joined #git
23:22 Derperperd joined #git
23:22 Dougie187 left #git
23:24 refried_ joined #git
23:26 dsdeiz joined #git
23:26 dsdeiz joined #git
23:26 thiago joined #git
23:27 Ryanar joined #git
23:27 zivester joined #git
23:27 jeffreylevesque joined #git
23:28 Derperperd joined #git
23:30 Fabricio20 joined #git
23:31 brcolow joined #git
23:33 brcolow Howdy. I would like to create a new branch, called async-fix (say), and then cherry-pick the work done here: https://github.com/TestFX/TestFX/pull/282 and then squash the changes to one commit. I tried doing so, but I was not able to cherry-pick a merge commit.
23:33 Siegfried joined #git
23:33 csk157 joined #git
23:34 brcolow I added Ortner's remote `git remote add ortner https://github.com/ortner/testfx`, and then fetched that remote: `git fetch ortner`, then I created a new branch `git checkout -b async-fix`, and then tried to `git cherry-pick 84737a56314fe62d7d9bd2a52108fde2290620e2`.
23:35 brcolow Maybe there is a way to instead rebase my branch onto his? And then squash?
23:35 TrentonDAdams osse, Yes, I did a "merge master".  Is there a way to get the merge base updated?
23:36 sargas joined #git
23:36 osse TrentonDAdams: no. the merge-base is a fact based on how the log graph looks
23:36 osse it's just how it is
23:36 TrentonDAdams Okay, fair enough.
23:37 osse you can merge topic into master, which would fast-forward it, so that they're the same
23:37 osse TrentonDAdams: basically the merge-base is the most recent commit they have in common
23:37 TrentonDAdams Oh, I could also do that thing where I get "truly" up to date, right?
23:37 TrentonDAdams I forget the terminology.
23:37 TrentonDAdams rebase
23:37 Guest54781 joined #git
23:38 brcolow The error is: `error: commit 84737a56314fe62d7d9bd2a52108fde2290620e2 is a merge but no -m option was given.` When I try to cherry-pick.
23:38 brcolow I am not sure what value to give for the `-m argument` if I am to take the advice of the error message
23:40 osse TrentonDAdams: if you rebase topic on top of master then the merge base becomes master itself
23:40 osse so git diff master...topic = git diff master topic
23:41 TrentonDAdams Right, exactly.  Which you shouldn't do if you're sharing.
23:41 TrentonDAdams branches that is.
23:41 inflames joined #git
23:41 bannakaffalatta joined #git
23:42 PaulCapestany joined #git
23:44 safe joined #git
23:46 refried_ joined #git
23:47 mischat joined #git
23:50 rizonz when you push without a commit, so force it, will it be logged ?
23:50 rizonz in your timeline
23:51 osse if you push without commit you have nothing to push
23:51 rizonz unless you force ?
23:52 rizonz I fetch and rebase my upstream
23:52 rizonz *from
23:52 osse then you have stuff to push
23:52 rizonz ok but wil that be logged when I push it ?
23:53 osse what do you mean
23:53 zyrb joined #git
23:54 simonides joined #git
23:57 olbat joined #git
23:57 olbat joined #git
23:58 rizonz osse: will it be visible in my timeline ?
23:58 voldz1tic3n joined #git
23:59 osse i don't know what a  timeline is

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