aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAge
* Remove git-rename. git-mv does the sameJosef Weidendorfer2005-11-14
| | | | | Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Rename lost+found to lost-found.Junio C Hamano2005-11-13
| | | | | | | | 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>
* Ignore built git-lost+found.Junio C Hamano2005-11-11
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Rename git-pack-intersect to git-pack-redundantLukas_Sandström2005-11-11
| | | | | | | | | | | 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>
* Add git-pack-intersect to .gitignoreLukas_Sandström2005-11-11
| | | | | Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Ignore more generated files.Junio C Hamano2005-11-07
| | | | | | | 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>
* Add 'ours' merge strategy.Junio C Hamano2005-11-03
| | | | | | | | | | | | | 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>
* Add more generated files to .gitignoreJohannes Schindelin2005-10-28
| | | | | | | 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>
* Make git-cherry-pick in target "all"Johannes Schindelin2005-10-20
| | | | | | | | 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>
* Ignore more generated filesJohannes Schindelin2005-10-18
| | | | | | | | 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>
* ref-format documentation.Junio C Hamano2005-10-16
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add new programs and stamp file to .gitignore.Tom Prince2005-10-14
| | | | | Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin2005-10-03
|\
| * Add git-symbolic-refJunio C Hamano2005-10-01
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Ignore *.exe filesPeter Anvin2005-09-28
|/
* [PATCH] Add new programs to .gitignore.Tom Prince2005-09-28
| | | | | Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Really ignore generated distribution material.Junio C Hamano2005-09-24
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge 'fixes' branch.Junio C Hamano2005-09-23
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Ignore a bit more generated files.Junio C Hamano2005-09-23
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Retire diff-helper.Junio C Hamano2005-09-22
| | | | | | | | | | | | | | 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>
* | Retire rev-tree.Junio C Hamano2005-09-22
| | | | | | | | | | | | | | | | 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>
* | Retire git-export.Junio C Hamano2005-09-22
|/ | | | | | | | | | | | 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>
* Add git-send-email to .gitignoreJunio C Hamano2005-09-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Be more backward compatible with git-ssh-{push,pull}.Junio C Hamano2005-09-15
| | | | | | | | HPA reminded me that these programs knows about the name of the counterpart on the other end and simply symlinking the old name to new name locally would not be enough. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Retire info/rev-cacheJunio C Hamano2005-09-15
| | | | | | | It was one of those things that were well intentioned but did not turn out to be useful in practice. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-13
| | | | | | | | Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-grep and link it from the main git(7) page.Junio C Hamano2005-09-12
| | | | | | Also adjust missing description in the git.txt page while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10
| | | | | | | | | | | I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Adjust .gitignore for big rename.Junio C Hamano2005-09-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Big tool rename.Junio C Hamano2005-09-07
| | | | | | | | | | | | | | | | | | | As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
Ignore generated files. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>