summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-05-12GIT 1.6.3.1v1.6.3.1Junio C Hamano2-7/+5
2009-05-12Merge branch 'maint-1.6.2' into maintJunio C Hamano2-8/+29
2009-05-12Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2Junio C Hamano2-8/+29
2009-05-12Revert "checkout branch: prime cache-tree fully"Junio C Hamano2-8/+29
2009-05-09Documentation: cloning to empty directory is allowedAlexander Potashev1-1/+1
2009-05-09Clarify kind of conflict in merge-one-file helperAlex Riesen1-2/+9
2009-05-09git config: clarify --add and --get-colorFelipe Contreras1-2/+3
2009-05-08archive-tar.c: squelch a type mismatch warningJunio C Hamano1-1/+1
2009-05-08Start 1.6.3.1 maintenance series.Junio C Hamano2-1/+13
2009-05-08Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano0-0/+0
2009-05-08Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-2/+2
2009-05-06GIT 1.6.3v1.6.3Junio C Hamano3-8/+4
2009-05-06t4029: use sh instead of bashNguyễn Thái Ngọc Duy1-1/+1
2009-05-06t4200: convert sed expression which operates on non-text file to perlBrandon Casey1-1/+1
2009-05-06t4200: remove two unnecessary linesBrandon Casey1-2/+0
2009-05-06t/annotate-tests.sh: avoid passing a non-newline terminated file to sedBrandon Casey1-1/+4
2009-05-06t4118: avoid sed invocation on file without terminating newlineBrandon Casey1-1/+1
2009-05-06t4118: add missing '&&'Brandon Casey1-1/+1
2009-05-06t8005: use egrep when extended regular expressions are requiredBrandon Casey1-4/+4
2009-05-06git-clean doc: the command only affects paths under $(cwd)Junio C Hamano1-2/+2
2009-05-05Merge branch 'maint'Junio C Hamano5-19/+21
2009-05-05Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maintJunio C Hamano1-1/+1
2009-05-05Merge branch 'maint-1.6.0' into maintJunio C Hamano1-2/+2
2009-05-05improve error message in config.cAlex Riesen1-1/+1
2009-05-05t4018-diff-funcname: add cpp xfuncname pattern to syntax testBrandon Casey1-1/+1
2009-05-05Work around BSD whose typeof(tv.tv_sec) != time_tBernd Ahlers1-1/+3
2009-05-05git-am.txt: reword extra headers in message bodyStephen Boyd1-4/+4
2009-05-05git-am.txt: Use date or value instead of time or timestampStephen Boyd1-4/+4
2009-05-05git-am.txt: add an 'a', say what 'it' is, simplify a sentenceStephen Boyd1-6/+6
2009-05-05completion: complete values for send-emailStephen Boyd1-3/+36
2009-05-05completion: complete values for log.dateStephen Boyd1-3/+6
2009-05-05completion: complete values for help.formatStephen Boyd1-0/+4
2009-05-05completion: add {gui,diff,merge}tool, man, and pager config variablesStephen Boyd1-0/+45
2009-05-05completion: add missing configuration variables to _git_config()Stephen Boyd1-0/+48
2009-05-05dir.c: Fix two minor grammatical errors in commentsAllan Caffee1-2/+2
2009-05-05git-svn: fix a sloppy Getopt::Long usageRobin H. Johnson1-1/+1
2009-05-03Sync with GIT 1.6.2.5Junio C Hamano3-1/+58
2009-05-03GIT 1.6.2.5v1.6.2.5Junio C Hamano3-2/+23
2009-05-03Merge branch 'np/maint-no-ofs-delta' into maintJunio C Hamano1-1/+12
2009-05-03Merge branch 'maint-1.6.1' into maintJunio C Hamano1-0/+25
2009-05-03GIT 1.6.1.4v1.6.1.4Junio C Hamano2-1/+26
2009-05-03Merge branch 'jc/maint-read-tree-multi' into maintJunio C Hamano4-41/+55
2009-05-03Merge branch 'mk/maint-apply-swap' into maintJunio C Hamano2-7/+112
2009-05-03Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano1-1/+1
2009-05-03Merge branch 'lt/pack-object-memuse' into maintJunio C Hamano7-43/+56
2009-05-03Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano11-74/+105
2009-05-03Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2-1/+17
2009-05-03Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano4-5/+29
2009-05-01GIT 1.6.3-rc4v1.6.3-rc4Junio C Hamano1-0/+6
2009-05-01honor repack.usedeltabaseoffset when fetching packsNicolas Pitre1-1/+12
2009-05-01Merge git://repo.or.cz/git-guiJunio C Hamano22-657/+1254
2009-05-01ctype.c: fix typo in commentRené Scharfe1-1/+1
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras25-64/+64
2009-05-01git-gui: Fixes for Mac OS X TkAquaDaniel A. Steffen2-19/+22
2009-04-30Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-25/+1381
2009-05-01gitk: Add Russian translationAlex Riesen1-0/+1085
2009-04-29improve error message in config.cAlex Riesen1-1/+1
2009-04-29Merge branch 'maint'Junio C Hamano2-9/+64
2009-04-29daemon.c: fix segfault on OS XBenjamin Kramer1-14/+14
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano2-5/+9
2009-04-29git config: error when editing a repo config and not being in oneFelipe Contreras1-0/+2
2009-04-29parseopt: fix documentation for --keep-dashdashUwe Kleine-König1-1/+1
2009-04-29Rename core.unreliableHardlinks to core.createObjectJohannes Schindelin6-16/+30
2009-04-29Merge branch 'maint-1.6.1' into maintJunio C Hamano2-12/+65
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-12/+65
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano2-12/+65
2009-04-29git-gui: Update Russian translationAlex Riesen1-401/+979
2009-04-28doc: consistently use ASCIIDOC_EXTRAEric Blake1-3/+3
2009-04-28Makefile: installing git in cygwin 1.7.0Eric Blake1-1/+1
2009-04-28Merge branch 'maint'Junio C Hamano4-4/+12
2009-04-28Merge branch 'maint-1.6.1' into maintJunio C Hamano4-4/+12
2009-04-28Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano4-4/+12
2009-04-28SubmittingPatches: itemize and reflect upon well written changesSam Vilain1-1/+13
2009-04-27Makefile: fix NO_PERL bug with gitwebJeff King1-3/+1
2009-04-27grep: fix segfault when "git grep '('" is givenLinus Torvalds2-2/+10
2009-04-27t5701: do not get stuck in empty-push/Johannes Schindelin1-2/+2
2009-04-27NetBSD compilation fixPatrick Welche2-0/+2
2009-04-27Documentation: fix a grammatical error in api-builtin.txtAllan Caffee1-1/+1
2009-04-27builtin-merge: fix a typo in an error messageAllan Caffee1-1/+1
2009-04-27Add semicolon to curly brace group in main MakefileMark Drago1-1/+1
2009-04-27prune-packed: advanced progress even for non-existing fan-out directoriesJohannes Sixt1-0/+1
2009-04-26t4202: fix typov1.6.3-rc3Linus Torvalds1-1/+1
2009-04-25Add an option not to use link(src, dest) && unlink(src) when that is unreliableJohannes Schindelin6-1/+28
2009-04-25connect: replace inet_ntop with getnameinfoBenjamin Kramer1-11/+4
2009-04-25Documentation: git-clean: make description more readableWesley J. Landaker1-5/+8
2009-04-25Documentation: git-clean: fix minor grammatical errorsWesley J. Landaker1-3/+3
2009-04-25Remove obsolete bug warning in man git-update-server-infoSitaram Chamarty1-6/+0
2009-04-25t7700-repack: repack -a now works properly, expect success from testBrandon Casey1-1/+1
2009-04-25t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey1-1/+1
2009-04-25progress bar: round to the nearest instead of truncating downNicolas Pitre1-4/+4
2009-04-24GIT 1.6.3-rc2v1.6.3-rc2Junio C Hamano1-1/+5
2009-04-24Merge branch 'maint'Junio C Hamano1-1/+1
2009-04-24Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+1
2009-04-24Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-04-24t7800: respect NO_PERLJeff King1-0/+5
2009-04-24remote.c: do not trigger remote.<name>.<var> codepath for two-level namesJohannes Sixt1-1/+1
2009-04-24builtin-help: silently tolerate unknown keysJohannes Sixt1-2/+1
2009-04-24Explain seemingly pointless use of system in difftoolAlex Riesen1-0/+6
2009-04-23Makefile: ignore perl/ subdirectory under NO_PERLJunio C Hamano1-0/+2
2009-04-23config.txt: Make configuration paragraph more consistentStephen Boyd1-3/+3
2009-04-23config.txt: clarify sentences in the configuration and syntax sectionsStephen Boyd1-6/+6
2009-04-23config.txt: add missing 'the's and make words pluralStephen Boyd1-17/+17
2009-04-23git-format-patch.txt: general rewordings and cleanupsStephen Boyd1-19/+19
2009-04-23git-show-branch.txt: cleanup example descriptionStephen Boyd1-3/+4
2009-04-23Documentation: use lowercase for shallow and deep threadingStephen Boyd2-4/+4
2009-04-23config.txt: add missing format.{subjectprefix,cc,attach} variablesStephen Boyd1-0/+15
2009-04-23test-genrandom: Add newline to usage stringStephen Boyd1-1/+1
2009-04-22Merge branch 'jc/maint-read-tree-multi'Junio C Hamano4-41/+55
2009-04-22Add parsing of elm aliases to git-send-emailBill Pemberton2-1/+9
2009-04-22Convert to use quiet option when availableDan Loewenherz4-5/+5
2009-04-22Fix more typos/spelling in commentsMichael J Gruber4-4/+4
2009-04-22Fix typos / spelling in commentsMike Ralphson20-27/+27
2009-04-22Documentation: git-svn: fix a grammatical error without awkwardnessWesley J. Landaker1-1/+1
2009-04-22Documentation: git-svn: fix spurious bolding that mangles the outputWesley J. Landaker1-1/+1
2009-04-22Wait for git diff to finish in git difftoolAlex Riesen1-1/+2
2009-04-22graph API: fix a bug in the rendering of octopus mergesAllan Caffee2-2/+2
2009-04-22graph API: fix extra space during pre_commit_line stateAllan Caffee1-2/+2
2009-04-22t4202-log: extend test coverage of graphingAllan Caffee1-2/+28
2009-04-21Revert "stat_tracking_info(): only count real commits"Junio C Hamano2-6/+1
2009-04-21test-lib.sh: Help test_create_repo() find the templates dirMichael J Gruber1-1/+1
2009-04-21gitk: Fix compare-commits function when we have local changesPaul Mackerras1-19/+47
2009-04-21Merge branch 'mk/maint-apply-swap'Junio C Hamano1-3/+31
2009-04-21Merge branch 'maint'Junio C Hamano2-1/+2
2009-04-20grep: don't support "grep.color"-like config optionsMarkus Heidelberg1-6/+3
2009-04-20Documentation: fix typos / spelling mistakesMike Ralphson4-5/+5
2009-04-20builtin-remote: fix typo in option descriptionMike Ralphson1-1/+1
2009-04-20clone: add test for push on an empty clone.Matthieu Moy1-0/+10
2009-04-20tests: make test-apply-criss-cross-rename more robustMichał Kiedrowicz1-3/+31
2009-04-20builtin-apply: keep information about files to be deletedMichał Kiedrowicz2-8/+47
2009-04-20tests: test applying criss-cross rename patchMichał Kiedrowicz1-0/+38
2009-04-20gitcvs-migration: Link to git-cvsimport documentationFrank Lichtenheld1-1/+1
2009-04-20Fix off-by-one in read_tree_recursiveJohannes Schindelin1-0/+1
2009-04-20Windows: Skip fstat/lstat optimization in write_entry()Johannes Sixt3-1/+17
2009-04-20checkout branch: prime cache-tree fullyJunio C Hamano1-1/+8
2009-04-20read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano1-0/+5
2009-04-20Move prime_cache_tree() to cache-tree.cJunio C Hamano4-36/+40
2009-04-20read-tree A B: do not corrupt cache-treeJunio C Hamano1-4/+2
2009-04-20Windows: Work around intermittent failures in mingw_renameJohannes Sixt1-2/+19
2009-04-20gitweb: Fix snapshots requested via PATH_INFOHolger Weiß1-2/+2
2009-04-20Merge branch 'mm/maint-add-p-quit'Junio C Hamano1-1/+1
2009-04-20git add -p: add missing "q" to patch promptWincent Colaiuta1-1/+1
2009-04-19Sync with 1.6.2.4Junio C Hamano5-18/+25
2009-04-19GIT 1.6.2.4v1.6.2.4Junio C Hamano2-2/+10
2009-04-19Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtinsNguyễn Thái Ngọc Duy1-2/+0
2009-04-19Merge branch 'ef/maint-fast-export' into maintJunio C Hamano2-2/+26
2009-04-19Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano2-39/+38
2009-04-19Merge branch 'lt/maint-reflog-expire' into maintJunio C Hamano1-6/+70
2009-04-19Merge branch 'jc/maint-shared-literally' into maintJunio C Hamano3-11/+23
2009-04-19Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy1-1/+3
2009-04-19add-interactive: refactor mode hunk handlingJeff King1-43/+21
2009-04-19git add -p: new "quit" command at the prompt.Matthieu Moy2-1/+20
2009-04-19Speed up reflog pruning of unreachable commitsJunio Hamano1-0/+44
2009-04-19Clean up reflog unreachability pruning decisionLinus Torvalds1-6/+26
2009-04-19builtin-fast-export.c: handle nested tagsErik Faye-Lund2-3/+6
2009-04-19builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2-3/+6
2009-04-19builtin-fast-export.c: turn error into warningErik Faye-Lund1-2/+4
2009-04-19test-suite: adding a test for fast-export with tag variantsErik Faye-Lund1-0/+16
2009-04-18Work around ash "alternate value" expansion bugBen Jackson3-3/+20
2009-04-18Update draft release notes to 1.6.3v1.6.3-rc1Junio C Hamano1-13/+21
2009-04-18Merge branch 'lt/bool-on-off'Junio C Hamano2-3/+3
2009-04-18Merge branch 'lt/pack-object-memuse'Junio C Hamano7-41/+54
2009-04-18Merge branch 'nd/archive-attribute'Junio C Hamano9-12/+147
2009-04-18Merge branch 'maint'Junio C Hamano5-11/+53
2009-04-18Describe fixes since 1.6.2.3Junio C Hamano2-1/+32
2009-04-18Merge branch 'maint-1.6.1' into maintJunio C Hamano0-0/+0
2009-04-18Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano3-9/+20
2009-04-18Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maintJunio C Hamano4-5/+29
2009-04-18Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2-3/+42
2009-04-18Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintJunio C Hamano2-12/+78
2009-04-18doc/git-daemon: add missing arguments to max-connections optionMarkus Heidelberg1-1/+1
2009-04-18Merge branch 'maint-1.6.0' into maintJunio C Hamano3-9/+20
2009-04-18doc/git-daemon: add missing arguments to optionsMarkus Heidelberg1-8/+8
2009-04-18init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2-1/+12
2009-04-18imap-send: use correct configuration variable in documentationPaul Bolle1-1/+1
2009-04-18Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'Johan Herland2-7/+15
2009-04-17Merge branch 'ac/color-graph'Junio C Hamano2-48/+199
2009-04-17Merge branch 'jk/cobdoc'Junio C Hamano2-47/+45
2009-04-17Merge branch 'mk/apply-swap'Junio C Hamano2-7/+84
2009-04-17Merge branch 'mm/add-p-quit'Junio C Hamano2-39/+38
2009-04-17Merge branch 'eb/upload-archive-from-git-shell'Junio C Hamano2-3/+4
2009-04-17Merge branch 'jc/shared-literally'Junio C Hamano1-5/+9
2009-04-17Merge branch 'ns/am-to-empty'Junio C Hamano2-5/+39
2009-04-17Merge branch 'bw/short-ref-strict'Junio C Hamano9-17/+67
2009-04-17Merge branch 'da/difftool'Junio C Hamano15-486/+825
2009-04-17Merge branch 'maint'Junio C Hamano3-5/+15
2009-04-17doc/gitattributes: clarify location of config textJeff King1-3/+6
2009-04-17hook/update: example of how to prevent branch creationPierre Habouzit1-1/+10
2009-04-17Merge branch 'maint-1.6.1' into maintJunio C Hamano2-2/+9
2009-04-17Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-2/+9
2009-04-17archive test: attributesRené Scharfe1-0/+91
2009-04-17archive: do not read .gitattributes in working directoryNguyễn Thái Ngọc Duy4-2/+36
2009-04-17unpack-trees: do not muck with attributes when we are not checking outJunio C Hamano1-2/+4
2009-04-17attr: add GIT_ATTR_INDEX "direction"Nguyễn Thái Ngọc Duy2-4/+11
2009-04-17archive tests: do not use .gitattributes in working directoryRené Scharfe1-4/+5
2009-04-17Fix buffer overflow in config parserThomas Jarosch2-2/+9
2009-04-17remote.c: use shorten_unambiguous_refMichael J Gruber1-5/+1
2009-04-17get_local_heads(): do not return random pointer if there is no headNguyễn Thái Ngọc Duy1-1/+1
2009-04-17Documentation: boolean value may be given by on/offMichał Kiedrowicz1-1/+1
2009-04-17gitk: Avoid crash if closed while reading referencesPat Thoyts1-0/+1
2009-04-17gitk: Handle external diff tool with spaces in the pathPat Thoyts1-3/+2