threads / patch / 44865

patch, 3 partsupdates to gitk & git-gui doc now gitview has gone

Subject: [PATCH 0/3] updates to gitk & git-gui doc now gitview has gone

## tl;dr

7 messages between Jan 12, 2017 and Jan 13, 2017. Diffs are folded; open one to read it.

replies: 6people: 4as markdown or json

Philip Oakley· Jan 12, 2017, 21:32 UTC · lore
gitview was removed recently.
> Sent: Tuesday, January 10, 2017 11:48 PM
> Subject: What's cooking in git.git (Jan 2017, #01; Tue, 10)
> * sb/remove-gitview (2017-01-07) 1 commit
>   (merged to 'next' on 2017-01-10 at dcb3abd146)
>  + contrib: remove gitview
> Will merge to 'master'.

Lets remove the reference in the gitk man page, and do some other fixups while in the area.

Philip Oakley (3):
  doc: gitk: remove gitview reference
  doc: gitk: add the upstream repo location
  doc: git-gui browser does not default to HEAD
 Documentation/git-gui.txt |  2 +-
 Documentation/gitk.txt    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)
-- 
2.9.0.windows.1.323.g0305acf
Philip Oakley· Jan 12, 2017, 21:32 UTC · re: Philip Oakley · lore

[PATCH 2/3] doc: gitk: add the upstream repo location

Match the 'git gui' information regarding the graphical browser and its upstream location.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
cc: Paul Mackerras <paulus@ozlabs.org>
---
 Documentation/gitk.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Show changes to Documentation/gitk.txt +8 −2
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 73c02b9..9244379 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -178,9 +178,15 @@ used by default. If '$XDG_CONFIG_HOME' is not set it defaults to
 History
 -------
 Gitk was the first graphical repository browser. It's written in
-tcl/tk and started off in a separate repository but was later merged
-into the main Git repository.
+tcl/tk.
 
+'gitk' is actually maintained as an independent project, but stable
+versions are distributed as part of the Git suite for the convenience
+of end users.
+
+gitk-git/ comes from Paul Mackerras's gitk project:
+
+        git://ozlabs.org/~paulus/gitk
 
 SEE ALSO
 --------

-- 
2.9.0.windows.1.323.g0305acf
Philip Oakley· Jan 12, 2017, 21:32 UTC · re: Philip Oakley · lore

[PATCH 3/3] doc: git-gui browser does not default to HEAD

37cd4f7 ("Document git-gui, git-citool as mainporcelain manual pages", 2007-06-21) documented the default, but was shortly followed by c52c945 ("git-gui: Allow blame/browser subcommands on bare repositories", 2007-07-17) which, it would appear, as a side effect, removed that default.

Finally document that change.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
cc: Shawn O. Pearce <spearce@spearce.org>
cc: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 Documentation/git-gui.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-gui.txt +1 −1
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index c1a3e8b..5f93f80 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -35,7 +35,7 @@ blame::
 
 browser::
 	Start a tree browser showing all files in the specified
-	commit (or `HEAD` by default).  Files selected through the
+	commit.  Files selected through the
 	browser are opened in the blame viewer.
 
 citool::

-- 
2.9.0.windows.1.323.g0305acf
Philip Oakley· Jan 12, 2017, 21:32 UTC · re: Philip Oakley · lore

[PATCH 1/3] doc: gitk: remove gitview reference

contrib/gitview has been removed. Remove the reference.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
cc: Paul Mackerras <paulus@ozlabs.org>
---
 Documentation/gitk.txt | 4 ----
 1 file changed, 4 deletions(-)
Show changes to Documentation/gitk.txt +0 −4
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index e382dd9..73c02b9 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -187,10 +187,6 @@ SEE ALSO
 'qgit(1)'::
 	A repository browser written in C++ using Qt.
 
-'gitview(1)'::
-	A repository browser written in Python using Gtk. It's based on
-	'bzrk(1)' and distributed in the contrib area of the Git repository.
-
 'tig(1)'::
 	A minimal repository browser and Git tool output highlighter written
 	in C using Ncurses.

-- 
2.9.0.windows.1.323.g0305acf
Stefan Beller· Jan 12, 2017, 22:25 UTC · re: Philip Oakley · lore

Re: [PATCH 1/3] doc: gitk: remove gitview reference

On Thu, Jan 12, 2017 at 1:32 PM, Philip Oakley <philipoakley@iee.org> wrote:
> contrib/gitview has been removed. Remove the reference.
Thanks for this cleanup.
Johannes Schindelin· Jan 13, 2017, 15:23 UTC · re: Philip Oakley · lore

Re: [PATCH 0/3] updates to gitk & git-gui doc now gitview has gone

Hi Philip,
On Thu, 12 Jan 2017, Philip Oakley wrote:
Show 14 quoted lines
> gitview was removed recently.
> 
> > Sent: Tuesday, January 10, 2017 11:48 PM
> > Subject: What's cooking in git.git (Jan 2017, #01; Tue, 10)
> 
> > * sb/remove-gitview (2017-01-07) 1 commit
> >   (merged to 'next' on 2017-01-10 at dcb3abd146)
> >  + contrib: remove gitview
> 
> > Will merge to 'master'.
> 
> 
> Lets remove the reference in the gitk man page, and do some other
> fixups while in the area.
These changes all look sensible to me.

Ciao, Dscho

Junio C Hamano· Jan 13, 2017, 20:05 UTC · re: Johannes Schindelin · lore

Re: [PATCH 0/3] updates to gitk & git-gui doc now gitview has gone

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> Lets remove the reference in the gitk man page, and do some other
>> fixups while in the area.
>
> These changes all look sensible to me.
To me, too.  Thanks, both.

← back to recent threads