diff-so-fancy
Git
Our great sponsors
diff-so-fancy | Git | |
---|---|---|
22 | 285 | |
17,077 | 49,964 | |
0.6% | 2.0% | |
6.4 | 10.0 | |
10 days ago | about 12 hours ago | |
Perl | C | |
MIT License | GNU General Public License v3.0 or later |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
diff-so-fancy
-
Difftastic, a structural diff tool that understands syntax
The diff itself is impressive, but in terms of styling I still prefer diff-so-fancy[1]. It's easier to read at a glance.
[1]: https://github.com/so-fancy/diff-so-fancy/
-
How to improve the readability of diffs? Preferably in Terminal, but a desktop application would be acceptable too
I don't have much hope for this being improved anytime soon in diff-so-fancy given this issue, so I'm wondering if there's something else I can use in Terminal that would allow me to have an experience like GitLab. If that's not possible and I have to rely on a desktop application, that would be acceptable too.
- How to see word-diff and moved lines?
-
Git Learnt
This is actually one that's really easy to write and remember but I hate typing and I run it all the time, so I've aliased it down to gd for git-diff. Also I use diff-so-fancy to make the output of my diffs look frickin sweet and I suggest you do the same.
-
diff: can I increase highlighting of a file name?
I recommend a tool like diff-so-fancy with some custom colors. You will never want to go back to vanilla diffs.
-
TIL: diff-so-fancy; and some funky git config
I just discovered diff-so-fancy, and very nice it is too. I immediately added it to my standard git config, which is semi-automatically installed on every machine I use. However, I've not (yet) installed diff-so-fancy on all the machines I use, and for those platforms for which it's not packaged I probably won't bother installing it from source.
-
Suggestion on how to set up neovim as a diff/merge tool for git with dir-diff in mind
I recently switched to diff-so-fancy for use in the terminal with the following configuration:
-
Let's add Git userdiff defaults for Perl and Perl 6
As the primary author of diff-so-fancy, which is entirely Perl, I fully support this endeavor.
-
A Better Git Diff with Delta
Instead of delta https://github.com/dandavison/delta (shown in the previous video), I've also used diff-so-fancy https://github.com/so-fancy/diff-so-fancy and I've heard difftastic is good as well https://github.com/Wilfred/difftastic Do you use one of those or something else?
-
Post your favorite programs
diff-so-fancy - syntax highlighting for diffs, including highlighting just the part of the line that changed: diff -ru ... | diff-so-fancy | less -R
Git
- GitHub Git Mirror Down
- Four ways to solve the "Remote Origin Already Exists" error.
-
So You Think You Know Git – Git Tips and Tricks by Scott Chacon
Boy, I can't find this either (but also, the kernel mailing list is _really_ difficult to search). I really remember Linus saying something like "it's not a real SCM, but maybe someone could build one on top of it someday" or something like that, but I cannot figure out how to find that.
You _can_ see, though, that in his first README, he refers to what he's building as not a "real SCM":
https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23...
- Maintain-Git.txt
-
Git Commit Messages by Jeff King
Here is the direct link, as HN somehow removes the query string: https://github.com/git/git/commits?author=peff&since=2023-10...
- Git commit messages by Jeff King
- My favourite Git commit (2019)
-
Do we think of Git commits as diffs, snapshots, and/or histories?
I understand all that.
I'm saying, if you write a survey and one of the possible answers is "diff", but you don't clearly define what you mean by "diff", then don't be surprised if respondents use any reasonable definition that makes sense to them. Ask an ambiguous question, get a mishmash of answers.
The thing that Git uses for packfiles is called a "delta" by Git, but it's also reasonable to call it a "diff". After all, Git's delta algorithm is "greatly inspired by parts of LibXDiff from Davide Libenzi"[1]. Not LibXDelta but LibXDiff.
Yes, how Git stores blobs (using deltas) is orthogonal to how Git uses blobs. But while that orthogonality is useful for reasoning about Git, it's not wrong to think of a commit as the totality of what Git does, including that optimization. (Some people, when learning Git, stumble over the way it's described as storing full copies, think it's wasteful. For them to wrap their heads around Git, they have to understand that the optimization exists. Which makes sense because Git probably wouldn't be practical if it lacked that optimization.)
The reason I'm bringing all this up is, if you're trying to explain Git, which is what the original article is about, then it's very important to keep in mind that someone who is learning Git needs to know what you mean when you say "diff". Most people who already know Git would tend to gravitate toward the definition of "diff" that you're assuming (the thing that Git computes on the fly and never stores), but people who already know Git aren't the target audience when you're teaching Git.
---
[1] https://github.com/git/git/blob/master/diff-delta.c
-
The State of Merging Technology
Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNote... ?
-
The bash book to rule them all
Yes, but you are referring to standalone scripts, not functions defined within a Bash script.
Compare for example the following helper code used for git command completion inside Bash and inside PowerShell.
Bash: https://github.com/git/git/blob/master/contrib/completion/gi...
What are some alternatives?
delta - A syntax-highlighting pager for git, diff, and grep output
scalar - Scalar: A set of tools and extensions for Git to allow very large monorepos to run on Git without a virtualization layer
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
PineappleCAS - A generic computer algebra system targeted for the TI-84+ CE calculators
git-split-diffs - Syntax highlighted side-by-side diffs in your terminal
Subversion - Mirror of Apache Subversion
git-extras - GIT utilities -- repo summary, repl, changelog population, author commit percentages and more
vscode-gitlens - Supercharge Git inside VS Code and unlock untapped knowledge within each repository — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more
vscode-angular-snippets - Angular Snippets for VS Code
linux - Linux kernel source tree
normalizr - Normalizes nested JSON according to a schema
chromebrew - Package manager for Chrome OS [Moved to: https://github.com/chromebrew/chromebrew]