| 2018-12-14 |
| ← Toadisattva left | 00:00 |
|
floraline
| i wouldn't have expected it to let you do that | 00:03 |
| ← CodeSlingerPaul left | 00:03 |
| ← finalbeta left | 00:04 |
| → jim joined | 00:05 |
|
rafasc
| git checkout with paths is the way you overwrite local files with the state from the index. | 00:09 |
| ← m0viefreak left | 00:11 |
| → davidfetter joined | 00:15 |
|
davidfetter
| hi | 00:15 |
|
| Is there a way to hint to `git diff` a file order? | 00:16 |
| ← Phylock left | 00:16 |
|
davidfetter
| I'd love to be able to say, "First, these files in this order, then these others" or words to that effect | 00:17 |
| → blackmesa joined | 00:19 |
| ← YuGiOhJCJ left | 00:21 |
| → YuGiOhJCJ joined | 00:21 |
| ← floraline left | 00:24 |
| ← dfee left | 00:25 |
|
osse
| davidfetter: yes | 00:27 |
| ← yyy left | 00:27 |
|
osse
| diff.orderFile | 00:27 |
|
davidfetter
| how? :) | 00:27 |
|
| davidfetter looks this up | 00:27 |
| ← netj left | 00:28 |
| ← n3wborn left | 00:28 |
| → netj joined | 00:28 |
| → yyy joined | 00:28 |
|
osse
| It's a config setting | 00:28 |
|
rafasc
| also -O | 00:28 |
|
osse
| Can probably be given as an argument to git diff | 00:28 |
|
rafasc
| osse: ahead of you | 00:28 |
|
| ;) | 00:28 |
|
osse
| Ah that's the one | 00:28 |
|
davidfetter
| That's perfect! Thanks, osse and rafasc | 00:29 |
| → jubal joined | 00:29 |
| → leeN joined | 00:31 |
| ← blackmesa left | 00:33 |
| → andyhuzhill joined | 00:33 |
| → courrier joined | 00:38 |
| ← yyy left | 00:39 |
| → bjpenn joined | 00:40 |
|
bjpenn
| lets say i merged my feature branch with master | 00:40 |
|
| and i was going to do a PR | 00:40 |
| ← jast left | 00:41 |
|
bjpenn
| but then i decided to make a few more changes, and now theres a few more changes to master, as well as my changes to my feature branch | 00:41 |
| → jast joined | 00:41 |
|
bjpenn
| so instead of merging to master again and filling up the commit log with a bunch of "merge to master" | 00:41 |
| ← Xeyame left | 00:41 |
|
bjpenn
| how do i remove teh previous "merge master into my feature branch" log entries | 00:41 |
|
| and just have the one | 00:41 |
| → Xeyame joined | 00:41 |
| ← Cabanossi left | 00:45 |
| ← leeN left | 00:46 |
| → Cabanossi joined | 00:46 |
| → SirFunk joined | 00:46 |
| dmc → gehidore | 00:47 |
| gehidore → teklad | 00:47 |
| teklad → dmc | 00:48 |
| → ferdna joined | 00:54 |
| ← durham left | 00:55 |
| ← dege left | 00:58 |
| → mattcen joined | 00:59 |
| ← w0ng left | 01:00 |
| → prakashdanish joined | 01:01 |
| → Bobdude joined | 01:03 |
| → est joined | 01:04 |
| ← al-damiri left | 01:04 |
|
est
| hello | 01:04 |
|
gitinfo
| est: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on. | 01:04 |
| ← Ram-Z left | 01:04 |
|
est
| If I have a range of commits, I can do git rebase -i and then select each of them to edit | 01:04 |
|
| but that's wearisome | 01:05 |
|
| is there a tool where I can just take the last commit, split it up into little pieces, and then make it amend the precise commit where the code was added | 01:06 |
| → Ram-Z joined | 01:06 |
|
est
| nvm found https://github.com/torbiak/git-autofixup | 01:12 |
| ← est left | 01:13 |
| Sasazuka__ → Sasazuka | 01:14 |
| → brandonkal joined | 01:16 |
|
brandonkal
| Hello When I create a symbolic link, how can I ensure it is tracked by git? Sometimes it works and other times they just seem to disappear or are not tracked. | 01:19 |
| → ngui joined | 01:21 |
| ← iam730 left | 01:21 |
| ← lucasb left | 01:22 |
| → Goplat joined | 01:25 |
| ← quesker left | 01:31 |
| → blackmesa joined | 01:32 |
| → iam730 joined | 01:36 |
| ← rafasc left | 01:39 |
| ← mloskot left | 01:40 |
| ← blackmesa left | 01:41 |
| ← courrier left | 01:54 |
| → rafasc joined | 01:54 |
| ← jubal left | 01:56 |
| ← thiago left | 01:57 |
| ← greatgatsby left | 01:58 |
| ← Sasazuka left | 01:58 |
| ← mikecmpbll left | 02:01 |
| ← cbrt64 left | 02:03 |
| ← iam730 left | 02:04 |
| ← Wetmelon left | 02:05 |
| → cbrt64 joined | 02:06 |
| → iam730 joined | 02:06 |
| ← epatr left | 02:14 |
| ← jim left | 02:15 |
| → epatr joined | 02:15 |
| → finalbeta joined | 02:16 |
| ← ghost43 left | 02:21 |
| → ghost43 joined | 02:22 |
| ← netj left | 02:22 |
| ← andyhuzhill left | 02:22 |
| → netj joined | 02:22 |
| → andyhuzhill joined | 02:23 |
| ← Essadon left | 02:23 |
| ← andyhuzhill left | 02:27 |
| → andyhuzhill joined | 02:27 |
| ← dsx_ left | 02:30 |
| → igemnace joined | 02:30 |
| ← xcm left | 02:32 |
| → xcm joined | 02:32 |
| → jim joined | 02:34 |
| → kazimuth joined | 02:37 |
| ← iam730 left | 02:44 |
| → kapil____ joined | 02:44 |
| → iam730 joined | 02:46 |
| ← prakashdanish left | 02:48 |
| ← xcm left | 02:50 |
| → xcm joined | 02:50 |
| → hofmann3900 joined | 02:51 |
| ← F0rTex left | 02:57 |
| → F0rTex joined | 02:59 |
| ← rafasc left | 03:00 |
| ← Codaraxis left | 03:01 |
| ← graphene left | 03:12 |
| → thiago joined | 03:13 |
| → graphene joined | 03:13 |
| ← WakiMiko left | 03:16 |
| ← mowcat left | 03:17 |
| → jomo_ joined | 03:18 |
| ← treehug88 left | 03:20 |
| → nioncode joined | 03:20 |
| → i7c joined | 03:20 |
| → mowcat joined | 03:21 |
| → chckyn joined | 03:21 |
| → Blkt joined | 03:21 |
| ← lagothrix left | 03:23 |
| → lagothrix joined | 03:23 |
| → maryo joined | 03:24 |
| → WakiMiko joined | 03:24 |
| → markus-k joined | 03:25 |
| → xall joined | 03:25 |
| ← jomo_ left | 03:29 |
| → jomo_ joined | 03:29 |
| → dfee joined | 03:31 |
| ← Mattiaslndstrm left | 03:36 |
| → Wetmelon joined | 03:36 |
| ← Dirak left | 03:37 |
| ← chckyn left | 03:38 |
| ← lagothrix left | 03:39 |
| ← nikivi left | 03:41 |
| ← kazimuth left | 03:41 |
| ← maryo left | 03:41 |
| → lagothrix joined | 03:43 |
| → mika joined | 03:47 |
| ← voidSurfr left | 03:48 |
| → deepy joined | 03:48 |
| → crane joined | 03:49 |
| ← drbean left | 03:50 |
| ← dviola left | 03:50 |
| ← swalladge left | 03:52 |
| → nikivi joined | 03:54 |
| ← mowcat left | 03:55 |
| → breakingsad joined | 03:55 |
| ← jomo_ left | 03:57 |
| → cd joined | 03:57 |
| → jomo_ joined | 03:57 |
| → mowcat joined | 03:58 |
| → Dirak joined | 03:59 |
| ← graphene left | 03:59 |
| → prakashdanish joined | 03:59 |
| → graphene joined | 04:00 |
| ← profmac left | 04:00 |
| ← mrCyborg|zzz left | 04:05 |
| → mrCyborg|zzz joined | 04:05 |
| → Toadisattva joined | 04:06 |
| → drbean joined | 04:09 |
| → Thominus joined | 04:09 |
| → motoko-chan joined | 04:13 |
| → Cabanoss- joined | 04:13 |
| → profmac joined | 04:13 |
| → yn joined | 04:13 |
| ← boombatower left | 04:13 |
| ← Cabanossi left | 04:13 |
| ← geekodour08 left | 04:17 |
| ← timj left | 04:17 |
| ← dfee left | 04:21 |
| ← graphene left | 04:21 |
| → graphene joined | 04:22 |
| → FiendKing04 joined | 04:26 |
| → cswl joined | 04:27 |
| ← mebus left | 04:27 |
| → swalladge joined | 04:28 |
| → treehug88 joined | 04:29 |
| → venmx joined | 04:30 |
| → timj joined | 04:31 |
| ← iam730 left | 04:33 |
| → iam730 joined | 04:38 |
| ← prakashdanish left | 04:40 |
| → KeyJoo joined | 04:41 |
| ← graphene left | 04:43 |
| → graphene joined | 04:44 |
| → chandoo joined | 04:44 |
| ← deltam left | 04:47 |
| ← finalbeta left | 04:47 |
| → finalbeta joined | 04:47 |
| ← FiendKing04 left | 04:56 |
| → sauvin joined | 05:00 |
| ← chandoo left | 05:00 |
| → Mrbuck joined | 05:02 |
| → pks_ joined | 05:02 |
| ← pks left | 05:02 |
| pks_ → pks | 05:02 |
| → prakashdanish joined | 05:04 |
| → Sleepy63 joined | 05:06 |
| ← novum left | 05:15 |
| ← str left | 05:16 |
| → ItalyPaleAle joined | 05:18 |
|
ItalyPaleAle
| Hi how can I create a commit in git that reverses the changes of the 2 previous commits? (I don’t want to just rebase or discard the changes, I still want them in the history) | 05:19 |
| ← Toadisattva left | 05:20 |
| → dfee joined | 05:20 |
| ← Wetmelon left | 05:21 |
| ← venmx left | 05:21 |
|
thiago
| ItalyPaleAle: git revert twice | 05:23 |
|
| better yet: | 05:23 |
|
| git checkout @~2 . (remember the dot), then commit | 05:23 |
| → quesker joined | 05:23 |
| ← kadoban left | 05:25 |
|
ItalyPaleAle
| thanks | 05:25 |
|
| @thiago wait but that doesn’t create a “reversed” commit | 05:26 |
|
| just brings my code back to what it was | 05:26 |
|
| what I want to do is for example: If in commit ~1 I added one line, I want to revert it so there’s a commit in which the same line gets deleted | 05:27 |
| ← Mrbuck left | 05:28 |
|
ItalyPaleAle
| oh well i figured it out | 05:29 |
| → str joined | 05:29 |
| ← ItalyPaleAle left | 05:30 |
|
thiago
| "then commit" | 05:33 |
| ← gordonfish left | 05:33 |
| ← libertyprime left | 05:35 |
| → miczac joined | 05:37 |
| → cfoch joined | 05:38 |
| ← graphene left | 05:39 |
| → graphene joined | 05:39 |
| ← prg318 left | 05:41 |
| ← xuib left | 05:46 |
| → jubal joined | 05:58 |
| → crimastergogo joined | 06:03 |
| → prakashd1 joined | 06:03 |
| ← g00s left | 06:03 |
| ← YuGiOhJCJ left | 06:03 |
| ← prakashdanish left | 06:05 |
| ← ferdna left | 06:07 |
| ← miczac left | 06:11 |
| ← graphene left | 06:12 |
| → graphene joined | 06:12 |
| → Codaraxis joined | 06:13 |
| → gordonfish joined | 06:22 |
| ← str left | 06:23 |
| ← Raed left | 06:25 |
| ← neunon left | 06:25 |
| ← cads left | 06:25 |
| ← mowcat left | 06:27 |
| → kazimuth joined | 06:29 |
| → Raed joined | 06:29 |
| → neunon joined | 06:31 |
| → str joined | 06:35 |
| → sydbarret joined | 06:38 |
| → prg318 joined | 06:42 |
| → jokester joined | 06:42 |
| → Phylock joined | 06:43 |
| ← kazimuth left | 06:44 |
| → kazimuth joined | 06:50 |
| ← ExeciN left | 06:50 |
| → courrier joined | 06:51 |
| ← xcm left | 06:55 |
| → xcm joined | 06:55 |
| ← str left | 06:56 |
| → elsheepo joined | 06:56 |
| ← nowhere_man left | 06:57 |
| → boZipper joined | 07:07 |
| ← boZipper left | 07:07 |
| ← Dirak left | 07:10 |
| → T_UNIX joined | 07:11 |
| → Dirak joined | 07:13 |
| ← GreenJello left | 07:15 |
| ← dolphy left | 07:18 |
| → sQVe joined | 07:19 |
| → dolphy joined | 07:19 |
| ← thiago left | 07:22 |
| ← sQVe left | 07:24 |
| ← courrier left | 07:25 |
| ← downer06 left | 07:25 |
| → andrzejv joined | 07:25 |
| → downer06 joined | 07:27 |
| → nurdie joined | 07:27 |
| ← crimastergogo left | 07:27 |
| → crimastergogo joined | 07:29 |
| → tarkus joined | 07:30 |
| ← nurdie left | 07:31 |
| → Orbitrix joined | 07:33 |
| ← dpyro left | 07:36 |
| ← crimastergogo left | 07:36 |
| ← guardian left | 07:38 |
| → n3wborn joined | 07:47 |
| ← Sleepy63 left | 07:47 |
| → chele joined | 07:48 |
| → deltam joined | 07:48 |
| → sQVe joined | 07:49 |
| ← Goplat left | 07:57 |
| ← motoko-chan left | 07:57 |
| ← cfoch left | 07:58 |
| elsheepo → beatzz | 07:59 |
| → Anthaas_ joined | 08:00 |
| ← Anthaas left | 08:01 |
| → dege joined | 08:03 |
| ← Bobdude left | 08:03 |
| ← kazimuth left | 08:08 |
| ← beatzz left | 08:12 |
| → mona_x joined | 08:12 |
| → crimastergogo joined | 08:14 |
| → Sleepy63 joined | 08:15 |
| → theoceaniscool joined | 08:16 |
| ← crimastergogo left | 08:19 |
| → crimastergogo joined | 08:20 |
| → courrier joined | 08:22 |
| → feyyazacikalin joined | 08:24 |
| → Sasazuka joined | 08:24 |
| → Silmarilion__ joined | 08:25 |
| ← justanotheruser left | 08:27 |
| ← rkta left | 08:27 |
| ← Sasazuka left | 08:28 |
| ← prakashd1 left | 08:32 |
| ← ngui left | 08:33 |
| → ngui joined | 08:33 |
| ← KeyJoo left | 08:33 |
| → nowhere_man joined | 08:33 |
| ← courrier left | 08:36 |
| ← ngui left | 08:37 |
| → ngui joined | 08:38 |
| ← sydbarret left | 08:39 |
| → TheWild joined | 08:40 |
| → justanotheruser joined | 08:41 |
| ← dfee left | 08:43 |
| → dre_ joined | 08:44 |
| ← feyyazacikalin left | 08:49 |
| ← xcm left | 08:49 |
| → xcm joined | 08:50 |
| → dfee joined | 08:55 |
|
TheWild
| hello | 08:55 |
| ← dfee left | 08:56 |
|
TheWild
| I wanted to either prove or disprove whether reproducing the same files and giving git exactly the same parameters during commit will produce the same commit hash | 08:57 |
|
| and points out, the answer is *yes*! https://gist.github.com/beyondlimits/e208eadae647c4fa733f9b870d775b46 | 08:57 |
| ← mona_x left | 08:57 |
| ← xcm left | 08:57 |
| → mona_x joined | 08:59 |
| ← crimastergogo left | 08:59 |
| → crimastergogo joined | 09:00 |
| → Fusl joined | 09:00 |
| → Silmarlion_ joined | 09:00 |
| → floppydh joined | 09:01 |
|
Fusl
| is it possible to make git merge repo1 into repo2 which is a fork of repo1 from a few commits back but with commits added to it? i basically want to get a fork of a software with custom patches thats since been updated up to date with the latest upstream patches | 09:02 |
| ← dre_ left | 09:02 |
| ← Silmarilion__ left | 09:03 |
| → xcm joined | 09:06 |
|
Fusl
| i guess git merge is the literal answer? | 09:06 |
| → prakashd1 joined | 09:08 |
|
TheWild
| if you mean merge but without merge, then the key word is 'rebase', but that would rewrite a bit of history. | 09:10 |
| → rkta joined | 09:10 |
| ← styler2go left | 09:11 |
|
TheWild
| I think it's safer to go with merge | 09:11 |
|
Fusl
| yeah, doing a merge now, that's what i was looking for after calling it "merge" in my question already. just had a brain fart | 09:12 |
| ← bjpenn left | 09:17 |
| → styler2go joined | 09:18 |
| ← crimastergogo left | 09:20 |
| → crimastergogo joined | 09:20 |
| → daegontaven joined | 09:29 |
| ← crimastergogo left | 09:30 |
| → crimastergogo joined | 09:31 |
| → Unode joined | 09:31 |
|
Unode
| hi all, I'm trying to setup 2 git hooks that unlock (make writable) something in the repository before a commit or merge/rebase and then lock (make read-only) again after git is done. Looking at git-hooks I'm pretty sure this is doable but I'm having a hard time figuring out which hooks would be more suitable. | 09:34 |
| → yyy joined | 09:34 |
| ← breakingsad left | 09:34 |
| → settermjd joined | 09:34 |
|
Unode
| In particular, by what order do different hooks trigger and would I need to setup several hooks (for commit, merge, rebase, ...) or is there some universal pre/post hook that gets triggered for almost every command? | 09:35 |
| ← andyhuzhill left | 09:35 |
| → Noti joined | 09:36 |
| ← settermjd left | 09:42 |
| ← ngui left | 09:43 |
| → ngui joined | 09:43 |
| → settermjd joined | 09:44 |
| → mikecmpbll joined | 09:49 |
| → Silenced joined | 09:50 |
| → THall66 joined | 09:51 |
| ← ngui left | 09:52 |
| → ngui joined | 09:52 |
|
THall66
| When using `git add -p`, is it possible to configure it not to require the <return> after the choice? | 09:53 |
|
_ikke_
| THall66: afaik no | 09:54 |
| ← crimastergogo left | 09:56 |
| → crimastergogo joined | 09:56 |
| ← xcm left | 10:01 |
| → xcm joined | 10:01 |
| ← igemnace left | 10:03 |
| → silenc3r joined | 10:08 |
| ← crimastergogo left | 10:11 |
| → crimastergogo joined | 10:11 |
| ← daegontaven left | 10:14 |
| ← crimastergogo left | 10:16 |
| → crimastergogo joined | 10:17 |
| ← ngui left | 10:18 |
| → ngui joined | 10:18 |
| → Zexaron joined | 10:18 |
| → bsaboia joined | 10:19 |
| ← catsup left | 10:19 |
| → catsup joined | 10:20 |
| ← catsup left | 10:20 |
| → throstur joined | 10:21 |
| → catsup joined | 10:21 |
| ← crimastergogo left | 10:22 |
| → D630 joined | 10:22 |
| → crimastergogo joined | 10:22 |
| ← ngui left | 10:22 |
| → ngui joined | 10:22 |
| ← crimastergogo left | 10:27 |
| → crimastergogo joined | 10:27 |
| → ansyeb joined | 10:30 |
|
ansyeb
| hello. lets assume im on a new system, Ive no idea bout. how do i find git repos? | 10:30 |
|
| find ~ -type d -name .git & find / -type d -name .git did not return anything | 10:30 |
|
| and I know for a fact, there are some on this system | 10:31 |
| ← mona_x left | 10:31 |
| ← crimastergogo left | 10:32 |
| → crimastergogo joined | 10:32 |
| ← throstur left | 10:33 |
| ← Orbitrix left | 10:34 |
| ← Dirak left | 10:36 |
| ← crimastergogo left | 10:37 |
| → crimastergogo joined | 10:38 |
| → EvilDMP joined | 10:40 |
| → xall_ joined | 10:41 |
| → Orbitrix joined | 10:41 |
| ← xall_ left | 10:42 |
|
EvilDMP
| I am trying to rebase a branch, and have a lot of: | 10:43 |
|
| * deleted by us | 10:43 |
|
| * both modified | 10:43 |
|
| * added by them | 10:43 |
|
| unmerged paths. In *all* cases, I want *only* "ours", and not "theirs". Is there a way to add/rm the appropriate ones en-masse? | 10:43 |
| ← xall left | 10:43 |
| ← Anthaas_ left | 10:44 |
| → libertyprime joined | 10:45 |
| → Anthaas joined | 10:46 |
| ← n3wborn left | 10:50 |
| ← TheWild left | 10:51 |
| ← ansyeb left | 10:51 |
| → Xatenev joined | 10:55 |
| ← Shentino left | 10:55 |
|
Xatenev
| Can I somehow after a rebase update my remote without push force? | 10:55 |
|
| I feel like im doing something wrong having to force push after a successful rebase | 10:56 |
| → Silmarilion__ joined | 10:56 |
| ← Silmarlion_ left | 10:58 |
| ← yyy left | 10:59 |
| → Shentino joined | 10:59 |
| → yyy joined | 11:00 |
| ← cd left | 11:04 |
|
canton7
| Not if you have rebased commits which have already been pushed | 11:05 |
|
| rebase by its very nature rewrites commits -- that's the entire point of it | 11:05 |
| → jungsubk joined | 11:06 |
| ← andrzejv left | 11:08 |
| ← crimastergogo left | 11:10 |
|
Xatenev
| canton7, okdoke | 11:10 |
| → throstur joined | 11:10 |
| → mona_x joined | 11:11 |
| → crimastergogo joined | 11:12 |
| ← crimastergogo left | 11:16 |
| → CodeSlingerPaul joined | 11:24 |
| ← D630 left | 11:29 |
| ← prakashd1 left | 11:34 |
| → gxt joined | 11:36 |
| ← johnny56 left | 11:38 |
| ← jungsubk left | 11:41 |
| → julius_ joined | 11:41 |
|
julius_
| hi | 11:41 |
| ← Xatenev left | 11:42 |
|
julius_
| is there a seperate channel for tortoise? | 11:42 |
| ← gxt left | 11:46 |
|
_ikke_
| not aware of any | 11:52 |
| → geekodour08 joined | 11:59 |
| ← zulutango left | 11:59 |
| → TheWild joined | 11:59 |
|
TheWild
| git pull... oh s**t, whaaat? Who was messing with my branch? | 12:00 |
|
| I'm stuck at EDIT_MSG. Is there a way to tell git I want to abort merge? | 12:00 |
| → basiclaser joined | 12:00 |
|
grawity
| delete the file's contents, save and exit | 12:01 |
|
TheWild
| ok. I hope it will work. I hope it will not treat just line ending as a non-empty message. | 12:01 |
| → SpinTensor joined | 12:02 |
|
TheWild
| "Not committing merge; use 'git commit' to complete the merge." | 12:03 |
|
| giving "git merge --abort" a try. | 12:03 |
|
| whew, worked! Thank you gravity. | 12:03 |
|
| considering I had a bunch of uncommited changes, my index would end up in a mess. | 12:04 |
|
| grawity | 12:04 |
|
SpinTensor
| hi, i need some help. We have a git repository at university. I have a clone of this repository on my local machine at home. Now i want to keep working on this on my laptop (which cant directly connect to the uni-repo). | 12:04 |
|
grawity
| huh, usually it's the opposite | 12:05 |
|
SpinTensor
| i made a clone from my local pc to my laptop, but if i try to push from my laptop i get an error | 12:05 |
|
grawity
| yes, by default you cannot push into a checked-out branch | 12:05 |
|
SpinTensor
| it says refusing to update checke out branch: | 12:05 |
|
| grawity. ok, thanks. is there a way how i could do it then? | 12:05 |
|
grawity
| a) you can push into a different branch | 12:06 |
|
| b) you can try setting receive.denyCurrentBranch=updateInstead on the receiving repo | 12:06 |
| → oxymoron93 joined | 12:06 |
|
grawity
| c) you can maybe pull from the laptop on the local PC | 12:06 |
|
SpinTensor
| i'm a git noob. so i create a branch on my pc and check this on the laptop? | 12:07 |
|
grawity
| there's a d) git bundle and an e) and probably a f), but not going to bother with those for now | 12:07 |
|
| if you're working on master on the laptop, try `git push origin master:tmp` | 12:07 |
| → johnny56 joined | 12:07 |
|
grawity
| then on the desktop, you'll now have a branch named "tmp" that you can merge into master | 12:07 |
|
SpinTensor
| wow. that seems to work. thanks. | 12:08 |
|
grawity
| once you have some more commits you can try the b) option, run `git config receive.denyCurrentBranch updateInstead` on the desktop, and then a regular `git push` on the laptop | 12:09 |
|
SpinTensor
| thanks. i will stay with the first option for now. but i definetely keep it in mind. | 12:10 |
| → dslegends joined | 12:13 |
| ← Silenced left | 12:14 |
| → rexwin_ joined | 12:17 |
| ← SpinTensor left | 12:18 |
| ← comptroller left | 12:19 |
| → qswz joined | 12:20 |
|
qswz
| good practice to always --prune in git pull? | 12:20 |
|
| or [pull] prune = true in .gitconfig, will try that | 12:21 |
|
osse
| In my opinion, yes | 12:21 |
|
qswz
| thanks k | 12:22 |
|
osse
| It's [fetch] | 12:22 |
|
qswz
| o thanks | 12:22 |
|
| love my [pull] rebase = true | 12:22 |
| ← nowhere_man left | 12:22 |
|
qswz
| [rebase] autoStash = true too | 12:23 |
| → lucasb joined | 12:24 |
| ← acetakwas left | 12:27 |
| ← mona_x left | 12:28 |
| → comptroller joined | 12:30 |
| → Steverman joined | 12:31 |
|
rexwin_
| I deleted two folders in master branch and committed and did git push origin master and the folders are there in github. what am I doing wrong | 12:34 |
| → rafasc joined | 12:36 |
| ← treehug88 left | 12:37 |
| → gxt joined | 12:37 |
|
rexwin_
| nm I removed using git rm command | 12:40 |
|
_ikke_
| rexwin_: Did you verify your local history | 12:40 |
|
rexwin_
| i think did | 12:40 |
| ← ngui left | 12:43 |
| → ngui joined | 12:43 |
| ← throstur left | 12:51 |
| → a-chymera joined | 12:51 |
|
a-chymera
| I have gpgSign= true, but when upstream does not support signing, I get: fatal: the receiving end does not support --signed push | 12:51 |
|
| any idea how I can make this non-fatal? | 12:51 |
| ← ngui left | 12:52 |
| → ngui joined | 12:52 |
| → venmx joined | 12:54 |
| ← kapil____ left | 12:54 |
| ← xcm left | 12:56 |
| → xcm joined | 12:57 |
| → escherial joined | 12:58 |
|
escherial
| this isn't really a problem, but i had a funny thing happen a moment ago where a file that wasn't in the repo wasn't showing up as untracked even though it wasn't gitignored; anyone have any idea why that might be? | 12:59 |
|
| i ran git log thefile and it didn't result in anything, and after removing it there's nothing about it in git status | 12:59 |
|
| ah, never mind, it was .gitignored, just from higher up in the filesystem | 13:00 |
|
_ikke_
| :-) | 13:00 |
|
| Was just about to ask | 13:00 |
|
escherial
| heh, thanks for responding in any case | 13:00 |
|
limbo_
| Is there something like git stash for making local commits, but automatic (e.g. after N file saves/period of time) and discarded after a real commit is made. (idea being that if I bungle something up, I can go back to 5 minutes ago/three changes ago even if I forget to manually commit) | 13:00 |
|
| This is probably not a first party feature. | 13:01 |
|
_ikke_
| correct | 13:01 |
| → mostlybadfly joined | 13:01 |
| → crimastergogo joined | 13:01 |
|
_ikke_
| You can always make WIP comments and amend them until they are ready | 13:01 |
| ← libertyprime left | 13:01 |
|
limbo_
| I know I can, but I often forget to amend them if I do, and more often don't commit often enough. | 13:04 |
|
escherial
| limbo_: you could use something for watching for filesystem changes, e.g. https://facebook.github.io/watchman/, then have a rotating set of stashes, maybe | 13:05 |
|
| s/rotating set of/rotating set of fixed stash names/, something like that | 13:06 |
| → figurelisp joined | 13:09 |
|
escherial
| as for wiping out the stashes, you could use a post-commit hook to intersect the contents of the commit with the stashes and remove ones that are entirely covered by the commit. i don't know what you'd do for partial matches, except perhaps recreate the stash with the committed bits removed...seems like it'd be finicky | 13:09 |
|
figurelisp
| what to do when patch failed while rebase? | 13:09 |
|
| also why does that happed? | 13:10 |
| ← crimastergogo left | 13:10 |
| → crimastergogo joined | 13:11 |
| → kus_ubuntui686 joined | 13:12 |
| → philippirrip joined | 13:13 |
| ← qswz left | 13:14 |
|
figurelisp
| anyone? | 13:15 |
| → throstur joined | 13:15 |
| ← crimastergogo left | 13:16 |
| → crimastergogo joined | 13:17 |
|
figurelisp
| i did not forget to do git add after resolving conflicts | 13:17 |
|
julius_
| which git version can i use with tortoise 1.8.11 ? cant upgrade die tortoise at work, just change the portable git | 13:17 |
| ← tarkus left | 13:18 |
| → ExeciN joined | 13:19 |
| ← voiceftp left | 13:21 |
| → voiceftp joined | 13:21 |
| ← voiceftp left | 13:21 |
| ← EvilDMP left | 13:24 |
| ← crimastergogo left | 13:28 |
| ← yuriii left | 13:29 |
|
_ikke_
| julius_: Not sure there are a lot of people that use tortoisegit here, let a lone know what version would work together wit that specific version | 13:31 |
|
julius_
| probably not...had to try | 13:31 |
|
limbo_
| escherial: Is there a way to set something like that up in a way that's not super hacky? e.g. so I could just run a script once per git repo and have it set up. | 13:32 |
| → psYchotic joined | 13:33 |
| → tsglove joined | 13:34 |
|
tsglove
| Hello. git n00b here. Can I configure git to have different config for a local directory? | 13:34 |
|
| I have configured git globally with git co[nfig --global user.name and user.email | 13:35 |
|
| Yet, can I have a different user.name and user.email , pointing to a different git repo host? | 13:35 |
|
| Ideally, have this apply only to this-directory | 13:35 |
|
_ikke_
| yes | 13:37 |
|
| the same command without --global | 13:37 |
|
tsglove
| _ikke_, WOW. I was reading this --> https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup | 13:37 |
| ← MACscr left | 13:37 |
|
tsglove
| Yet didn't ... come across that without --global | 13:37 |
|
| Going to try it now. Thank you _ikke_ | 13:37 |
| → Envil joined | 13:40 |
| → Assault joined | 13:41 |
| → manuelschneid3r joined | 13:42 |
|
escherial
| limbo_: it depends on your definition of "super hacky", but sure, i could imagine a script that sets it up per repo. it's probably much better to use watchman if you just want to set it and forget it, since watchman runs a single service and will persist (afaik) watches across reboots | 13:43 |
|
Assault
| so...im pushing got github and get an error stating that one of my files is larger than 100 MB. So I delete that file since i realize I dont need it. Then I push again, I still get the error stating that this one particular file is too big..WTF? | 13:43 |
| → Essadon joined | 13:44 |
| ← Serus left | 13:44 |
|
escherial
| limbo_: ideally the script would create a watch on your project dir (excluding anything in your .gitignore), add a trigger to stash whenever something changes, then add a git post-commit hook to wipe any stash that was covered by the commit. although, it occurs to me that auto-stashing might not be the best idea since it changes your working direct | 13:46 |
|
| ory...maybe there's some non-git way to keep track of your edit history | 13:46 |
| ← xcm left | 13:47 |
| → xcm joined | 13:47 |
| → Serus joined | 13:48 |
| → emsjessec joined | 13:49 |
|
emsjessec
| does the bitbucket git system allow conflict resolution if there are changes made from the web interface? | 13:49 |
| → CheckDavid joined | 13:54 |
| ← neels left | 13:54 |
| ← ngui left | 13:58 |
| → ngui joined | 13:58 |
| → kapil____ joined | 13:59 |
| ← Assault left | 14:00 |
| → Trillium1 joined | 14:00 |
| ← julius_ left | 14:01 |
| → cfoch joined | 14:01 |
| ← ngui left | 14:02 |
|
limbo_
| escherial: That's why I said "like stash" (I am sure there's some arg to stash, or a plumming command that won't mess with the working dir) By "super hacky", I mean will it result in more or less work for me if I tell someone to run whatever script I make on their repo. (it being more hacky if it takes more maintaince on their machine than it saves me time fixing up their repo.) | 14:02 |
|
rafasc
| emsjessec: sure. Changes from the web interface are stored as commits like anything else. | 14:03 |
| → ngui joined | 14:03 |
| ← Trillium1 left | 14:03 |
| ← xcm left | 14:04 |
| → xcm joined | 14:04 |
| → boombatower joined | 14:06 |
|
emsjessec
| what if someone edited the file after the web page was open? | 14:06 |
| ← PEG left | 14:07 |
| → thiago joined | 14:07 |
| ← jorj left | 14:08 |
| ← figurelisp left | 14:08 |
| → jorj joined | 14:08 |
|
limbo_
| emsjessec: depends on that you're committing on top of. If both people committed on the same file, a fork happened. | 14:08 |
| → ngui_ joined | 14:10 |
| ← ngui left | 14:12 |
| ngui_ → ngui | 14:12 |
| ← ngui left | 14:13 |
|
rafasc
| I really avoid editing on the web ui. | 14:13 |
| → ngui joined | 14:13 |
|
nikivi
| whats the 'best' way to comment out blocks of visually selected code (language agnostic)? | 14:14 |
|
| I want to get same behavior I get with cmd+shift+/ in sublime/vscode and bind that to ctrl+l | 14:14 |
|
| I googled and saw nerd commenter being mentioned. I wonder if I can do this without any plugins though | 14:15 |
|
rafasc
| nikivi: you're in #git. This isn't a git question. | 14:15 |
|
nikivi
| oops, sorry | 14:15 |
|
rafasc
| that will depend on the editor you're using. | 14:16 |
|
nikivi
| asked on #vim sorry for noise | 14:16 |
| ← ngui left | 14:17 |
| → ngui joined | 14:17 |
|
rafasc
| nikivi: no problem, for vim I either use ctrl+v, select the first column, then shift+i, type the comment character for your specific language, ESC. | 14:18 |
|
| or select the lines, and run ':norm 0i#' | 14:19 |
|
Unode
| Is there any hook that runs before any change is performed on the checked out files? I'm guessing pre-checkout would be apropriate but there is no such hook. Do people use a different solution for this use-case? | 14:22 |
| ← cbrt64 left | 14:23 |
| ← ngui left | 14:28 |
| → ngui joined | 14:28 |
| → miczac joined | 14:29 |
| → xuib joined | 14:32 |
| ← ngui left | 14:32 |
| → GinoMan joined | 14:34 |
| → Dougie187 joined | 14:34 |
| → ngui joined | 14:35 |
| → bsanford joined | 14:35 |
| ← bsanford left | 14:35 |
| ← basiclaser left | 14:40 |
|
canton7
| Unode, what *is* the use-case? | 14:43 |
| → devz joined | 14:45 |
|
Unode
| canton7: a folder inside git has permissions r-x, so git can't change it or its contents. Use-case is 'chmod u+w folder && git action && chmod u-w folder' | 14:45 |
|
thiago
| then make it rwx for the current user | 14:45 |
|
Unode
| thiago: the point is the folder is not meant to be 'w' to anyone unless being updated by git itself. | 14:46 |
|
canton7
| Unode, that's the technical implementation. What's the use-case? *Why* are you doing this? | 14:46 |
|
| Ah, there we go. | 14:46 |
|
| Unode, so nobody should work directly in the repo, correct? They're only allowed to checkout/pull/etc? | 14:47 |
|
thiago
| Unode: ok. Same answer. | 14:47 |
|
canton7
| What's to stop them from adding another remote to git, and getting their changes in that way? | 14:47 |
|
thiago
| Unode: you need to do what you said: u+w, git, u-w | 14:47 |
|
| every time | 14:47 |
|
canton7
| Unode, are you sure you don't want to do something like only allow a particular user to change those files, and give everyone sudo rights to run a specific git command as that user? | 14:48 |
|
thiago
| or make it a server that people push to. That server will run as the right user, with full write permissions. | 14:49 |
| → Luyin joined | 14:56 |
| ← Luyin left | 14:56 |
| ← TheWild left | 14:58 |
| ← ngui left | 14:58 |
| ← justanotheruser left | 14:58 |
| → ngui joined | 14:58 |
|
Unode
| no, the permission is quite set like that. We could use a different account to handle this but it's a shared filesystem to it gets tricky | 14:58 |
|
| *so it gets tricky | 14:58 |
|
| I was looking into using hooks to do the u+w before checkout and then u-w after, but it doesn't seem like it's possible. | 14:59 |
|
| The best option I've encountered so far is an alias | 14:59 |
|
| but... muscle memory to train. Using the alias instead of checkout or pull | 15:00 |
| ← ngui left | 15:02 |
| → ngui joined | 15:03 |
| → quipa joined | 15:03 |
| ← Steverman left | 15:03 |
| → mona_x joined | 15:07 |
| → bolovanos joined | 15:07 |
| → novumsensum joined | 15:07 |
| → leeN joined | 15:09 |
| → acetakwas joined | 15:10 |
| ← rkta left | 15:13 |
| ← netj left | 15:17 |
| → netj joined | 15:17 |
| ← ngui left | 15:18 |
| → ngui joined | 15:19 |
| → orbitex joined | 15:22 |
| ← a-chymera left | 15:24 |
| ← theoceaniscool left | 15:25 |
| → blackntan joined | 15:27 |
| ← ngui left | 15:27 |
| → ngui joined | 15:27 |
| → nurdie joined | 15:28 |
| ← blackntan left | 15:29 |
| ← throstur left | 15:30 |
| ← cdown left | 15:34 |
| → cdown joined | 15:39 |
| → Toadisattva joined | 15:41 |
| → Luyin joined | 15:45 |
| → manuels joined | 15:45 |
| ← manuels left | 15:45 |
|
Luyin
| hi, what is the advantage of using "git merge -s ours obsolete_branch" over "git branch -D obsolete_branch"? I understand from the manpage that "-s ours" discards everyhting from the branch, so the branch effectively vanishes, doesn't it? | 15:46 |
|
rafasc
| Luyin: yes. But there's advantages over using -s ours. By using it, you're recording that you're making the other branch obsolete. | 15:47 |
|
Luyin
| okay, thanks | 15:47 |
|
| then -s ours is definitely not what I want to use for my case :D | 15:48 |
| ← cdown left | 15:48 |
|
rafasc
| so any commits that are reachable from that branch wont be merged again. | 15:48 |
|
Luyin
| and this -Xours seems a bit dangerous to me | 15:48 |
| → Steverman joined | 15:48 |
| ← d^sh left | 15:49 |
|
rafasc
| Luyin: if a new branch, forks from this branch that was merged with -s ours. Only the changes by commits that come after this fork are merged. | 15:49 |
|
| !revert_merge | 15:49 |
|
gitinfo
| [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you can use 'git revert' but there are gotchas to be aware of. Please read: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt | 15:49 |
| ← Noti left | 15:50 |
| → Mattiaslndstrm joined | 15:50 |
|
rafasc
| This has some insight on a related issue. Basically merging history and merging files are two related, but different things. | 15:51 |
| → d^sh joined | 15:51 |
|
rafasc
| Luyin: What do you mean by -Xours is dangerous? | 15:51 |
|
Luyin
| yeah I know about that discussion. my situation is a bit difficult. "git rerere" doesn't work here (I assume because we use "iconv" filter attributes, since our files are utf-16 instead of utf-8, but I'm not 100 % certain that's the reason), so I'm trying to reduce the amount of work my devs have while merging. I thought by using a merge strategy it might be possible | 15:52 |
| → GreenJello joined | 15:52 |
| ← oxymoron93 left | 15:52 |
| ← ngui left | 15:53 |
| → ngui joined | 15:53 |
|
Luyin
| rafasc: what I mean is that the differences/changes I'm trying to merge are often not properly recognised by git. so I'm looking at options to make it easier for git to merge stuff. but what I understand from -Xours is that it prefers my side over the other in conflict cases, and uses the other side if it's conflict-free. but sometimes our code looks so disrupted in a diff (e. g. when you look at it with | 15:54 |
|
| WinMerge, or if you simply look for the conflict markers), that it is very dangerous to assume that one side is correct and the other isn't | 15:54 |
|
| it's a bit hard to explain actually, and I can't give code examples because even our language is proprietary :-/ | 15:55 |
|
rafasc
| well, merge should not be automated in the first place. Even conflict free merges are not guaranteed to be correct. | 15:56 |
|
| so yeah, from that perspective, it's always dangerous to assume things while merging. | 15:56 |
| ← ngui left | 15:57 |
| → ngui joined | 15:57 |
|
rafasc
| Luyin: -Xours will perform a 3-way merge and favor our side in case of conflict. You got that part right. You'll get changes from both sides. | 15:58 |
|
Luyin
| I don't want to automate the merge, I want to reduce the amount of work it produces | 15:59 |
| → throstur joined | 15:59 |
|
rafasc
| just to be clear, you're using 'working-tree-encoding' attributes right? | 16:01 |
| ← Silmarilion__ left | 16:02 |
| ← tomfarr left | 16:02 |
| ← ngui left | 16:03 |
| → tomfarr joined | 16:04 |
| → TJ- joined | 16:05 |
| → jleclanche joined | 16:05 |
| ← tomfarr left | 16:05 |
| ← venmx left | 16:05 |
| ← floppydh left | 16:06 |
|
mns
| I have a local branch, mns/feature/fubar, which I pushed to remote origin, so that when I push to remote, it pushes to origin/mns/feature/branch. I pushed a commit that I dont want on the remote at the moment. Any chance of getting it removed locally and remotely ? I was thinking 'git reset --hard ^' but am no sure if thre is a better way to do that. | 16:06 |
| ← thiago left | 16:06 |
| → tomfarr joined | 16:07 |
| → Regon joined | 16:08 |
| → ngui joined | 16:08 |
|
rts-sander
| yeah git reset --hard and git push --force | 16:08 |
|
kezimo
| ello | 16:08 |
| ← tomfarr left | 16:10 |
|
rexwin_
| how to revert the local copy to contain code before deleting two folders | 16:10 |
| ← throstur left | 16:11 |
|
rts-sander
| rexwin_, git checkout -- <dir1> <dir2> | 16:11 |
|
rexwin_
| I committed the code with the commit message "deleted bf" | 16:11 |
| → tomfarr joined | 16:12 |
|
rts-sander
| you committed your deletion of the directories? | 16:12 |
|
rexwin_
| yes | 16:12 |
|
rts-sander
| rexwin_, git reset @~ -- <dir1> <dir2> | 16:12 |
|
| then commit --amend | 16:12 |
|
| or you could remove the commit entirely if it's just the 2 directories with git reset --hard @~ | 16:13 |
| ← sQVe left | 16:14 |
| → cdown joined | 16:14 |
| ← bsaboia left | 16:15 |
| ← tomfarr left | 16:15 |
| → TikityTik joined | 16:17 |
| → tomfarr joined | 16:17 |
|
TikityTik
| can you make git store data referenced by sym links? | 16:17 |
| ← ngui left | 16:18 |
|
_ikke_
| no | 16:18 |
| → ngui joined | 16:18 |
|
_ikke_
| git will not read / write data outside the current repository directory | 16:19 |
| → eduardas_m joined | 16:19 |
|
TikityTik
| i want to make a git repo of my system settings like bashrc and vimrc, but i don't want to continously cp the files over | 16:20 |
|
| hence i'm wondering if i can get git to copy the data for me by symlink | 16:20 |
|
_ikke_
| The way to do it is to symlink *to* the git repo | 16:22 |
| ← ngui left | 16:22 |
| → ngui joined | 16:23 |
| → fmgt joined | 16:25 |
| ← fmgt left | 16:26 |
| → fmgt joined | 16:26 |
|
Luyin
| rafasc: my_file.txt diff=utf16diff encoding=utf-16le filter=utf16 | 16:29 |
|
| what I have in .gitattributes | 16:30 |
| ← Xiti left | 16:30 |
| ← mona_x left | 16:30 |
| → mona_x joined | 16:31 |
| → c3llular joined | 16:31 |
|
rafasc
| you might want to take a look at that attribute then. | 16:32 |
|
Luyin
| rafasc: and the lines from my ~/.gitconfig: https://paste.xinu.at/tTRl/ | 16:32 |
|
| rafasc: I will, thanks for the hint. gotta go into a meeting now, bbl | 16:32 |
| → Xiti joined | 16:34 |
| ← mona_x left | 16:35 |
| → kazimuth joined | 16:35 |
| → blackntan joined | 16:36 |
| → rkta joined | 16:36 |
| → Ayo joined | 16:40 |
| → Natt0 joined | 16:41 |
| → spacesuitdiver joined | 16:42 |
| ← fmgt left | 16:43 |
| → mona_x joined | 16:44 |
| ← kapil____ left | 16:44 |
| ← blackntan left | 16:44 |
|
Natt0
| I'm using git for windows 2.20.0 but it is stuck when pushing after writing objects on 'Total 3 (delta 1), reused 0 (delta 0)' to a rasberry pi while fetching works. | 16:46 |
| → GinoMan2440 joined | 16:47 |
| ← ngui left | 16:48 |
| → ngui joined | 16:48 |
| ← c3llular left | 16:48 |
| → Nixew joined | 16:49 |
| ← CodeSlingerPaul left | 16:49 |
| ← silenc3r left | 16:49 |
| → thiago joined | 16:50 |
| ← GinoMan left | 16:50 |
| → silenc3r joined | 16:50 |
| ← silenc3r left | 16:51 |
| ← Toadisattva left | 16:52 |
| ← ngui left | 16:52 |
| → ngui joined | 16:53 |
| ← chele left | 16:53 |
| ← mikecmpbll left | 16:59 |
| ← epatr left | 17:02 |
| ← kazimuth left | 17:02 |
| → mowcat joined | 17:06 |
|
TikityTik
| is it a bad idea to not password your ssh keys for github uploading on a person computer? | 17:08 |
| ← eduardas_m left | 17:08 |
|
TikityTik
| personal computer* | 17:08 |
|
Natt0
| nvm I found it, I was using user that didn't have write rights in the putty profile and you can't seem to do user@profilename | 17:08 |
|
TikityTik
| i get tired of typing the password repetitively for git usage | 17:09 |
| ← Natt0 left | 17:11 |
| ← T_UNIX left | 17:12 |
| → AtumT joined | 17:17 |
| ← ngui left | 17:23 |
| → ngui joined | 17:23 |
| → fassl joined | 17:23 |
| → nowhere_man joined | 17:24 |
| ← mona_x left | 17:25 |
| ← meLon left | 17:26 |
| → kerframil joined | 17:26 |
| ← dolphy left | 17:26 |
| → meLon joined | 17:26 |
| ← ngui left | 17:27 |
| → ngui joined | 17:27 |
| → dolphy joined | 17:28 |
| → prakashd1 joined | 17:30 |
| ← THall66 left | 17:31 |
| → Silmarilion__ joined | 17:32 |
| → EvilDMP joined | 17:39 |
|
EvilDMP
| Is it possible to check out a remote branch by specifying the URL of the remote, along these lines: | 17:43 |
|
| git checkout -b new-branch https://github.com/user/repository.git/some-branch ? | 17:43 |
|
| Or is it always necessary to add the remote first? | 17:44 |
| → Inline joined | 17:45 |
| ← Cabanoss- left | 17:45 |
|
Inline
| if i had a working snapshot and i git pulled and now something goes wrong, what can i do ? | 17:46 |
|
| can i revert to a previous state ? | 17:46 |
| → Cabanossi joined | 17:46 |
|
Inline
| or do you have to manually make snapshot points so to say ? | 17:46 |
| ← Nixew left | 17:48 |
| → dfee joined | 17:49 |
|
_ikke_
| THe reflog keeps of what you do locally | 17:51 |
| → igemnace joined | 17:51 |
| ← igemnace left | 17:51 |
| ← cfoch left | 17:51 |
| → venmx joined | 17:52 |
| → igemnace joined | 17:52 |
| ← CheckDavid left | 17:53 |
| → mikecmpbll joined | 17:55 |
| → novumsen1 joined | 17:57 |
| ← xcm left | 17:57 |
| ← graphene left | 17:57 |
| → graphene joined | 17:58 |
| ← rexwin_ left | 17:58 |
| ← novumsensum left | 17:58 |
| novumsen1 → novumsensum | 17:58 |
| → xcm joined | 17:58 |
| ← yyy left | 18:01 |
| ← quipa left | 18:04 |
| → Toadisattva joined | 18:04 |
| ← Mattiaslndstrm left | 18:09 |
| → silenc3r joined | 18:10 |
| → Mattiaslndstrm joined | 18:11 |
| → wildlander joined | 18:12 |
| → mustmodify_ joined | 18:12 |
|
mustmodify_
| I have a "merge" commit hash from 2015. The branch is long gone. But I want to see just the log of commits that were in that branch. | 18:13 |
|
| so ... I can see the first commit in that branch, but how do I get them all? | 18:13 |
| ← xcm left | 18:13 |
|
mustmodify_
| NM, think I figured it out. | 18:15 |
| ← mustmodify_ left | 18:15 |
| → nshp joined | 18:16 |
| → xcm joined | 18:17 |
|
nshp
| is there a way to filter a diff down to only chunks which match a substring/regex? from the docs, I thought `git diff -S<string>` would do that for me, but it's including a lot of unrelated chunks which just happen to be in matched *files* | 18:18 |
| ← random_yanek left | 18:19 |
|
nshp
| more broadly what I'm trying to do is apply a subset of the changes on an overgrown feature branch to another branch, so I can get it reviewed on its own | 18:20 |
| → MACscr joined | 18:21 |
| ← ngui left | 18:22 |
| Ayo → Guest47511 | 18:25 |
| ← Guest47511 left | 18:25 |
| → Ayo joined | 18:25 |
| ← EvilDMP left | 18:25 |
| → random_yanek joined | 18:30 |
| → topdownjimmy joined | 18:30 |
|
topdownjimmy
| Is it possible to see the diff over a range of commits, only including commits from a single user? | 18:31 |
| → greggerz joined | 18:31 |
|
nshp
| topdownjimmy: git log --author="Author Name" --patch commit..range | 18:31 |
|
| that doesn't combine the diffs though, that shows each commit separately | 18:32 |
| ← Toadisattva left | 18:33 |
|
nshp
| the only way I'm aware of to get the combined diff would involve cherry-picking the author's commits, then diffing normally | 18:33 |
| → AtumT_ joined | 18:36 |
| ← leeN left | 18:36 |
| ← netj left | 18:38 |
| ← AtumT left | 18:39 |
| → netj joined | 18:39 |
| ← graphene left | 18:39 |
| → graphene joined | 18:40 |
| ← gxt left | 18:40 |
|
_ikke_
| correct | 18:40 |
|
| diff only looks at 2 commits | 18:41 |
|
| what happens in between doesn't matter | 18:41 |
| → dpyro joined | 18:41 |
| ← Ayo left | 18:42 |
| ← dege left | 18:43 |
| ← lagothrix left | 18:43 |
| ← cswl left | 18:45 |
| → lagothrix joined | 18:46 |
| ← Dougie187 left | 18:47 |
| → yyy joined | 18:47 |
| → AtumT joined | 18:49 |
| ← AtumT_ left | 18:51 |
| → Silmarlion_ joined | 18:52 |
| → Narrat joined | 18:52 |
| → Dirak joined | 18:53 |
| ← Silmarilion__ left | 18:54 |
| → cek joined | 18:56 |
|
cek
| guys, how do I tell git to get to display all upstream branches if initialliy repo was cloned via git clone --depth 1 --branch xx ? | 18:57 |
| → a-chymera joined | 18:59 |
| → cd joined | 18:59 |
| → Sasazuka joined | 19:01 |
| ← Sasazuka left | 19:01 |
| → blackntan joined | 19:01 |
| ← blackntan left | 19:02 |
| ← Dirak left | 19:05 |
| ← heftig left | 19:08 |
|
avar
| Is there an option with 'git log -p -G<rx> --stat' to show something like the --full-diff (i.e. all changed files in those commits), not just the file matching -G | 19:10 |
| xcm → Guest41444 | 19:10 |
| ← Guest41444 left | 19:10 |
| → xcm joined | 19:10 |
| → khisanth_ joined | 19:11 |
| ← Khisanth left | 19:14 |
| ← Silmarlion_ left | 19:16 |
| → libertyprime joined | 19:20 |
| ← axsuul left | 19:20 |
| → Sasazuka joined | 19:21 |
| ← graphene left | 19:22 |
| → graphene joined | 19:23 |
|
cek
| cek: solved that by git fetch with proper refspec mathcing all remote refs | 19:25 |
| ← cek left | 19:25 |
| → ngui joined | 19:28 |
| → heftig joined | 19:29 |
| ← nurdie left | 19:30 |
| ← xcm left | 19:31 |
| ← ngui left | 19:32 |
| → xcm joined | 19:33 |
| → ngui joined | 19:33 |
| → axsuul joined | 19:34 |
| ← libertyprime left | 19:34 |
| ← Mattiaslndstrm left | 19:34 |
| → libertyprime joined | 19:36 |
| → nurdie joined | 19:37 |
| ← ngui left | 19:37 |
| ← nurdie left | 19:41 |
| ← TJ- left | 19:44 |
| → mebus joined | 19:44 |
| → TJ- joined | 19:46 |
| ← yyy left | 19:47 |
| ← cliluw left | 19:48 |
| ← orbitex left | 19:48 |
| → cliluw joined | 19:49 |
| → dre_ joined | 19:50 |
| ← libertyprime left | 19:51 |
| ← hofmann3900 left | 19:53 |
| ← TikityTik left | 19:58 |
| → cbrt64 joined | 20:00 |
| ← prakashd1 left | 20:01 |
| ← dolphy left | 20:02 |
| → mloskot joined | 20:06 |
| → dolphy joined | 20:07 |
| ← miczac left | 20:10 |
| ← d^sh left | 20:12 |
| ← kerframil left | 20:12 |
| → d^sh joined | 20:13 |
| ← Envil left | 20:15 |
| → plexigras joined | 20:18 |
| ← dfee left | 20:22 |
| ← manuelschneid3r left | 20:23 |
| ← topdownjimmy left | 20:24 |
| → topdownjimmy joined | 20:25 |
| ← Regon left | 20:25 |
| → dege joined | 20:26 |
| ← Phylock left | 20:27 |
| ← fassl left | 20:27 |
| → Phylock joined | 20:28 |
| → fassl joined | 20:28 |
| → Regon joined | 20:36 |
| → yyy joined | 20:39 |
| ← cdown left | 20:42 |
| ← silenc3r left | 20:43 |
| → MineCoins joined | 20:46 |
| ← netj left | 20:49 |
| → netj joined | 20:49 |
| ← graphene left | 20:50 |
| → graphene joined | 20:51 |
| ← settermjd left | 20:55 |
| → eb0t joined | 20:55 |
| → Mattiaslndstrm joined | 20:56 |
| ← Mattiaslndstrm left | 20:57 |
| → Mattiaslndstrm joined | 20:59 |
| ← MineCoins left | 21:00 |
| → m0viefreak joined | 21:02 |
| → guardian joined | 21:07 |
| → libertyprime joined | 21:09 |
| ← mostlybadfly left | 21:11 |
| → gareppa joined | 21:12 |
| ← libertyprime left | 21:14 |
| → MineCoins joined | 21:16 |
| ← MineCoins left | 21:17 |
| ← yyy left | 21:22 |
| → aldodelgado joined | 21:32 |
| → miczac joined | 21:32 |
|
aldodelgado
| I’m looking for a way to prevet branching from anything other then master. Example: `git checkout -b issue-xxx` <- allowed from master `git checkout -b issue-xxx-test` <- not allowed from another branch. Tired searching on github and stackoverflow, however I’ve had no luck. Any suggestions? | 21:35 |
| ← novumsensum left | 21:35 |
| ← Hello71 left | 21:38 |
| → Hello71 joined | 21:38 |
| ← Puffball left | 21:40 |
| → cdown joined | 21:40 |
| ← aldodelgado left | 21:43 |
| ← fassl left | 21:43 |
| ← finalbeta left | 21:44 |
| → finalbeta joined | 21:44 |
| ← gareppa left | 21:45 |
| ← miczac left | 21:46 |
| → miczac joined | 21:48 |
| → kerframil joined | 21:50 |
| → kazimuth joined | 21:52 |
| → MineCoins joined | 21:54 |
| ← Phylock left | 21:55 |
| ← bolovanos left | 21:56 |
| → dfee joined | 21:57 |
| → fstd_ joined | 21:58 |
| MineCoins → MyPoolOnline | 21:58 |
| MyPoolOnline → help | 21:58 |
| help → Guest32306 | 21:59 |
| ← fstd left | 22:01 |
| fstd_ → fstd | 22:01 |
| ← Guest32306 left | 22:01 |
| → courrier joined | 22:02 |
| ← spacesuitdiver left | 22:03 |
| → ZyX-I joined | 22:04 |
| ← Mattiaslndstrm left | 22:05 |
| ← fletom86 left | 22:06 |
| ← emsjessec left | 22:07 |
| ← graphene left | 22:08 |
| → graphene joined | 22:08 |
| → fletom86 joined | 22:11 |
| ← ESpiney left | 22:17 |
| ← fletom86 left | 22:24 |
| → novum joined | 22:26 |
| → treepalm joined | 22:27 |
| → dansan_ joined | 22:29 |
| ← dansan left | 22:29 |
| → Nugget joined | 22:32 |
| → Mattiaslndstrm joined | 22:32 |
| ← Mattiaslndstrm left | 22:34 |
| ← Nugget left | 22:35 |
| → c3llular joined | 22:36 |
| ← treepalm left | 22:36 |
| → treepalm joined | 22:37 |
| ← novum left | 22:41 |
| → fletom86 joined | 22:48 |
| ← dre_ left | 22:57 |
| → spacesuitdiver joined | 22:59 |
| ← spacesuitdiver left | 23:03 |
| ← graphene left | 23:07 |
| → graphene joined | 23:08 |
| → orbyt_ joined | 23:08 |
| ← paraxial left | 23:13 |
| → paraxial joined | 23:14 |
| → n3wborn joined | 23:14 |
| → libertas joined | 23:16 |
| → novum joined | 23:16 |
| → Puffball joined | 23:19 |
| → The_Woodsman joined | 23:20 |
| ← graphene left | 23:21 |
| → graphene joined | 23:21 |
| ← kmels left | 23:23 |
| → donofrio joined | 23:24 |
| → yyy joined | 23:25 |
| ← libertas left | 23:25 |
| ← dslegends left | 23:26 |
| ← TJ- left | 23:28 |
| ← foul_owl left | 23:28 |
| ← miczac left | 23:32 |
| → gxt joined | 23:34 |
| → miczac joined | 23:36 |
| ← Steverman left | 23:37 |
| → mona_x joined | 23:37 |
| ← graphene left | 23:38 |
| → graphene joined | 23:39 |
| → foul_owl joined | 23:41 |
| ← cd left | 23:41 |
| ← treepalm left | 23:46 |
| → TheRuckus joined | 23:48 |
| ← greggerz left | 23:48 |
| ← plexigras left | 23:52 |
| ← Case_Of left | 23:53 |
| → Case_Of joined | 23:54 |
| ← mikecmpbll left | 23:56 |
| ← Narrat left | 23:57 |
| → g00s joined | 23:59 |