Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 4, 2007
  1. @RandalSchwartz @gitster

    add "test-absolute-path" to .gitignore

    RandalSchwartz authored gitster committed
    New file requires new ignore.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 2, 2007
  1. @gitster

    Merge branch 'ns/stash'

    gitster authored
    * ns/stash:
      Documentation: quote {non-attributes} for asciidoc
      git-stash: don't complain when listing in a repo with no stash
      git-stash: fix "can't shift that many" with no arguments
      git-stash: fix "no arguments" case in documentation
      git-stash: require "save" to be explicit and update documentation
      Document git-stash
      Add git-stash script
Commits on Jul 1, 2007
  1. @gitster

    Add git-stash script

    しらいしななこ authored gitster committed
    When my boss has something to show me and I have to update, for some
    reason I am always in the middle of doing something else, and git pull
    command refuses to work in such a case.
    
    I wrote this little script to save the changes I made, perform the
    update, and then come back to where I was, but on top of the updated
    commit.
    
    This is how you would use the script:
    
      $ git stash
      $ git pull
      $ git stash apply
    
    [jc: with a few fixlets from the list]
    
    Signed-off-by: Nanako Shiraishi <nanako3@bluebottle.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 27, 2007
  1. @matled @gitster

    ignore git-rebase--interactive

    matled authored gitster committed
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 16, 2007
  1. @gitster
  2. @jnareb @gitster

    Generated spec file to be ignored is named git.spec and not git-core.…

    jnareb authored gitster committed
    …spec
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 10, 2007
  1. @torvalds @gitster

    Makefile: add an explicit rule for building assembly output

    torvalds authored gitster committed
    In the kernel we have a rule for *.c -> *.s files exactly because
    it's nice to be able to easily say "ok, what does that generate".
    
    Here's a patch to add such a rule to git too, in case anybody is
    interested. It makes it much simpler to just do
    
    	make sha1_file.s
    
    and look at the compiler-generated output that way, rather than having to
    fire up gdb on the resulting binary.
    
    (Add -fverbose-asm or something if you want to, it can make the result
    even more readable)
    
    [jc: add *.s to .gitignore]
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 6, 2007
  1. @matled @gitster

    add git-filter-branch to .gitignore

    matled authored gitster committed
    Signed-off-by: Matthias Lederhofer <matled@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 3, 2007
  1. @RandalSchwartz @gitster

    Add test-sha1 to .gitignore.

    RandalSchwartz authored gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branches 'lh/submodules' and 'pb/am'

    Junio C Hamano authored
    * lh/submodules:
      Add basic test-script for git-submodule
      Add git-submodule command
    
    * pb/am:
      Remove git-applypatch
      git-applymbox: Remove command
Commits on May 27, 2007
  1. @hjemli

    Add git-submodule command

    hjemli authored Junio C Hamano committed
    This command can be used to initialize, update and inspect submodules. It
    uses a .gitmodules file, readable by git-config, in the top level directory
    of the 'superproject' to specify a mapping between submodule paths and
    repository url.
    
    Example .gitmodules layout:
    
    [module "git"]
    	url = git://git.kernel.org/pub/scm/git/git.git
    
    With this entry in .gitmodules (and a commit reference in the index entry for
    the path "git"), the command 'git submodule init' will clone the repository
    at kernel.org into the directory "git".
    
    Known issues
    ============
    There is currently no way to override the url found in the .gitmodules file,
    except by manually creating the subproject repository. The place to fix this
    in the script has a rather long comment about a possible plan.
    
    Funny paths will be quoted in the output from git-ls-files, but git-submodule
    does not attempt to unquote (or even detect the presence of) such paths.
    
    Signed-off-by: Lars Hjemli <hjemli@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on May 25, 2007
  1. Remove git-applypatch

    Junio C Hamano authored
    The previous one removed git-applymbox, which was the sole user
    of this tool.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-applymbox: Remove command

    Petr Baudis authored Junio C Hamano committed
    I believe noone uses git-applymbox, and noone definitely should, since it
    is supposed to be completely superseded and everything by its younger
    cousin git-am. The only known person in the universe to use it was Linus
    and he declared some time ago that he will try to use git-am instead in his
    famous dotest script.
    
    The trouble is that git-applymbox existence creates confusing UI. I'm a bit
    like a recycled newbie to the git porcelain and *I* was confused by
    git-applymbox primitiveness until I've realized a while later that I'm of
    course using the wrong command.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 22, 2007
  1. Merge branch 'jc/attr'

    Junio C Hamano authored
    * 'jc/attr': (28 commits)
      lockfile: record the primary process.
      convert.c: restructure the attribute checking part.
      Fix bogus linked-list management for user defined merge drivers.
      Simplify calling of CR/LF conversion routines
      Document gitattributes(5)
      Update 'crlf' attribute semantics.
      Documentation: support manual section (5) - file formats.
      Simplify code to find recursive merge driver.
      Counto-fix in merge-recursive
      Fix funny types used in attribute value representation
      Allow low-level driver to specify different behaviour during internal merge.
      Custom low-level merge driver: change the configuration scheme.
      Allow the default low-level merge driver to be configured.
      Custom low-level merge driver support.
      Add a demonstration/test of customized merge.
      Allow specifying specialized merge-backend per path.
      merge-recursive: separate out xdl_merge() interface.
      Allow more than true/false to attributes.
      Document git-check-attr
      Change attribute negation marker from '!' to '-'.
      ...
Commits on Apr 14, 2007
  1. Add basic infrastructure to assign attributes to paths

    Junio C Hamano authored
    This adds the basic infrastructure to assign attributes to
    paths, in a way similar to what the exclusion mechanism does
    based on $GIT_DIR/info/exclude and .gitignore files.
    
    An attribute is just a simple string that does not contain any
    whitespace.  They can be specified in $GIT_DIR/info/attributes
    file, and .gitattributes file in each directory.
    
    Each line in these files defines a pattern matching rule.
    Similar to the exclusion mechanism, a later match overrides an
    earlier match in the same file, and entries from .gitattributes
    file in the same directory takes precedence over the ones from
    parent directories.  Lines in $GIT_DIR/info/attributes file are
    used as the lowest precedence default rules.
    
    A line is either a comment (an empty line, or a line that begins
    with a '#'), or a rule, which is a whitespace separated list of
    tokens.  The first token on the line is a shell glob pattern.
    The rest are names of attributes, each of which can optionally
    be prefixed with '!'.  Such a line means "if a path matches this
    glob, this attribute is set (or unset -- if the attribute name
    is prefixed with '!').  For glob matching, the same "if the
    pattern does not have a slash in it, the basename of the path is
    matched with fnmatch(3) against the pattern, otherwise, the path
    is matched with the pattern with FNM_PATHNAME" rule as the
    exclusion mechanism is used.
    
    This does not define what an attribute means.  Tying an
    attribute to various effects it has on git operation for paths
    that have it will be specified separately.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 12, 2007
  1. simple random data generator for tests

    Nicolas Pitre authored Junio C Hamano committed
    Reliance on /dev/urandom produces test vectors that are, well, random.
    This can cause problems impossible to track down when the data is
    different from one test invokation to another.
    
    The goal is not to have random data to test, but rather to have a
    convenient way to create sets of large files with non compressible and
    non deltifiable data in a reproducible way.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 7, 2007
  1. A new merge stragety 'subtree'.

    Junio C Hamano authored
    This merge strategy largely piggy-backs on git-merge-recursive.
    When merging trees A and B, if B corresponds to a subtree of A,
    B is first adjusted to match the tree structure of A, instead of
    reading the trees at the same level.  This adjustment is also
    done to the common ancestor tree.
    
    If you are pulling updates from git-gui repository into git.git
    repository, the root level of the former corresponds to git-gui/
    subdirectory of the latter.  The tree object of git-gui's toplevel
    is wrapped in a fake tree object, whose sole entry has name 'git-gui'
    and records object name of the true tree, before being used by
    the 3-way merge code.
    
    If you are merging the other way, only the git-gui/ subtree of
    git.git is extracted and merged into git-gui's toplevel.
    
    The detection of corresponding subtree is done by comparing the
    pathnames and types in the toplevel of the tree.
    
    Heuristics galore!  That's the git way ;-).
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Apr 1, 2007
  1. Optional Tck/Tk: ignore generated files.

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Mar 14, 2007
  1. Merge branch 'jc/fetch'

    Junio C Hamano authored
    * jc/fetch:
      .gitignore: add git-fetch--tool
      builtin-fetch--tool: fix reflog notes.
      git-fetch: retire update-local-ref which is not used anymore.
      builtin-fetch--tool: make sure not to overstep ls-remote-result buffer.
      fetch--tool: fix uninitialized buffer when reading from stdin
      builtin-fetch--tool: adjust to updated sha1_object_info().
      git-fetch--tool takes flags before the subcommand.
      Use stdin reflist passing in git-fetch.sh
      Use stdin reflist passing in parse-remote
      Allow fetch--tool to read from stdin
      git-fetch: rewrite expand_ref_wildcard in C
      git-fetch: rewrite another shell loop in C
      git-fetch: move more code into C.
      git-fetch--tool: start rewriting parts of git-fetch in C.
      git-fetch: split fetch_main into fetch_dumb and fetch_native
  2. @tytso

    Add git-mergetool to run an appropriate merge conflict resolution pro…

    tytso authored
    …gram
    
    The git-mergetool program can be used to automatically run an appropriate
    merge resolution program to resolve merge conflicts.  It will automatically
    run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Commits on Mar 4, 2007
  1. .gitignore: add git-fetch--tool

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 28, 2007
  1. Merge branch 'js/bundle'

    Junio C Hamano authored
    * js/bundle:
      bundle: reword missing prerequisite error message
      git-bundle: record commit summary in the prerequisite data
      git-bundle: fix 'create --all'
      git-bundle: avoid fork() in verify_bundle()
      git-bundle: assorted fixes
      Add git-bundle: move objects and references by archive
