summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-04-19GIT 1.6.2.4v1.6.2.4Junio C Hamano2-2/+10
2009-04-19Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtinsNguyễn Thái Ngọc Duy1-2/+0
2009-04-19Merge branch 'ef/maint-fast-export' into maintJunio C Hamano2-2/+26
2009-04-19Merge branch 'mm/maint-add-p-quit' into maintJunio C Hamano2-39/+38
2009-04-19Merge branch 'lt/maint-reflog-expire' into maintJunio C Hamano1-6/+70
2009-04-19Merge branch 'jc/maint-shared-literally' into maintJunio C Hamano3-11/+23
2009-04-19Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy1-1/+3
2009-04-19add-interactive: refactor mode hunk handlingJeff King1-43/+21
2009-04-19git add -p: new "quit" command at the prompt.Matthieu Moy2-1/+20
2009-04-19Speed up reflog pruning of unreachable commitsJunio Hamano1-0/+44
2009-04-19Clean up reflog unreachability pruning decisionLinus Torvalds1-6/+26
2009-04-19builtin-fast-export.c: handle nested tagsErik Faye-Lund2-3/+6
2009-04-19builtin-fast-export.c: fix crash on tagged treesErik Faye-Lund2-3/+6
2009-04-19builtin-fast-export.c: turn error into warningErik Faye-Lund1-2/+4
2009-04-19test-suite: adding a test for fast-export with tag variantsErik Faye-Lund1-0/+16
2009-04-18Describe fixes since 1.6.2.3Junio C Hamano2-1/+32
2009-04-18Merge branch 'maint-1.6.1' into maintJunio C Hamano0-0/+0
2009-04-18Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano3-9/+20
2009-04-18Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maintJunio C Hamano4-5/+29
2009-04-18Merge branch 'js/maint-submodule-checkout' into maintJunio C Hamano2-3/+42
2009-04-18Merge branch 'cb/maint-merge-recursive-submodule-fix' into maintJunio C Hamano2-12/+78
2009-04-18doc/git-daemon: add missing arguments to max-connections optionMarkus Heidelberg1-1/+1
2009-04-18Merge branch 'maint-1.6.0' into maintJunio C Hamano3-9/+20
2009-04-18doc/git-daemon: add missing arguments to optionsMarkus Heidelberg1-8/+8
2009-04-18init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2-1/+12
2009-04-18imap-send: use correct configuration variable in documentationPaul Bolle1-1/+1
2009-04-18Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'Johan Herland2-7/+15
2009-04-17doc/gitattributes: clarify location of config textJeff King1-3/+6
2009-04-17Merge branch 'maint-1.6.1' into maintJunio C Hamano2-2/+9
2009-04-17Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-2/+9
2009-04-17Fix buffer overflow in config parserThomas Jarosch2-2/+9
2009-04-16git-apply: fix option descriptionUlrich Windl1-1/+1
2009-04-12GIT 1.6.2.3v1.6.2.3Junio C Hamano2-7/+1
2009-04-12Merge branch 'maint-1.6.1' into maintJunio C Hamano2-0/+5
2009-04-12Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-0/+5
2009-04-12State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)1-0/+3
2009-04-12process_{tree,blob}: Remove useless xstrdup callsLinus Torvalds1-0/+2
2009-04-12t1301-shared-repo: fix forced modes testJohannes Sixt1-4/+8
2009-04-08Start 1.6.2.3 preparationJunio C Hamano2-1/+29
2009-04-08Merge branch 'jc/shared-literally' into maintJunio C Hamano10-38/+97
2009-04-08Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2-1/+17
2009-04-08Merge branch 'maint-1.6.1' into maintJunio C Hamano2-3/+0
2009-04-08Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-3/+0
2009-04-08Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano11-74/+105
2009-04-08Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano1-4/+4
2009-04-08Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2-2/+2
2009-04-08Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano1-0/+4
2009-04-08Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano1-9/+12
2009-04-08process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink2-3/+0
2009-04-08git-pull.sh: better warning message for "git pull" on detached head.Matthieu Moy1-17/+25
2009-04-07Merge branch 'maint-1.6.1' into maintJunio C Hamano3-9/+13
2009-04-07Change double quotes to single quotes in messageJari Aalto2-4/+4
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano3-9/+13
2009-04-07Documentation: clarify .gitattributes searchJason Merrill2-5/+5
2009-04-07git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy1-2/+6
2009-04-07git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy1-2/+2
2009-04-05git submodule: fix usage lineJulien Danjou1-1/+1
2009-04-05Merge branch 'maint-1.6.1' into maintJunio C Hamano2-2/+3
2009-04-05Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-2/+3
2009-04-05doc/git-pack-refs: fix two grammar issuesMarkus Heidelberg1-2/+2
2009-04-05commit: abort commit if interactive add failedJeff King1-1/+2
2009-04-05simplify output of conflicting mergeClemens Buchacher1-13/+4
2009-04-05update cache for conflicting submodule entriesClemens Buchacher2-3/+4
2009-04-05add tests for merging with submodulesClemens Buchacher1-0/+74
2009-04-05git-repack: use non-dashed update-server-infoDan McGee1-1/+1
2009-04-02Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2-3/+42
2009-04-02GIT 1.6.2.2v1.6.2.2Junio C Hamano2-7/+10
2009-04-02Merge branch 'jc/maint-1.6.0-blame-s' into maintJunio C Hamano1-4/+4
2009-04-02Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2-3/+26
2009-04-02Merge branch 'js/maint-1.6.0-exec-path-env' into maintJunio C Hamano1-0/+4
2009-04-02Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2-2/+2
2009-04-02Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano1-9/+12
2009-04-02Merge branch 'dm/maint-docco' into maintJunio C Hamano10-230/+234
2009-04-01Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+1
2009-04-01Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-04-01match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2-2/+12
2009-04-01tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2-3/+17
2009-04-01Documentation: Remove an odd "instead"Holger Weiß1-1/+1
2009-04-01t1301: loosen test for forced modesJeff King1-2/+2
2009-04-01fix portability problem with IS_RUN_COMMAND_ERRJeff King1-1/+1
2009-04-01mailmap: resurrect lower-casing of email addressesJohannes Schindelin1-0/+9
2009-03-30Update draft release notes to 1.6.2.2Junio C Hamano1-1/+8
2009-03-30Merge branch 'maint-1.6.1' into maintJunio C Hamano3-6/+7
2009-03-30Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano3-6/+12
2009-03-30Fix bash completion in path with spacesDaniel Cheng (aka SDiZ)1-2/+2
2009-03-30bash completion: only show 'log --merge' if mergingThomas Rast1-1/+6
2009-03-30git-tag(1): add hint about commit messagesNico -telmich- Schottelius1-0/+1
2009-03-30Documentation: update graph api example.Allan Caffee1-4/+4
2009-03-29Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+2
2009-03-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+2
2009-03-29git-svn: fix ls-tree usage with dash-prefixed pathsEric Wong1-6/+9
2009-03-29import-zips: fix thinkoJohannes Schindelin1-1/+2
2009-03-28set_shared_perm(): sometimes we know what the final mode bits should look likeJunio C Hamano3-11/+19
2009-03-28move_temp_to_file(): do not forget to chmod() in "Coda hack" codepathJunio C Hamano1-2/+3
2009-03-28Merge branch 'maint-1.6.1' into maintJunio C Hamano3-11/+3
2009-03-28test-lib: Clean up comments and Makefile.Emil Sit2-9/+1
2009-03-27Move chmod(foo, 0444) into move_temp_to_file()Johan Herland5-11/+4
2009-03-27"core.sharedrepository = 0mode" should set, not loosenJunio C Hamano5-20/+77
2009-03-27Documentation: format-patch --root clarificationsThomas Rast1-9/+12
2009-03-26documentation: update cvsimport description of "-r" for recent cloneCarlo Marcelo Arenas Belon1-1/+1
2009-03-25Documentation: Remove spurious uses of "you" in git-bisect.txt.David J. Mellor1-3/+3
2009-03-25diff --no-index: Do not generate patch output if other output is requestedJohannes Sixt1-2/+2
2009-03-24Increase the size of the die/warning buffer to avoid truncationShawn O. Pearce1-1/+1
2009-03-24Merge branch 'maint-1.6.1' into maintJunio C Hamano2-2/+2
2009-03-24Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-2/+2
2009-03-24close_sha1_file(): make it easier to diagnose errorsLinus Torvalds1-1/+1
2009-03-24avoid possible overflow in delta size filtering computationNicolas Pitre1-1/+1
2009-03-22Documentation: minor grammatical fix in git-check-ref-format.txtDavid J. Mellor1-20/+20
2009-03-22Documentation: minor grammatical fixes in git-check-attr.txtDavid J. Mellor1-8/+8
2009-03-22Documentation: minor grammatical fixes in git-cat-file.txtDavid J. Mellor1-9/+9
2009-03-22Documentation: minor grammatical fixes and rewording in git-bundle.txtDavid J. Mellor1-43/+43
2009-03-22Documentation: remove some uses of the passive voice in git-bisect.txtDavid J. Mellor1-11/+11
2009-03-22Merge branch 'maint-1.6.1' into maintJunio C Hamano1-1/+1
2009-03-22Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2-1/+17
2009-03-22Smudge the files fed to external diff and textconvJohannes Schindelin2-3/+26
2009-03-22everyday: use the dashless form of git-initDavid Aguilar1-1/+1
2009-03-21Update draft release notes to 1.6.2.2Junio C Hamano2-1/+36
2009-03-21ls-files: require worktree when --deleted is givenJeff King1-0/+1
2009-03-21pickaxe: count regex matches only onceRené Scharfe1-2/+4
2009-03-21Merge branch 'maint-1.6.1' into maintJunio C Hamano0-0/+0
2009-03-21Merge branch 'tr/maint-1.6.0-send-email-irt' into maintJunio C Hamano2-1/+12
2009-03-21Merge branch 'mg/maint-submodule-normalize-path' into maintJunio C Hamano2-3/+61
2009-03-21Merge branch 'rs/memmem' into maintJunio C Hamano2-11/+12
2009-03-21Merge branch 'js/rsync-local' into maintJunio C Hamano2-27/+35
2009-03-21Merge branch 'db/maint-missing-origin' into maintJunio C Hamano3-8/+20
2009-03-21Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maintJunio C Hamano2-3/+34
2009-03-21Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano6-152/+115
2009-03-21Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano7-27/+73
2009-03-21format-patch: --numbered-files and --stdout aren't mutually exclusiveStephen Boyd2-3/+0
2009-03-21pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2-2/+26
2009-03-21Propagate --exec-path setting to external commands via GIT_EXEC_PATHJohannes Sixt1-0/+4
2009-03-21t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey1-0/+17
2009-03-21git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2-2/+2
2009-03-20Remove --kept-pack-only option and associated infrastructureBrandon Casey5-31/+2
2009-03-20pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2-3/+3
2009-03-20git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2-6/+2
2009-03-20t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey1-0/+44
2009-03-20Documentation: reword example text in git-bisect.txt.David J. Mellor1-20/+24
2009-03-19doc: clarify how -S worksJeff King1-1/+4
2009-03-19Documentation: reworded the "Description" section of git-bisect.txt.David J. Mellor1-8/+9
2009-03-18blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano1-4/+4
2009-03-17Documentation: minor grammatical fixes in git-branch.txt.David J. Mellor1-25/+25
2009-03-17Documentation: minor grammatical fixes in git-blame.txt.David J. Mellor3-38/+37
2009-03-17Documentation: reword the "Description" section of git-bisect.txt.David J. Mellor1-77/+77
2009-03-17Documentation: minor grammatical fixes in git-archive.txt.David J. Mellor1-4/+4
2009-03-16Remove total confusion from git-fetch and git-pushJunio C Hamano1-18/+3
2009-03-15GIT 1.6.2.1v1.6.2.1Junio C Hamano2-7/+1
2009-03-12Merge branch 'maint-1.6.1' into maintJunio C Hamano0-0/+0
2009-03-12Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano4-38/+82
2009-03-12Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1Junio C Hamano1-2/+2
2009-03-12Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Junio C Hamano22-10/+229
2009-03-12Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Junio C Hamano2-36/+73
2009-03-12Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Junio C Hamano2-2/+9
2009-03-12Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1Junio C Hamano1-1/+1
2009-03-12Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1Junio C Hamano3-5/+27
2009-03-12Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Junio C Hamano2-7/+58
2009-03-12Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Junio C Hamano2-13/+16
2009-03-12Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Junio C Hamano2-1/+69
2009-03-12Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1Junio C Hamano2-5/+30
2009-03-12Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1Junio C Hamano2-3/+44
2009-03-12Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1Junio C Hamano22-10/+229
2009-03-12Merge branch 'jk/maint-1.6.1-cleanup-after-exec-failure' into maint-1.6.1Junio C Hamano3-10/+30
2009-03-12Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0Junio C Hamano2-66/+98
2009-03-12read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano2-3/+34
2009-03-11send-email: test --no-thread --in-reply-to combinationThomas Rast1-0/+11
2009-03-11Update draft release notes for 1.6.2.1Junio C Hamano1-0/+19
2009-03-11Merge branch 'js/maint-send-email' into maintJunio C Hamano3-112/+305
2009-03-11Merge branch 'jk/sane-relative-time' into maintJunio C Hamano1-1/+19
2009-03-11Merge branch 'jc/maint-add-p-unquote' into maintJunio C Hamano2-10/+52
2009-03-11Merge branch 'fg/maint-exclude-bq' into maintJunio C Hamano2-2/+9
2009-03-11Merge branch 'en/maint-hash-object' into maintJunio C Hamano1-2/+2
2009-03-10rsync transport: allow local paths, and fix testsJohannes Schindelin2-27/+35
2009-03-10Give error when no remote is configuredDaniel Barkalow3-8/+35
2009-03-07Merge branch 'maint-1.6.1' into maintJunio C Hamano2-0/+34
2009-03-07builtin-revert.c: release index lock when cherry-picking an empty commitChris Johnsen2-0/+34
2009-03-07document config --bool-or-intJeff King1-0/+4
2009-03-07t1300: use test_must_fail as appropriateJeff King1-5/+5
2009-03-07cleanup: add isascii()René Scharfe2-2/+3
2009-03-07Documentation: fix badly indented paragraphs in "--bisect-all" descriptionChristian Couder1-2/+2
2009-03-04Make the 'lock file' exists error more informativeJohn Tapsell1-2/+2
2009-03-04Beginning of 1.6.2 maintenance trackJunio C Hamano2-1/+7
2009-03-03GIT 1.6.2v1.6.2Junio C Hamano3-7/+6
2009-03-03git submodule: Fix adding of submodules at paths with ./, .. and //Michael J Gruber2-7/+16
2009-03-03git submodule: Add test cases for git submodule addMichael J Gruber1-0/+49
2009-03-03Documentation: Typo / spelling / formatting fixesMike Ralphson3-4/+4
2009-03-03Documentation: Expand a couple of abbreviationsMike Ralphson1-1/+1
2009-03-03Documentation: Typos / spelling fixes in RelNotesMike Ralphson4-6/+6
2009-03-03Documentation/git-archive.txt: Note attributesRoy Lee1-0/+17
2009-03-02send-email: respect in-reply-to regardless of threadingThomas Rast1-1/+1
2009-03-02optimize compat/ memmem()René Scharfe1-1/+4
2009-03-02diffcore-pickaxe: use memmem()René Scharfe1-10/+8
2009-03-02Documentation: minor grammatical fixes.David J. Mellor1-13/+13
2009-03-02Documentation: minor grammatical fixes.David J. Mellor2-6/+6
2009-03-02Documentation: minor grammatical fixes.David J. Mellor1-18/+18
2009-03-01t3400-rebase: Move detached HEAD check earlierJohannes Sixt1-4/+4
2009-03-01Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-4/+6
2009-03-02gitk: Fix possible infinite loop and display corruptionPaul Mackerras1-4/+6
2009-02-28Merge branch 'jc/maint-1.6.0-pack-directory'Junio C Hamano1-1/+2
2009-02-28Merge branch 'maint'Junio C Hamano2-7/+7