summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-16git-apply: fix option descriptionUlrich Windl1-1/+1
2009-04-16Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy1-1/+3
2009-04-16add-interactive: refactor mode hunk handlingJeff King1-43/+21
2009-04-15git add -p: new "quit" command at the prompt.Matthieu Moy2-1/+20
2009-04-15builtin-apply: keep information about files to be deletedMichał Kiedrowicz2-8/+47
2009-04-13graph API: Added logic for colored edgesAllan Caffee2-48/+199
2009-04-13tests: test applying criss-cross rename patchMichał Kiedrowicz1-0/+38
2009-04-13rev-parse: --abbrev-ref option to shorten ref nameBert Wesarg2-2/+26
2009-04-13for-each-ref: utilize core.warnAmbiguousRefs for :short-formatBert Wesarg3-4/+22
2009-04-13shorten_unambiguous_ref(): add strict modeBert Wesarg4-7/+19
2009-04-13docs/checkout: clarify what "non-branch" meansJeff King1-5/+5
2009-04-13doc/checkout: split checkout and branch creation in synopsisJeff King1-18/+22
2009-04-13doc/checkout: refer to git-branch(1) as appropriateJeff King1-19/+9
2009-04-13doc: refer to tracking configuration as "upstream"Jeff King2-12/+14
2009-04-13doc: clarify --no-track optionJeff King2-2/+4
2009-04-12gitignore git-bisect--helperJunio C Hamano1-0/+1
2009-04-12git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi2-5/+39
2009-04-12Mark t1301 permission test to depend on POSIXPERMJunio C Hamano346-4349/+10224
2009-04-12show_object(): push path_name() call further downLinus Torvalds7-14/+20
2009-04-12process_{tree,blob}: show objects without bufferingLinus Torvalds7-41/+48
2009-04-12GIT 1.6.3-rc0v1.6.3-rc0Junio C Hamano2-3/+14
2009-04-12Documentation/git.txt: GIT 1.6.2.2 has been out for a whileNanako Shiraishi1-1/+2
2009-04-12Merge branch 'jk/no-perl'Junio C Hamano13-4/+77
2009-04-12Merge branch 'sb/doc-upstream-branch'Junio C Hamano2-1/+7
2009-04-12Merge branch 'jk/show-upstream'Junio C Hamano7-131/+187
2009-04-12Merge branch 'fg/remote-prune'Junio C Hamano5-34/+156
2009-04-12Merge branch 'cc/sha1-bsearch'Junio C Hamano1-1/+1
2009-04-12Merge branch 'cc/bisect-filter'Junio C Hamano20-665/+985
2009-04-12Merge branch 'maint'Junio C Hamano3-6/+5
2009-04-12GIT 1.6.2.3v1.6.2.3Junio C Hamano2-7/+1
2009-04-12Merge branch 'maint-1.6.1' into maintJunio C Hamano2-0/+5
2009-04-12Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-0/+5
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar4-70/+76
2009-04-12State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)1-0/+3
2009-04-12process_{tree,blob}: Remove useless xstrdup callsLinus Torvalds1-0/+2
2009-04-12t1301-shared-repo: fix forced modes testJohannes Sixt1-4/+8
2009-04-12documentation: Makefile accounts for SHELL_PATH settingBen Walton1-6/+10
2009-04-11Allow users to un-configure rename detectionLinus Torvalds1-7/+10
2009-04-11Replace ",<,>,& with their respective XML entities in DAV requestsMike Hommey1-2/+34
2009-04-11git-svn: always initialize with core.autocrlf=falseJohannes Schindelin1-0/+1
2009-04-11Update delta compression message to be less misleadingDan McGee1-1/+1
2009-04-11git-svn: Save init/clone --ignore-paths in configBen Jackson3-2/+9
2009-04-11git-svn: Add per-svn-remote ignore-paths configBen Jackson3-21/+82
2009-04-11git-svn: speed up blame commandBoris Byk1-4/+50
2009-04-11git-svn: add fetch --parent optionJason Merrill2-4/+17
2009-04-11Fix misspelled mergetool.keepBackupFerry Huberts1-1/+1
2009-04-11git-shell: Add 'git-upload-archive' to allowed commands.Erik Broes2-3/+4
2009-04-11Allow users to un-configure rename detectionLinus Torvalds1-2/+2
2009-04-09add tests for remote groupsJeff King1-0/+81
2009-04-09Update draft release notes to 1.6.3Junio C Hamano1-2/+27
2009-04-08Merge branch 'maint'Junio C Hamano5-25/+53
2009-04-08Start 1.6.2.3 preparationJunio C Hamano2-1/+29
2009-04-08Merge branch 'jc/shared-literally' into maintJunio C Hamano10-38/+97
2009-04-08Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2-1/+17
2009-04-08Merge branch 'maint-1.6.1' into maintJunio C Hamano2-3/+0
2009-04-08Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-3/+0
2009-04-08Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano11-74/+105
2009-04-08Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano1-4/+4
2009-04-08Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2-2/+2
2009-04-08Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano1-0/+4
2009-04-08Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano1-9/+12
2009-04-08process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink2-3/+0
2009-04-08tests: skip perl tests if NO_PERL is definedJeff King12-2/+48
2009-04-08Makefile: allow building without perlJeff King2-2/+29
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy1-17/+25
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar6-388/+458
2009-04-07branch: show upstream branch when double verboseJeff King2-7/+20
2009-04-07make get_short_ref a public functionJeff King3-104/+101
2009-04-07for-each-ref: add "upstream" format fieldJeff King3-0/+41
2009-04-07for-each-ref: refactor refname handlingJeff King1-21/+26
2009-04-07Merge branch 'maint'Junio C Hamano5-12/+16
2009-04-07Merge branch 'maint-1.6.1' into maintJunio C Hamano3-9/+13
2009-04-07Change double quotes to single quotes in messageJari Aalto2-4/+4
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano3-9/+13
2009-04-07Merge branch 'lt/reflog-expire'Junio C Hamano1-6/+70
2009-04-07Merge branch 'bs/maint-1.6.0-tree-walk-prefix'Junio C Hamano4-5/+29
2009-04-07Merge branch 'ms/http-auth'Junio C Hamano3-0/+50
2009-04-07Merge branch 'js/maint-submodule-checkout'Junio C Hamano2-3/+42
2009-04-07Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2-12/+78
2009-04-07Merge branch 'mh/html-path'Junio C Hamano5-3/+22
2009-04-07mergetool: use $( ... ) instead of `backticks`David Aguilar1-8/+8
2009-04-07bash completion: add git-difftoolDavid Aguilar1-5/+22
2009-04-07difftool: add support for a difftool.prompt config variableDavid Aguilar5-6/+96
2009-04-07difftool: add various git-difftool testsDavid Aguilar1-0/+147
2009-04-07difftool: move 'git-difftool' out of contribDavid Aguilar7-4/+27
2009-04-07difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping6-11/+14
2009-04-07difftool: add a -y shortcut for --no-promptDavid Aguilar2-25/+17
2009-04-07difftool: use perl built-ins when testing for msysDavid Aguilar1-2/+5
2009-04-07difftool: remove the backup file featureDavid Aguilar1-33/+1
2009-04-07difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiffDavid Aguilar1-7/+3
2009-04-07git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg3-5/+16
2009-04-07git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2-4/+16
2009-04-07doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg1-1/+2