summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-0811-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
* | git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy2009-04-081-17/+25
* | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-073-9/+13
|\ \
| * \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-073-9/+13
| |\ \
| | * | Documentation: clarify .gitattributes searchJason Merrill2009-04-072-5/+5
| | * | git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy2009-04-071-2/+6
| | * | git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy2009-04-071-2/+2
* | | | Change double quotes to single quotes in messageJari Aalto2009-04-072-4/+4
* | | | git submodule: fix usage lineJulien Danjou2009-04-051-1/+1
* | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-052-2/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-052-2/+3
| |\ \ \ | | |/ /
| | * | commit: abort commit if interactive add failedJeff King2009-04-051-1/+2
| | * | git-repack: use non-dashed update-server-infoDan McGee2009-04-051-1/+1
* | | | doc/git-pack-refs: fix two grammar issuesMarkus Heidelberg2009-04-051-2/+2
* | | | GIT 1.6.2.2v1.6.2.2Junio C Hamano2009-04-022-7/+10
* | | | Merge branch 'jc/maint-1.6.0-blame-s' into maintJunio C Hamano2009-04-021-4/+4
|\ \ \ \
| * | | | blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano2009-03-181-4/+4
* | | | | Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2009-04-022-3/+26
|\ \ \ \ \
| * | | | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-222-3/+26
* | | | | | Merge branch 'js/maint-1.6.0-exec-path-env' into maintJunio C Hamano2009-04-021-0/+4
|\ \ \ \ \ \
| * | | | | | Propagate --exec-path setting to external commands via GIT_EXEC_PATHJohannes Sixt2009-03-211-0/+4
* | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2009-04-022-2/+2
|\ \ \ \ \ \ \
| * | | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-212-2/+2
* | | | | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano2009-04-021-9/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: format-patch --root clarificationsThomas Rast2009-03-271-9/+12
* | | | | | | | | Merge branch 'dm/maint-docco' into maintJunio C Hamano2009-04-0210-230/+234
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: Remove spurious uses of "you" in git-bisect.txt.David J. Mellor2009-03-251-3/+3
| * | | | | | | | | Documentation: minor grammatical fix in git-check-ref-format.txtDavid J. Mellor2009-03-221-20/+20
| * | | | | | | | | Documentation: minor grammatical fixes in git-check-attr.txtDavid J. Mellor2009-03-221-8/+8
| * | | | | | | | | Documentation: minor grammatical fixes in git-cat-file.txtDavid J. Mellor2009-03-221-9/+9
| * | | | | | | | | Documentation: minor grammatical fixes and rewording in git-bundle.txtDavid J. Mellor2009-03-221-43/+43
| * | | | | | | | | Documentation: remove some uses of the passive voice in git-bisect.txtDavid J. Mellor2009-03-221-11/+11
| * | | | | | | | | Documentation: reword example text in git-bisect.txt.David J. Mellor2009-03-201-20/+24
| * | | | | | | | | Documentation: reworded the "Description" section of git-bisect.txt.David J. Mellor2009-03-191-8/+9
| * | | | | | | | | Documentation: minor grammatical fixes in git-branch.txt.David J. Mellor2009-03-171-25/+25
| * | | | | | | | | Documentation: minor grammatical fixes in git-blame.txt.David J. Mellor2009-03-173-38/+37
| * | | | | | | | | Documentation: reword the "Description" section of git-bisect.txt.David J. Mellor2009-03-171-77/+77
| * | | | | | | | | Documentation: minor grammatical fixes in git-archive.txt.David J. Mellor2009-03-171-4/+4