summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-132-34/+34
|\
| * git-rerere.txt: grammatical fixups and cleanupsStephen Boyd2009-06-131-33/+32
| * http-push.c::remove_locks(): fix use after freeAlex Riesen2009-05-241-1/+2
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-131-1/+3
|\ \ | |/
| * ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen2009-05-101-0/+2
| * ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen2009-05-101-1/+1
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-081-2/+2
|\ \ | |/
| * dir.c: Fix two minor grammatical errors in commentsAllan Caffee2009-05-051-2/+2
* | GIT 1.6.1.4v1.6.1.4Junio C Hamano2009-05-032-1/+26
* | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-0311-74/+105
|\ \
| * | pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2009-03-212-2/+26
| * | t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey2009-03-211-0/+17
| * | Remove --kept-pack-only option and associated infrastructureBrandon Casey2009-03-205-31/+2
| * | pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2009-03-202-3/+3
| * | git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2009-03-202-6/+2
| * | t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey2009-03-201-0/+44
| * | is_kept_pack(): final clean-upJunio C Hamano2009-02-285-21/+13
| * | Simplify is_kept_pack()Junio C Hamano2009-02-285-51/+18
| * | Consolidate ignore_packed logic moreJunio C Hamano2009-02-284-21/+17
| * | has_sha1_kept_pack(): take "struct rev_info"Junio C Hamano2009-02-284-9/+12
| * | has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano2009-02-287-13/+33
| * | git-repack: resist stray environment variableJunio C Hamano2009-02-281-0/+1
* | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-032-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 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-034-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 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-292-12/+65
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diff -c -p: do not die on submodulesJunio C Hamano2009-04-292-12/+65
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-284-4/+12
|\ \ \ \ \ | |/ / / /
| * | | | grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-272-2/+10
| * | | | Documentation: fix a grammatical error in api-builtin.txtAllan Caffee2009-04-271-1/+1
| * | | | builtin-merge: fix a typo in an error messageAllan Caffee2009-04-271-1/+1
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | test-genrandom: Add newline to usage stringStephen Boyd2009-04-231-1/+1
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio 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
* | | | | 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
* | | | | 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
* | | | | 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
|\ \ \ \ \
| * | | | | blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano2009-03-181-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-082-2/+2
|\ \ \ \ \
| * | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-212-2/+2
* | | | | | Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano2009-04-081-0/+4
|\ \ \ \ \ \