Re: [petsc-dev] Commit squashing in MR
If you're in Emacs, Magit (https://github.com/magit/magit) is excellent for much the same things, and works over remote (i.e., I'm editing "ssh:thathost:path/to/file.c" and invoke magit). There's also a (partial) magit clone for vscode. https://marketplace.visualstudio.com/items?itemName=kahole.magit Patrick Sanan <[email protected]> writes:
I have also been enjoying using lazygit (thanks, Lisandro, for the tip!). It's a similar sort of thing but runs in the terminal. I find it very useful for those things where the command line git tool falls down (staging parts of files, browsing large sets of changes), and I like that I don't have to bother with X windows to use something like gitk on my remote machine.
https://github.com/jesseduffield/lazygit
The only wrinkles I ran into using this are that is seems to assume you have a somewhat-recent "git" executable for some of the fancier features (like merging or rearranging commits without using git rebase -i).
Am 03.03.2021 um 21:02 schrieb Jacob Faibussowitsch <[email protected]>:
'gitk' is easier to read [for me] than 'git log --graph'
Where was this my entire life⦠best kept git secret!
Best regards,
Jacob Faibussowitsch (Jacob Fai - booss - oh - vitch) Cell: (312) 694-3391
On Mar 3, 2021, at 13:55, Satish Balay <[email protected] <mailto:[email protected]>> wrote:
'gitk' is easier to read [for me] than 'git log --graph'
Satish
On Wed, 3 Mar 2021, Jacob Faibussowitsch wrote:
git: 'graph' is not a git command. See 'git --help'.
I have it as an alias:
graph = !git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
Best regards,
Jacob Faibussowitsch (Jacob Fai - booss - oh - vitch) Cell: (312) 694-3391
On Mar 3, 2021, at 13:50, Mark Adams <[email protected] <mailto:[email protected]>> wrote:
On Tue, Mar 2, 2021 at 10:02 PM Junchao Zhang <[email protected] <mailto:[email protected]> <mailto:[email protected] <mailto:[email protected]>>> wrote: I am a naive git user, so I use interactive git rebase. Suppose I am on the branch I want to modify,
1) Use git graph to locate an upstream commit to be used as the base $ git graph
Humm ....
14:49 adams/cusparse-lu-landau= /gpfs/alpine/csc314/scratch/adams/petsc$ git --version git version 2.20.1 14:49 adams/cusparse-lu-landau= /gpfs/alpine/csc314/scratch/adams/petsc$ git graph git: 'graph' is not a git command. See 'git --help'.
The most similar commands are branch grep
participants (1)
-
Jed Brown