Permalink
Commits on Nov 3, 2005
  1. GIT 0.99.9c

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 3, 2005
  2. Illustration: "Commit DAG Revision Naming"

    Jon Loeliger's ASCII art in the git-rev-parse(1) manual.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 3, 2005
  3. Illustration: "Git Diff Types"

    Jon Loeliger's ASCII art in the Tutorial.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 3, 2005
  4. Illustration: "Fundamental Git Index Operations"

    Jon Loeliger's ASCII art in the Discussion section.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 3, 2005
  5. git-merge-ours: make sure our index matches HEAD

    git-merge expects this check to be done appropriately by the
    merge strategy backends.  In the case of merge-ours strategy,
    the resulting tree comes what we have in the index file, so it
    must match the current HEAD; otherwise it would not be "ours"
    merge.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 3, 2005
  6. Add 'ours' merge strategy.

    This adds the coolest merge strategy ever, "ours".  It can take
    arbitrary number of foreign heads and merge them into the
    current branch, with the resulting tree always taken from our
    branch head, hence its name.
    
    What this means is that you can declare that the current branch
    supersedes the development histories of other branches using
    this merge strategy.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  7. Add --no-commit to git-merge/git-pull.

    With --no-commit flag, git-pull will perform the merge but pretends as
    if the merge needed a hand resolve even if automerge cleanly resolves,
    to give the user a chance to add further changes and edit the commit
    message.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  8. Document --since and --until options to rev-parse.

    The usability magic were hidden in the source code without being
    documented, and even the maintainer did not know about them ;-).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 3, 2005
  9. Be careful when dereferencing tags.

    One caller of deref_tag() was not careful enough to make sure
    what deref_tag() returned was not NULL (i.e. we found a tag
    object that points at an object we do not have).  Fix it, and
    warn about refs that point at such an incomplete tag where
    needed.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  10. [PATCH] Clean up the SunOS Makefile rule

    Don't set a non-standard CURLDIR as default, and fix an error
    in Solaris 10 by setting NEEDS_LIBICONV.
    
    Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Peter Eriksen committed with Junio C Hamano Nov 2, 2005
  11. Ignore '\r' at the end of line in $GIT_DIR/config

    Unfortunate people may have to use $GIT_DIR/config edited on
    DOSsy machine on UNIXy machine.  Ignore '\r' immediately
    followed by '\n'.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  12. remove CR/LF from .gitignore

    For everyone cursed by dos/windows line endings (aka CRLF):
    
    The code reading the .gitignore files (excludes and excludes per
    directory) leaves \r in the patterns, which causes fnmatch to fail for
    no obvious reason. Just remove a "\r" preceding a "\n"
    unconditionally.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml committed with Junio C Hamano Nov 2, 2005
  13. Do not fail on hierarchical branch names.

    "git-checkout -b frotz/nitfol master" failed to create
    $GIT_DIR/refs/heads/frotz/nitfol but went ahead and updated
    $GIT_DIR/HEAD to point at it, resulting in a corrupt repository.
    Exit when we cannot create the new branch with an error status.
    
    While we are at it, there is no reason to forbid subdirectories
    in refs/heads, so make sure we handle that correctly.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  14. Make test-date buildable again.

    Now we define and use our own ctype-replacement, we need to link
    with it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
