path: root/.gitignore
AgeCommit message (Collapse)Author
2006-09-09Add git-upload-archiveFranck Bui-Huu
This command implements the git archive protocol on the server side. This command is not intended to be used by the end user. Underlying git-archive command line options are sent over the protocol from "git-archive --remote=...", just like upload-tar currently does with "git-tar-tree=...". As for "git-archive" command implementation, this new command does not execute any existing "git-{tar,zip}-tree" but rely on the archive API defined by "git-archive" patch. Hence we get 2 good points: - "git-archive" and "git-upload-archive" share all option parsing code. - All kind of git-upload-{tar,zip} can be deprecated. Signed-off-by: Franck Bui-Huu <> Signed-off-by: Junio C Hamano <>
2006-09-09Add git-archiveFranck Bui-Huu
git-archive is a command to make TAR and ZIP archives of a git tree. It helps prevent a proliferation of git-{format}-tree commands. Instead of directly calling git-{tar,zip}-tree command, it defines a very simple API, that archiver should implement and register in "git-archive.c". This API is made up by 2 functions whose prototype is defined in "archive.h" file. - The first one is used to parse 'extra' parameters which have signification only for the specific archiver. That would allow different archive backends to have different kind of options. - The second one is used to ask to an archive backend to build the archive given some already resolved parameters. The main reason for making this API is to avoid using git-{tar,zip}-tree commands, hence making them useless. Maybe it's time for them to die ? It also implements remote operations by defining a very simple protocol: it first sends the name of the specific uploader followed the repository name (git-upload-tar git:// Then it sends options. It's done by sending a sequence of one argument per packet, with prefix "argument ", followed by a flush. The remote protocol is implemented in "git-archive.c" for client side and is triggered by "--remote=<repo>" option. For example, to fetch a TAR archive in a remote repo, you can issue: $ git archive --format=tar --remote=git://xxx/yyy/zzz.git HEAD We choose to not make a new command "git-fetch-archive" for example, avoind one more GIT command which should be nice for users (less commands to remember, keeps existing --remote option). Signed-off-by: Franck Bui-Huu <> Acked-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
2006-09-07autoconf: Add config.cache to .gitignoreJakub Narebski
Add generated file config.cache (default cache file, when running ./configure with -C, --config-cache option) to the list of ignored files. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2006-08-28Add git-zip-tree to .gitignoreRene Scharfe
Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
2006-08-28Merge branch 'js/c-merge-recursive'Junio C Hamano
* js/c-merge-recursive: (21 commits) discard_cache(): discard index, even if no file was mmap()ed merge-recur: do not die unnecessarily merge-recur: try to merge older merge bases first merge-recur: if there is no common ancestor, fake empty one merge-recur: do not setenv("GIT_INDEX_FILE") merge-recur: do not call git-write-tree merge-recursive: fix rename handling .gitignore: git-merge-recur is a built file. merge-recur: virtual commits shall never be parsed merge-recur: use the unpack_trees() interface instead of exec()ing read-tree merge-recur: fix thinko in unique_path() Makefile: git-merge-recur depends on xdiff libraries. merge-recur: Explain why sha_eq() and struct stage_data cannot go merge-recur: Cleanup last mixedCase variables... merge-recur: Fix compiler warning with -pedantic merge-recur: Remove dead code merge-recur: Get rid of debug code merge-recur: Convert variable names to lower_case Cumulative update of merge-recursive in C recur vs recursive: help testing without touching too many stuff. ... This is an evil merge that removes TEST script from the toplevel.
2006-08-13Merge branch 'lt/web'Junio C Hamano
2006-08-09autoconf: clean temporary file mak.appendJunio C Hamano
When configure is interrupted in the middle it leaves config.mak.append behind. Add it to .gitignore and make sure $(MAKE) clean removes it. Also earlier .gitignore listed which is a tracked file. Fix it. Signed-off-by: Junio C Hamano <>
2006-08-06Add gitweb.cgi to .gitignoreMatthias Kestenholz
Signed-off-by: Matthias Kestenholz <> Signed-off-by: Junio C Hamano <>
2006-08-03.gitignore: git-merge-recur is a built file.Junio C Hamano
Also it is OK to omit the documentation for it at least for now. Signed-off-by: Junio C Hamano <>
2006-07-30Merge branch 'jn/make'Junio C Hamano
* jn/make: Set datarootdir in Quote all calls to GIT_CONF_APPEND_LINE Typofix in comment. vertical whitespace usage cleanup autoconf: Checks for some programs autoconf: Checks for libraries autoconf: Checks for some library functions. autoconf: Checks for typedefs, structures, and compiler characteristics. autoconf: Preparing the way for autodetection Copy description of build configuration variables to Teach make clean about configure and autoconf autoconf: Use autoconf to write installation directories to config.mak.autogen
2006-07-07git-svn: migrate out of contribEric Wong
Allow NO_SVN_TESTS to be defined to skip git-svn tests. These tests are time-consuming due to SVN being slow, and even more so if SVN Perl libraries are not available. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-07-03autoconf: Use autoconf to write installation directories to config.mak.autogenJakub Narebski
This is beginning of patch series introducing installation configuration using autoconf (and no other autotools) to git. The idea is to generate config.mak.autogen using ./configure (generated from by running autoconf) from, so one can use autoconf as an _alternative_ to ordinary Makefile, and creating one's own config.mak. Local settings in config.mak override generated settings in config.mak.autogen This patch includes minimal and, so one can set installation directories using autoconf generated ./configure script e.g. ./configure --prefix=/usr Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2006-07-02Add git-instaweb, instantly browse the working repo with gitwebEric Wong
I got tired of having to configure gitweb for every repository I work on. I sometimes prefer gitweb to standard GUIs like gitk or gitview; so this lets me automatically configure gitweb to browse my working repository and also opens my browser to it. Updates from the original patch: Added Apache/mod_perl2 compatibility if Dennis Stosberg's gitweb has been applied, too: <> General cleanups in shell code usage. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-06-22add GIT-CFLAGS to .gitignoreMatthias Kestenholz
Signed-off-by: Matthias Kestenholz <> Signed-off-by: Junio C Hamano <>
2006-06-21Retire git-clone-packJunio C Hamano
The program is not used by git-clone since git-fetch-pack was extended to allow its caller do what git-clone-pack alone did, and git-clone was updated to use it. Signed-off-by: Junio C Hamano <>
2006-05-29Merge branch 'jc/cache-tree'Junio C Hamano
* jc/cache-tree: (26 commits) builtin-rm: squelch compiler warnings. git-write-tree writes garbage on sparc64 Fix crash when reading the empty tree fsck-objects: do not segfault on missing tree in cache-tree cache-tree: a bit more debugging support. read-tree: invalidate cache-tree entry when a new index entry is added. Fix test-dump-cache-tree in one-tree disappeared case. fsck-objects: mark objects reachable from cache-tree cache-tree: replace a sscanf() by two strtol() calls cache-tree.c: typefix test-dump-cache-tree: validate the cached data as well. cache_tree_update: give an option to update cache-tree only. read-tree: teach 1-way merege and plain read to prime cache-tree. read-tree: teach 1 and 2 way merges about cache-tree. update-index: when --unresolve, smudge the relevant cache-tree entries. test-dump-cache-tree: report number of subtrees. cache-tree: sort the subtree entries. Teach fsck-objects about cache-tree. index: make the index file format extensible. cache-tree: protect against "git prune". ... Conflicts: Makefile, builtin.h, git.c: resolved the same way as in next.
2006-05-25Built git-upload-tar should be ignored.Shawn Pearce
Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2006-05-23Add git-quiltimport to .gitignore.Peter Eriksen
Signed-off-by: Peter Eriksen <> Signed-off-by: Junio C Hamano <>
2006-04-24Add test-dump-cache-treeJunio C Hamano
This was useful in diagnosing the corrupt index.aux format problem. But do not bother building or installing it by default. Signed-off-by: Junio C Hamano <>
2006-04-05Add git-clean commandPavel Roskin
This command removes untracked files from the working tree. This implementation is based on cg-clean with some simplifications. The documentation is included. [jc: with trivial documentation fix, noticed by Jakub Narebski] Signed-off-by: Pavel Roskin <> Signed-off-by: Junio C Hamano <>
2006-03-27add clean and ignore rules for xdiff/Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-03-11Add git-imap-send, derived from isync 1.0.1.Mike McCormack
git-imap-send drops a patch series generated by git-format-patch into an IMAP folder. This allows patch submitters to send patches through their own mail program. git-imap-send uses the following values from the GIT repository configuration: The target IMAP folder: [imap] Folder = "INBOX.Drafts" A command to open an ssh tunnel to the imap mail server. [imap] Tunnel = "ssh -q /usr/bin/imapd ./Maildir 2> /dev/null" [imap] Host = User = bob Password = pwd Port = 143
2006-03-09Nicer output from 'git'Fredrik Kuivinen
[jc: with suggestions by Jan-Benedict Glaw] Signed-off-by: Fredrik Kuivinen <> Signed-off-by: Junio C Hamano <>
2006-03-05gitignore: Ignore some more boring things.Mark Wooding
Signed-off-by: Mark Wooding <> Signed-off-by: Junio C Hamano <>
2006-02-25Add missing programs to ignore listShawn Pearce
Added recently added programs to the default exclude list. Signed-off-by: Junio C Hamano <>
2006-02-23Add new git-rm command with documentationCarl Worth
This adds a git-rm command which provides convenience similar to git-add, (and a bit more since it takes care of the rm as well if given -f). Like git-add, git-rm expands the given path names through git-ls-files. This means it only acts on files listed in the index. And it does act recursively on directories by default, (no -r needed as in the case of rm itself). When it recurses, it does not remove empty directories that are left behind. Signed-off-by: Junio C Hamano <>
2006-02-07.gitignore git-rerere and config.makAndreas Ericsson
Signed-off-by: Andreas Ericsson <> Signed-off-by: Junio C Hamano <>
2006-02-06git-showJunio C Hamano
This is essentially 'git whatchanged -n1 --always --cc "$@"'. Just like whatchanged takes default flags from whatchanged.difftree configuration, this uses show.difftree configuration. Signed-off-by: Junio C Hamano <>
2006-01-11Add git-describe to .gitignore.Tom Prince
Signed-off-by: Junio C Hamano <>
2006-01-06Merge fixes up to GIT 1.0.7Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-01-06trivial: .gitignore precompiled python modulesAlex Riesen
Signed-off-by: Alex Riesen <> Signed-off-by: Junio C Hamano <>
2005-12-28Makefile: use git-describe to mark the git version.Junio C Hamano
Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <>
2005-12-20Remove "octopus".Junio C Hamano
We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <>
2005-11-24Rename git-config-set to git-repo-configJohannes Schindelin
... and adjust all references. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-11-20Add git-config-set, a simple helper for scripts to set config variablesJohannes Schindelin
This is meant for the end user, who cannot be expected to edit .git/config by hand. Example: git-config-set core.filemode true will set filemode in the section [core] to true, git-config-set --unset core.filemode will remove the entry (failing if it is not there), and git-config-set --unset diff.twohead ^recar will remove the unique entry whose value matches the regex "^recar" (failing if there is no unique such entry). It is just a light wrapper around git_config_set() and git_config_set_multivar(). Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-11-14Remove git-rename. git-mv does the sameJosef Weidendorfer
Signed-off-by: Josef Weidendorfer <> Signed-off-by: Junio C Hamano <>
2005-11-13Rename lost+found to lost-found.Junio C Hamano
Because we use "lost-found" as the directory name to hold dangling object names, it is confusing to call the command git-lost+found, although it makes sense and is even cute ;-). Signed-off-by: Junio C Hamano <>
2005-11-12Ignore built git-lost+found.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-11-12Rename git-pack-intersect to git-pack-redundantLukas_Sandström
This patch renames git-pack-intersect to git-pack-redundant as suggested by Petr Baudis. The new name reflects what the program does, rather than how it does it. Also fix a small argument parsing bug. Signed-off-by: Lukas Sandström <> Signed-off-by: Junio C Hamano <>
2005-11-12Add git-pack-intersect to .gitignoreLukas_Sandström
Signed-off-by: Lukas Sandström <> Signed-off-by: Junio C Hamano <>
2005-11-08Ignore more generated files.Junio C Hamano
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 <>
2005-11-03Add 'ours' merge strategy.Junio C Hamano
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 <>
2005-10-28Add more generated files to .gitignoreJohannes Schindelin
git-name-rev, git-mv and git-shell are recent additions to git. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-21Make git-cherry-pick in target "all"Johannes Schindelin
Since git-cherry-pick is simply a copy of git-revert, it can be created before installing (so that it can be used without installing, too). Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-18Ignore more generated filesJohannes Schindelin
Since git-status now shows the "other" files, too, bring .gitignore up-to-date. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-10-17ref-format documentation.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-10-15Add new programs and stamp file to .gitignore.Tom Prince
Signed-off-by: Tom Prince <> Signed-off-by: Junio C Hamano <>
2005-10-03Merge with Anvin
2005-10-02Add git-symbolic-refJunio C Hamano
This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano <>
2005-09-29Ignore *.exe filesPeter Anvin