summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2007-04-03GIT 1.5.1v1.5.1Junio C Hamano3-16/+187
2007-04-03Merge 1.5.0.7 inJunio C Hamano3-4/+44
2007-04-03GIT 1.5.0.7v1.5.0.7Junio C Hamano3-2/+20
2007-04-03Documentation: A few minor fixes to Git User's ManualJakub Narebski1-10/+10
2007-04-03Plug memory leak in index-pack collision checking codepath.Nicolas Pitre1-0/+1
2007-04-03rerere should not repeat the earlier hunks in later onesJunio C Hamano2-4/+26
2007-04-02Hopefully final update to the draft Release Notes, preparing for 1.5.1Junio C Hamano1-8/+15
2007-03-31cvsserver: Don't lie about binary mode in asciidoc documentationFrank Lichtenheld1-3/+5
2007-03-31git-svn: fail on rebase if we are unable to find a ref to rebase againstEric Wong1-0/+3
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen1-6/+31
2007-03-31contrib/workdir: add a simple script to create a working directoryJulian Phillips1-0/+57
2007-03-31Reimplement emailing part of hooks--update in contrib/hooks/post-receive-emailAndy Parkins2-0/+605
2007-03-31git-svn: avoid respewing similar error messages for missing pathsEric Wong1-5/+11
2007-03-31Rename warn() to warning() to fix symbol conflicts on BSD and Mac OSTheodore Ts'o5-6/+6
2007-03-31git-mailinfo fixes for patch mungingDon Zickus2-12/+13
2007-03-31gitweb: Support comparing blobs (files) with different namesJakub Narebski1-2/+2
2007-03-30Do not bother documenting fetch--toolJunio C Hamano1-1/+1
2007-03-30Update draft release notes for 1.5.1Junio C Hamano1-1/+6
2007-03-29Merge branch 'maint'Junio C Hamano2-9/+9
2007-03-29git-quiltimport /bin/sh-ism fixFrancis Daly1-1/+1
2007-03-29Bisect: Improve error message in "bisect_next_check".Christian Couder1-7/+9
2007-03-29Merge branch 'master' of git://repo.or.cz/git/mergetool.gitJunio C Hamano2-81/+87
2007-03-29mergetool: Clean up description of files and prompts for merge resolutionsTheodore Ts'o1-12/+15
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictTheodore Ts'o1-1/+1
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandTheodore Ts'o1-2/+14
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesTheodore Ts'o1-4/+4
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setTheodore Ts'o1-1/+1
2007-03-29mergetool: factor out common codeTheodore Ts'o1-42/+36
2007-03-29mergetool: portability fix: don't use reserved word functionTheodore Ts'o1-5/+5
2007-03-29mergetool: portability fix: don't assume true is in /binTheodore Ts'o1-2/+2
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedTheodore Ts'o1-6/+5
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableTheodore Ts'o1-14/+12
2007-03-29Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o1-5/+5
2007-03-29git-upload-pack: make sure we close unused pipe endsH. Peter Anvin1-0/+1
2007-03-29Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.Gerrit Pape1-8/+8
2007-03-29Documentation/git-svnimport.txt: fix typo.Gerrit Pape1-1/+1
2007-03-28GIT 1.5.1-rc3v1.5.1-rc3Junio C Hamano1-1/+1
2007-03-28Update main git.html page to point at 1.5.0.6 documentationJunio C Hamano1-1/+3
2007-03-28Merge branch 'maint' to synchronize with 1.5.0.6Junio C Hamano3-3/+28
2007-03-28GIT 1.5.0.6v1.5.0.6Junio C Hamano3-2/+24
2007-03-28commit: fix pretty-printing of messages with "\nencoding "Jeff King1-2/+5
2007-03-28t4118: be nice to non-GNU sedJohannes Schindelin1-1/+2
2007-03-28t/t6006: add tests for a slightly more complex commit messagesJeff King1-0/+42
2007-03-28Fix "--pretty=format:" encoding itemJeff King1-1/+2
2007-03-28Fix "--pretty=format:" for parent related items.Junio C Hamano2-8/+12
2007-03-28http-fetch: remove path_len from struct alt_base, it was computed but never usedGerrit Pape1-17/+3
2007-03-28http-fetch: don't use double-slash as directory separator in URLsGerrit Pape3-11/+14
2007-03-28git-commit: "read-tree -m HEAD" is not the right way to read-tree quicklyJunio C Hamano1-1/+1
2007-03-27Add some basic tests of rev-list --pretty=formatJeff King1-0/+108
2007-03-27git-upload-pack: make sure we close unused pipe endsH. Peter Anvin1-0/+1
2007-03-27--pretty=format: fix broken %ct and %at interpolationJeff King1-1/+1
2007-03-27use xrealloc in help.cJames Bowes1-11/+1
2007-03-27read-tree: use xcallocJames Bowes1-1/+1
2007-03-27Fix "getaddrinfo()" bugletLinus Torvalds1-1/+3
2007-03-27Makefile: remove test-chmtime program in target clean.Gerrit Pape1-1/+1
2007-03-27gitweb: Cleanup and uniquify die_error callsJakub Narebski1-3/+3
2007-03-27sha1_file.c (write_sha1_file): Detect close failureJunio C Hamano1-1/+2
2007-03-27git.el: Display some information about the HEAD commit.Alexandre Julliard1-2/+20
2007-03-27Document git-log --first-parentJunio C Hamano1-0/+5
2007-03-27Bisect: add checks at the beginning of "git bisect run".Christian Couder1-0/+8
2007-03-27sha1_file.c (write_sha1_from_fd): Detect close failure.Jim Meyering1-1/+2
2007-03-27git-rm: don't remove newly added file without -fJeff King1-14/+4
2007-03-25Bisect: Use "git-show-ref --verify" when reseting.Christian Couder1-1/+1
2007-03-25gitweb: Add example of config file and how to generate projects list to gitwe...Jakub Narebski1-2/+43
2007-03-25GIT 1.5.1-rc2v1.5.1-rc2Junio C Hamano2-14/+41
2007-03-25git-svn: fix rel_path() when not connected to the repository rootEric Wong1-2/+4
2007-03-25use xmalloc in git.c and help.cJames Bowes2-2/+2
2007-03-25Merge branch 'jc/fpl'Junio C Hamano2-5/+12
2007-03-25Update README to point at a few key periodical messages to the listJunio C Hamano1-0/+6
2007-03-25Merge branch 'maint'Junio C Hamano4-453/+416
2007-03-25Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano4-453/+416
2007-03-25Merge branch 'js/remote-show-push'Junio C Hamano1-1/+15
2007-03-25Merge branch 'maint'Junio C Hamano2-1/+185
2007-03-24Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen3-18/+12
2007-03-24Document --quiet option to git-diffAlex Riesen1-0/+3
2007-03-24write_sha1_from_fd() should make new objects read-onlyNicolas Pitre1-0/+1
2007-03-24make it more obvious that temporary files are temporary filesNicolas Pitre3-6/+6
2007-03-24update-hook: remove e-mail sending hook.Andy Parkins1-222/+3
2007-03-24gitweb: Add some installation notes in gitweb/INSTALLJakub Narebski1-0/+184
2007-03-24gitweb: Fix not marking signoff lines in "log" viewJakub Narebski1-1/+1
2007-03-24gitweb: Don't escape attributes in CGI.pm HTML methodsJakub Narebski1-3/+3
2007-03-24gitweb: Change to use explicitly function call cgi->escapHTML()Li Yang1-2/+2
2007-03-24git-am documentation: describe what is taken from where.Junio C Hamano1-0/+27
2007-03-24git-revert: Revert revert message to old behaviourJohannes Schindelin1-5/+5
2007-03-23Merge branch 'maint'Junio C Hamano1-1/+1
2007-03-23Documentation: bisect: make a comment fit better in the man page.Christian Couder1-3/+3
2007-03-23Documentation: bisect: add some titles to some paragraphs.Christian Couder1-0/+21
2007-03-23Documentation: bisect: reformat more paragraphs.Christian Couder1-34/+39
2007-03-23Documentation: bisect: reword one paragraph.Christian Couder1-3/+3
2007-03-23Documentation: bisect: reformat some paragraphs.Christian Couder1-6/+6
2007-03-23Fix path-limited "rev-list --bisect" termination condition.Junio C Hamano1-1/+1
2007-03-23gitweb: Fix "next" link in commit viewJakub Narebski1-1/+1
2007-03-23git-bisect.sh: properly dq $GIT_DIRJunio C Hamano1-1/+1
2007-03-23git-bisect: typofixJunio C Hamano1-1/+1
2007-03-23checkout: report where the new HEAD is upon detaching HEADJunio C Hamano1-2/+10
2007-03-23Bisect: implement "git bisect run <cmd>..." to automatically bisect.Christian Couder3-3/+138
2007-03-23Bisect: convert revs given to good and bad to commitsUwe Kleine-König1-2/+2
2007-03-22t4118: be nice to non-GNU sedJohannes Schindelin1-1/+2
2007-03-22git-apply: Do not free the wrong buffer when we convert the data for writeoutJunio C Hamano1-7/+10
2007-03-22Merge git://git2.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-2/+2
2007-03-22Merge branch 'maint'Junio C Hamano2-5/+7
2007-03-22Documentation/pack-format.txt: Clear up description of types.Peter Eriksen1-4/+6
2007-03-22update HEAD reflog when branch pointed to by HEAD is directly modifiedNicolas Pitre1-0/+21
2007-03-22update-hook: abort early if the project description is unsetAndy Parkins1-0/+6
2007-03-22git-merge: Put FETCH_HEAD data in merge commit messageMichael S. Tsirkin1-0/+4
2007-03-22git-rebase: make 'rebase HEAD branch' work as expected.Junio C Hamano1-4/+4
2007-03-22tree_entry_interesting(): allow it to say "everything is interesting"Junio C Hamano1-5/+28
2007-03-22tree-diff: avoid strncmp()Junio C Hamano1-23/+37
2007-03-22Teach tree_entry_interesting() that the tree entries are sorted.Junio C Hamano1-6/+35
2007-03-21Switch over tree descriptors to contain a pre-parsed entryLinus Torvalds2-62/+57
2007-03-21Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds15-62/+60
2007-03-21Remove "pathlen" from "struct name_entry"Linus Torvalds6-15/+14
2007-03-21[PATCH] prefer "git COMMAND" over "git-COMMAND" in gitkBrandon Casey1-2/+2
2007-03-21fix typo in git-am manpageMichael S. Tsirkin1-1/+1
2007-03-20blame: cmp_suspect is not "cmp" anymore.Junio C Hamano1-13/+13
2007-03-20minor git-prune optimizationNicolas Pitre1-4/+4
2007-03-20improve checkout message when asking for same branchNicolas Pitre1-1/+6
2007-03-20Be more careful about zlib return valuesLinus Torvalds1-4/+9
2007-03-20Don't ever return corrupt objects from "parse_object()"Linus Torvalds1-2/+4
2007-03-20index-pack: more validation checks and cleanupsNicolas Pitre1-9/+9
2007-03-20index-pack: use hash_sha1_file()Nicolas Pitre3-23/+4
2007-03-20don't ever allow SHA1 collisions to exist by fetching a packNicolas Pitre2-4/+27
2007-03-20Teach git-remote to list pushed branches.Johannes Sixt1-1/+15
2007-03-20git-fetch: Fix single_force in append_fetch_headSanti Béjar1-2/+2
2007-03-19Merge git://git2.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-0/+2
2007-03-19make git clone -q suppress the noise with http fetchChris Wright1-1/+2
2007-03-19Fix loose object uncompression check.Linus Torvalds1-2/+15
2007-03-19contrib/continuous: a continuous integration build managerShawn O. Pearce2-0/+607
2007-03-19Provide some technical documentation for shallow clonesJohannes Schindelin1-0/+49
2007-03-19Add a HOWTO for setting up a standalone git daemonJohannes Schindelin1-0/+52
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin1-2/+20
2007-03-19blame: micro-optimize cmp_suspect()Junio C Hamano1-3/+2
2007-03-19Replace remaining instances of strdup with xstrdup.James Bowes3-3/+3
2007-03-19use a LRU eviction policy for the delta base cacheNicolas Pitre1-8/+31
2007-03-19clean up the delta base cache size a bitNicolas Pitre1-3/+3
2007-03-19GIT 1.5.1-rc1v1.5.1-rc1Junio C Hamano2-2/+50
2007-03-19Fix merge-indexJunio C Hamano1-1/+2
2007-03-19Set up for better tree diff optimizationsLinus Torvalds1-10/+34
2007-03-19Trivial cleanup of track_tree_refs()Linus Torvalds1-3/+1
2007-03-19git.el: Add support for commit hooks.Alexandre Julliard1-24/+57
2007-03-18Merge branch 'jb/gc'Junio C Hamano5-1/+82
2007-03-18Merge branch 'fl/cvsserver'Junio C Hamano1-1/+12
2007-03-18Limit the size of the new delta_base_cacheShawn O. Pearce5-4/+46
2007-03-18Merge branch 'sp/run-command'Junio C Hamano11-234/+146
2007-03-18Make git-send-email aware of Cc: lines.J. Bruce Fields2-5/+6
2007-03-18user-manual: introduce "branch" and "branch head" differentlyJ. Bruce Fields1-22/+21
2007-03-18glossary: clean up cross-referencesJ. Bruce Fields1-29/+29
2007-03-18glossary: stop generating automaticallyJ. Bruce Fields4-428/+392
2007-03-18mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o1-4/+9
2007-03-18mergetool: Add support for vimdiff.James Bowes3-5/+7
2007-03-18user-manual: Use def_ instead of ref_ for glossary references.J. Bruce Fields1-2/+2
2007-03-18user-manual.txt: fix a tiny typo.Jim Meyering1-1/+1
2007-03-18user-manual: run xsltproc without --nonet optionJ. Bruce Fields1-1/+1
2007-03-18Update main git.html page to point at 1.5.0.5 documentationJunio C Hamano1-1/+3
2007-03-18Merge branch 'ar/diff'Junio C Hamano12-27/+242
2007-03-18Avoid unnecessary strlen() callsLinus Torvalds3-29/+36
2007-03-18Reuse cached data out of delta base cache.Nicolas Pitre1-4/+10
2007-03-18Implement a simple delta_base cacheLinus Torvalds1-1/+42
2007-03-18Make trivial wrapper functions around delta base generation and freeingLinus Torvalds1-2/+14
2007-03-18Merge 1.5.0.5 in from 'maint'Junio C Hamano1-0/+28
2007-03-18GIT 1.5.0.5v1.5.0.5Junio C Hamano3-2/+30
2007-03-17Make gc a builtin.James Bowes5-1/+82
2007-03-17Merge branch 'maint'Junio C Hamano1-2/+2
2007-03-16[PATCH] clean up pack index handling a bitNicolas Pitre6-87/+90
2007-03-16[PATCH] add test for OFS_DELTA objectsNicolas Pitre1-6/+65
2007-03-16[PATCH] fix t5300-pack-object.shNicolas Pitre1-1/+1
2007-03-16[PATCH] local-fetch.c: some error printing cleanupNicolas Pitre1-20/+13
2007-03-16applymbox: brown paper bag fix.Junio C Hamano1-2/+2
2007-03-16git-merge: finish when git-read-tree failsSanti Béjar1-2/+2
2007-03-16Add tests for --quiet option of diff programsAlex Riesen1-0/+80
2007-03-16use xstrdup pleaseShawn O. Pearce1-2/+2
2007-03-16git-fetch, git-branch: Support local --track via a special remote '.'Paolo Bonzini7-22/+79
2007-03-14git-log --first-parent: show only the first parent logJunio C Hamano2-5/+12
2007-03-14try-to-simplify-commit: use diff-tree --quiet machinery.Junio C Hamano1-0/+6
2007-03-14revision.c: explain what tree_difference doesJunio C Hamano1-2/+9
2007-03-14Teach --quiet to diff backends.Junio C Hamano2-0/+8
2007-03-14diff --quietJunio C Hamano2-4/+27
2007-03-14Remove unused diffcore_std_no_resolveJunio C Hamano2-13/+0
2007-03-14Allow git-diff exit with codes similar to diff(1)Alex Riesen9-14/+118
2007-03-14Merge GIT 1.5.0.4Junio C Hamano3-2/+26
2007-03-14GIT 1.5.0.4v1.5.0.4Junio C Hamano3-2/+26
2007-03-14Clarify doc for git-config --unset-all.Yann Dirson1-1/+1
2007-03-14git-checkout: fix "eval" used for merge labelling.Junio C Hamano1-1/+1
2007-03-14update-hook: fix incorrect use of git-describe and sed for finding previous tagAndy Parkins1-1/+1
2007-03-14cvsserver: further improve messages on commit and statusFrank Lichtenheld1-3/+6
2007-03-14cvsserver: Be more chattyFrank Lichtenheld1-0/+8
2007-03-14Merge branch 'jc/repack'Junio C Hamano2-0/+57
2007-03-14Merge branch 'jc/fetch'Junio C Hamano7-249/+558
2007-03-14Merge branch 'dz/mailinfo'Junio C Hamano13-248/+352
2007-03-14Merge branch 'jb/per-user-exclude'Junio C Hamano1-1/+17
2007-03-14Merge branch 'maint'Junio C Hamano1-8/+11
2007-03-14Merge branch 'pb/branch-track'Junio C Hamano7-41/+237
2007-03-14git-grep: don't use sscanfJim Meyering1-1/+14
2007-03-14Do not output "GEN " when generating perl.makJohannes Schindelin1-1/+1
2007-03-14shortlog: prompt when reading from terminal by mistakeJunio C Hamano1-1/+4
2007-03-14Documentation: add git-mergetool to the command list.Junio C Hamano1-0/+1
2007-03-14Merge branch 'master' of git://repo.or.cz/git/mergetoolJunio C Hamano5-1/+405
2007-03-13git-svn: add -l/--local command to "git svn rebase"Eric Wong2-2/+13
2007-03-13cvsserver: asciidoc formatting changesFrank Lichtenheld1-8/+11
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o5-1/+405