Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 4, 2006
  1. Add a few more words to the glossary.

    Jon Loeliger authored Junio C Hamano committed
    Clean up a few entries and fix typos.
    
        bare repository
        cherry-picking
        hook
        topic branch
    
    [jc: removing questionable "symbolic ref -- see 'ref'" for now.]
    
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Added definitions for a few words:

    Jon Loeliger authored Junio C Hamano committed
        fast forward
        pickaxe
        refspec
        tracking branch
    
    Wild hack allows "link:git-" prefix to reference commands too.
    
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Alphabetize the glossary.

    Jon Loeliger authored Junio C Hamano committed
    Signed-off-by: Jon Loeliger <jdl@jdl.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 3, 2006
  1. @matthiask

    fix various typos in documentation

    matthiask authored Junio C Hamano committed
    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 2, 2006
  1. git-send-email: fix version string to be valid perl

    Martin Langhoff authored Junio C Hamano committed
    This makes git-send-email easier to develop and debug, skipping the need
    to `make git-send-email` every time.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Give the user a hint for how to continue in the case that git-am fail…

    Robert Shearman authored Junio C Hamano committed
    …s because it requires user intervention
    
    Give the user a hint for how to continue in the case that git-am fails
    because it requires user intervention.
    
    Signed-off-by: Robert Shearman <rob@codeweaves.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 30, 2006
  1. @hdmdavies

    git-format-patch: Use rfc2822 compliant date.

    hdmdavies authored Junio C Hamano committed
    Signed-off-by: Huw Davies <huw@codeweavers.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 28, 2006
  1. @loops

    Fix trivial typo in git-log man page.

    loops authored Junio C Hamano committed
    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
  2. @loops

    Properly render asciidoc "callouts" in git man pages.

    loops authored Junio C Hamano committed
    Adds an xsl fragment to render docbook callouts when
    converting to man page format.  Update the Makefile
    to have "xmlto" use it when generating man pages.
    
    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
  3. @loops

    Fix up remaining man pages that use asciidoc "callouts".

    loops authored Junio C Hamano committed
    Unfortunately docbook does not allow a callout to be
    referenced from inside a callout list description.
    Rewrite one paragraph in git-reset man page to work
    around this limitation.
    
    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
  4. @loops

    Update the git-branch man page to include the "-r" option,

    loops authored Junio C Hamano committed
    and fix up asciidoc "callouts"
    
    Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
  5. @matthiask

    annotate: display usage information if no filename was given

    matthiask authored Junio C Hamano committed
    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
  6. @matthiask

    annotate: fix warning about uninitialized scalar

    matthiask authored Junio C Hamano committed
    Use of uninitialized value in scalar chomp at
    ./git-annotate.perl line 212, <$kid> chunk 4.
    
    Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
  7. git-am --resolved: more usable error message.

    Junio C Hamano authored
    After doing the hard work of hand resolving the conflicts in the
    working tree, if the user forgets to run update-index to mark
    the paths that have been resolved, the command gave an
    unfriendly "fatal: git-write-tree: not able to write tree" error
    message.  Catch the situation early and give more meaningful
    message and suggestion.
    
    Noticed and suggested by Len Brown.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 27, 2006
  1. verify-pack: check integrity in a saner order.

    Junio C Hamano authored
    Check internal integrity to report corrupt pack or idx, and
    then check cross-integrity between idx and pack.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 26, 2006
  1. commit-tree.c: check_valid() microoptimization.

    Junio C Hamano authored
    There is no point reading the whole object just to make sure it exists and
    it is of the expected type.  We added sha1_object_info() for such need
    after this code was written, so use it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Fix filename verification when in a subdirectory

    Linus Torvalds authored Junio C Hamano committed
    When we are in a subdirectory of a git archive, we need to take the prefix
    of that subdirectory into accoung when we verify filename arguments.
    
    Noted by Matthias Lederhofer
    
    This also uses the improved error reporting for all the other git commands
    that use the revision parsing interfaces, not just git-rev-parse. Also, it
    makes the error reporting for mixed filenames and argument flags clearer
    (you cannot put flags after the start of the pathname list).
    
    [jc: with fix to a trivial typo noticed by Timo Hirvonen]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. rebase: typofix.

    Junio C Hamano authored
    Noticed by Sean.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 25, 2006
  1. socksetup: don't return on set_reuse_addr() error

    Serge E. Hallyn authored Junio C Hamano committed
    The set_reuse_addr() error case was the only error case in
    socklist() where we returned rather than continued.  Not sure
    why.  Either we must free the socklist, or continue.  This patch
    continues on error.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    (cherry picked from 0032d54 commit)
  2. Document the configuration file

    Petr Baudis authored Junio C Hamano committed
    This patch adds a Documentation/config.txt file included by git-repo-config
    and currently aggregating hopefully all the available git plumbing / core
    porcelain configuration variables, as well as briefly describing the format.
    
    It also updates an outdated bit of the example in git-repo-config(1).
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
  3. Document git-var -l listing also configuration variables

    Petr Baudis authored Junio C Hamano committed
    Signed-off-by: Petr Baudis <pasky@suse.cz>
  4. @paulusmack

    rev-parse: better error message for ambiguous arguments

    paulusmack authored Junio C Hamano committed
    Currently, if git-rev-parse encounters an argument that is neither a
    recognizable revision name nor the name of an existing file or
    directory, and it hasn't encountered a "--" argument, it prints an
    error message saying "No such file or directory".  This can be
    confusing for users, including users of programs such as gitk that
    use git-rev-parse, who may then think that they can't ask about the
    history of files that no longer exist.
    
    This makes it print a better error message, one that points out the
    ambiguity and tells the user what to do to fix it.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
