summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-04-18Merge branch 'js/maint-submodule-checkout' into maintLibravatar Junio C Hamano2-3/+42
2009-04-18Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintLibravatar Junio C Hamano2-12/+78
2009-04-18doc/git-daemon: add missing arguments to max-connections optionLibravatar Markus Heidelberg1-1/+1
2009-04-18Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano3-9/+20
2009-04-18doc/git-daemon: add missing arguments to optionsLibravatar Markus Heidelberg1-8/+8
2009-04-18init: Do not segfault on big GIT_TEMPLATE_DIR environment variableLibravatar Frank Lichtenheld2-1/+12
2009-04-18imap-send: use correct configuration variable in documentationLibravatar Paul Bolle1-1/+1
2009-04-17doc/gitattributes: clarify location of config textLibravatar Jeff King1-3/+6
2009-04-17Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano2-2/+9
2009-04-17Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+9
2009-04-17Fix buffer overflow in config parserLibravatar Thomas Jarosch2-2/+9
2009-04-16git-apply: fix option descriptionLibravatar Ulrich Windl1-1/+1
2009-04-12GIT 1.6.2.3Libravatar Junio C Hamano2-7/+1
2009-04-12Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano2-0/+5
2009-04-12Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-0/+5
2009-04-12State the effect of filter-branch on graft explicitlyLibravatar Daniel Cheng (aka SDiZ)1-0/+3
2009-04-12process_{tree,blob}: Remove useless xstrdup callsLibravatar Linus Torvalds1-0/+2
2009-04-08Start 1.6.2.3 preparationLibravatar Junio C Hamano2-1/+29
2009-04-08Merge branch 'jc/shared-literally' into maintLibravatar Junio C Hamano10-38/+97
2009-04-08Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintLibravatar Junio C Hamano2-1/+17
2009-04-08Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano2-3/+0
2009-04-08Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-3/+0
2009-04-08Merge branch 'jc/maint-1.6.0-keep-pack' into maintLibravatar Junio C Hamano11-74/+105
2009-04-08Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Libravatar Junio C Hamano1-4/+4
2009-04-08Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Libravatar Junio C Hamano2-2/+2
2009-04-08Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Libravatar Junio C Hamano1-0/+4
2009-04-08Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Libravatar Junio C Hamano1-9/+12
2009-04-08process_{tree,blob}: Remove useless xstrdup callsLibravatar Björn Steinbrink2-3/+0
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Libravatar Matthieu Moy1-17/+25
2009-04-07Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano3-9/+13
2009-04-07Change double quotes to single quotes in messageLibravatar Jari Aalto2-4/+4
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano3-9/+13
2009-04-07Documentation: clarify .gitattributes searchLibravatar Jason Merrill2-5/+5
2009-04-07git-checkout.txt: clarify that <branch> applies when no path is given.Libravatar Matthieu Moy1-2/+6
2009-04-07git-checkout.txt: fix incorrect statement about HEAD and indexLibravatar Matthieu Moy1-2/+2
2009-04-05git submodule: fix usage lineLibravatar Julien Danjou1-1/+1
2009-04-05Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano2-2/+3
2009-04-05Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+3
2009-04-05doc/git-pack-refs: fix two grammar issuesLibravatar Markus Heidelberg1-2/+2
2009-04-05commit: abort commit if interactive add failedLibravatar Jeff King1-1/+2
2009-04-05simplify output of conflicting mergeLibravatar Clemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesLibravatar Clemens Buchacher2-3/+4
2009-04-05add tests for merging with submodulesLibravatar Clemens Buchacher1-0/+74
2009-04-05git-repack: use non-dashed update-server-infoLibravatar Dan McGee1-1/+1
2009-04-02Fix 'git checkout <submodule>' to update the indexLibravatar Johannes Schindelin2-3/+42
2009-04-02GIT 1.6.2.2Libravatar Junio C Hamano2-7/+10
2009-04-02Merge branch 'jc/maint-1.6.0-blame-s' into maintLibravatar Junio C Hamano1-4/+4
2009-04-02Merge branch 'js/maint-diff-temp-smudge' into maintLibravatar Junio C Hamano2-3/+26
2009-04-02Merge branch 'js/maint-1.6.0-exec-path-env' into maintLibravatar Junio C Hamano1-0/+4
2009-04-02Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintLibravatar Junio C Hamano2-2/+2