Permalink
Commits on Jan 14, 2006
  1. GIT 1.1.2

    Junio C Hamano committed Jan 14, 2006
  2. GIT 1.0.10

    Junio C Hamano committed Jan 14, 2006
Commits on Jan 13, 2006
  1. Documentation: git-reset - interrupted workflow.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 13, 2006
  2. Documentation: git-commit -a

    A bit more elaboration on what "update all paths" means.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 13, 2006
  3. Documentation: clarify fetch parameter descriptions.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    bfields committed with Junio C Hamano Jan 13, 2006
Commits on Jan 11, 2006
  1. show-branch: handle [] globs as well.

    Earlier only '?' and '*' signalled the command that what the
    user has given is a glob pattern.  This prevented us to say:
    
    	$ git show-branch 'v0.99.[0-3]'
    
    Now we notice '[' as well, so the above would work.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  2. name-rev: do not omit leading components of ref name.

    In a repository with mainto/1.0 (to keep maintaining the 1.0.X
    series) and fixo/1.0 (to keep fixes that apply to both 1.0.X
    series and upwards) branches, "git-name-rev mainto/1.0" answered
    just "1.0" making things ambiguous.  Show refnames unambiguously
    like show-branch does.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  3. describe: do not silently ignore indescribable commits

    We silently ignored indescribable commits without complaining.
    Complain and die instead.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  4. update-index: work with c-quoted name

    update-index --stdin did not work with c-style quoted names even though
    update-index --index-info did.  This fixes the inconsistency.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 11, 2006
  5. Add git-describe to .gitignore.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    tomprince committed with Junio C Hamano Jan 11, 2006
  6. GIT 1.0.9

    Junio C Hamano committed Jan 11, 2006
  7. GIT 1.1.1

    Junio C Hamano committed Jan 11, 2006
  8. glossary: explain "master" and "origin"

    If you are a long time git user/developer, you forget that to a new git
    user, these words have not the same meaning as to you.
    
    [jc: with updates from J. Bruce Fields.]
    
    Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    dscho committed with Junio C Hamano Jan 10, 2006
Commits on Jan 10, 2006
  1. GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.

    If we are building from a working tree with local modifications,
    mark the version accordingly.
    
    Deliberately uses '-' to prevent RPM from being built from such
    a tree.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 9, 2006
  2. For release tarballs, include the proper version

    When producing a release tarball, include a "version" file, which
    GIT-VERSION-GEN can then use to do the right thing when building from a
    tarball.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    H. Peter Anvin committed with Junio C Hamano Jan 10, 2006
Commits on Jan 8, 2006
  1. GIT 1.1.0

    Junio C Hamano committed Jan 8, 2006
  2. Add a test for rebase when a change was picked upstream

    This test exercises the standard feature that makes rebase useful.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  3. Add a minimal test for git-cherry

    This test checks that git-cherry finds the expected number of patches
    in two simple cases, and then tests the new limit arguments.
    
    [jc: collapsed two patches into one and added sleep to make sure
     the two commits would get different timestamps]
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  4. Add an optional limit to git-cherry

    This allows to use another commit than the merge base as a limit for
    scanning patches.
    
    [jc: part about t3500 test omitted.]
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  5. git-daemon --base-path

    Tommi Virtanen expressed a wish on #git to be able to use short and elegant
    git URLs by making git-daemon 'root' in a given directory. This patch
    implements this, causing git-daemon to interpret all paths relative to
    the given base path if any is given.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Dec 23, 2005
  6. describe: allow more than one revs to be named.

    The main loop was prepared to take more than one revs, but the actual
    naming logic wad not (it used pop_most_recent_commit while forgetting
    that the commit marks stay after it's done).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 8, 2006
  7. ls-files --others --directory: test

    Add a test to run with --directory option.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  8. git-status: use ls-files --others --directory for untracked list.

    This shortens "Untracked files" list by using --directory option
    when running ls-files --others.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  9. ls-files --others --directory: give trailing slash

    This adds a trailing slash to directory names in the output
    when "--others --directory" option shows only untracked
    directories and not their contents, to make them stand out.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  10. ls-files --others --directory: fix a bug with index entry ordering

    When both howto-index.sh and howto/make-dist.txt exist under
    Documentation/ directory, dir_exists() mistakenly checked it
    without the trailing slash to see if there was something under
    Documentation/howto directory, and did not realize there was,
    because '-' sorts earlier than '/' and cache_name_pos() finds
    howto-index.sh, which is not under howto/ directory.  This
    caused --others --directory to show it which was incorrect.
    
    Check the directory name with the trailing slash, because having
    an entry that has such as a prefix is what we are looking for.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  11. ls-files -o: optionally skip showing the contents in "untracked" dire…

    …ctories
    
    Darrin Thompson notes that git-ls-files -o reports all the unknown
    files it finds in a work area.  Subversion and probably other systems
    "simply ignore all the files and directories inside an unknown
    directory and just note the directory as unknown."
    
    With --directory option, ls-files --others shows untracked directories
    without descending into them.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Jan 4, 2006
  12. git-fetch: auto-following tags.

    I added things to ls-remote so that Cogito can auto-follow tags
    easily and correctly a while ago, but git-fetch did not use the
    facility.  Recently added git-describe command relies on
    repository keeping up-to-date set of tags, which made it much
    more attractive to automatically follow tags, so we do that as
    well.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  13. GIT 1.0.8

    Junio C Hamano committed Jan 8, 2006
  14. mailsplit: allow empty input from stdin

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 8, 2006
  15. revert/cherry-pick: handle single quote in author name.

    The same fix as aa66c7e is
    needed here.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 8, 2006
  16. Fix git-format-patch usage string wrt output modes.

    --stdout was not mentionned, and the description for the case where -o
    was not given was thus incomplete.
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
  17. Fix typo in debug stanza of t2001

    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    ydirson committed with Junio C Hamano Jan 8, 2006
Commits on Jan 7, 2006
  1. tar-tree: finish honoring extractor's umask in git-tar-tree.

    Earlier commit 38ec15a forgot
    to apply the same principle of not forcing go-w to the base
    directory when specified.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  2. [PATCH] Compilation: zero-length array declaration.

    ISO C99 (and GCC 3.x or later) lets you write a flexible array
    at the end of a structure, like this:
    
    	struct frotz {
    		int xyzzy;
    		char nitfol[]; /* more */
    	};
    
    GCC 2.95 and 2.96 let you to do this with "char nitfol[0]";
    unfortunately this is not allowed by ISO C90.
    
    This declares such construct like this:
    
    	struct frotz {
    		int xyzzy;
    		char nitfol[FLEX_ARRAY]; /* more */
    	};
    
    and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and
    empty for others.
    
    If you are using a C90 C compiler, you should be able
    to override this with CFLAGS=-DFLEX_ARRAY=1 from the
    command line of "make".
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006
  3. prune: do not show error from pack-redundant when no packs are found.

    When there is no pack yet, git-prune leaked an error message
    from "git-pack-redundant --all" which complained that there is
    no pack.  Squelch the annoying message.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Jan 7, 2006