summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-104-39/+88
* Multi-backend merge driver.Junio C Hamano2005-09-105-2/+381
* Plug leak in Daniel's read-tree.Junio C Hamano2005-09-101-0/+1
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-102-8/+44
* [PATCH] Disable debugging from read-tree.Junio C Hamano2005-09-101-3/+10
* [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.Daniel Barkalow2005-09-101-0/+92
* [PATCH] Rewrite read-treeDaniel Barkalow2005-09-102-804/+421
* [PATCH] Add function to append to an object_list.Daniel Barkalow2005-09-102-0/+14
* [PATCH] Add a function for getting a struct tree for an ent.Daniel Barkalow2005-09-102-0/+24
* Fix 'git-show-branch --list <head>'Junio C Hamano2005-09-101-1/+1
* Add 'git bisect replay/log' documentation.Junio C Hamano2005-09-101-1/+11
* Keep bisection log so that it can be replayed later.Junio C Hamano2005-09-101-3/+47
* Fix copy marking from diffcore-rename.Junio C Hamano2005-09-102-5/+39
* [PATCH] archimport - add merge detectionmartin@catalyst.net.nz2005-09-101-4/+180
* Make sure we have leading directories under refs/{heads,tags}Junio C Hamano2005-09-101-0/+1
* [PATCH] Documentation/repository-layout.txt typoSven Verdoolaege2005-09-101-1/+1
* show-branch: --list and --independentJunio C Hamano2005-09-092-17/+73
* Retire support for old environment variables.Junio C Hamano2005-09-0913-318/+16
* Adjust .gitignore for big rename.Junio C Hamano2005-09-091-1/+45
* [PATCH] remove duplicate git-send-email-script.perl target in MakefileMarco Roeland2005-09-091-1/+1
* [PATCH] fix tutorial typojdl@freescale.com2005-09-091-1/+1
* [PATCH] Fix tutorial reference to git-*-scripts.jdl@freescale.com2005-09-091-5/+5
* Ignore datestamp-only changes when installing webdoc.Junio C Hamano2005-09-091-1/+1
* Squelch `removal' message from 'git reset --hard'.Junio C Hamano2005-09-081-1/+1
* 'build' scripts before installing.Junio C Hamano2005-09-085-25/+33
* Show all merge-base candidates from show-branch --merge-baseJunio C Hamano2005-09-082-5/+7
* Documentation updates.Junio C Hamano2005-09-074-28/+74
* [PATCH] git-daemon --inetdlars.doelle@on-line.de2005-09-071-1/+3
* git --version tells which version of git you have.Junio C Hamano2005-09-072-2/+13
* [PATCH] Do not create bogus branch from flag to git branchAmos Waterland2005-09-072-0/+43
* [PATCH] Portability fix for Solaris 10/x86Patrick Mauritz2005-09-073-3/+19
* Big tool rename.Junio C Hamano2005-09-07160-915/+1023
* GIT 0.99.6v0.99.6Junio C Hamano2005-09-072-1/+7
|\
| * Merge branch 'master' of . Junio C Hamano2005-09-068-30/+58
| |\
| * \ Merge branch 'master' of . Junio C Hamano2005-09-057-111/+134
| |\ \
| * \ \ Merge branch 'master' of . Junio C Hamano2005-09-0416-35/+374
| |\ \ \
| * \ \ \ Merge branch 'master' of . Junio C Hamano2005-09-0210-44/+208
| |\ \ \ \
| * \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-09-014-31/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-303-291/+965
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-3011-365/+537
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-304-22/+135
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-293-4/+18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-299-36/+242
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-2922-496/+1264
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-295-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-2819-38/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-2811-51/+520
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master branch changes into release candidate branch.Junio C Hamano2005-08-2618-190/+293
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge refs/heads/master from . Junio C Hamano2005-08-2618-35/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Prepare 0.99.6 branch.Junio C Hamano2005-08-242-1/+7