| 2019-06-24 |
| → igemnace joined | 00:01 |
| → nerosnm joined | 00:04 |
| ← veegee left | 00:09 |
| → robertparkerx joined | 00:11 |
|
robertparkerx
| how do I pull a remote branch into local branch? | 00:11 |
|
igemnace
| git pull <remote> <remote branch name>:<local branch name> | 00:14 |
|
| see git help pull | 00:14 |
|
| if this is just a one-time thing, i actually prefer fetching then merging; it flows more clearly that way. git fetch then git merge <remote-tracking branch name> | 00:16 |
| → veegee joined | 00:16 |
|
igemnace
| if it isn't, consider setting the remote branch as an upstream | 00:16 |
| ← mattfly left | 00:17 |
| ← Tibian left | 00:18 |
| ← mat001 left | 00:22 |
| → xorander joined | 00:23 |
| ← veegee left | 00:25 |
| → veegee_ joined | 00:25 |
| ← wjschmidt left | 00:26 |
| ← m0viefreak left | 00:26 |
| ← mowcat left | 00:27 |
| → n000g joined | 00:27 |
| ← queip left | 00:27 |
| → mat001 joined | 00:30 |
| ← mat001 left | 00:32 |
| → queip joined | 00:36 |
| ← nerosnm left | 00:36 |
| ← barteks2x left | 00:37 |
| → jcbitter joined | 00:37 |
|
robertparkerx
| It is a one thing thing I believe | 00:38 |
| → nerosnm joined | 00:48 |
| ← Cabanossi left | 00:50 |
| ← JanC left | 00:51 |
| → rishi joined | 00:51 |
| → JanC joined | 00:51 |
| ← CryptoDavid left | 00:51 |
| ← dongcarl left | 00:52 |
| ← hoek left | 00:52 |
| → mns joined | 00:52 |
| → ZachGibbens joined | 00:52 |
| → rodarmor joined | 00:53 |
| → Wizek joined | 00:53 |
| → dongcarl joined | 00:53 |
| → yn joined | 00:53 |
| → hoek joined | 00:53 |
| → CryptoDavid joined | 00:53 |
| → jelmer joined | 00:53 |
| → Cabanossi joined | 00:54 |
| → veegee joined | 00:55 |
| ← z8z left | 00:57 |
| ← veegee_ left | 00:58 |
| → veremitz joined | 00:58 |
| → mattfly joined | 01:01 |
| → mat001 joined | 01:02 |
| ← kh31d4r left | 01:03 |
| → OtakuSenpai joined | 01:04 |
| ← mat001 left | 01:04 |
| → dfee joined | 01:04 |
| → kh31d4r joined | 01:04 |
| ← kh31d4r left | 01:07 |
| → kh31d4r joined | 01:09 |
| ← netj left | 01:13 |
| → netj joined | 01:14 |
| ← R2robot left | 01:18 |
| ← OtakuSenpai left | 01:19 |
| → R2robot joined | 01:20 |
| ← nerosnm left | 01:21 |
| ← paws_ left | 01:22 |
| ← netj left | 01:24 |
| ← kh31d4r left | 01:24 |
| → netj joined | 01:24 |
| → kh31d4r joined | 01:24 |
| → learningc joined | 01:25 |
| ← AtumT left | 01:25 |
| ← ferdna left | 01:31 |
|
mattfly
| whats the best git gui for linux? | 01:32 |
| → Newami joined | 01:32 |
| → ferdna joined | 01:32 |
| ← learningc left | 01:32 |
| → learningc joined | 01:33 |
| → drbean joined | 01:35 |
| ← Cabanossi left | 01:36 |
|
finn0
| Does this channel have Matrix IRC bridge support? | 01:37 |
| ← F0rTex left | 01:39 |
|
finn0
| I'm trying to connect it using Matrix client and @appservice-irc:matrix.org kicked me out with this "Could not join #git on 'chat.freenode.net': err_needreggednick" error message. | 01:39 |
| → F0rTex joined | 01:40 |
| → nerosnm joined | 01:42 |
|
rewt
| err_needreggednick -- i'm guessing that's an error message saying you need a regged nick (and tell matrix the info for it) | 01:44 |
| ← freeman42x left | 01:45 |
| → ElectroStatik joined | 01:46 |
| ← dfee left | 01:46 |
| → Cabanossi joined | 01:47 |
| → durham joined | 01:47 |
| ← durham left | 01:47 |
| → durham joined | 01:48 |
| ← durham left | 01:48 |
| → durham joined | 01:48 |
| ← durham left | 01:49 |
| → iam730 joined | 01:49 |
| → durham joined | 01:50 |
| ← durham left | 01:51 |
| → durham joined | 01:51 |
| ← durham left | 01:51 |
| → durham joined | 01:52 |
| ← durham left | 01:52 |
| → durham joined | 01:53 |
| ← cd left | 01:56 |
|
finn0
| rewt: I found a FAQ covering that error message https://github.com/matrix-org/matrix-appservice-irc/wiki/End-user-FAQ#i-am-getting-kicked-out-of-a-bridged-room-with-the--err_needreggednick-error | 01:57 |
| ← durham left | 01:58 |
| → esrse joined | 02:00 |
| ← CryptoDavid left | 02:01 |
| → eb0t joined | 02:03 |
| → cd joined | 02:04 |
| ← nerosnm left | 02:15 |
| → armyriad joined | 02:23 |
| → unrael__ joined | 02:24 |
| lagothrix → Guest90068 | 02:24 |
| ← Guest90068 left | 02:24 |
| → lagothrix joined | 02:24 |
| unrael__ → unreal | 02:24 |
| → freeman42x joined | 02:27 |
| ← Bodger_ left | 02:33 |
| ← bambanx left | 02:35 |
| → nerosnm joined | 02:36 |
| → sorressean joined | 02:36 |
|
sorressean
| I added a bunch of files to gitignore, but they're still part of my repo because I added them. is there a way to git rm so they can remove them from the repo without actually deleting the files? | 02:37 |
| → Kaisyu7 joined | 02:37 |
| → Goplat joined | 02:49 |
| → thebope joined | 02:50 |
| → AK joined | 02:53 |
|
AK
| how to remove all git cached commits and push a newone such that size of repo dont increase | 02:53 |
| ← Cabanossi left | 02:58 |
| → z8z joined | 02:58 |
| ← alyptik left | 03:01 |
| ← sauvin left | 03:03 |
| ← g00s left | 03:04 |
| → fphilipe_ joined | 03:07 |
| ← nerosnm left | 03:07 |
| → Cabanossi joined | 03:12 |
| ← fphilipe_ left | 03:12 |
| ← fatalhalt left | 03:19 |
| → fatalhalt joined | 03:22 |
| → ygivenx joined | 03:22 |
|
igemnace
| sorressean: git rm --cached | 03:23 |
|
| AK: hmm, not sure i understand. what's the overarching goal here? | 03:23 |
| ← cbreak left | 03:24 |
| → cbreak joined | 03:25 |
| ← freeman42x left | 03:28 |
| ← oatmealraisin left | 03:28 |
| → nerosnm joined | 03:30 |
| → g00s joined | 03:30 |
| ← iam730 left | 03:33 |
| ← thebope left | 03:38 |
| ← bket left | 03:39 |
| → mven joined | 03:40 |
| → thebope joined | 03:41 |
| → bket joined | 03:41 |
| ← fatalhalt left | 03:46 |
| → ephemera_ joined | 03:47 |
| ← hallamigo left | 03:48 |
| ← mven left | 03:52 |
| → mven joined | 03:53 |
| → mud joined | 03:53 |
| → durham joined | 03:54 |
| ← thebope left | 03:58 |
| ← durham left | 03:58 |
| ← null1337 left | 03:58 |
| ← ygivenx left | 04:01 |
| ← nerosnm left | 04:01 |
| ← Anthaas left | 04:03 |
| → Anthaas_ joined | 04:03 |
| → mrCyborg joined | 04:06 |
| → rudrab joined | 04:10 |
|
rudrab
| hi, what is the last line of git status called? | 04:11 |
|
| I am trying to color git output, like https://paste.fedoraproject.org/paste/rJfohENof9xcmZW2BXw0tA | 04:11 |
|
| but the last line, that says "nothing to commit, working tree clean" etc, is not colored | 04:12 |
|
| must be the tag is missing | 04:12 |
| ← ElectroStatik left | 04:15 |
| → ygivenx joined | 04:16 |
| ← ygivenx left | 04:21 |
| → dviola joined | 04:21 |
| → nerosnm joined | 04:23 |
| ← rudrab left | 04:24 |
| → alyptik joined | 04:27 |
| → dfee joined | 04:29 |
| ← queip left | 04:29 |
| ← Anthaas_ left | 04:30 |
| → Anthaas joined | 04:32 |
| → SkarmoutsosV joined | 04:34 |
| → atrigent joined | 04:34 |
| → queip joined | 04:36 |
| ← cfoch left | 04:41 |
| ← cd left | 04:46 |
| ← g00s left | 04:52 |
| ← orbyt_ left | 04:54 |
| ← nerosnm left | 04:54 |
| → pks_ joined | 05:02 |
| ← Inline left | 05:03 |
| → fflam joined | 05:04 |
| ← pks left | 05:04 |
| pks_ → pks | 05:04 |
| → fphilipe_ joined | 05:11 |
| ← ferdna left | 05:13 |
| → nerosnm joined | 05:16 |
| ← bashfulshell left | 05:20 |
| ← SkarmoutsosV left | 05:24 |
| → breakingsad joined | 05:27 |
| ← fphilipe_ left | 05:33 |
| ← thiago left | 05:37 |
| → g00s joined | 05:39 |
| ← nerosnm left | 05:48 |
| → fphilipe_ joined | 05:49 |
| → ygivenx joined | 05:50 |
| → clime joined | 05:50 |
| ← fphilipe_ left | 05:54 |
| → omnireq_ joined | 05:54 |
| ← omnireq left | 05:56 |
| → ygivenx_ joined | 05:58 |
| ← finn0 left | 05:59 |
| → ZombieByte joined | 05:59 |
| ← ghostlines left | 06:00 |
| → ghostlin_ joined | 06:00 |
| ← ygivenx left | 06:02 |
| → phlym_ joined | 06:06 |
| → iamthad joined | 06:07 |
| → EnTeQuAk_ joined | 06:07 |
| → fcrick_ joined | 06:08 |
| → afisher_ joined | 06:08 |
| → nictuku_ joined | 06:08 |
| → d10n-work_ joined | 06:08 |
| → JayDoubleu_ joined | 06:08 |
| → SrPx_ joined | 06:08 |
| → CEnnis91_ joined | 06:08 |
| → drupol_ joined | 06:08 |
| → heinrich5991_ joined | 06:08 |
| → Karyon_ joined | 06:08 |
| → CheckYourSix_ joined | 06:09 |
| → federico3_ joined | 06:09 |
| → SoniEx2 joined | 06:09 |
| → Forkk joined | 06:09 |
| → TomTom joined | 06:10 |
| → nick` joined | 06:10 |
| → nerosnm joined | 06:10 |
| → beaky_ joined | 06:10 |
| → n3wborn joined | 06:11 |
| → unixdork joined | 06:14 |
| → Swant_ joined | 06:14 |
| ← AK left | 06:15 |
| ← xelxebar left | 06:15 |
| ← mojisun left | 06:15 |
| ← tombusby left | 06:15 |
| ← ghost43 left | 06:15 |
| ← galaxie left | 06:15 |
| ← Fusl left | 06:15 |
| → cathyjf joined | 06:15 |
| → __name__ joined | 06:15 |
| ← d10n-work left | 06:15 |
| ← iamthad_ left | 06:15 |
| ← heinrich5991 left | 06:15 |
| Karyon_ → Karyon | 06:15 |
| fcrick_ → fcrick | 06:15 |
| nictuku_ → nictuku | 06:15 |
| unixdork → nixdork | 06:15 |
| afisher_ → afisher | 06:15 |
| drupol_ → drupol | 06:15 |
| SrPx_ → SrPx | 06:15 |
| CEnnis91_ → CEnnis91 | 06:15 |
| d10n-work_ → d10n-work | 06:15 |
| heinrich5991_ → heinrich5991 | 06:15 |
| cathyjf → Cathy | 06:15 |
| JayDoubleu_ → JayDoubleu | 06:16 |
| Swant_ → Swant | 06:16 |
| ← haasn left | 06:16 |
| ← ygivenx_ left | 06:17 |
| → haasn joined | 06:17 |
| → ygivenx joined | 06:18 |
| ← vavkamil left | 06:20 |
| ← mattfly left | 06:20 |
| → Envil joined | 06:20 |
| → Iroha joined | 06:20 |
| → _rgn joined | 06:22 |
| → pandem joined | 06:22 |
| → Timvde joined | 06:22 |
| ← MACscr left | 06:23 |
| → Noti joined | 06:23 |
| → cyberlard joined | 06:25 |
| → kadoban joined | 06:25 |
| → sauvin joined | 06:28 |
| ← unreal left | 06:29 |
| ← ygivenx left | 06:30 |
| → ygivenx joined | 06:31 |
| ← duderonomy left | 06:31 |
| → duderonomy joined | 06:32 |
| ← duderonomy left | 06:32 |
| → duderonomy joined | 06:33 |
| ← duderonomy left | 06:33 |
| → duderonomy joined | 06:33 |
| ← duderonomy left | 06:34 |
| ← n3wborn left | 06:37 |
| → dege joined | 06:38 |
| ← ygivenx left | 06:40 |
| ← nerosnm left | 06:42 |
| → ygivenx joined | 06:42 |
| → Mattiaslndstrm joined | 06:42 |
| ← atrigent left | 06:45 |
| → rohit[m] joined | 06:45 |
| ← ygivenx left | 06:47 |
| → chele joined | 06:49 |
| → gloomy joined | 06:49 |
| → salad joined | 06:50 |
| ← omnireq_ left | 06:53 |
| ← Bobguy left | 06:53 |
| → mayurvpatil joined | 06:55 |
| ← mayurvpatil left | 06:55 |
| → OtakuSenpai joined | 06:55 |
| → tufteddeer joined | 06:56 |
| → duderonomy joined | 06:56 |
| → mayurvpatil joined | 06:56 |
| ← mayurvpatil left | 06:56 |
| → atrigent joined | 06:56 |
| → stdedos joined | 07:00 |
|
stdedos
| Hello there! I have `Master---/Branch1--commit1--commit2 / Branch2--commit3` this setup. I use git pull / rebase to make my `branch1` up-to-date. I then want to move branch2 to its original location (`commit3` replayed on top of the new `branch1`). `git rebase branch1` seems to replay all 3 commits though. | 07:00 |
|
| Is this a mistake, or I am writing the command wrong? | 07:00 |
| → ygivenx joined | 07:01 |
| → TomyWork joined | 07:03 |
| ← ygivenx left | 07:07 |
| → ygivenx joined | 07:08 |
| → fphilipe_ joined | 07:09 |
| ← Newami left | 07:11 |
| ← atrigent left | 07:13 |
| → elroncio joined | 07:16 |
| ← duderonomy left | 07:17 |
| ← ygivenx left | 07:21 |
| → nerosnm joined | 07:23 |
| → aw1 joined | 07:23 |
| → BeerLover joined | 07:26 |
| → agowa338 joined | 07:28 |
| → Jackneill joined | 07:34 |
| → jstein joined | 07:34 |
| ← hussam left | 07:36 |
|
j416
| stdedos: !lol | 07:37 |
|
gitinfo
| stdedos: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 07:37 |
|
j416
| could you show this? | 07:37 |
|
stdedos
| Isn't it going to be long for here? :/ | 07:37 |
|
j416
| or something similar so that we can see the graph | 07:37 |
|
| skip the commit messages and such if you prefer | 07:37 |
|
| I don't quite understand your branches | 07:37 |
|
| commit hashes (obfuscate if you want) and graph | 07:38 |
| ← Jackneill left | 07:39 |
| → Jackneill joined | 07:40 |
| ← Jackneill left | 07:41 |
| → Jackneill joined | 07:42 |
|
jast
| for long output: !paste | 07:42 |
|
gitinfo
| Please use a pastebin for snippets longer than one line. Persistent and can be used with a GitHub account: https://gist.github.com/ - one hour auto-delete: https://upaste.de/ | 07:42 |
|
stdedos
| jast https://upaste.de/T49 | 07:43 |
|
jast
| hmm, there's a duplicate commit ID in that list (lines 6 & 7) | 07:47 |
| → dartmouthed joined | 07:48 |
|
stdedos
| actually, that's the one I mocked :-p | 07:48 |
|
jast
| purely based on that graph, I can say that a rebase of branch-2 onto branch-1 would replay the commits in lines 3 & 4 | 07:49 |
|
stdedos
| they are different (4 instead of a 5) | 07:49 |
|
jast
| oh, my bad :) | 07:49 |
|
stdedos
| I would guess so. But, I said that I am using `git pull --rebase` to pull | 07:50 |
|
| So, I guess that `8eee44776d8` will change commit "when needed | 07:50 |
|
| " | 07:50 |
|
| So, that will end-up playing `8eee44776d8` on top of everything else, on top of the "new version" of `8eee44776d8` | 07:51 |
| → mikecmpbll joined | 07:51 |
| ← edwardly left | 07:51 |
| ← gde33 left | 07:52 |
| → gde33 joined | 07:52 |
| → ygivenx joined | 07:53 |
| ← nerosnm left | 07:55 |
| → durham joined | 07:56 |
| ← ygivenx left | 07:58 |
| ← g00s left | 08:00 |
| → mayurvpatil joined | 08:00 |
| ← durham left | 08:00 |
| ← dfee left | 08:01 |
| ← mayurvpatil left | 08:03 |
| → ygivenx joined | 08:03 |
| ← TomyWork left | 08:06 |
| → TomyWork joined | 08:07 |
| ← ygivenx left | 08:10 |
| → dfee joined | 08:10 |
| → edwardly joined | 08:10 |
| → KnoP joined | 08:11 |
| → joe2 joined | 08:12 |
| ← queip left | 08:16 |
| → lss8 joined | 08:16 |
| → ygivenx joined | 08:17 |
| → nerosnm joined | 08:19 |
| → mimajof joined | 08:20 |
| → queip joined | 08:21 |
| → finn0 joined | 08:27 |
| ← ygivenx left | 08:32 |
| → mayurvpatil joined | 08:32 |
| → floppydh joined | 08:33 |
| ← mayurvpatil left | 08:33 |
| ← BeerLover left | 08:33 |
|
floppydh
| `git cherry` apparently shows merged&squashed commits, is there a way to circumvent this? | 08:33 |
| → ygivenx joined | 08:37 |
|
floppydh
| can I do something on a commit-basis to have them not show up in `git cherry` because I know they have been merged&squashed? | 08:38 |
| → BeerLover joined | 08:39 |
| ← Shentino left | 08:43 |
| ← ygivenx left | 08:46 |
| → Shentino joined | 08:46 |
| ← nerosnm left | 08:49 |
| ← igemnace left | 08:49 |
| → igemnace joined | 08:50 |
| ← z8z left | 08:53 |
| → alkisg joined | 08:54 |
|
mage_
| any idea how could I git format-match only for file within a certain directory ? | 08:56 |
|
| format-patch* | 08:56 |
|
alkisg
| Hi, I'm trying `git apply my.patch`, with patch=https://termbin.com/w7vl, but it tells me: error: wifi.h: No such file or directory | 08:56 |
|
| I think I need to tell it to ignore the a/ directory and search ./include when the patch says "a/include/wifi.h"; how can I do that? | 08:56 |
| → tribly joined | 08:57 |
| → MACscr joined | 08:58 |
| → Tobbi_ joined | 09:01 |
| ← hofmann3900 left | 09:04 |
| → ygivenx joined | 09:04 |
|
alkisg
| git apply -p0 did it; thanks | 09:06 |
| ← ygivenx left | 09:10 |
| → joe3 joined | 09:10 |
| ← joe2 left | 09:13 |
| → ygivenx joined | 09:15 |
|
mage_
| any idea for this https://gist.github.com/silenius/b7bfe4a7073d8aa9858d44760e9a3b53 ? | 09:15 |
|
| I'd to do a 3way merge but I got nothing .. | 09:16 |
|
| I don't have any <<< and >>> in the file | 09:18 |
| ← ygivenx left | 09:20 |
| → ygivenx joined | 09:21 |
| ← queip left | 09:22 |
| → aw1_ joined | 09:23 |
| ← aw1_ left | 09:23 |
| → is_null joined | 09:23 |
| ← alkisg left | 09:24 |
| → oxymoron93 joined | 09:25 |
| ← aw1 left | 09:25 |
| ← finn0 left | 09:27 |
| ← ygivenx left | 09:27 |
| → queip joined | 09:28 |
| → ygivenx joined | 09:29 |
| ← floppydh left | 09:33 |
| ← ygivenx left | 09:34 |
| ← tufteddeer left | 09:36 |
| → tufteddeer joined | 09:36 |
| ← zamba left | 09:37 |
| ← mikecmpbll left | 09:39 |
| → zamba joined | 09:40 |
| → mikecmpbll joined | 09:40 |
| → zonixo joined | 09:47 |
| ← Goplat left | 09:49 |
| ← zamba left | 09:50 |
| ← yuljk left | 09:51 |
| → mayurvpatil joined | 09:52 |
| ← mayurvpatil left | 09:52 |
| → mayurvpatil joined | 09:52 |
| ← mayurvpatil left | 09:53 |
| → mayurvpatil joined | 09:53 |
| ← mayurvpatil left | 09:53 |
| ← clime left | 09:53 |
| → yuljk joined | 09:54 |
| → mayurvpatil joined | 09:54 |
| ← mayurvpatil left | 09:54 |
| → zamba joined | 09:54 |
| → mayurvpatil joined | 09:55 |
| → floppydh joined | 09:55 |
| ← mayurvpatil left | 09:55 |
| → mayurvpatil joined | 09:55 |
| ← mayurvpatil left | 09:56 |
| → perrier-jouet joined | 10:02 |
| ← lankanmon left | 10:02 |
| → bsanford joined | 10:04 |
| ← bsanford left | 10:04 |
| ← Tobbi_ left | 10:06 |
| → Tobbi_ joined | 10:06 |
| ← TomyWork left | 10:07 |
| ← mimajof left | 10:09 |
| → Fusl joined | 10:09 |
| → TomyWork joined | 10:11 |
| → ygivenx joined | 10:13 |
| ← ghostlin_ left | 10:13 |
| ← BeerLover left | 10:16 |
| → BeerLover joined | 10:18 |
| → mimajof joined | 10:18 |
| ← dfee left | 10:19 |
| ← zamba left | 10:19 |
| → dfee joined | 10:19 |
| → Sonderblade joined | 10:20 |
| ← yonder left | 10:21 |
| ← igemnace left | 10:21 |
| → zamba joined | 10:22 |
| → tens0r joined | 10:22 |
| ← ygivenx left | 10:23 |
| → julius_ joined | 10:24 |
|
julius_
| hi | 10:24 |
| ← tens0r left | 10:25 |
|
julius_
| first timer with branching, im following this howto: https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches after the step: git remote add [name_of_your_remote] [name_of_your_new_branch] it tells me to run: git push [name_of_your_new_remote] [url] and im not really certain why i shou | 10:25 |
|
| ld provide url? i mean the url isnt changing for the branch, its just a new name....isnt it? | 10:25 |
| ← dfee left | 10:29 |
|
jast
| julius_: the information there is wrong. you'd pass the name of the remote and the name of the branch, actually. | 10:29 |
|
| not sure why the guide says something about multiple repositories/remote, anyway | 10:31 |
|
| the info about how to create a new remote is wrong, too, btw | 10:31 |
|
| the two are mixed up: 'git remote add' needs the URL and 'push' needs the name of the branch | 10:31 |
|
| but if you have only one repository, all you need is the remote you already had | 10:32 |
| → thefatma joined | 10:33 |
| ← zonixo left | 10:33 |
| → clime joined | 10:35 |
| → ygivenx joined | 10:37 |
| → dfee joined | 10:38 |
| → luckman212 joined | 10:38 |
| ← AfroThundr|main left | 10:39 |
| ← rapha left | 10:40 |
| → mingdao joined | 10:41 |
| ← BeerLover left | 10:42 |
| ← ygivenx left | 10:43 |
| → Rh0nda joined | 10:43 |
|
julius_
| ok great | 10:44 |
| → VectorX joined | 10:44 |
| → AfroThundr|main joined | 10:45 |
| ← dmc left | 10:45 |
| ← dfee left | 10:48 |
| → ygivenx joined | 10:50 |
| → BeerLover joined | 10:50 |
| → nav2002 joined | 10:51 |
| → alvan joined | 10:52 |
| federico3_ → federico3 | 10:54 |
| ← ygivenx left | 10:55 |
| ← BeerLover left | 10:55 |
|
alvan
| hi .. is is possible to create a new remote tag from remote master without having a local clone using git cli commands ? (i know there is API and some python scripts but i like not to install and use other tools except git cli ) | 10:58 |
| → ygivenx joined | 10:59 |
| → unreal joined | 10:59 |
| → dmc joined | 11:00 |
| → tmz joined | 11:00 |
| → rapha joined | 11:01 |
| ← nav2002 left | 11:02 |
| → emsjessec joined | 11:03 |
| ← ygivenx left | 11:04 |
| → z8z joined | 11:05 |
| ← esrse left | 11:06 |
| → tombusby joined | 11:06 |
| → ghost43 joined | 11:06 |
| ← rapha left | 11:07 |
| ← alvan left | 11:09 |
| → AK joined | 11:09 |
| → alvan joined | 11:09 |
|
GyrosGeier
| alvan, you can do a shallow clone | 11:10 |
|
| but there is no "pretend that we're in a repo" mode | 11:10 |
| → galaxie joined | 11:11 |
| → j7k6 joined | 11:15 |
| → mojisun joined | 11:15 |
| → BeerLover joined | 11:20 |
| ← elroncio left | 11:20 |
| → lankanmon joined | 11:24 |
| → ygivenx joined | 11:25 |
| ← emsjessec left | 11:25 |
| → Lucas_Gray joined | 11:29 |
| ← ygivenx left | 11:30 |
| ← clime left | 11:31 |
| → ghostlines joined | 11:32 |
| → rapha joined | 11:34 |
| → mowcat joined | 11:36 |
| → tomboy64 joined | 11:36 |
| beaky_ → beaky | 11:36 |
| → FlatPanda joined | 11:39 |
| → ygivenx joined | 11:40 |
| → oatmealraisin joined | 11:41 |
| ← ygivenx left | 11:45 |
| ← dviola left | 11:45 |
| ← tufteddeer left | 11:45 |
| ← learningc left | 11:46 |
| → zonixo joined | 11:46 |
| ← Isla_de_Muerte left | 11:53 |
| → Isla_de_Muerte joined | 11:53 |
| → durham joined | 11:57 |
| → ke4roh joined | 11:57 |
| ← zonixo left | 11:59 |
| → emsjessec joined | 12:00 |
| ← victorqueiroz left | 12:01 |
| → savolla joined | 12:01 |
| → elroncio joined | 12:01 |
| ← durham left | 12:02 |
| → cdown joined | 12:06 |
| ← pengwens left | 12:06 |
| → bashfulshell joined | 12:09 |
| → Behold joined | 12:09 |
| ← thefatma left | 12:09 |
| → ygivenx joined | 12:09 |
|
alvan
| GyrosGeier i was thinking maybe instead of shallow to use git clone --bare ? | 12:14 |
|
GyrosGeier
| you can combine them | 12:15 |
|
| a bare repo is sufficient for creating a tag | 12:15 |
|
| I'm not sure if knowing the full commit ID is sufficient for creating a tag or if you need a copy of the commit object | 12:16 |
|
| but if you do a shallow bare clone with just that one commit, that is enough for creating the tag | 12:16 |
| → CodeSlingerPaul joined | 12:17 |
| ← BeerLover left | 12:17 |
| ← ygivenx left | 12:20 |
| ← mud left | 12:22 |
| → hofmann3900 joined | 12:27 |
| ← z8z left | 12:28 |
| → gxt joined | 12:29 |
| → lucasb joined | 12:30 |
|
alvan
| GyrosGeier it works with git clone --bare or git clone --no-checkout as well, but you need to remove the bare .git repo data if already exists on local | 12:31 |
| ← mowcat left | 12:32 |
|
GyrosGeier
| yes | 12:33 |
| → donofrio joined | 12:33 |
|
GyrosGeier
| I'd combine them so you don't need to copy all the objects, but only those for the commit you want to tag | 12:33 |
|
alvan
| yeah agree, thank you | 12:34 |
| → BeerLover joined | 12:38 |
| ← BeerLover left | 12:38 |
| → zonixo joined | 12:40 |
| → mowcat joined | 12:44 |
| → fission6 joined | 12:44 |
|
Stummi
| do git commits actually store timestamps with zone or is it just displaying? | 12:46 |
|
| nvm, I just realized I can checkout some third repo and look at it. Seems timezone (or offset) actually is stored in the commit | 12:48 |
|
GyrosGeier
| Git internal format It is <unix timestamp> <time zone offset>, where <unix timestamp> is the number of seconds since the UNIX epoch. <time zone offset> is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is +0100. | 12:48 |
|
| according to git-commit(1) | 12:48 |
| → ygivenx joined | 12:49 |
| ← stdedos left | 12:50 |
| ← zonixo left | 12:53 |
| ← galaxie left | 12:56 |
| → galaxie joined | 12:58 |
| ← fission6 left | 12:59 |
| ← ygivenx left | 13:00 |
| ← gloomy left | 13:02 |
| → gloomy joined | 13:03 |
| → xelxebar joined | 13:04 |
| ← gloomy left | 13:05 |
| → neunon joined | 13:06 |
| → howell joined | 13:07 |
| → ygivenx joined | 13:09 |
| ← xcm left | 13:10 |
| → xcm joined | 13:11 |
| ← neunon left | 13:11 |
| → neunon joined | 13:11 |
| ← ygivenx left | 13:15 |
| ← savolla left | 13:15 |
| → tufteddeer joined | 13:16 |
| → nuala joined | 13:17 |
| → gloomy joined | 13:18 |
| → ygivenx joined | 13:18 |
| ← ygivenx left | 13:24 |
| joe3 → revoltingPeasant | 13:26 |
| → zonixo joined | 13:27 |
| ← ghostlines left | 13:28 |
| → ghostlines joined | 13:30 |
| → ygivenx joined | 13:30 |
| ← ghostlines left | 13:30 |
| → ghostlines joined | 13:31 |
| ← ghostlines left | 13:32 |
| → elichai2 joined | 13:32 |
| → ghostlines joined | 13:32 |
| ← ghostlines left | 13:32 |
| → ghostlines joined | 13:33 |
| ← ghostlines left | 13:33 |
| → ghostlines joined | 13:33 |
| ← ghostlines left | 13:34 |
| ← ygivenx left | 13:35 |
| ← oatmealraisin left | 13:35 |
| → ghostlines joined | 13:35 |
| ← ghostlines left | 13:35 |
| ← Sonderblade left | 13:36 |
| → Atlenohen joined | 13:36 |
| → lacrymology joined | 13:41 |
| ← cdown left | 13:42 |
| ← ke4roh left | 13:42 |
| → Inline joined | 13:43 |
| → nowhereman joined | 13:45 |
| ← magic_ninja left | 13:45 |
| → mat001 joined | 13:46 |
| → ygivenx joined | 13:47 |
| → duderonomy joined | 13:48 |
| → rsrx joined | 13:50 |
| → cdown joined | 13:50 |
| → czart joined | 13:50 |
| → clime joined | 13:51 |
| → victorqueiroz joined | 13:53 |
| → shabius joined | 13:53 |
| → hussam joined | 13:54 |
| → igemnace joined | 13:56 |
| → altendky joined | 13:57 |
| → mayurvpatil joined | 13:57 |
| ← ygivenx left | 13:57 |
| → thefatma joined | 13:59 |
| ← emsjessec left | 13:59 |
| → magic_ninja joined | 13:59 |
| ← nowhereman left | 14:00 |
| → ygivenx joined | 14:00 |
| ← is_null left | 14:00 |
| ← cdown left | 14:02 |
| → Sonderblade joined | 14:04 |
| → cdown joined | 14:04 |
| → emsjessec joined | 14:06 |
| → nowhereman joined | 14:06 |
| ← OtakuSenpai left | 14:07 |
| ← cdown left | 14:10 |
| ← nowhereman left | 14:11 |
| ← ygivenx left | 14:13 |
| → greggerz joined | 14:14 |
| ← queip left | 14:16 |
| ← jcbitter left | 14:19 |
| → boombatower joined | 14:20 |
| → jcbitter joined | 14:20 |
| → p3rL joined | 14:21 |
|
p3rL
| how to remove specific commit | 14:22 |
| → queip joined | 14:22 |
|
BtbN
| define remove | 14:22 |
|
haymawk
| you could do an interactive rebase and delete specific commits | 14:22 |
|
BtbN
| You could revert it, to undo its changes. Actively purging it from the history will cause some issues and require a force push, and annoy everyone else using that repo. | 14:23 |
|
p3rL
| i want to remove 2nd commit only but want the uppers git checkout HEAD~2 | 14:23 |
|
robertparkerx
| Is there a way to remove ALL untracked files? | 14:23 |
|
BtbN
| git clean with the right flags | 14:24 |
|
| it's potentially quite destructive, so be very sure before running it | 14:24 |
|
robertparkerx
| git clean -n | 14:24 |
|
| git clean -f | 14:24 |
|
| ? | 14:24 |
| ← p3rL left | 14:29 |
| ← emsjessec left | 14:30 |
| ← clime left | 14:31 |
| ← julius_ left | 14:33 |
|
haymawk
| git clean -xdf will remove anything that's in your .gitignore file including directories | 14:33 |
| ← jelmer left | 14:36 |
| → m1dnight_ joined | 14:37 |
| ← m1dnight1 left | 14:40 |
| → T_UNIX joined | 14:40 |
| → m1dnight1 joined | 14:40 |
| → learningc joined | 14:40 |
| ← magic_ninja left | 14:40 |
| → jelmer joined | 14:42 |
| ← duderonomy left | 14:43 |
| ← m1dnight_ left | 14:44 |
| → m1dnight_ joined | 14:47 |
| ← jelmer left | 14:49 |
| → durham joined | 14:49 |
| ← durham left | 14:50 |
| ← m1dnight1 left | 14:50 |
| → def_jam joined | 14:54 |
| → eb0t_ joined | 14:54 |
| → YuGiOhJCJ joined | 14:55 |
| → AbleBacon joined | 14:55 |
| ← eb0t left | 14:55 |
| ← mowcat left | 14:55 |
| → jelmer joined | 14:56 |
| → magic_ninja joined | 14:56 |
| ← Noti left | 14:57 |
| ← tufteddeer left | 14:58 |
| → tufteddeer joined | 14:58 |
| ← queip left | 14:58 |
| ← jelmer left | 14:58 |
| → SerialSmile joined | 14:59 |
| → fission6 joined | 15:01 |
| ← gloomy left | 15:02 |
| ← elroncio left | 15:03 |
| ← mat001 left | 15:03 |
| → jelmer joined | 15:04 |
| ← agowa338 left | 15:04 |
| → subopt joined | 15:06 |
| ← zonixo left | 15:06 |
| → thiago joined | 15:09 |
| → gloomy joined | 15:09 |
| ← alvan left | 15:10 |
| → ygivenx joined | 15:10 |
| CheckYourSix_ → CheckYourSix | 15:10 |
| ← ygivenx left | 15:15 |
| → ygivenx joined | 15:15 |
| ← chele left | 15:18 |
| ← Sleepy63 left | 15:19 |
| ← dmc left | 15:19 |
| ← TomyWork left | 15:20 |
| ← oxymoron93 left | 15:22 |
| → JeffH joined | 15:27 |
| ← rsrx left | 15:28 |
| → dmc joined | 15:29 |
| ← bashfulshell left | 15:31 |
| ← JeffH left | 15:34 |
| → durham joined | 15:36 |
| ← thefatma left | 15:41 |
| → thefatma joined | 15:42 |
| ← revoltingPeasant left | 15:45 |
| → revoltingPeasant joined | 15:46 |
| ← mayurvpatil left | 15:46 |
| → cdown joined | 15:47 |
| ← durham left | 15:48 |
| ← FlatPanda left | 15:51 |
| → mayurvpatil joined | 15:52 |
| ← mayurvpatil left | 15:52 |
| → emsjessec joined | 15:52 |
| ← rohit[m] left | 15:54 |
| → cdown_ joined | 15:55 |
| → mat001 joined | 15:57 |
| → dmj8and3 joined | 15:57 |
| ← mat001 left | 15:57 |
|
dmj8and3
| RIP old webchat | 15:57 |
| ← cdown left | 15:57 |
| → mat001 joined | 15:57 |
| cdown_ → cdown | 15:58 |
|
dmj8and3
| Hey all, I searched for this and nothing really came up, so I'm hoping for a quick sanity check. | 15:58 |
|
| git rebase --onto HEAD~2 HEAD~1 | 15:59 |
|
| This will remove the changes+commit from the 2nd-to-last commit on the current branch, right? | 16:00 |
| → agowa338 joined | 16:01 |
| ← learningc left | 16:04 |
|
osse
| yes | 16:04 |
| → im0nde joined | 16:04 |
| ← Lucas_Gray left | 16:05 |
|
dmj8and3
| thanks! | 16:05 |
| → im0nde_ joined | 16:06 |
| ← im0nde- left | 16:06 |
| → mowcat joined | 16:06 |
| ← im0nde| left | 16:06 |
| ← xcm left | 16:07 |
| → xcm joined | 16:07 |
|
GyrosGeier
| dmj8and3, protip: unless you are writing a script, use "git rebase -i" | 16:09 |
| ← mimajof left | 16:09 |
| ← fphilipe_ left | 16:09 |
|
dmj8and3
| i'd prefer to understand both ways, and this form seems like the place to start | 16:09 |
| ← thiago left | 16:10 |
|
dmj8and3
| the interactive one feels a bit weird, yeah? | 16:10 |
|
GyrosGeier
| I use it to clean up commits before submitting them | 16:11 |
| ← thefatma left | 16:12 |
|
GyrosGeier
| e.g. if I insert a debug printf somewhere, I immediately commit that with -mDISCARD | 16:12 |
|
| then when I'm done I can just drop all the lines containing DISCARD in the interactive editor, and rebase the debug code out | 16:12 |
|
dmj8and3
| neat. Reading the man page now, which helps | 16:16 |
| ← floppydh left | 16:16 |
|
dmj8and3
| i had some bad experiences in the past with the whole "open editor, make changes" thing. I don't even remember when or what. | 16:16 |
| → Sleepy63 joined | 16:16 |
|
dmj8and3
| but I haven't seen this fail yet, so I'll roll with it | 16:17 |
| → duderonomy joined | 16:18 |
| ← YuGiOhJCJ left | 16:19 |
| → durham joined | 16:21 |
| ← rkta left | 16:23 |
| → rkta joined | 16:23 |
|
mns
| I have cloned a remote repo, created a branch local-branch, switched to local-branch, created a tag and then pushing the tag back to origin/master. In the meantime origin/master has had several commits made to it. How do I push just the tags from local-branch without getting the push rejected because remote contains work that I don't have locally. | 16:26 |
| ← duderonomy left | 16:26 |
| ← cdown left | 16:28 |
| → orbyt_ joined | 16:28 |
| → iam730 joined | 16:32 |
| ← durham left | 16:34 |
| ← alyptik left | 16:34 |
| → nuc joined | 16:35 |
| → fphilipe_ joined | 16:35 |
| → theoceaniscool joined | 16:36 |
|
haymawk
| git push origin <tag_name> | 16:41 |
| → thiago joined | 16:47 |
| ← irrgit left | 16:48 |
| → vavkamil joined | 16:49 |
| ← revoltingPeasant left | 16:51 |
| ← Atlenohen left | 16:51 |
| ← mikecmpbll left | 16:51 |
| → fstd_ joined | 16:53 |
| ← nuala left | 16:55 |
| eb0t_ → eblip | 16:56 |
| ← fstd left | 16:57 |
| fstd_ → fstd | 16:57 |
| → nuala joined | 16:58 |
| → mrpropa joined | 16:59 |
|
mns
| haymawk: thanks, that worked. whats the difference between that and using "git push --tags origin local-branch:master" ? | 17:00 |
| → troulouliou_dev joined | 17:00 |
| → irrgit joined | 17:01 |
| → goiko joined | 17:02 |
|
Zarthus
| (18:12:08) <GyrosGeier> e.g. if I insert a debug printf somewhere, I immediately commit that with -mDISCARD | 17:02 |
|
| how many DISCARD commits do you usually wipe after a rebase :P | 17:02 |
| ← kh31d4r left | 17:02 |
| → mat001_ joined | 17:03 |
| ← fission6 left | 17:03 |
| → kh31d4r joined | 17:03 |
| ← mat001_ left | 17:03 |
| → mat001_ joined | 17:04 |
| ← wildlander left | 17:05 |
| ← mat001 left | 17:06 |
|
GyrosGeier
| ten or so | 17:07 |
|
| depends on the problem | 17:07 |
|
| making individual commits means I can mix changes in the history, and then reorganize them later | 17:09 |
|
| e.g. if I have a build system change that prepares something but doesn't break anything else, I make a separate commit, make a note in the message that this needs to go early into the submission, and then I can ignore the change until reorg time | 17:10 |
|
| step one is to sort thematically, do a bit of squashing | 17:10 |
|
| then run "git rebase -x make" to make sure each commit also builds | 17:11 |
|
| then refine from there | 17:11 |
| → wildlander joined | 17:11 |
| → fission6 joined | 17:12 |
| → Atlenohen joined | 17:12 |
| → dfee joined | 17:15 |
| → mattfly joined | 17:16 |
| → nowhereman joined | 17:16 |
| → yonder joined | 17:17 |
| ← Atlenohen left | 17:18 |
| → JeffH joined | 17:22 |
| → jhulten joined | 17:26 |
| → mikecmpbll joined | 17:27 |
| → alonkli joined | 17:27 |
| → alonkli12 joined | 17:27 |
| → alyptik joined | 17:28 |
| → thefatma joined | 17:28 |
| → mat001 joined | 17:28 |
|
qpdb
| once in a while i rebase -i the same branch on different hosts without any syncing. when i run into "missing" code i wonder if i actually implemented it or just dreamed about doing it - then i take a trip to reflog hell | 17:29 |
| → skywalker joined | 17:29 |
|
cbreak
| GyrosGeier: try -m'fixup!' | 17:29 |
| ← JeffH left | 17:29 |
|
cbreak
| GyrosGeier: and then git rebase --autosquash | 17:29 |
|
| GyrosGeier: you can get the proper fixup pattern with git commit --fixup or --squash | 17:30 |
| ← nuala left | 17:31 |
| ← tufteddeer left | 17:31 |
| → tufteddeer joined | 17:32 |
| ← mat001_ left | 17:32 |
|
skywalker
| very often i want to rebase my branch to squash some commits. i usually git rebase -i HEAD~n. how can i tell git i want to rebase all my commits from HEAD to the first commit of my branch? | 17:32 |
|
GyrosGeier
| cbreak, I do that sometimes, but most of the time I just number the features in my head | 17:32 |
|
| so -mf2 -mf3 and so on | 17:33 |
|
cbreak
| skywalker: man git-merge-base | 17:33 |
|
gitinfo
| skywalker: the git-merge-base manpage is available at https://gitirc.eu/git-merge-base.html | 17:33 |
|
GyrosGeier
| the fixup! syntax expects you to know the existing commit message | 17:33 |
|
cbreak
| merge-base functionality is built-in in the rebase syntax | 17:33 |
|
skywalker
| thanks | 17:34 |
|
GyrosGeier
| it'd be cool if there was an --autodiscard to drop all 'discard!' commits | 17:34 |
|
cbreak
| but it's mingled with the destination of the merge base too | 17:34 |
|
| GyrosGeier: you don't have to commit those | 17:34 |
|
GyrosGeier
| it's a lot easier if I commit them, because then I don't have to ignore them time and time again with git-add | 17:35 |
|
cbreak
| you don't have to | 17:35 |
|
| you can do git checkout -p to remove them | 17:35 |
|
GyrosGeier
| assuming that the debug printfs are not anywhere near the code I've changed | 17:35 |
|
| checkout -p is really annoying if you have to edit the patch | 17:36 |
| ← tufteddeer left | 17:36 |
|
GyrosGeier
| especially for the "added a printf" case, where I have to replace all '-' lines by ' ', and drop all '+' lines except those I want to delete | 17:36 |
| → tufteddeer joined | 17:36 |
| → oatmealraisin joined | 17:38 |
|
skywalker
| so, something like git rebase -i $(git merge-base master feature), right? | 17:40 |
| → freeman42x joined | 17:41 |
| → is_null joined | 17:42 |
| → AtumT joined | 17:45 |
|
skywalker
| or even better instead of feature, just HEAD (in my specific case) | 17:45 |
| ← tufteddeer left | 17:45 |
| → cliluw joined | 17:45 |
|
GyrosGeier
| if you don't give a ref, it uses the "upstream" branch for the branch you're on | 17:46 |
| → tufteddeer joined | 17:46 |
|
GyrosGeier
| I often do "git checkout -b feature1 origin" | 17:46 |
|
| and "git rebase" on that branch implies rebasing on top of origin/HEAD | 17:46 |
|
skywalker
| cool | 17:48 |
| ← tufteddeer left | 17:50 |
| ← is_null left | 17:52 |
| def_jam → eb0t | 17:53 |
| ← kh31d4r left | 17:53 |
| → kh31d4r joined | 17:53 |
| → sbeyer joined | 18:00 |
| ← xcm left | 18:02 |
| → xcm joined | 18:02 |
| → jubal joined | 18:02 |
| ← dfee left | 18:03 |
| → pks_ joined | 18:04 |
| ← fission6 left | 18:05 |
| ← pks left | 18:06 |
| pks_ → pks | 18:06 |
| ← iam730 left | 18:08 |
| → Sasazuka joined | 18:08 |
| → iam730 joined | 18:10 |
| → leeN joined | 18:10 |
| → is_null joined | 18:12 |
| → dino82 joined | 18:13 |
| → seebyr joined | 18:17 |
| ← T_UNIX left | 18:19 |
| → dfee joined | 18:20 |
| ← sbeyer left | 18:20 |
| → Newami joined | 18:20 |
| seebyr → sbeyer | 18:20 |
| → bongjovi joined | 18:21 |
| ← is_null left | 18:22 |
| → joe4 joined | 18:26 |
| → Eryn_1983_FL joined | 18:28 |
| ← sauvin left | 18:33 |
| → nowhere_man joined | 18:36 |
| ← nowhereman left | 18:36 |
| → fission6 joined | 18:36 |
| ← galaxie left | 18:38 |
| ← nowhere_man left | 18:42 |
| ← ZombieByte left | 18:42 |
| ← mat001 left | 18:46 |
| → mat001 joined | 18:47 |
| → is_null joined | 18:51 |
| ← kneeki left | 18:51 |
| → kneeki joined | 18:51 |
| ← kneeki left | 18:52 |
| SoniEx2 → Soni | 18:55 |
| ← leeN left | 18:56 |
| ← Sonderblade left | 18:57 |
| → wrkrcoop joined | 18:57 |
|
wrkrcoop
| hey i messed up my local branch pretty bad. is it possible to delete my local branch and pull the branch i have a PR for? the PR has not been merged yet | 18:57 |
| ← bongjovi left | 18:58 |
|
vishal
| wrkrcoop: !rtb | 18:58 |
|
gitinfo
| wrkrcoop: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branc | 18:58 |
| ← kh31d4r left | 18:58 |
| ← is_null left | 18:58 |
| → Atlenohen joined | 18:58 |
| → z|bandito joined | 19:00 |
|
vishal
| wrkrcoop: unless, did you mean you also pushed to your fork - from which the PR was originally created - and want to use upstream/PR to restore your local repo as well as your fork on whatever hosting site? | 19:01 |
| ← agowa338 left | 19:01 |
| → duderonomy joined | 19:03 |
| ← duderonomy left | 19:04 |
| ← mattfly left | 19:05 |
| → nuala joined | 19:06 |
| ← iam730 left | 19:08 |
| → zonixo joined | 19:10 |
| → bongjovi joined | 19:11 |
| ← CodeSlingerPaul left | 19:16 |
| → pengwens joined | 19:16 |
| ← wrkrcoop left | 19:17 |
| → reveer joined | 19:18 |
| ← cbreak left | 19:21 |
| → cbreak joined | 19:21 |
| ← pengwens left | 19:22 |
| → wolfshappen joined | 19:25 |
| ← Mattiaslndstrm left | 19:26 |
| → m0viefreak joined | 19:26 |
| ← perrier-jouet left | 19:27 |
| → im0nde- joined | 19:27 |
| ← im0nde_ left | 19:28 |
| → im0nde_ joined | 19:28 |
| ← im0nde left | 19:28 |
| → jarlopez joined | 19:28 |
|
jarlopez
| I'm on a local dev branch where a commit 3 commits ago included some changes that now should be undone. What's a good way to handle this? `git rebase -i HEAD~3` and `edit` the commit? | 19:30 |
| ← gloomy left | 19:30 |
| → tufteddeer joined | 19:30 |
|
vishal
| jarlopez: if !rewrite is ok, then yes | 19:30 |
|
gitinfo
| jarlopez: 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 | 19:30 |
|
vishal
| you might also need HEAD~4 instead of HEAD~3 | 19:31 |
|
jarlopez
| Yes, in this case I'm the sole owner of the branch with comments living on GitHub | 19:31 |
|
vishal
| should be ok then | 19:31 |
|
jarlopez
| Thanks, y'all | 19:32 |
|
vishal
| One option is to make a new commit with the changes, and then rebase -i to move it right after the orig commit, and mark it as fixup | 19:32 |
| ← bongjovi left | 19:32 |
|
vishal
| I use that sort of a workflow all the time | 19:32 |
|
| commit even has a --fixup=<sha> option to make that easier | 19:32 |
| ← Cabanossi left | 19:33 |
|
jarlopez
| I thought about that as well, but the original commit contains many snippets that I'd like to `git checkout --ours` on | 19:33 |
|
vishal
| though I think you need to set some config option to make rebase reposition and mark fixup/squash commits automagically | 19:33 |
|
jarlopez
| I'd like to "undo" the changes from the commit, re-stage the revelant ones, and use those changes as the original commit | 19:34 |
|
vishal
| ok, 'edit' can be an option of there are many conflict opportunities, but you will hit those conflicts after the edit stage anyway when rebase moves on to the next commits | 19:34 |
| → Cabanossi joined | 19:34 |
|
vishal
| yep edit should be able to handle that | 19:34 |
|
| edit, followed by reset --mixed HEAD~1, and then stage the stuff you want | 19:34 |
|
nedbat
| "git remote prune origin" shouldn't delete anything on the remote repo, should it? | 19:35 |
|
jarlopez
| vishal: Aha, that's the missing piece I think | 19:35 |
| ← emsjessec left | 19:35 |
|
vishal
| nedbat: no, only cleanup RTBs that are no longer present on the remote | 19:35 |
|
jarlopez
| vishal: What does --mixed do in this case? | 19:35 |
| ← salad left | 19:36 |
|
vishal
| --mixed is the default, it doesn't touch the working tree but undoes the commit and also unstages | 19:36 |
|
jarlopez
| Beautiful. Thanks, vishal | 19:36 |
| → pengwens joined | 19:37 |
|
vishal
| cheers | 19:37 |
| → nowhere_man joined | 19:38 |
| → joe2 joined | 19:38 |
| ← czart left | 19:38 |
| ← fission6 left | 19:40 |
| ← joe4 left | 19:41 |
| ← dfee left | 19:41 |
| ← troulouliou_dev left | 19:41 |
|
vishal
| nedbat: I find git remote prune kind of an awkward spot for that operation. I much prefer git fetch --prune | 19:41 |
|
nedbat
| vishal: the man page was helpful to say that it was the same as "git fetch --prune", which helped me understand it was local-only | 19:42 |
|
vishal
| I treat git-remote as a local only command (barring the --fetch option) | 19:42 |
|
| yep | 19:42 |
| → perrier-jouet joined | 19:44 |
| → duderonomy joined | 19:44 |
| → parsnip joined | 19:46 |
| ← duderonomy left | 19:47 |
| → is_null joined | 19:47 |
| → plexigras joined | 19:48 |
| → troulouliou_dev joined | 19:51 |
| ← theoceaniscool left | 19:53 |
| ← gde33 left | 19:55 |
| → fission6 joined | 19:56 |
| → JeffH joined | 19:56 |
| → gde33 joined | 19:57 |
| ← reveer left | 19:58 |
| → mat001_ joined | 20:02 |
| ← is_null left | 20:02 |
| → reveer joined | 20:02 |
| ← mat001 left | 20:04 |
| → duderonomy joined | 20:04 |
| subopt → _subopt_in_repos | 20:06 |
| ← _subopt_in_repos left | 20:06 |
| ← duderonomy left | 20:06 |
| ← Virox left | 20:10 |
| → Es0teric joined | 20:11 |
|
Es0teric
| hi, i have a quick question -- how do I merge two git repositories? | 20:12 |
| ← fission6 left | 20:12 |
|
_ikke_
| Es0teric: Do these repositories have something in common? | 20:12 |
|
Es0teric
| yeah.. one would be dev1 the other would be dev2 | 20:12 |
|
_ikke_
| and 2nd question: what do you imagine the end result to be? | 20:12 |
|
Es0teric
| _ikke_ both repositories were already merged before at some point in time | 20:12 |
|
| so i imagine their histories would be the same up to a certain point | 20:12 |
|
| my end result would be... code from repo B to be merged into repo A | 20:13 |
|
_ikke_
| Just add one repo as a remote to the other | 20:13 |
|
Zarthus
| what about the commits? | 20:13 |
|
Es0teric
| Zarthus i want all of the commits | 20:13 |
|
_ikke_
| then fetch and merge the relevant branch | 20:13 |
|
Es0teric
| wait what? | 20:13 |
|
_ikke_
| Es0teric: Do you know how to add remotes? | 20:14 |
|
Es0teric
| so you're saying I should have two origins in the remote then merge the dev branch from repo A to repo B? | 20:14 |
|
| _ikke_ | 20:15 |
|
| vishal hands Es0teric some !books | 20:15 |
|
vishal
| er | 20:15 |
|
| !book | 20:15 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 20:15 |
|
_ikke_
| Es0teric: s/origins/remotes/ | 20:15 |
| → n3wborn joined | 20:15 |
|
_ikke_
| Es0teric: but yes, that's the idea | 20:15 |
|
Es0teric
| ok run that by me again | 20:16 |
|
| would I have to pull down both repositories? | 20:16 |
|
_ikke_
| You probably have at least on of them already cloned? | 20:16 |
|
Es0teric
| I do | 20:16 |
| ← unreal left | 20:16 |
|
Es0teric
| but I am going to make a new folder that has the repo i want to merge to | 20:17 |
| ← JeffH left | 20:17 |
| ← tufteddeer left | 20:18 |
|
Es0teric
| _ikke_ | 20:18 |
|
_ikke_
| sure, go ahead | 20:18 |
| → tufteddeer joined | 20:19 |
|
Es0teric
| alright well its cloning now | 20:19 |
| ← troulouliou_dev left | 20:20 |
| → ggSo joined | 20:20 |
| ← zonixo left | 20:21 |
| ← tufteddeer left | 20:23 |
| → fission6 joined | 20:24 |
|
Es0teric
| _ikke_ ok so I have both remotes on the branches | 20:24 |
|
| i mean on the repo | 20:24 |
|
| so on the origin branch that I am currently in do I do something like.. `git merge <remote>/<branch> | 20:26 |
|
| ` ? | 20:26 |
|
_ikke_
| Es0teric: yes | 20:26 |
|
vishal
| yep, though I prefer to make a new branch for the merge attempt if I expect things to get ugly | 20:26 |
|
_ikke_
| vishal: they already made a new clone | 20:27 |
|
vishal
| ah true | 20:27 |
|
Es0teric
| ╰─➤ git merge dev1 devel merge: dev1 - not something we can merge | 20:27 |
|
vishal
| is dev1 your remote? | 20:27 |
|
Es0teric
| vishal yeah | 20:28 |
| → tufteddeer joined | 20:28 |
| ← tufteddeer left | 20:28 |
|
vishal
| git merge dev1/devel | 20:28 |
|
_ikke_
| indeed | 20:28 |
| → tufteddeer joined | 20:28 |
|
Es0teric
| ╰─➤ git merge dev1/devel merge: dev1/devel - not something we can merge | 20:28 |
|
| vishal | 20:28 |
|
_ikke_
| Es0teric: what does git branch -r return? | 20:28 |
|
vishal
| git remote -v and git branch -av please | 20:28 |
| → SkarmoutsosV joined | 20:30 |
| → Onionnion joined | 20:31 |
| ← pengwens left | 20:31 |
| → troulouliou_dev joined | 20:33 |
|
Es0teric
| _ikke_ https://kopy.io/i34Kl | 20:34 |
|
| oh i mean vishal | 20:35 |
|
_ikke_
| Es0teric: run git fetch dev1 | 20:35 |
|
Es0teric
| done | 20:36 |
|
| _ikke_ | 20:36 |
| ← alyptik left | 20:36 |
|
_ikke_
| Es0teric: Did you see it getting those branches now> | 20:36 |
|
| ? | 20:36 |
|
Es0teric
| yeah | 20:36 |
|
_ikke_
| now you can do that merge | 20:36 |
|
Es0teric
| ahhh | 20:37 |
|
| i see | 20:37 |
|
| thanks! | 20:37 |
|
| how do i know that i am in the origin branch and not dev1? | 20:38 |
|
| vishal struggles with that paste output.. what happened to the commands? and what's this "into devel" and "folder" stuff :) | 20:38 |
|
_ikke_
| Es0teric: origin is not a branch | 20:38 |
|
| vishal: that's wrapped output from the previous line | 20:38 |
|
Es0teric
| vishal you asked me to show you what the output of your command was | 20:38 |
|
vishal
| _ikke_: oof I see | 20:38 |
|
Es0teric
| _ikke_ ok so how do I know that I am about to push to origin? | 20:39 |
|
vishal
| Es0teric: its the right output, the formatting is just very confusing | 20:39 |
|
Es0teric
| ok | 20:39 |
| → Raging_Hog joined | 20:39 |
| → fatalhalt joined | 20:39 |
|
_ikke_
| Es0teric: one way would be to explicit about where you push to | 20:39 |
| → Fernando-Basso joined | 20:39 |
|
Es0teric
| so `git push origin devel` | 20:40 |
| ← SerialSmile left | 20:40 |
|
_ikke_
| Es0teric: yes | 20:40 |
|
Es0teric
| ok | 20:40 |
| ← tufteddeer left | 20:42 |
| → pengwens joined | 20:44 |
| → tufteddeer joined | 20:44 |
| ← Cabanossi left | 20:51 |
| ← nowhere_man left | 20:54 |
| ← jarlopez left | 20:57 |
| → kalib joined | 20:57 |
| → nowhere_man joined | 20:59 |
| → dfee joined | 20:59 |
|
kalib
| Hi guys. If I missed a commit when I merged my code from my local development branch to my local staging branch, and pushed that to my origin staging, I can fix that locally by using reset --hard on my local staging so I can properly merge again from my local development to my local staging with all the commits. I did it and the logs now seem ok, w | 20:59 |
|
| ith all the commits local on my staging. If I push it now to my origin staging, would that be fixed there as well? Or do I need to also reset hard my remote staging before pushing? | 20:59 |
| → alyptik joined | 21:00 |
|
deltab
| kalib: I believe that'll be okay, but it'll need to be a force push, because you'll be pushing a head that doesn't have the current head as an ancestor (if I've understood you correctly) | 21:04 |
| ← nowhere_man left | 21:05 |
| → nowhere_man joined | 21:06 |
| → Cabanossi joined | 21:06 |
| → craftyguy joined | 21:06 |
|
deltab
| it might cause trouble for someone else if they've pulled the earlier version and they add their own commits on top of that | 21:07 |
| → UrsoBranco joined | 21:07 |
| ← TomTom left | 21:09 |
| ← pengwens left | 21:10 |
| ← AbleBacon left | 21:12 |
| ← Es0teric left | 21:14 |
| ← nowhere_man left | 21:16 |
| ← tufteddeer left | 21:20 |
|
kalib
| deltab thanks | 21:20 |
| → tufteddeer joined | 21:20 |
| → dviola joined | 21:23 |
| → kerframil joined | 21:23 |
| → hellz joined | 21:24 |
| → pengwens joined | 21:24 |
| ← fission6 left | 21:24 |
| ← rkta left | 21:25 |
| → rkta joined | 21:25 |
| ← kalib left | 21:26 |
| ← reveer left | 21:28 |
| ← kerframil left | 21:29 |
| → limarfrek joined | 21:29 |
| ← tufteddeer left | 21:29 |
| ← howell left | 21:29 |
| limarfrek → kerframil | 21:30 |
| → tufteddeer joined | 21:30 |
| ← plexigras left | 21:32 |
| ← dartmouthed left | 21:37 |
| → subopt joined | 21:38 |
| ← jstein left | 21:38 |
| ← tufteddeer left | 21:38 |
| → tufteddeer joined | 21:38 |
| → greatgatsby joined | 21:43 |
| → mattfly joined | 21:46 |
| ← mattfly left | 21:46 |
| → fission6 joined | 21:47 |
| ← greatgatsby left | 21:48 |
| ← dmj8and3 left | 21:49 |
| → is_null joined | 21:52 |
| → duderonomy joined | 21:53 |
| → unomystEz joined | 21:56 |
| ← duderonomy left | 21:56 |
| → Es0teric joined | 22:00 |
| ← greggerz left | 22:01 |
| ← Es0teric left | 22:01 |
| → duderonomy joined | 22:01 |
| ← duderonomy left | 22:03 |
| ← fission6 left | 22:04 |
|
unomystEz
| do git subtrees get tracked remotely? I.e, if someone clones a repo do any subtrees get automatically checked out? | 22:04 |
|
vishal
| unomystEz: do you mean submodules? | 22:04 |
| ← DusteD left | 22:05 |
|
unomystEz
| vishal: I mean subtrees as I would prefer to stay away from submodules if possible | 22:05 |
|
vishal
| unomystEz: yes, the subtree simply becomes part of the repo | 22:06 |
|
unomystEz
| ok that's great | 22:06 |
| ← SkarmoutsosV left | 22:07 |
| ← orbyt_ left | 22:07 |
| ← xelxebar left | 22:07 |
| ← toothe left | 22:07 |
| → xelxebar joined | 22:07 |
| ← mat001_ left | 22:08 |
| → mat001 joined | 22:08 |
| ← rigid left | 22:11 |
| → duderonomy joined | 22:12 |
| → rigid joined | 22:13 |
| → cd joined | 22:17 |
| ← duderonomy left | 22:18 |
| ← tufteddeer left | 22:19 |
| ← dege left | 22:20 |
| → a3Dman joined | 22:22 |
| → Es0teric joined | 22:24 |
| ← Es0teric left | 22:26 |
| → nowhere_man joined | 22:26 |
| → JeffH joined | 22:31 |
| ← JeffH left | 22:34 |
| ← unomystEz left | 22:35 |
| ← joe2 left | 22:38 |
| → joe2 joined | 22:39 |
| → orbyt_ joined | 22:42 |
| → duderonomy joined | 22:44 |
| → nic-hartley joined | 22:44 |
| → joe4 joined | 22:45 |
| ← joe2 left | 22:46 |
| ← duderonomy left | 22:46 |
| ← thiago left | 22:55 |
| → thiago joined | 22:59 |
| ← dfee left | 23:02 |
| → duderonomy joined | 23:02 |
| ← n3wborn left | 23:03 |
| → greatgatsby joined | 23:05 |
| ← duderonomy left | 23:06 |
| ← Atlenohen left | 23:07 |
| → duderonomy joined | 23:07 |
| → fission6 joined | 23:08 |
| → seebyr joined | 23:08 |
| → joe__ joined | 23:08 |
| ← boombatower left | 23:09 |
| ← joe4 left | 23:10 |
| ← pengwens left | 23:10 |
| ← sbeyer left | 23:11 |
| ← dviola left | 23:13 |
| → nowhereman joined | 23:13 |
| ← nowhere_man left | 23:14 |
| ← duderonomy left | 23:15 |
| → duderonomy joined | 23:16 |
| → ferdna joined | 23:17 |
| ← duderonomy left | 23:18 |
| → bashfulshell joined | 23:18 |
| → duderonomy joined | 23:19 |
| ← nowhereman left | 23:20 |
| → yyy- joined | 23:20 |
| ← xcm left | 23:20 |
| → xcm joined | 23:21 |
| ← duderonomy left | 23:22 |
| ← is_null left | 23:25 |
| → duderonomy joined | 23:26 |
| ← greatgatsby left | 23:26 |
| ← kerframil left | 23:29 |
| ← yyy- left | 23:30 |
| ← duderonomy left | 23:31 |
| → Bobguy joined | 23:33 |
| ← jhulten left | 23:33 |
| ← oatmealraisin left | 23:33 |
| → duderonomy joined | 23:34 |
| ← m0viefreak left | 23:35 |
| ← duderonomy left | 23:36 |
| → kerframil joined | 23:37 |
| ← seebyr left | 23:38 |
| ← kerframil left | 23:40 |
| → kerframil joined | 23:40 |
| → duderonomy joined | 23:41 |
| ← troulouliou_dev left | 23:41 |
| ← kerframil left | 23:42 |
| → kerframil joined | 23:42 |
| → sweatsuit joined | 23:43 |
| → troulouliou_dev joined | 23:43 |
| ← duderonomy left | 23:43 |
| ← Cabanossi left | 23:43 |
| → duderonomy joined | 23:45 |
| ← duderonomy left | 23:49 |
| → duderonomy joined | 23:50 |
| → Atlenohen joined | 23:51 |
| ← hofmann3900 left | 23:51 |
| → hofmann3900 joined | 23:52 |
| ← duderonomy left | 23:52 |
| → Cabanossi joined | 23:53 |
| ← hofmann3900 left | 23:53 |
| ← igemnace left | 23:56 |
| → duderonomy joined | 23:56 |
| ← mat001 left | 23:56 |