summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'lt/maint-reflog-expire' into maintJunio C Hamano2009-04-191-6/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | Speed up reflog pruning of unreachable commitsJunio Hamano2009-04-191-0/+44
| * | | | | | | | Clean up reflog unreachability pruning decisionLinus Torvalds2009-04-191-6/+26
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/maint-shared-literally' into maintJunio C Hamano2009-04-193-11/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'Johan Herland2009-04-182-7/+15
| * | | | | | | | t1301-shared-repo: fix forced modes testJohannes Sixt2009-04-121-4/+8
* | | | | | | | | Describe fixes since 1.6.2.3Junio C Hamano2009-04-182-1/+32
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-180-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-183-9/+20
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maintJunio C Hamano2009-04-184-5/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-012-2/+12
| * | | | | | | | tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-012-3/+17
* | | | | | | | | Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2009-04-182-3/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2009-04-022-3/+42
* | | | | | | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintJunio C Hamano2009-04-182-12/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | simplify output of conflicting mergeClemens Buchacher2009-04-051-13/+4
| * | | | | | | | | | update cache for conflicting submodule entriesClemens Buchacher2009-04-052-3/+4
| * | | | | | | | | | add tests for merging with submodulesClemens Buchacher2009-04-051-0/+74
* | | | | | | | | | | doc/git-daemon: add missing arguments to max-connections optionMarkus Heidelberg2009-04-181-1/+1
* | | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-04-183-9/+20
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | doc/git-daemon: add missing arguments to optionsMarkus Heidelberg2009-04-181-8/+8
| * | | | | | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2009-04-182-1/+12
* | | | | | | | | | | imap-send: use correct configuration variable in documentationPaul Bolle2009-04-181-1/+1
* | | | | | | | | | | doc/gitattributes: clarify location of config textJeff King2009-04-171-3/+6
* | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-172-2/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-172-2/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fix buffer overflow in config parserThomas Jarosch2009-04-172-2/+9
* | | | | | | | | | | git-apply: fix option descriptionUlrich Windl2009-04-161-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | GIT 1.6.2.3v1.6.2.3Junio C Hamano2009-04-122-7/+1
* | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-122-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-122-0/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)2009-04-121-0/+3
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | process_{tree,blob}: Remove useless xstrdup callsLinus Torvalds2009-04-121-0/+2
* | | | | | | | | Start 1.6.2.3 preparationJunio C Hamano2009-04-082-1/+29
* | | | | | | | | Merge branch 'jc/shared-literally' into maintJunio C Hamano2009-04-0810-38/+97
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | t1301: loosen test for forced modesJeff King2009-04-011-2/+2
| * | | | | | | | set_shared_perm(): sometimes we know what the final mode bits should look likeJunio C Hamano2009-03-283-11/+19
| * | | | | | | | move_temp_to_file(): do not forget to chmod() in "Coda hack" codepathJunio C Hamano2009-03-281-2/+3
| * | | | | | | | Move chmod(foo, 0444) into move_temp_to_file()Johan Herland2009-03-275-11/+4
| * | | | | | | | "core.sharedrepository = 0mode" should set, not loosenJunio C Hamano2009-03-275-20/+77
* | | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-082-1/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-222-1/+17
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-082-3/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-082-3/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink2009-04-082-3/+0
| * | | | | | | | Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano2009-04-081-4/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-082-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano2009-04-081-0/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-081-9/+12
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-0811-74/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |