summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2007-04-22gitweb: Show "no difference" message for empty diffv1.5.2-rc0Martin Koegler2-0/+7
2007-04-22delay progress display when checking out filesNicolas Pitre1-7/+2
2007-04-22provide a facility for "delayed" progress reportingNicolas Pitre2-0/+40
2007-04-22make progress "title" part of the common progress interfaceNicolas Pitre6-34/+27
2007-04-22common progress display supportNicolas Pitre7-185/+154
2007-04-22Support 'diff=pgm' attributeJunio C Hamano5-5/+182
2007-04-22pack-objects: make generated packfile read-onlyJunio C Hamano1-1/+1
2007-04-22Update tests not to assume that generated packfiles are writable.Junio C Hamano1-11/+11
2007-04-22Fix 'quickfix' on pack-objects.Junio C Hamano1-2/+14
2007-04-22pack-objects: quickfix for permission modes.Junio C Hamano1-0/+6
2007-04-22Fix crash in t0020 (crlf conversion)Alex Riesen1-2/+4
2007-04-22Fix a typo in crlf conversion codeAlex Riesen1-5/+5
2007-04-22Cleanup variables in cat-fileShawn O. Pearce1-12/+18
2007-04-22Update draft release notes for v1.5.2Junio C Hamano1-26/+51
2007-04-22Documentation/Makefile: fix section (5) installationJunio C Hamano2-2/+2
2007-04-21Update documentation links to point at v1.5.1.2Junio C Hamano1-1/+5
2007-04-21Merge branch 'lt/objalloc'Junio C Hamano8-59/+43
2007-04-21Merge branch 'jc/add'Junio C Hamano1-1/+57
2007-04-21Merge branch 'jc/attr'Junio C Hamano22-134/+1816
2007-04-21Merge branch 'lt/gitlink'Junio C Hamano18-120/+639
2007-04-21Merge branch 'np/pack'Junio C Hamano21-498/+1010
2007-04-21Merge branch 'jp/refs'Junio C Hamano1-21/+89
2007-04-21Merge branch 'jc/quickfetch'Junio C Hamano4-13/+206
2007-04-21Merge branch 'maint'Junio C Hamano4-10/+23
2007-04-21GIT 1.5.1.2v1.5.1.2Junio C Hamano2-8/+21
2007-04-21perl: install private Error.pm if the site version is older than our ownEric Wong1-1/+1
2007-04-21lockfile: record the primary process.Junio C Hamano2-1/+6
2007-04-21convert.c: restructure the attribute checking part.Junio C Hamano1-20/+28
2007-04-21Fix bogus linked-list management for user defined merge drivers.Junio C Hamano1-1/+2
2007-04-20Simplify calling of CR/LF conversion routinesAlex Riesen6-60/+51
2007-04-20Fix a copy-n-paste bug in the object decorator code.Linus Torvalds1-1/+0
2007-04-20git-clone: fix dumb protocol transport to clone from pack-pruned refJunio C Hamano1-1/+1
2007-04-20git-add -u: match the index with working tree.Junio C Hamano1-1/+57
2007-04-20gitview: annotation supportAneesh Kumar K.V1-4/+256
2007-04-20Kill the useless progress meter in merge-recursiveShawn O. Pearce1-62/+3
2007-04-19Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt1-52/+52
2007-04-19git.el: Add a commit description to the reflog.Alexandre Julliard1-14/+28
2007-04-19Contribute a fairly paranoid update hookShawn O. Pearce1-0/+284
2007-04-19Merge branch 'maint'Junio C Hamano5-14/+21
2007-04-19Fix working directory errno handling when unlinking a directoryLinus Torvalds1-25/+29
2007-04-19Document gitattributes(5)Junio C Hamano3-2/+300
2007-04-19Update 'crlf' attribute semantics.Junio C Hamano2-60/+89
2007-04-19Documentation: support manual section (5) - file formats.Junio C Hamano2-7/+15
2007-04-19document --index-version for index-pack and pack-objectsNicolas Pitre2-0/+10
2007-04-19pack-objects: remove obsolete commentsNicolas Pitre1-11/+3
2007-04-18Update git-config documentationAndrew Ruder2-11/+15
2007-04-18Fix unmatched emphasis tag in git-tutorialAndrew Ruder1-1/+1
2007-04-18Update git-cherry-pick documentationAndrew Ruder1-1/+1
2007-04-18Update git-archive documentationAndrew Ruder1-1/+4
2007-04-18Merge branch 'maint'Junio C Hamano3-3/+3
2007-04-18fix up strtoul_ui error handlingAndy Whitcroft2-2/+2
2007-04-18Simplify code to find recursive merge driver.Junio C Hamano1-7/+2
2007-04-18Counto-fix in merge-recursiveJunio C Hamano1-1/+4
2007-04-18git-tar-tree: complete deprecation conversion messageSam Vilain1-1/+1
2007-04-18Tests for core subproject supportAlex Riesen1-0/+85
2007-04-18refs.c: add a function to sort a ref list, rather then sorting on addJulian Phillips1-21/+89
2007-04-18Merge branch 'maint'Junio C Hamano5-3/+43
2007-04-18Fix funny types used in attribute value representationJunio C Hamano6-26/+43
2007-04-18git-shortlog: Fix two formatting errors in asciidoc documentationFrank Lichtenheld1-1/+3
2007-04-18Fix overwriting of files when applying contextually independent diffsAlex Riesen2-2/+34
2007-04-18git-svn: don't allow globs to match regular filesEric Wong2-0/+6
2007-04-18Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano1-0/+12
2007-04-18Custom low-level merge driver: change the configuration scheme.Junio C Hamano2-79/+131
2007-04-18Allow the default low-level merge driver to be configured.Junio C Hamano1-2/+12
2007-04-18Custom low-level merge driver support.Junio C Hamano2-13/+235
2007-04-17Merge branch 'fl/cvsserver'Junio C Hamano3-18/+224
2007-04-17Merge branch 'maint'Junio C Hamano2-2/+2
2007-04-17Use const qualifier for 'sha1' parameter in delete_ref functionCarlos Rica2-2/+2
2007-04-17Update draft release notes for 1.5.2 with accumulated changes.Junio C Hamano1-1/+44
2007-04-17Merge branch 'maint'Junio C Hamano2-3/+43
2007-04-17Start preparing for 1.5.1.2Junio C Hamano2-1/+38
2007-04-17Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2-74/+91
2007-04-17Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano1-4/+6
2007-04-17Merge branch 'jc/read-tree-df'Junio C Hamano4-24/+587
2007-04-17Add a demonstration/test of customized merge.Junio C Hamano1-0/+72
2007-04-17Allow specifying specialized merge-backend per path.Junio C Hamano1-7/+129
2007-04-17git-gui: Honor TCLTK_PATH if suppliedJunio C Hamano1-0/+4
2007-04-17Revert "Allow wish interpreter to be defined with TCLTK_PATH"Shawn O. Pearce1-3/+0
2007-04-17git-svn: quiet some warnings when run only with --version/--helpEric Wong1-2/+2
2007-04-17git-svn: respect lower bound of -r/--revision when following parentEric Wong1-1/+4
2007-04-17merge-recursive: separate out xdl_merge() interface.Junio C Hamano1-21/+35
2007-04-17Allow more than true/false to attributes.Junio C Hamano5-82/+169
2007-04-17Add --ignore-unmatch option to exit with zero status when no files are removed.Steven Grimm3-5/+25
2007-04-17Make sure quickfetch is not fooled with a previous, incomplete fetch.Junio C Hamano2-0/+93
2007-04-16Clean up object creation to use more common codeLinus Torvalds8-43/+23
2007-04-16Use proper object allocators for unknown object nodes tooLinus Torvalds3-20/+24
2007-04-16Bisect: rename "t/t6030-bisect-run.sh" to "t/t6030-bisect-porcelain.sh".Christian Couder1-1/+1
2007-04-16Bisect: simplify "bisect start" logging.Christian Couder1-4/+1
2007-04-16pack-objects: better check_object() performancesNicolas Pitre1-80/+126
2007-04-16add get_size_from_delta()Nicolas Pitre2-34/+40
2007-04-16pack-objects: make in_pack_header_size a variable of its ownNicolas Pitre1-14/+12
2007-04-16pack-objects: get rid of create_final_object_list()Nicolas Pitre1-55/+72
2007-04-16pack-objects: get rid of reuse_cached_packNicolas Pitre1-72/+14
2007-04-16pack-objects: clean up list sortingNicolas Pitre1-31/+22
2007-04-16pack-objects: rework check_delta_limit usageNicolas Pitre1-44/+32
2007-04-16pack-objects: equal objects in size should delta against newer objectsNicolas Pitre1-1/+1
2007-04-16pack-objects: optimize preferred base handling a bitNicolas Pitre1-15/+12
2007-04-16Merge branch 'js/wrap-log'Junio C Hamano8-3/+120
2007-04-16Fix permissions on test scriptsAlex Riesen7-0/+0
2007-04-16Fix t4201: accidental arithmetic expansionAlex Riesen1-1/+1
2007-04-16send-email: do not leave an empty CC: line if no cc is present.Junio C Hamano1-2/+5
2007-04-16Add support for "commit name decorations" to log family of commandsLinus Torvalds3-2/+61
2007-04-16Add a generic "object decorator" interface, and make object refs use itLinus Torvalds5-65/+116
2007-04-16Merge branch 'maint'Junio C Hamano11-137/+222
2007-04-16Have sample update hook not refuse deleting a branch through push.Gerrit Pape1-1/+6
2007-04-16variable $projectdesc needs to be set before checking against unchanged default.Gerrit Pape1-0/+1
2007-04-16git-rm: Trivial fix for a comment typo.Steven Grimm1-1/+1
2007-04-16Update git-annotate/git-blame documentationAndrew Ruder4-67/+85
2007-04-16Update git-apply documentationAndrew Ruder1-6/+7
2007-04-16Update git-applymbox documentationAndrew Ruder1-4/+10
2007-04-16Update git-am documentationAndrew Ruder1-9/+16
2007-04-16user-manual: use detached head when rewriting historyJ. Bruce Fields1-7/+8
2007-04-16user-manual: start revising "internals" chapterJ. Bruce Fields1-18/+20
2007-04-16user-manual: detached HEADJ. Bruce Fields1-2/+42
2007-04-16user-manual: fix discussion of default cloneJ. Bruce Fields1-3/+3
2007-04-16Documentation: clarify track/no-track option.J. Bruce Fields1-4/+8
2007-04-16Documentation: clarify git-checkout -f, minor editingJ. Bruce Fields1-4/+5
2007-04-16Documentation: minor edits of git-lost-found manpageJ. Bruce Fields1-12/+11
2007-04-16Add --quiet option to suppress output of "rm" commands for removed files.Steven Grimm3-3/+34
2007-04-16Display the subject of the commit just made.Michael S. Tsirkin1-1/+2
2007-04-15Add policy on user-interface changesAndrew Ruder1-0/+3
2007-04-15Merge branch 'maint'Junio C Hamano3-15/+44
2007-04-15Document -g (--walk-reflogs) option of git-logAlex Riesen1-0/+5
2007-04-15Document git-check-attrJames Bowes2-0/+38
2007-04-15ident.c: Use size_t (instead of int) to store sizesLuiz Fernando N. Capitulino1-7/+7
2007-04-15ident.c: Use const qualifier for 'struct passwd' parametersLuiz Fernando N. Capitulino1-2/+2
2007-04-15Change attribute negation marker from '!' to '-'.Junio C Hamano3-7/+52
2007-04-15Define a built-in attribute macro "binary".Junio C Hamano1-0/+1
2007-04-15attribute macro supportJunio C Hamano2-48/+132
2007-04-15Makefile: add patch-ids.h back in.Junio C Hamano1-1/+1
2007-04-15Fix 'diff' attribute semantics.Junio C Hamano1-2/+3
2007-04-15Fix 'crlf' attribute semantics.Junio C Hamano1-44/+78
2007-04-15Expose subprojects as special files to "git diff" machineryLinus Torvalds1-0/+20
2007-04-15git-gui: Display the directory basename in the titleShawn O. Pearce1-1/+1
2007-04-15Merge branch 'er/ui'Shawn O. Pearce2-69/+83
2007-04-14sscanf/strtoul: parse integers robustlyJim Meyering4-18/+22
2007-04-14Merge git://git2.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano1-14/+38
2007-04-14Fix some "git ls-files -o" fallout from gitlinksLinus Torvalds1-7/+25
2007-04-14git-blame: Fix overrun in fake_working_tree_commit()Michael Spang1-1/+1
2007-04-14Teach 'diff' about 'diff' attribute.Junio C Hamano2-27/+31
2007-04-14Define 'crlf' attribute.Junio C Hamano3-7/+84
2007-04-14Add basic infrastructure to assign attributes to pathsJunio C Hamano8-2/+453
2007-04-14Merge branch 'maint'Junio C Hamano4-17/+49
2007-04-14git-quiltimport complaining yet still workingLinus Torvalds1-2/+2
2007-04-14Replace a pair of patches with updated ones for subproject support.Junio C Hamano0-0/+0
2007-04-14Teach "git-read-tree -u" to check out submodules as a directoryLinus Torvalds1-13/+32
2007-04-14Teach git list-objects logic to not follow gitlinksLinus Torvalds1-0/+34
2007-04-14Fix gitlink index entry filesystem matchingLinus Torvalds1-4/+4
2007-04-13config.txt: Add gitcvs.db* variablesFrank Lichtenheld1-0/+27
2007-04-13config.txt: Fix grammatical error in description of http.noEPSVFrank Lichtenheld1-1/+1
2007-04-13config.txt: Change pserver to server in description of gitcvs.*Frank Lichtenheld1-2/+2
2007-04-13config.txt: Document core.autocrlfFrank Lichtenheld1-0/+10
2007-04-13config.txt: Document gitcvs.allbinaryFrank Lichtenheld1-0/+7
2007-04-13Do not default to --no-index when given two directories.Junio C Hamano1-10/+26
2007-04-13Use rev-list --reverse in git-rebase.shAlex Riesen1-2/+1
2007-04-12Teach "git-read-tree -u" to check out submodules as a directoryLinus Torvalds1-13/+29
2007-04-12Teach git list-objects logic not to follow gitlinksLinus Torvalds1-0/+34
2007-04-12Merge branch 'jc/cherry'Junio C Hamano9-35/+346
2007-04-12Merge branch 'maint'Junio C Hamano1-0/+1
2007-04-12handle_options in git wrapper miscounts the options it handled.Matthias Lederhofer1-0/+1
2007-04-12Fix git {log,show,...} --pretty=emailJunio C Hamano2-1/+1
2007-04-12Don't yap about merge-subtree during makeShawn O. Pearce1-1/+1
2007-04-12Don't show gitlink directories when we want "other" filesLinus Torvalds1-0/+2
2007-04-12cvsserver: Document the GIT branches -> CVS modules mapping more prominentlyFrank Lichtenheld1-0/+4
2007-04-12Teach git-update-index about gitlinksLinus Torvalds1-62/+138
2007-04-12cvsserver: Reword documentation on necessity of write accessFrank Lichtenheld1-3/+9
2007-04-12cvsserver: Allow to "add" a removed fileFrank Lichtenheld1-0/+40
2007-04-11Documentation: --cherry-pickJunio C Hamano1-0/+15
2007-04-11git-log --cherry-pick A...BJunio C Hamano2-0/+89
2007-04-11Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano4-32/+228
2007-04-11Add %m to '--pretty=format:'Junio C Hamano2-3/+14
2007-04-11clean up add_object_entry()Nicolas Pitre1-27/+25
2007-04-11tests for various pack index featuresNicolas Pitre1-0/+146
2007-04-11use test-genrandom in tests instead of /dev/urandomNicolas Pitre1-1/+1
2007-04-11simple random data generator for testsNicolas Pitre3-2/+40
2007-04-11sscanf/strtoul: parse integers robustlyJim Meyering4-18/+22
2007-04-11Teach directory traversal about subprojectsLinus Torvalds3-19/+121
2007-04-11Add testcase for format-patch --subject-prefix (take 3)Robin H. Johnson2-0/+165
2007-04-11Add custom subject prefix support to format-patch (take 3)Robin H. Johnson4-11/+31
2007-04-11Merge branch 'maint'Junio C Hamano6-20/+44
2007-04-11Fix thinko in subproject entry sortingLinus Torvalds1-2/+2
2007-04-11GIT 1.5.1.1v1.5.1.1Junio C Hamano2-8/+23
2007-04-11cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld1-0/+1
2007-04-11fsck: do not complain on detached HEAD.Junio C Hamano1-8/+16
2007-04-11(encode_85, decode_85): Mark source buffer pointer as "const".Jim Meyering2-4/+4
2007-04-10gitweb: Allow configuring the default projects order and add order 'none'Frank Lichtenheld1-4/+7
2007-04-10gitweb: Allow forks with project list fileFrank Lichtenheld1-7/+27
2007-04-10Merge branch 'maint'Junio C Hamano2-3/+24
2007-04-10Teach core object handling functions about gitlinksLinus Torvalds4-6/+54
2007-04-10Teach "fsck" not to follow subproject linksLinus Torvalds2-2/+22
2007-04-10Add "S_IFDIRLNK" file mode infrastructure for git linksLinus Torvalds1-1/+19
2007-04-10Add 'resolve_gitlink_ref()' helper functionLinus Torvalds2-0/+83
2007-04-10git-fetch: use fetch--tool pick-rref to avoid local fetch from alternateJunio C Hamano1-13/+29
2007-04-10git-fetch--tool pick-rrefJunio C Hamano1-0/+84
2007-04-10t3030: merge-recursive backend test.Junio C Hamano1-0/+528
2007-04-10merge-recursive: handle D/F conflict case more carefully.Junio C Hamano1-3/+26
2007-04-10merge-recursive: do not barf on "to be removed" entries.Junio C Hamano1-5/+11
2007-04-10Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()Junio C Hamano1-14/+20
2007-04-10t1000: fix case table.Junio C Hamano2-2/+2
2007-04-10shortlog -w: make wrap-line behaviour optional.Junio C Hamano2-5/+67