| 2021-08-12 |
| ← Tuor left | 00:00 |
| → Tuor joined | 00:00 |
| → __jmcantrell__ joined | 00:01 |
| ← TomyLobo left | 00:02 |
|
bn_work
| or b? | 00:03 |
| ← jmcantrell left | 00:04 |
|
bn_work
| ok, I'm lost, I feel like rebase -i has changed since I last used it in an older version of git :/ | 00:05 |
|
| (tried b, then `git reset HEAD~ <filename>` as before but it didn't stage it back to be omitted) | 00:06 |
|
| I feel doing E is backwards because I have to amend what needs to be edited before the fact?, I could have sworn in the past at each step of the rebase it would drop to shell with the index set the way was right before the commit and I could modify as needed using normal add/reset commands and then commit it to proceed? | 00:10 |
| → qpdb_ joined | 00:16 |
| ← qpdb left | 00:19 |
|
bn_work
| damn, is there no man page that explains the rebase interactive options? | 00:19 |
| → ferdna joined | 00:20 |
|
bn_work
| reading https://git-rebase.io/ and https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History surprisingly says nothing about the actual options | 00:20 |
|
| and man git-rebase oddly doesn't work for me :/ | 00:20 |
|
gitinfo
| the git-rebase manpage is available at https://gitirc.eu/git-rebase.html | 00:20 |
|
bn_work
| locally | 00:20 |
|
| well, surprisingly man page says nothing about it either :/ | 00:23 |
| ← tirnanog left | 00:25 |
| → rektide joined | 00:26 |
| → jwillikers joined | 00:29 |
| → Xenguy joined | 00:31 |
| ← ash_worksi left | 00:32 |
| ← srinidhi left | 00:32 |
|
bn_work
| ok, I think I got it fixed now, still feels strange though... but maybe I'm misremembering things because I'm tired :/ thanks | 00:34 |
| ← reset left | 00:36 |
| ← christall left | 00:38 |
| → jmcantrell joined | 00:38 |
| → hbautista joined | 00:40 |
| ← __jmcantrell__ left | 00:41 |
| → christall joined | 00:41 |
| → __jmcantrell__ joined | 00:43 |
| → jmcantre1 joined | 00:45 |
| ← christall left | 00:45 |
| ← jmcantrell left | 00:46 |
| ← __jmcantrell__ left | 00:48 |
| → lightstalker joined | 00:48 |
| → zebrag joined | 00:53 |
| → jmcantrell joined | 00:54 |
| ← jinsun left | 00:56 |
| ← jmcantre1 left | 00:56 |
| → jinsun joined | 00:57 |
| ← zebrag left | 00:58 |
| → __jmcantrell__ joined | 01:00 |
| ← jmcantrell left | 01:03 |
| → christall joined | 01:09 |
| ← jwillikers left | 01:10 |
| ← vysn left | 01:18 |
| ← tejr left | 01:19 |
| → hbautista_ joined | 01:20 |
| ← lgc left | 01:22 |
| ← hbautista left | 01:23 |
| ← christall left | 01:29 |
| → YuGiOhJCJ joined | 01:34 |
| ← przemoc86 left | 01:34 |
| → przemoc joined | 01:36 |
| → jmcantrell joined | 01:38 |
| ← AnAverageHuman left | 01:39 |
| ← keypusher left | 01:40 |
| → keypushe- joined | 01:41 |
| ← __jmcantrell__ left | 01:41 |
| keypushe- → keypusher | 01:44 |
| → __jmcantrell__ joined | 01:47 |
| → AnAverageHuman joined | 01:50 |
| ← jmcantrell left | 01:50 |
| → Guest67 joined | 01:50 |
| → jmcantrell joined | 01:54 |
|
Guest67
| Hi, I have a workflow question. I'm knee-deep in implementing a new feature on a project -- there are all sorts of tracked and untracked changes. Due to a change in priorities, I need to shelve everything and pick it up much later. What's a good way to save a big bundle of half-baked work? I could create a feature branch and do a crappy commit | 01:55 |
|
| "Lots of changes and half-done work relating to X". And then push that to origin. But then I won't be able to clean up the history later, right? | 01:55 |
| → christall joined | 01:55 |
| ← __jmcantrell__ left | 01:57 |
|
davidfetter
| hi | 01:58 |
| → kikijiki joined | 01:58 |
|
davidfetter
| is there a way to include a branch's upstream branch(es) in a push? | 01:59 |
| ← christall left | 02:00 |
|
mackerman
| Guest67: Commit and push can be fine, if you document that as a work in progress branch. | 02:06 |
|
| Correct, sharing the branch with others means you should not rewrite that history. | 02:07 |
| → __jmcantrell__ joined | 02:11 |
|
Guest67
| mackerman: Thanks for the input. When the time comes to merge that work in progress branch, is there a way to do it without dragging the ugly history along? (Is that what 'squash' is for?) | 02:11 |
| ← Murr left | 02:11 |
| → Murr joined | 02:12 |
| → jmcantre1 joined | 02:13 |
| ← jmcantrell left | 02:14 |
| ← __jmcantrell__ left | 02:16 |
| ← R2robot left | 02:17 |
|
mackerman
| More than one way to do things exists. | 02:18 |
| → jmcantrell joined | 02:18 |
|
mackerman
| Maybe read a !book and see which of the merge work flows seem reasonble. | 02:18 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: https://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 02:18 |
|
mackerman
| Regarding a squash, all the change becomes one diff, which loses the history and could be a large diff. | 02:20 |
| ← jmcantre1 left | 02:21 |
|
mackerman
| But the work in progress branch is not rewritten, and could be later deleted. | 02:21 |
| → __jmcantrell__ joined | 02:25 |
| ← subopt left | 02:25 |
| → subopt joined | 02:25 |
| → finn_elija joined | 02:26 |
| ← FinnElija left | 02:26 |
| finn_elija → FinnElija | 02:26 |
|
mackerman
| However it is cleaned up later, commit now. | 02:28 |
| → jmcantre1 joined | 02:28 |
|
mackerman
| Commited data can be recovered, untracked files cannot. | 02:28 |
| ← jmcantrell left | 02:28 |
| → jess joined | 02:29 |
| ← __jmcantrell__ left | 02:31 |
| ← subopt left | 02:32 |
| → christall joined | 02:33 |
| → jmcantrell joined | 02:33 |
| → __jmcantrell__ joined | 02:34 |
| ← jmcantre1 left | 02:37 |
| ← christall left | 02:38 |
| ← jmcantrell left | 02:38 |
| ← hackinghorn left | 02:40 |
| → jmcantrell joined | 02:41 |
| ← epolanski left | 02:42 |
| → jmcantre1 joined | 02:42 |
| → jmcantre2 joined | 02:43 |
| ← __jmcantrell__ left | 02:44 |
| → __jmcantrell__ joined | 02:46 |
| ← jmcantrell left | 02:46 |
| ← jmcantre1 left | 02:47 |
| ← jmcantre2 left | 02:49 |
|
Guest67
| Thanks for all of the info. I'm going to check out that book. | 02:51 |
| → jmcantrell joined | 02:54 |
| ← __jmcantrell__ left | 02:58 |
| ← Guest67 left | 03:01 |
| ← nyah left | 03:05 |
| → Xeago joined | 03:08 |
| → hackinghorn joined | 03:22 |
| → gnoo joined | 03:33 |
| ← ghost43 left | 03:36 |
| → ghost43 joined | 03:36 |
| → arcatech joined | 03:37 |
| ← howdoi left | 03:41 |
| → jazzy joined | 03:41 |
| ← vishal left | 04:09 |
| → vishal joined | 04:11 |
| ← zmt00 left | 04:13 |
| ← gast0n left | 04:13 |
| → zmt00 joined | 04:15 |
| → ByteHackr joined | 04:15 |
| ← The_Blode_ left | 04:18 |
| → mci64 joined | 04:22 |
| → The_Blode joined | 04:25 |
| → nattiestnate joined | 04:37 |
| ← shailangsa left | 04:45 |
| → ash_worksi joined | 04:47 |
| ← reprazent left | 04:48 |
| → reprazent joined | 04:50 |
| ← nattiestnate left | 04:52 |
| ← AnAverageHuman left | 04:53 |
| → __jmcantrell__ joined | 05:12 |
| ← jmcantrell left | 05:15 |
| → madewokherd` joined | 05:17 |
| ← madewokherd left | 05:20 |
| ← thiago left | 05:22 |
| ← hbautista_ left | 05:32 |
| → jmcantrell joined | 05:33 |
| → jmcantre1 joined | 05:36 |
| ← __jmcantrell__ left | 05:37 |
| ← jmcantrell left | 05:39 |
| → jmcantrell joined | 05:39 |
| → __jmcantrell__ joined | 05:40 |
| ← jmcantre1 left | 05:42 |
| ← jmcantrell left | 05:44 |
| → jmcantre1 joined | 05:44 |
| ← ash_worksi left | 05:45 |
| ← __jmcantrell__ left | 05:47 |
| ← ferdna left | 05:48 |
| → ishutin_ joined | 05:51 |
| → theoceaniscool joined | 06:02 |
| ← arcatech left | 06:04 |
| → AndrewYu joined | 06:05 |
| → ash_worksi joined | 06:07 |
| ← fling left | 06:09 |
| → makara joined | 06:11 |
| ← Murr left | 06:11 |
| → Murr joined | 06:12 |
| → rsrx joined | 06:17 |
| ← obiwahn left | 06:18 |
| ← jinsun left | 06:23 |
| → jinsun joined | 06:25 |
| → Lord_of_Life_ joined | 06:28 |
| ← Lord_of_Life left | 06:29 |
| Lord_of_Life_ → Lord_of_Life | 06:29 |
| ← ash_worksi left | 06:30 |
| → christall joined | 06:35 |
| ← rsrx left | 06:39 |
| ← christall left | 06:39 |
| → Gurkenglas joined | 06:44 |
| → alkino joined | 06:48 |
| → jetchisel joined | 06:54 |
| ← Vonter left | 06:55 |
| → rfuentess joined | 06:59 |
| → Vonter joined | 07:00 |
| ← unluckyshrubbery left | 07:04 |
| → skapata joined | 07:06 |
| ← skapata left | 07:06 |
| → skapata joined | 07:06 |
| ← TJ- left | 07:08 |
| → TomyWork joined | 07:10 |
| → srinidhi joined | 07:12 |
| → travisghansen3 joined | 07:13 |
| ← Codaraxis left | 07:14 |
| → mexen joined | 07:14 |
| ← travisghansen left | 07:14 |
| travisghansen3 → travisghansen | 07:14 |
| ← jpnurmi left | 07:14 |
| → jpnurmi joined | 07:15 |
| ← jpnurmi left | 07:15 |
| → jpnurmi joined | 07:16 |
| ← jimklimov left | 07:17 |
| → TJ- joined | 07:22 |
| → epolanski joined | 07:22 |
| ← jpnurmi left | 07:23 |
| → humanface joined | 07:24 |
| → jpnurmi joined | 07:24 |
| → lpapp joined | 07:27 |
|
lpapp
| hi, is there a way to leave the rebase todo list without rebasing? | 07:27 |
|
| even if I just enter it and leave normally, nothing changes in the content and commit messages, but I still get new hashes. This is not ideal. | 07:27 |
|
ikke
| make it empty | 07:28 |
| → christall joined | 07:29 |
|
lpapp
| ok, thanks | 07:30 |
|
| other thing, if I want to edit some line in previous commits and then in a later commit, those lines were moved into a different file | 07:30 |
|
| will git rebase --continue solve that automatically? | 07:30 |
|
| or should I edit the line-moving commit instead? Logically, it does not make sense, but if it is safer... | 07:30 |
| ← christall left | 07:33 |
| → christall joined | 07:35 |
| → reset joined | 07:37 |
| ← christall left | 07:39 |
| ← mci64 left | 07:40 |
|
ikke
| lpapp: git tries to follow changes across files | 07:47 |
|
| But you should verify | 07:47 |
| → Hax0r joined | 07:48 |
| → lgc joined | 07:51 |
| → daoudr joined | 07:59 |
| ← ano left | 08:07 |
| → ano joined | 08:08 |
| → mci64 joined | 08:08 |
| → FH_thecat joined | 08:11 |
| ← reprazent left | 08:16 |
| → zulutango joined | 08:17 |
| → reprazent joined | 08:18 |
| → mjbatty joined | 08:19 |
| ← AbleBacon left | 08:22 |
| → ekathva joined | 08:22 |
| ← mjbatty left | 08:24 |
| → mjbatty joined | 08:25 |
| Trieste_ → Trieste | 08:30 |
| ← madewokherd` left | 08:31 |
| ← pulse left | 08:32 |
| ← mjbatty left | 08:38 |
| → mjbatty joined | 08:38 |
| → Shentino_ joined | 08:38 |
| → nobody_ joined | 08:39 |
| ← Shentino left | 08:39 |
| ← mjbatty left | 08:40 |
| Shentino_ → Shentino | 08:42 |
| → randomuser joined | 08:43 |
| ← Betal left | 08:45 |
| ← dermato left | 08:49 |
| → dgcampea joined | 08:54 |
| → pyxal joined | 08:58 |
| ← mci64 left | 08:59 |
| ← pyxal left | 08:59 |
| → R2robot joined | 09:00 |
| → wender joined | 09:00 |
| ← computeiro left | 09:03 |
| ← YuGiOhJCJ left | 09:04 |
| guardian` → guardian | 09:04 |
| → YuGiOhJCJ joined | 09:05 |
| ← guardian left | 09:06 |
| → guardian joined | 09:06 |
| → unluckyshrubbery joined | 09:07 |
| ← FH_thecat left | 09:07 |
| → FH_thecat joined | 09:08 |
| ← jmcantre1 left | 09:14 |
| → dermato joined | 09:21 |
| → AnapodoPsalidaki joined | 09:23 |
| ← celphi left | 09:23 |
| → christall joined | 09:35 |
| ← codebam left | 09:36 |
| ← christall left | 09:40 |
| ← hnOsmium0001 left | 09:41 |
| → mjbatty joined | 09:50 |
| ← OnkelTem left | 09:50 |
| → roadie joined | 09:53 |
| → a6a45081-2b83 joined | 09:53 |
| ← Murr left | 10:11 |
| → Murr joined | 10:12 |
| ← cbreak left | 10:21 |
| ← nobody_ left | 10:28 |
| → cbreak joined | 10:30 |
| → darkbit joined | 10:33 |
| → shlomif joined | 10:36 |
| ← wender left | 10:41 |
| → computeiro joined | 10:42 |
| ← computeiro left | 10:42 |
| → computeiro joined | 10:43 |
| ← Hax0r left | 10:44 |
| ← ekathva left | 10:45 |
| ← reprazent left | 10:46 |
| → reprazent joined | 10:50 |
| ← EvilDMP left | 10:50 |
| → fnurkla joined | 10:52 |
| → rewrit3 joined | 11:02 |
| ← gnoo left | 11:03 |
| ← theoceaniscool left | 11:03 |
| → gnoo joined | 11:03 |
| ← BigShip left | 11:05 |
| → BigShip joined | 11:05 |
| ← reprazent left | 11:07 |
| ← igemnace left | 11:10 |
| → reprazent joined | 11:10 |
| → celphi joined | 11:12 |
| ← Gustavo6046 left | 11:14 |
| ← lgc left | 11:16 |
| ← roadie left | 11:29 |
| ← reprazent left | 11:30 |
| → christall joined | 11:31 |
| → reprazent joined | 11:31 |
| → Gustavo6046 joined | 11:32 |
| → lgc joined | 11:33 |
| → OnkelTem joined | 11:43 |
| → shailangsa joined | 11:44 |
| ← a6a45081-2b83 left | 11:45 |
| ← acidsys left | 11:47 |
| → LSD joined | 11:50 |
| → Fernando-Basso joined | 11:53 |
| → roadie joined | 11:55 |
| → jwillikers joined | 11:56 |
| ← christall left | 12:00 |
| ← Murr left | 12:11 |
| → Murr joined | 12:12 |
| → vysn joined | 12:13 |
| → christall joined | 12:16 |
| ← vysn left | 12:24 |
| → akshay joined | 12:24 |
|
akshay
| hi | 12:24 |
| ← akshay left | 12:25 |
| → vysn joined | 12:26 |
| → AbleBacon joined | 12:28 |
| ← keypusher left | 12:29 |
| → AnAverageHuman joined | 12:29 |
| → darkxploit joined | 12:34 |
| → pulse joined | 12:35 |
| → fling joined | 12:37 |
| → nyah joined | 12:40 |
| ← shailangsa left | 12:40 |
| ← roadie left | 12:40 |
| ← christall left | 12:45 |
| → christall joined | 12:46 |
| ← blaklistd left | 12:51 |
| → durham joined | 12:51 |
| → blaklistd joined | 12:52 |
| → EvilDMP joined | 12:53 |
| ← durham left | 12:56 |
| → durham joined | 12:57 |
| → rsx joined | 13:11 |
| → ThorMojito joined | 13:13 |
| ← gnoo left | 13:14 |
| → wender joined | 13:15 |
| → nobody_ joined | 13:16 |
| ← computeiro left | 13:17 |
| ← Xenguy left | 13:26 |
| ← elastic_dog left | 13:28 |
| → pulse_ joined | 13:29 |
| → gnoo joined | 13:29 |
| ← pulse left | 13:32 |
| → Guest32 joined | 13:33 |
| ← Guest32 left | 13:34 |
| → elastic_dog joined | 13:34 |
| ← lgc left | 13:41 |
| ← reprazent left | 13:42 |
| → reprazent joined | 13:43 |
| → dcpc007 joined | 13:45 |
| ← nvmd left | 13:45 |
| → natrys joined | 13:49 |
| LSD → acidsys | 13:56 |
| → ash_worksi joined | 13:56 |
| → trilobite joined | 14:01 |
| ← reprazent left | 14:02 |
| ← cbreak left | 14:03 |
| → reprazent joined | 14:04 |
| → cbreak joined | 14:05 |
| → computeiro joined | 14:12 |
| ← humanface left | 14:13 |
| ← wender left | 14:14 |
| → humanface joined | 14:26 |
| ← reprazent left | 14:26 |
| ← mexen left | 14:26 |
| → reprazent joined | 14:28 |
| → thiago joined | 14:28 |
| ← pulse_ left | 14:29 |
| → roadie joined | 14:29 |
| ← roadie left | 14:31 |
| → keypusher joined | 14:33 |
| ← average left | 14:33 |
| → oriba joined | 14:38 |
| → rsrx joined | 14:41 |
| ← AnAverageHuman left | 14:42 |
| ← axisys_ left | 14:51 |
| → nvmd joined | 14:53 |
| ← jetchisel left | 14:56 |
| ← rsrx left | 14:58 |
| → AnAverageHuman joined | 14:58 |
| → jetchisel joined | 14:58 |
| ← jetchisel left | 15:04 |
| → axisys joined | 15:06 |
| ← Shentino left | 15:09 |
| → Shentino joined | 15:10 |
| ← makara left | 15:11 |
| → The_Blode_ joined | 15:17 |
| ← The_Blode left | 15:18 |
| ← ByteHackr left | 15:18 |
| → roadie joined | 15:23 |
| → Bayes joined | 15:29 |
| ← Bayes left | 15:30 |
| → Bayes joined | 15:30 |
| ← fnurkla left | 15:32 |
| ← Gustavo6046 left | 15:33 |
| → madewokherd joined | 15:33 |
| → djibb joined | 15:36 |
| ← ano left | 15:37 |
|
djibb
| Hi ! I've made some mistakes... :) MY branch (which is a fork) has some code i don't want anymore. I want to scratch and go with "original" branch... how can do this ? | 15:38 |
| → ano joined | 15:44 |
| ← darkbit left | 15:44 |
|
Fernando-Basso
| git reset --hard <remote>/original-branch. USE AT YOUR OWN RISK. | 15:46 |
|
| Resets are dangerous if used incorrectly. | 15:47 |
|
| djibb: Ex: git reset --hard origin/foo. Now your local foo is the same as origin/foo. | 15:48 |
| ← stkrdknmibalz left | 15:48 |
| ← jazzy left | 15:49 |
| → average joined | 15:50 |
|
ikke
| Instead, you could also use: git checkout -B <branchname> <branchname>@{upstream} | 15:52 |
|
jinsun
| where do you find out about these weird magic things like @{upsteam} ? | 15:55 |
|
Fernando-Basso
| https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitrevisions.html | 15:56 |
|
| https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-rev-parse.html | 15:57 |
|
jinsun
| cool, thanks | 15:58 |
|
Fernando-Basso
| It takes practice and time to learn how to apply stuff from a formal documentation, spec page into actual, real and useful daily commands. I'm not there myself yet. | 15:59 |
|
| https://git-scm.com/docs/gittutorial -- https://git-scm.com/docs/gittutorial-2 -- https://git-scm.com/docs/gitcore-tutorial | 16:01 |
|
| These are also extremely useful, and goes into some more advanced stuff (with more links to other nice and/or advanced stuff). | 16:01 |
| ← YuGiOhJCJ left | 16:01 |
| ← durham left | 16:04 |
| → durham joined | 16:04 |
| → orbyt joined | 16:07 |
|
Fernando-Basso
| And since we are at it, this post is also nice: https://fabiensanglard.net/git_code_review/index.php | 16:08 |
|
jinsun
| nice, I've just got enough basics to not mess things up when working with git, but I didn't really think about git can automatically do more things like these | 16:10 |
| ← rsx left | 16:10 |
| → gh34 joined | 16:11 |
| ← Murr left | 16:11 |
| → Murr joined | 16:11 |
| ← rfuentess left | 16:14 |
| → Lunatrius` joined | 16:15 |
| ← Lunatrius left | 16:15 |
| Lunatrius` → Lunatrius | 16:15 |
| ← dermato left | 16:16 |
| ← ano left | 16:21 |
|
Fernando-Basso
| There is also some nice stuff we can enable in the shell to give more information about the status of our local repo: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh | 16:28 |
| → dermato joined | 16:28 |
|
Fernando-Basso
| We get it for free just for having git installed. We just need to enable those. | 16:29 |
|
| https://gitlab.com/fernandobasso/dotfiles/-/blob/master/bash_incl/bash-prompts.sh#L14-25 | 16:30 |
| → ano joined | 16:39 |
| ← vysn left | 16:47 |
|
djibb
| works well... | 16:47 |
| ← djibb left | 16:47 |
| → pulse joined | 16:50 |
| ← gnoo left | 16:54 |
| ← durham left | 16:54 |
| → durham joined | 16:54 |
| ← christall left | 16:57 |
| → christall joined | 16:57 |
| → wender joined | 16:59 |
| ← christall left | 17:00 |
| ← nvmd left | 17:01 |
| ← computeiro left | 17:02 |
| → christall joined | 17:02 |
| ← alkino left | 17:03 |
| → hubble joined | 17:03 |
| ← OnkelTem left | 17:05 |
| ← hubble left | 17:06 |
| → Betal joined | 17:06 |
| ← reprazent left | 17:08 |
| → reprazent joined | 17:10 |
| ← ash_worksi left | 17:11 |
| → zebrag joined | 17:13 |
| ← Betal left | 17:14 |
| → Betal joined | 17:19 |
| → Guest20 joined | 17:20 |
| ← Guest20 left | 17:21 |
| → Guest20 joined | 17:21 |
| ← nobody_ left | 17:34 |
| → Samian joined | 17:34 |
| ← daoudr left | 17:37 |
| → daoudr joined | 17:37 |
| → daoudr_ joined | 17:40 |
| ← daoudr left | 17:40 |
| ← TomyWork left | 17:41 |
| → makara joined | 17:42 |
| → EvilDMP_ joined | 17:43 |
| ← Guest20 left | 17:45 |
| → Guest20 joined | 17:45 |
| → daoudr__ joined | 17:46 |
| ← daoudr_ left | 17:46 |
| ← EvilDMP left | 17:47 |
| ← Guest20 left | 17:47 |
| → Guest20 joined | 17:47 |
| ← ghost43 left | 17:48 |
| → ghost43 joined | 17:48 |
| ← EvilDMP_ left | 17:49 |
| ← crabbedhaloablut left | 17:49 |
| → crabbedhaloablut joined | 17:50 |
| → Narrat joined | 17:50 |
| ← epolanski left | 17:56 |
| → DoofusCanadensis joined | 17:59 |
|
Helmholtz
| Is there a way to submit a PR without cloning? The repo size is huge | 18:00 |
|
DoofusCanadensis
| see if the web service is providing a UI to do so? | 18:01 |
|
ikke
| Helmholtz: in moth cases, you should be able to use git clone --depth=<n> | 18:02 |
| ← daoudr__ left | 18:03 |
| → daoudr__ joined | 18:03 |
| ← shlomif left | 18:08 |
| → vysn joined | 18:08 |
|
Helmholtz
| ikke, thanks | 18:10 |
|
| worked | 18:10 |
| ← pulse left | 18:18 |
| ← FFY00 left | 18:22 |
| → FFY00 joined | 18:22 |
| → CSWookie joined | 18:23 |
|
thiago
| that woudln't solve the problem of breadth, though | 18:23 |
|
| some repositories are huge because they have a lot of files | 18:23 |
|
ikke
| nod | 18:24 |
|
| but in this case apparently it did | 18:24 |
| → masber joined | 18:33 |
| → fnurkla joined | 18:36 |
| → pulse joined | 18:38 |
| ← rossome left | 18:40 |
| → theoceaniscool joined | 18:40 |
| → ash_worksi joined | 18:44 |
| → rossome joined | 18:46 |
| → EvilDMP joined | 18:47 |
| → stkrdknmibalz joined | 18:49 |
| → hnOsmium0001 joined | 18:50 |
| → FFY00_ joined | 18:51 |
|
ash_worksi
| *THIS* is git | 18:53 |
| ← Guest20 left | 18:53 |
|
ash_worksi
| I asked in the wrong channel | 18:53 |
|
| :P | 18:53 |
| ← vysn left | 18:53 |
| ← FFY00 left | 18:54 |
| → Guest20 joined | 18:56 |
| → jstein joined | 18:58 |
| ← FFY00_ left | 18:58 |
| → molt joined | 18:59 |
| → codebam joined | 18:59 |
| → FFY00 joined | 19:01 |
| → adanwan joined | 19:06 |
| → computeiro joined | 19:07 |
| ← Guest20 left | 19:09 |
| ← wender left | 19:10 |
| ← DoofusCanadensis left | 19:10 |
| → Guest20 joined | 19:12 |
| ← masber left | 19:14 |
| → auri joined | 19:15 |
| ← unluckyshrubbery left | 19:16 |
| ← Guest20 left | 19:21 |
| → m0viefreak joined | 19:21 |
| ← CSWookie left | 19:23 |
| → howdoi joined | 19:24 |
| ← orbyt left | 19:30 |
|
ash_worksi
| I have like 6 files staged for commit | 19:30 |
|
| I don't know exactly how I go to this point, but I was wondering if I could commit each file with a different message? | 19:31 |
|
ikke
| git reset | 19:31 |
|
| git stage each file and commit | 19:31 |
|
ash_worksi
| so I can't while they're staged together | 19:31 |
|
imMute
| ash_worksi: git reset unstages them | 19:32 |
|
ikke
| git commit <filename> | 19:33 |
| → mci64 joined | 19:37 |
|
ash_worksi
| ikke: oh, while staged, I can just git commit <filename> ? | 19:38 |
|
ikke
| yes | 19:38 |
|
ash_worksi
| ikke: they're basically all different | 19:38 |
|
ikke
| git will commit just the contents of the files that you specify and ignore what's staged | 19:38 |
|
ash_worksi
| gmmm | 19:39 |
|
| so, it denied me because I'm in the middle of a merge | 19:40 |
|
| which I didn't think was a problem... I jumped into the files with conflicts and removed the <<<<<<<< stuff | 19:40 |
|
ikke
| If you are in a merge conflict, you should first finish that | 19:40 |
|
ash_worksi
| then I `git add`ed them | 19:40 |
|
| so... git reset? | 19:40 |
|
| I mean, I don't know what else to do about the conflicts | 19:41 |
|
| `git commit` to conclude merge | 19:41 |
|
| but but but | 19:41 |
|
ikke
| yes | 19:41 |
| ← mci64 left | 19:42 |
|
ash_worksi
| I don't want those files all under one commit (they were apparently previously staged) | 19:42 |
|
imMute
| you should commit merge conflict fixes as part of the merge commit, not separate commits. | 19:42 |
|
ikke
| It does not make sense to merge, run into conflicts, and then commit each file separately | 19:42 |
|
ash_worksi
| ikke: I mean, I did `git add A B C; "oh wait"; `git pull`; *conflicts*` | 19:43 |
|
j416
| you should not commit merge conflicts | 19:43 |
|
| wat | 19:43 |
|
ash_worksi
| so A B C are not part of the conflict but are staged | 19:43 |
|
j416
| ah, fixes | 19:43 |
|
| j416 goes back to under the rock | 19:43 |
|
ash_worksi
| j416: is there room under there for 2? | 19:43 |
|
j416
| no, go back to your merge situation | 19:44 |
|
ash_worksi
| T_T | 19:44 |
|
| ikke: ? | 19:44 |
|
ikke
| git merge --abort | 19:44 |
| → DoofusCanadensis joined | 19:45 |
| → gothicserpent joined | 19:51 |
| DoofusCanadensis → tang^ | 19:55 |
| ← randomuser left | 19:57 |
| → beshr joined | 19:59 |
| ← fnurkla left | 20:01 |
| → fnurkla joined | 20:02 |
|
ghostbuster
| is there a way to do the following in a cleaner way? git log --oneline -- some/sub/dir | head -n1 | awk '{print $1}' | 20:03 |
|
| ie. i want to obtain the hash of the latest commit that touched a subdir of the repo | 20:03 |
|
| i'm guessing there's an incantation of git rev-parse that will do it but i have not had much luck understanding the man page | 20:04 |
|
ikke
| git rev-list --format="%H" -- some/sub/dir | 20:04 |
|
ghostbuster
| thank you :) | 20:05 |
|
| hmm git rev-list is saying it requires a commit-id | 20:05 |
|
ikke
| --all | 20:05 |
|
| or HEAD | 20:06 |
|
ghostbuster
| ah so i still need to pipe into those other commands? it prints a large list of commits and hashes | 20:06 |
| ← gothicserpent left | 20:08 |
|
ikke
| hmm | 20:08 |
|
| just rev-list HEAD some/sub/dir | 20:09 |
|
| the default for rev-list is to just print commit hashes | 20:09 |
| ← oriba left | 20:09 |
|
imMute
| ikke: sounds like he wants "-1" to only get a single (the latest) commit | 20:10 |
|
ghostbuster
| ah --max-count=1 | 20:10 |
|
| i think i've got it now, thank you | 20:10 |
| ← mjbatty left | 20:12 |
| ← atrigent left | 20:14 |
| → atrigent_ joined | 20:14 |
| → mjbatty joined | 20:16 |
| → Gustavo6046 joined | 20:18 |
| → jmcantrell joined | 20:21 |
| ← mjbatty left | 20:26 |
| ← baroobob left | 20:27 |
| → __jmcantrell__ joined | 20:30 |
| → jmcantre1 joined | 20:32 |
| ← jmcantrell left | 20:33 |
| ← __jmcantrell__ left | 20:35 |
| → jmcantrell joined | 20:37 |
| ← jmcantre1 left | 20:40 |
| → nobody_ joined | 20:43 |
| ← roadie left | 20:45 |
| ← ecs left | 20:49 |
| → ecs joined | 20:49 |
| ← Frogging101 left | 20:50 |
| ← earthbreaker left | 20:50 |
| ecs → Guest780 | 20:50 |
| → Frogging101 joined | 20:50 |
| ← mackerman left | 20:50 |
| Guest780 → ecs | 20:51 |
| ← ecs left | 20:52 |
| → ecs joined | 20:52 |
| → dzho joined | 20:52 |
| → em joined | 20:53 |
| → tureba joined | 20:53 |
| → mackerman joined | 20:54 |
| → earthbreaker joined | 20:54 |
| → xikkub joined | 21:00 |
| → mci64 joined | 21:01 |
| ← madewokherd left | 21:04 |
| ← kurtthemaker left | 21:06 |
| → roadie joined | 21:11 |
| → kurtthemaker joined | 21:12 |
| ← roadie left | 21:16 |
| ← durham left | 21:18 |
| ← EvilDMP left | 21:20 |
| → Hax0r joined | 21:29 |
| ← makara left | 21:30 |
| ← Bayes left | 21:30 |
| ← R2robot left | 21:30 |
| ← humanface left | 21:37 |
| → madewokherd joined | 21:40 |
| → roadie joined | 21:41 |
| ← ackyshake left | 21:43 |
| ← fnurkla left | 21:43 |
| ← Hax0r left | 21:45 |
| ← roadie left | 21:50 |
| ← natrys left | 21:50 |
| → pc_nublet joined | 21:52 |
|
pc_nublet
| Is there a way to 'git push' while specifically ignoring some files (eg. PDFs)? | 21:52 |
| → cdown_ joined | 21:55 |
| → R2robot joined | 21:57 |
|
tang^
| git push can restrict to commits at its finest detail. not files within a commit | 21:57 |
| ← cdown left | 21:58 |
| cdown_ → cdown | 21:58 |
|
nedbat
| pc_nublet: do you want to always ignore them? | 21:58 |
| ← keypusher left | 22:02 |
| → natrys joined | 22:03 |
|
pc_nublet
| nedbat, I'm trying to migrate GitLab repo to GitHub. Both GH & GL's import/mirror GUI func failed. I tried it manually (git clone --mirror [repo.git], cd [repo], git push --no-verify [newrepo.git]), and the process couldn't complete, as it triggers GitHub's 100mb file limit (even tho the actual PDFs are all in the ~10 mb range). | 22:11 |
| → gast0n joined | 22:12 |
| ← gh34 left | 22:15 |
| ← Gustavo6046 left | 22:15 |
| → roadie joined | 22:16 |
| → __jmcantrell__ joined | 22:18 |
| ← jwillikers left | 22:21 |
| ← jmcantrell left | 22:21 |
| ← roadie left | 22:25 |
| ← Samian left | 22:25 |
| ← xx left | 22:28 |
| → jmcantrell joined | 22:33 |
| → keypusher joined | 22:33 |
| → Gustavo6046 joined | 22:34 |
| ← __jmcantrell__ left | 22:36 |
| → jmcantre1 joined | 22:36 |
| ← jmcantrell left | 22:39 |
| ← christall left | 22:45 |
| ← Narrat left | 22:45 |
| → christall joined | 22:45 |
| ← christall left | 22:48 |
| → christall joined | 22:48 |
| → roadie joined | 22:51 |
| → jmcantrell joined | 22:52 |
| ← frobnic left | 22:54 |
| ← m0viefreak left | 22:55 |
| ← jmcantre1 left | 22:55 |
| ← Arokh left | 22:55 |
| → Xenguy joined | 22:56 |
| → Arokh joined | 22:56 |
| → m0viefreak joined | 22:56 |
| → frobnic joined | 22:59 |
| ← roadie left | 23:00 |
| ← natrys left | 23:04 |
| → milosz__ joined | 23:13 |
| ← m0viefreak left | 23:15 |
| → forgotmynick joined | 23:16 |
| → m0viefreak joined | 23:16 |
| ← frobnic left | 23:16 |
| ← Arokh left | 23:16 |
| → frobnic joined | 23:17 |
| → igemnace joined | 23:17 |
| → Arokh joined | 23:17 |
| ← milosz_ left | 23:17 |
| → __jmcantrell__ joined | 23:23 |
| ← jmcantrell left | 23:25 |
| ← darkxploit left | 23:27 |
| → darkxploit joined | 23:31 |
| ← christall left | 23:32 |
| → jmcantrell joined | 23:35 |
| ← __jmcantrell__ left | 23:38 |
| → __jmcantrell__ joined | 23:40 |
| → jmcantre1 joined | 23:41 |
| → christall joined | 23:42 |
| ← jmcantrell left | 23:43 |
| ← __jmcantrell__ left | 23:45 |
| ← TJ- left | 23:46 |
| → TJ- joined | 23:47 |
| ← mthall left | 23:48 |
| → birkoff joined | 23:49 |
| ← birkoff left | 23:49 |
| → birkoff joined | 23:49 |
| → mthall joined | 23:50 |
| → slaughtr joined | 23:54 |
| ← dieggsy left | 23:54 |
| ← Fernando-Basso left | 23:54 |
| ← AnisBarghouthi[m left | 23:54 |
| ← silvio[m] left | 23:54 |
| ← Ody[m] left | 23:54 |
| ← s0dyy[m] left | 23:55 |
| ← pinage404 left | 23:55 |
| ← erochow[hehim][m left | 23:55 |
| ← dittid[m] left | 23:55 |
| ← viral_mutant[m] left | 23:55 |
| ← lockna left | 23:55 |
| ← Guest526 left | 23:55 |
| ← tuxayo left | 23:55 |
| ← Helmholtz left | 23:55 |
| ← kadoban left | 23:55 |
| ← smuise[m] left | 23:55 |
| ← cameron[m] left | 23:55 |
| ← morguldir left | 23:55 |
| ← t_unix[m] left | 23:55 |
| ← Rubin left | 23:55 |
| ← Industrial[m] left | 23:55 |
| ← lasr[m] left | 23:55 |
| ← heftig[m] left | 23:55 |
| ← ServerStatsDisco left | 23:55 |
| ← psydroid left | 23:55 |
| ← elemongw[m] left | 23:55 |
| ← cpackham[m] left | 23:55 |
| ← unclechu left | 23:55 |
| ← ronny left | 23:55 |
| ← slaughter left | 23:55 |
| ← zfnmxt left | 23:55 |
| ← Vipulk left | 23:55 |
| ← shokohsc left | 23:58 |
| → shokohsc joined | 23:59 |