diff --git a/etc/tigrc b/etc/tigrc index d45d95aea80..320a2eac208 100644 --- a/etc/tigrc +++ b/etc/tigrc @@ -26,6 +26,7 @@ # date # - display (enum) [no|default|relative|relative-compact|custom] # : Show dates? +# - use-author (bool) : Show author date instead of committer date? # - local (bool) : Show local dates? # - format (string) : Custom strftime(3) format # Note: %Z is formatted as %z @@ -100,6 +101,7 @@ set truncation-delimiter = ~ # Character drawn for truncations, or "utf-8" # - replace : A replaced reference. # - branch : A branch. # - stash : The stash. +# - note : Notes. # - prefetch : Refs prefetched by `git maintenance`. # - other : Any other reference. # @@ -108,8 +110,8 @@ set truncation-delimiter = ~ # Character drawn for truncations, or "utf-8" # Similarly, if no format is specified for `tracked-remote`, the format for # `remote` is used, and if no format is specified for any other reference # type, the format for `branch` is used. -# Prefix with `hide:` to not show that reference type, e.g. `hide:remote`. -set reference-format = [branch] {remote} ~replace~ hide:prefetch +# Prefix with `hide:` to not show that reference type, e.g. `hide:prefetch`. +set reference-format = [branch] {remote} ~replace~ # Settings controlling how content is read from Git set commit-order = auto # Enum: auto, default, topo, date, reverse (main) @@ -168,7 +170,7 @@ set pager-autoscroll = no # Scroll the pager view automatically while loading? # # User-defined commands can optionally refer to Tig's internal state # using the following variable names, which are substituted before -# commands are run: +# commands are run (see 'man tigrc' for the full list): # # %(head) The current ref ID. Defaults to HEAD # %(commit) The current commit ID. @@ -186,6 +188,9 @@ set pager-autoscroll = no # Scroll the pager view automatically while loading? # %(cmdlineargs) All other options passed on the command line. # %(diffargs) The diff options from `diff-options` or `TIG_DIFF_OPTS` # %(prompt) Prompt for the argument value. +# %(repo:head) The name of the checked out branch. +# %(repo:remote) The remote name associated with the checked out branch. +# %(repo:upstream) The upstream branch associated with the checked out branch. bind main C ?git cherry-pick %(commit) bind status C !git commit @@ -428,6 +433,10 @@ color main-annotated default default bold color main-tag magenta default bold color main-local-tag magenta default color main-remote yellow default +color main-stash blue default +color main-note blue default +color main-prefetch blue default +color main-other blue default color main-replace cyan default color main-tracked yellow default bold color main-ref cyan default diff --git a/usr/bin/tig.exe b/usr/bin/tig.exe index 7eb9100c747..af604e7ba2c 100644 Binary files a/usr/bin/tig.exe and b/usr/bin/tig.exe differ diff --git a/usr/share/bash-completion/completions/tig b/usr/share/bash-completion/completions/tig index 6841d41f868..6b649809f95 100644 --- a/usr/share/bash-completion/completions/tig +++ b/usr/share/bash-completion/completions/tig @@ -1,7 +1,7 @@ # bash/zsh completion for tig # # Copyright (C) 2019 Roland Hieber, Pengutronix -# Copyright (C) 2006-2024 Jonas fonseca +# Copyright (C) 2006-2025 Jonas fonseca # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff --git a/usr/share/man/man1/tig.1.gz b/usr/share/man/man1/tig.1.gz index fccee31357b..03196563623 100644 Binary files a/usr/share/man/man1/tig.1.gz and b/usr/share/man/man1/tig.1.gz differ diff --git a/usr/share/man/man5/tigrc.5.gz b/usr/share/man/man5/tigrc.5.gz index 9b1cb2e87b4..0a64f2c85d8 100644 Binary files a/usr/share/man/man5/tigrc.5.gz and b/usr/share/man/man5/tigrc.5.gz differ diff --git a/usr/share/man/man7/tigmanual.7.gz b/usr/share/man/man7/tigmanual.7.gz index 4d9314d9a53..2db583021fa 100644 Binary files a/usr/share/man/man7/tigmanual.7.gz and b/usr/share/man/man7/tigmanual.7.gz differ diff --git a/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc b/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc index 5069b022d95..14194d6fe70 100644 --- a/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc +++ b/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc @@ -20,7 +20,7 @@ any 1718204230 %INSTALLDATE% -1737861476 +1738379998 %PACKAGER% Johannes Schindelin diff --git a/var/lib/pacman/local/tig-2.5.10-1/mtree b/var/lib/pacman/local/tig-2.5.10-1/mtree deleted file mode 100644 index 98b2ff0cbb7..00000000000 Binary files a/var/lib/pacman/local/tig-2.5.10-1/mtree and /dev/null differ diff --git a/var/lib/pacman/local/tig-2.5.10-1/desc b/var/lib/pacman/local/tig-2.5.11-1/desc similarity index 89% rename from var/lib/pacman/local/tig-2.5.10-1/desc rename to var/lib/pacman/local/tig-2.5.11-1/desc index 41cdb02ae15..3d323531217 100644 --- a/var/lib/pacman/local/tig-2.5.10-1/desc +++ b/var/lib/pacman/local/tig-2.5.11-1/desc @@ -2,7 +2,7 @@ tig %VERSION% -2.5.10-1 +2.5.11-1 %BASE% tig @@ -17,16 +17,16 @@ http://jonas.nitro.dk/tig/ i686 %BUILDDATE% -1715459182 +1738331479 %INSTALLDATE% -1715483661 +1738379995 %PACKAGER% Johannes Schindelin %SIZE% -699847 +706059 %LICENSE% GPL diff --git a/var/lib/pacman/local/tig-2.5.10-1/files b/var/lib/pacman/local/tig-2.5.11-1/files similarity index 100% rename from var/lib/pacman/local/tig-2.5.10-1/files rename to var/lib/pacman/local/tig-2.5.11-1/files diff --git a/var/lib/pacman/local/tig-2.5.11-1/mtree b/var/lib/pacman/local/tig-2.5.11-1/mtree new file mode 100644 index 00000000000..5fa6acf7f0a Binary files /dev/null and b/var/lib/pacman/local/tig-2.5.11-1/mtree differ diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db index a6a3846477a..3efe715a0ec 100644 Binary files a/var/lib/pacman/sync/clang64.db and b/var/lib/pacman/sync/clang64.db differ diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig index 268766161b1..71d576a23c7 100644 Binary files a/var/lib/pacman/sync/clang64.db.sig and b/var/lib/pacman/sync/clang64.db.sig differ diff --git a/var/lib/pacman/sync/git-for-windows.db b/var/lib/pacman/sync/git-for-windows.db index ae64bf5b1d3..9ae2bde1b2e 100644 Binary files a/var/lib/pacman/sync/git-for-windows.db and b/var/lib/pacman/sync/git-for-windows.db differ diff --git a/var/lib/pacman/sync/git-for-windows.db.sig b/var/lib/pacman/sync/git-for-windows.db.sig index 6961cf932f5..f23f763d789 100644 Binary files a/var/lib/pacman/sync/git-for-windows.db.sig and b/var/lib/pacman/sync/git-for-windows.db.sig differ diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db index 59e51e22547..0b3a735d156 100644 Binary files a/var/lib/pacman/sync/mingw32.db and b/var/lib/pacman/sync/mingw32.db differ diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig index 24b0651f4ed..479dd5ed758 100644 Binary files a/var/lib/pacman/sync/mingw32.db.sig and b/var/lib/pacman/sync/mingw32.db.sig differ diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db index b25cd5c3fd8..e73ab90bb0d 100644 Binary files a/var/lib/pacman/sync/mingw64.db and b/var/lib/pacman/sync/mingw64.db differ diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig index 76479860379..d74cf60b10e 100644 Binary files a/var/lib/pacman/sync/mingw64.db.sig and b/var/lib/pacman/sync/mingw64.db.sig differ diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db index 5b6386681d3..7f8e9be02ab 100644 Binary files a/var/lib/pacman/sync/ucrt64.db and b/var/lib/pacman/sync/ucrt64.db differ diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig index 53759a5b6cc..6feb6e651ea 100644 Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