summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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
2007-03-12Use run_command within send-packShawn O. Pearce1-56/+30
2007-03-12Use run_command within receive-pack to invoke index-packShawn O. Pearce1-25/+10
2007-03-12Use run_command within merge-indexShawn O. Pearce1-18/+5
2007-03-12Use run_command for proxy connectionsShawn O. Pearce1-21/+15
2007-03-12Use RUN_GIT_CMD to run push backendsShawn O. Pearce1-3/+3
2007-03-12Correct new compiler warnings in builtin-revertShawn O. Pearce3-4/+4
2007-03-12Replace fork_with_pipe in bundle with run_commandShawn O. Pearce1-99/+30
2007-03-12Teach run-command to redirect stdout to /dev/nullShawn O. Pearce2-8/+19
2007-03-12Teach run-command about stdout redirectionShawn O. Pearce2-1/+31
2007-03-12Add a couple more test cases to the suite.Don Zickus8-1/+35
2007-03-12restrict the patch filteringDon Zickus1-3/+34
2007-03-12builtin-mailinfo.c infrastrcture changesDon Zickus5-248/+287
2007-03-12Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano1-0/+5
2007-03-12Merge branch 'maint'Junio C Hamano5-158/+16
2007-03-12Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2-4/+54
2007-03-12Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano1-2/+2
2007-03-12Fix t5510-fetch's use of sedShawn O. Pearce1-1/+7
2007-03-12Simplify closing two fds at once in run-command.cShawn O. Pearce1-6/+9
2007-03-12Remove unnecessary casts from fast-importShawn O. Pearce1-2/+2
2007-03-12Merge branch 'maint'Shawn O. Pearce1-2/+2
2007-03-12New fast-import test case for valid tree sortingJeff King1-0/+50
2007-03-12fast-import: grow tree storage more aggressivelyJeff King1-2/+2
2007-03-12Don't package the git-gui credits file anymoreShawn O. Pearce1-2/+1
2007-03-12Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano4-156/+15
2007-03-12Re-fix get_sha1_oneline()Linus Torvalds1-5/+5
2007-03-12Merge branch 'maint'gitgui-0.6.5Shawn O. Pearce4-156/+15
2007-03-12git-gui: Allow 'git gui version' outside of a repositorygitgui-0.6.4Shawn O. Pearce1-7/+5
2007-03-12git-gui: Revert "git-gui: Display all authors of git-gui."Shawn O. Pearce4-135/+9
2007-03-12git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."Shawn O. Pearce1-19/+6
2007-03-12git-gui: Allow committing empty mergesShawn O. Pearce1-1/+1
2007-03-11git-bundle: only die if pack would be empty, warn if ref is skippedJohannes Schindelin1-3/+8
2007-03-11git-send-email: configurable bcc and chain-reply-toAvi Kivity2-1/+19
2007-03-11Merge branch 'maint'Junio C Hamano2-1/+19
2007-03-11git-send-email: Document configuration optionsAvi Kivity1-0/+13
2007-03-11git-merge: warn when -m provided on a fast forwardJ. Bruce Fields1-1/+6
2007-03-11Merge branch 'jc/boundary'Junio C Hamano4-197/+243
2007-03-11Change {pre,post}-receive hooks to use stdinShawn O. Pearce3-58/+62
2007-03-11Split back out update_hook handling in receive-packShawn O. Pearce1-2/+24
2007-03-11Refactor run_command error handling in receive-packShawn O. Pearce1-19/+24
2007-03-11Teach run_command how to setup a stdin pipeShawn O. Pearce2-1/+37
2007-03-11Split run_command into two halves (start/finish)Shawn O. Pearce2-7/+22
2007-03-11Start defining a more sophisticated run_commandShawn O. Pearce2-7/+27
2007-03-11Remove unused run_command variantsShawn O. Pearce3-50/+1
2007-03-11Switch to run_command_v_opt in revertShawn O. Pearce1-4/+9
2007-03-11cvsserver: Use Merged response instead of Update-existing for merged filesFrank Lichtenheld1-3/+3
2007-03-11I like the idea of the new ':/<oneline prefix>' notation, and gave itJim Meyering1-2/+6
2007-03-11prepare_packed_git(): sort packs by age and localness.Junio C Hamano2-0/+57
2007-03-10Fix broken create_branch() in builtin-branch.Junio C Hamano1-14/+17
2007-03-10git-branch, git-checkout: autosetup for remote branch trackingPaolo Bonzini7-36/+229
2007-03-10Merge branch 'js/attach'Junio C Hamano11-47/+384
2007-03-10Merge branch 'js/diff-ni'Junio C Hamano32-131/+176
2007-03-10Merge branch 'jc/fsck'Junio C Hamano3-15/+41
2007-03-10Merge branch 'pb/commit-i'Junio C Hamano2-7/+23
2007-03-10Merge branch 'js/revert-cherry'Junio C Hamano5-203/+407
2007-03-10Merge branch 'sp/make'Junio C Hamano3-44/+76
2007-03-10Merge branch 'maint'Junio C Hamano7-48/+100
2007-03-10git.el: Retrieve commit log information from .dotest directory.Alexandre Julliard1-24/+53
2007-03-10git.el: Avoid appending a signoff line that is already present.Alexandre Julliard1-6/+18
2007-03-10setup_git_directory_gently: fix off-by-one errorMatthias Lederhofer1-1/+1
2007-03-10Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintJunio C Hamano3-20/+29
2007-03-10user-manual: install user manual stylesheet with other web documentsJ. Bruce Fields1-1/+1
2007-03-10user-manual: fix rendering of history diagramsJ. Bruce Fields1-4/+21
2007-03-10user-manual: fix missing colon in git-show exampleJ. Bruce Fields1-1/+1
2007-03-10user-manual: fix inconsistent use of pull and mergeJ. Bruce Fields1-11/+3
2007-03-10user-manual: fix inconsistent exampleJ. Bruce Fields1-2/+2
2007-03-10glossary: fix overoptimistic automatic linking of defined termsJ. Bruce Fields1-1/+1
2007-03-09Documentation: s/seperator/separator/Jeff King1-3/+3
2007-03-09Adjust reflog filemode in shared repositoryMatthias Kestenholz1-0/+2
2007-03-09add: Support specifying an excludes file with a configuration variableJames Bowes1-1/+17
2007-03-09git-commit: add a --interactive optionPaolo Bonzini2-7/+23
2007-03-08git-bundle: prevent overwriting existing bundlesJohannes Schindelin1-2/+2
2007-03-08git-bundle: die if a given ref is not included in bundleJohannes Schindelin1-4/+2
2007-03-08git-bundle: handle thin packs in subcommand "unbundle"Johannes Schindelin1-1/+2
2007-03-08Merge branch 'js/config-rename'Junio C Hamano4-25/+74
2007-03-07Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano3-18/+88
2007-03-07git-bundle: Make thin packsJohannes Schindelin1-59/+26
2007-03-07git-bundle: avoid packing objects which are in the prerequisitesJohannes Schindelin2-3/+23
2007-03-07Allow fast-import frontends to reload the marks tableShawn O. Pearce3-1/+56
2007-03-07Use atomic updates to the fast-import mark fileShawn O. Pearce1-9/+26
2007-03-07Teach receive-pack to run pre-receive/post-receive hooksShawn O. Pearce3-62/+191
2007-03-07Refactor handling of error_string in receive-packShawn O. Pearce2-32/+36
2007-03-07Refactor run_update_hook to be more usefulShawn O. Pearce1-19/+44
2007-03-07Don't run post-update hook unless a ref changedShawn O. Pearce1-4/+4
2007-03-07Move post-update hook to after all other activityShawn O. Pearce1-2/+1
2007-03-07Merge branch 'maint'Junio C Hamano2-2/+6
2007-03-07Preallocate memory earlier in fast-importShawn O. Pearce1-8/+6
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce16-59/+83
2007-03-07Use off_t in pack-objects/fast-import when we mean an offsetShawn O. Pearce2-28/+28
2007-03-07Use off_t when we really mean a file offset.Shawn O. Pearce6-47/+54
2007-03-07Use uint32_t for pack-objects counters.Shawn O. Pearce1-33/+30
2007-03-07Use uint32_t for all packed object counts.Shawn O. Pearce5-15/+15
2007-03-07General const correctness fixesShawn O. Pearce16-42/+40
2007-03-07Don't build external_grep if its not usedShawn O. Pearce1-0/+2
2007-03-07Fix mmap leak caused by reading bad indexes.Shawn O. Pearce1-9/+16
2007-03-07Display the null SHA-1 as the base for an OBJ_OFS_DELTA.Shawn O. Pearce1-0/+1
2007-03-07git-archimport: allow remapping branch namesPaolo Bonzini2-24/+81
2007-03-07t/t5515-fetch-merge-logic.sh: Add two more testsSanti B,Ai(Bjar3-0/+5
2007-03-07Catch write_ref_sha1 failure in receive-packShawn O. Pearce1-1/+4
2007-03-06bundle: fix wrong check of read_header()'s return value & add testsJohannes Schindelin2-1/+24
2007-03-06gitweb: Don't escape attributes in CGI.pm HTML methodsJakub Narebski1-3/+3
2007-03-06Allow "make -w" generate its usual outputAlex Riesen1-2/+8
2007-03-06Support of "make -s": do not output anything of the build itselfAlex Riesen1-3/+7
2007-03-06More build output cleaning upAlex Riesen2-4/+6
2007-03-06make t8001 work on Mac OS X againJohannes Schindelin1-1/+2
2007-03-06git-gui: Support of "make -s" in: do not output anything of the build itselfAlex Riesen1-0/+5
2007-03-06revision --boundary: fix uncounted case.Junio C Hamano1-8/+8
2007-03-06gitweb: Change to use explicitly function call cgi->escapHTML()Li Yang1-2/+2
2007-03-06revision --boundary: fix stupid typoJunio C Hamano1-1/+1
2007-03-06git-bundle: make verify a bit more chatty.Junio C Hamano1-20/+35
2007-03-06revision traversal: SHOWN means shownJunio C Hamano1-8/+18
2007-03-06git-bundle: various fixupsJunio C Hamano1-13/+33
2007-03-06revision traversal: retire BOUNDARY_SHOWJunio C Hamano3-5/+13
2007-03-06revision walker: Fix --boundary when limitedJunio C Hamano2-116/+100
2007-03-06Make 'make' quiet by defaultShawn O. Pearce3-5/+5
2007-03-06Make 'make' quieter while building gitShawn O. Pearce3-42/+62
2007-03-06Merge branch 'maint'Junio C Hamano2-37/+69
2007-03-06Merge branch 'master' of git://repo.or.cz/git-gui into maintJunio C Hamano2-37/+69
2007-03-05git-bundle: fix pack generation.Junio C Hamano1-0/+6
2007-03-06git-gui: Make 'make' quieter by defaultgitgui-0.6.3Shawn O. Pearce1-7/+15
2007-03-05Merge branch 'maint'Junio C Hamano1-0/+3
2007-03-05git-commit: cd to top before showing the final statJunio C Hamano1-0/+3
2007-03-05cherry-pick: Bug fix 'cherry picked from' message.Shawn O. Pearce1-2/+2
2007-03-05Merge branch 'master-for-junio' of git://repo.or.cz/git/fastimport; branch 'm...Junio C Hamano5-9/+57
2007-03-05Fix diff-options references in git-diff and git-format-patchBrian Gernhardt2-3/+5
2007-03-05Add definition of <commit-ish> to the main git man page.Theodore Ts'o1-0/+6
2007-03-05Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maintJunio C Hamano1-6/+19
2007-03-05Begin SubmittingPatches with a check listJohannes Schindelin1-0/+27
2007-03-05Merge branch 'maint'Shawn O. Pearce1-6/+19
2007-03-05fast-import: Fail if a non-existant commit is used for mergeShawn O. Pearce1-1/+8
2007-03-05fast-import: Avoid infinite loop after resetShawn O. Pearce1-5/+11
2007-03-05fsck: exit with non-zero status upon errorsJunio C Hamano1-5/+21
2007-03-05unpack_sha1_file(): detect corrupt loose object files.Junio C Hamano2-9/+19
2007-03-05fsck: fix broken loose object check.Junio C Hamano1-1/+1
2007-03-05contrib/emacs: Use non-interactive function to byte-compile filesXavier Maillard1-2/+2
2007-03-05t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetchSanti Béjar63-0/+731
2007-03-04Post 1.5.0.3 cleanupJunio C Hamano2-4/+14
2007-03-04format-patch --attach: not folding some long headers.Junio C Hamano8-76/+40
2007-03-04format-patch: add --inline option and make --attach a true attachmentJohannes Schindelin11-13/+386
2007-03-04Merge branch 'js/fetch-progress' (early part)Junio C Hamano6-14/+47
2007-03-04Merge branch 'js/symlink'Junio C Hamano15-13/+175
2007-03-04Merge branch 'maint'Junio C Hamano5-48/+167
2007-03-04GIT 1.5.0.3v1.5.0.3Junio C Hamano2-12/+15