Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-15

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

All times shown according to UTC.

Time Nick Message
00:01 FrostCandy joined #git
00:01 rgrinberg joined #git
00:02 eletuchy joined #git
00:03 tgunr joined #git
00:03 rominronin joined #git
00:03 rom1504 ok
00:04 droidicus joined #git
00:05 Xz left #git
00:05 eletuchy_ joined #git
00:06 Lynxium joined #git
00:07 Duder9999 joined #git
00:08 NightMonkey joined #git
00:08 eletuchy joined #git
00:10 Duder9999 Hello all. Git Question.  I have a git and because of installing the IDE on different computers, the name of the branch has changed throughout the past few months, extra _ or capital letter.  Can I just delete the branches that we no longer use that have all been merged into the master or will I lose anything because of this?
00:10 eletuch__ joined #git
00:10 dopesong joined #git
00:11 cdg joined #git
00:13 SwiftMatt joined #git
00:13 eletuchy joined #git
00:14 Duder9999 anyone here?
00:14 dmto joined #git
00:14 Duder9999 hey guys, looking for some advice
00:15 vishal Duder9999: yes if you have all the commits/code you want to keep in master, you can delete other branches
00:15 brcolow joined #git
00:16 brcolow Is there anything equivalent to "commit.template" for annotated tags?
00:16 Duder9999 ok great. The master keeps track of the code that has been merged and the name of the branch right?  I have a branch name
00:16 tristanp joined #git
00:18 Duder9999 vishal I have a branch name, Delopment_ben, Developmen_Ben, development_ben,   they are all really the same thing.  The master keeps record of where the commit cam from, even though the branch is deleted, right?
00:18 ekinmur joined #git
00:18 eletuchy_ joined #git
00:19 vishal Duder9999: sort of.. the names of branches don't matter. The commit sha IDs matter. Branch names are just human friendly annotations for sha IDs. What matters are these commit IDs, and their parentage. When you merge a branch into another, you merge their histories, and create a merge commit which has two or more parents, and that's what git tracks
00:20 diegoaguilar joined #git
00:20 Duder9999 vishal ok thank you
00:21 brcolow Or is there a way to make annotated tags use the commit template?
00:21 sbeller joined #git
00:22 eletuchy joined #git
00:23 brcolow Basically a template for TAG_EDITMSG
00:24 eletuch__ joined #git
00:24 brcolow I see there is internally in http://fossies.org/linux/git/builtin/tag.c line 116...
00:24 tristanp joined #git
00:26 ensyde__ joined #git
00:27 vishal brcolow: that line looks like its just a template for what will be printed when the editor is opened. I don't know of a tag equivalent for commit.template..
00:27 eletuchy joined #git
00:27 rueben joined #git
00:28 drodger joined #git
00:30 eletuchy_ joined #git
00:32 eletuch__ joined #git
00:33 thiago joined #git
00:34 Lights joined #git
00:35 eletuchy joined #git
00:37 durham joined #git
00:38 eletuchy_ joined #git
00:41 eletuchy joined #git
00:41 raininja joined #git
00:43 eletuch__ joined #git
00:44 Schwarzbaer__ joined #git
00:44 durham joined #git
00:44 drodger joined #git
00:45 eletuchy_ joined #git
00:45 cqi joined #git
00:47 MattMaker joined #git
00:48 eletuchy joined #git
00:49 mkopriva joined #git
00:49 drodger joined #git
00:51 eletuchy_ joined #git
00:54 eletuchy joined #git
00:54 allcentury joined #git
00:55 qpdb joined #git
00:56 eletuchy_ joined #git
00:58 stormlrd joined #git
00:58 dmto joined #git
00:59 eletuchy joined #git
01:00 ekinmur joined #git
01:01 eletuch__ joined #git
01:03 eletuchy_ joined #git
01:04 rominronin joined #git
01:05 eletuchy joined #git
01:05 brcolow darn
01:06 brcolow Can you think of anyway using external tools that it could be done? Like a way to hook into TAG_EDITMSG?
01:08 wgrant joined #git
01:08 rueben joined #git
01:09 eletuchy_ joined #git
01:10 GT joined #git
01:10 hwrdprkns joined #git
01:10 fstd_ joined #git
01:10 GandalfTheWizard joined #git
01:10 pks joined #git
01:11 dmto joined #git
01:12 eletuchy joined #git
01:12 docnvk joined #git
01:14 diogenese joined #git
01:16 dmto joined #git
01:17 netj joined #git
01:18 hahuang62 joined #git
01:18 eletuchy_ joined #git
01:19 interne7y joined #git
01:20 eletuch__ joined #git
01:20 drodger joined #git
01:20 artemisart joined #git
01:21 Vinnie_win_z joined #git
01:22 son joined #git
01:23 eletuchy joined #git
01:23 diogenese joined #git
01:24 Garen joined #git
01:25 TBot709 joined #git
01:25 eletuchy_ joined #git
01:27 dmto joined #git
01:27 romerocesar joined #git
01:28 eletuchy joined #git
01:28 Vinnie_win joined #git
01:29 dreiss joined #git
01:31 eletuchy_ joined #git
01:32 jaguarmagenta joined #git
01:32 sargas joined #git
01:35 LawlzieDay joined #git
01:35 LawlzieDay left #git
01:37 Bin4ry_ joined #git
01:38 dreiss joined #git
01:38 interne7y joined #git
01:41 dmto joined #git
01:43 Goplat joined #git
01:46 mkopriva joined #git
01:46 LeBlaaanc joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and release parties | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | If you have anything staged, commit now or stash forever
01:50 pr0ton joined #git
01:50 italoacasas joined #git
01:51 sarbs joined #git
01:52 brcolow Guess I will just have to rely on documenting what the standards should be, which is okay.
01:56 vervic joined #git
01:58 Wulf4 joined #git
01:59 EY joined #git
02:00 mischat joined #git
02:04 eletuchy joined #git
02:05 rominronin joined #git
02:09 barteks2x joined #git
02:12 raininja joined #git
02:13 dopesong joined #git
02:13 drodger joined #git
02:17 shgysk8zer0 joined #git
02:18 romerocesar joined #git
02:21 stormlrd joined #git
02:23 nettoweb joined #git
02:25 chachasmooth joined #git
02:25 drodger joined #git
02:26 watabou joined #git
02:28 dmto joined #git
02:37 knutstrut joined #git
02:37 mkopriva joined #git
02:37 raininja joined #git
02:41 ash_workz joined #git
02:42 dodobrain joined #git
02:45 dodobrain hi all
02:47 dodobrain how do i a cherry-pick but without creating a new commit?
02:47 eletuchy_ joined #git
02:47 dodobrain i mean i want everything to be staged or simply the changes applied and showing as changes
02:48 inflames joined #git
02:48 hexagoxel joined #git
02:49 romerocesar joined #git
02:49 DonRichie joined #git
02:49 zumba_addict joined #git
02:49 dreiss joined #git
02:49 eletuch__ joined #git
02:53 eletuchy joined #git
02:55 eletuchy_ joined #git
02:57 eletuch__ joined #git
02:57 ceaucari joined #git
02:59 italoacasas joined #git
02:59 eletuchy joined #git
03:00 dfr33zy joined #git
03:00 Rodya_ joined #git
03:01 Sample joined #git
03:01 mischat joined #git
03:02 ShekharReddy joined #git
03:02 eletuchy_ joined #git
03:04 aavrug joined #git
03:04 cqi joined #git
03:04 aavrug joined #git
03:04 eletuch__ joined #git
03:06 rominronin joined #git
03:08 eletuchy joined #git
03:11 eletuchy_ joined #git
03:12 stormlrd joined #git
03:13 DonRichie joined #git
03:13 eletuchy joined #git
03:13 Guest3765 left #git
03:14 grassass joined #git
03:15 dmto joined #git
03:16 eletuchy_ joined #git
03:17 micah left #git
03:18 dreiss joined #git
03:18 eletuch__ joined #git
03:18 hahuang62 joined #git
03:19 preaction dodobrain: cherry-pick -n probably
03:19 romerocesar joined #git
03:20 dodobrain preaction, thanks. but i'll have to try it out another time. the latest commit on branch i'm working on (where i wanted to grab some stuff from another branch) is broken. grr
03:20 k3rn31 joined #git
03:21 eletuchy joined #git
03:21 tristanp joined #git
03:22 rkazak joined #git
03:24 Waskeend joined #git
03:26 cagedwisdom joined #git
03:27 wgrant joined #git
03:27 livingstn joined #git
03:28 sdothum joined #git
03:30 mehola joined #git
03:31 murph joined #git
03:31 mkopriva joined #git
03:32 jaguarmagenta joined #git
03:33 phanimahesh joined #git
03:33 Andrew_K joined #git
03:35 Klumben joined #git
03:36 howdoi joined #git
03:39 durham joined #git
03:41 drodger joined #git
03:43 denimsoft joined #git
03:48 cagedwisdom joined #git
03:49 romerocesar joined #git
03:51 nitin joined #git
03:52 jaguarmagenta joined #git
03:53 lindenle joined #git
03:53 k3rn31 joined #git
03:54 sebbu joined #git
03:54 robotroll joined #git
03:54 ash_workz joined #git
03:58 dreiss joined #git
03:59 rueben joined #git
04:01 eletuchy joined #git
04:02 mischat joined #git
04:04 Anthaas joined #git
04:05 Darcidride joined #git
04:07 rominronin joined #git
04:09 romerocesar joined #git
04:11 snowinferno joined #git
04:12 shgysk8zer0 joined #git
04:13 d4rklit3 joined #git
04:13 Cabanossi joined #git
04:16 dopesong joined #git
04:19 hahuang62 joined #git
04:21 dreiss joined #git
04:22 eletuchy joined #git
04:25 mkopriva joined #git
04:29 romerocesar joined #git
04:31 Limes_ joined #git
04:31 blackwind_123 joined #git
04:31 DolphinDream_ joined #git
04:40 romerocesar joined #git
04:41 wgrant joined #git
04:44 pwnz0r joined #git
04:45 Raging_Hog joined #git
04:52 shachaf Is there something I should know about using git am with CRLF line endings? At least I'm guessing that's the issue.
04:53 _ikke_ Nothing special, as long as it's consistent
04:53 _ng joined #git
04:53 shachaf I have a branch on top of master containing one commit. I run `git format-patch master` to make a patch file. Then I make a new branch "test" on the same commit as master, and I try "git am *.patch", and it fails:
04:53 skylite joined #git
04:54 shachaf "error: patch failed: file:45", "error: file: patch does not apply"
04:54 shachaf When I "git apply *.patch", the error is "trailing whitespace".
04:56 _ikke_ https://stackoverflow.com/a/17338798/20261
04:56 Samual joined #git
04:58 shachaf Ah, it just treats the CR as trailing whitespace, which it has a special case error for?
04:58 shachaf Makes sense, thanks.
04:59 shachaf Hmm, when someone applies the patch on master, they don't end up at the same commit hash as the original commit the patch was made from?
05:00 mkopriva joined #git
05:01 shachaf Hmm, no, the commit is different, whether with --whitespace=fix or --ignore-whitespace or --ignore-space-change.
05:01 kadoban shachaf: No. commit hashes include the message, the commiter, the timestamps, etc.
05:01 eletuchy joined #git
05:01 shachaf But doesn't the .patch file include all of those?
05:01 shachaf I guess it doesn't include the committer as such.
05:02 shachaf But is there a way to send someone a patch file they can use to end up at my branch?
05:03 kadoban shachaf: Why not just have a public git repo, and publish that branch?
05:03 mischat joined #git
05:03 shachaf I don't want a public repository. Or any repository.
05:03 shachaf A file can have all the information that a branch would, so why not just send a file?
05:04 sevenonezero joined #git
05:04 neanderslob joined #git
05:04 kadoban Maybe you can. I dunno a way to end up with the same commit hash.
05:04 ojacobson shachaf: patch application creates a new commit - it preserves the author (if available in the patch) and message (ditto), but defaults to setting the committer to you (and the commit time to now)
05:05 ojacobson this is intentional, so that the attribution of changes is correcy.
05:05 shachaf But there's no way to send a commit object to someone such that they can apply it if they have all the commits it refers to?
05:05 ojacobson git-am's `--commiter-date-is-author-date` often - but not always - causes the applied patches to match the original commits, however.
05:06 ojacobson No, you can't send someone a loose object.
05:06 ojacobson If you want that, send them a repo.
05:06 ojacobson or man git-bundle
05:06 gitinfo the git-bundle manpage is available at http://jk.gs/git-bundle.html
05:06 ojacobson but that's not human-readable, so if you want patches…
05:07 shachaf I guess I'll just send a patch. This seems like a surprising thing not to support, though.
05:07 ojacobson If you want to send the objects, that's what git-bundle is for
05:07 ojacobson if you want the receiver to create a new object, that's what patches are for
05:07 ojacobson you can always reconstitute patches from the objects afterwards, so there's no loss of expressiveness
05:08 shachaf This project is on GitHub so I guess their "official" approach would be a GitHub pull request, but I don't want other people's projects associated with my account.
05:08 ojacobson fork, pull request, delete fork when merged?
05:08 shachaf I guess I'll just send a patch. Might as well have the committer field be accurate.
05:08 mdw joined #git
05:09 rominronin joined #git
05:09 shachaf Assuming I can make a patch that applies correctly, that is.
05:10 romerocesar joined #git
05:11 shachaf OK, looks like git am --ignore-whitespace --keep-cr does what I want.
05:12 shachaf And with --committer-date-is-author-date it even creates the same commit hash, but I guess I'll leave that up to the committer.
05:12 shachaf Thanks!
05:15 dreiss joined #git
05:15 zumba_addict joined #git
05:16 subhojit777 joined #git
05:17 interne7y joined #git
05:20 hahuang62 joined #git
05:21 curiousmansi joined #git
05:24 gelei007 joined #git
05:25 gelei007 hi ,i m new git ,anyone told me the difference between git stash nad git revert,i really confused about this
05:26 gelei007 thanks first
05:26 ojacobson git stash makes backups of the tracked part of your work tree and of the staging area, then removes uncommitted changes from both
05:26 ojacobson (and then reapplies those backups, later, to restore your state)
05:27 ojacobson git revert creates a new commit that reverses some prior commit
05:27 ojacobson they … don't do much that's related
05:27 dingus joined #git
05:30 mariuscc joined #git
05:32 taylorm joined #git
05:32 cqi joined #git
05:33 TomyLobo joined #git
05:33 ronskisika joined #git
05:35 Raging_Hog joined #git
05:36 orbitphreak joined #git
05:40 taylorm joined #git
05:43 eletuchy joined #git
05:49 KnownSyntax joined #git
05:49 gelei007 ojacobson:thank you,and what does git reset do,is it just jump to the revision to look for information
05:49 taylorm joined #git
05:49 chris3492 joined #git
05:49 Repox joined #git
05:49 bayman joined #git
05:50 d0nn1e joined #git
05:51 bayman i'm trying to do a git pull and I'm getting error: Your local changes to the following files would be overwritten by merge:
05:51 bayman i don't care about the local changes want to overwrite them
05:51 bayman what should i do?
05:52 ojacobson either commit the changes or discard them
05:52 lordjancso joined #git
05:52 KnownSyntax left #git
05:52 ojacobson you can discard both staged and unstaged changes to a file with 'git checkout HEAD -- paths', or only unstaged changes with 'git checkout -- paths'
05:53 ceaucari joined #git
05:54 wagle is there a way to save the history of a file you "git mv"?
05:54 ciampix joined #git
05:55 ciampix joined #git
05:55 vuoto joined #git
05:56 ciampix_ joined #git
05:56 ojacobson git doesn't track history per-file
05:56 fracting joined #git
05:56 ojacobson so no, but git log --follow <path> will attempt to reconstruct a per-file history of <file>, including moves
05:57 ojacobson the basis for determining whether a file moved is a configurable similarity threshold
05:58 wagle yeah, I was just finding out if someone changed that in the past 6 years
05:58 wagle thanks!
05:59 ThomasLocke joined #git
06:00 rscata joined #git
06:00 romerocesar joined #git
06:02 udm_ joined #git
06:03 mischat joined #git
06:04 rchavik joined #git
06:07 gauthier gelei007: git reset moves the given branch (the reference) to a given commit. It's not just looking, it actually moves the ref.
06:08 nidr0x joined #git
06:08 gauthier gelei007: it has an important side effect, in what it does to the index and the working files. See man git reset, optione --soft, --mixed, --hard
06:08 gitinfo gelei007: the git-reset manpage is available at http://jk.gs/git-reset.html
06:08 romerocesar joined #git
06:10 grift joined #git
06:10 rominronin joined #git
06:11 freimatz joined #git
06:11 zumba_addict joined #git
06:13 uruk7 joined #git
06:13 uruk7 hello somebody can to get sessionStorage variables from client browsers   ::::->   /localhost/index.php->http://pastebin.com/fADyv3gT    ::::->   /localhost/scripts/index.php->http://pastebin.com/08iywMKM   ::::->   /localhost/scripts/bas.022.sS.js->http://pastebin.com/BefEtphX
06:14 gelei007 gauthie:thank you very much
06:14 taylorm_ joined #git
06:14 Guest9 joined #git
06:15 nidr0x joined #git
06:15 eijk joined #git
06:16 Guest9 joined #git
06:17 pwnz0r joined #git
06:17 dopesong joined #git
06:18 eletuchy joined #git
06:19 muthu joined #git
06:20 flavius joined #git
06:20 nidr0x joined #git
06:23 JeroenT joined #git
06:26 taylorm joined #git
06:27 lb uruk7 you're in the wrong place
06:27 taylorm joined #git
06:31 t-mart_ joined #git
06:34 taylorm joined #git
06:34 emPi joined #git
06:35 fling joined #git
06:35 ciampix joined #git
06:35 denimsoft joined #git
06:39 r3ply joined #git
06:39 r3ply joined #git
06:40 taylorm joined #git
06:40 eijk joined #git
06:41 Sceorem joined #git
06:44 jceb joined #git
06:44 dopesong joined #git
06:44 apotry joined #git
06:44 phanimahesh joined #git
06:45 taylorm joined #git
06:46 vuoto joined #git
06:47 mniip joined #git
06:47 ki0 joined #git
06:49 taylorm joined #git
06:55 Raging_Hog joined #git
06:55 dopesong_ joined #git
06:56 dEPy joined #git
06:56 anu0 joined #git
06:56 rominronin joined #git
06:56 eijk_ joined #git
06:57 taylorm joined #git
06:59 bayman- joined #git
07:00 KebabSpion joined #git
07:01 dan2k3k4 joined #git
07:02 j416 joined #git
07:04 ToBeCloud joined #git
07:04 mischat joined #git
07:05 dEPy joined #git
07:06 eijk joined #git
07:07 TomyWork joined #git
07:08 JeroenT joined #git
07:10 Rish joined #git
07:12 eletuchy joined #git
07:13 eijk joined #git
07:14 garethdaine joined #git
07:16 eijk_ joined #git
07:17 stormlrd joined #git
07:20 pmort joined #git
07:21 hahuang62 joined #git
07:21 d4rklit3 joined #git
07:22 njt joined #git
07:23 xbob joined #git
07:23 k3rn31 joined #git
07:24 dopesong joined #git
07:24 mischat joined #git
07:26 Alienpruts joined #git
07:28 linoespinoza joined #git
07:28 circ-user-NuHgv joined #git
07:31 tristanp joined #git
07:31 Balliad joined #git
07:31 imjacobclark joined #git
07:32 david007 joined #git
07:34 JeroenT joined #git
07:37 Ploppz joined #git
07:37 Ploppz .* in .gitignore doesn't seem to affect hidden file in subdirs. How can I do that?
07:38 rueben joined #git
07:38 jast it should
07:39 jast are those files already added to/tracked by git?
07:43 kedare joined #git
07:44 JeroenT joined #git
07:45 lindenle_ joined #git
07:45 MikeChernev left #git
07:45 denimsoft joined #git
07:46 MrMojito joined #git
07:46 MikeChernev joined #git
07:46 JeroenT joined #git
07:48 testild joined #git
07:50 imjacobclark joined #git
07:51 davisonio joined #git
07:51 imjacobclark joined #git
07:52 PCatinean joined #git
07:54 gfixler joined #git
07:55 Andrew_K joined #git
07:56 eletuchy joined #git
07:56 Hounddog joined #git
07:56 matrixa1 joined #git
07:58 ocbtec joined #git
07:59 King_Hual joined #git
08:00 clmsy joined #git
08:00 akushner joined #git
08:01 eletuchy_ joined #git
08:02 a_thakur joined #git
08:04 eletuchy joined #git
08:06 nd joined #git
08:07 Waskeend joined #git
08:07 garethdaine joined #git
08:07 _pix joined #git
08:08 denimsoft joined #git
08:08 mozzarella joined #git
08:08 eletuchy_ joined #git
08:09 Fijit joined #git
08:10 mmattice joined #git
08:10 eletuch__ joined #git
08:10 Alienpruts joined #git
08:12 maxorator joined #git
08:12 cdown joined #git
08:13 Shashikant86 joined #git
08:13 marcogmonteiro joined #git
08:13 eletuchy joined #git
08:14 _pix joined #git
08:14 TheGr8Nik joined #git
08:14 bongjovi joined #git
08:14 tvw joined #git
08:15 eletuchy_ joined #git
08:16 phanimahesh joined #git
08:16 xcesariox joined #git
08:17 EY joined #git
08:17 TheGr8Nik Hi guys, I would like to run a JSHint over the staged files before the commit (pre-commit hook) on windows, any suggestions?
08:18 TheGr8Nik I tryied with the npm module "precommit-hook" but I don't think is the right way
08:19 bruce_lee joined #git
08:19 bruce_lee joined #git
08:19 tinarg joined #git
08:21 zeroed joined #git
08:26 j416 TheGr8Nik: hooks are in .git/hooks
08:26 Schwarzbaer__ joined #git
08:26 j416 TheGr8Nik: man githooks for more info
08:26 gitinfo TheGr8Nik: the githooks manpage is available at http://jk.gs/githooks.html
08:28 stormlrd joined #git
08:29 aswen joined #git
08:34 TheGr8Nik There is a method to automatically checkout git hooks with the repo, or I have to copy the file all the times I checkout in a new place?
08:35 achadwick joined #git
08:36 phanimahesh joined #git
08:36 selckin copy, major security issues otherwise
08:37 j416 TheGr8Nik: copy.
08:39 TheGr8Nik So there isn't a method where I haven't to do nothing more than checkout the repo and work on it?
08:39 rueben joined #git
08:39 selckin by not using hooks
08:40 TheGr8Nik what should I use?
08:40 selckin usually people use the build tool for checks like that
08:40 selckin same as a test failure
08:41 j416 don't enforce a workflow with hooks
08:41 j416 people use git in different ways.
08:41 j416 (I would never use a pre-commit hook, for instance)
08:42 selckin also your hook probably won't work on window or mac
08:42 selckin or linux
08:42 selckin whatever flavor you're not currently using
08:43 djb-irc joined #git
08:43 TheGr8Nik do you mean that the code style in the repo should not be defined by hooks be is up to the users to correctly commit?
08:43 TheGr8Nik but*
08:45 j416 TheGr8Nik: that is what I would do.
08:45 TheGr8Nik @seleckin yes, the problem was that, I have a repository running on raspberry and we work on windows
08:45 yuhlw joined #git
08:45 selckin if you want to enforce it, do it in the same way you enforce that your code works, by integrating it in the build, just like the test suite
08:45 j416 TheGr8Nik: you can have a script to check things if you like. But leave it to the developers to choose whether or not to put that in a hook.
08:45 selckin break the build if you're not happy, thety'll fix it
08:46 j416 a hook enforces nothing, it can be bypassed, if that's what you are trying to do.
08:47 vuoto joined #git
08:48 TheGr8Nik Thank you guys, I will go in that direction
08:48 GavinMagnus joined #git
08:50 yuhlw joined #git
08:51 jceb joined #git
08:52 raven-au_ joined #git
08:53 phanimahesh joined #git
08:56 courrier joined #git
08:56 settermjd joined #git
08:56 notebox joined #git
08:58 SoRoot joined #git
08:58 go1111111 joined #git
09:00 Hink joined #git
09:04 encod3 joined #git
09:05 mischat joined #git
09:09 JeroenT joined #git
09:11 allcentury joined #git
09:13 dopesong joined #git
09:15 eletuchy joined #git
09:18 phanimahesh joined #git
09:19 fees joined #git
09:20 digidog joined #git
09:21 jaguarmagenta joined #git
09:21 hahuang62 joined #git
09:22 eletuchy_ joined #git
09:27 nnyk_ joined #git
09:29 cyan__ joined #git
09:30 tgunr joined #git
09:32 eletuchy joined #git
09:36 Segfault_ joined #git
09:37 eijk_ joined #git
09:37 dopesong_ joined #git
09:37 timothy joined #git
09:38 timothy hello, is there any way to create a shallow file in another directory?
09:38 _ikke_ a shallow file?
09:38 timothy I have a 'read only" repository and git clone --depth 1 returns an error about shallow file creation
09:38 timothy fatal: Unable to create temporary file '/home/gerrit3/mobile/whc-a​ndroid.git/shallow_sGSyzQ': Permission denied
09:41 dopesong joined #git
09:42 BtbN you don't have permission to write there then.
09:44 gelei007 hi,genius,i met a problem, what command should i use to see the local commits
09:44 _ikke_ git log
09:44 timothy BtbN: I know, that's my question
09:45 timothy can I change shallow file creation path?
09:45 BtbN Well, fix the permissions.
09:45 BtbN you can't clone to a location where you have no permission to write.
09:45 timothy I can't.
09:45 timothy no, it's not this problem
09:45 timothy it try to create shallow fine on remote repository path
09:46 BtbN Tell the server administrator to fix its permissions then.
09:46 timothy BtbN: no, it's silly to do not support read only repositories.
09:46 gelei007 _ikke:how should i remove some commit;
09:47 BtbN timothy, read-only repos work perfectly fine.
09:47 timothy BtbN: not if you do shallow clone :)
09:48 BtbN works via smart-http and git-daemon for me.
09:48 timothy oh, http
09:49 timothy maybe I only need to change ssh to http
09:50 BtbN if you clone via ssh, the cloning user is expected to have write access to the repository.
09:50 BtbN If you need something more advanced than that, use gitolite.
09:51 SoRoot joined #git
09:53 xpl0iter joined #git
09:54 xpl0iter Hi, I on a branch "foo". So now if I use git push, it will be pushed to this branch instead of the master right?
09:54 BtbN it will be pushed to the upstream branch configured for that local branch, unless you specify where to push it.
09:54 JeroenT joined #git
09:57 gelei007 can i jump to the status that before a specific local commit,i did push the whole progress
09:57 exxi joined #git
09:57 gelei007 can i jump to the status that before a specific local commit,i didn't push the whole progress
09:58 xpl0iter BtbN, What do you man by upstream branch configured for that local branch?
09:58 chris3492 joined #git
09:58 xpl0iter Does that mean: If I created a branch like git checkout -b "foo", then made the changes and commit it. Then do "git push" will push it to the branch "foo"?
09:59 JeroenT joined #git
09:59 jost joined #git
10:02 cdown joined #git
10:02 interne7y joined #git
10:03 dopesong_ joined #git
10:05 keltvek joined #git
10:09 phanimahesh joined #git
10:09 dopesong joined #git
10:11 vuoto joined #git
10:13 sdothum joined #git
10:13 JeroenT joined #git
10:14 JeroenT joined #git
10:15 CJKinni joined #git
10:15 JeroenT joined #git
10:16 JeroenT_ joined #git
10:17 JeroenT joined #git
10:18 JeroenT_ joined #git
10:19 JeroenT joined #git
10:20 JeroenT_ joined #git
10:21 AlexRussia joined #git
10:21 JeroenT joined #git
10:21 son joined #git
10:22 JeroenT joined #git
10:22 M-sbts joined #git
10:22 ahr3n joined #git
10:22 _ikke_ xpl0iter: It all depends on the push.default value you have set
10:23 JeroenT joined #git
10:23 mikecmpbll joined #git
10:23 JeroenT joined #git
10:24 cqi joined #git
10:24 JeroenT_ joined #git
10:25 JeroenT joined #git
10:27 JeroenT joined #git
10:28 JeroenT joined #git
10:28 JeroenT joined #git
10:28 timothy left #git
10:29 JeroenT_ joined #git
10:30 JeroenT joined #git
10:31 JeroenT_ joined #git
10:32 JeroenT joined #git
10:33 JeroenT_ joined #git
10:33 dopesong_ joined #git
10:34 JeroenT joined #git
10:35 JeroenT_ joined #git
10:36 JeroenT joined #git
10:36 dopesong joined #git
10:36 JeroenT joined #git
10:37 JeroenT joined #git
10:37 fracting joined #git
10:38 JeroenT joined #git
10:39 JeroenT joined #git
10:39 JeroenT joined #git
10:39 Impaloo joined #git
10:40 ome joined #git
10:47 vuoto joined #git
10:49 jknetl joined #git
10:52 eijk_ joined #git
10:55 artemisart joined #git
10:55 dsdeiz joined #git
10:55 dsdeiz joined #git
10:56 ahmedelgabri joined #git
11:00 dsdeiz joined #git
11:01 pungi-man joined #git
11:03 dan2k3k4 joined #git
11:07 rahtgaz joined #git
11:14 dopesong_ joined #git
11:15 hanle joined #git
11:15 nilg joined #git
11:16 CheckDavid joined #git
11:16 mehola joined #git
11:16 johnmilton joined #git
11:22 hahuang62 joined #git
11:22 jaguarmagenta joined #git
11:25 mrkat joined #git
11:27 k3rn31 joined #git
11:27 xaa joined #git
11:29 aax joined #git
11:30 mdw joined #git
11:30 zeroed joined #git
11:33 johnmilton joined #git
11:34 artemisart joined #git
11:36 dopesong joined #git
11:37 k3rn31 joined #git
11:38 marcogmonteiro joined #git
11:38 johnmilton joined #git
11:39 nettoweb joined #git
11:39 Bin4ry_ joined #git
11:41 kus joined #git
11:43 SoRoot joined #git
11:43 Rooxo joined #git
11:44 UTAN_dev joined #git
11:44 checkItOut joined #git
11:45 digidog joined #git
11:45 leeN joined #git
11:45 jknetl joined #git
11:46 Bin4ry__ joined #git
11:47 leehambley joined #git
11:50 eijk_ joined #git
11:51 bruce_lee joined #git
11:52 bibek hi, is there a waz to switch to keys? like z and y are swapped in german lazout. i want to swap it back.
11:53 settermjd joined #git
11:53 bibek oops, wrong channel.
11:53 bibek sorrz
11:54 mrkat bibek: in windows, simple, just "install" another keyboard
11:54 mrkat kezboard* :P
11:54 xaa__ joined #git
11:56 JeroenT joined #git
11:57 rnsanchez joined #git
12:00 fscala joined #git
12:00 Panacea joined #git
12:02 kedare_ joined #git
12:02 cek left #git
12:02 interne7y joined #git
12:03 tlaxkit joined #git
12:03 zeroed joined #git
12:04 JeroenT joined #git
12:05 bibek :D
12:07 synthroid joined #git
12:15 phanimahesh bibtek: And in linux you can use xmodmap.
12:15 docnvk joined #git
12:15 i7c Rather setxkbmap.
12:15 i7c Unless you're not alright with a standard layout?
12:16 xao joined #git
12:17 phanimahesh Yep that. To change the keyboard layout to one of the standard ones use setxkbmap, to make your own funky keyboard use xmodmap.
12:17 i7c :]
12:17 narendraj9 joined #git
12:18 rwb joined #git
12:18 phanimahesh I guess looking at what capslock is bound to reveals a lot about the user.
12:19 Panacea joined #git
12:20 Panacea joined #git
12:21 diphtherial left #git
12:21 rgrinberg joined #git
12:21 PCatinean joined #git
12:22 vuoto joined #git
12:23 mehola joined #git
12:24 Gitzilla_ joined #git
12:26 qsx phanimahesh: WHY, TO CAPSLOCK, OF COURSE!
12:28 rkazak joined #git
12:28 fahadash joined #git
12:28 rekoJehT joined #git
12:28 rekoJehT left #git
12:31 Sasazuka joined #git
12:31 jagob joined #git
12:33 frobnic woot?
12:36 cdown joined #git
12:36 Bin4ry__ joined #git
12:36 CussBot joined #git
12:37 mikecmpbll joined #git
12:38 mgoodwin left #git
12:38 robotroll joined #git
12:40 dstarh joined #git
12:41 phanimahesh qsx: o_o
12:41 Gitzilla_ joined #git
12:41 phanimahesh vim and emacs folk often rebind it to esc and ctrl respectively
12:42 phanimahesh And if someone uses neither, it should be bound to nothing, atleast.
12:43 qsx well, i occassionally use caps lock
12:43 qsx this keyboard has too few keys
12:43 phanimahesh I'm planning to bind it to touchpad enable/disable.
12:43 qsx i bound compose to Fn-k (aka scroll lock) for example
12:47 jknetl joined #git
12:50 ahmedelgabri joined #git
12:52 xcesariox joined #git
12:54 mdw joined #git
12:55 ahmedelgabri joined #git
12:56 drodger joined #git
12:57 acetakwas joined #git
12:57 ceaucari joined #git
12:58 acetakwas joined #git
13:00 zivester joined #git
13:03 nnyk_ joined #git
13:03 interne7y joined #git
13:04 fracting joined #git
13:07 mablae joined #git
13:08 italoacasas joined #git
13:10 jimi_ joined #git
13:10 i7c phanimahesh, esc is actually silly since there is ^[
13:11 rgrinberg joined #git
13:11 tchan joined #git
13:14 k3dare joined #git
13:14 sagerdearia joined #git
13:14 JanC_ joined #git
13:15 phanimahesh But it's difficult to reach, apparently. I type pretty well with just two fingers, never found reachability an issue.
13:16 bsanford joined #git
13:16 phanimahesh I have the layout memorized but can't type with the recommended posture, I use whichever finger happens to be near the key at the moment. :P
13:16 dimi1947 joined #git
13:18 i7c You type with two fingers? o_O
13:18 jamesd joined #git
13:21 cqi joined #git
13:21 jceb joined #git
13:21 frem_ joined #git
13:21 Cyclohexane If I have a feature branch and someone has made changes that I need in the develop branch, whats the best way of getting them changes? Google implies rebase but I don't understand the order of commands. 1) git checkout my-feature 2) git rebase develop 3) done?
13:23 hahuang62 joined #git
13:23 ShekharReddy joined #git
13:23 jaguarmagenta joined #git
13:24 i7c Cyclohexane do you want all the changes of the feature branch or just some?
13:24 Cyclohexane i7c: all i think
13:25 phanimahesh i7c: Depends, but yep, I can type with two at a decent speed. Typing is never the bottleneck for me, atleast not enough to bother.
13:25 i7c Cyclohexane, in that case you can rebase the way you said.
13:25 phanimahesh Cyclohexane: Any reason you don't want to merge?
13:25 italoacasas joined #git
13:26 i7c Or that, yes.
13:26 phanimahesh rebase works, btw. Just trying to understand why you thought of rebase.
13:26 k3rn31 joined #git
13:26 rafalcpp in git blame can you highlight any changes done after commit XYZ ?
13:26 Cyclohexane phanimahesh: it ruins the history when comparing changes between develop and my-feature, rebase doesn't do that?
13:27 phanimahesh Cyclohexane: what do you mean it ruins history? A merge maintains history very cleanly.
13:28 Cyclohexane it shows all the develop changes in the merge commit "Merge develop into my-feature" ?
13:29 phanimahesh rafalcpp: git blame <rev>
13:30 i7c You can limit the revisions blame considers but you cannot highlight a line.
13:30 phanimahesh Cyclohexane: Sorry, I misread. I thought you were trying to rebase develop onto feature, and that seemed weird.
13:31 phanimahesh Cyclohexane: For your case, rebase is the way to go.
13:33 allcentury joined #git
13:33 CEnnis91 joined #git
13:34 fuchstronaut joined #git
13:34 tristanp joined #git
13:37 notebox joined #git
13:38 Cyclohexane i7c: phanimahesh: i got a conflict during the rebase, i fixed the conflict, now what? git commit && git rebase --continue ?
13:38 i7c no
13:38 mdw joined #git
13:39 i7c Add the resolved stuff to the index if it isn't already and run git rebase --continue
13:39 i7c without running commit manually
13:39 Cyclohexane add the resolved stuff to the index?
13:39 phanimahesh Aye.
13:39 i7c "stage it"
13:40 i7c or see if it's all staged by the merge tool alrady in git status
13:40 Guest54 joined #git
13:40 GavinMagnus left #git
13:40 phanimahesh To understand why you should just stage it you need to understand how rebase works.
13:40 bsanford joined #git
13:41 phanimahesh Rebase takes a bunch of commits, and applies them on to a new base. It keeps track of those it has applied, and to be applied.
13:42 phanimahesh when it gets interrupted, either due to a conflict or because let's say you used edit in rebase -i,
13:42 ash_workz joined #git
13:42 phanimahesh it will continue exactly where it stopped when you do rebase --continue.
13:42 xcesariox joined #git
13:43 phanimahesh And it stopped before successfully applying the commit that caused the conflict.
13:43 Guest54 joined #git
13:43 phanimahesh If you feel like it you can create a few commits there, and they'll be "inserted" into history at that point.
13:44 phanimahesh So rebase can also used to break up a large commit into smaller chunks, or to tweak a commit somewhere deep in history.
13:44 diegoaguilar joined #git
13:45 Cyclohexane awesome thanks i7c, phanimahesh got it working :)
13:45 phanimahesh If you commit after resolving a conflict, there won't be anything left for rebase to commit, and rebase --continue will complain about an empty commit.
13:46 kpease joined #git
13:49 ahmedelgabri joined #git
13:49 ekinmur joined #git
13:50 enleeten_ joined #git
13:52 JJM joined #git
13:52 Dazzyp joined #git
13:53 Cyclohexane i7c: phanimahesh: i'm about to push but its showing more than just my feature commits, cause of the rebase... i guess i should of said "some" not "all" to your original question?
13:53 phaleth joined #git
13:54 phanimahesh !graph
13:54 gitinfo [!lol] A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
13:55 phanimahesh take a moment, run that and see what you have, and figure out what you want.
13:56 CJKinni joined #git
14:01 Panacea joined #git
14:01 Impaloo joined #git
14:01 cdg joined #git
14:02 sangy joined #git
14:02 Dougie187 joined #git
14:03 i7c Cyclohexane, or maybe your feature branch didn't branch off the development branch?
14:03 Cyclohexane nah its all good
14:03 Cyclohexane just looked odd
14:03 i7c In that case there'd also be rebase with --onto
14:03 i7c Okay :)
14:03 i7c Sometimes odd is right!
14:03 cdg joined #git
14:04 SoRoot joined #git
14:05 intellix joined #git
14:07 ncthom91 joined #git
14:07 zumba_addict joined #git
14:08 chris3492 joined #git
14:08 GavinMagnus joined #git
14:10 JeroenT joined #git
14:10 rwb joined #git
14:10 mdw joined #git
14:11 fracting joined #git
14:11 jost_ joined #git
14:12 ResidentBiscuit joined #git
14:12 ResidentBiscuit joined #git
14:13 ahmedelgabri joined #git
14:13 ceaucari joined #git
14:14 JeroenT joined #git
14:17 phanimahesh joined #git
14:17 fracting joined #git
14:20 mmlb joined #git
14:20 crose joined #git
14:20 Impaloo joined #git
14:21 madewokherd joined #git
14:21 johnmilton joined #git
14:21 shgysk8zer0 joined #git
14:21 tristanp joined #git
14:22 kaldoran joined #git
14:22 Gamecubic joined #git
14:26 MrMojito joined #git
14:28 Panacea joined #git
14:28 khmarbaise joined #git
14:31 m1dnight_ joined #git
14:32 GandalfTheWizard joined #git
14:33 thiago_ joined #git
14:34 ahmed_elgabri joined #git
14:34 bsanford joined #git
14:34 Impaloo joined #git
14:35 intellix joined #git
14:37 austincheney joined #git
14:37 fracting joined #git
14:39 dsdeiz_ joined #git
14:40 tcurdt joined #git
14:40 Lynl joined #git
14:40 Rish joined #git
14:40 SoRoot joined #git
14:43 ahmedelgabri joined #git
14:44 introsp3ctive joined #git
14:44 DolphinDream i'm gtting a wierd difftool error .. it says that difftool is not a git command (even though i have it set up in my gitconfig
14:45 Pieter joined #git
14:47 umbSublime joined #git
14:48 umbSublime joined #git
14:49 davisonio joined #git
14:49 crameth joined #git
14:50 sagerdearia joined #git
14:52 Phreya joined #git
14:54 introsp3ctive joined #git
14:54 cyan__ joined #git
14:55 Noldorin joined #git
14:56 introsp3ctive joined #git
14:56 anu1 joined #git
14:57 ajf- joined #git
14:57 kilo_bravo joined #git
14:58 lindenle joined #git
15:00 mmmveggies joined #git
15:00 notebox joined #git
15:01 Spacew00t joined #git
15:03 clemf joined #git
15:04 interne7y joined #git
15:04 intellix joined #git
15:04 introsp3ctive joined #git
15:05 WayToDoor joined #git
15:06 Slush- joined #git
15:07 introsp3ctive joined #git
15:08 bango2 joined #git
15:10 dmto joined #git
15:11 davisonio joined #git
15:11 Rish joined #git
15:11 zivester joined #git
15:12 MrMojito joined #git
15:12 harha_ joined #git
15:13 diegoviola joined #git
15:14 zincrokx joined #git
15:14 tyreld joined #git
15:14 sharpy joined #git
15:15 zincrokx joined #git
15:15 nnyk_ joined #git
15:15 zincrokx joined #git
15:16 zincrokx joined #git
15:16 brandonw joined #git
15:17 zincrokx joined #git
15:17 harha_ Hey, git noob here. I know the basics and the idea, but that's it. Anyways, I'm uncertain of how I should do this; I want to clone a public repo that is being actively developed, then I want to make some sort of branch of that repo's master which I want to continue developing on my own. But while doing this, I also want to be able to actively merge the remote master branch with my own version of
15:17 harha_ the repo to get all the updates that are being committed by other people. And while doing this I want to have my own remote at my own linux server which I can push my repo into. What kind of setup would be the best for this?
15:18 zincrokx joined #git
15:18 m1dnight_ joined #git
15:19 zincrokx joined #git
15:19 harha_ I did some testing yesterday and now I have my own branch which I've committed some of my work on and I've also rebased it with master (pulled from public remote to master before rebase) and that seemed to work, but then when I tried to push my changes to my own remote git informed me about conflicts that shouldn't exist. Anyways I just chose my local files and the conflict was resolved and I was
15:19 harha_ able to push to my own remote. So it seems to work fine, but is there a better approach for this? Is it bad practise to just keep developing on your own branch which is rebased with master often, instead of actually merging my changes to master?
15:21 MindSpark joined #git
15:21 _ikke_ It's better to merge master into your branch in this case
15:21 khmarbaise joined #git
15:21 MindSpark hi, can someone point me to a good video or article that explains the difference between checkout and reset?
15:21 perlpilot harha_: maybe read something like https://www.atlassian.com/git/​tutorials/comparing-workflows/  or !progit  ?
15:21 gitinfo harha_: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
15:22 harha_ Thanks to both.
15:22 ki0_ joined #git
15:23 jeffreylevesque joined #git
15:24 hahuang62 joined #git
15:24 jaguarmagenta joined #git
15:24 jhe_ joined #git
15:24 explodes joined #git
15:25 explodes How do I permanently and globally enable diff-highlight? (2.9) and compact heuristic??
15:27 intellix joined #git
15:28 LionsMane joined #git
15:29 ferr1 joined #git
15:29 drodger joined #git
15:30 fracting joined #git
15:31 tilpner joined #git
15:31 ericvw joined #git
15:32 aard_ joined #git
15:32 tcurdt joined #git
15:32 aavrug joined #git
15:34 fracting joined #git
15:35 CJKinni joined #git
15:36 i7c explodes, has anything changed regarding diff-highlight in 2.9?
15:37 i7c Because I can't find any hint on that.
15:37 i7c explodes, and the config option for the other is probably this here: https://github.com/git/git/commit/558​0b271af518bae30148edfd42cc8459d8da384
15:38 i7c i.e. diff.compacionHeuristic
15:38 ceaucari joined #git
15:38 i7c explodes, and if I'm right and nothing changed regarding diff-highlight, you can see here how to enable it: https://github.com/git/git/tree​/master/contrib/diff-highlight
15:39 i7c i.e. using the [pager] settings there.
15:41 tilpner joined #git
15:44 exarch joined #git
15:45 ahmedelgabri joined #git
15:46 synthroid joined #git
15:48 madewokherd joined #git
15:50 btcquant joined #git
15:51 synthroid joined #git
15:52 ki0 joined #git
15:52 ronny hi
15:53 ronny is there a simple way to prevent pushes to certain upstreams/upstream branches that im missing
15:53 sargas joined #git
15:54 sargas joined #git
15:55 thefifthsetpin joined #git
15:57 BtbN ronny, install a hook in the "server" repository that rejects them.
15:58 ronny BtbN: the server is github, the toy doesnt differenciate between a ux merge and a push ^^
15:58 BtbN github supports protected branches, but I think that only prevents force-pushes
15:59 BtbN But what's the point if a branch nobody can push to anyway?
15:59 intellix joined #git
15:59 al-damiri joined #git
16:01 thiago joined #git
16:01 Lorcatar joined #git
16:01 durham joined #git
16:02 ronny BtbN: the basci idea is to prevent accidential pushes against the upstream repo in order to enforce a github-pull-request based workflow
16:02 BtbN And their protected branch feature is not enough?
16:03 ronny BtbN: that doesnt prevent pushing new changes, that doesnt prevent pushing master
16:03 ronny *branches
16:03 sebbu joined #git
16:03 ronny BtbN: bascially i want a fetch only remote
16:03 BtbN If you protect master, that's exactly what it does.
16:04 BtbN Something has to have push access, otherwise that repo is entirely useless.
16:04 Seveas ronny: that feature is currently being discussed/implemented on the git mailinglist.
16:04 cdown joined #git
16:04 BtbN protected branches are designed to enforce a pull-reuqest based workflow.
16:04 Seveas you can do a workaround by setting the push url for the remote to file:///dev/null or something :)
16:05 MindSpark sorry for repeating myself, but can someone point me to a good video or article that explains the difference between checkout and reset?
16:05 ronny so remotes can have a different push url
16:05 BtbN Why even have a remote when it just points to dev/null?
16:05 Seveas ronny: yup
16:05 BtbN I think you are misunderstanding something there.
16:06 ronny BtbN: what about fetch only is incomprehensible
16:06 BtbN If something is fetch only, there is nothing to fetch.
16:06 Topic for #git is now Welcome to #git, the place for git help and your morning commute | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-hg: Don't you know that's poison?
16:06 Seveas BtbN: that assumes that there are no other ways commits can go to that remote. Like other collaborators...
16:06 ronny it doesnt mean that no changes go to the remote, its jsut that i cwant to prevent pushing changes there in a way thats outside of the process thats to be followed
16:07 BtbN So protect that branch, that's what it's there for.
16:07 dreiss joined #git
16:07 ronny and since i only ever put changes in via pull requests, i have no need for direct push, and can protect the complete repo
16:07 BtbN You can't push directly anymore then.
16:08 ronny BtbN: i could still by accident put random branches into the remote
16:08 ShekharReddy I have set some directories not to get tracked in the last commit and for the next commit when i do "git add ." it adds the untracked files too, but that is not desired, I want to use git add . but not the untracked files get staged. Is there a way for that
16:08 BtbN So what? Don't do that.
16:08 ronny i want to protect the whole remote from my mistake
16:08 BtbN Nothing can prevent that.
16:08 _ikke_ ShekharReddy: add the files / directories to .gitignore
16:08 ronny and dont make mistakes while leaving them easily availiable is pretty much not a way to solve them
16:08 Seveas ShekharReddy: pastebin the output of git status before doing git add .
16:08 rominronin joined #git
16:09 BtbN You have to explicitly request pushing a new branch somewhere. I don't see how that could happen on accident.
16:09 BtbN Apart from that, it's not possible.
16:09 ShekharReddy Seveas: http://kopy.io/qSF1R
16:10 _ikke_ yeah, add .idea and node_modules to .gitignore
16:10 ronny BtbN: i have seen it happen to me and a few others happen on occasion simply by muscle memory mistake - usually after pressing return its too late
16:10 BtbN Well, complain to github then. Nothing git or anyone here can do about that.
16:11 Seveas ShekharReddy: you say you 'set some directories not to get tracked', what do you mean with that?
16:11 BtbN In the meantime, protect master and just delete an accidentialy pushed branch...
16:11 ronny BtbN: please just stay out of the conversation if all you want to do is troll it tho ^^
16:11 ShekharReddy Seveas:  did u see there that .idea and node_modules are not getting tracked
16:11 BtbN this is #git, not github. github is closed source, we can't change it. It doesn't support doing what you want to do. Accept that or use something else.
16:12 nettoweb joined #git
16:12 Seveas ShekharReddy: yes, but what do you mean with 'set some directories to not get tracked'? I can see they're not tracked, but what did you do?
16:12 Seveas BtbN: easy on the attitude mate. Let's try to be helpful instead.
16:12 ronny BtbN: that implies the only fix is server side, and as already pointed out - even just setting a invalid push url for a remote can fix it - whats wrong with you?
16:12 fscala joined #git
16:12 BtbN The only fix _is_ server side.
16:13 imachuchu joined #git
16:13 BtbN You can allways just do "git push someremote somebranch"
16:13 BtbN Seveas, I don't see any attidude here. I just don't like being called a troll because someone doesn't like the way things are.
16:14 ShekharReddy Seveas:  http://stackoverflow.com/a/1143800/5757626
16:15 Seveas BtbN: well, if you don't see how you're being unhelpful and quite frankly annoying, there's not much I can do. ronny has the answer he needs to get to what he wants, so let's not wast more words on that.
16:15 BtbN There is no answer for that question. I understand the feature he wants, it's entirely possible with a custom push hook. But github doesn't support it.
16:15 Seveas ShekharReddy: that's what I expected, and _ikke_ expected the same given his answer. Follow his suggestion and things should be alright.
16:16 ronny BtbN: git remote set-url --push upstream file:///dev/null already works exactly as i need it
16:16 BtbN ronny, you can't push _at all_ then.
16:16 BtbN Not even to the branch you intend to push to.
16:17 mischat_ joined #git
16:17 khmarbaise joined #git
16:17 ronny BtbN: and that is fine, i asked for fetch only the whole time
16:17 BtbN You can't even fetch then anymore.
16:17 ronny uhm i can
16:17 ronny i just did
16:17 BtbN You fetched from a diffrent remote then.
16:18 ronny no, i have a different fetch url
16:18 tomog999 joined #git
16:18 aswen joined #git
16:18 ronny it simply has 2 urls for that remote, the good one for fetch, a broken one for push
16:18 BtbN Why not just use seperate github account, and don't give push access to the ones the developers use?
16:19 BtbN Or use the git:// scheme. It's read-only.
16:19 fuchstronaut joined #git
16:19 BtbN But if the person doing that has full access to the github repo, the only clean fix for this is server side. Can't just tell everyone to remove the upstream remote.
16:20 ronny can you stop now
16:20 ronny i have a working solution for my case
16:20 BtbN ...
16:20 subhojit777 joined #git
16:20 ronny there is no point in extending it to random use-cases that do not apply
16:21 leehambley joined #git
16:21 MistahKurtz joined #git
16:21 BtbN Well, two more people for my ignore list it seems.
16:21 makinen left #git
16:22 t4nkd joined #git
16:22 _ikke_ BtbN: Watch your attitude please
16:22 ronny yay
16:22 BtbN left #git
16:22 Seveas and _ikke_ wants to be number 3 :)
16:22 _ikke_ I don't mind :-)
16:22 kballou joined #git
16:22 cdg joined #git
16:24 ronny i cant comprehend why people would instead of at least asking just violently deny my problem and try to push me to a completely unfit solution
16:25 Seveas ronny: I think you should let it go as well now.
16:25 vigilvindex joined #git
16:25 ronny k, sorry for lingering on that one
16:26 mehola joined #git
16:27 Seveas http://article.gmane.org/gmane.​comp.version-control.git/295166 for the git mailing list thread on blacklisting remotes
16:27 Seveas http://thread.gmane.org/gmane.c​omp.version-control.git/295166
16:29 Lunatrius joined #git
16:29 ronny Seveas: at first glance it looks not matchigng my use-cases
16:30 Seveas "
16:30 Seveas The general idea is to add a way to prevent accidental push to the
16:30 Seveas wrong repository, we see two ways to do it:"
16:30 Seveas I have to admit that I didn't read/follow the thread, as I'm not interested in the feature at all, but it seems to match
16:30 algun joined #git
16:30 ronny Seveas: the problem i see with it, that it is completely disconnected from remotes
16:31 Seveas dammit, now you're making me read that thread :P
16:31 ronny whops, want a coffee?
16:32 tinajohnson___ joined #git
16:34 pr0ton joined #git
16:35 tgunr joined #git
16:35 axiom_1 joined #git
16:38 xanadu_ joined #git
16:38 axisys joined #git
16:39 f3r70rr35f joined #git
16:39 MrMojito joined #git
16:40 Sasazuka joined #git
16:40 toogley joined #git
16:40 infra-red joined #git
16:41 nb_bez___ joined #git
16:41 blackwind_123 joined #git
16:44 dopesong joined #git
16:44 mischat joined #git
16:45 vuoto joined #git
16:45 fission6 joined #git
16:46 fission6 is there a short hand for doing git push origin (the current branch i am on)
16:47 austincheney joined #git
16:49 _ikke_ git push origin HEAD would work
16:49 osse fission6: git push -u origin master (one time) and then just git push every time after that
16:49 fission6 osse that seems to push all branches
16:49 _ikke_ depends on the push.default setting
16:49 fission6 all tracked branches i think
16:50 osse old version of git do that. new ones don't
16:50 fission6 hmmmm ok
16:50 fission6 maybe i should update my git
16:50 _ikke_ by default
16:50 osse 'git config push.default upstream' to make old behave like new
16:50 fission6 git version 1.7.7
16:50 osse very old inded
16:50 osse indeed
16:50 _ikke_ simple is the new default
16:50 _ikke_ not upstream
16:50 osse oops
16:50 fission6 OK, how can i find a list of other changes if i upgrade?
16:51 osse but afaik simple doesn't even exist in that old gits
16:51 _ikke_ fission6: changelog
16:51 fission6 OK and whats the best way to upgrade GIT on macos
16:51 osse fission6: i'm fairly sure that's the only important default that has changed, and for a less destructive value to boot.
16:51 _ikke_ homebrew I guess
16:52 benwbooth joined #git
16:53 osse i suggest repeating the procedure you used to install it in the first place
16:53 osse unless that just gives you the same one
16:54 backnforth joined #git
16:54 pr0ton joined #git
16:54 benwbooth joined #git
16:55 fission6 OK any other things i should be aware jumping from 1.7 to 2.9
16:55 fission6 i assume my current repos are fine right
16:55 SoRoot joined #git
16:55 fission6 they are "compatiable"
16:56 osse it's all fine
16:58 fission6 yea looks good got 2.9
16:58 fission6 now
16:58 rueben joined #git
16:58 fission6 thanks!
17:01 mikecmpbll joined #git
17:01 al-damiri joined #git
17:01 metastableB joined #git
17:01 vcoinminer joined #git
17:01 XDS2010 joined #git
17:01 _ikke_ osse: osx system install will get you a pretty old version
17:01 fahadash joined #git
17:02 Meow-J joined #git
17:02 NeckBeardPrince joined #git
17:05 mischat_ joined #git
17:05 thefifthsetpin I sometimes use commands like `git push origin ebb629f:foo` to create a branch on a remote.  But if my head happens to be detached, I need to write that more verbosely: `git push origin ebb629f:refs/heads/foo`  Why is that? It's not obvious why that command has anything to do with the branch I'm on.
17:05 interne7y joined #git
17:07 NaN joined #git
17:07 NaN hi there
17:07 NaN any good tutorial that makes me understand the differences between merge/rebase?
17:10 _ikke_ !merge_vs_rebase
17:10 gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel​@lists.sourceforge.net/msg39091.html
17:10 rominronin joined #git
17:11 mdw joined #git
17:11 osse thefifthsetpin: becase git doesn't know whether you want refs/heads/foo or refs/tags/foo or something else.
17:12 osse when you do git push origin blah:foo then git will assume you want the same as what blah has
17:12 mdw joined #git
17:12 thefifthsetpin osse: that makes sense, but in the first case blah was just a sha, not a branch.  Why did it assume I meant a branch?
17:13 osse it does?
17:13 thefifthsetpin yep.  that wasn't even my HEAD sha
17:13 osse I thought it would work the same
17:13 osse i don't know then
17:14 TomyLobo joined #git
17:14 mdw_ joined #git
17:15 osse thefifthsetpin: behaves the same here
17:15 osse even when I'm on a branch git push origin abc123:foo fails
17:15 mdw_ joined #git
17:15 osse "The destination refspec neither matches an existing ref on the remote nor
17:15 osse begins with refs/, and we are unable to guess a prefix based on the source ref.Y
17:19 thefifthsetpin osse: I retract my question.  I'd swear I just tried that, but maybe I forgot to delete origin/foo in between my tests....
17:19 d4rklit3 joined #git
17:20 guardian hello, is there a way to run the pre-commit hook while rebasing interactively?
17:20 osse thefifthsetpin: too late, I have already files papers for a lawsuit against you where I claim compensatory damages
17:20 guardian I installed a pre-commit hooks that formats code and I would like to rebase a bunch of commits with the purpose of that hook to run
17:20 thefifthsetpin Are you near Boulder, CO?  I'll grab you a coffee.....
17:21 osse i am very far from there
17:21 osse i'll let you off the hook this time.
17:21 thefifthsetpin whew
17:21 osse ... and a couple more times. but that's it!
17:21 NaN thanks _ikke_
17:22 GavinMagnus left #git
17:23 rueben joined #git
17:25 LeBlaaanc joined #git
17:29 Eipa joined #git
17:30 xaa__ joined #git
17:31 MrMojito joined #git
17:33 mdw joined #git
17:34 hahuang62 joined #git
17:35 Qioeo joined #git
17:36 BSaboia joined #git
17:36 phanimahesh joined #git
17:36 mikecmpbll joined #git
17:36 BSaboia joined #git
17:36 dreiss joined #git
17:36 BSaboia joined #git
17:37 BSaboia joined #git
17:37 BSaboia joined #git
17:38 dingus joined #git
17:38 dsdeiz joined #git
17:40 dingus joined #git
17:40 irco joined #git
17:41 optraz joined #git
17:41 boudicca joined #git
17:42 optraz how do i list all commit belong to a branch (not the master) ?
17:42 k3rn31 joined #git
17:44 _ikke_ git log master..branch
17:45 felixjet joined #git
17:46 optraz thanks _ikke_ that works!
17:47 nate_c joined #git
17:47 mdw_ joined #git
17:48 UTAN_dev joined #git
17:48 IWishIKnew joined #git
17:48 taylorm joined #git
17:49 hahuang62 joined #git
17:50 JanC joined #git
17:51 d4rklit3 joined #git
17:51 sangy joined #git
17:51 thefifthsetpin joined #git
17:53 JanC joined #git
17:53 Dyonisos joined #git
17:54 Sasazuka joined #git
17:54 ResidentBiscuit TIL you can do that
17:55 Repox joined #git
17:57 jimi_ joined #git
18:01 nidr0x joined #git
18:02 paul424 joined #git
18:03 roentgen joined #git
18:03 xaa joined #git
18:03 vuoto_ joined #git
18:05 sorenb_ joined #git
18:05 vuoto joined #git
18:09 vuoto joined #git
18:09 rominronin joined #git
18:09 vuoto joined #git
18:10 tcurdt joined #git
18:12 swati_27 joined #git
18:12 toydestroyer joined #git
18:12 vuoto_ joined #git
18:12 swati_27 hello? I'm trying to create patch using git diff. And I use "git diff HEAD > diff.patch".
18:13 swati_27 But it doesn't cover all the files in which changes occured.
18:13 swati_27 Please look.
18:14 D-Boy joined #git
18:14 chachasmooth joined #git
18:14 nwkj86 joined #git
18:14 maucar joined #git
18:15 milki swati_27: thats not enough for us to help you
18:15 milki swati_27: start with showing us what you expect and what you get in a !paste
18:15 gitinfo swati_27: Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.
18:16 swati_27 https://www.irccloud.com/pastebin/MJkyCO4Y/
18:17 swati_27 In this folder i use "git diff HEAD > diff.patch"
18:17 hahuang61 joined #git
18:17 Raging_Hog joined #git
18:17 swati_27 the patch doesn't have results of the files mentioned above.
18:18 milki which files arent mentioned?
18:18 swati_27 the files below modified.
18:18 milki swati_27: git will not show diffs for untracked files
18:19 swati_27 Why are they included in untracked files?
18:19 milki swati_27: you can git add them, and then git diff --cached will show them
18:19 jost__ joined #git
18:19 swati_27 okay.. I'll try this!
18:19 milki or you can git add -N them, and git diff will show them
18:19 milki swati_27: git is just letting you know there are files it doesnt know about
18:20 swati_27 milki: Oh.. got it!
18:21 nitrix joined #git
18:22 swati_27 milki: If I want to remove files after I do "git add", what should I use?
18:23 mmmveggies you mean unstage?
18:23 swati_27 yes...
18:24 mmmveggies `git reset HEAD fileName` I believe..
18:24 swati_27 for all files, git reset would be fine?
18:24 zeroed joined #git
18:25 mmmveggies maybe
18:27 mehola joined #git
18:27 nitrix joined #git
18:27 allcentury joined #git
18:28 m0viefreak joined #git
18:29 whomp joined #git
18:29 vuoto joined #git
18:29 whomp i copied a file and made a bunch of changes to it and committed, then i deleted the old file and committed, and i want the whole thing for diff purposes to be considered a file move by github and not a file creation + file deletion. any ideas?
18:31 grawity copy, commit, make changes, then commit again
18:32 ResidentBiscuit joined #git
18:32 grawity what gets considered a "move" is calculated on the fly whenever a diff is shown, and it entirely depends on how similar the two files are
18:35 nfk joined #git
18:36 jbitdrop joined #git
18:39 fuchstronaut joined #git
18:40 sq-one joined #git
18:43 mikecmpbll joined #git
18:43 multi_io joined #git
18:43 benwbooth joined #git
18:43 ki0 joined #git
18:44 evie_hammond joined #git
18:46 sagerdearia joined #git
18:46 milki swati_27: git status would tell you what you can do to files
18:47 swati_27 milki: okay...thanks!
18:47 ynanm joined #git
18:49 Panacea joined #git
18:49 editshare-ericf joined #git
18:56 sparr is there any official/useful mechanism for representing "this new file in this repo is copied from this other repo where it has plenty of history"?
18:57 jstimm joined #git
18:57 milki sparr: no
18:58 milki sparr: you can do it at a repository level with !subtree
18:58 gitinfo sparr: The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-To​ols-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
18:58 milki sparr: but not at the file level
18:58 sparr damn. the repo it's in is prohibitively large
18:58 milki sparr: though you could have a repo with only a single file
18:59 sparr would it be possible to produce a single-file repo by somehow extracting just commits that change the file in question?
18:59 bgold joined #git
19:00 milki sparr: yeah, man git filter-branch can do that
19:00 gitinfo sparr: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
19:01 eijk_ joined #git
19:01 Darcidride joined #git
19:01 mischat joined #git
19:03 siprbaum joined #git
19:04 Dabbit joined #git
19:04 dsdeiz joined #git
19:04 siprbaum joined #git
19:06 interne7y joined #git
19:07 kristofferR joined #git
19:08 SwiftMatt joined #git
19:09 ochorocho__ joined #git
19:09 Cata|Work joined #git
19:09 arooni joined #git
19:09 Dabbit Hello. Sorry to ask a question here, but I seem to be doing something stupid. I've cloned a local repository and get the warning that it's bare. When I try to git pull origin master, I get another warning that origin does not appear to be a git repo
19:10 rominronin joined #git
19:10 grawity what exactly does the warning say?
19:11 ResidentBiscuit Did you change directories to where the repo is?
19:11 Dabbit grawity, fatal: 'origin' does not appear to be a git repository, could not read from remote repo
19:11 Dabbit No, so I have a home server and am just trying to set it up so that I can pull from two different machines.
19:11 grawity that doesn't say anything about it being bare though
19:12 Dabbit grawity, sorry, that's the error before. The clone error says: warning: You appear to have cloned an empty repository.
19:13 grawity so that's not about it being bare; it's about it being empty
19:14 Dabbit grawity, right. But it shouldn't be: I've committed and pushed on the other device.
19:14 khmarbaise joined #git
19:14 grawity do pastebin `git remote -v` of both the original repo and the clone
19:14 grawity I'm curious if they actually point to the same repo on the server
19:15 paul424 joined #git
19:16 harmfulbytes left #git
19:16 Dabbit grawity: http://pastie.org/private/okpktwxf0tiw1jgxyxucuw
19:16 Dabbit There is no output on the laptop for git remote -v
19:16 moritz that means no remote is configured
19:17 grawity that's odd, it should set up a remote even if the clone's empty
19:17 grawity and 2.8.3 certainly does
19:17 moritz uhm, no URL, just a path?
19:17 moritz so no server either
19:17 grawity doesn
19:17 Dabbit moritz, it's local
19:17 yqt joined #git
19:17 grawity doesn't matter if it's local or not
19:17 grawity Dabbit: anyway, `git remote add` it manually then
19:19 ki0_ joined #git
19:19 Dabbit Grawity, I get this error: "couldn't find remote ref master"
19:20 Dabbit grawity Sorry... My head is fried, it has been a long day. I get that error when I try to git pull origin master
19:20 grawity what does `git ls-remote origin` show, from both clones?
19:21 grawity also `git ls-remote .` when cd'd into the "server" repo
19:21 Dabbit Will grab it from my devices now.
19:22 grawity more generally, do they all show a "refs/heads/master" entry?
19:22 nitin joined #git
19:22 Dabbit refs/heads/master displays on my PC, but not on my laptop.
19:22 grawity sounds like they aren't in fact looking at the same remote then
19:23 Dabbit I have an idea why that might be.
19:23 Dabbit ... They are currently sync'd over dropbox.
19:23 grawity dropbox under /media? haven't seen that before
19:24 Dabbit That's just a different drive.
19:24 Dabbit The dropbox folder's stored on a different drive on my PC.
19:24 grawity anyway, if you *must* use dropbox as your "central server", prefer something like https://github.com/anishathalye/git-remote-dropbox
19:24 grawity but why not just add the other PC via ssh as a remote
19:24 Dabbit I don't suppose google drive would be any better? >_>
19:25 grawity probably not; their "syncing" tends to have the same problems
19:25 Dabbit They won't always be on the same network, and dropbox is (hypothetically) providing me with an additional layer of protection.
19:25 jaguarmagenta joined #git
19:25 arooni joined #git
19:26 durham joined #git
19:26 nwkj86 joined #git
19:26 Dabbit Well, I suppose I'm kinda glad I've ran into an error with dropbox sync'ing this early on.
19:26 cyan__ joined #git
19:27 Dabbit I would be in a much worse place, were this to crop up like a few weeks before my PhD was due for submission.
19:27 Dabbit Thanks for the time, grawity.
19:28 mehola joined #git
19:29 rahtgaz joined #git
19:29 aswen joined #git
19:29 umbSublime joined #git
19:29 SwiftMatt joined #git
19:30 Juri_Agarin joined #git
19:33 rossome joined #git
19:36 f3r70rr35f joined #git
19:37 AfroThundr joined #git
19:38 emx joined #git
19:40 umbSublime joined #git
19:42 c0ded joined #git
19:42 c0ded joined #git
19:43 wallyet joined #git
19:44 m2n joined #git
19:47 nine_9 joined #git
19:47 clemf joined #git
19:48 m2n Hi, I have a doubt. I want to use the multiple files of one repository in other repository. For instance consider repo A with multiple files in test_cases folder plus hell lots of other irrelevant folders. Now, I have repo B which wants to use repo A's test_cases folder only. So, whenever A make any update in its test_cases, doing some sort of git submodule update will also update test_cases of B.
19:48 m2n is it possible ?
19:48 ceaucari joined #git
19:49 milki m2n: you cannot pick and choose files to include from repo in another with git
19:49 nine_9 hello there guys, i'm struggling with git... i have a local project and i've created a git repo for it, i can see the .git folder and i can push/pull/commit/etc.. i'm stuck at remote 'pulls' though. i've cloned the repo on another pc (lan) and it's working (the clone branch) but how do you update the 'master' with the changes on the clone branch? when i try to pull it gives errors... github seems so simple and just works :P... i just want to know if i'm doing
19:49 nine_9 it the right way or if i'm supposed to do an extra step i'm missing
19:49 milki m2n: you can however, always make your test script to do it for you
19:51 m2n milki, thanks... :) I was wondering if it's possible through git.. but anyway if it's not possible i will probably update test script to fetch those test cases from that folder.
19:55 milki nine_9: !paste the error would be helpful
19:55 gitinfo nine_9: Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.
19:55 hahuang62 joined #git
19:56 stormlrd joined #git
19:57 eletuchy joined #git
19:57 robotroll joined #git
19:58 macefr joined #git
19:59 GavinMagnus joined #git
19:59 satifant joined #git
19:59 GavinMagnus left #git
20:01 toogley joined #git
20:02 Juzzika joined #git
20:04 IWishIKnew joined #git
20:05 thiago don't use gist for pastes wider than 80 columns
20:05 Juzzika joined #git
20:05 grawity why
20:06 grawity I thought github had already moved to 90-column punchcards
20:08 interne7y joined #git
20:11 rominronin joined #git
20:11 LeBlaaanc joined #git
20:13 JJM joined #git
20:15 eletuchy_ joined #git
20:15 Afb joined #git
20:17 nidr0x joined #git
20:18 arooni joined #git
20:18 eletuchy joined #git
20:21 axiom_1 joined #git
20:23 ceaucari joined #git
20:24 nidr0x joined #git
20:29 whomp grawity, thx :)
20:30 nnyk_ joined #git
20:31 eletuchy_ joined #git
20:31 GT joined #git
20:31 ahmedelgabri joined #git
20:33 eletuch__ joined #git
20:34 sparr m2n: move the test cases to their own repo, make that repo a sub-module of both A and B
20:34 tesuji joined #git
20:36 eletuchy joined #git
20:37 orbitphreak joined #git
20:37 d0nn1e joined #git
20:37 nidr0x joined #git
20:38 eletuchy_ joined #git
20:39 eletuch__ joined #git
20:40 ojdo joined #git
20:40 lethosor joined #git
20:43 eletuchy joined #git
20:43 stormlrd joined #git
20:44 udm_ joined #git
20:44 jimmyeatworld joined #git
20:44 Balliad joined #git
20:45 eletuchy_ joined #git
20:45 tctara joined #git
20:46 Dreamer3 joined #git
20:47 stormlrd joined #git
20:48 radsy joined #git
20:49 eletuchy joined #git
20:51 eletuch__ joined #git
20:51 garethdaine joined #git
20:51 Schwarzbaer__ joined #git
20:54 eletuchy joined #git
20:57 wrouesnel1 joined #git
20:59 eletuchy_ joined #git
20:59 rgrinberg joined #git
21:00 ahr3n joined #git
21:00 matiaslanzi joined #git
21:01 matiaslanzi left #git
21:06 livingstn joined #git
21:06 kadoban joined #git
21:06 DolphinDreamm joined #git
21:09 drbean joined #git
21:09 eletuchy joined #git
21:09 nitin joined #git
21:09 diegoaguilar joined #git
21:12 eletuchy_ joined #git
21:12 rominronin joined #git
21:13 netj joined #git
21:14 blueyed Is it a bug that the autostash is lost after "git rebase -i --autostash" and aborting Vim with ":cq"?  Git says "Could not execute editor" and does not restore the autostash. (git 2.8.3, have not checked 2.9)
21:14 eletuch__ joined #git
21:15 _ikke_ does git stash list it?
21:15 charllie joined #git
21:15 blueyed nope
21:15 slick joined #git
21:15 charllie Hello is there anyone who use gitkraken?
21:15 _ikke_ blueyed: Looks like a bug to me then
21:15 _ikke_ can you create a repeatable test case?
21:16 blueyed _ikke_: yes, it's easy: just add something that would be stashed, call "EDITOR=vim git rebase -i --autostash" and then use ":cq" in Vim to abort and exit non-zero.
21:17 eletuchy joined #git
21:17 blueyed See also http://stackoverflow.com/a/37845822/15690 for a way to get back to it.
21:18 _ikke_ Yeah, the objects seem to still exist, just the stash reflog not updated
21:18 charllie If there is anyone who use gitkraken I will highly appreciate an information how can I make some of files untracked?
21:18 blueyed _ikke_: so the plan would be to add it as a regular stash then?! Makes sense - given that it's there normally.
21:18 blueyed charllie: .gitignore?
21:18 _ikke_ Not sure if that's the goal, or that it should restore it
21:19 hahuang62 joined #git
21:19 charllie gitignore does not work with gitkraken for me?
21:19 cdg joined #git
21:19 blueyed _ikke_: yes, it should probably be restored/unstashed: since "editor" aborted, there was no action taken.
21:21 fling joined #git
21:21 _ikke_ blueyed: I would certainly mention it to the mailing list
21:21 cdg joined #git
21:22 joaumg joined #git
21:23 Gius joined #git
21:23 jorj joined #git
21:23 stormlrd joined #git
21:24 SwiftMatt joined #git
21:24 eletuchy_ joined #git
21:25 benwbooth joined #git
21:26 jaguarmagenta joined #git
21:28 nerium joined #git
21:28 nerium Is there a way to add all files when using git commit?
21:29 mehola joined #git
21:29 vishal nerium: you can use git commit -a if those files are already in the index
21:29 nerium vishal: They are not
21:29 vishal i.e. iff git status shows them as modifued, git commit -a will auto add all of them
21:30 mellernoia joined #git
21:30 vishal if not, you have to add them manually. you could do something like git add . to add everything in the current dir
21:30 nerium Was hoping to avoid that in case git commit fails
21:31 vishal what do you mean
21:31 evie_hammond joined #git
21:31 nerium I mean; git add . && git commit fail; will run git add ., but fail on the next one, but the files are still added
21:31 nerium It wont rollback the command
21:32 ahmedelgabri joined #git
21:32 netcarver joined #git
21:32 vishal nerium: heh I can't say I've ever seen git commit fail, but if you really want to protect against it you can manually rollback on failure..
21:33 vishal something like
21:33 vishal git add .
21:33 vishal git commit || git rm --cached ..
21:33 nerium alias gg=’git add . && git commit -m ’; gg
21:33 backnforth joined #git
21:33 ItSANgo joined #git
21:37 eletuchy joined #git
21:37 nine_9 joined #git
21:38 hhee joined #git
21:38 eletuch__ joined #git
21:42 thefifthsetpin nerium: yours is really a shell scripting question rather than a git one.  Your two git commands don't know about each other; your shell is invoking them in succession.  I suppose `git add . && git commit -m'....' || git reset HEAD .` would come close, but only if the previous state was that no part of . had been added.  Better might be to stick a command at the start that just fixes whatever is causing your git commit to fa
21:42 thefifthsetpin il.  (I'm guessing file permissions are getting restricted?)
21:43 kaldoran joined #git
21:45 eletuchy joined #git
21:46 eletuchy_ joined #git
21:48 joki joined #git
21:48 leehambley joined #git
21:50 Dougie187 left #git
21:50 eletuchy joined #git
21:51 heroux_ joined #git
21:53 barteks2x joined #git
21:54 eletuchy_ joined #git
21:54 jstimm joined #git
21:54 apotry joined #git
21:56 madewokherd joined #git
21:57 benwbooth joined #git
21:58 swati_27 left #git
21:58 rgrinberg joined #git
21:59 tlaxkit joined #git
21:59 exarch left #git
21:59 eletuchy joined #git
22:02 ceaucari joined #git
22:02 eletuchy_ joined #git
22:04 ceaucari joined #git
22:05 eletuchy joined #git
22:10 heroux joined #git
22:11 eletuchy_ joined #git
22:12 hegge joined #git
22:13 rominronin joined #git
22:14 cdg joined #git
22:14 eletuchy joined #git
22:15 LeBlaaanc what's the proper way if i want a separate pull request just for a single commit? I tried branching it.
22:15 t-mart__ joined #git
22:15 LeBlaaanc Basically I have a pull request to just do documentation updates, and then I have one that does some functionaltiy update but i want it to be separate
22:16 ahr3n joined #git
22:17 LeBlaaanc Oh wait I know what I did wrong.
22:19 zumba_addict joined #git
22:22 AKPWD joined #git
22:22 SwiftMatt joined #git
22:25 crayon joined #git
22:25 eletuchy_ joined #git
22:27 quizzi joined #git
22:28 mikecmpbll joined #git
22:30 aidalgol joined #git
22:30 ilogger2 joined #git
22:31 heinrich5991 joined #git
22:32 bond joined #git
22:33 ahmedelgabri joined #git
22:38 fuchstronaut joined #git
22:39 eletuchy joined #git
22:41 boombatower joined #git
22:41 eletuch__ joined #git
22:44 kballou left #git
22:44 bgold joined #git
22:45 xaa joined #git
22:46 eletuchy joined #git
22:48 eletuchy_ joined #git
22:51 eletuchy joined #git
22:53 heroux joined #git
22:55 eletuchy_ joined #git
22:55 mkopriva joined #git
22:57 tristanp joined #git
22:57 anu0 joined #git
23:01 mdw joined #git
23:04 jargan joined #git
23:04 dling` joined #git
23:05 milki_ joined #git
23:05 lebster_ joined #git
23:05 _richardJ joined #git
23:05 WaReZ joined #git
23:06 Guest53224 joined #git
23:06 twisted`_ joined #git
23:06 nephyrin` joined #git
23:06 marko___ joined #git
23:06 Orphis joined #git
23:06 attente_ joined #git
23:06 arooni joined #git
23:06 Rodya_ joined #git
23:07 Keel joined #git
23:07 ozzloy_ joined #git
23:07 djh_ joined #git
23:07 Kuukunen- joined #git
23:07 moritz_ joined #git
23:07 chernjie joined #git
23:07 RoyK^ joined #git
23:07 koro_ joined #git
23:07 maxb_ joined #git
23:07 bambams_ joined #git
23:07 bambams_ joined #git
23:07 pampeho_ joined #git
23:07 same_ol_2eez joined #git
23:07 topi`_ joined #git
23:07 rasmusto_ joined #git
23:07 harv_ joined #git
23:07 comps_ joined #git
23:07 rudi_s_ joined #git
23:07 ulkesh_ joined #git
23:07 ejnahc_ joined #git
23:07 mikap joined #git
23:07 msm___ joined #git
23:08 Mathiasd1 joined #git
23:08 hpfmn_ joined #git
23:08 petn-ran1all joined #git
23:08 ftoulemon joined #git
23:08 marcadde1 joined #git
23:08 progrock_ joined #git
23:08 ffualo_ joined #git
23:08 Roconda_ joined #git
23:08 Pieter joined #git
23:08 sunny256_ joined #git
23:08 knitt1 joined #git
23:08 knitt1 joined #git
23:08 perlpilo1 joined #git
23:08 Danzeel joined #git
23:08 boz_v1_ joined #git
23:08 same_ol_3eez joined #git
23:08 dbolser_ joined #git
23:08 hyperair joined #git
23:08 _r3ply joined #git
23:08 sysanthrope_ joined #git
23:09 Peng__ joined #git
23:09 pitastrudl_ joined #git
23:09 tristanp joined #git
23:10 jlewis_ joined #git
23:10 SoRoot joined #git
23:10 MattMaker joined #git
23:11 ozzloy_ left #git
23:11 Dandelock[Gone] joined #git
23:11 Karunamon|2 joined #git
23:11 pleroma joined #git
23:11 loglaunc- joined #git
23:11 SenpaiSilver_ joined #git
23:11 Korvin[BNC] joined #git
23:11 Korvin[BNC] joined #git
23:11 jamieshepherd_ joined #git
23:11 SirCmpwn_ joined #git
23:11 fugi joined #git
23:11 Wiched joined #git
23:11 HedgeMage_ joined #git
23:11 ybden- joined #git
23:11 c0 joined #git
23:11 swilsonau_ joined #git
23:11 Ravana- joined #git
23:11 Saturn286 joined #git
23:11 abh joined #git
23:11 ahf_ joined #git
23:11 cydrobolt_ joined #git
23:11 netwoodle joined #git
23:11 hide_ joined #git
23:11 MerinoBailon joined #git
23:11 kennon_ joined #git
23:11 varesa_ joined #git
23:11 e-dardl joined #git
23:11 MTwister joined #git
23:11 KebabBob joined #git
23:11 EspadaV8 joined #git
23:11 EspadaV8 joined #git
23:11 BombAw joined #git
23:11 LHL_Jordan joined #git
23:11 ozzloy joined #git
23:11 hfp_ joined #git
23:11 tterrag|alt joined #git
23:11 CentaurW- joined #git
23:12 m0ltar_ joined #git
23:12 ozzloy joined #git
23:12 musca` joined #git
23:12 god^ joined #git
23:12 Bucciarati_ joined #git
23:12 RiPer_ joined #git
23:12 leonarth_ joined #git
23:12 Afforess joined #git
23:12 uranellus_ joined #git
23:12 qsuscs joined #git
23:12 Ankhers_ joined #git
23:12 jetpackjoe joined #git
23:12 LiENUX joined #git
23:12 Riviera joined #git
23:12 artgoeshere_ joined #git
23:13 DelphicOkami joined #git
23:13 lamont` joined #git
23:13 Bombe joined #git
23:13 Orbitrix joined #git
23:13 rmrrn joined #git
23:13 rmrrn joined #git
23:14 andschwa joined #git
23:14 andschwa joined #git
23:14 rominronin joined #git
23:15 sfix joined #git
23:15 BeerSerc joined #git
23:16 BSaboia joined #git
23:17 clemf joined #git
23:18 gnarf_ joined #git
23:18 terabyte joined #git
23:18 fission6 joined #git
23:18 blueyed joined #git
23:18 hplar joined #git
23:18 dalias joined #git
23:18 nioncode joined #git
23:18 thomas joined #git
23:18 t0mex joined #git
23:19 noctux joined #git
23:19 Silex joined #git
23:19 reizuki joined #git
23:19 marlun joined #git
23:19 marlun joined #git
23:19 osse joined #git
23:19 tmh1999 joined #git
23:19 tomek joined #git
23:19 Takumo joined #git
23:19 Takumo joined #git
23:19 tomek joined #git
23:19 DonRichie joined #git
23:19 spaceone joined #git
23:19 malide joined #git
23:19 fold4 joined #git
23:19 gnoirzox joined #git
23:19 Zeedox joined #git
23:19 cwillu_at_work joined #git
23:19 johntramp joined #git
23:19 sparr joined #git
23:19 obiwahn joined #git
23:20 marienz joined #git
23:20 Mo0O joined #git
23:20 udm_ joined #git
23:20 autofly joined #git
23:20 catbeard joined #git
23:20 quadz joined #git
23:20 Chaser joined #git
23:20 neachdainn joined #git
23:20 danemacmillan joined #git
23:20 crayon joined #git
23:20 groundnuty joined #git
23:21 hahuang62 joined #git
23:21 tomboy64 joined #git
23:22 nickthetait joined #git
23:22 yanome joined #git
23:22 kriskropd joined #git
23:24 interne7y joined #git
23:26 peepsalot joined #git
23:26 LeBlaaanc joined #git
23:27 jaguarmagenta joined #git
23:28 m1dnight_ joined #git
23:30 mehola joined #git
23:30 benwbooth joined #git
23:32 austincheney joined #git
23:34 ahmedelgabri joined #git
23:38 nick123_ joined #git
23:39 dstarh joined #git
23:42 clemf joined #git
23:43 clemf joined #git
23:43 backnforth joined #git
23:44 Vinnie_win joined #git
23:44 jimi_ joined #git
23:44 mablae_ joined #git
23:44 backnforth joined #git
23:46 attente_ left #git
23:49 Chunk2 joined #git
23:50 mkopriva joined #git
23:50 musca` left #git
23:51 ahr3n_ joined #git
23:51 musca joined #git
23:51 cdg joined #git
23:54 backnforth joined #git
23:56 diegoaguilar joined #git
23:57 diegoaguilar joined #git
23:58 hahuang62 joined #git
23:58 diegoaguilar joined #git
23:59 udm joined #git
23:59 rkazak joined #git

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