Commits on Apr 21, 2006
  1. git-log produces no output

    Linus Torvalds authored Junio C Hamano committed
    When $PAGER is set to 'less -i', we used to fail because we
    assumed the $PAGER is a command and simply exec'ed it.
    
    Try exec first, and then run it through shell if it fails.  This
    allows even funkier PAGERs like these ;-):
    
    	PAGER='sed -e "s/^/`date`: /" | more'
    	PAGER='contrib/colordiff.perl | less -RS'
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. fix pack-object buffer size

    Nicolas Pitre authored Junio C Hamano committed
    The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also
    account for the space before the pathname, and the terminating \n and \0.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. mailinfo: decode underscore used in "Q" encoding properly.

    Junio C Hamano authored
    Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are
    subtly different; the latter is used on the mail header and an
    underscore needs to be decoded to 0x20.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Reintroduce svn pools to solve the memory leak.

    Santi_Béjar authored Junio C Hamano committed
    Introduced in 4802426.
    
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. pack-objects: do not stop at object that is "too small"

    Junio C Hamano authored
    Because we sort the delta window by name-hash and then size,
    hitting an object that is too small to consider as a delta base
    for the current object does not mean we do not have better
    candidate in the window beyond it.
    
    Noticed by Shawn Pearce, analyzed by Nico, Linus and me.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 20, 2006
  1. git-commit --amend: two fixes.

    Junio C Hamano authored
    When running "git commit --amend" only to fix the commit log
    message without any content change, we mistakenly showed the
    git-status output that says "nothing to commit" without
    commenting it out.
    
    If you have already run update-index but you want to amend the
    top commit, "git commit --amend --only" without any paths should
    have worked, because --only means "starting from the base
    commit, update-index these paths only to prepare the index to
    commit, and perform the commit".  However, we refused -o without
    paths.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 19, 2006
  1. pre-commit hook: complain about conflict markers.

    Junio C Hamano authored
    Several <<< or === or >>> characters at the beginning of a line
    is very likely to be leftover conflict markers from a failed
    automerge the user resolved incorrectly, so detect them.
    
    As usual, this can be defeated with "git commit --no-verify" if
    you really do want to have those files, just like changes that
    introduce trailing whitespaces.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-merge: a bit more readable user guidance.

    Junio C Hamano authored
    We said "fix up by hand" after failed automerge, which was a big
    "Huh?  Now what?".  Be a bit more explicit without being too
    verbose. Suggested by Carl Worth.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. @spearce

    Document git-clone --reference

    spearce authored Junio C Hamano committed
    The new --reference flag introduced to git-clone in
    GIT 1.3.0 was not documented but is rather handy.
    So document it.
    
    Also corrected a minor issue with the documentation for the
    -s flag; the info/alternates file name was spelled wrong.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 18, 2006
  1. @jonas

    Fix filename scaling for binary files

    jonas authored Junio C Hamano committed
    Set maximum filename length for binary files so that scaling won't be
    triggered and result in invalid string access.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. GIT 1.3.0

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

    Add git-annotate(1) and git-blame(1)

    jonas authored Junio C Hamano committed
    [jc: with entries in git.txt]
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. diff --stat: make sure to set recursive.

    Junio C Hamano authored
    Just like "patch" format always needs recursive, "diffstat"
    format does not make sense without setting recursive.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.