Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-05

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

All times shown according to UTC.

Time Nick Message
00:03 boushi_ joined #git
00:03 sleepee joined #git
00:05 atomi joined #git
00:07 ratiotile__ joined #git
00:10 johnmilton joined #git
00:13 mingrammer joined #git
00:18 nivag joined #git
00:18 armyriad joined #git
00:21 danslo joined #git
00:23 madewokherd joined #git
00:25 raijin joined #git
00:28 MattMake_ joined #git
00:28 vladon joined #git
00:31 AnarchyAo joined #git
00:32 Gsham joined #git
00:33 l4v2 joined #git
00:34 jeffreylevesque joined #git
00:43 meinteil joined #git
00:43 unreal joined #git
00:45 mehola joined #git
00:46 kus joined #git
00:48 egis joined #git
00:49 egis Hello.  If I `merge --no-ff` local branch to another, then push another to remote - remote will see only one commit (merge commit), yes?
00:51 meinteil joined #git
00:52 CaMoT joined #git
00:55 e14 joined #git
00:59 i7c I don’t think so.
00:59 i7c --no-ff only tells git to always make a merge commit, even if it could be a fast-forward merge (which does not produce a merge commit).
01:03 meinteil joined #git
01:06 liamonade joined #git
01:06 egis i7c, thanks. I think 'rebase -i' and then squashing is what I'm looking for.
01:08 egis I have a 'branch-remote' and 'branch-local'. branch-local is child of branch-remote. I want to somehow move all changes from branch-local in one commit, but keep branch-local commit history unchanged.
01:08 egis Is this possible?
01:08 egis *from branch-local to branch-remote in one commit...
01:09 ome joined #git
01:12 andlabs joined #git
01:12 anonnumberanon Hi can I get some help to use my remote repo I just setup?
01:12 anonnumberanon I try a commit from my local machine and get: Please tell me who you are
01:13 anonnumberanon This does not happen when I don't do a git remote setup
01:13 dmarr joined #git
01:14 anonnumberanon All I did was : git init && git remote add origin user@IP.address:main-repo.git
01:14 anonnumberanon And then git add helloworld.c && git commit.
01:15 mehola joined #git
01:16 dsdeiz joined #git
01:17 Vampire0 egis, you can also use `git merge --squash`  to prepare one commit that introduces all changes a merge would introduce but as single commit instead of merge
01:18 egis Vampire0, nice. Thanks!
01:18 Vampire0 yw
01:18 daurnimator egis: why do you want it all in one commit?
01:19 egis To make commit message informative for other devs. I have a local branch with bunch of experimentation and etc. I want to make one pretty commit and push it to remote.
01:20 egis But would prefer to keep my local branch intact.
01:20 msm joined #git
01:20 chigang_ joined #git
01:21 egis daurnimator, ^
01:21 daurnimator egis: not sure if it's the right solution, but I would usually make a branch locally `git branch experiments`, then rebase to clean up `git rebase -i`, and push it.
01:22 daurnimator then work off the rebased version (as that's what other people have). but I still have the experiments to look back on
01:29 anonnumberanon I've solved my problem with this :) https://stackoverflow.com/questions/11656​761/git-please-tell-me-who-you-are-error
01:29 l4v2 joined #git
01:29 nevodka joined #git
01:33 pks joined #git
01:34 cqi joined #git
01:36 e14 joined #git
01:36 kpease joined #git
01:37 ochorocho__ joined #git
01:38 ratiotile_ joined #git
01:39 war_pigs joined #git
01:39 eizua joined #git
01:40 eizua joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and post-reductionist industrial exuberance | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Be careful when rewriting history. It may push you to use the dark side of the --force
01:49 mehola joined #git
01:53 murph joined #git
01:55 msm joined #git
01:55 boushi_ joined #git
01:55 Klumben joined #git
01:58 ResidentBiscuit joined #git
02:03 Corosus joined #git
02:06 liuzhen joined #git
02:08 fahadash joined #git
02:13 dreiss joined #git
02:13 raijin joined #git
02:14 arescorpio joined #git
02:14 SourTrout joined #git
02:19 hexagoxel joined #git
02:22 danslo joined #git
02:24 zacts joined #git
02:24 d0nn1e joined #git
02:25 inflames joined #git
02:26 fstd_ joined #git
02:26 zacts joined #git
02:29 vrishab joined #git
02:30 Aces_Charles joined #git
02:30 Gsham joined #git
02:31 brunodlz joined #git
02:31 Blackpajamas joined #git
02:31 inflames joined #git
02:33 mangolisk__ joined #git
02:33 aro_ joined #git
02:33 Dispatch joined #git
02:33 aro_ left #git
02:34 Rodya_ joined #git
02:39 lagothri1 joined #git
02:41 cdg joined #git
02:42 rchavik joined #git
02:43 romerocesar joined #git
02:44 relipse joined #git
02:44 Gsham joined #git
02:50 Impaloo joined #git
02:50 mehola joined #git
02:50 cqi joined #git
02:55 ahr3n joined #git
02:56 sangy joined #git
02:58 crayon joined #git
03:00 chachasmooth joined #git
03:02 MattMaker joined #git
03:03 aavrug joined #git
03:05 aavrug joined #git
03:06 aavrug joined #git
03:07 Rodya_ joined #git
03:08 aavrug joined #git
03:08 ffabi joined #git
03:09 aavrug joined #git
03:10 aavrug joined #git
03:10 evanwang joined #git
03:11 aavrug joined #git
03:15 Vortex34 joined #git
03:16 dreiss joined #git
03:22 jeffreylevesque joined #git
03:23 ExoUNX joined #git
03:23 ExoUNX man this whole branch thing has me slight confused
03:24 ExoUNX I have to jump to the changed branch then merge with the previous one?
03:24 ExoUNX it's weird
03:24 ExoUNX and then adding remote repos and merging with that doesn't push any files...
03:25 crayon joined #git
03:25 moneylotion joined #git
03:25 crayon joined #git
03:30 boushi joined #git
03:33 MattMaker joined #git
03:33 mingrammer joined #git
03:33 rgrinberg joined #git
03:33 blackwind_123 joined #git
03:35 raijin joined #git
03:37 boshhead joined #git
03:39 ochorocho__ joined #git
03:39 mehola joined #git
03:42 chrisshattuck joined #git
03:42 MattMaker joined #git
03:43 justanotheruser joined #git
03:43 boshhead joined #git
03:43 hahuang65 joined #git
03:46 ffabi joined #git
03:48 lolmac joined #git
03:55 dtux joined #git
04:00 preyalone joined #git
04:03 daey_ joined #git
04:05 dreiss joined #git
04:09 ffabi joined #git
04:10 dermoth joined #git
04:10 Darren_ joined #git
04:13 Cabanossi joined #git
04:15 dreamyspell joined #git
04:17 diogenese joined #git
04:21 kadoban ExoUNX: You should usually be on the branch that you're changing, so the one that you're merging something *into*. Just remember that if you want to change a branch, you should be on that branch.
04:21 CaMoT joined #git
04:21 kadoban ExoUNX: And the push stuff ... yeah git is a distributed VCS. So it rarely does anything that requires talking to remotes implicitly. If you're not pushing or fetch/pulling, it's local.
04:21 kadoban Oh those messages were kinda old. Oh well.
04:23 danslo joined #git
04:23 ExoUNX kadoban, I'm still here
04:23 ExoUNX kadoban, yah I just like to update to remote often
04:23 CaMoT joined #git
04:23 ExoUNX kadoban, it's part of the dev environment
04:25 navidr joined #git
04:25 CaMoT joined #git
04:30 sdothum joined #git
04:31 mizu_no_oto joined #git
04:34 sdothum joined #git
04:34 mangolisk joined #git
04:35 a3Dman joined #git
04:35 ahr3n joined #git
04:36 sangy joined #git
04:39 paulh_ joined #git
04:44 texasmynsted joined #git
04:45 ffabi joined #git
04:46 underpantz_ joined #git
04:48 cdg joined #git
04:55 neersighted joined #git
05:01 nilg joined #git
05:01 phanimahesh joined #git
05:05 Andrew_K joined #git
05:14 govg joined #git
05:19 jceb joined #git
05:20 mohabaks joined #git
05:21 zacts joined #git
05:22 jceb joined #git
05:23 djb-irc joined #git
05:23 dreiss joined #git
05:23 Puffball joined #git
05:26 SwiftMatt joined #git
05:27 neersighted joined #git
05:28 thiago joined #git
05:29 ffabi joined #git
05:29 t0by joined #git
05:39 jaguarma_ joined #git
05:40 ochorocho__ joined #git
05:40 justanotheruser joined #git
05:40 drbean joined #git
05:41 Junior joined #git
05:41 jaguarmagenta joined #git
05:43 ffabi joined #git
05:44 vrishab joined #git
05:45 stuh84 joined #git
05:48 dtux joined #git
05:48 hahuang65 joined #git
05:50 romerocesar joined #git
05:52 zeroed joined #git
05:53 subhojit777 joined #git
05:59 Raging_Hog joined #git
05:59 raijin joined #git
06:00 jaguarma_ joined #git
06:00 dtux joined #git
06:03 thiago joined #git
06:04 cdown joined #git
06:04 Puffball joined #git
06:04 Shangjin joined #git
06:05 Shangjin left #git
06:05 dhollinger joined #git
06:07 ffabi joined #git
06:09 mariuscc joined #git
06:09 boshhead joined #git
06:11 lvns joined #git
06:17 m0viefreak joined #git
06:17 _ng joined #git
06:19 qt-x joined #git
06:20 dede joined #git
06:20 Silenced_v2 joined #git
06:21 paulh_ joined #git
06:21 Silenced_v2 joined #git
06:21 Repox joined #git
06:22 rominronin joined #git
06:22 star_prone joined #git
06:22 ffabi joined #git
06:23 danslo joined #git
06:25 rorro joined #git
06:26 erguven joined #git
06:27 rscata joined #git
06:28 elect joined #git
06:29 GT4066 joined #git
06:32 bruce_lee joined #git
06:35 pijiu joined #git
06:36 tens0r joined #git
06:41 Sceorem joined #git
06:42 fees joined #git
06:42 Silenced- joined #git
06:42 Silenced- joined #git
06:45 dreiss joined #git
06:48 jceb joined #git
06:48 Alienpruts joined #git
06:48 JeroenT joined #git
06:49 Emperor_Earth joined #git
06:53 eduardas_m joined #git
06:54 submitnine joined #git
06:57 Junior joined #git
06:58 danslo joined #git
07:01 jknetl joined #git
07:02 checkItOut joined #git
07:04 laumann joined #git
07:04 JeroenT joined #git
07:09 jknetl joined #git
07:09 Junior joined #git
07:11 jknetl joined #git
07:12 Mannn joined #git
07:16 star_prone joined #git
07:16 jceb joined #git
07:21 TomyWork joined #git
07:23 anonymuse joined #git
07:23 duderonomy joined #git
07:25 circ-user-wzlJo joined #git
07:25 hahuang65 joined #git
07:31 jknetl joined #git
07:31 Balliad joined #git
07:33 auzty joined #git
07:35 King_Hual joined #git
07:35 star_prone joined #git
07:35 danslo joined #git
07:35 see joined #git
07:37 tens0r joined #git
07:38 Biganon left #git
07:39 bb010g joined #git
07:40 ochorocho__ joined #git
07:41 encod3 joined #git
07:42 _ikke_ https://github.com/felixSchl/git-fiddle
07:42 _ikke_ Wrapper around git rebase to to more directly from the todo list
07:44 see hello. my git version 2.10.0 i'm delete branches master and module1. then git checkout --orphan master; git rm -r --cached .; git add include; git checkout --orphan module1; git rm -r --cached .; git add module1; then i'm doing git checkout master; git delete dir module1. then i'm doing git checkout module1; git delete dir include. what i'm must to do for keeping this dirs when checkout
07:47 cbreak commit it, in both branches
07:48 EvilDMP left #git
07:48 see forget to tell: i make git commit after add
07:49 ahmedelgabri joined #git
07:49 star_prone joined #git
07:49 stasmakarov joined #git
07:51 hellboy joined #git
07:51 djb-irc joined #git
08:00 tens0r joined #git
08:02 omegak joined #git
08:03 see git log --diff-filter=D --summary; git ls-files --deleted; return nothing
08:05 leehambley joined #git
08:08 rorro joined #git
08:08 ahmedelgabri joined #git
08:09 mingrammer joined #git
08:09 dreiss joined #git
08:09 realz__ joined #git
08:10 cbreak see: so?
08:10 cbreak see: it's not deleted...
08:10 mingrammer joined #git
08:10 cbreak as I told you: you have to commit it on both branches
08:10 cbreak if git has a file on a branch, and you switch to a branch that does not have the file, git will delete it of course
08:11 aidalgol joined #git
08:13 DieguezZ joined #git
08:13 govg joined #git
08:14 bejeb does doing git commit --amend on the root commit of a repo cause problems?
08:14 armyriad joined #git
08:14 ringer1 joined #git
08:15 armyriad joined #git
08:15 _ikke_ bejeb: If you just checkout the root commit, and do that, then it will not, but it will just create a new commit that is not part of the rest of the history (and eligible for gc)
08:16 _ikke_ If you want it to be part of the history, you have to rewrite all commits following it, making the history incompattible with other clones
08:17 bejeb that sounds like what I want
08:17 _ikke_ bejeb: what?
08:17 see cbreak: I make initial commit in both branches after git add; I create by hands dir 123 and it not deleted in both commits
08:17 bejeb oh - is it not?
08:17 bejeb one moment, I'll get an image for you
08:18 cbreak see: then git won't delete it
08:18 cbreak because it's in both branches
08:18 jubalh left #git
08:19 star_prone joined #git
08:19 marcogmonteiro joined #git
08:20 Ring0` joined #git
08:21 _xor I know git isn't a deployment tool.  Any suggestions on which deployment tools to look into?  I'd prefer something that's not tied to a single platform (ex: PHP, ASP.NET, Node.js, etc.)
08:21 _xor I've heard of Capistrano, and it's on my list to check out.
08:23 see cbreak: does git delete files in branch master then I switch it to branch module1?
08:23 cbreak see: only if master has the file and module1 does not
08:24 Ring0` I create dev branch from master, they are the exactly the same now. I do 5 commits to dev while master receives 3 commits (those 3 master changes are irrelevant to dev workflow). Dev is being merged into master. Now if I want to work again on dev, should I again *merge* master into dev? I notice that if I merge master into dev, it appears as a commit. That is, dev is 1 commit ahead of master even tho this
08:24 Ring0` "commit" was actually merging master into dev despite that dev looks the same as master. I can keep merging dev into master or master into dev and in log it'll always look like 1 breanch is ahead of the another. why?
08:24 _ng joined #git
08:26 cbreak Ring0`: it doesn't matter
08:26 cbreak you don't have to merge back if you don't want to
08:26 cbreak but if you do merge back, you obviously get a merge commit if that merge isn't fast forwardable
08:26 Ring0` cbreak: oh ok, so it was fast forwardable, it wouldn't create a merge commit?
08:26 cbreak not unless forced with --no-ff
08:27 Ring0` I see. is ff recommended for beginners or should I always have the merge commit?
08:28 see cbreak: now I understand why dir 123 don't deleted. does it correct to use separate git for each module and include dirs
08:28 bejeb _ikke_: I created an example. Say I have a template repo: https://snag.gy/hwzCOG.jpg. I want to use that history, basically, so I git clone, them git remote rm. Then I edit the readme, git commit --amend, and cherry pick the other two commits. Now I have this: https://snag.gy/T3FGgC.jpg
08:29 bejeb Now I just delete `t`, and carry on with the new history.
08:29 bejeb Will that cause me problems (e.g. with gc)
08:29 chll_ joined #git
08:30 bejeb */want to use/want to edit
08:31 _ikke_ bejeb: Using rebase is easier, it will also move the branch to the new history
08:31 _ikke_ git rebase -i --root
08:31 _ikke_ change pick to edit for the first commit
08:31 _ikke_ do the ammend
08:31 _ikke_ git rebase --continue
08:31 bejeb ok, cool, that makes sense
08:33 star_prone joined #git
08:34 bejeb _ikke_: trying it out now
08:34 Puffball joined #git
08:36 notcharlie joined #git
08:41 Ezzy joined #git
08:44 DieguezZ joined #git
08:45 anonymuse joined #git
08:45 kurkale6ka joined #git
08:46 gajus `git commit --no-verify -m 'docs: update documentation' ./README.md` returns error status code (1) if there is nothing to commit
08:46 gajus how do I make it return 0 in that case?
08:46 _ikke_ Do you want error codes in other situations?
08:47 gajus There is `--allow-empty`, but that will create a redundant commit.
08:47 gajus _ikke_ yes
08:47 _ikke_ There are no provisions for that
08:47 _ikke_ Better to check if there is something to commit beforehand
08:48 gajus `git diff-index --quiet HEAD || git commit ...`
08:48 gajus picked that up from SO. makes sene
08:48 gajus sense*
08:48 _ikke_ cool
08:48 tinsley joined #git
08:49 gajus if I need it only for a specific file, then `git diff-index --quiet HEAD ./target-file.md` should work too, I assume
08:50 gajus mm.
08:50 gajus `git diff-index --quiet HEAD ./README.md` doesn't work if `README.md` is in .gitignore
08:51 chibbol joined #git
08:54 ljc joined #git
08:55 blaster joined #git
08:55 harish joined #git
08:56 gajus .gitignore doesn't work like I was hoping it will
08:56 gajus I have created an empty repo and commit `.gitignore` with README.md
08:57 gajus then I have created README.md and used `git add --force README.md`
08:57 gajus I was hoping that future changes will require to use `--force`
08:57 gajus but it seems that now the file is no longer being ignored
08:57 gajus anyway to achieve the desired result?
08:59 geko joined #git
08:59 _ikke_ git never ignores tracked files
09:00 _ikke_ Once a file is tracked, .gitignore has no effect on it
09:00 lolmac joined #git
09:01 encod3 joined #git
09:02 rorro joined #git
09:03 encod3 joined #git
09:04 bongjovi joined #git
09:04 spinningarrow gajus: you'll need to tell git to remove the file so it can be ignore. `git rm --cached <filename>` and then commit the result
09:04 gajus I see. Thats one way to do.
09:06 djb-irc joined #git
09:08 tvw joined #git
09:10 govg joined #git
09:10 JeroenT joined #git
09:15 lvns joined #git
09:16 jceb joined #git
09:20 boushi joined #git
09:23 chibbol joined #git
09:23 irqq joined #git
09:26 hahuang65 joined #git
09:26 notebox joined #git
09:28 igmar joined #git
09:28 star_prone joined #git
09:31 igmar Is there a way to figure out why a git merge does not delete a file that is deleted in the source branch, but still present in destination branch ?
09:31 iveqy joined #git
09:31 igmar we use shallow clones, if that is relevant
09:33 igmar Figuring out if this is a git issue, or a lack of understanding
09:33 igmar Probably the latter
09:34 harish joined #git
09:35 rorro joined #git
09:36 canton7 igmar, is it present in the common ancestor of the source and destination branches?
09:36 canton7 is that common ancestor present in git's history?
09:36 canton7 (the history that was cloned, that is)
09:37 skylite joined #git
09:38 nohitall joined #git
09:38 crayon joined #git
09:39 nohitall hi, I have a issue, when I try to commit it opens an editor and it basiaclly lists all files comented out and says I have to remove the # from files to be commited, is that normal?
09:39 canton7 no, never seen that before. Can you pastebin it?
09:40 nohitall http://pastebin.com/raw/5K0rv1U5
09:40 nohitall the issue is that its nearly 3000 lines
09:40 canton7 oh, that's not asking you to remove the comment from anything
09:40 canton7 you're simply misreading it
09:41 nohitall but it doesnt commit anything if I dont change it
09:41 nohitall it aborts
09:41 PCatinean joined #git
09:41 nohitall "Aborting commit due to empty commit message."
09:41 star_prone joined #git
09:41 canton7 it's just giving you a list of files it's going to commit
09:41 canton7 well, yes. You need to write a commit message
09:41 ochorocho__ joined #git
09:41 canton7 as the first line says
09:41 canton7 put it at the top, before the comments
09:42 nohitall oh
09:42 nohitall k thx
09:42 nohitall weird system
09:42 canton7 "Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit." seems fairly clear to me?
09:43 nohitall well to me this reads as that below is the message
09:43 nohitall and I have to uncomment a line to have a message
09:43 nohitall not to put something on top of it
09:43 nohitall well w/e
09:43 djb-irc joined #git
09:43 nohitall if I commit does it store everything in memory?
09:43 nohitall because git process just got killed
09:44 nohitall ran out of memory
09:44 canton7 when a commit has finished, the contents of the commit are written to disk
09:44 nohitall git commit
09:44 nohitall [master (root-commit) 2d4ced4] firstup
09:44 nohitall Killed
09:44 nohitall I saw full memory/swap
09:44 nohitall how much memory does it consume?
09:45 see left #git
09:45 xaa joined #git
09:45 canton7 fun: what's the total size of files you're trying to commit?
09:45 nohitall 3GB
09:45 canton7 how much memory do you have?
09:46 nohitall canton7: 512MB
09:46 canton7 I've never seen 'commit' run out of memory before. Push, sure, but not 'commit'
09:46 nohitall well it did, OOM kill
09:46 nohitall debian jessie
09:47 bejeb _ikke_: thank you again, I did as you said: git rebase -i --root, then changed all to edit, then git commit --amend on each commit. It looks just like it did before, but with any luck it will behave properly as you said!
09:47 canton7 ah, having a commit that's 6x the available memory is probably going to be an issue
09:47 nohitall kernel: [1458366.066371] Out of memory: Kill process 21481 (git) score 883 or sacrifice child
09:47 anonymuse joined #git
09:47 Anticom joined #git
09:47 bejeb "sacrifice child" - just sounds wrong
09:47 nohitall well lemme reboot with 1GB
09:48 nohitall hopefully is enough
09:48 bejeb the god of git is only appeased with sacrifice
09:48 canton7 what's the size of the largest file?
09:48 nohitall 343mb
09:48 nohitall Ijust add some memory, one sec
09:49 nohitall was just wondering what it does exactly to need so much
09:49 canton7 I've got a faint memory that it needs about 2x the size of the largest file, in order to do the compression it needs to do
09:49 _ikke_ bejeb: if history looks exactly the same, it should not matter
09:49 canton7 but I've no idea whether that's right
09:52 anonymuse joined #git
09:53 nohitall probably was due to compression memory usage
09:53 nohitall im pushing now, see memory jump quite around
09:53 nohitall ah darn :) ok 1GB is not enough either
09:53 canton7 yeah, it's doing a lot of work to minimize the amount of data it sends over the wire
09:54 canton7 there are some config options you can tweak to reduce the memory usage during a push iirc
09:54 canton7 plenty of SO posts on it
09:54 nohitall yea no problem
09:54 nohitall 2GB it is :)
09:55 _ikke_ !large_file
09:55 gitinfo [!large_files] Git isn't yet great at large files(larger than RAM). Look at !annex for solutions. You can find them (after gc) with: git verify-pack -v .git/objects/pack/pack-*.idx | grep blob | sort -k3nr | head | while read s x b x; do git rev-list --all --objects | grep $s | awk '{print "'"$b"'",$0;}'; done
09:55 _ikke_ Meh, it has changed
09:57 nohitall omg it ran out of 2GB too :/
09:57 nohitall largest file is 370mb
09:58 nohitall well swap helped, barely, push finished
09:58 _ikke_ jast: You're letsencrypt certificate has expire
09:59 _ikke_ !large_repos
09:59 gitinfo 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.
09:59 _ikke_ nohitall: ^^
09:59 nohitall yea no worries :) its working now, its fine with me
09:59 _ikke_ alright
10:00 nohitall understadnable if larges files need to be compressed
10:00 igmar Any starters on debugging a "my files doesn't get deleted during a merge" issue ?
10:01 boushi joined #git
10:01 canton7 igmar, answer my questions :)
10:02 lolmac joined #git
10:02 igmar canton7> Sorry, missed those. Can you repeat ? No idea how scrolling works in this client :(
10:02 canton7 <canton7> igmar, is it present in the common ancestor of the source and destination branches?
10:02 canton7 <canton7> is that common ancestor present in git's history?
10:02 canton7 <canton7> (the history that was cloned, that is)
10:03 igmar No, Git doesn't think so.
10:03 igmar We use --allow-unrelated-histories to override
10:03 canton7 ah, so the common ancestor isn't present in your cloned history
10:03 canton7 that'll be your problem then
10:03 canton7 in order to do a 3-way merge, you need the common ancestor
10:03 igmar The target branch is used a "copy" branch
10:03 Silenced_v2 joined #git
10:03 Silenced_v2 joined #git
10:04 canton7 git doesn't handle 2-way merges particular well, because 99.99999% of the time it does the superior 3-way merge
10:04 canton7 *particularly
10:04 igmar Hmmm
10:04 igmar Any suggestion to erredicate this ?
10:04 canton7 and in a 2-way merge, how should it know whether to keep or delete the file? I suspect it goes with the safe option, which is to keep it
10:04 canton7 clone the common ancestor
10:04 igmar It's develop -> staging -> production
10:04 canton7 *clone the history containing the common ancestor, I should say
10:04 igmar develop -> staging is done by hand, the latter by the deamon
10:05 igmar Can this be relevant to shallow clones ?
10:05 canton7 I've said that about 4 times now :)
10:05 canton7 yes - it's caused by the fact that you haven't cloned the common ancestor
10:05 canton7 therefore git can't do a proper 3-way merge
10:05 igmar Hmmm
10:05 igmar It makes sense
10:05 canton7 the fix is to clone the history containing the common ancestor
10:06 star_prone joined #git
10:06 igmar I'll increase the depth to 50 or so
10:06 igmar The problem is that that histpry is huge, and we have 2 copies per repo
10:06 igmar And about 200 repo's
10:06 igmar Which makes a huge bootup time
10:07 canton7 two copies per repo
10:07 canton7 ?
10:07 igmar Yeah, a git pull isn't an atomic operation
10:07 igmar which gives runtime errors in the template engine
10:07 canton7 you're deploying using a 'git pull'?
10:08 igmar yup
10:08 canton7 !deploy
10:08 gitinfo 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
10:09 nohitall thanks for the help guys
10:09 * nohitall flies away
10:09 nohitall left #git
10:09 canton7 as a minor change, you could have one repo, and use 'git archive' or just 'cp' to copy the files to another dir, then switch a symlink to point to that dir
10:10 igmar We might switch the archive, but all solutions have their downsides.
10:11 mingrammer joined #git
10:11 igmar I'll probably stick with 1 real repo, and 2 copies
10:12 igmar Writes on linux are pretty atomic in our case
10:12 foxxx0 joined #git
10:12 igmar Thanks for the help
10:13 tapout joined #git
10:17 spudowiar joined #git
10:20 Fairy joined #git
10:22 phanimahesh There was an article on things that can be done atomically in linux.
10:22 blackwind_123 joined #git
10:22 paulh_ joined #git
10:22 suy joined #git
10:22 notebox joined #git
10:22 igmar This version has 4k atomic writes, which is OK for us
10:23 igmar dir operations can't be batched atomically, which is the main pain.
10:23 phanimahesh https://rcrowley.org/2010/01/06/t​hings-unix-can-do-atomically.html
10:24 phanimahesh Use one of these options for the "switching" part in your deployments.
10:26 phanimahesh Atomic deployment options boil down to mv.
10:28 ycon_ joined #git
10:28 ycon_ Hi all, I'm want to delete my most recent commit added to my repo but none of the guides work
10:29 _ikke_ What did you try?
10:29 ycon_ git checkout <sha>
10:29 tjbp joined #git
10:29 ycon_ then git commit
10:29 _ikke_ That's not going to work
10:29 synthmeat joined #git
10:29 ycon_ also git reset ~HEAD
10:30 ycon_ *HEAD~
10:30 Fairy left #git
10:30 _ikke_ Ok, and what did that do?
10:30 ycon_ "Unstaged changes after reset:"
10:30 ycon_ and listed
10:30 _ikke_ (I know what it does, but want to know if that's what you expected)
10:30 _ikke_ Do you want to remove the changes also?
10:30 ycon_ yep
10:31 ycon_ I want to just keep the same changes as the last commit
10:31 ycon_ revert/wipe everything of the latest commit
10:31 _ikke_ git reset --hard HEAD
10:31 _ikke_ (one action would've been git reset --hard HEAD~)
10:31 synthmeat joined #git
10:33 ycon_ And after that?
10:33 anonymuse joined #git
10:35 _ikke_ done
10:36 ycon_ so i can just git add, git commit
10:37 _ikke_ After that command there should be nothing to commit (except for untracked files)
10:37 ycon_ _ikke_:  same as keeps happening- won't let me push "Updates were rejected because the tip of your current branch is behind "
10:38 govg joined #git
10:38 _ikke_ So you already pushed that commit you wanted to revert?
10:38 ycon_ yeah
10:38 ycon_ should I make some changes so it thinkgs it's new?
10:38 _ikke_ No
10:39 _ikke_ Do others use the repository you pushed to?
10:39 ycon_ nope
10:39 _ikke_ git push --force-with-lease <remote> <branch>
10:43 ycon_ is remote the url?
10:43 ycon_ .git
10:43 _ikke_ the name of the remote
10:43 _ikke_ in most cases it's origin
10:46 afuentes joined #git
10:46 anonymuse joined #git
10:46 ycon_ _ikke_: thank you. worked a charm
10:47 _ikke_ yw
10:47 tvw joined #git
10:51 anuxivm joined #git
10:56 tapout joined #git
10:56 ronskisika joined #git
10:57 star_prone joined #git
10:59 JeroenT joined #git
10:59 nilg joined #git
11:00 selckin joined #git
11:03 JeroenT joined #git
11:05 decimad joined #git
11:05 armin joined #git
11:06 phanimahesh joined #git
11:08 jceb joined #git
11:09 cdown joined #git
11:09 stamina joined #git
11:10 anonymuse joined #git
11:12 ASOLAr joined #git
11:12 harish joined #git
11:15 rnsanchez joined #git
11:17 cyan__ joined #git
11:18 ASOLAr joined #git
11:18 _ng joined #git
11:19 ojdo joined #git
11:20 spudowiar Is there any way to nest submodules where all submodules are bound to the root Git repository?
11:20 spudowiar e.g. rather than A -> B { C, D } it's A { B, B -> C, B -> D }
11:20 spudowiar Because A is the root, B is another repository and C and D are more repositories I want inside B but bound to A
11:22 grawity define 'bound to'
11:23 spudowiar grawity: the submodule should belong to the root repository
11:23 grawity doesn't really clarify much
11:23 spudowiar ok
11:23 spudowiar wait
11:23 grawity do you mean it should be listed in root's .gitmodules?
11:23 grawity or what
11:23 spudowiar yes
11:24 spudowiar grawity: what I aim is to have a repository that pulls down build, build/kati and build/soong in the relevant folders
11:24 spudowiar Those are three repositories
11:24 ferr joined #git
11:25 anonymuse joined #git
11:27 hahuang65 joined #git
11:28 _ikke_ I'm not sure you can nest submodule in the root repository
11:28 sleepee joined #git
11:30 nettoweb joined #git
11:31 jantje a pull --rebase should call the smudge filters right?
11:32 dodobrain joined #git
11:33 govg joined #git
11:33 djb-irc joined #git
11:34 _ikke_ No
11:35 _ikke_ Hmm
11:35 _ikke_ the git am part of rebase probably should
11:41 lolmac joined #git
11:42 ochorocho__ joined #git
11:43 jost_ joined #git
11:43 mohabaks joined #git
11:44 ahmedelgabri joined #git
11:46 dsdeiz joined #git
11:46 dsdeiz joined #git
11:46 inflames joined #git
11:47 danslo joined #git
11:49 ASOLAr joined #git
11:51 Impaloo joined #git
11:51 ASOLAr_ joined #git
11:52 Caelum joined #git
11:53 bernardio joined #git
11:53 Munt joined #git
11:54 subhojit777 joined #git
11:58 TheFarmingBunny joined #git
11:59 TheFarmingBunny I have a git repo i push to via ssh
12:00 TheFarmingBunny i keep a copy of the repo, updated daily by cron, on a subdomain of my nginx website
12:00 TheFarmingBunny i manually updated the https copy but my newest change doesnt show when cloning from https but it does from ssh
12:01 TheFarmingBunny any help?
12:01 _ikke_ TheFarmingBunny: You don't use something like git-http-backend through cgi right?
12:01 _ikke_ TheFarmingBunny: You probably need to run man git update-server-info
12:01 gitinfo TheFarmingBunny: the git-update-server-info manpage is available at http://jk.gs/git-update-server-info.html
12:01 TheFarmingBunny _ikke_: No, it is a read-only copy
12:01 TheFarmingBunny oh
12:02 _ikke_ It generates the file git requires to fetch everything over 'dumb' http
12:02 _ikke_ the files*
12:02 TheFarmingBunny ok
12:02 sin3t joined #git
12:02 TheFarmingBunny ill do that
12:02 bernardio joined #git
12:04 Impaloo How do I find out when a git subcommand was introduced?
12:04 Impaloo e.g. git-describe
12:05 _ikke_ Impaloo: I usually grep release notes
12:06 tinsley joined #git
12:06 dsdeiz joined #git
12:06 dsdeiz joined #git
12:08 _ikke_ Impaloo: 908e5310b958619559d34b0b6da122f058faa47e
12:09 _ikke_ v1.1.0 is the first tag
12:10 Impaloo _ikke_: thanks. what do you grep?
12:10 Impaloo `(git)?.*decsribe` only gets me to 1.5.0
12:11 Impaloo ah nvm only got release notes that goes back to 1.5.0
12:11 _ikke_ Impaloo: In this case, the relnotes would not go lower then 1.5.0, so I used git log on builtin/describe.c, which the last commit showed the move from / to /builtin, so I did git log -- describe.c, which showed the commit from linus that introduced it
12:11 Impaloo gotcha, thx
12:12 Impaloo There are no retroactive rel notes for <1.5.0?
12:12 _ikke_ Apparently not
12:13 notebox joined #git
12:15 leehambley joined #git
12:15 leeN joined #git
12:15 sdothum joined #git
12:17 sevenfourk joined #git
12:21 berndl joined #git
12:22 marksei joined #git
12:22 Gurkenglas joined #git
12:23 lss8 joined #git
12:24 jknetl joined #git
12:25 lvns joined #git
12:27 GavinMagnus joined #git
12:28 Silenced_v2 joined #git
12:28 Silenced_v2 joined #git
12:29 jceb joined #git
12:31 l4v2 joined #git
12:35 anonymuse joined #git
12:36 JeroenT_ joined #git
12:36 rahtgaz joined #git
12:37 star_prone joined #git
12:37 notebox joined #git
12:38 JeroenT_ joined #git
12:38 lvns joined #git
12:40 ahmedelgabri joined #git
12:42 Dispatch joined #git
12:47 gechr joined #git
12:47 jeffreylevesque joined #git
12:50 tabrez joined #git
12:51 bongjovi joined #git
12:52 ahmed_elgabri joined #git
12:52 Hink joined #git
12:52 romerocesar joined #git
12:54 mizu_no_oto joined #git
12:58 spriz joined #git
13:01 shmuli joined #git
13:03 Fuco joined #git
13:03 Fuco When I do rebase --onto it doesn't move the branch but checks out a detached-head commit, why is that?  Do I need to be checked out on a specific branch for it to move along?
13:05 star_prone joined #git
13:06 moritz Fuco: are you sure you finished the rebase (and not, for example, are stuck in a conflict resolution)?
13:06 Fuco pretty sure
13:06 moritz if 'git status' doesn't mention a rebase, it should be fine
13:06 Fuco the situation before was this: I had one branch based on top of another, upstream changed the "base branch", I pulled that... so now the other branch was starting at some old nonsense commits
13:07 Fuco so I did git rebase --onto origin/base-branch base-branch my-new-branch
13:08 Fuco git status is fine
13:08 _ikke_ That should checkout my-new-branch
13:08 Fuco even if I'm not on it originally?
13:08 _ikke_ yes
13:08 _ikke_ The last parameter is the branch to checkout
13:08 Fuco it does that when I run the rebase from emacs (magit), but not from CLI :O
13:09 Fuco oh, I'm so stupid :D
13:09 Fuco I put the hash on the CLI :)
13:09 Fuco not the branch name
13:09 Fuco thanks :)
13:09 moritz that would explain it, yes
13:11 zeroed joined #git
13:13 GavinMagnus left #git
13:15 _ng joined #git
13:16 circ-user-OBsh3 joined #git
13:17 BlaXpirit I'm on a git branch. how can I pull the latest changes from a remote, and then execute a command unless there were no changes to this branch?
13:18 blackwind_123 joined #git
13:18 BlaXpirit oh, also I would prefer to "force pull", that is, rewrite the branch with any changes from the remote even if they force-pushed
13:18 jceb joined #git
13:19 osse BlaXpirit: "force pull":  git fetch; git reset --hard @{u}
13:19 berndl BlaXpirit: How about first diff'ing with the remote?
13:19 BlaXpirit yep, thanks. what about the other part thoguh?
13:20 BlaXpirit osse, not sure what you mean by  @{u}  - is that git's syntax or a place holder?
13:20 Macaveli joined #git
13:20 BlaXpirit i know i can    git reset --hard origin/branchname
13:20 Impaloo !@{u}
13:20 Impaloo @{u} is pretty much an alias for upstream branch
13:20 BlaXpirit cool
13:21 cyan__ joined #git
13:21 BlaXpirit berndl, oh, diffing after fetching makes sense
13:21 JeroenT joined #git
13:21 shinnya joined #git
13:22 JeroenT joined #git
13:23 tilpner_ joined #git
13:24 osse BlaXpirit: foo@{upstream} = foo's upstream branch.  @{upstream} = HEAD's upstream branch. @{u} = shorthand
13:24 Impaloo BlaXpirit: git --no-pager diff --exit-code @{u} &> /dev/null
13:24 chll__ joined #git
13:24 BlaXpirit sweeet, thanks so much
13:24 Impaloo That command will exit 1 if there are diffs
13:24 BlaXpirit yep
13:25 parasite_ joined #git
13:25 fees joined #git
13:25 aidalgol joined #git
13:25 hexagoxel_ joined #git
13:25 lss8 joined #git
13:25 stomplee joined #git
13:25 marksei joined #git
13:25 BlaXpirit git fetch; git --no-pager diff --exit-code @{u} &>/dev/null || (git reset --hard origin/feature/extern2 && echo "foo")
13:25 Lomex joined #git
13:25 Limes joined #git
13:25 BlaXpirit woops, the  2nd one should also be  @{u}
13:27 abra0 joined #git
13:27 rscata joined #git
13:27 _ng joined #git
13:27 sonOfRa joined #git
13:27 hahuang65 joined #git
13:28 marienz joined #git
13:28 flopsec joined #git
13:31 ToBeFree joined #git
13:38 lolmac joined #git
13:38 rnsanchez_ joined #git
13:42 UnnamedUser joined #git
13:42 ochorocho__ joined #git
13:43 zivester joined #git
13:44 rahtgaz joined #git
13:47 siriniok joined #git
13:47 Shuggsy joined #git
13:47 Gsham joined #git
13:51 tvw joined #git
13:57 boushi_ joined #git
14:05 vmiklos joined #git
14:06 l4v2 my indentation from vim to Github is off, I tried a few different things I’ve read, but so far still no luck.
14:07 l4v2 it’s ruby code
14:09 jceb joined #git
14:09 lvns joined #git
14:10 vrishab joined #git
14:11 selckin %s/\t/   /g
14:13 relipse joined #git
14:14 notebox joined #git
14:17 * daey burns selckin
14:17 vassagus joined #git
14:17 delboy1978uk joined #git
14:18 Shuggsy left #git
14:18 nilg joined #git
14:18 delboy1978uk my push is getting rejected due to a bad commit message, how can i find the commit number to amend if i know the commit message?
14:18 danslo git log --oneline | grep "part of the message"
14:19 delboy1978uk in my work we need to start a commit with the ticket number we are working on
14:19 delboy1978uk okj i'll try that, thanks!
14:20 nilg` joined #git
14:21 phaleth joined #git
14:21 madewokherd joined #git
14:22 raijin joined #git
14:22 delboy1978uk danslo: got it thanks! 1f1b99d check for SSL Client Verify Generous for dev envs
14:23 delboy1978uk so can i git commit --amend and pass that commit number?
14:23 rgrinberg joined #git
14:23 gechr joined #git
14:23 _ikke_ git log --grep 'part of the message'
14:23 _ikke_ git can grep log messages itself
14:24 delboy1978uk nice
14:25 _ikke_ delboy1978uk: You cannot just amend arbitrary commits
14:25 JeroenT joined #git
14:26 Darcidride joined #git
14:26 danslo delboy1978uk: if it's not the latest commit, you're going to have to start an interactive rebase afaik (option 'reword' on that commit). you generally want to avoid this if you have already pushed
14:26 delboy1978uk thats what i feared guys
14:26 delboy1978uk i can delete the remote branch and push it afresh though
14:27 delboy1978uk so git rebase then. any options to add?
14:27 danslo delboy1978uk: if you are not worried about other people having pulled your stuff, then you can do  git push -f after rebasing
14:27 _ikke_ How long ago was that commit?
14:28 hahuang65 joined #git
14:28 delboy1978uk _ikke_: i'm looking
14:30 delboy1978uk good god, the 1st of April?! I'm being made a fool of here lol
14:32 delboy1978uk hmm. can we undo a commit? i think it'd be quicker branching off, cherry picking that commit, amending the commit message, deleting it from the original branch, and then cherry picking from the temporary branch?
14:33 grawity wat
14:33 grawity better go with `git rebase -i`
14:33 delboy1978uk otherwise i need to rebase every commit since april?
14:33 grawity well the end result is going to be identical either way
14:34 grawity you can't just "delete" an old commit from the original branch
14:34 grawity no, that really /always/ involves rewriting all commits after it
14:34 delboy1978uk i suppose
14:34 quadgrande joined #git
14:34 grawity whether automatically via `git rebase` or manually with tons of cherry picking
14:34 delboy1978uk so how does rebase know where to start rebasing from?
14:34 star_prone joined #git
14:35 grawity you tell it
14:36 delboy1978uk ok i'll try to tell it.
14:37 nilg joined #git
14:40 e14 joined #git
14:43 Gsham joined #git
14:43 ksefchik joined #git
14:44 Anticom joined #git
14:45 jceb joined #git
14:45 l4v2 selkin, is this comment for me? %s/\t/  /g
14:47 satbyy joined #git
14:47 notebox joined #git
14:48 boushi_ joined #git
14:49 notebox joined #git
14:50 amcsi joined #git
14:50 amcsi hi
14:50 amcsi does anyone know if there's a shorter way to express: git rebase -i $(git merge-base @ origin/develop)
14:50 amcsi ?
14:51 irco joined #git
14:51 amcsi if my current branch is based on develop
14:52 l4v2 selkin, thank you
14:52 delboy1978uk left #git
14:53 quadgrande joined #git
14:53 romerocesar joined #git
14:53 snowkidind joined #git
14:54 waruqi joined #git
14:57 robotroll joined #git
14:57 tabrez joined #git
14:58 eivarv joined #git
14:59 justanotheruser joined #git
15:00 anonymuse joined #git
15:01 _ng joined #git
15:04 l4v2 I wouldlike to continue using tabs, but I have to remember to write %s/\t/  /g at the end of each file in order to strip the tags. would this be something a git hook would handle before pushing my code to the server?
15:06 nedbat l4v2: what's the point of using tabs if you're just going to remove them when you check the file in?
15:06 l4v2 it’s faster than using soft tabs (space bar)
15:06 nedbat l4v2: configure your editor to insert spaces when you use the tab key
15:07 danslo ^
15:07 anonymuse joined #git
15:08 nedbat l4v2: what editor do you use?
15:08 l4v2 vim
15:08 ratiotile__ joined #git
15:08 l4v2 I set the tabstop =2
15:08 l4v2 spaces
15:08 l4v2 b4
15:09 danslo set expandtab
15:09 nedbat l4v2: http://stackoverflow.com/a/1878983/14343
15:12 l4v2 cool, thank you. Now I have to come up with a quick way to edit a past project to strip all of the tabs out or whatever, I just did it on this one, because it’s still managebale.
15:12 l4v2 I was thinking script for all .rb files
15:14 dreiss joined #git
15:14 ahmed_elgabri joined #git
15:15 CheckDavid joined #git
15:17 danslo find . -type f -name '*.rb' -exec sed -i 's/\t/    /g' {} \;
15:17 danslo something like that, anyway :)
15:17 johnmilton joined #git
15:18 l4v2 you guys are awesome thank you :)
15:19 xcesariox joined #git
15:20 rudi_s joined #git
15:21 mingrammer joined #git
15:21 mingrammer joined #git
15:25 _ikke_ amcsi: git rebase origin/develop
15:25 _ikke_ amcsi: Git by default already calculates the merge base
15:26 Kicer86 joined #git
15:29 ochorocho__ joined #git
15:30 notebox joined #git
15:31 tete_ joined #git
15:33 quadgrande joined #git
15:33 Macaveli joined #git
15:35 Dispatch joined #git
15:36 Silenced_v2 joined #git
15:36 Silenced_v2 joined #git
15:37 dtux joined #git
15:40 JamesBaxter joined #git
15:40 Darcidride_ joined #git
15:42 Faylite joined #git
15:42 netj joined #git
15:43 sleepee joined #git
15:43 encod3_ joined #git
15:44 elect joined #git
15:44 Goplat joined #git
15:44 thekrynn_ joined #git
15:44 dviola joined #git
15:44 Shakeel__ joined #git
15:45 ochorocho__1 joined #git
15:45 diprotic joined #git
15:45 rwb1 joined #git
15:45 eivarv_ joined #git
15:45 mkoskar joined #git
15:45 dsantiago joined #git
15:45 sharkz_ joined #git
15:46 rishi` joined #git
15:46 chamunks- joined #git
15:46 cstrahan_ joined #git
15:46 ffabi_ joined #git
15:46 kwmiebach_ joined #git
15:46 ealvarez___ joined #git
15:46 ed joined #git
15:46 beckyconning__ joined #git
15:47 gear4 joined #git
15:47 CrazyBonz_ joined #git
15:47 VampiricPadraig_ joined #git
15:47 angelsl_ joined #git
15:47 Blkt_ joined #git
15:47 sebhoss_ joined #git
15:47 mafrasi2_ joined #git
15:47 epic__ joined #git
15:47 heftig_ joined #git
15:47 quackgyver_ joined #git
15:47 synchron- joined #git
15:47 sonOfRa_ joined #git
15:47 addshore_ joined #git
15:47 ohcibi_ joined #git
15:47 Lunatrius` joined #git
15:47 JRHaigh_ joined #git
15:48 antranig1 joined #git
15:48 chachasmooth_ joined #git
15:48 Mats- joined #git
15:48 and_i joined #git
15:48 ndimitrij joined #git
15:48 Hogofwar_ joined #git
15:48 marlinc_ joined #git
15:48 Bowel_ joined #git
15:48 tabakhase__ joined #git
15:48 perlpilot joined #git
15:48 PioneerAxon_ joined #git
15:48 warthog19 joined #git
15:48 tokkee_ joined #git
15:48 mns_ joined #git
15:48 drupald_ joined #git
15:48 GodEater` joined #git
15:48 lol_ joined #git
15:48 Gitzilla_ joined #git
15:48 Moggets joined #git
15:48 larrybolt` joined #git
15:48 jknetl joined #git
15:48 goezz joined #git
15:48 gr_wity joined #git
15:49 SupaHam_ joined #git
15:49 ixian8 joined #git
15:49 Arokh joined #git
15:49 _main_ joined #git
15:49 alexis_broher joined #git
15:49 vmiklos joined #git
15:49 bruce_lee joined #git
15:49 auzty joined #git
15:49 dtux joined #git
15:49 theskillwithin joined #git
15:49 monty joined #git
15:49 utrack joined #git
15:49 nkhoit joined #git
15:49 tabakhase__ left #git
15:50 johnmilton joined #git
15:50 Sc0rpius joined #git
15:50 ThiefMaster joined #git
15:50 shmuli joined #git
15:50 tabakhase joined #git
15:50 tomzx joined #git
15:50 zncmax4 joined #git
15:51 SupaHam joined #git
15:51 Remram[m] joined #git
15:51 justanotheruser joined #git
15:51 zrts joined #git
15:51 msonntag joined #git
15:51 SenpaiSilver joined #git
15:51 biertie joined #git
15:51 habbasi joined #git
15:51 RickyB98 joined #git
15:51 bouncy joined #git
15:52 RickyB98 joined #git
15:52 sigjuice joined #git
15:52 Neal_ joined #git
15:52 Hello71 joined #git
15:52 relgar joined #git
15:52 adrian_broher joined #git
15:52 tcurdt joined #git
15:53 rominronin joined #git
15:53 lamont joined #git
15:53 pizzaops joined #git
15:54 quadgrande joined #git
15:55 XDS2010 joined #git
15:56 chrisshattuck joined #git
15:56 discopatrick joined #git
15:56 HalfEatenPie joined #git
15:57 sfan786_ joined #git
15:57 ffabi joined #git
15:57 daxroc joined #git
15:58 stealthii joined #git
15:58 huhlig joined #git
15:58 Urbany joined #git
15:59 barq joined #git
15:59 asd5a joined #git
15:59 i7c joined #git
15:59 nioncode joined #git
15:59 vktec joined #git
15:59 braderhart joined #git
15:59 yena joined #git
15:59 pothepanda joined #git
16:00 bastelfreak joined #git
16:00 sea-gull joined #git
16:00 hexa- joined #git
16:00 adrian_broher joined #git
16:00 Darren_ joined #git
16:01 batrick joined #git
16:01 ec joined #git
16:02 theresajayne joined #git
16:02 WillMoogle joined #git
16:02 sanketdg joined #git
16:03 evanc joined #git
16:03 ec joined #git
16:03 sanketdg joined #git
16:03 zero7 joined #git
16:03 bedouin joined #git
16:04 chrisshattuck joined #git
16:04 ToeSnacks joined #git
16:04 angular_mike joined #git
16:04 MLM joined #git
16:04 Awesomecase joined #git
16:04 psacrifice joined #git
16:05 ratiotile_ joined #git
16:05 wizonesolutions joined #git
16:05 adrian_broher joined #git
16:05 elijah joined #git
16:07 adrian_broher joined #git
16:08 vassagus joined #git
16:11 e14 joined #git
16:11 chrisshattuck joined #git
16:12 adrian_broher joined #git
16:14 Bob8989|3 joined #git
16:14 Bob8989|3 joined #git
16:15 adrian_broher joined #git
16:15 aspiers joined #git
16:15 adrian_broher joined #git
16:15 fclnva joined #git
16:17 adrian_broher joined #git
16:17 justanotheruser joined #git
16:20 adrian_broher joined #git
16:21 Rly joined #git
16:22 Groovin joined #git
16:22 adrian_broher joined #git
16:23 adrian_broher joined #git
16:23 Gianormagantrous joined #git
16:24 mohabaks joined #git
16:25 danslo joined #git
16:26 chrisshattuck joined #git
16:27 InfoTest joined #git
16:29 hahuang65 joined #git
16:29 boushi_ joined #git
16:31 mariuscc joined #git
16:34 cagmz joined #git
16:34 andlabs joined #git
16:36 chrissha_ joined #git
16:37 Dispatch joined #git
16:38 shmuli joined #git
16:38 encod3 joined #git
16:38 dodobrain joined #git
16:39 eivarv joined #git
16:41 inflames joined #git
16:43 dsdeiz joined #git
16:43 Chinorro joined #git
16:44 kba joined #git
16:44 laumann joined #git
16:44 AlexanderS joined #git
16:45 tabrez joined #git
16:50 chrisshattuck joined #git
16:51 Rodya_ joined #git
16:53 zmachine joined #git
16:54 romerocesar joined #git
16:55 rominronin joined #git
16:56 chrisshattuck joined #git
16:56 GavinMagnus joined #git
16:58 jeffreylevesque joined #git
17:01 ayjay joined #git
17:01 tabrez joined #git
17:03 aax joined #git
17:04 heller_ joined #git
17:05 heller_ hey
17:05 heller_ help for gitlab perhaps?
17:05 HedgeMage There is a #gitlab IIRC, but we can try, too...you may or may not run into gitlab users here.
17:05 heller_ im having problems on remaking folder structure
17:06 heller_ i kind of managed to remove all, but now i cant push new structure
17:06 Gsham joined #git
17:06 heller_ how can i kind of clear a project and start over
17:07 heller_ left #git
17:07 _ikke_ heller_: I think you want to force push
17:07 _ikke_ Just too late
17:07 foist joined #git
17:09 hzc joined #git
17:10 chrisshattuck joined #git
17:10 zivester joined #git
17:13 amcsi joined #git
17:14 e14 joined #git
17:16 groundnuty joined #git
17:18 gusnan joined #git
17:19 tabrez joined #git
17:21 d0nn1e joined #git
17:22 SteffanW joined #git
17:23 lolmac joined #git
17:25 paul424 joined #git
17:26 cyan__ joined #git
17:27 abyx joined #git
17:27 Spec-Chum joined #git
17:32 polyzen joined #git
17:33 romerocesar joined #git
17:34 spudowiar joined #git
17:35 tvw joined #git
17:35 anonymuse joined #git
17:37 avar joined #git
17:37 Shentino joined #git
17:38 nwkj86 joined #git
17:40 jknetl joined #git
17:42 shirty joined #git
17:42 Hobbyboy joined #git
17:43 star_prone joined #git
17:43 nickstenn left #git
17:45 vrishab joined #git
17:45 mingrammer joined #git
17:47 deadprez joined #git
17:49 Gsham joined #git
17:51 al-damiri joined #git
17:54 rominronin joined #git
17:55 timmu joined #git
17:55 multi_io joined #git
17:57 zacts joined #git
17:57 JamesBaxter joined #git
17:59 clemf joined #git
18:00 encod3 joined #git
18:07 grumble joined #git
18:09 GavinMagnus left #git
18:10 stamina joined #git
18:11 tjone270 joined #git
18:12 tabrez joined #git
18:12 dreiss joined #git
18:13 GingerGeek joined #git
18:13 GingerGeek joined #git
18:14 Furai joined #git
18:14 BackEndCoder joined #git
18:14 McNozes joined #git
18:17 nsh joined #git
18:18 SpecChum joined #git
18:18 Rodya_ joined #git
18:20 satbyy joined #git
18:20 satbyy joined #git
18:20 joki joined #git
18:24 nikivi joined #git
18:25 Mannn joined #git
18:29 hahuang65 joined #git
18:30 Fairy joined #git
18:31 Xizor joined #git
18:31 erguven joined #git
18:31 Fairy left #git
18:34 mohabaks joined #git
18:35 flavius joined #git
18:39 boushi joined #git
18:40 kfunk joined #git
18:40 mingrammer joined #git
18:42 raijin joined #git
18:46 EduardoMartins joined #git
18:47 rivarun joined #git
18:47 mycelium joined #git
18:47 kulelu88 joined #git
18:48 Rodya_ joined #git
18:48 lolmac joined #git
18:48 watabou joined #git
18:49 ahmed_elgabri joined #git
18:52 shinnya joined #git
18:53 Rodya_ joined #git
18:55 rominronin joined #git
18:56 biotim joined #git
18:59 preyalone joined #git
19:01 dreiss joined #git
19:02 SpecChum left #git
19:02 Spec-Chum joined #git
19:04 cdown joined #git
19:08 Groscheri joined #git
19:12 kus joined #git
19:13 PaulCapestany joined #git
19:15 moneylotion joined #git
19:15 moneylotion joined #git
19:16 sQVe joined #git
19:17 serialoverflow joined #git
19:18 mmattice joined #git
19:18 Rodya_ joined #git
19:19 Goplat joined #git
19:21 serialoverflow hi, i am using one gitconfig on multiple machines. some configuration varies between machines, like the email-address or autocrlf for windows hosts. currently i am using an include directive to a gitconfig.local in the global gitconfig. however, this doesn't work very well as the include isn't always parsed, especially when dealing with 3rd party git implementations like egit/jgit in eclipse. is there some other way to have a variable part
19:21 serialoverflow in a shared gitconfig?
19:23 cdown joined #git
19:25 moneylotion joined #git
19:25 boushi_ joined #git
19:27 Rodya_ joined #git
19:27 raijin joined #git
19:29 osse serialoverflow: you can put whatever you like into repo/.git/config and it will be true for that repo
19:29 osse I think working with that is the best you're gonna get. I do that for email, for example
19:29 moneylotion joined #git
19:29 qsx osse: even if you put 'false'?
19:30 satifant joined #git
19:30 anonymuse joined #git
19:31 Macaveli joined #git
19:32 osse qsx: i don't know
19:33 star_prone joined #git
19:34 mingrammer joined #git
19:35 zacts joined #git
19:39 loopy joined #git
19:39 Rodya_ joined #git
19:40 joki joined #git
19:40 choki joined #git
19:41 moneylotion joined #git
19:43 irqq joined #git
19:44 moneylotion joined #git
19:45 Darcidride joined #git
19:46 WayToDoor joined #git
19:47 amcsi joined #git
19:51 Rodya_ joined #git
19:52 tanuki_ joined #git
19:52 DieguezZ joined #git
19:54 mangolisk joined #git
19:55 kyan joined #git
19:56 choki left #git
19:57 skylite joined #git
19:57 rominronin joined #git
20:00 Thorn__ joined #git
20:00 mangolisk_ joined #git
20:00 Lomex_ joined #git
20:00 PaulCape_ joined #git
20:01 dreamyspell joined #git
20:01 mattsl1 joined #git
20:02 raijin joined #git
20:02 shmuli joined #git
20:03 anonymus_ joined #git
20:03 comps_ joined #git
20:03 chris2 umm
20:03 mariuscc2 joined #git
20:03 chris2 git add foo; git commit -p bar
20:03 chris2 why does this commit foo too?
20:03 rafalcpp_ joined #git
20:04 LeMike_ joined #git
20:05 atomi_ joined #git
20:05 Ratler_ joined #git
20:05 MarkusDB1 joined #git
20:05 chris2 and when i have 'MM bar' 'A  foo', how can i only commit bar now?
20:06 thekingofbandit joined #git
20:06 _main_ joined #git
20:06 elijah__ joined #git
20:06 DuncanT_ joined #git
20:06 bremner !reset
20:06 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
20:07 chris2 i know reset
20:07 Bowel joined #git
20:07 chris2 but i dont want to remove the file from the index and then add it again
20:07 chris2 i mean that's what i just did, is there no way to avoid it?
20:07 bremner reset -p
20:07 chris2 3.by listing files as arguments to the commit command, in which
20:07 chris2 case the commit will ignore changes staged in the index,
20:08 chris2 so why would git commit commit changes that are not in the filenames
20:08 Goplat` joined #git
20:08 ajpiano_ joined #git
20:08 Ravana- joined #git
20:08 |ifei5g00d joined #git
20:08 cyphase_eviltwin joined #git
20:09 thoros- joined #git
20:09 yossarian joined #git
20:09 nitesh`` joined #git
20:09 constant joined #git
20:09 yossarian joined #git
20:09 Grum_ joined #git
20:09 chachasmooth joined #git
20:10 Afforess_ joined #git
20:10 BrianBla- joined #git
20:10 Ph_ joined #git
20:10 zrts joined #git
20:11 deadprez joined #git
20:11 cagedwisdom joined #git
20:11 ahmed_elgabri joined #git
20:11 nsh joined #git
20:11 psacrifice joined #git
20:11 hexa- joined #git
20:11 yena joined #git
20:11 nioncode joined #git
20:11 barq joined #git
20:11 pizzaops joined #git
20:11 Hello71 joined #git
20:11 ixian8 joined #git
20:11 beckyconning_ joined #git
20:11 ealvarez___ joined #git
20:11 hexagoxel joined #git
20:11 canton7 joined #git
20:11 roentgen joined #git
20:11 tcsc joined #git
20:11 up_the_irons joined #git
20:11 sarbs joined #git
20:11 thecomedian joined #git
20:11 c0ded joined #git
20:11 alexsystemf___ joined #git
20:11 jleclanche joined #git
20:11 spr0tsuki joined #git
20:11 parliament joined #git
20:11 tobie joined #git
20:11 henriquev joined #git
20:11 FritzLakritz joined #git
20:11 Lowell joined #git
20:11 bcardarella joined #git
20:11 teadrop_ joined #git
20:11 gravitron joined #git
20:11 codebam joined #git
20:11 NightStrike joined #git
20:11 _ikke_ joined #git
20:11 n-st joined #git
20:11 janx joined #git
20:11 paperziggurat joined #git
20:11 aendrew joined #git
20:11 cspotcode joined #git
20:11 JohnLea____ joined #git
20:11 fcrick joined #git
20:11 ariver joined #git
20:11 boxrick1 joined #git
20:11 da5id joined #git
20:11 shennyg joined #git
20:11 _flow_ joined #git
20:11 creppe joined #git
20:11 alcohol joined #git
20:11 boogibugs joined #git
20:11 JelmerD joined #git
20:12 rgrinberg joined #git
20:12 lolmac joined #git
20:12 Fuco joined #git
20:12 n-st joined #git
20:12 osse joined #git
20:12 hexagoxel joined #git
20:12 gravitron joined #git
20:12 sarbs joined #git
20:12 Limes joined #git
20:12 tcsc joined #git
20:12 tribly joined #git
20:13 dermoth joined #git
20:13 rgrinberg joined #git
20:13 alexsystemf___ joined #git
20:13 jfelchner joined #git
20:14 twisted` joined #git
20:14 groundnuty joined #git
20:15 avtobiff joined #git
20:16 codebam joined #git
20:16 JamesBaxter joined #git
20:18 Bob8989 joined #git
20:19 boombatower joined #git
20:19 cdg joined #git
20:20 netj joined #git
20:20 bmahe joined #git
20:20 rorro joined #git
20:20 cspotcode joined #git
20:21 henriquev joined #git
20:21 wizonesolutions joined #git
20:22 dviola joined #git
20:22 JohnLea____ joined #git
20:22 fcrick joined #git
20:23 spr0tsuki joined #git
20:23 barq joined #git
20:24 Awesomecase joined #git
20:24 thecomedian joined #git
20:25 discopatrick joined #git
20:25 boxrick1 joined #git
20:25 da5id joined #git
20:25 Lowell joined #git
20:25 NightStrike joined #git
20:26 teadrop_ joined #git
20:26 al-damiri joined #git
20:26 beckyconning_ joined #git
20:26 jleclanche joined #git
20:26 janx joined #git
20:27 yena joined #git
20:27 XDS2010 joined #git
20:27 tcurdt joined #git
20:27 parliament joined #git
20:27 cdown joined #git
20:27 paperziggurat joined #git
20:28 braderhart joined #git
20:28 ggherdov joined #git
20:29 Sasazuka joined #git
20:29 mycelium joined #git
20:29 pizzaops joined #git
20:30 skylite joined #git
20:30 mingrammer joined #git
20:30 hahuang65 joined #git
20:31 bremner chris2: looks like a side effect of -p
20:31 PioneerAxon joined #git
20:31 chris2 yes
20:31 p4trix joined #git
20:31 * chris2 ponders reporting
20:35 bremner the behaviour fits the docs, IMHO
20:35 bremner ymmv
20:36 osse chris2, bremner: I just reconnected so I've no idea what you're talking about.
20:36 osse Completely unrelated, you might like git add -N
20:37 chris2 that will add nevertheless
20:37 chris2 osse: i used git add foo; git commit -p bar and it added foo to the commit
20:37 qws-user-1228 joined #git
20:37 bremner git commit -p file vs git commit file
20:38 osse Ah, I was hoping the question was "how can I use git add -p on untracked files?"
20:38 chris2 that's neat too
20:39 chris2 but wont it just show a big hunk?
20:40 osse yup
20:40 chris2 which cant be splitted?
20:41 osse I think the only useful thing you can do is use 'e' to delete stuff to leave them out. debug printouts maybe.
20:41 chris2 ah, yes
20:41 osse but yeah it's initially just one huge hunk
20:41 chris2 i hope someone adds this line-wise staging
20:41 JamesBaxter joined #git
20:43 groundnuty hey, I'm writting a script. When I do git push, sometimes I get message "everything is up-to-date" I would like to react on this message. The thing is that the code returned by git is alwasy 0.
20:43 groundnuty regardless if there was something to push or not
20:44 ggherdov joined #git
20:45 ggherdov joined #git
20:46 bremner chris2: ignoring the current index is pretty weird IMHO. so I don't know how much traction such a request would get
20:47 osse maybe the commit -p weirdness is because using -p necessitates the use of the index, but without -p git can just skip it somehow
20:49 chris2 bremner: but git commit file only commits file, ignoring the rest of the index...
20:49 bremner groundnuty: fetch and examine the remote branch
20:49 bremner chr
20:49 Guest30 joined #git
20:50 bremner chris2: yeah, that behaviour is what seems weird to me
20:50 chris2 hm, git commit file... creates a new index from file... and commits that, no?
20:52 osse commit -p just runs the same external process as git add -p does
20:53 chris2 if it was the same as git add -p files...; git commit files... then it would be good
20:53 chris2 that's kinda what i expected
20:54 bremner maybe run git stash more ;)
20:54 chris2 usually i keep my index clean, but i added this file and then had to split a hunk
20:54 chris2 and forgot about the file
20:54 groundnuty bremner: bit I'm interested with all the branches and tags, not only HEAD
20:54 groundnuty bremner: I just know git status for examining
20:54 osse from what i can tell 'git commit files' creates a temporary index
20:54 nikivi joined #git
20:55 StuartMI joined #git
20:56 JamesBaxter joined #git
20:57 aard_ joined #git
20:59 rominronin joined #git
20:59 Opertus joined #git
21:00 groundnuty bremner: to git push I give a list of refspecs to push
21:00 groundnuty or just refs/heads/*
21:01 groundnuty can't find a way to check if push is needed in such a global fashion
21:02 chris2 i'll ask the ml
21:04 PabloR joined #git
21:04 PabloR I originally initiated a repo in my app directory with `git init`. It’s been working ok. Few days ago I reinstalled Mavericks and brought back everything I had backed up. Now when I try to run any git command a pop up window comes up: `the git common requires the command line dev tools` and asks if I want to install the tools now. Or choose `Get Xcode` to install Xcode and the command line developer tools from the App Store. This had not happened before the
21:05 PabloR reinstallation. Nor I recall installing anything to run git. Any ideas on why it’s happening and best way to proceed?
21:06 nevodka joined #git
21:06 rorro joined #git
21:06 boushi joined #git
21:08 Jellyg00se joined #git
21:09 mycelium joined #git
21:09 Darcidride joined #git
21:12 jeffreylevesque joined #git
21:14 Darcidride joined #git
21:16 psprint_ What's so special about working dir discovery (git rev-parse --show-toplevel?) – I believe this is a serious topic in git world, however, isn't it that one has to do [ -d ".git" ] || [ -d "../.git" ] || [ -d "../../.git" ] ... – say configured number of times, what is a simple, not serious action
21:17 dan2k3k5 joined #git
21:17 jay-m joined #git
21:20 chibbol joined #git
21:22 arup___ joined #git
21:25 mingrammer joined #git
21:25 moritz psprint_: I think there are a few environment variables that one has to be aware of as well
21:27 icor1031 joined #git
21:28 icor1031 hello
21:28 gitinfo icor1031: 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.
21:28 icor1031 I'm triyng to use git for the first time. I'm using bit bucket for hosting.
21:28 mehola joined #git
21:29 icor1031 http://pastebin.com/NXBY8CYW
21:29 icor1031 This is what I did and what happens (except I censored the URL)
21:29 icor1031 Why can't I add files ...?
21:30 icor1031 My 'tree' is 'clean'
21:30 moritz icor1031: it means all of your files are already committed
21:31 Groovin joined #git
21:33 icor1031 moritz but if I try to push, I get this: ..... git push -u origin master fatal: Not a git repository (or any of the parent directories): .git
21:33 zmachine joined #git
21:33 icor1031 This is what happened earlier when I tried to add:
21:33 icor1031 $ git add c:/xampp/htdocs/memory3/* fatal: c:/xampp/htdocs/memory3/5.2: 'c:/xampp/htdocs/memory3/5.2' is outside repository
21:34 moritz icor1031: you have to be a bit more careful with the casing of your paths
21:34 icor1031 oh?
21:34 moritz icor1031: memory3 vx. Memory3
21:34 icor1031 lol
21:34 icor1031 case sensitive, okay. I'll try
21:35 moritz not sure if that's the problem here, buth worth a shot
21:35 icor1031 didn't help
21:35 zacts joined #git
21:36 psprint_ moritz: thanks for pointing this out
21:36 moritz no idea then; I tend to avoid Windows
21:36 icor1031 dang it
21:37 icor1031 thanks anyway moritz
21:37 Orbitrix joined #git
21:38 Vinnie_win joined #git
21:39 deadprez joined #git
21:43 byteflame joined #git
21:47 Rodya_ joined #git
21:49 lolmac joined #git
21:53 Fuco left #git
21:56 e14 joined #git
21:59 rominronin joined #git
22:01 Dispatch joined #git
22:01 anonymuse joined #git
22:01 rahtgaz joined #git
22:02 ahr3n joined #git
22:04 blackwind_123 joined #git
22:05 Boobie joined #git
22:09 deadprez joined #git
22:11 inflames joined #git
22:12 sleepee joined #git
22:12 Bennux joined #git
22:13 Bennux joined #git
22:15 JanC joined #git
22:15 spudowiar joined #git
22:15 moneylotion joined #git
22:24 paulh joined #git
22:25 ToBeCloud joined #git
22:26 ruby_ joined #git
22:30 Gsham joined #git
22:31 Vgr joined #git
22:31 hahuang65 joined #git
22:33 Mannn joined #git
22:36 deadprez joined #git
22:41 Olipro joined #git
22:41 madewokherd joined #git
22:41 moneylotion joined #git
22:42 clemf joined #git
22:46 tyreld joined #git
22:47 ayjay joined #git
22:52 terminal_echo joined #git
23:00 rominronin joined #git
23:01 moneylotion joined #git
23:02 byteflame joined #git
23:02 ruby_ joined #git
23:03 deadprez joined #git
23:06 up_the_irons joined #git
23:08 paulh joined #git
23:10 moneylotion joined #git
23:11 johnmilton joined #git
23:11 jaimelopez joined #git
23:13 mingrammer joined #git
23:13 SporkWitch joined #git
23:13 MattE joined #git
23:15 Bennux joined #git
23:17 jeffreylevesque joined #git
23:17 Groovin joined #git
23:20 joki joined #git
23:20 mellernoia joined #git
23:21 runlevl4 joined #git
23:23 ffabi joined #git
23:26 Noldorin joined #git
23:26 sangy joined #git
23:29 ShapeShifter499 joined #git
23:29 lolmac joined #git
23:30 thiago joined #git
23:30 deadprez joined #git
23:34 VagabondAzulien joined #git
23:35 shmuli joined #git
23:38 dsdeiz joined #git
23:38 dsdeiz joined #git
23:40 thiago joined #git
23:42 ruby_ joined #git
23:42 bruce_lee joined #git
23:42 bruce_lee joined #git
23:45 WayToDoor joined #git
23:48 moneylotion joined #git
23:51 ochorocho__ joined #git
23:53 vassagus joined #git
23:54 ayjay joined #git
23:55 alexandrecvl joined #git
23:56 Gsham joined #git
23:56 Ph_ joined #git
23:56 romerocesar joined #git
23:57 alexandrecvl is there a way to commit message with carriage return programmatically?
23:57 SporkWitch alexandrecvl: use double quotes and \n ?
23:58 deadprez joined #git
23:58 alexandrecvl SporkWitch: Like this? git commit -m "paragraph 1 \n paragraph 2"
23:59 SporkWitch alexandrecvl: yup; that should work.  \n == newline
23:59 SporkWitch so actually "paragraph 1\nparagraph 2"

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