summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2009-05-03GIT 1.6.1.4v1.6.1.4Junio C Hamano2-1/+26
2009-05-03Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano11-74/+105
2009-05-03Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2-1/+17
2009-05-03Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano4-5/+29
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-12/+65
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano2-12/+65
2009-04-28Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano4-4/+12
2009-04-27grep: fix segfault when "git grep '('" is givenLinus Torvalds2-2/+10
2009-04-27Documentation: fix a grammatical error in api-builtin.txtAllan Caffee1-1/+1
2009-04-27builtin-merge: fix a typo in an error messageAllan Caffee1-1/+1
2009-04-24Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-1/+1
2009-04-23test-genrandom: Add newline to usage stringStephen Boyd1-1/+1
2009-04-18Merge branch 'maint-1.6.0' into maint-1.6.1Junio 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-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-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-08Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-3/+0
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-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-05Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2-2/+3
2009-04-05commit: abort commit if interactive add failedJeff King1-1/+2
2009-04-05git-repack: use non-dashed update-server-infoDan McGee1-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-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.0' into maint-1.6.1Junio C Hamano1-1/+2
2009-03-29import-zips: fix thinkoJohannes Schindelin1-1/+2
2009-03-28test-lib: Clean up comments and Makefile.Emil Sit2-9/+1
2009-03-27Documentation: format-patch --root clarificationsThomas Rast1-9/+12
2009-03-25diff --no-index: Do not generate patch output if other output is requestedJohannes Sixt1-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-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-22everyday: use the dashless form of git-initDavid Aguilar1-1/+1
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-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-18blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano1-4/+4
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-07builtin-revert.c: release index lock when cherry-picking an empty commitChris Johnsen2-0/+34
2009-02-28Documentation: minor grammatical fixes.David J. Mellor1-6/+6
2009-02-28Ensure proper setup of git_dir for git-hash-objectElijah Newren1-2/+2
2009-02-28Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+1
2009-02-28added missing backtick in git-apply.txtDanijel Tasov1-1/+1
2009-02-28is_kept_pack(): final clean-upJunio C Hamano5-21/+13
2009-02-28Simplify is_kept_pack()Junio C Hamano5-51/+18
2009-02-28Consolidate ignore_packed logic moreJunio C Hamano4-21/+17
2009-02-28has_sha1_kept_pack(): take "struct rev_info"Junio C Hamano4-9/+12
2009-02-28has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano7-13/+33
2009-02-28git-repack: resist stray environment variableJunio C Hamano1-0/+1
2009-02-27bisect: fix another instance of eval'ed stringChristian Couder1-1/+7
2009-02-27bisect: fix quoting TRIED revs when "bad" commit is also "skip"pedChristian Couder2-35/+66
2009-02-26Fix odb_mkstemp() on AIXMike Ralphson1-1/+2
2009-02-25Make sure objects/pack exists before creating a new packJunio C Hamano7-27/+72
2009-02-19More friendly message when locking the index fails.Matthieu Moy3-3/+17
2009-02-19Document git blame --reverse.Matthieu Moy2-1/+8
2009-02-18Documentation: Note file formats send-email acceptsTodd Zullinger1-0/+13
2009-02-18tests: fix "export var=val"Junio C Hamano2-3/+3
2009-02-18Skip timestamp differences for diff --no-indexMichael Spang3-0/+8
2009-02-18Documentation/git-push: --all, --mirror, --tags can not be combinedGerrit Pape1-1/+1
2009-02-12Support "\" in non-wildcard exclusion entriesFinn Arne Gangstad2-2/+9
2009-02-11Prepare for 1.6.1.4.Junio C Hamano2-1/+20
2009-02-11Merge branch 'maint-1.6.0' into maintJunio C Hamano3-20/+69
2009-02-11Make repack less likely to corrupt repositoryJunio C Hamano1-20/+67
2009-02-11fast-export: ensure we traverse commits in topological orderElijah Newren1-0/+1
2009-02-11Clear the delta base cache if a pack is rebuiltShawn O. Pearce1-0/+1
2009-02-11Merge branch 'maint-1.5.6' into maintJunio C Hamano2-2/+43
2009-02-11Merge branch 'maint-1.5.5' into maint-1.5.6Junio C Hamano2-2/+43
2009-02-11Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano2-2/+43
2009-02-11revision traversal and pack: notice and die on missing commitJunio C Hamano2-2/+43
2009-02-10Merge branch 'maint-1.6.0' into maintJunio C Hamano3-0/+9
2009-02-10Clear the delta base cache during fast-import checkpointShawn O. Pearce3-0/+9
2009-02-08gitweb: add $prevent_xss option to prevent XSS by repository contentMatt McCutchen2-3/+27
2009-02-08rev-list: fix showing distance when using --bisect-allChristian Couder1-0/+1
2009-02-07Remove unused normalize_absolute_path()Johannes Sixt2-46/+6
2009-02-07Test and fix normalize_path_copy()Johannes Sixt3-30/+26
2009-02-07Fix GIT_CEILING_DIRECTORIES on WindowsRené Scharfe2-8/+9
2009-02-07Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()Johannes Sixt3-87/+88
2009-02-07Make test-path-utils more robust against incorrect useJohannes Sixt1-1/+6
2009-02-07GIT 1.6.1.3v1.6.1.3Junio C Hamano3-2/+34
2009-02-05Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+4
2009-02-05Merge branch 'jc/maint-apply-fix' into maintJunio C Hamano1-1/+1
2009-02-05Merge branch 'am/maint-push-doc' into maintJunio C Hamano2-23/+34
2009-02-05Merge branch 'sg/maint-gitdir-in-subdir' into maintJunio C Hamano2-1/+12
2009-02-05Merge branch 'lt/maint-wrap-zlib' into maintJunio C Hamano9-34/+99
2009-02-05Merge branch 'jc/maint-split-diff-metainfo' into maintJunio C Hamano3-67/+99
2009-02-05Merge branch 'js/maint-all-implies-HEAD' into maintJunio C Hamano6-2/+63
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2-2/+31
2009-02-05filter-branch: do not consider diverging submodules a 'dirty worktree'Johannes Schindelin1-1/+1
2009-02-04Fixed broken git help -w when installing from RPMDavid J. Mellor1-1/+4
2009-02-04builtin-blame.c: Use utf8_strwidth for author's namesGeoffrey Thomas1-5/+7
2009-02-04utf8: add utf8_strwidth()Geoffrey Thomas2-0/+20
2009-02-04urls.txt: document optional port specification in git URLSStefan Naewe1-4/+4
2009-02-04Merge branch 'maint-1.6.0' into maintJunio C Hamano2-5/+13
2009-02-04builtin-mv.c: check for unversionned files before looking at the destination.Matthieu Moy2-5/+5
2009-02-04Add a testcase for "git mv -f" on untracked files.Matthieu Moy1-0/+8
2009-02-04Missing && in t/t7001.sh.Matthieu Moy1-1/+1
2009-02-04builtin-remote: make rm operation safer in mirrored repositoryJay Soffian2-2/+53
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano5-4/+4
2009-02-03User-manual: "git stash <comment>" form is long goneWilliam Pursell1-1/+1
2009-02-03add test-dump-cache-tree in MakefileGuanqun Lu2-1/+1
2009-02-03fix typo in DocumentationGuanqun Lu1-1/+1
2009-02-03apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin1-1/+1
2009-02-03filter-branch: Fix fatal error on bare repositoriesEric Kidd2-13/+16
2009-02-03builtin-remote: make rm() use properly named variable to hold return valueJay Soffian1-5/+5
2009-02-03Merge branch 'maint-1.6.0' into maintJunio C Hamano1-0/+2
2009-02-02grep: pass -I (ignore binary) down to external grepJunio C Hamano1-0/+2
2009-01-31Merge branch 'maint-1.6.0' into maintJunio C Hamano1-3/+6
2009-01-31merge: fix out-of-bounds memory accessRené Scharfe1-3/+6
2009-01-29GIT 1.6.1.2v1.6.1.2Junio C Hamano3-2/+41
2009-01-28Merge branch 'jc/maint-format-patch-o-relative' into maintJunio C Hamano2-4/+76
2009-01-28Merge branch 'bs/maint-rename-populate-filespec' into maintJunio C Hamano1-2/+7
2009-01-28Merge branch 'mh/maint-commit-color-status' into maintJunio C Hamano1-0/+6
2009-01-28Merge branch 'nd/grep-assume-unchanged' into maintJunio C Hamano2-2/+20
2009-01-28Merge branch 'jc/maint-ls-tree' into maintJunio C Hamano2-2/+13
2009-01-28Merge branch 'np/no-loosen-prune-expire-now' into maintJunio C Hamano2-3/+9
2009-01-28Merge branch 'mc/cd-p-pwd' into maintJunio C Hamano2-3/+3
2009-01-28Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+2
2009-01-28avoid 31-bit truncation in write_loose_objectJeff King1-1/+2
2009-01-28add -u: do not fail to resolve a path as deletedJunio C Hamano2-1/+69
2009-01-28builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano1-1/+1
2009-01-28mailinfo: tests for RFC2047 examplesKirill Smelkov14-0/+100
2009-01-28mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'Kirill Smelkov5-1/+11
2009-01-28Fix submodule squashing into unrelated commitJohannes Schindelin2-6/+5
2009-01-28rebase -i squashes submodule changes into unrelated commitJunio C Hamano1-0/+26
2009-01-28git: use run_command() to execute dashed externalsJeff King1-4/+13
2009-01-28run_command(): help callers distinguish errorsJeff King1-0/+1
2009-01-28run_command(): handle missing command errors more gracefullyJeff King1-4/+14
2009-01-28git: s/run_command/run_builtin/Jeff King1-2/+2
2009-01-28revision traversal: allow UNINTERESTING objects to be missingJunio C Hamano2-3/+44
2009-01-27send-pack: do not send unknown object name from ".have" to pack-objectsJunio C Hamano2-22/+127
2009-01-27Merge branch 'maint-1.6.0' into maintJunio C Hamano2-2/+2
2009-01-27test-path-utils: Fix off by one, found by valgrindJohannes Schindelin1-1/+1
2009-01-27get_sha1_basic(): fix invalid memory access, found by valgrindJohannes Schindelin1-1/+1
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano3-67/+99
2009-01-27diff.c: output correct index lines for a split diffJunio C Hamano2-66/+98
2009-01-25Documentation: rework src/dst description in git pushAnders Melchiorsen1-11/+12
2009-01-25Documentation: more git push examplesAnders Melchiorsen1-3/+13
2009-01-25Documentation: simplify refspec format descriptionJunio C Hamano2-9/+9
2009-01-25GIT 1.6.1.1v1.6.1.1Junio C Hamano2-8/+18
2009-01-23Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2-18/+67
2009-01-23Merge branch 'tr/maint-no-index-fixes' into maintJunio C Hamano3-10/+20
2009-01-23Merge branch 'rs/maint-shortlog-foldline' into maintJunio C Hamano2-5/+8
2009-01-23Merge branch 'pj/maint-ldflags' into maintJunio C Hamano1-2/+2
2009-01-23Merge branch 'pb/maint-git-pm-false-dir' into maintJunio C Hamano1-3/+4
2009-01-23Merge branch 'js/maint-bisect-gitk' into maintJunio C Hamano1-1/+1
2009-01-23Merge branch 'js/add-not-submodule' into maintJunio C Hamano2-0/+53
2009-01-23Merge branch 'jc/maint-format-patch' into maintJunio C Hamano1-0/+7
2009-01-23Merge branch 'am/maint-push-doc' into maintJunio C Hamano1-7/+8
2009-01-23Merge branch 'maint-1.6.0' into maintJunio C Hamano1-1/+1
2009-01-23Fix Documentation for git-describeBoyd Stephen Smith Jr1-1/+1
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin3-6/+8
2009-01-21Rename detection: Avoid repeated filespec populationBjörn Steinbrink1-2/+7
2009-01-19Fix combined use of whitespace ignore options to diffKeith Cascio2-6/+8
2009-01-19test more combinations of ignore-whitespace options to diffKeith Cascio1-0/+27
2009-01-19shell: Document that 'cvs server' is a valid commandLars Noschinski1-2/+3
2009-01-18Documentation: avoid using undefined parametersAnders Melchiorsen1-2/+2
2009-01-18Documentation: mention branches rather than headsAnders Melchiorsen1-2/+2
2009-01-18Documentation: remove a redundant elaborationAnders Melchiorsen1-2/+1
2009-01-18Documentation: git push repository can also be a remoteAnders Melchiorsen1-1/+3