Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 03 4月, 2012 2 次提交
  3. 24 3月, 2012 1 次提交
    • M
      gitk: Teach gitk to respect log.showroot · b2b76d10
      由 Marcus Karlsson 提交于 
      In early days, all projects managed by git (except for git itself) had the
product of a fairly mature development history in their first commit, and
it was deemed unnecessary clutter to show additions of these thousands of
paths as a patch.

"git log" learned to show the patch for the initial commit without requiring
--root command line option at 0f03ca94 (config option log.showroot to show
the diff of root commits, 2006-11-23).

Teach gitk to respect log.showroot.

[paulus@samba.org: Cleaned up the Tcl a bit, use --bool on the
 git config call]
Signed-off-by: NMarcus Karlsson <mk@acc.umu.se>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      b2b76d10
  5. 23 3月, 2012 1 次提交
    • P
      gitk: Add menu items for comparing a commit with the marked commit · 6febdede
      由 Paul Mackerras 提交于 
      Sometimes one wants to see the different between two commits that are
a long distance apart in the graph display.  This is difficult to do
with the "Diff this -> selected" and "Diff selected -> this" menu
items because the need to maintain the selection means that one can't
use the find facilities or the reference list window to navigate from
one to the other.

This provides an alternative using the mark.  Having found one commit,
one marks it with the "Mark this commit" menu item, then navigates to
the other commit and uses the new "Diff this -> marked commit" and/or
"Diff marked commit -> this" menu items.
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      6febdede
  7. 19 3月, 2012 7 次提交
  9. 08 10月, 2011 1 次提交
    • J
      gitk: Make vi-style keybindings more vi-like · 811c70fc
      由 Jonathan Nieder 提交于 
      When commit 6e2dda35 (Add new keybindings, 2005-09-22) added vi-style
keybindings to gitk (an excellent idea!), instead of adopting the
usual "hjkl = left, down, up, right" bindings used by less, vi, rogue,
and many other programs, it used "ijkl = up, left, down, right" to
mimic the inverted-T formation of the arrow keys on a qwerty keyboard,
in the style of Lode runner.  So using 'j' and 'k' to scroll through
commits produces utterly confusing results to the vi user, as 'k'
moves down and 'j' moves to the previous commit.

Luckily most non-vi-users are probably using an alternate set of keys
(cursor keys or z/x + n/p) anyway.  Switch to the expected vi/nethack
convention.
Requested-by: NJosh Triplett <josh@joshtriplett.org>
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      811c70fc
  11. 24 7月, 2011 10 次提交
  13. 29 5月, 2011 3 次提交
  15. 09 4月, 2011 1 次提交
  17. 09 3月, 2011 2 次提交
  19. 19 1月, 2011 1 次提交
  21. 12 12月, 2010 3 次提交
    • S
      gitk: Make text selectable on Mac · 4adcbea0
      由 Stefan Haller 提交于 
      Stolen from git-gui, 23effa79 (original log message by
Shawn O. Pearce <spearce@spearce.org> follows):

    git-gui: Force focus to the diff viewer on mouse click.

    Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text
    widget cannot receive focus or receive a selection within it.  This
    makes the diff viewer almost useless on that platform as you cannot
    select individual parts of the buffer.

    Now we force focus into the diff viewer when its clicked on with
    button 1.  This works around the feature and allows selection to
    work within the viewer just like it does on other less sane systems,
    like Microsoft Windows.
Signed-off-by: NStefan Haller <stefan@haller-berlin.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      4adcbea0
    • S
      gitk: Prevent the text pane from becoming editable · 120ea892
      由 Stefan Haller 提交于 
      When setting the "Patch/Tree" radio buttons to "Tree" and
clicking on a file to display it, the text pane would
accidentally become editable (because of the early return
in getblobline).
Signed-off-by: NStefan Haller <stefan@haller-berlin.de>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      120ea892
    • T
      gitk: Add the equivalent of diff --color-words · ae4e3ff9
      由 Thomas Rast 提交于 
      Use the newly added 'diff --word-diff=porcelain' to teach gitk a
color-words mode, with two different modes analogous to the
--word-diff=plain and --word-diff=color settings.  These are selected
by a dropdown box.

As an extra twist, automatically enable this word-diff support when
the user mentions a word-diff related option on the command line.
These options were previously ignored because they would break diff
parsing.

Both of these features are only enabled if we have a version of git
that supports --word-diff=porcelain, meaning at least 1.7.2.
Signed-off-by: NThomas Rast <trast@student.ethz.ch>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      ae4e3ff9
  23. 30 5月, 2010 1 次提交
    • K
      gitk: Show notes by default (like git log does) · 7defefb1
      由 Kirill Smelkov 提交于 
      Starting from ~ git-1.6.6, log, show & whatchanged show notes by default.

On the other hand, gitk does not show notes by default, because under
the hood it calls 'git log --pretty=raw ...' to get the log, and in
'git log' notes are turned off when user specifies format or pretty
settings.

Yes, it is possible to invoke 'gitk --show-notes' explicitly, but since
from user's perspective, gitk is gui enabled git log, it would be
logical for gitk to show notes by default too for consistency.

In git, --show-notes was introduced in 66b2ed (Fix "log" family not to
be too agressive about showing notes) which predates 1.6.6.2.

Notes can still be supressed with 'gitk --no-notes'.

Cc: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NKirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
      7defefb1
  25. 17 4月, 2010 1 次提交
  27. 20 3月, 2010 6 次提交