Commits on Nov 2, 2005
  1. git-clone: do not forget to create origin branch.

    The newly cloned repository by default had .git/remotes/origin
    set up to track the remote master to origin, but forgot to
    create the origin branch ourselves.  Also it hardcoded the
    assumption that the remote HEAD points at "master", which may
    not always be true.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  2. Do not put automatic merge message after signed-off-by line.

    'git-commit -s' after a failed automerge inserted the automerge
    message in a wrong place.  The signed-off-by line should come
    last.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  3. GIT 0.99.9b

    This contains the changes made on the master branch since 0.99.9a.
    
    The workaround for building RPMs has not changed since 0.99.9a,
    mainly because I haven't heard back if it was good enough for
    kernel.org consumption, or otherwise what changes are needed.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  4. Add -P to the documentation head.

    This is a companion patch for 211dcac
    commit, to add the newly introduced -P option to the list of options.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
  5. cvsimport: cvsps should be quiet too

    Tell cvsps to be quiet, unless we've been told to be verbose.
    
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Martin Langhoff committed with Junio C Hamano Nov 2, 2005
  6. cvsimport: introduce -P <cvsps-output-file> option

    -P:: <cvsps-output-file>
           Instead of calling cvsps, read the provided cvsps output file. Useful
           for debugging or when cvsps is being handled outside cvsimport.
    
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Martin Langhoff committed with Junio C Hamano Nov 2, 2005
  7. cvsimport: catch error condition where cvs host disappears

    Add error handling for cases where the cvs server goes away unexpectedly.
    While I don't know why the cvs server is so erratic, we should definitely
    exit here before committing bogus files.
    
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Martin Langhoff committed with Junio C Hamano Nov 2, 2005
  8. Do not install backward compatibility links anymore.

    This is a companion patch to 4f9dcf7
    which stops mentioning the old command names.  As promised, we do not
    install symlinks to let people use backward compatibility names anymore.
    
    cmd-rename.sh script is still shipped to help people who installed
    previous git by hand to clean up the leftover symlinks.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 2, 2005
Commits on Nov 1, 2005
  1. Strip any trailing slash on destination argument

    Needed because generating a target paths will add another slash.
    This fixes e.g. "git-mv file dir/", which removed "file" from
    version control by renaming it to "dir//file", as
    git-update-index does not accept such paths.
    
    Thanks goes to Ben Lau for noting this bug.
    
    Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    weidendo committed with Junio C Hamano Nov 1, 2005
  2. git-am.txt is no stub anymore

    That notice was added by me for the emergency documentation, but Junio
    already expanded it to a full-fledged manual page. This patch removes
    the notice.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 1, 2005
  3. Documentation for git-fmt-merge-msg

    Simple description. It appears to be mostly internal command, but hey, it
    is (it seems) the only undocumented one, so let's fix it up...
    
    Also add a note about it to git-merge documentation.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 1, 2005
  4. Remove git-findtags.perl

    This script was superseded by git-name-rev, which is more versatile,
    actually documented, faster, and everything else...
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Nov 1, 2005
  5. Remove 'Previously this command was known as ...' messages.

    For a 1.0 release, there is no need to maintain the
    historical "Previously this command was known as..."
    information on the doc splash page.  It is noise;
    command names should stand on their own now.
    
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Jon Loeliger committed with Junio C Hamano Nov 1, 2005
  6. Fix constness of input in mozilla-sha1/sha1.c::SHA1_Update().

    Among the three of our own implementations, only this one lacked
    "const" from the second argument.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 1, 2005
  7. Document the use of "current directory" as pull source.

    The repository to pull from can be a local repository, and as a
    special case the current directory can be specified to perform
    merges across local branches.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 1, 2005
  8. Merge branch 'fixes'

    Junio C Hamano committed Nov 1, 2005
Commits on Oct 31, 2005
  1. Add examples for git-log documentation and others.

    I don't think people really follow the links or think very abstractly at
    all in the first place.
    
    So I was thinking more of some explicit examples. I actually think every
    command should have an example in the man-page, and hey, here's a patch to
    start things off.
    
    Of course, I'm not exactly "Mr Documentation", and I don't know that this
    is the prettiest way to do this, but I checked that the resulting html and
    man-page seems at least reasonable.
    
    And hey, if the examples look like each other, that's just because I'm
    also not "Mr Imagination".
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Oct 31, 2005
  2. GIT 0.99.9a

    ... to contain the RPM workaround.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 31, 2005
  3. Work around an RPM build problem.

    The require statement at the top of git-svnimport seems to confuse
    rpmbuild dependency generation.  It uses the newer notation "v5.8.0",
    and rpm ends up requiring "perl(v5.8.0)", while we would want it to
    say something like "perl >= 0:5.008".
    
    Ryan suggests old-style "require 5.008" might fix this problem, so
    here it is.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005
  4. Fix rev-list documentation again (--sparse and pathspec)

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005
  5. Update git-pack-objects documentation.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Oct 30, 2005