Permalink
Commits on Nov 8, 2005
  1. GIT 0.99.9f

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  2. git-am: do not lose already edited final-commit when resuming.

    The last round stopped munging the patch when resuming, but
    failed to preserve final-commit.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  3. ls-files and read-tree need core.filemode

    ls-files.c and read-tree.c miss the default configuration, in
    particular the filemode=false part.  The recent +x bit flip made me
    notice that, because git-merge refused to merge anything saying that
    git-pull.sh is not up to date.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    raalkml committed with Junio C Hamano Nov 8, 2005
  4. Debian: packaging updates.

    Do not scatter txt and html documentation into feature subpackages.
    Do place man pages into them.
    
    Capture more cvs stuff into git-cvs package.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  5. Use consistent shell prompts and example style.

    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 7, 2005
  6. Add --tags documentation, scraped from JC mail.

    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 7, 2005
  7. Add support for git-http-push to git-push script

    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld committed with Junio C Hamano Nov 2, 2005
  8. Tutorial: do not use 'git resolve'.

    Use 'git merge' instead.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  9. Documentation: fix dependency generation.

    The previous rule misses the case where git.txt or tutorial.txt
    includes new files.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  10. Add bug isolation howto, scraped from Linus.

    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 8, 2005
  11. Merge branch 'master'

    Junio C Hamano committed Nov 8, 2005
  12. Ignore more generated files.

    List new commands cvsexportcommit and http-push to .gitignore list.
    Also cover the test programs (test-date and test-delta).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  13. Fix documentation dependency generation.

    Documentation/Makefile spent a lot of time to generate include
    dependencies, which was quite noticeable especially during "make clean".
    
    Rewrite it to generate just a single dependency file.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  14. Documentation: asciidoc formatting fix for git-cvsexportcommit doc.

    Annoyingly enough, asciidoc wants the same number of '=' on the second
    line as there are characters on the first line.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
  15. merge-recursive: Only print relevant rename messages

    It isn't really interesting to know about the renames that have
    already been committed to the branch you are working on. Furthermore,
    the 'git-apply --stat' at the end of git-(merge|pull) will tell us
    about any renames in the other branch.
    
    With this commit only renames which require a file-level merge will
    be printed.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Fredrik Kuivinen committed with Junio C Hamano Nov 7, 2005
  16. Do not fail on hierarchical tagnames.

    This is a companion patch to 13d1cc3
    commit, which made hierarchical branch name possible.  "git tag
    v0.99.9/a" would fail otherwise.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 8, 2005
Commits on Nov 7, 2005
  1. Small bugfixes for http-push.c

    This patch fixes three things:
    
    - older libexpat does not know about enum XML_Status
    - as in my patch for http-fetch, do not rely on a curl result in
    	free()d data
    - calloc the new_lock structure
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Nov 7, 2005
  2. Make http-push smarter about creating remote dirs

    Remember object directories known to exist in the remote repo and don't
    bother trying to create them.
    
    Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Nick Hengeveld committed with Junio C Hamano Nov 7, 2005
  3. Introducing: git-cvsexportcommit

    A script that can replay commits git into a CVS checkout. Tries to ensure the
    sanity of the operation and supports mainly manual usage.
    
    If you are reckless enough, you can ask it to autocommit when everything has
    applied cleanly. Combined with a couple more scripts could become part of
    a git2cvs gateway.
    
    Should support adds/removes and binary 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 7, 2005
  4. Documentation update: use git branch -d foo where applicable

    This updates documentation to use git branch -d foo in favour of
    rm .git/refs/heads/foo
    
    Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Kai Ruemmler committed with Junio C Hamano Nov 7, 2005
  5. Recover dropped +x bit from git-pull.sh by accident.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2005
  6. Merge branch 'master'

    Junio C Hamano committed Nov 7, 2005
  7. Documentation: talk about guts of merge in tutorial.

    While discussing Jon's ASCII art on merge operations with him, I
    realized that the tutorial stops talking about the plumbing
    details halfway.  So fill in the gory details, and update the
    examples to use 'git-merge', not 'git-resolve'.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2005
  8. Refactored merge options into separate merge-options.txt.

    Refactored fetch options into separate fetch-options.txt.
    Made git-merge use merge-options.
    Made git-fetch use fetch-options.
    Made git-pull use merge-options and fetch-options.
    Added --help option to git-pull and git-format-patch scripts.
    Rewrote Documentation/Makefile to dynamically determine
    include dependencies.
    
    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 7, 2005
  9. GIT 0.99.9e

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2005
  10. http-fetch: do not use curl_message after releasing it

    When curl_message is released using curl_multi_remove_handle(), it's
    contents are undefined. Therefore, get the information before releasing it.
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Nov 6, 2005
  11. Allow GIT_DIR to be an absolute path

    This fixes a problem in safe_create_leading_directories() when the
    argument starts with a '/' (i.e. the path is absolute).
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Nov 6, 2005
  12. http-push.c: include with angle bracket, not dq.

    Do not search the current directory when including expat.h, since it
    is not supplied by git.
    
    Signed-off-by: Paul Collins <paul@briny.ondioline.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Paul Collins committed with Junio C Hamano Nov 6, 2005
  13. Set up remotes/origin to track all remote branches.

    This implements the idea Daniel Barkalow came up with, to match
    the remotes/origin created by clone by default to the workflow I
    use myself in my guinea pig repository, to have me eat my own
    dog food.
    
    We probably would want to use either .git/refs/local/heads/*
    (idea by Linus) or .git/refs/heads/origin/* instead to reduce
    the local ref namespace pollution.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 6, 2005
  14. git-status: do not mark unmerged paths as committable.

    An unmerged path appears as both "Updated but not checked in" list,
    and "Changed but not updated" list.  We are not going to commit that
    path until it is resolved, so remove it from the former list.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2005
  15. ls-files: --others should not say unmerged paths are unknown.

    Jon Loeliger noticed that an unmerged path appears as
    "Untracked" in git-status output, even though we show the same
    path as updated/changed.  Since --others means "we have not told
    git about that path", we should not show unmerged paths --
    obviously, git knows about them; it just does not know what we
    want to do about them yet.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 7, 2005
Commits on Nov 6, 2005
  1. Use fink/darwinport paths for OSX

    There's no standard libexpat for OSX, so if you install it
    after-market, it can end up in various directories.  Give
    paths used by fink and darwinports by default to CFLAGS.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    RandalSchwartz committed with Junio C Hamano Nov 6, 2005
  2. Refactor merge strategies into separate includable file.

    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 6, 2005
  3. Document expat dependency when using http-push.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Nov 5, 2005
  4. Merge in http-push first stage.

    Junio C Hamano committed Nov 6, 2005