utils-code/paulirish.git-recent
1
0
Fork 0
mirror of https://github.com/paulirish/git-recent.git synced 2026-09-10 07:26:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
Paul Irish 2025-07-04 12:28:51 -07:00
parent 6b98834931 6322cde317
commit 2e5e69fe30
No known key found for this signature in database
GPG key ID: 047F4C1E64AD96C0
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
git-recent
View file

@ -33,9 +33,10 @@ commits_format="%C(red bold)%h %C(bold blue)%an %C(bold green)%ad %Creset%s"
# TODO: some branch mgmt approaches don't work well with this. And may prefer `git log --pretty=format:%H --merges -n 1`. See https://github.com/paulirish/git-recent/issues/28
diff_base=$(cat $(git rev-parse --show-cdup).git/refs/remotes/origin/HEAD | awk '{print $2}')
uniqcommits_cmd="branch_name=\$(echo {1} | cut -d' ' -f1) git log --date=human --color=always --format='$commits_format' --no-merges $diff_base..\$branch_name"
# the cut drops anything after the branch name, like the Chromium link. These commands need to work in all shells (bash, fish, etc)
uniqcommits_cmd="git log --date=human --color=always --format='$commits_format' --no-merges $diff_base..\$(echo {1} | cut -d' ' -f1)"
diffbranch_cmd="git diff --color=always $diff_base...\$(echo {1} | cut -d' ' -f1)"
diffbranch_cmd="branch_name=\$(echo {1} | cut -d' ' -f1) git diff --color=always $diff_base...\$branch_name"
# Progressive enhancement if you have delta or diff-so-fancy
if command -v delta >/dev/null 2>&1; then
diffbranch_cmd="$diffbranch_cmd | delta"

7
package-lock.json generated
View file

@ -1,15 +1,16 @@
{
"name": "git-recent",
"version": "2.0.3",
"version": "2.0.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "git-recent",
"version": "2.0.3",
"version": "2.0.4",
"license": "MIT",
"bin": {
"git-recent": "git-recent"
"git-recent": "git-recent",
"git-recent-og": "git-recent-og"
}
}
}

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "git-recent",
"version": "2.0.3",
"version": "2.0.4",
"description": "List recent git branches, select one for checkout. See branch commits and diffs, all formatted so fancy",
"bin": {
"git-recent": "git-recent",