summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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
2009-04-07rev-list: add "int bisect_show_flags" in "struct rev_list_info"Christian Couder3-12/+9
2009-04-07rev-list: remove last static vars used in "show_commit"Christian Couder3-28/+34
2009-04-07list-objects: add "void *data" parameter to show functionsChristian Couder5-46/+49
2009-04-07git-rev-list.txt: make ascii markup uniform with other pages.Matthieu Moy1-11/+11
2009-04-07git-send-email.txt: clarify which options take an argument.Matthieu Moy1-17/+17
2009-04-07for-each-ref: refactor get_short_ref functionJeff King1-7/+7
2009-04-07Documentation: Introduce "upstream branch"Santi Béjar2-1/+7
2009-04-07Documentation: clarify .gitattributes searchJason Merrill2-5/+5
2009-04-07git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy1-2/+6
2009-04-07git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy1-2/+2
2009-04-07git remote update: Fallback to remote if group does not existFinn Arne Gangstad2-3/+9
2009-04-07remote: New function remote_is_configured()Finn Arne Gangstad2-0/+12
2009-04-07git remote update: Report error for non-existing groupsFinn Arne Gangstad1-3/+8
2009-04-06sha1-lookup: fix up the assertion messageJunio C Hamano1-1/+1
2009-04-06Merge branch 'jc/name-branch'Junio C Hamano11-50/+94
2009-04-06Merge branch 'jc/shared-literally'Junio C Hamano10-38/+97
2009-04-06Merge branch 'mg/tracked-local-branches'Junio C Hamano2-3/+14
2009-04-06Merge branch 'sb/format-patch-patchname'Junio C Hamano17-129/+381
2009-04-06user-manual: the name of the hash function is SHA-1, not sha1Felipe Contreras1-25/+25
2009-04-06docbook: change css styleFelipe Contreras1-2/+12
2009-04-06user-manual: remove some git-foo usageFelipe Contreras1-74/+74
2009-04-06Documentation: branch.*.merge can also affect 'git-push'Santi Béjar1-1/+1
2009-04-06Add configuration variable for sign-off to format-patchHeiko Voigt3-7/+24
2009-04-05bash completion: Update 'git am' optionsTodd Zullinger1-1/+2
2009-04-05git remote update: New option --pruneFinn Arne Gangstad2-5/+19
2009-04-05builtin-remote.c: Split out prune_remote as a separate function.Finn Arne Gangstad1-26/+30
2009-04-05bisect--helper: string output variables together with "&&"Christian Couder4-25/+23
2009-04-05rev-list: pass "int flags" as last argument of "show_bisect_vars"Christian Couder3-10/+13
2009-04-05t6030: test bisecting with pathsChristian Couder1-0/+60
2009-04-05bisect: use "bisect--helper" and remove "filter_skipped" functionChristian Couder1-77/+12
2009-04-05bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"Christian Couder1-9/+46
2009-04-05bisect--helper: implement "git bisect--helper"Christian Couder6-0/+105
2009-04-05bisect: use the new generic "sha1_pos" function to lookup sha1Christian Couder1-14/+9
2009-04-05rev-list: call new "filter_skip" functionChristian Couder3-6/+93
2009-04-05Merge branch 'maint'Junio C Hamano4-5/+6
2009-04-05git submodule: fix usage lineJulien Danjou1-1/+1
2009-04-05Merge branch 'maint-1.6.1' into maintJunio C Hamano2-2/+3
2009-04-05Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-2/+3
2009-04-05doc/git-pack-refs: fix two grammar issuesMarkus Heidelberg1-2/+2
2009-04-05tests: remove exit after test_done callJeff King17-26/+0
2009-04-05commit: abort commit if interactive add failedJeff King1-1/+2
2009-04-05simplify output of conflicting mergeClemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesClemens Buchacher2-3/+4
2009-04-05add tests for merging with submodulesClemens Buchacher1-0/+74
2009-04-05bisect: improve error message when branch checkout failsChristian Couder1-3/+3
2009-04-05git-repack: use non-dashed update-server-infoDan McGee1-1/+1
2009-04-04add --html-path to get the location of installed HTML docsMarkus Heidelberg5-3/+22
2009-04-04Merge branch 'cc/sha1-bsearch' into HEADJunio C Hamano84-723/+1738
2009-04-04patch-ids: use the new generic "sha1_pos" function to lookup sha1Christian Couder1-88/+5
2009-04-04sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1Christian Couder2-0/+108
2009-04-04send-email: fix nasty bug in ask() functionJay Soffian2-2/+15
2009-04-02Update draft release notes to 1.6.3Junio C Hamano1-2/+19
2009-04-02Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2-3/+42
2009-04-02Allow curl to rewind the read buffersMartin Storsjö3-0/+50
2009-04-02Sync with 1.6.2.2Junio C Hamano2-12/+9
2009-04-02GIT 1.6.2.2v1.6.2.2Junio C Hamano2-7/+10
2009-04-02Merge branch 'jc/maint-1.6.0-blame-s' into maintJunio C Hamano1-4/+4
2009-04-02Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2-3/+26
2009-04-02Merge branch 'js/maint-1.6.0-exec-path-env' into maintJunio C Hamano1-0/+4
2009-04-02Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2-2/+2
2009-04-02Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano1-9/+12
2009-04-02Merge branch 'dm/maint-docco' into maintJunio C Hamano10-230/+234
2009-04-02send-email: ensure quoted addresses are rfc2047 encodedJay Soffian2-1/+15
2009-04-02send-email: correct two tests which were going interactiveJay Soffian1-3/+5
2009-04-01Merge branch 'ef/fast-export'Junio C Hamano2-2/+26
2009-04-01Merge branch 'mh/format-patch-add-header'Junio C Hamano3-0/+22
2009-04-01Merge branch 'tr/maint-1.6.1-doc-format-patch--root'Junio C Hamano1-9/+12
2009-04-01Merge branch 'maint'Junio C Hamano3-2/+11
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-19 00:37:03 +0000