Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-24

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

All times shown according to UTC.

Time Nick Message
00:02 phillip carpii: I don't really know, sorry. Maybe wait a bit for someone, who knows more then I do
00:02 carpii ok thanks anyway :)
00:02 whomp joined #git
00:06 btree joined #git
00:07 btree left #git
00:08 dsdeiz joined #git
00:08 phillip carpii: So when you run git pull it does fetch your change and then merge it as merge commit. That's what these commits are about
00:08 phillip see man git pull
00:08 gitinfo the git-pull manpage is available at http://jk.gs/git-pull.html
00:08 carpii but wouldnt this result ina merge commit on remote server, which isnt present on local?
00:09 carpii even though local has pushed to bare repo (and is 'up to date')?
00:10 phillip yeah there are merge commits on the server and not on local.
00:11 phillip but the server has all commits local has + the merge commits that's why its 55 commits ahead
00:11 carpii so to keep the two perfectly synced, i should then push from server to bare repo?
00:12 phillip carpii: the server should just use git pull -r, instead of git pull
00:12 howitdo joined #git
00:13 carpii ok i will look into this, but its the first time ive ever heard of it being recommended for a remote server
00:14 phillip carpii: well I dont't really know, it is not a safe advice. But I do know that the -r often solves thoses problems.
00:17 thiago joined #git
00:20 shgysk8zer0 joined #git
00:22 phillip carpii: alse why not just use git fetch?
00:22 phillip *also
00:22 carpii what would that achieve?
00:22 carpii i want to apply the changes to remote server
00:23 ToeSnacks joined #git
00:23 Schrostfutz joined #git
00:24 ki0 joined #git
00:27 phillip carpii: well what should the server repo do? git fetch will just save your code on the server repo: http://stackoverflow.com/a/15733096
00:27 carpii git fetch just fetches git meta data, but doesnt apply it to the codebase
00:31 ktoverso joined #git
00:32 phillip carpii: I'm afraid it does also fetch your code not only meta data. merge/rebase does apply these changes to your codebase
00:32 KV joined #git
00:33 carpii ive used git many years now. i appreciate the help but i think youre mistaken :)
00:34 carpii it may fetch the commits into the repo, but it doesnt actually apply them to your working directory
00:37 phillip carpii: yeah, it does apply them.
00:37 phillip *not
00:37 phillip merge/rebase does apply them
00:38 carpii yes bit a merge/rebase should not be necessary. Im just asking the server to git pull, meaning bring it up to date with origin/master HEAD
00:38 bronson joined #git
00:38 carpii bit/but
00:38 de-vri-es joined #git
00:40 phillip carpii: pull does a merge. You want to use pull without merge?
00:40 carpii nope, i just want pull to result in the exact same repo as what exists on the bare repo
00:41 carpii which in all other projects it has done, but now im using tags, it sometimes results in remote being 'ahead' of origin/master
00:41 carpii and thats the bit I cant fathom
00:41 carpii since it would imply that commits have been made to remote server which have not been pushed to bare repo
00:41 carpii which isnt possible
00:43 phillip carpii: right, then I'm not the one to help you. Have a good day/night :)
00:44 carpii ok thanks, Im not being ungrateful, I do appreciate the help :)
00:53 svm_invictvs joined #git
00:56 dan2k3k4 joined #git
00:59 PaulCape_ joined #git
00:59 venmx joined #git
01:00 thiago joined #git
01:02 dsdeiz joined #git
01:03 sdothum joined #git
01:05 lightstalker joined #git
01:09 fstd_ joined #git
01:11 mizu_no_oto joined #git
01:12 mellernoia-away joined #git
01:19 derk0pf joined #git
01:19 anuxivm left #git
01:21 diogenese joined #git
01:21 sdothum joined #git
01:23 menip joined #git
01:23 nd joined #git
01:26 WaReZ joined #git
01:31 thiago joined #git
01:32 ktoverso_ joined #git
01:33 conrad_ joined #git
01:34 conrad_ joined #git
01:35 PaulCapestany joined #git
01:35 KV joined #git
01:36 conrad_ joined #git
01:37 bronson joined #git
01:37 conrad_ joined #git
01:39 [0xAA] joined #git
01:40 dsantiago joined #git
01:41 PaulCape_ joined #git
01:52 thiago joined #git
01:53 sammyo joined #git
01:53 jasondockers__ joined #git
01:57 PaulCapestany joined #git
01:59 MrWoohoo joined #git
02:00 venmx joined #git
02:19 finalbeta joined #git
02:22 lvns joined #git
02:22 cqi joined #git
02:31 pks joined #git
02:32 thiago joined #git
02:32 d^sh joined #git
02:34 Kulrak joined #git
02:34 Kulrak joined #git
02:36 KV joined #git
02:38 johnny56_ joined #git
02:38 bronson joined #git
02:39 eagle_mike joined #git
02:41 rchavik joined #git
02:42 Achylles joined #git
02:46 Vampire0_ joined #git
02:46 plos joined #git
02:48 brent__ joined #git
02:49 Limes joined #git
02:50 pks joined #git
02:51 mizu_no_oto joined #git
03:00 Goplat joined #git
03:01 rwb joined #git
03:01 venmx joined #git
03:02 mgoodwin joined #git
03:03 xaviergmail joined #git
03:12 chachasmooth joined #git
03:13 Guest32 joined #git
03:13 Ekho joined #git
03:14 Ekho joined #git
03:15 Ekho joined #git
03:16 mgoodwin joined #git
03:22 mgoodwin joined #git
03:24 mgoodwin joined #git
03:25 ochorocho__ joined #git
03:31 diogenese joined #git
03:31 Atr3Yu joined #git
03:34 Vortex34 joined #git
03:34 dreiss joined #git
03:36 Siegfried joined #git
03:36 KV joined #git
03:37 Siegfried joined #git
03:38 ayjay_t joined #git
03:39 bronson joined #git
03:39 conrad_ joined #git
03:41 conrad_ joined #git
03:41 conrad_ joined #git
03:42 conrad_ joined #git
03:43 romerocesar joined #git
03:45 conrad_ joined #git
03:45 hexagoxel joined #git
03:46 conrad_ joined #git
03:50 dreiss joined #git
03:51 svm_invictvs joined #git
03:51 xaviergmail joined #git
03:51 meadmoon joined #git
03:52 SwiftMatt joined #git
03:55 robattila256 joined #git
03:55 masuberu joined #git
03:56 sunri5e joined #git
04:02 venmx joined #git
04:05 a3Dman_ joined #git
04:05 dreiss joined #git
04:07 Nilesh_ joined #git
04:09 mgoodwin joined #git
04:11 SwiftMatt joined #git
04:11 sweatsuit joined #git
04:12 Aces_Charles joined #git
04:14 svm_invictvs joined #git
04:18 Lyqyd joined #git
04:19 sgtbigman joined #git
04:19 netj joined #git
04:23 svm_invictvs joined #git
04:26 pks joined #git
04:26 ochorocho__ joined #git
04:26 fstd_ joined #git
04:33 cagedwisdom joined #git
04:33 sgtbigman joined #git
04:34 Kulrak joined #git
04:34 Kulrak joined #git
04:35 Vinnie_win joined #git
04:37 KV joined #git
04:38 Kulrak joined #git
04:38 Kulrak joined #git
04:39 a_thakur joined #git
04:40 bronson joined #git
04:41 jaguarmagenta joined #git
04:41 a_thakur joined #git
04:43 eizua joined #git
04:43 Siegfried joined #git
04:46 dviola joined #git
04:47 narendraj9 joined #git
04:47 nckpz joined #git
04:54 ki0 joined #git
04:55 particleGolem joined #git
04:56 jaguarmagenta joined #git
04:57 xaviergmail joined #git
04:58 tmg__ joined #git
05:00 moei joined #git
05:01 diogenese joined #git
05:03 venmx joined #git
05:05 inovas joined #git
05:05 a_thakur joined #git
05:09 dreiss joined #git
05:11 adino joined #git
05:18 whomp joined #git
05:18 Cabanossi joined #git
05:24 GT4066 joined #git
05:27 ochorocho__ joined #git
05:28 lvns joined #git
05:30 justanotheruser joined #git
05:30 ki0 joined #git
05:33 subhojit777 joined #git
05:33 xaviergmail joined #git
05:36 howitdo joined #git
05:38 KV joined #git
05:41 particleGolem joined #git
05:41 bronson joined #git
05:46 aw1 joined #git
05:53 Junior joined #git
05:59 doogz joined #git
06:01 spacelord_ joined #git
06:04 venmx joined #git
06:06 jgrasser joined #git
06:07 Motoko joined #git
06:12 vdv joined #git
06:13 narendraj9 joined #git
06:21 narendraj9 joined #git
06:27 whomp joined #git
06:28 mda1 joined #git
06:29 jaafar joined #git
06:34 freimatz joined #git
06:35 ki0 joined #git
06:38 KV joined #git
06:41 duderonomy joined #git
06:42 bronson joined #git
06:45 Garen joined #git
06:48 diogenese joined #git
06:50 d0nn1e joined #git
06:51 Domhack_ joined #git
06:55 Atrumx joined #git
07:00 venmx joined #git
07:02 bluebell_ joined #git
07:07 dez joined #git
07:08 cdown joined #git
07:09 cdown_ joined #git
07:10 dezserps joined #git
07:11 Kulrak joined #git
07:11 Kulrak joined #git
07:14 dezserps left #git
07:18 cyan__ joined #git
07:20 ki0 joined #git
07:24 llamapixel I have used tags on master:branch for final integer release versions. Should I be thinking in other terms other than the usage of tags for this medium?
07:25 elastix joined #git
07:28 ochorocho__ joined #git
07:28 Siegfried joined #git
07:31 pks joined #git
07:38 mgoodwin joined #git
07:39 KV joined #git
07:42 davimore__ joined #git
07:43 bronson joined #git
07:48 narendraj9 joined #git
07:51 InfoTest joined #git
07:56 a_thakur joined #git
08:01 venmx joined #git
08:01 yaewa joined #git
08:03 pks joined #git
08:09 SteffanW joined #git
08:09 YuGiOhJCJ joined #git
08:11 overlord_tm joined #git
08:11 cagedwisdom joined #git
08:12 www-bukolay-com joined #git
08:12 SpeakerToMeat joined #git
08:15 weckstrom joined #git
08:20 subhojit777 joined #git
08:21 Naan joined #git
08:22 narendraj9 joined #git
08:23 bernardio joined #git
08:23 pks joined #git
08:23 jrm joined #git
08:24 theoceaniscool joined #git
08:25 joco42 joined #git
08:25 theoceaniscool joined #git
08:29 whomp joined #git
08:32 navidr joined #git
08:33 Nicmavr joined #git
08:34 reverse_light joined #git
08:34 bernardio joined #git
08:35 bernardio joined #git
08:37 bernardio_ joined #git
08:38 Guest53581 joined #git
08:40 KV joined #git
08:41 fk joined #git
08:41 narendraj9 joined #git
08:43 venmx joined #git
08:44 bronson joined #git
08:45 eizua joined #git
08:47 duderonomy joined #git
08:47 llamapixel tags are common?
08:48 jost joined #git
08:51 robotroll joined #git
08:51 alipoor90 joined #git
08:52 diogenese joined #git
08:54 darkbit joined #git
08:55 alipoor90 in git diff --summary output, it shows file type as three digit octal number such as 100 (delete mode 100644 ...), where I can find the document on the meaning of that octal numbers? (i.e. which file type echo octal value mean)
08:57 dreiss joined #git
09:00 joki- joined #git
09:03 wget joined #git
09:04 Orbitrix joined #git
09:04 Orbitrix joined #git
09:06 nowhereman joined #git
09:07 stick-shift joined #git
09:11 Jackneill joined #git
09:12 b100s joined #git
09:12 stick-shift joined #git
09:12 Jackneill_ joined #git
09:19 osse llamapixel: Tags are commonly used for marking versions, yes.
09:19 bluebell_ left #git
09:20 llamapixel what industry do you use tags in osse ?
09:20 osse llamapixel: But tags aren't grouped by branch, btw. They are globally visible and apply directly to the commit
09:21 finalbeta joined #git
09:21 osse llamapixel: Not sure I understand the question. The software industry?
09:21 armyriad joined #git
09:21 llamapixel yeah what software industry are you using tags and why?
09:22 llamapixel some context helps me more than answers sometimes.
09:23 bremner llamapixel: I think you should just do some hands on exercises with tags. That's the best way to understand.
09:23 bremner man gittutorial is a start
09:23 gitinfo the gittutorial manpage is available at http://jk.gs/gittutorial.html
09:23 llamapixel i have a test project and have completed tag exercises, I am now looking for concrete examples
09:24 osse Hmm, I work as a consultant, but these days it's in the oil business. But doesn't matter what industry it is.I use tags the same way: to mark versions. "This revision of the code is v1.4"
09:24 llamapixel i have seen tags used as marking release software and would like more examples
09:24 llamapixel so tags as versions is my understanding as well, anything else I should explore?
09:25 bremner llamapixel: have you done release engineering before in any sense?
09:25 llamapixel yes
09:25 osse Examples other than marking releases? I can't think of anything. I use them sometimes locally to apply a label I can easily refer to later. That's about it
09:26 llamapixel ok thanks, I have not over explored my objections at the moment with this irc chat inspection.
09:26 narendraj9 joined #git
09:28 ochorocho__ joined #git
09:29 Eryn_1983_FL joined #git
09:31 llamapixel I make games, tags at the moment mark a release of full or partial integer points if I use rolling automatic cloud building or manual release builds
09:33 andrew710 joined #git
09:34 PioneerAxon joined #git
09:39 bremner tags are human readable, and can be signed.
09:40 ^7heo bremner: do not expect video game developers to be more than giant hacks (not all of them, but definitely most of them)
09:41 KV joined #git
09:44 bronson joined #git
09:52 Balliad joined #git
09:55 derk0pf joined #git
09:55 Cthalupa joined #git
10:00 overlord_tm joined #git
10:03 nwkj86 joined #git
10:04 osse interesting
10:06 Nicmavr joined #git
10:06 byte512 joined #git
10:09 [0xAA] joined #git
10:12 manuelschneid3r joined #git
10:13 google-bukolay-y joined #git
10:16 howitdo joined #git
10:16 howitdo joined #git
10:18 mrkake joined #git
10:20 WayToDoor joined #git
10:27 llamapixel It is the dick again Hwittaker
10:27 llamapixel 108.61.198.188
10:28 llamapixel ~theo@108.61.198.188
10:28 llamapixel sets ignore
10:29 particleGolem lol
10:30 whomp joined #git
10:30 ayogi joined #git
10:34 t0by joined #git
10:35 astrofog joined #git
10:35 fk joined #git
10:38 fk joined #git
10:43 Akimb joined #git
10:45 bronson joined #git
10:45 Guest55795 joined #git
10:47 Guest55795 joined #git
10:52 rebrec joined #git
10:56 SpeakerToMeat joined #git
10:56 strk joined #git
10:56 strk (how) can you remove a remote tag ?
10:57 bremner git push --delete
10:57 narendraj9 joined #git
10:59 Balliad joined #git
11:00 strk and, how to see the tree hash for a given commitish ?
11:00 bremner dunno. maybe git cat-file -p ?
11:01 strk git show b330128261
11:01 strk sorry
11:02 strk I'm confused by annotated tags
11:02 strk they have another hash, but points to the same commit
11:02 strk are them not "chained" with commits ?
11:03 strk as I think I saw them retain the same hash after changing them to point somehere else (possible ?)
11:03 bremner doubtful
11:03 Akimb joined #git
11:05 strk but I can remove tags w/out rewriting any commit history
11:05 Hink joined #git
11:05 strk anyway, I guess I was wrong about tag hash not changing
11:07 vdv joined #git
11:08 bremner strk: sure. it has to do with the way the pointers point. the rest of the graph doesn't even know the tags exist
11:08 mikecmpbll joined #git
11:09 cyan__ joined #git
11:09 holodoc joined #git
11:10 ThunderChicken joined #git
11:10 sea-gull joined #git
11:11 Schrostfutz joined #git
11:11 m0viefreak joined #git
11:14 Balliad joined #git
11:15 thiago joined #git
11:27 thiago left #git
11:27 thiago joined #git
11:29 maxb joined #git
11:29 ki0 joined #git
11:29 ochorocho__ joined #git
11:33 _ikke_ annotated tags: ref-tag -> tag-object -> commit
11:35 Schrostfutz joined #git
11:38 Panacea joined #git
11:40 macivy joined #git
11:40 pks joined #git
11:46 bronson joined #git
11:55 netj joined #git
11:55 maxb joined #git
11:55 cdown joined #git
11:56 a_thakur joined #git
11:57 ochorocho__ joined #git
12:01 maxb joined #git
12:02 xaa joined #git
12:13 CheckDavid joined #git
12:17 freimatz joined #git
12:19 overlord_tm joined #git
12:22 vuoto joined #git
12:22 Surfer2010 joined #git
12:22 pks joined #git
12:22 moei joined #git
12:23 nisseni joined #git
12:25 mikecmpbll joined #git
12:30 whomp joined #git
12:32 sdothum joined #git
12:34 ayogi joined #git
12:35 Panacea joined #git
12:40 zso joined #git
12:42 ij left #git
12:43 crose joined #git
12:47 bronson joined #git
12:56 ojdo joined #git
12:59 gzox joined #git
12:59 Vinnie_win_y joined #git
13:01 Siegfried joined #git
13:04 synthroid joined #git
13:07 synthroi_ joined #git
13:09 leeN joined #git
13:11 thiago joined #git
13:14 Siegfried joined #git
13:14 Starky joined #git
13:16 ki0 joined #git
13:18 donught joined #git
13:21 thiago joined #git
13:26 TomyLobo joined #git
13:30 jaguarmagenta joined #git
13:32 pks joined #git
13:32 jimi_ joined #git
13:34 newbie1 joined #git
13:41 reznord joined #git
13:41 zeroed joined #git
13:44 jnavila joined #git
13:45 reznord how can I revert to a previous version of the commit on
13:45 reznord I already pushed some changes to the code
13:45 reznord that i want to reset on the master as well
13:45 reznord git push origin HEAD --force ??
13:46 aavrug joined #git
13:47 aw1 joined #git
13:48 bronson joined #git
13:50 ochorocho__ joined #git
13:55 ayogi joined #git
13:56 rory reznord: consider local and rmeote separately. first get your local copy of the branch in the state you want it, using git reset --hard
13:56 jacob123 joined #git
13:56 rory reznord: then push with git push -f
13:59 jhgundersen joined #git
14:00 masuberu joined #git
14:01 shinnya joined #git
14:07 AndChat|383616 joined #git
14:07 AndChat|383616 joined #git
14:11 ShekharReddy joined #git
14:13 SpeakerToMeat joined #git
14:17 whomp joined #git
14:22 davimore_ joined #git
14:29 vrlx joined #git
14:30 thiago reznord: just remember that push -f does a history !rewrite
14:30 gitinfo reznord: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
14:33 cdown joined #git
14:34 sysadmin_ joined #git
14:36 vuoto joined #git
14:43 mar77i joined #git
14:48 navidr joined #git
14:49 bronson joined #git
14:49 jaafar joined #git
14:52 sdothum joined #git
14:53 LiMp^ joined #git
14:55 sdothum joined #git
14:56 b100s joined #git
14:57 reznord thiago: it is a private repository, as in I'm the only dev
14:57 reznord so, I guess it is not a problem
14:57 reznord 😅
15:00 zeroed joined #git
15:01 Schrostfutz joined #git
15:04 theoceaniscool joined #git
15:09 ncrntn joined #git
15:10 ncrntn hi, I'm trying to add a second remote (push only) to my repo but I can't seem to do it with git remote set-url --add [--push] <name> <newurl>
15:10 ncrntn because whenever I use an arbitrary name in the field <name> I get an error saying no such remote exists
15:11 strk git remote add <name> <url>
15:11 ncrntn yh but what if I want to add a push only one
15:15 ncrntn @strk solved with the --mirror option
15:15 ncrntn left #git
15:19 floatingman joined #git
15:23 sdothum joined #git
15:23 denimsoft joined #git
15:27 Electrometro joined #git
15:35 jeffreylevesque joined #git
15:37 menip joined #git
15:38 SpeakerToMeat joined #git
15:40 jw4242 joined #git
15:41 rocket joined #git
15:41 nettoweb joined #git
15:41 derk0pf joined #git
15:42 rocket71 joined #git
15:45 dan2k3k4 joined #git
15:45 plos joined #git
15:50 bronson joined #git
15:51 Panacea joined #git
15:54 Panacea joined #git
15:55 mar77i_ joined #git
15:55 lvns joined #git
15:55 nettoweb1 joined #git
16:03 vaskozl joined #git
16:03 nettoweb joined #git
16:03 vaskozl What does the server run to provide plain git, or git:// (I know how to do https and ssh)?
16:04 mellernoia joined #git
16:05 sdothum joined #git
16:06 Peng vaskozl: 'git daemon', via xinetd or similar
16:06 rocket71 joined #git
16:06 Peng https://git-scm.com/book/en/v2​/Git-on-the-Server-Git-Daemon
16:06 thiago vaskozl: remember: git daemon is unencrypted and unauthenticated
16:07 vaskozl Ok I was just wondering, as I saw the kernel could be pulled that way.
16:10 vaskozl Thanks :), now I have all 3 set up fine
16:11 nikitasius joined #git
16:13 Darcidride joined #git
16:13 SpeakerToMeat joined #git
16:15 jaguarmagenta joined #git
16:16 denimsoft joined #git
16:22 cyan__ joined #git
16:22 nydel07 joined #git
16:22 moestevens_ joined #git
16:23 jimi_ joined #git
16:24 realtime joined #git
16:31 robotroll joined #git
16:34 perrier-jouet joined #git
16:39 jimi_ joined #git
16:40 quackgyver joined #git
16:48 cdown joined #git
16:49 whomp joined #git
16:49 Starky joined #git
16:49 AndroIRCScreensh joined #git
16:50 AndroIRCScreensh joined #git
16:51 bronson joined #git
16:52 parasite_ joined #git
16:52 AndroIRCScreensh joined #git
16:54 cdown joined #git
16:55 tyriondwarf joined #git
16:55 tyriondwarf can i upload a project to a server without git
16:57 AndroIRCScreensh joined #git
16:57 AndroIRCScreensh joined #git
16:59 AndroIRCScreensh joined #git
17:00 madewokherd joined #git
17:01 cdown_ joined #git
17:03 PaulCapestany joined #git
17:05 m0viefreak joined #git
17:06 vuoto joined #git
17:08 salamanderrake joined #git
17:10 somaReverse joined #git
17:10 jaguarmagenta joined #git
17:11 kadoban joined #git
17:11 howitdo joined #git
17:12 dreiss joined #git
17:14 AndroIRCScreensh joined #git
17:14 Jon28_ joined #git
17:17 donught joined #git
17:19 jimi_ joined #git
17:22 thiago tyriondwarf: that makes it not-a-git question
17:22 sea-gull joined #git
17:22 AndroIRCScreensh joined #git
17:22 strk left #git
17:22 oun joined #git
17:23 tyriondwarf lol
17:23 nowhereman joined #git
17:24 thiago tyriondwarf: there are plenty of ways to upload stuff
17:24 thiago I highly recommend rsync
17:30 jaguarmagenta joined #git
17:31 jaguarmagenta joined #git
17:36 mizu_no_oto joined #git
17:42 somaReverse joined #git
17:50 wloncom joined #git
17:51 sdothum joined #git
17:52 bronson joined #git
17:52 somaReverse joined #git
17:53 ejb joined #git
17:56 zq joined #git
17:57 zq is it possible to automate git rebase so that commits with messages containing a certain keyword are skipped?
17:57 zq or am i stuck with the filter-branch tool?
17:57 thiago use git rebase -i and then use your text editor's search-and-replace (or line-deletion) feature
17:58 thiago note that rebase and filter-branch do two very different things
17:58 thiago they're not interchangeable
17:59 zq thiago: -i is interactive, though
17:59 snowkidind joined #git
17:59 wloncom joined #git
17:59 thiago yes
17:59 thiago I don't see the problem
17:59 zq yes, i'm aware of the distinction between the two, but i also know that what i'm asking can be (rather inelegantly) done with filter-branch
17:59 thiago you're sitting in front of the computer
17:59 zq the problem is that interactive is the opposite of automated
18:00 pks joined #git
18:00 thiago automated as in "without my having to look into every commit"
18:00 brent__ joined #git
18:00 thiago ALL rebases are interactive in the sense that you're sitting in front of the computer
18:01 zq that's not what interactive means
18:01 zq re-defining the word doesn't really make what i'm asking go away
18:01 thiago you never do a rebase in the background, in a server, without a human looking after it
18:01 thiago that's what I meant
18:01 zq sure i do
18:01 thiago well, you're not supposed to
18:02 thiago rebases can result in conflicts
18:02 zq git rebase master really-long-list-of-commits
18:02 thiago the script can't fix them
18:02 thiago therefore, rebases are only done when there's a human around to fix the conflicts
18:02 zq what if i know a priori that there will be none?
18:02 somaReverse joined #git
18:03 thiago that is a very difficult construction
18:03 zq and, in my scenario where the rebase is only ever removing commits, how can there possibly conflicts?
18:03 thiago like every commit creating a new file with a unique (non-sequential) ID
18:03 thiago if you remove a change that a later commit depended on or was close to, it's a conflict
18:04 zq really
18:04 cagedwisdom joined #git
18:04 thiago suppose one commit modified a given line in a given file
18:04 zq then how come it's manageable with filter-branch?
18:04 thiago if any later commit modified (or removed or added) any line within 3 lines of those changed lines, it's a coflict
18:04 thiago because filter-branch is not the same as rebase
18:05 thiago as I said, they do two very different things and are not interchangeable
18:05 thiago if you use filter-branch with a commit filter and remove a commit, the changes remain but they show up in the next commit
18:06 thiago that's like using git rebase -i and squashing the two commits together, retaining the latter commit's commit message
18:06 thiago rebase also linearises history, filter-branch doesn't
18:06 zq i don't think that's what skip_commit does
18:06 thiago in filter-branch?
18:06 thiago sure it is
18:07 flavius joined #git
18:08 Spec-Chum joined #git
18:10 tyriondwarf joined #git
18:14 kulelu88 joined #git
18:17 dreiss joined #git
18:21 thiago joined #git
18:24 Goplat joined #git
18:28 dviola joined #git
18:29 tyriondwarf joined #git
18:34 YuGiOhJCJ joined #git
18:37 Juanito[m] joined #git
18:38 knot joined #git
18:39 knot left #git
18:42 b1tchcakes joined #git
18:49 nckpz joined #git
18:51 infernix joined #git
18:51 clemf joined #git
18:53 bronson joined #git
18:56 b100s joined #git
19:02 snowkidind joined #git
19:03 xaviergmail joined #git
19:03 NeverDie joined #git
19:05 dreiss joined #git
19:08 NeverDie_ joined #git
19:12 gxw joined #git
19:16 howitdo joined #git
19:18 cdown joined #git
19:23 Panacea joined #git
19:32 ejb joined #git
19:33 ianmethyst joined #git
19:35 shgysk8zer0 joined #git
19:35 Schrostfutz joined #git
19:38 albel727 joined #git
19:39 pks joined #git
19:39 ianmethyst joined #git
19:40 unreal_ joined #git
19:40 davimore__ joined #git
19:41 ianmethyst joined #git
19:42 dreiss joined #git
19:50 cdown joined #git
19:52 bernardio joined #git
19:53 multi_io joined #git
19:54 bronson joined #git
19:57 aavrug joined #git
19:59 pks joined #git
20:01 remote joined #git
20:02 remote does anyone have a recipe for excluding specific blocks of text from files (sets of lines)
20:02 remote ?
20:02 Seveas That sounds like an !xy problem
20:02 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
20:08 Zordey__ joined #git
20:09 Salander27_ joined #git
20:13 ianmethyst joined #git
20:20 diogenese joined #git
20:22 shgysk8zer0 joined #git
20:23 altendky joined #git
20:26 rwp remote, man git-filter-branch
20:26 gitinfo remote: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
20:27 davimore_ joined #git
20:30 ianmethyst joined #git
20:32 nisseni joined #git
20:33 overlord_tm joined #git
20:36 pks joined #git
20:38 sea-gull joined #git
20:40 nidr0x joined #git
20:44 shgysk8zer0 joined #git
20:44 rafalcpp joined #git
20:45 cdown joined #git
20:50 ResidentBiscuit joined #git
20:51 dreiss joined #git
20:52 remote ty
20:53 mfrankly joined #git
20:54 nidr0x joined #git
20:54 bronson joined #git
20:59 madewokherd joined #git
21:00 d0nn1e joined #git
21:09 Atm0spher1c joined #git
21:11 howitdo joined #git
21:11 bernardio joined #git
21:17 howitdo joined #git
21:17 Anja joined #git
21:20 spm_draget left #git
21:22 larsrustand joined #git
21:22 pks joined #git
21:23 kpease joined #git
21:26 f4 joined #git
21:27 tyriondwarf joined #git
21:29 a3Dman joined #git
21:30 tyriondw_ joined #git
21:32 Singmyr joined #git
21:33 mmlb joined #git
21:35 ochorocho__ joined #git
21:36 thiago joined #git
21:40 iamthad joined #git
21:42 a3Dman joined #git
21:44 freimatz joined #git
21:44 jeffreylevesque joined #git
21:45 mikecmpbll joined #git
21:47 wcpan joined #git
21:47 aw1 joined #git
21:47 pikajude joined #git
21:50 tmg joined #git
21:50 ianmethyst joined #git
21:55 GavinMagnus joined #git
21:55 bronson joined #git
21:56 troyt joined #git
21:59 jeffreylevesque joined #git
22:02 nidr0x joined #git
22:08 elastix joined #git
22:09 jimi_ joined #git
22:12 HcsOmot joined #git
22:13 shgysk8zer0 joined #git
22:32 Lyqyd joined #git
22:32 ayjay_t joined #git
22:32 salamanderrake joined #git
22:39 theoceaniscool joined #git
22:40 theskillwithin joined #git
22:46 xaviergmail_ joined #git
22:46 ResidentBiscuit joined #git
22:48 dreiss joined #git
22:48 Siegfried joined #git
22:49 theskillwithin joined #git
22:50 GavinMagnus left #git
22:52 nivag joined #git
22:56 bronson joined #git
22:57 [0xAA] joined #git
23:01 WaReZ joined #git
23:01 fmeerkoetter joined #git
23:01 diogenese joined #git
23:06 [0xAA] joined #git
23:07 Goplat joined #git
23:07 Tee_Pee joined #git
23:21 infernix joined #git
23:25 Atm0spher1c joined #git
23:26 [Saint] joined #git
23:27 masuberu joined #git
23:30 paramourne joined #git
23:30 Atm0spher1c joined #git
23:30 JanC_ joined #git
23:35 [Saint] joined #git
23:38 larsrustand joined #git
23:40 lilpup joined #git
23:41 robotroll joined #git
23:43 andrew710 joined #git
23:43 afed joined #git
23:43 pks_ joined #git
23:46 derk0pf joined #git
23:48 derk0pf joined #git
23:57 bronson joined #git
23:58 ayjay_t joined #git

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