aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-13
|\
| * ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen2009-05-10
| * ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen2009-05-10
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-08
|\ \ | |/
| * dir.c: Fix two minor grammatical errors in commentsAllan Caffee2009-05-05
* | GIT 1.6.1.4v1.6.1.4Junio C Hamano2009-05-03
* | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-03
|\ \
| * | pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2009-03-21
| * | t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey2009-03-21
| * | Remove --kept-pack-only option and associated infrastructureBrandon Casey2009-03-20
| * | pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2009-03-20
| * | git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2009-03-20
| * | t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey2009-03-20
| * | is_kept_pack(): final clean-upJunio C Hamano2009-02-28
| * | Simplify is_kept_pack()Junio C Hamano2009-02-28
| * | Consolidate ignore_packed logic moreJunio C Hamano2009-02-28
| * | has_sha1_kept_pack(): take "struct rev_info"Junio C Hamano2009-02-28
| * | has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano2009-02-28
| * | git-repack: resist stray environment variableJunio C Hamano2009-02-28
* | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-03
|\ \ \
| * | | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-22
* | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-03
|\ \ \ \
| * | | | match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-01
| * | | | tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-01
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-29
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diff -c -p: do not die on submodulesJunio C Hamano2009-04-29
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-28
|\ \ \ \ \ | |/ / / /
| * | | | grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-27
| * | | | Documentation: fix a grammatical error in api-builtin.txtAllan Caffee2009-04-27
| * | | | builtin-merge: fix a typo in an error messageAllan Caffee2009-04-27
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-24
|\ \ \ \ \ | |/ / / /
| * | | | test-genrandom: Add newline to usage stringStephen Boyd2009-04-23
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-18
|\ \ \ \ \ | |/ / / /
| * | | | doc/git-daemon: add missing arguments to optionsMarkus Heidelberg2009-04-18
| * | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2009-04-18
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-17
|\ \ \ \ \ | |/ / / /
| * | | | Fix buffer overflow in config parserThomas Jarosch2009-04-17
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-12
|\ \ \ \ \ | |/ / / /
| * | | | State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)2009-04-12
| * | | | process_{tree,blob}: Remove useless xstrdup callsLinus Torvalds2009-04-12
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-08
|\ \ \ \ \ | |/ / / /
| * | | | process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink2009-04-08
* | | | | Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano2009-04-08
|\ \ \ \ \
| * | | | | blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano2009-03-18
| | |_|/ / | |/| | |
* | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-08
|\ \ \ \ \
| * | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-21
* | | | | | Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano2009-04-08
|\ \ \ \ \ \
| * | | | | | Propagate --exec-path setting to external commands via GIT_EXEC_PATHJohannes Sixt2009-03-21
* | | | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-08
|\ \ \ \ \ \ \
| * | | | | | | Documentation: format-patch --root clarificationsThomas Rast2009-03-27