Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-08

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

All times shown according to UTC.

Time Nick Message
00:00 joshszep joined #git
00:04 vapre git version 2.7.4  .. requires user and password both in http url? google doesn't give me anything.
00:04 APNG uh I can't push to a git:// URL???
00:05 APNG I'm using $ git daemon --verbose --reuseaddr --base-path=`pwd` --enable=upload-pack --enable=upload-archive --enable=receive-pack --export-all `pwd`
00:05 APNG it gets to [27893] Request receive-pack for '/renata'
00:05 APNG then it sits there doing nothing...
00:06 Achylles joined #git
00:07 Vinnie_win_l joined #git
00:11 APNG ugh
00:17 bremner assuming you want push without authentication, the man page tells you how to enable it.
00:17 bremner it's not enabled by default because it is without authentication.
00:20 thiago joined #git
00:20 webdev007 joined #git
00:21 bbear joined #git
00:22 bbear hello, i have a question about git.
00:22 vapre i want to push with authentication ; )
00:22 bbear I have a bare repo on my server and when I push
00:22 vapre this git version really doesn't ask anymore for username and/or password for urls it seems .. you need  to supply them in the url
00:23 bbear I want my code to be redployed in production.
00:24 bbear It would go like that (local)git push ->(server)receive data ->(server) copy code in production-> (server) restart
00:24 bbear how could I do that ?
00:24 bbear please ?
00:24 bbear any advice ?
00:25 m0viefreak !deploy
00:25 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
00:26 cagedwisdom joined #git
00:26 bbear thanks
00:27 kexmex joined #git
00:27 unbalanced joined #git
00:27 lindenle joined #git
00:28 ctcrnitv I know this isn't directly about git, but can anyone find a way to "skip to level" for this?
00:28 ctcrnitv https://github.com/Gazler/githug
00:29 toogley joined #git
00:29 Droolio joined #git
00:29 m0viefreak "skip to level"?
00:29 anuxivm joined #git
00:30 ctcrnitv yeah, it's a game for learning git
00:30 ctcrnitv you progress from one level to the nexxt
00:30 ctcrnitv there's a command that will let you list the levels
00:30 ctcrnitv but I don't see any documentation to skip to the level you want
00:30 bbear I can really put any bash code in my hook ?
00:31 ctcrnitv and I don't want to play through all of the just to get to one
00:31 ikelso joined #git
00:31 bbear what are constants we want to use with hooks ?
00:31 netj joined #git
00:32 m0viefreak ctcrnitv: well i dont know that game, but from a very slight read of the readme, i'd say use command "level <level>"
00:32 ctcrnitv nope =/ tried that
00:33 * ctcrnitv error is: Could not find task "level".
00:33 ctcrnitv there might just not be a way
00:34 m0viefreak bbear: if your hook script is a bash script, sure
00:35 m0viefreak and what "constansts" do you mean?
00:36 FSadino joined #git
00:37 treia joined #git
00:37 bbear arguments of the hook
00:38 dreiss joined #git
00:38 m0viefreak its documented: https://git-scm.com/docs/githooks
00:38 bbear http://krisjordan.com/essays/setting-up-push-to-deploy-with-git
00:44 _sbalousek joined #git
00:45 re1 joined #git
00:45 nobody joined #git
00:48 almy joined #git
00:49 b1tchcakes joined #git
00:53 svm_invictvs joined #git
00:53 Incisor_Marks joined #git
00:57 Fabricio20 joined #git
01:04 APNG bremner, isn't that what "--enable=receive-pack" does?
01:04 bremner APNG: yeah, sorry, missed that
01:05 APNG bremner, so why's it locking up?
01:05 cdown_ joined #git
01:05 _sbalousek joined #git
01:06 dsdeiz joined #git
01:06 dsdeiz joined #git
01:06 bremner dunno. maybe try with --informative-errors
01:08 _sbalousek joined #git
01:09 hahuang61 joined #git
01:10 wxg joined #git
01:11 tayfunyasar joined #git
01:12 arescorpio joined #git
01:12 yurikoles joined #git
01:13 matsaman bremner: heh
01:13 matsaman I like that the existence of --informative-errors can only mean the default is uninformative errors =P
01:13 davimore joined #git
01:13 yurikoles how to separate and apply needed patches from large mailbox?
01:13 bremner yeah, git-daemon is kindof a PITA, on purpose
01:13 bremner yurikoles: man git am
01:13 gitinfo yurikoles: the git-am manpage is available at http://jk.gs/git-am.html
01:13 bremner oh, you want to filter somehow?
01:14 yurikoles yes, I had read i but can't find a solution
01:14 yurikoles yes
01:14 yurikoles I need to filter it first
01:14 bremner yurikoles: if it was me I'd apply them all then rebase -i to filter
01:14 yurikoles there is 4k emails in my inbox :)
01:14 yurikoles I mean this mail-list
01:15 yurikoles those AMD guys are very busy sending patches to mailing list so they have no time to set up a repo with all of them
01:16 bremner it sounds more like a question for your mail client
01:17 bremner just save the ones you want to a smaller mailbox. I don't think git is really able to help you much.
01:17 yurikoles But it's more than that because I don't have all required emails still
01:17 zq joined #git
01:17 yurikoles The very first patches on topic are in kernel patchwork
01:17 yurikoles and in mailing list
01:17 newdimension left #git
01:18 zq is there a shortcut to listing commits that match an author or message?
01:18 yurikoles --author?
01:18 _sbalousek sbalousek has joined the channel.
01:18 zq that excludes matching by message, though
01:19 zq to rephrase, i want all commits whose message or author contain the term "xyz"
01:20 jstimm joined #git
01:23 bremner zq: might need two runs, but you could use --grep for the commit messages
01:23 marlinc joined #git
01:24 zq yeah, i really wanted one run
01:27 GodGinrai joined #git
01:27 rominronin joined #git
01:30 thierryp joined #git
01:32 aeontech joined #git
01:32 tayfunyasar joined #git
01:33 ToBeCloud joined #git
01:37 CheckDavid joined #git
01:37 APNG bremner, no error
01:38 APNG it gets to [19261] Request receive-pack for '/renata'
01:38 APNG then it locks up
01:38 APNG does nothing
01:38 APNG at all
01:38 APNG no CPU usage
01:38 brent__ joined #git
01:42 regald_ joined #git
01:42 DINOWILLIAM joined #git
01:42 SwiftMatt joined #git
01:45 perrier-jouet joined #git
01:46 boombatower joined #git
01:48 fahadash joined #git
01:48 slappymcfry joined #git
01:49 elijah joined #git
01:49 khagler joined #git
01:50 mizu_no_oto joined #git
01:53 marlinc joined #git
01:55 NeverDie joined #git
01:56 roelmonnens joined #git
01:57 tayfunyasar joined #git
01:59 gmac joined #git
02:02 cdown joined #git
02:03 thiago joined #git
02:04 luhem joined #git
02:04 SpeakerToMeat joined #git
02:06 nidr0x joined #git
02:08 rnsanchez_ joined #git
02:09 jgrasser joined #git
02:13 bronson joined #git
02:16 howitdo joined #git
02:17 Shentino joined #git
02:18 finalbeta joined #git
02:21 brent__ joined #git
02:23 luhem joined #git
02:31 thierryp joined #git
02:32 ikelso joined #git
02:34 romerocesar joined #git
02:35 bronson joined #git
02:37 luhem joined #git
02:39 inflames joined #git
02:40 ikelso joined #git
02:40 Vampire0 joined #git
02:43 diogenese joined #git
02:46 Belxjander joined #git
02:46 d^sh joined #git
02:46 Belxjander left #git
02:51 zivester joined #git
02:51 ikelso joined #git
02:54 SwiftMatt joined #git
02:59 rominronin joined #git
03:00 pks joined #git
03:01 Gsham joined #git
03:01 diogenese joined #git
03:03 netj joined #git
03:06 atrigent joined #git
03:07 brent__ joined #git
03:08 Gsham joined #git
03:10 hahuang61 joined #git
03:10 nettoweb joined #git
03:10 Anja joined #git
03:12 dsdeiz joined #git
03:12 dsdeiz joined #git
03:16 diogenese joined #git
03:25 Gsham joined #git
03:26 Vortex35 joined #git
03:27 nettoweb1 joined #git
03:27 GodGinrai joined #git
03:27 hexagoxel joined #git
03:28 Belxjander joined #git
03:29 Belxjander has anyone here ever needed a "cloning proxy"? where you have a proxy copy of an external repo on a LAN storage device that local machines then use to pull and push changes to ?
03:33 ojacobson DAYJOB has a gitolite instance for that, for those times when github is down
03:33 netj joined #git
03:34 Belxjander left #git
03:35 Anja joined #git
03:36 Anja joined #git
03:37 metachr0n joined #git
03:38 Anja joined #git
03:40 sunri5e joined #git
03:42 regedit joined #git
03:42 SpeakerToMeat joined #git
03:46 thiago joined #git
03:47 mahakal joined #git
03:48 aeontech joined #git
03:51 menip joined #git
03:54 Nilesh_ joined #git
03:55 justanotheruser joined #git
03:55 lindenle joined #git
03:56 romerocesar joined #git
03:56 fstd_ joined #git
03:57 ki0 joined #git
03:58 shinnya joined #git
04:00 chachasmooth joined #git
04:01 gmac joined #git
04:02 anuxivm left #git
04:03 dreiss joined #git
04:06 Gsham joined #git
04:21 azerus joined #git
04:26 sargas joined #git
04:31 rominronin joined #git
04:32 aeontech left #git
04:33 thierryp joined #git
04:45 jstimm joined #git
04:52 ikelso joined #git
04:57 SpeakerToMeat joined #git
04:58 weckstrom joined #git
05:00 bronson joined #git
05:00 Limes__ joined #git
05:03 wrouesnel1 joined #git
05:04 chachasmooth joined #git
05:05 jeffreylevesque joined #git
05:07 danimal2 joined #git
05:07 chosafine joined #git
05:10 ertes joined #git
05:10 hahuang61 joined #git
05:18 zq left #git
05:18 Nugget joined #git
05:20 ianmethyst joined #git
05:21 nikivi joined #git
05:24 ki0 joined #git
05:26 finalbeta joined #git
05:28 GodGinrai joined #git
05:30 ShapeShifter499 joined #git
05:32 atrigent joined #git
05:38 sdothum joined #git
05:39 thiago joined #git
05:39 netj joined #git
05:40 bmahe joined #git
05:44 mahakal joined #git
05:46 cyan__ joined #git
05:49 blackwind_123 joined #git
05:49 Cabanossi joined #git
05:50 netj joined #git
05:51 bmahe joined #git
05:52 cbegin joined #git
05:53 ikelso joined #git
05:55 cdesai joined #git
05:56 safe joined #git
05:59 lindenle joined #git
05:59 aavrug joined #git
06:01 bronson joined #git
06:02 rominronin joined #git
06:04 YuGiOhJCJ joined #git
06:05 davimore_ joined #git
06:06 freimatz joined #git
06:11 DonRichie joined #git
06:11 rivarun joined #git
06:15 romerocesar joined #git
06:22 romerocesar joined #git
06:23 dreiss joined #git
06:23 jason237 joined #git
06:26 ki0 joined #git
06:28 gmac joined #git
06:31 cagedwisdom joined #git
06:35 mahakal joined #git
06:35 thierryp joined #git
06:35 _ng joined #git
06:37 subhojit777 joined #git
06:39 gopi1410 joined #git
06:41 elh9 joined #git
06:41 finalbeta joined #git
06:43 aw1 joined #git
06:45 SwiftMatt joined #git
06:45 zuck05 joined #git
06:46 Dev0n joined #git
06:50 cagedwisdom joined #git
06:54 jj-_ left #git
06:54 ikelso joined #git
06:54 BlackMaria joined #git
06:55 jj- joined #git
06:59 zefferno joined #git
07:00 tarvos joined #git
07:00 vuoto joined #git
07:00 SwiftMatt joined #git
07:00 pijiu joined #git
07:00 dermoth joined #git
07:01 bronson joined #git
07:02 pijiu joined #git
07:04 Anja joined #git
07:06 guzzlefry joined #git
07:06 trimosier joined #git
07:07 rivarun joined #git
07:08 trimosier joined #git
07:11 hahuang61 joined #git
07:15 Shock- joined #git
07:20 SwiftMatt joined #git
07:24 tgy joined #git
07:25 guzzlefry left #git
07:27 ki0 joined #git
07:29 thiago joined #git
07:29 GodGinrai joined #git
07:30 chosafine joined #git
07:33 dsdeiz joined #git
07:34 Shock- joined #git
07:35 rominron_ joined #git
07:38 pijiu joined #git
07:38 zuck05 joined #git
07:38 chandu20 joined #git
07:39 pijiu joined #git
07:40 pijiu joined #git
07:42 pijiu joined #git
07:43 pijiu joined #git
07:45 pijiu joined #git
07:47 chandu20 joined #git
07:49 frobnic joined #git
07:51 finalbeta joined #git
07:58 ctcrnitv joined #git
07:59 ctcrnitv i cloned a repo, it has a tag named "foo" and a remotes/origin/foo
07:59 ctcrnitv i want to checkout the branch instead of the tag
07:59 ctcrnitv but git checkout foo checks out the tag, why does it to this
08:01 _ikke_ ctcrnitv: those are gits rules to disambiguate
08:01 _ikke_ note that if you do git checkout foo, git tries to guess what you meant because you weren't very specific
08:01 ctcrnitv makes sense, I get there's ambiguity
08:02 _ikke_ ctcrnitv: So you want to create a local branch based on the remote tracking branch?
08:02 ctcrnitv yes
08:02 _ikke_ git checkout -b foo origin/foo
08:02 _ikke_ (git checkout foo is a automagic shortcut in the case there is no ambiguity)
08:05 ctcrnitv It worked!
08:05 ctcrnitv I thought of doing git checkout -b foo
08:05 ctcrnitv but assumed it would make a new branch at the current commit which is not what I wanted.
08:05 _ikke_ correct
08:06 ctcrnitv nice. thanks! I'm playing a game called git-game (on github)
08:07 ctcrnitv it's a really fun way to learn git imo
08:07 _ikke_ ah ok, cool
08:07 ctcrnitv thanks again for the help I will probably be back
08:11 SteffanW joined #git
08:13 cyan__ joined #git
08:18 ShekharReddy joined #git
08:18 zefferno joined #git
08:18 timvisher joined #git
08:19 jstimm joined #git
08:21 SwiftMatt joined #git
08:25 hahuang61 joined #git
08:27 meocs joined #git
08:28 ki0 joined #git
08:31 gmac_ joined #git
08:33 xaa joined #git
08:36 thierryp joined #git
08:37 tayfunyasar joined #git
08:42 jagob joined #git
08:43 jknetl joined #git
08:44 mrkake joined #git
08:49 Shock- joined #git
08:53 jagob joined #git
08:56 ikelso joined #git
08:56 ayjay_t joined #git
09:00 chandu20 joined #git
09:01 _main_ joined #git
09:02 _main_ joined #git
09:02 aavrug_ joined #git
09:02 bronson joined #git
09:04 __main__ joined #git
09:06 rominron_ joined #git
09:06 brent__ joined #git
09:13 thiago joined #git
09:16 silnp joined #git
09:17 chandu20 joined #git
09:20 King_Hual joined #git
09:20 aavrug_ joined #git
09:21 pijiu joined #git
09:21 thierryp joined #git
09:22 pijiu joined #git
09:23 pks joined #git
09:24 overlord_tm joined #git
09:24 pijiu joined #git
09:27 nd_ joined #git
09:29 ki0 joined #git
09:29 vrlx joined #git
09:31 pbrewczynski joined #git
09:32 bannakaf_ joined #git
09:33 stevenbenner joined #git
09:38 hhee joined #git
09:40 a_thakur joined #git
09:41 SwiftMatt joined #git
09:50 Limes__ joined #git
09:51 jagob joined #git
09:58 pks joined #git
10:03 lindenle joined #git
10:03 bronson joined #git
10:05 t0by joined #git
10:05 t0by joined #git
10:08 fragstone joined #git
10:09 armyriad joined #git
10:11 rnsanchez_ joined #git
10:12 a_thakur joined #git
10:15 Balliad joined #git
10:16 _rnsanchez_ joined #git
10:21 Balliad joined #git
10:25 dhollinger joined #git
10:26 SwiftMatt joined #git
10:26 catsup joined #git
10:27 catsup joined #git
10:29 Achylles joined #git
10:30 ki0 joined #git
10:30 rominronin joined #git
10:32 joco42 joined #git
10:33 vdv joined #git
10:34 jjasinski joined #git
10:35 freimatz joined #git
10:35 jagob joined #git
10:39 rominron_ joined #git
10:39 timewalker joined #git
10:41 Balliad joined #git
10:45 timewalker joined #git
10:46 rt joined #git
10:48 jimmyeatworld joined #git
10:49 a3Dman joined #git
10:49 toogley joined #git
10:50 timewalker joined #git
10:51 miczac joined #git
10:53 thiago joined #git
10:54 nick123 joined #git
10:54 jagob joined #git
10:54 hlysig joined #git
10:54 oskarkv joined #git
10:55 ki0 joined #git
10:55 a_thakur joined #git
10:56 timewalker joined #git
10:56 fragstone joined #git
10:57 fragstone joined #git
10:57 ikelso joined #git
10:57 fragstone joined #git
10:58 acetakwas joined #git
10:58 fragstone joined #git
10:58 shinnya joined #git
10:59 doener joined #git
10:59 Bizkit joined #git
11:00 fragstone joined #git
11:03 jagob joined #git
11:06 nettoweb joined #git
11:06 spacelord_ joined #git
11:07 robotroll joined #git
11:08 yurikoles joined #git
11:08 Gloomy joined #git
11:10 jagob joined #git
11:11 jas4711 joined #git
11:12 rivarun joined #git
11:12 tester_ joined #git
11:14 Jackneill_ joined #git
11:19 ayjay_t joined #git
11:20 dhollinger joined #git
11:22 yurikoles joined #git
11:26 cyan__ joined #git
11:27 timewalker joined #git
11:32 jnavila joined #git
11:32 timewalker joined #git
11:35 jagob joined #git
11:37 timewalker joined #git
11:38 joki joined #git
11:40 done joined #git
11:44 govg joined #git
11:45 cbegin joined #git
11:46 cbegin left #git
11:46 timewalker joined #git
11:49 howdoi joined #git
11:52 ertesx joined #git
11:52 timewalker joined #git
11:53 fragstone joined #git
11:53 chandu20 joined #git
11:56 WaReZ joined #git
11:57 jozwior joined #git
12:04 phanimahesh joined #git
12:04 bronson joined #git
12:05 jozwior joined #git
12:08 cdown joined #git
12:10 rominron_ joined #git
12:12 pietv joined #git
12:15 jagob joined #git
12:20 mahakal joined #git
12:21 treia joined #git
12:23 mahakal_ joined #git
12:25 ki0 joined #git
12:27 BSab joined #git
12:29 masuberu joined #git
12:30 TheWild joined #git
12:30 zivester joined #git
12:31 jnavila joined #git
12:31 TheWild hello
12:31 TheWild I need git pull --ignore-if-not-public
12:32 Achylles joined #git
12:33 finalbeta joined #git
12:33 TheWild I couldn't find anything revelant in documentation
12:34 Murii_ joined #git
12:35 cqi joined #git
12:36 bremner TheWild: I don't know what that option means.
12:37 TheWild this isn't an official option. I'm just doing git pull over a bunch of repositories via batch file and I don't want to be asked for password when out of nothing one or more repositories become private (or non-existent in case of Github)
12:39 thiago joined #git
12:43 Balliad joined #git
12:45 jagob joined #git
12:47 WakiMiko joined #git
12:50 jagob joined #git
12:54 dwts joined #git
12:56 astrofog joined #git
12:57 ojdo joined #git
12:57 chandu20 joined #git
12:59 ikelso joined #git
13:01 tayfunyasar joined #git
13:01 UTAN_dev joined #git
13:05 garethdaine joined #git
13:06 davimore joined #git
13:06 Limes__ joined #git
13:07 Guest7874 joined #git
13:08 Tobbi joined #git
13:12 sdothum joined #git
13:14 tojo joined #git
13:17 m0viefreak joined #git
13:19 pks joined #git
13:21 nedbat TheWild: i would have thought there would be a --no-interactive or something.
13:22 Oebele joined #git
13:24 Oebele joined #git
13:25 metachr0n joined #git
13:28 elh9 joined #git
13:31 govg joined #git
13:33 Guest7874 left #git
13:33 j416 TheWild: how many zillion repos is it? can you not just press a key manually to skip the ones inaccessible?
13:35 robotroll joined #git
13:35 TheWild j416: 94 repos currently. I would like to leave it in background and come back after a bunch of minutes.
13:35 j416 I see
13:35 j416 why do you need to fetch from them all?
13:37 TheWild this is a bunch of addons to the game
13:37 overlord_tm joined #git
13:38 j416 you could run them in parallel and kill ones that stalled
13:38 ocbtec joined #git
13:39 jbitdrop joined #git
13:39 gopi1410 joined #git
13:39 zeroed joined #git
13:39 zeroed joined #git
13:39 TheWild doesn't git write anything to my home directory (that could mess up parallelism)?
13:40 j416 no
13:40 elh9 joined #git
13:42 TheWild I'll try it out hoping Windows will get "start git pull" right.
13:42 rominronin joined #git
13:43 j416 odd windows shell :)
13:44 Gloomy joined #git
13:45 TheWild quick question now: when git prompts for password, it ensures that it is a tty and not a pipe?
13:46 j416 assumes would be the right word
13:46 j416 in which case I would guess so but try it
13:46 TheWild I think "git pull < two-empty-lines"
13:46 j416 good idea.
13:47 j416 doubt it'll work
13:47 kexmex joined #git
13:47 j416 worth a shot
13:47 j416 though
13:48 osse TheWild: try  export GIT_ASKPASS=false
13:49 SteffanW joined #git
13:49 TheWild osse: error: unable to read askpass response from 'false'
13:50 knod joined #git
13:50 treehug88 joined #git
13:50 knod When pushing to github, I got the error "! [remote rejected] master -> master (pre-receive hook declined)". The size of the push is "96.37 KiB". What's going on? Is this a git error or a github error?
13:51 osse TheWild: Sounds good to me
13:52 osse Do you get that error on repos that don't require authentication?
13:52 osse If not then hooray
13:52 tvw joined #git
13:54 knod All I get with git status is that my master is one commit ahead of origin
13:54 knod origin/master
13:55 osse knod: The server denies your push
13:55 knod osse: Yes, but why is that?
13:56 osse knod: I don't know. The error seems to be size related, but 100 kib isn't much
13:57 knod Yeah :/
13:57 osse It's neither a git nor github error. It's an error from the hook that a human has installed.
13:57 cdg joined #git
13:57 osse Locate said human and ask questions
13:57 TheWild j416, osse: finally got it to work. set GIT_ASKPASS=1line         source code of 1line.c: http://kopy.io/jh3jG
13:57 knod I've never heard "hook" in relation to git before. What does that mean?
13:57 knod Where can I find that?
13:57 knod In their code
13:58 TheWild j416, osse: thanks for help.
13:58 TheWild IMHO git was pretty inconvenient in this case.
13:58 knod What I did was install an npm module
13:59 osse It's a weird request, honestly.
13:59 osse knod: man githooks
13:59 gitinfo knod: the githooks manpage is available at http://jk.gs/githooks.html
13:59 osse knod: It's the remote that rejects. Not your Git locally
13:59 dodobrain joined #git
13:59 osse Or are you said human?
13:59 Gloomy joined #git
13:59 knod osse: I am said human. It's my repo.
13:59 knod It's the first time it's done this
13:59 osse TheWild: What failed with my approach?
14:00 TheWild git thinks that "false" is a command but... I'm working in Windows :(
14:00 dodobrain joined #git
14:01 dodobrain joined #git
14:01 bl0m1_ joined #git
14:01 Muzer joined #git
14:02 dodobrain joined #git
14:02 kyan joined #git
14:02 Tatou joined #git
14:02 Tatou Howdy. I am sick of my editors giving inconsistent/bad indentation
14:02 Tatou Can I use git hooks to help me lint?
14:03 dodobrain joined #git
14:03 osse TheWild: Hmm I expected false to be included
14:03 knod osse: As far as I know, I haven't added any hooks
14:03 dodobrain joined #git
14:04 Tatou knod: Was that to me?
14:04 knod Tatou: no, that was to osse
14:04 osse So I guess it's not run through a shell, so you can't do GIT_ASKPASS='echo ""' either
14:04 Tatou Are you sure? :(
14:05 bronson joined #git
14:05 osse knod: Are you saying you're in control of the remote repo you're pushing to? You have your own github instance?
14:05 faux___ joined #git
14:06 lindenle joined #git
14:07 sbalousek joined #git
14:07 dsdeiz hi all, kind of offtopic but is there a popular list of git aliases?
14:07 ij «oh my zsh» might have some
14:08 ij https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/git/git.plugin.zsh
14:08 dsdeiz oh, aside from omz, or would you recommend i just copy them?
14:09 ij That's certainly an option. Not sure what you're asking though anymore.
14:10 dwts joined #git
14:10 sbalousek sbalousek has joined the channel.
14:10 osse Do you mean shell aliases for git or git aliases
14:10 knod osse: Yes
14:10 knod I'm in control of that repo
14:10 dsdeiz yeah any would do
14:10 dsdeiz either shell aliases for git or git aliases
14:10 knod Hmm, it is a fork. Maybe the hook is from the original
14:10 chachasmooth joined #git
14:11 knod but I don't see a config anywhere
14:11 osse knod: I only have one shell alias, g=git, then I have a bunch of git aliases such as s for status, d for diff and so on
14:11 knod I'll link the repo
14:11 osse That was for dsdeiz
14:11 knod I don't have any aliases
14:11 knod Oh, ok
14:12 knod osse: https://github.com/knod/read_plugin
14:12 yurikoles joined #git
14:12 osse So it is on github.com
14:12 osse Then I have no clue
14:12 CheckDavid joined #git
14:12 mellernoia joined #git
14:13 Guest5799 left #git
14:14 knod Damn
14:15 knod osse: Welp, this time when I tried it it worked
14:15 knod I guess it's time to report a bug
14:15 krs93 joined #git
14:15 yurikoles joined #git
14:16 knod Though I don't know if it would be a github bug or a git bug… I would suspect github, though
14:17 sbalousek joined #git
14:18 canton7 knod, this is github rejecting the push
14:19 canton7 git's behaving properly
14:19 sbalousek joined #git
14:20 [0xAA] joined #git
14:20 knod canton7: Thanks for the input
14:21 yurikoles joined #git
14:22 a_thakur joined #git
14:24 zeroed joined #git
14:24 zeroed joined #git
14:24 Khisanth joined #git
14:26 knod left #git
14:27 sbalousek joined #git
14:28 thiago joined #git
14:30 _main_ joined #git
14:32 _main_ joined #git
14:34 mizu_no_oto joined #git
14:34 Balliad joined #git
14:36 chandu20 joined #git
14:36 kexmex joined #git
14:39 cdown joined #git
14:39 cyan__ joined #git
14:40 a_thakur joined #git
14:42 anuxivm joined #git
14:43 sea-gull_ joined #git
14:43 aw1 joined #git
14:43 overlord_tm joined #git
14:49 krs93_ joined #git
14:52 timvisher joined #git
14:53 satifant joined #git
14:55 newbie1 joined #git
14:57 Endarked joined #git
14:57 Shentino joined #git
14:59 dsdeiz osse: happen to have something? :D
15:01 fstd joined #git
15:01 ikelso joined #git
15:01 kjsaihs joined #git
15:03 cqi joined #git
15:04 jason237 joined #git
15:04 fstd joined #git
15:07 Darcidride_ joined #git
15:08 fstd joined #git
15:10 fstd joined #git
15:11 nettoweb joined #git
15:14 rominronin joined #git
15:14 rominron_ joined #git
15:17 fstd joined #git
15:19 mellernoia joined #git
15:21 fstd joined #git
15:24 _xor joined #git
15:25 fstd joined #git
15:25 nettoweb1 joined #git
15:29 fstd_ joined #git
15:32 Muzer joined #git
15:32 Gsham joined #git
15:33 leeN joined #git
15:33 mehola joined #git
15:41 kjsaihs joined #git
15:42 NwS joined #git
15:47 chandu20 joined #git
15:47 zeroed joined #git
15:47 nettoweb joined #git
15:47 danzarov joined #git
15:48 danzarov joined #git
15:51 f4 joined #git
15:52 fstd joined #git
15:56 fstd joined #git
15:58 rominron_ joined #git
15:58 fstd joined #git
15:58 jjasinski joined #git
16:03 diogenese joined #git
16:06 bronson joined #git
16:06 hasc joined #git
16:07 brent__ joined #git
16:09 metachr01 joined #git
16:10 yurikoles joined #git
16:12 dreiss joined #git
16:13 rnsanchez joined #git
16:18 FSadino joined #git
16:18 zeroed joined #git
16:18 zeroed joined #git
16:19 thiago joined #git
16:19 yurikoles joined #git
16:22 rivarun joined #git
16:22 dmin7b5 joined #git
16:25 netj joined #git
16:29 courrier joined #git
16:31 serialoverflow joined #git
16:33 Dazzyp joined #git
16:33 jeffreylevesque joined #git
16:35 nettoweb joined #git
16:37 Noldorin joined #git
16:38 rivarun joined #git
16:41 dhollinger joined #git
16:42 Discovery joined #git
16:43 _ng joined #git
16:44 jstein_ joined #git
16:45 osse dsdeiz: you can see my dotfiles
16:45 rominronin joined #git
16:46 osse dsdeiz: https://github.com/Osse/dotfiles/blob/master/.gitconfig
16:48 IlNominePatre joined #git
16:48 dsdeiz awesome thx osse !
16:51 murr4y joined #git
16:55 DINOWILLIAM joined #git
16:56 eihabarabia joined #git
16:56 xlegoman joined #git
17:00 peepsalot joined #git
17:01 metachr0n joined #git
17:02 ikelso joined #git
17:03 dmin7b5 joined #git
17:05 nettoweb joined #git
17:06 dmin7b5 joined #git
17:07 menip joined #git
17:07 cdown joined #git
17:07 re1 joined #git
17:07 manuelschneid3r joined #git
17:09 rizonz why does a fork show the upstream wheree I forked from as origin instead of my own personal repo ?
17:10 thiago rizonz: ask in #github
17:10 rizonz oh!
17:10 rizonz gitlab then ;)
17:10 rizonz I thought git was git as underlying
17:11 rizonz and it was the same
17:11 thiago yes, it is
17:11 thiago but we don't control web interfaces
17:11 thiago did you use "git clone" to create the repository?
17:11 rizonz thiago: it's commandline
17:11 rizonz nope
17:11 thiago then we can't help you
17:11 rizonz I forked @ gitlab (button)
17:12 rizonz I'm doing this
17:12 bronson joined #git
17:12 rizonz https://help.github.com/articles/configuring-a-remote-for-a-fork/
17:14 Miguel[m] joined #git
17:16 bremner you're using github help on gitlab?
17:16 binaryplease joined #git
17:18 binaryplease Hi trying to clone a github.com repo from a fresh debian install. It says 'cloning into repo...' but does not download any files. No errors shown
17:18 binaryplease Here is what I'm running
17:18 binaryplease http://pastebin.com/eaYfX39p
17:19 bremner binaryplease: check your network/firewall. clones fine here
17:19 binaryplease bremner: I can access websites with w3m, but ping is not working. ping: icmp open socket: Operation not permitted
17:20 thiago that's your outgoing firewall
17:20 madewokherd joined #git
17:20 BlessJah that's ping executable permissions (ping usually has suid)
17:20 thiago or that too
17:20 rizonz bremner: eh ?
17:21 binaryplease BlessJah: How do I correct that? It is a fresh install
17:21 thiago ping is setuid root
17:21 thiago or at least has the CAP_NET_ADMIN bit set
17:21 thiago ask #debian
17:22 binaryplease Ping works with root
17:22 BlessJah that's issue with odroid-debian, not debian per-se
17:22 binaryplease BlessJah: thiago will ask there, thanks!
17:23 BlessJah binaryplease: could you run 'pwd ; mkdir test ; ls -ld test ; wget -v https://github.com/binaryplease/dotfiles.git' and paste output
17:25 * BlessJah suspects strange filesystem issues
17:25 BlessJah maybe overlay mounts
17:26 bronson joined #git
17:29 rizonz bremner: ah! gitlab links to it
17:29 bremner ok.
17:29 rizonz bremner: https://gitlab.com/gitlab-org/gitlab-ce/issues/18332#note_20888598
17:29 nick123 joined #git
17:29 dsdeiz joined #git
17:29 dsdeiz joined #git
17:34 _main_ joined #git
17:36 dreiss joined #git
17:39 __main__ joined #git
17:41 sim590 joined #git
17:41 FSadino joined #git
17:42 blackwind_123 joined #git
17:43 sim590 I have tried to add two repositories as submodules of my dotfiles repository (https://github.com/sim590/dotfiles). The two are awesome/lain and awesome/themes. I feel like something's wrong since github doesn't show them as submodule, but as if they were files part of my repository. I did git subomdule add $URL $PATH, then git commit and git push. What's wrong?
17:43 bronson joined #git
17:44 sim590 actually, my submodule are on the awesome-3.5-backport branch
17:44 sim590 (https://github.com/sim590/dotfiles/tree/awesome-3.5-backport/awesome)
17:44 osse were they previously files in the repo ?
17:47 sim590 osse: No. When I did git submodule add, it did clone the repositories.
17:47 justanotheruser joined #git
17:47 binaryplease joined #git
17:48 osse says here the latest commit is e8c88fa648e8a
17:48 osse do you see that when you git log ?
17:49 sim590 osse: yes
17:52 Domhack joined #git
17:53 rivarun joined #git
17:53 hhee joined #git
17:54 Gsham joined #git
17:56 osse sim590: can you show me the output of git branch -avv
17:56 sim590 osse: http://paste.debian.net/907712/
17:58 osse sim590: can you show the output of git ls-tree HEAD awesome/
17:58 osse sim590: the trailing slash is imprtant
18:00 Fabricio20 joined #git
18:00 sim590 http://paste.debian.net/907714/
18:00 mrkake joined #git
18:00 osse sim590: you must have done something wrong.
18:00 osse there are no submodules here
18:03 lmat joined #git
18:03 thiago joined #git
18:03 howitdo joined #git
18:06 sim590 I'll post a short example showing what I do.
18:08 Balliad joined #git
18:08 sim590 osse: http://paste.debian.net/907716/ that's a short example that has the same behavior.
18:09 Stoichi joined #git
18:09 regedit joined #git
18:09 sim590 hmmm it doesn't execute really well if you run it because of the "cd -", but that's what I do.
18:09 lindenle joined #git
18:10 Stoichi Hey I'm using git checkout -- . to remove any unstaged changes which I don't want to keep. This resulted in some changes being removed (work A) while not some others(which was some work I did before work A). How is this possible?
18:11 sea-gull_ joined #git
18:11 kadoban Stoichi: What does 'git status' say?
18:11 chosafine joined #git
18:11 chosafine joined #git
18:12 Stoichi kadoban: Initially it listed all my work. After executing git checkout -- . git status shows work B only
18:13 kadoban ... is it just showing you the staged changes?
18:13 Stoichi Well no since no changes have been staged.
18:13 sim590 osse: actually. I just executed the file after fixing some errors and it works as expected now. Hmm.
18:14 SwiftMatt joined #git
18:14 Stoichi kadoban: It lists the files in work B as modified.
18:14 kadoban Stoichi: Are they new files?
18:15 Stoichi They are not. Just modified.
18:15 osse sim590: :S
18:15 kadoban What are the modifications, are there actual content differences? Use git diff
18:15 osse git checkout -- . will remove only unstaged changes.
18:16 Stoichi Yep. Git diff lists all the changes I've made.
18:16 rorro joined #git
18:16 thiago Stoichi: git checkout -- . checks out from the index
18:16 thiago you may need git checkout HEAD -- .
18:16 kadoban Stoichi: !transcript
18:16 gitinfo Stoichi: Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:16 Stoichi Stoichi:  git diff --staged gives me nothing. So nothing has been changed.
18:17 thiago show us git staths before and after that checkout
18:18 rominronin joined #git
18:20 ikelso joined #git
18:21 sim590 osse: I started again and it did it: https://github.com/sim590/dotfiles/tree/awesome-3.5-backport/awesome
18:21 sim590 osse: thanks for your time! ;)
18:22 Tobbi joined #git
18:23 kadoban Weird ... why'd they get k-lined
18:23 mizu_no_oto joined #git
18:28 jnavila joined #git
18:32 InhaledDuck joined #git
18:34 dviola joined #git
18:38 Stoichi_ joined #git
18:38 Stoichi_ kadoban: Sorry lost connectivity. Did you receive the paste?
18:39 thiago no, we didn't
18:39 thiago paste the link again
18:39 Stoichi_ http://pastebin.com/rR4JkkZy
18:40 thiago looks like checkout worked perfectly
18:40 thiago what do you think is wrong?
18:40 Stoichi_ This part on the second git status modified:   ../path/file4.extension
18:41 Stoichi_ Shouldn't it scrub all changes?
18:41 kadoban Stoichi_: . means "the current directory" (and recursively all subdirectories)
18:42 kadoban Stoichi_: So, you're telling it not to nuke the ones in parent directories, that way
18:42 Stoichi_ Shit. I didn't notice the .. I have a file4 in the current directory as well.
18:42 Stoichi_ That explains it. Thanks :)
18:42 kadoban Anytime, ya that can be confusing
18:42 oskarkv joined #git
18:43 Stoichi_ thiago: kadoban: Thanks :)
18:43 bronson joined #git
18:44 Bombe joined #git
18:46 jost__ joined #git
18:47 nettoweb joined #git
18:48 gopi1410 joined #git
18:49 nettoweb joined #git
18:50 aarobc joined #git
18:52 Balliad joined #git
18:56 ianmethyst joined #git
18:59 jnavila joined #git
19:00 dreiss joined #git
19:01 nettoweb1 joined #git
19:02 Guest68442 joined #git
19:03 a3Dman_ joined #git
19:07 manuelschneid3r joined #git
19:09 mda1 joined #git
19:10 Industrial joined #git
19:10 Industrial Hi!
19:10 Industrial I have a repo with .bin/<file> which have +x or mode 755.
19:10 robnester joined #git
19:10 Industrial On windows 10, I keep getting that it changed it to 644 and I can not push my commits cause I have unstaged changes
19:11 Industrial if I stash then the stash happens but again the whole .bin dir has 644. the weirdest thing :S
19:13 PioneerAxon joined #git
19:14 Gsham joined #git
19:15 _ikke_ Industrial: Did you copy this repo from a linux system?
19:15 thiago or did you clone?
19:17 spaceone how to fix "This branch is 1 commits ahead, 1 commit behind ..." ? I tried to fix this by removing the last commit and cherry-picking the last commit from the other branch. Now I have "This branch is 2 commits ahead, 1 commit behind ..."
19:17 thiago spaceone: don't cherry-pick, that creates new commits
19:17 thiago anyway, that is not a bug, so there's no "fix"
19:17 thiago what do you want to see happen?
19:18 spaceone that github shows again that my commits aren't divernged
19:18 Zamerick joined #git
19:18 spaceone while they are the same
19:18 spaceone as in the upstream
19:18 thiago github is irrelevant
19:18 thiago git is right. Period.
19:18 spaceone jeah but git also tells this message
19:19 spaceone which i don't want
19:19 thiago so it is right
19:19 thiago do you want to discard your latest commit?
19:19 spaceone i want the branch to be the upstream branch with my extra commits
19:19 thiago try to rebase: git rebase
19:19 spaceone i want to know how i can in the future prevent this
19:20 spaceone after rebasing:
19:20 spaceone "This branch is 2 commits ahead, 2 commit behind ..."
19:20 thiago rebase won't do that
19:20 Industrial _ikke_: yes
19:20 thiago if you've rebased, then it can't be behind
19:21 Industrial _ikke_: it's current destination is a vagrant box too, but I'm making the commit from windows until I get that dev box running
19:21 spaceone but this is what i get
19:21 thiago spaceone: !repro
19:21 gitinfo spaceone: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
19:21 leeN joined #git
19:22 spaceone well, you have to wait some minutes until i paste all this
19:22 thiago sure
19:24 Balliad joined #git
19:25 spaceone thiago: https://bpaste.net/show/4ad500b65df1
19:26 _ikke_ Industrial: When you clone a repo on windows, git determined wheter the FS adheres to file permissions, and then enables / disables it accordingly
19:26 _ikke_ when sharing a repo with linux, this does obviously not work
19:27 _ikke_ It's not recommended to share repositories between linux and windows
19:27 bremner or between anything, really. the D in DVCS is there for a reason
19:28 _ikke_ right
19:29 thiago spaceone: you've rebased on upstream/master, not your upstream branch.
19:29 thiago spaceone: do you want to make your upstream branch (probably origin/master) match your master branch?
19:29 spaceone thiago: yes, but this is the upstream branch? i can do this for remotes/.. as well
19:29 spaceone no
19:29 spaceone well kind of
19:30 spaceone if want "git reset --hard upstream/master -- && git cherry-pick $my_commits"
19:30 thiago ok
19:30 Industrial _ikke_: I see.
19:30 spaceone if i do this with the remotes-branch i get the same message that they are equal
19:31 spaceone $ git rebase remotes/upstream/master
19:31 spaceone Current branch master is up to date.
19:31 thiago then you are up to date
19:31 thiago upstream/master is not your upstream branch
19:31 sea-gull_ joined #git
19:31 thiago your upstream branch is probably origin/master
19:31 thiago so, what do you want to do?
19:31 rumble joined #git
19:32 spaceone i want git to stfu about This branch is 2 commits ahead, 1 commit behind circuits:master.
19:32 thiago ok
19:32 thiago you want master and origin/master to be like one another
19:33 _ikke_ spaceone: why exactly?
19:33 thiago so choose one: do you want to change origin/master to match master, or do you want to change master to match origin/master?
19:33 spaceone _ikke_: because i can't do pull requests otherwise
19:34 thiago what does that have to do with pull requests?
19:34 grumblebee joined #git
19:34 _ikke_ probably because he cannot push
19:34 calamari joined #git
19:35 jozwior joined #git
19:35 spaceone _ikke_: thiago https://bpaste.net/show/798af0fedd5d
19:35 calamari are the contents of .git/config ever transmitted on a push?
19:35 selckin no
19:36 calamari selckin: thank you
19:36 thiago calamari: no
19:36 thiago spaceone: sounds like you've chosen one
19:37 spaceone thiago: this fixed it
19:37 shgysk8zer0_ joined #git
19:37 rivarun joined #git
19:37 spaceone but i hate this, because this always happen if the upstream branch force-push something or changes the commit message when accepting PR's
19:38 spaceone this is always so much fucking work, why can't gi fix this in a short way
19:38 BlessJah _ikke_: do you remember discussion about git as deployment tool we had two days ago? I'm still curious how tar/rsync is superior to git checkout/reset
19:38 spaceone especially if i have more than only one commit like 30 or so
19:38 thiago spaceone: upstream never force-pushes
19:39 thiago that's not proper workflow
19:39 _ikke_ BlessJah: I've thought a bit about this
19:39 spaceone thiago: i can't influence what others do
19:39 thiago spaceone: you can
19:39 spaceone no
19:39 thiago tell them NEVER to force-push into a branch people track
19:39 _ikke_ I think my main reasons have to do with that I think there are better ways to do it
19:39 spaceone it's there repo not mine
19:39 thiago that's just stupid
19:39 inflames joined #git
19:39 _ikke_ BlessJah: But that's just my personal feeling / experience
19:40 thiago spaceone: ok, stop contributing to them, then
19:40 spaceone thiago: even if they wouldn't, the problem still exists in other ways
19:40 _ikke_ checkout / reset based deployments have quirks, but I think they can be worked around
19:40 thiago if they can't follow proper workflow, then don't collaborate
19:40 thiago explain the other problem
19:40 thiago force pushing has no clear solution because it breaks the assumptions that most git commands rest on
19:40 thiago everything else should be easy to solve
19:41 _ikke_ BlessJah: did you read the link in the deploy trigger?
19:41 BlessJah _ikke_: quite opposite to what I think - git as a tool/library provides all the functions you need to *develop* succesfull deployment tool
19:41 spaceone thiago: it doesn't help me to tell people what they shouldn't do
19:41 _ikke_ BlessJah: curious, how do you handle credentials?
19:42 _ikke_ and other environment specific configuration
19:42 BlessJah skimmed through, I either knew or would've figured out all the quirks
19:42 thiago spaceone: tell them "don't force-push"
19:42 spaceone thiago: the problem root is asynchronius
19:42 _ikke_ BlessJah: right
19:42 thiago spaceone: huh? What do you mean by "root is asynchronous"?
19:43 BlessJah _ikke_: bootstrap is done by hand - deploy key (ssh with ro), along with .credentials file
19:43 BlessJah s/credentials/config/ - it often contains some credentials to other services (api keys etc), but basically is configuration
19:44 spaceone thiago: even if they never forced pushed: look: i submit a pull request, they accept this one week later and change one commit message of my commits to include some ticket number. i commited in the meantime some things locally. now i do a simple pull --rebase and i have this conflict.
19:44 BlessJah _ikke_: the proper tool for deployments you seem to think about, where you actually need to handle credentials etc is ansible (and alternatives)
19:45 brent__ joined #git
19:45 chandu20 joined #git
19:46 thiago spaceone: you won't have a conflict due to the updated commit message
19:46 _ikke_ BlessJah: Yeah, we use tools like that
19:46 _ikke_ (chef in our situation)
19:48 _ikke_ But even my ad-hoc deployment is basically something like git archive HEAD --format=tar --prefix=$(date ...)/ | ssh server 'tar xf - -C /path/to/release/dir' and then some other steps
19:49 BlessJah _ikke_: pipe over network with in-place on-the-fly overwrite
19:49 rominronin joined #git
19:50 svm_invictvs joined #git
19:50 _ikke_ Note that the release dir is not the deployment dir
19:50 _ikke_ I have a symlink to the current release which I update
19:50 holodoc joined #git
19:50 _ikke_ So nothing is overwritten
19:51 BlessJah better, but no way to test integrity of deployment :>
19:51 thiago joined #git
19:52 blackwind_123 joined #git
19:53 schakl_ joined #git
19:53 thiago spaceone: you won't have a conflict due to the updated commit message
19:54 spaceone thiago: what is the reason then?
19:54 thiago spaceone: for not conflicting? Because it's just the commit message.
19:54 jnavila joined #git
19:54 meadmoon joined #git
19:54 spaceone i don't understand you
19:55 thiago you asked the reason why it doesn't conflict
19:55 thiago it doesn't conflict for an updated commit message because commit messages cannot cause conflicts
19:56 spaceone it does
19:56 thiago no, it doesn't
19:56 spaceone it does
19:56 spaceone maybe not because of the commit message
19:56 thiago there are many reasons why it can conflict. The commit message is not one of them.
19:56 spaceone but the conflict is there
19:56 thiago it can only conflict if a file changed
19:57 BlessJah sigh
19:57 thiago it's possible that the rebase did not notice that your commit is already applied and tried to apply again (it can happen if there are further changes to the files you changed that throw git off)
19:57 thiago if that happens, just git rebase --skip
19:57 BlessJah spaceone: did it merge? or failed with message "automatic merge failed"?
19:58 spaceone BlessJah: it merged sucessfully
19:58 spaceone i never spoke about a file-conflict. the term conflict is my word for the problem
19:58 manuelschneid3r joined #git
19:58 thiago what problem?
19:58 spaceone come one
19:58 thiago conflict is a very specific thing in Git. So we were talking about file conflicts.
19:59 spaceone 7.#securitytraps      │20:44:09        spaceone | thiago: even if they never forced pushed: look: i submit a pull request, they accept this one week later and change one commit message of my commits to include some      │ _flow__
19:59 thiago if you didn't mean a conflict, what did you mean?
19:59 spaceone 8.#python             │                         | ticket number. i commited in the meantime some things locally. now i do a simple pull --rebase and i have this conflict.
19:59 spaceone this ^^
19:59 thiago ok, so you mean "I don't have a problem"
19:59 thiago if you don't have a problem, everything is fine
19:59 spaceone i have a problem
19:59 thiago which is?
19:59 spaceone i have 2 problesm
20:00 thiago ok, which are?
20:00 spaceone that you don't understand this
20:00 thiago I don't understand you, correct
20:00 thiago you haven't described a situation that is problematic
20:00 BlessJah thiago: that's what support or trainer roles teach you :>
20:00 thiago I submit changes every week. EVERY single one of them has its commit message updated.
20:00 spaceone the situation is problematic
20:00 thiago it's not a problem
20:00 spaceone it is
20:00 thiago no, it isn't
20:00 tobiasvl OK guys... you're just going in circles here
20:01 spaceone you don't want to understand me
20:01 tobiasvl spaceone: state your problem in one sentence please
20:01 spaceone bye
20:01 thiago git pull --rebase drops the commits that were accepted, even with commit messages updated
20:01 thiago then I can move on to other tasks
20:01 thiago I want to understand you
20:01 thiago but you haven't told us what your problem is
20:01 thiago you've described a situation that is not problematic
20:01 thiago you're probably seeing something there that you didn't tell us
20:01 spaceone okay, then use this situation and add the sentence
20:02 spaceone git says after the pull --rebase "Your branch and 'origin/master' have diverged,
20:02 spaceone and have 2 and 2 different commits each, respectively.Your branch and 'origin/master' have diverged,
20:02 spaceone and have 2 and 2 different commits each, respectively."
20:02 thiago ok, that, by itself, is not a problem
20:02 spaceone it causes problems
20:02 thiago note that there are three branches here: master, origin/master and upstream/master
20:03 spaceone because if i push to github then i can't do pull requests anymore
20:03 spaceone i have to manually fix every commit
20:03 thiago you must always rebase on upstream/master. You should change your upstream to be upstream/master.
20:03 thiago please run this: git branch -u upstream/master
20:03 spaceone how can i see the current set upstream ?
20:03 thiago by running that command
20:03 thiago see?
20:03 thiago oh... not easily
20:04 thiago cat .git/config
20:04 spaceone there is nothing
20:04 thiago see the [branch master] section
20:04 osse git br -vv will show it
20:04 selckin joined #git
20:04 osse git branch -vv
20:04 thiago right
20:04 spaceone https://bpaste.net/show/4c67b5061fc7
20:05 thiago your upstream is origin/master
20:05 eftov joined #git
20:05 spaceone yes
20:05 jwmann joined #git
20:05 spaceone because origin is my own repository
20:05 spaceone where i have to push to
20:05 spaceone i can't push to upstream
20:07 osse spaceone: you can set 'git config remote.pushdefault origin'.  then you can have upstream as the upstream, and push to origin at the same time
20:08 osse without having to type extra stuff
20:08 spaceone okay
20:09 spaceone and this will resolve the diverged-thing?
20:09 keltvek joined #git
20:09 osse not sure what you mean by that
20:10 osse it means you can follow thiago's advice, and yet push to origin easily
20:10 spaceone all my problems were caused because my remote branch was set to origin instead of upstream?!
20:10 jimi_ joined #git
20:10 osse well I was never sure what the problem was
20:11 spaceone that git showed two equal commits as diverged
20:12 hashpuppy joined #git
20:12 Goplat joined #git
20:12 Algebr joined #git
20:13 Algebr How can I see the last commit of each branch? I have a lot of branches and don't remember which one is the freshest one
20:13 spaceone the upstream and the origin HEAD commit(s) are the same, but git showed the "Your branch and 'origin/master' have diverged," message and prevented pull-requests without manually resetting to upstream-master-HEAD and cherry-picking all the commits i did
20:13 osse spaceone: changing the upstream won't change any of that.  it will only change what 'git status' prints
20:13 osse Algebr: git branch -v  will print them
20:14 evil-t0by joined #git
20:14 evil-t0by joined #git
20:14 kadoban Algebr: gitk --all or !lol will usually give you an idea if you like those
20:14 gitinfo Algebr: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
20:14 dodobrain joined #git
20:14 dodobrain joined #git
20:16 webdev007 joined #git
20:16 Algebr thanks
20:20 ghostlight left #git
20:20 [0xAA] joined #git
20:21 rorro joined #git
20:23 mehola joined #git
20:23 Gianormagantrous joined #git
20:26 chosafine joined #git
20:27 chosafine joined #git
20:27 dreiss joined #git
20:28 dave0x6d joined #git
20:30 LeBlaaanc joined #git
20:30 chosafine joined #git
20:30 chosafine joined #git
20:31 spm_draget left #git
20:31 stick-shift joined #git
20:32 Atm0spher1c joined #git
20:34 davimore_ joined #git
20:38 aviraldg joined #git
20:38 aviraldg joined #git
20:38 jimi_ joined #git
20:38 Limes_ joined #git
20:40 ribasushi joined #git
20:41 jason237 joined #git
20:42 bekks_ left #git
20:43 aidalgol joined #git
20:43 a_thakur joined #git
20:44 davimore__ joined #git
20:44 bekks joined #git
20:48 mitzip joined #git
20:48 polyrob_ joined #git
20:49 cagedwisdom joined #git
20:50 up_the_irons joined #git
20:52 YuGiOhJCJ joined #git
20:52 rominronin joined #git
20:57 polyrob_ joined #git
20:59 prg3 joined #git
21:09 danzarov joined #git
21:09 ayjay_t joined #git
21:10 apotry joined #git
21:13 ocbtec joined #git
21:15 Baggage joined #git
21:18 fragstone joined #git
21:21 rominronin joined #git
21:23 msonntag joined #git
21:25 Guest68442 joined #git
21:25 cdown joined #git
21:26 oo0o joined #git
21:26 SwiftMatt joined #git
21:31 thiago joined #git
21:34 anuxivm left #git
21:36 nettoweb joined #git
21:37 oaao joined #git
21:41 askb joined #git
21:44 cdown joined #git
21:47 Guest26 joined #git
21:49 yurikoles joined #git
21:49 Log1x joined #git
21:52 yurikoles joined #git
21:53 shgysk8zer0_ joined #git
21:54 bernardio joined #git
21:55 m0viefreak joined #git
21:55 netj joined #git
21:56 peeps[lappy] joined #git
21:58 dhollinger joined #git
22:00 thierryp joined #git
22:00 cyan__ joined #git
22:02 ki0 joined #git
22:02 Guest26 joined #git
22:05 dhollinger joined #git
22:09 dhollinger joined #git
22:09 kadoban git log, or something, doesn't have a helper to run a command for each ref or anything, does it?
22:11 bremner git foreach-ref
22:11 bremner or for-each-ref
22:11 cdown joined #git
22:13 lindenle joined #git
22:13 Guest26 joined #git
22:14 kadoban Ah, hmm *looks*
22:22 Anja joined #git
22:22 rorro joined #git
22:23 thierryp joined #git
22:26 Algebr joined #git
22:27 morenoh149 joined #git
22:28 morenoh149 can one git diff against a previous commit and limit the result to only certain files?
22:29 cdown_ joined #git
22:29 bremner yep, that's pretty much the first line of the man page ;)
22:30 Gsham joined #git
22:32 morenoh149 bremner: can path be a pattern?
22:33 newbie1 joined #git
22:33 morenoh149 or how do I specify all the files in the current directory (not the nested folders)?
22:33 bernardio joined #git
22:34 newbie1 joined #git
22:35 bremner your shell can expand a glob. I seem to recall that git can too, but I never use that.
22:35 osse morenoh149: try  git diff ... -- . ':!*/'
22:36 morenoh149 osse: nope :(
22:36 morenoh149 oh well I'll just deal with it for now, thanks
22:36 morenoh149 or use grep -v
22:38 ketas joined #git
22:38 yurikoles_ joined #git
22:39 Anja joined #git
22:50 rnsanchez_ joined #git
22:50 chosafine joined #git
22:52 khagler joined #git
22:53 quesker how do I restage a git rm file if I did git reset HEAD -- file
22:53 quesker just add it?
22:54 rominronin joined #git
22:54 quesker git rm it again?  (it is gone)
22:55 morenoh149 git checkout -- . if it was being tracked before
22:57 quesker I don't want to undelete it I want to delete it, I just was going to umm it is a long story and I keep messing up
22:57 quesker looks like git add restaged it
22:57 quesker er no it didn't
22:58 quesker ugh
22:58 quesker ah git rm restaged.  whew
22:58 osse morenoh149: maybe git diff ... -- . ':!./*/*'
22:59 morenoh149 osse I just did git diff ... | grep -v ./
23:01 TheWild left #git
23:01 fmeerkoetter joined #git
23:11 KG4PEQ joined #git
23:12 xaa joined #git
23:12 jimi_ joined #git
23:16 Vortex35 joined #git
23:18 thiago joined #git
23:24 ikelso joined #git
23:25 LaptopBrain joined #git
23:29 shgysk8zer0_ joined #git
23:29 hhee joined #git
23:31 nowhere_man joined #git
23:34 matsaman joined #git
23:34 xlegoman joined #git
23:37 oskarkv joined #git
23:38 lindenle joined #git
23:39 Vortex35 joined #git
23:43 chosafine joined #git
23:49 thierryp joined #git
23:51 Zialus joined #git
23:53 cdown_ joined #git

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