Skip to content

[pull] master from git:master #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 18 commits into from
Jun 12, 2026
Merged

[pull] master from git:master #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d9ee2ab
gitk: add horizontal scrollbar to the commit list pane
ramcdona Apr 14, 2026
89858b2
git-gui: use HEAD as current branch when detached
mark987 May 31, 2026
a7e5d89
git-gui: remove unnecessary 'cd $_gitworktree' from do_gitk
j6t May 31, 2026
d4800b7
git-gui: guard set/unset of GIT_DIR and GIT_WORK_TREE
mark987 May 31, 2026
587a4ac
git-gui: do not change global vars in choose_repository::pick
mark987 May 31, 2026
9902c4c
git-gui: use --absolute-git-dir
mark987 May 31, 2026
edcf918
git-gui: use rev-parse exclusively to find a repository
mark987 May 31, 2026
80b7207
git-gui: use git rev-parse for worktree discovery
mark987 May 31, 2026
d0e9b49
git-gui: simplify [is_bare] to report if a worktree is known
mark987 May 31, 2026
4f5114b
git-gui: try harder to find worktree from gitdir
mark987 May 31, 2026
7c7c7ba
git-gui: allow specifying path '.' to the browser
mark987 May 31, 2026
3fbef19
git-gui: check browser/blame arguments carefully
mark987 May 31, 2026
e61190e
git-gui: add gui and pick as explicit subcommands
mark987 May 31, 2026
3372505
git-gui: silence install recipes under "make -s"
HaraldNordgren Jun 4, 2026
1b2c2a2
Merge branch 'ml/repo-discovery'
j6t Jun 12, 2026
bad83ad
Merge branch 'horizontal-scroll' of github.com:ramcdona/gitk
j6t Jun 12, 2026
45d10e1
Merge branch 'master' of https://github.com/j6t/gitk
gitster Jun 12, 2026
ea97ad8
Merge branch 'master' of https://github.com/j6t/git-gui
gitster Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions git-gui/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ REMOVE_F0 = $(RM_RF) # space is required here
REMOVE_F1 =
CLEAN_DST = true

ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
ifndef V
QUIET = @
QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
Expand All @@ -89,6 +90,7 @@ ifndef V
REMOVE_F0 = dst=
REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
endif
endif

TCLTK_PATH ?= wish
ifeq (./,$(dir $(TCLTK_PATH)))
Expand All @@ -97,10 +99,6 @@ else
TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
endif

ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
QUIET_GEN =
endif

-include config.mak

DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
Expand Down
Loading