When viewing the log, if a log entry has been selected, the cursor is in the diff for that entry. If I type "C-x o" to switch the cursor back to the log entry list, I can then use "M-n" and "M-p" to move the selected log entry. When I do this, the diff changes to match. Being able to scroll through log history in diff format is one of my favorite features.
Hi Andrew, how do you get this behaviour? In my case when I go back to the log entry list and move to another log entry I've to press Enter or Space to view the diff this other commit represents, the diff window doesn't update 'automagically'.
@@antoniocorbibellot6532 They key is to move the cursor with M-n (next, forward) and M-p (previous, backward). Then the diff changes with each keypress.
@@AndrewEsh Not for me. As I told before, after pressing (n. M-n, p or M-p) in the log buffer I've to press enter or space to get the diff...It must be some magit setting that I've not configured.
You should do an ediff tutorial. It seems simple but I still don’t understand half the commands. This is the key area where mastering the right tool makes a huge difference.
Thanks for the video upload. Magit looks like a real game changer, but there is a lot to learn and I keep going back to the terminal. But it's perseverance, I guess.
Only if you haven't pushed the branch already. Once you push the branch, you will always have to force push the next time if you rebase and any of the existing commits have been modified, even if it was just to replay them on top of a new base commit.
@@SystemCrafters Not sure which push/pull scenario you end up in, but "git pull --rebase" will rebase the changed you did locally since last common ancestor with your upstream branch (in other words - when you last pushed) on top of the new head on the upstream branch. Those change should only be local to you and rebasing them will just do as pretending you just did a fresh checkout of the upstream branch and made all those changes on top of that. It's true that rebasing in general (from an arbitary point in your history) will potentiall rewrite stuff already pushed, but with "git pull --rebase" you will only rewrite stuff not already pushed.
When viewing the log, if a log entry has been selected, the cursor is in the diff for that entry. If I type "C-x o" to switch the cursor back to the log entry list, I can then use "M-n" and "M-p" to move the selected log entry. When I do this, the diff changes to match. Being able to scroll through log history in diff format is one of my favorite features.
That's awesome, I hadn't seen that before!
Hi Andrew, how do you get this behaviour? In my case when I go back to the log entry list and move to another log entry I've to press Enter or Space to view the diff this other commit represents, the diff window doesn't update 'automagically'.
@@antoniocorbibellot6532 They key is to move the cursor with M-n (next, forward) and M-p (previous, backward). Then the diff changes with each keypress.
It looks as though "n" and "p" also work. Whatever calls magit-section-forward and magit-section-backward.
@@AndrewEsh Not for me. As I told before, after pressing (n. M-n, p or M-p) in the log buffer I've to press enter or space to get the diff...It must be some magit setting that I've not configured.
ufff This is the killing package, I love magit
You should do an ediff tutorial. It seems simple but I still don’t understand half the commands. This is the key area where mastering the right tool makes a huge difference.
The command window is wonderfull !
Another fantastic video! Looking forward to watching the third one.
David, thanks for the content. It is really good! I have watched multiple hours of your content. Thank you very much!
Thanks for the video upload. Magit looks like a real game changer, but there is a lot to learn and I keep going back to the terminal. But it's perseverance, I guess.
It takes some time before Magit feels comfortable but once you reach that point you will never want to use the git command line again!
Great tutorial. Thanks!
More Magit and Org Roam videos please!
Next Org Roam video is in development, Magit after that!
Great work as always.
Thank you so much for this great video.please make video about Gnu Stow.
lucky you ;) ruclips.net/video/gibqkbdVbeY/видео.html
Great walkthrough.
Gods work right here
Great, love your work! Thanks
Just what I needed, thank you!
command-log posframe is nice!
I need to use it more often, for sure
Great video even after eight month later!
Is resolving merge conflicts discussed at all? I cannot find it in the timestamps
👍👍
How correct do "git pull" on one host after did "git push --force" on another host?
Actually ... using rebase does not force you to force-push. In fact ... if often ensures that your eventual push will be fast-forward.
Only if you haven't pushed the branch already. Once you push the branch, you will always have to force push the next time if you rebase and any of the existing commits have been modified, even if it was just to replay them on top of a new base commit.
@@SystemCrafters Not sure which push/pull scenario you end up in, but "git pull --rebase" will rebase the changed you did locally since last common ancestor with your upstream branch (in other words - when you last pushed) on top of the new head on the upstream branch.
Those change should only be local to you and rebasing them will just do as pretending you just did a fresh checkout of the upstream branch and made all those changes on top of that.
It's true that rebasing in general (from an arbitary point in your history) will potentiall rewrite stuff already pushed, but with "git pull --rebase" you will only rewrite stuff not already pushed.
You don't have to use P (capital) to push, regular p also works (saves a shift press every time)
In most Magit buffers, "p" moves to the previous section.
How to do git cherry-pick in magit?
Once you go magit you never git back
magit is the only way I use git!
Is that a pun at 35:03-35:06?