summaryrefslogtreecommitdiff
path: root/.gitignore
AgeCommit message (Collapse)AuthorFilesLines
2006-05-24Merge branch 'jc/fetchupload' into nextLibravatar Junio C Hamano1-0/+1
* jc/fetchupload: fetch-pack: give up after getting too many "ack continue" cat-file: document -p option Built git-upload-tar should be ignored. ls-remote: fix rsync:// to report HEAD
2006-05-24Built git-upload-tar should be ignored.Libravatar Shawn Pearce1-0/+1
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-23Merge branch 'master' into nextLibravatar Junio C Hamano1-0/+1
* master: Add git-quiltimport to .gitignore. cvsimport: introduce _fetchfile() method and used a 1M buffer to read() cvsimport: cleanup commit function cvsimport: use git-update-index --index-info git status: skip empty directories, and add -u to show all untracked files cvsimport: repack every kilo-commits. cvsimport: introduce -L<imit> option to workaround memory leaks
2006-05-23Add git-quiltimport to .gitignore.Libravatar Peter Eriksen1-0/+1
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Retire rabinpoly fingerprinting codeLibravatar Junio C Hamano1-1/+0
For now let's retire this and reintroduce it as part of the updated pack-objects series from Geert when it is ready. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-24Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano1-0/+1
* jc/cache-tree: index: make the index file format extensible. cache-tree: protect against "git prune". Add test-dump-cache-tree
2006-04-24Add test-dump-cache-treeLibravatar Junio C Hamano1-0/+1
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 <junkio@cox.net>
2006-04-19Merge branch 'jc/unresolve' into nextLibravatar Junio C Hamano1-1/+0
* jc/unresolve: git-update-index --unresolve
2006-04-19git-update-index --unresolveLibravatar Junio C Hamano1-1/+0
Retire git-unresolve and make it into "git-update-index --unresolve". It processes all paths that follow. During a merge, you would mark a path that is dealt with with: $ git update-index hello and you would "undo" it with: $ git update-index --unresolve hello Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Merge branch 'jc/unresolve' into nextLibravatar Junio C Hamano1-0/+1
* jc/unresolve: Add git-unresolve <paths>... get_tree_entry(): make it available from tree-walk sha1_name.c: no need to include diff.h; tree-walk.h will do. sha1_name.c: prepare to make get_tree_entry() reusable from others. pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance. diff: move diff.c to diff-lib.c to make room. git log: don't do merge diffs by default Allow "git repack" users to specify repacking window/depth
2006-04-19Add git-unresolve <paths>...Libravatar Junio C Hamano1-0/+1
This is an attempt to address the issue raised on #git channel recently by Carl Worth. After a conflicted automerge, "git diff" shows a combined diff to give you how the tentative automerge result differs from what came from each branch. During a complex merge, it is tempting to be able to resolve a few paths at a time, mark them "I've dealt with them" with git-update-index to unclutter the next "git diff" output, and keep going. However, when the final result does not compile or otherwise found to be a mismerge, the workflow to fix the mismerged paths suddenly changes to "git diff HEAD -- path" (to get a diff from our HEAD before merging) and "git diff MERGE_HEAD -- path" (to get a diff from theirs), and it cannot show the combined anymore. With git-unresolve <paths>..., the versions from our branch and their branch for specified blobs are placed in stage #2 and stage #3, without touching the working tree files. This gives you the combined diff back for easier review, along with "diff --ours" and "diff --theirs". One thing it does not do is to place the base in stage #1; this means "diff --base" would behave differently between the run immediately after a conflicted three-way merge, and the run after an update-index by mistake followed by a git-unresolve. We could theoretically run merge-base between HEAD and MERGE_HEAD to find which tree to place in stage #1, but reviewing "diff --base" is not that useful so.... Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-15Clean-up Geert's similarity fingerprint code.Libravatar Junio C Hamano1-0/+1
This splits Geert's similarity fingerprint code into main program and fingerprinting function. The next step would be to try using this in pack-objects.c::try_delta() -- which would be a good evaluation. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-05Add git-clean commandLibravatar Pavel Roskin1-0/+1
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 <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-26add clean and ignore rules for xdiff/Libravatar Junio C Hamano1-2/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-10Add git-imap-send, derived from isync 1.0.1.Libravatar Mike McCormack1-0/+1
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 user@imap.server.com /usr/bin/imapd ./Maildir 2> /dev/null" [imap] Host = imap.server.com User = bob Password = pwd Port = 143
2006-03-09Nicer output from 'git'Libravatar Fredrik Kuivinen1-0/+1
[jc: with suggestions by Jan-Benedict Glaw] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-05gitignore: Ignore some more boring things.Libravatar Mark Wooding1-0/+1
Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-24Add missing programs to ignore listLibravatar Shawn Pearce1-0/+4
Added recently added programs to the default exclude list. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-22Add new git-rm command with documentationLibravatar Carl Worth1-0/+1
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 <junkio@cox.net>
2006-02-07.gitignore git-rerere and config.makLibravatar Andreas Ericsson1-0/+2
Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-05git-showLibravatar Junio C Hamano1-0/+1
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 <junkio@cox.net>
2006-01-11Add git-describe to .gitignore.Libravatar Tom Prince1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Merge fixes up to GIT 1.0.7Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: .gitignore precompiled python modulesLibravatar Alex Riesen1-0/+1
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Makefile: use git-describe to mark the git version.Libravatar Junio C Hamano1-0/+1
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 <junkio@cox.net>
2005-12-19Remove "octopus".Libravatar Junio C Hamano1-1/+0
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 <junkio@cox.net>
2005-11-24Rename git-config-set to git-repo-configLibravatar Johannes Schindelin1-1/+1
... and adjust all references. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-19Add git-config-set, a simple helper for scripts to set config variablesLibravatar Johannes Schindelin1-0/+1
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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-14Remove git-rename. git-mv does the sameLibravatar Josef Weidendorfer1-1/+0
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-13Rename lost+found to lost-found.Libravatar Junio C Hamano1-1/+1
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 <junkio@cox.net>
2005-11-11Ignore built git-lost+found.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-11Rename git-pack-intersect to git-pack-redundantLibravatar Lukas_Sandström1-1/+1
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 <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-11Add git-pack-intersect to .gitignoreLibravatar Lukas_Sandström1-0/+1
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-07Ignore more generated files.Libravatar Junio C Hamano1-0/+4
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>
2005-11-03Add 'ours' merge strategy.Libravatar Junio C Hamano1-0/+1
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>
2005-10-28Add more generated files to .gitignoreLibravatar Johannes Schindelin1-0/+3
git-name-rev, git-mv and git-shell are recent additions to git. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-20Make git-cherry-pick in target "all"Libravatar Johannes Schindelin1-0/+1
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 <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-18Ignore more generated filesLibravatar Johannes Schindelin1-0/+3
Since git-status now shows the "other" files, too, bring .gitignore up-to-date. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-16ref-format documentation.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-14Add new programs and stamp file to .gitignore.Libravatar Tom Prince1-0/+3
Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Merge with master.kernel.org:/pub/scm/git/git.gitLibravatar Peter Anvin1-0/+1
2005-10-01Add git-symbolic-refLibravatar Junio C Hamano1-0/+1
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 <junio@twinsun.com>
2005-09-28Ignore *.exe filesLibravatar Peter Anvin1-0/+1
2005-09-28[PATCH] Add new programs to .gitignore.Libravatar Tom Prince1-0/+2
Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-24Really ignore generated distribution material.Libravatar Junio C Hamano1-4/+5
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-23Merge 'fixes' branch.Libravatar Junio C Hamano1-0/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-23Ignore a bit more generated files.Libravatar Junio C Hamano1-0/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-22Retire diff-helper.Libravatar Junio C Hamano1-1/+0
The textual diff generation with built-in '-p' in diff-* brothers has proven to be useful enough that git-diff-helper outlived its usefulness. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-22Retire rev-tree.Libravatar Junio C Hamano1-1/+0
Some old scripts might still use git-rev-tree, but it really is clearly inferior in every way to git-rev-list that such scripts should be fixed anyway. Fixing them should be pretty easy. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-22Retire git-export.Libravatar Junio C Hamano1-1/+0
git-export was done as a concept example on how easy it is to export the git data to something else. It's much less powerful than any number of trivial one-liner scripts now, and real exporters would not ever use git-export. It's obviously much less powerful than "git-whatchanged", or just about any combination of git-rev-list + git-diff-tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:34:41 +0000