Commits on Feb 25, 2007
  1. Add test-chmtime: a utility to change mtime on files

    Eric Wong authored Junio C Hamano committed
    This is intended to be a portable replacement for our usage
    of date(1), touch(1), and Perl one-liners in tests.
    
    Usage: test-chtime (+|=|-|=+|=-)<seconds> <file>..."
    
      '+' increments the mtime on the files by <seconds>
      '-' decrements the mtime on the files by <seconds>
      '=' sets the mtime on the file to exactly <seconds>
      '=+' and '=-' sets the mtime on the file to <seconds> after or
          before the current time.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 23, 2007
  1. @dscho

    Add git-bundle: move objects and references by archive

    dscho authored Junio C Hamano committed
    Some workflows require use of repositories on machines that cannot be
    connected, preventing use of git-fetch / git-push to transport objects and
    references between the repositories.
    
    git-bundle provides an alternate transport mechanism, effectively allowing
    git-fetch and git-pull to operate using sneakernet transport. `git-bundle
    create` allows the user to create a bundle containing one or more branches
    or tags, but with specified basis assumed to exist on the target
    repository. At the receiving end, git-bundle acts like git-fetch-pack,
    allowing the user to invoke git-fetch or git-pull using the bundle file as
    the URL. git-fetch and git-ls-remote determine they have a bundle URL by
    checking that the URL points to a file, but are otherwise unchanged in
    operation with bundles.
    
    The original patch was done by Mark Levedahl <mdl123@verizon.net>.
    
    It was updated to make git-bundle a builtin, and get rid of the tar
    format: now, the first line is supposed to say "# v2 git bundle", the next
    lines either contain a prerequisite ("-" followed by the hash of the
    needed commit), or a ref (the hash of a commit, followed by the name of
    the ref), and finally the pack. As a result, the bundle argument can be
    "-" now.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 13, 2007
  1. Remove git-diff-stages.

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

    Junio C Hamano authored
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Feb 7, 2007
  1. Remove git-merge-recur

    Junio C Hamano authored
    This was useful when the current recursive was in development, and
    the original Python version was still called git-merge-recursive.
    
    Now the synonym has served us well, it is time to move on.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jan 30, 2007
  1. @spearce

    Merge branch 'master' into sp/gfi

    spearce authored
    git-fast-import requires use of inttypes.h, but the master branch has
    added it to git-compat-util differently than git-fast-import originally
    had used it.  This merge back of master to the fast-import topic is to
    get (and use) inttypes.h the way master is using it.
    
    This is a partially evil merge to remove the call to setup_ident(),
    as the master branch now contains a change which makes this implicit
    and therefore removed the function declaration. (commit 0175476).
    
    Conflicts:
    
    	git-compat-util.h
Commits on Jan 29, 2007
  1. git-fsck-objects is now synonym to git-fsck

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

    [PATCH] Rename git-repo-config to git-config.

    tomprince authored Junio C Hamano committed
    Signed-off-by: Tom Prince <tom.prince@ualberta.net>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jan 14, 2007
  1. @spearce

    Merge branch 'master' into sp/fast-import

    spearce authored
    I'm bringing master in early so that the OBJ_OFS_DELTA implementation
    is available as part of the topic.  This way git-fast-import can
    learn about this new slightly smaller and faster packfile format,
    and can generate them directly rather than needing to have them be
    repacked with git-pack-objects.
    
    Due to the API changes in master during the period of development
    of git-fast-import, a few minor tweaks to fast-import.c are needed
    to produce a working merge.  I've done them here as part of the
    merge to ensure bisection always works.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  2. @spearce

    Created fast-import, a tool to quickly generating a pack from blobs.

    spearce authored
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Commits on Jan 9, 2007
  1. @Benabik

    Ignore git-init and git-remote

    Benabik authored Junio C Hamano committed
    These new commands weren't added to .gitignore.  Add them so we don't
    end up with copies of them in the repo.
    
    Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 27, 2006
  1. @spearce

    Create 'git gc' to perform common maintenance operations.

    spearce authored Junio C Hamano committed
    Junio asked for a 'git gc' utility which users can execute on a
    regular basis to perform basic repository actions such as:
    
     * pack-refs --prune
     * reflog expire
     * repack -a -d
     * prune
     * rerere gc
    
    So here is a command which does exactly that.  The parameters fed
    to reflog's expire subcommand can be chosen by the user by setting
    configuration options in .git/config (or ~/.gitconfig), as users may
    want different expiration windows for each repository but shouldn't
    be bothered to remember what they are all of the time.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Merge branch 'jc/fsck-reflog'

    Junio C Hamano authored
    * jc/fsck-reflog:
      Add git-reflog to .gitignore
      reflog expire: do not punt on tags that point at non commits.
      reflog expire: prune commits that are not incomplete
      Don't crash during repack of a reflog with pruned commits.
      git reflog expire
      Move in_merge_bases() to commit.c
      reflog: fix warning message.
      Teach git-repack to preserve objects referred to by reflog entries.
      Protect commits recorded in reflog from pruning.
      add for_each_reflog_ent() iterator
Something went wrong with that request. Please try again.