Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 10, 2007
  1. GIT v1.5.2-rc3

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @mndrix

    Document 'git-log --decorate'

    mndrix authored Junio C Hamano committed
    Signed-off-by: Michael Hendricks <michael@ndrix.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. @spearce

    Correct error message in revert/cherry-pick

    spearce authored Junio C Hamano committed
    We now write to MERGE_MSG, not .msg.  I missed this earlier
    when I changed the target we write to.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'master' of git://repo.or.cz/git-gui

    Junio C Hamano authored
    * 'master' of git://repo.or.cz/git-gui:
      git gui 0.7.0
      git-gui: Paperbag fix blame in subdirectory
      git-gui: Format author/committer times in ISO format
      git-gui: Cleanup minor nits in blame code
      git-gui: Generate blame on uncommitted working tree file
      git-gui: Smarter command line parsing for browser, blame
      git-gui: Use prefix if blame is run in a subdirectory
      git-gui: Convert blame to the "class" way of doing things
      git-gui: Don't attempt to inline array reads in methods
      git-gui: Convert browser, console to "class" format
      git-gui: Define a simple class/method system
      git-gui: Allow shift-{k,j} to select a range of branches to merge
      git-gui: Call changes "Staged" and "Unstaged" in file list titles.
  5. @spearce

    git gui 0.7.0

    spearce authored
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  6. @spearce

    git-gui: Paperbag fix blame in subdirectory

    spearce authored
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  7. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      Fix documentation of tag in git-fast-import.txt
      Properly handle '0' filenames in import-tars
  8. Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

    Junio C Hamano authored
    * 'maint' of git://repo.or.cz/git/fastimport:
      Fix documentation of tag in git-fast-import.txt
      Properly handle '0' filenames in import-tars
  9. @rc0 @spearce

    Fix documentation of tag in git-fast-import.txt

    rc0 authored spearce committed
    The tag command does not take a trailing LF.
    
    Signed-off-by: Richard P. Curnow <rc@rc0.org.uk>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  10. @spearce

    Merge branch 'gfi-maint' into maint

    spearce authored
    * gfi-maint:
      Properly handle '0' filenames in import-tars
  11. @pasky

    gitweb: Do not use absolute font sizes

    pasky authored Junio C Hamano committed
    Avoid specifying font sizes in pixels, since that is just pure evil.
    Pointed out by Chris Riddoch.
    
    Note that this is pretty much just a proposal; I didn't test if everything
    fits perfectly right, but things seem to be pretty much okay. repo.or.cz
    uses it now as a test drive - if you find any visual quirks, please point
    them out, with a patch if possible since I'm total CSS noob and debugging
    CSS is an extremely painful experience for me.
    
    Note that this patch actually does change visual look of gitweb in Firefox
    with my resolution and default settings - everything is bigger and I can't
    explain the joy of actually seeing gitweb text that is in _readable_ size;
    also, my horizontal screen real estate feels better used now. But judging
    from the look of most modern webpages on the 'net, most people prefer
    reading the web with strained eyes and/or a magnifying glass (I wonder what
    species of scientists should look into this mystifying phenomenon) - so,
    please tell us what you think.
    
    Maybe we might want to get rid of absolute sizes other than font sizes in
    the CSS file too in the long term.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. Git.pm: config_boolean() -> config_bool()

    Petr Baudis authored Junio C Hamano committed
    This patch renames config_boolean() to config_bool() for consistency with
    the commandline interface and because it is shorter but still obvious. ;-)
    It also changes the return value from some obscure string to real Perl
    boolean, allowing for clean user code.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
  13. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      .mailmap: add some aliases
      SPECIFYING RANGES typo fix: it it => it is
      git-clone: don't get fooled by $PWD
      Fix documentation of tag in git-fast-import.txt
  14. .mailmap: add some aliases

    Junio C Hamano authored
  15. @jaalto

    SPECIFYING RANGES typo fix: it it => it is

    jaalto authored Junio C Hamano committed
    Signed-off-by: Jari Aalto <jari.aalto@cante.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  16. git-clone: don't get fooled by $PWD

    Junio C Hamano authored
    If you have /home/me/git symlink pointing at /pub/git/mine,
    trying to clone from /pub/git/his/ using relative path would not
    work as expected:
    
    	$ cd /home/me
            $ cd git
            $ ls ../
            his    mine
            $ git clone -l -s -n ../his/stuff.git
    
    This is because "cd ../his/stuff.git" done inside git-clone to
    check if the repository is local is confused by $PWD, which is
    set to /home/me, and tries to go to /home/his/stuff.git which is
    different from /pub/git/his/stuff.git.
    
    We could probably say "set -P" (or "cd -P") instead, if we know
    the shell is POSIX, but the way the patch is coded is probably
    more portable.
    
    [jc: this is updated with Andy Whitcroft's improvements]
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  17. gitweb: choose appropriate view for file type if a= parameter missing

    Gerrit Pape authored Junio C Hamano committed
    gitweb URLs use the a= parameter for the view to use on the given path, such
    as "blob" or "tree".  Currently, if a gitweb URL omits the a= parameter,
    gitweb just shows the top-level repository summary, regardless of the path
    given.  gitweb could instead choose an appropriate view based on the file
    type: blob for blobs (files), tree for trees (directories), and summary if
    no path given (the URL included no f= parameter, or an empty f= parameter).
    
    Apart from making gitweb more robust and supporting URL editing more easily,
    this change would aid the creation of shortcuts to git repositories using
    simple substitution, such as:
    http://example.org/git/?p=path/to/repo.git;hb=HEAD;f=%s
    
    With this patch, if given the hash through the h= parameter, or the hash
    base (hb=) and a filename (f=), gitweb uses cat-file -t to automatically set
    the a= parameter.
    
    This feature was requested by Josh Triplett through
     http://bugs.debian.org/410465
    
    Signed-off-by: Gerrit Pape <pape@smarden.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  18. @qtonthat

    Added new git-gui library files to rpm spec

    qtonthat authored Junio C Hamano committed
    "make rpm" breaks without these files.
    
    Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  19. @rc0

    Fix documentation of tag in git-fast-import.txt

    rc0 authored Junio C Hamano committed
    The tag command does not take a trailing LF.
    
    Signed-off-by: Richard P. Curnow <rc@rc0.org.uk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 9, 2007
  1. t9400: skip cvsserver test if Perl SQLite interface is unavailable

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'fl/cvsserver'

    Junio C Hamano authored
    * fl/cvsserver:
      cvsserver: Add test cases for git-cvsserver
  3. Merge branch 'jc/diffopt'

    Junio C Hamano authored
    * jc/diffopt:
      diff -S: release the image after looking for needle in it
      diff -M: release the preimage candidate blobs after rename detection.
      diff.c: do not use a separate "size cache".
      diff: release blobs after generating textual diff.
  4. Merge branch 'jn/gitweb'

    Junio C Hamano authored
    * jn/gitweb:
      gitweb: Show combined diff for merge commits in 'commit' view
      gitweb: Show combined diff for merge commits in 'commitdiff' view
      gitweb: Make it possible to use pre-parsed info in git_difftree_body
      gitweb: Add combined diff support to git_patchset_body
      gitweb: Add combined diff support to git_difftree_body
      gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
  5. @flichtenheld

    cvsserver: Add test cases for git-cvsserver

    flichtenheld authored Junio C Hamano committed
    Use the :fork: access method to force cvs to
    call "$CVS_SERVER server" even when accessing a local
    repository.
    
    Add a basic test for checkout and some tests for update.
    
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Update documentation links to point at 1.5.1.4

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. @tytso

    Increase pack.depth default to 50

    tytso authored Junio C Hamano committed
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. @tytso

    Add pack.depth option to git-pack-objects.

    tytso authored Junio C Hamano committed
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. @spearce

    Use .git/MERGE_MSG in cherry-pick/revert

    spearce authored Junio C Hamano committed
    Rather than storing the temporary commit message data in .msg (in
    the working tree) we now store the message data in .git/MERGE_MSG.
    
    By storing the message in the .git/ directory we are sure we will
    never have a collision with a user file, should a project actually
    have a ".msg" file in their top level tree.  We also don't need to
    worry about leaving this stale file behind during a `reset --hard`
    and have it show up in the output of status.
    
    We are using .git/MERGE_MSG here to store the temporary message as
    it is an already established convention between git-merge, git-am
    and git-rebase that git-commit will default the user's edit buffer
    to the contents of .git/MERGE_MSG.  If the user is going to need
    to resolve this commit or wants to edit the message on their own
    prepping that file with the desired message "just works".
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Merge branch 'maint'

    Junio C Hamano authored
    * maint:
      GIT v1.5.1.4
      Add howto files to rpm packages.
      wcwidth redeclaration
      user-manual: fix clone and fetch typos
  11. GIT v1.5.1.4

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. @qtonthat

    Add howto files to rpm packages.

    qtonthat authored Junio C Hamano committed
    RPM packages did not include howto files which causes broken
    links in howto-index.html
    
    Signed-off-by: Quy Tonthat <qtonthat@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  13. @spearce

    git-gui: Format author/committer times in ISO format

    spearce authored
    This is a simple change to match what gitk does when it shows
    a commit; we format using ISO dates (yyyy-mm-dd HH:MM:SS).
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  14. @spearce

    git-gui: Cleanup minor nits in blame code

    spearce authored
    We can use [list ...] rather than "", especially when we are talking
    about values as then they are properly escaped if necessary.  Small
    nit, but probably not a huge deal as the only data being inlined here
    is Tk paths.
    
    Some of the lines in the parser code were longer than 80 characters
    wide, and they actually were all the same value on the end part of
    the line.  Rather than keeping the mess copied-and-pasted around we
    can set the last argument into a local variable and reuse it many
    times.
    
    The commit display code was also rather difficult to read on an 80
    character wide terminal, so I'm moving it all into a double quoted
    string that is easier to read.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  15. @spearce

    git-gui: Generate blame on uncommitted working tree file

    spearce authored
    If the user doesn't give us a revision parameter to our blame
    subcommand then we can generate blame against the working tree
    file by passing the file path off to blame with the --contents
    argument.  In this case we cannot obtain the contents of the
    file from the ODB; instead we must obtain the contents by
    reading the working directory file as-is.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  16. @spearce

    git-gui: Smarter command line parsing for browser, blame

    spearce authored
    The browser subcommand now optionally accepts a single revision
    argument; if no revision argument is supplied then we use the
    current branch as the tree to browse.  This is very common, so
    its a nice option.
    
    Our blame subcommand now tries to perform the same assumptions
    as the command line git-blame; both the revision and the file
    are optional.  We assume the argument is a filename if the file
    exists in the working directory, otherwise we assume the argument
    is a revision name.  A -- can be supplied between the two to force
    parsing, or before the filename to force it to be a filename.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Something went wrong with that request. Please try again.