summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-04-26Git 1.7.7.7v1.7.7.7Junio C Hamano4-3/+18
2012-04-26bundle: remove stray single-quote from error messageJonathan Nieder1-1/+1
2012-03-06Document the --histogram diff optionThomas Rast1-0/+3
2012-02-05Sync with 1.7.6.6Junio C Hamano2-24/+2
2012-02-05Git 1.7.6.6v1.7.6.6Junio C Hamano2-2/+3
2012-02-05imap-send: remove dead codeJeff King1-23/+0
2012-01-18Git 1.7.7.6v1.7.7.6Junio C Hamano2-1/+5
2012-01-18diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2-0/+10
2012-01-12Update draft release notes to 1.7.7.6Junio C Hamano1-0/+5
2012-01-12Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-2/+12
2012-01-12Update draft release notes to 1.7.6.6Junio C Hamano1-0/+5
2012-01-12thin-pack: try harder to use preferred base objects as baseJeff King1-2/+7
2012-01-11Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-1/+2
2012-01-11attr: fix leak in free_attr_elemJeff King1-0/+1
2012-01-11t2203: fix wrong commit commandNguyễn Thái Ngọc Duy1-1/+1
2012-01-10Prepare for 1.7.7.6Junio C Hamano2-1/+12
2012-01-10Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano4-33/+66
2012-01-10Prepare for 1.7.6.6Junio C Hamano2-1/+12
2012-01-10Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano1-1/+2
2012-01-10attr.c: clarify the logic to pop attr_stackJunio C Hamano1-1/+10
2012-01-10attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano1-30/+31
2012-01-10attr: drop misguided defensive codingJeff King1-1/+1
2012-01-10attr: don't confuse prefixes with leading directoriesJeff King2-1/+12
2012-01-06Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano1-4/+4
2012-01-06Documentation: rerere.enabled is the primary way to configure rerereThomas Rast1-4/+4
2012-01-03Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-5/+5
2012-01-03docs: describe behavior of relative submodule URLsJens Lehmann1-1/+6
2012-01-01Documentation: read-tree --prefix works with existing subtreesClemens Buchacher1-5/+4
2011-12-29Add MYMETA.json to perl/.gitignoreJack Nagel1-0/+1
2011-12-13Git 1.7.7.5v1.7.7.5Junio C Hamano4-3/+21
2011-12-13Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano3-5/+2
2011-12-13Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2-2/+2
2011-12-13Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano4-40/+78
2011-12-13Git 1.7.6.5v1.7.6.5Junio C Hamano4-3/+30
2011-12-13Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano1-38/+49
2011-12-13Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano1-1/+1
2011-12-13Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano1-3/+2
2011-12-13blame: don't overflow time bufferJeff King1-1/+1
2011-12-09fetch: create status table using strbufJeff King1-38/+49
2011-12-09am: don't persist keepcr flagMartin von Zweigbergk1-7/+0
2011-12-09mingw: give waitpid the correct signatureErik Faye-Lund2-2/+2
2011-12-08git symbolic-ref: documentation fixMichael Haggerty1-6/+3
2011-12-05Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2-2/+1
2011-12-05stripspace: fix outdated commentJeff King1-2/+0
2011-12-05Add MYMETA.yml to perl/.gitignoreSebastian Morr1-0/+1
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2-2/+2
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein1-1/+1
2011-11-18Git 1.7.7.4v1.7.7.4Junio C Hamano3-2/+16
2011-11-18Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano1-1/+1
2011-11-18Merge branch 'ml/mailmap' into maintJunio C Hamano1-3/+2
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano1-43/+61
2011-11-18Makefile: add missing header file dependenciesJonathan Nieder1-2/+3
2011-11-17notes merge: eliminate OUTPUT macroJonathan Nieder1-43/+61
2011-11-16mailmap: xcalloc mailmap_infoMarc-André Lureau1-3/+2
2011-11-15name-rev --all: do not even attempt to describe non-commit objectJunio C Hamano1-1/+1
2011-11-08Git 1.7.7.3v1.7.7.3Junio C Hamano3-2/+21
2011-11-08Merge branch 'jc/maint-remove-renamed-ref' into maintJunio C Hamano1-8/+0
2011-11-08Merge branch 'jm/maint-gitweb-filter-forks-fix' into maintJunio C Hamano1-1/+1
2011-11-08Merge branch 'dm/pack-objects-update' into maintJunio C Hamano1-19/+55
2011-11-08docs: Update install-doc-quickJunio C Hamano3-50/+46
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Jeff King1-0/+2
2011-11-06cast variable in call to free() in builtin/diff.c and submodule.cÆvar Arnfjörð Bjarmason2-2/+2
2011-11-06apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason1-3/+0
2011-11-01Git 1.7.7.2v1.7.7.2Junio C Hamano2-1/+45
2011-11-01Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano1-1/+1
2011-11-01Merge branch 'md/smtp-tls-hello-again' into maintJunio C Hamano1-1/+1
2011-11-01Merge branch 'jk/pull-rebase-with-work-tree' into maintJunio C Hamano2-2/+2
2011-11-01Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano1-0/+2
2011-11-01Merge branch 'js/bisect-no-checkout' into maintJunio C Hamano1-1/+2
2011-11-01Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano11-36/+92
2011-11-01Merge branch 'cn/fetch-prune' into maintJunio C Hamano5-55/+137
2011-11-01Merge branch 'sp/smart-http-failure' into maintJunio C Hamano1-1/+8
2011-11-01Merge jn/maint-http-error-messageJunio C Hamano1-2/+7
2011-10-31t7511: avoid use of reserved filename on Windows.Pat Thoyts1-1/+1
2011-10-27Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2-3/+53
2011-10-27clone: Quote user supplied path in a single quote pairRichard Hartmann1-2/+2
2011-10-26Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano1-1/+13
2011-10-26Merge branch 'jk/argv-array' into maintJunio C Hamano11-107/+261
2011-10-26Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano1-19/+52
2011-10-26Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano4-6/+6
2011-10-26Merge branch 'maint-1.7.6' into maintJunio C Hamano10-93/+166
2011-10-26Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6Junio C Hamano1-1/+2
2011-10-26Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6Junio C Hamano1-4/+4
2011-10-26Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano3-70/+71
2011-10-26Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2-7/+52
2011-10-26Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano1-0/+8
2011-10-26Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2-11/+29
2011-10-26Merge branch 'maint-1.7.6' into maintJunio C Hamano7-32/+46
2011-10-26Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano1-1/+2
2011-10-26Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano1-2/+2
2011-10-26Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano4-25/+31
2011-10-26Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano3-5/+12
2011-10-26Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano3-5/+12
2011-10-26Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano3-5/+12
2011-10-26Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano1-2/+5
2011-10-26read-cache.c: fix index memory allocationRené Scharfe2-3/+53
2011-10-26make the sample pre-commit hook script reject names with newlines, tooJim Meyering1-2/+6
2011-10-23Merge branch 'maint-1.7.3' into maintJunio C Hamano1-1/+1
2011-10-23Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy1-1/+1
2011-10-23Git 1.7.7.1v1.7.7.1Junio C Hamano2-2/+3
2011-10-23RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile se...Jonathan Nieder1-2/+3
2011-10-21gitweb: fix regression when filtering out forksJulien Muchembled1-1/+1
2011-10-21Almost ready for 1.7.7.1Junio C Hamano1-0/+20
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano7-65/+93
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano1-2/+9
2011-10-21Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano1-0/+1
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano3-3/+15
2011-10-21Merge branch 'il/archive-err-signal' into maintJunio C Hamano1-0/+2
2011-10-21Merge branch 'js/maint-merge-one-file-osx-expr' into maintJunio C Hamano1-1/+1
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2-0/+46
2011-10-21Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2-1/+47
2011-10-21Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2-7/+19
2011-10-20pack-objects: don't traverse objects unnecessarilyDan McGee1-6/+12
2011-10-18strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()Brandon Casey1-1/+0
2011-10-18pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee1-7/+37
2011-10-18pack-objects: use unsigned int for counter and offset valuesDan McGee1-6/+6
2011-10-18pack-objects: mark add_to_write_order() as inlineDan McGee1-1/+1
2011-10-15fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2-4/+23
2011-10-15fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto5-20/+36
2011-10-15remote: separate out the remote_find_tracking logic into query_refspecsCarlos Martín Nieto1-36/+33
2011-10-15Prepare for 1.7.7.1Junio C Hamano2-1/+40
2011-10-15Merge branch 'ms/patch-id-with-overlong-line' into maintJunio C Hamano1-4/+6
2011-10-15Merge branch 'jc/maint-bundle-too-quiet' into maintJunio C Hamano4-5/+10
2011-10-15Merge branch 'jk/filter-branch-require-clean-work-tree' into maintJunio C Hamano1-3/+1
2011-10-15Merge branch 'jc/maint-fsck-fwrite-size-check' into maintJunio C Hamano1-6/+3
2011-10-15Merge branch 'bk/ancestry-path' into maintJunio C Hamano3-10/+101
2011-10-15Merge branch 'jk/maint-fetch-submodule-check-fix' into maintJunio C Hamano1-5/+72
2011-10-15Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano1-0/+2
2011-10-15Merge branch 'nm/grep-object-sha1-lock' into maintJunio C Hamano1-0/+3
2011-10-15Merge branch 'jc/diff-index-unpack' into maintJunio C Hamano5-6/+38
2011-10-15Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2-4/+40
2011-10-15send-email: Honour SMTP domain when using TLSMatthew Daley1-1/+1
2011-10-14t1304: fall back to $USER if $LOGNAME is not definedRené Scharfe1-0/+5
2011-10-13pull,rebase: handle GIT_WORK_TREE betterJeff King2-2/+2
2011-10-12fix "git apply --index ..." not to deref NULLJim Meyering2-0/+46
2011-10-12branch -m/-M: remove undocumented RENAMED-REFJunio C Hamano1-8/+0
2011-10-11attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2-3/+61
2011-10-10config: display key_delim for config --bool --get-regexpMatthieu Moy2-7/+19
2011-10-07t5510: add tests for fetch --pruneCarlos Martín Nieto1-0/+50
2011-10-07fetch: free all the additional refspecsCarlos Martín Nieto1-1/+1
2011-10-06attr: read core.attributesfile from git_default_core_configJunio C Hamano5-13/+9
2011-10-06builtin/mv.c: plug miniscule memory leakBrandon Casey1-1/+5
2011-10-06cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey7-8/+8
2011-10-06attr.c: avoid inappropriate access to strbuf "buf" memberBrandon Casey1-13/+11
2011-10-06merge-one-file: fix "expr: non-numeric argument"Jay Soffian1-1/+1
2011-10-05Support ERR in remote archive like in fetch/pushIlari Liusvaara1-0/+2
2011-10-04remote-curl: Fix warning after HTTP failureShawn O. Pearce1-1/+8
2011-10-03Makefile: do not set setgid bit on directories on GNU/kFreeBSDJonathan Nieder1-0/+1
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2-0/+8
2011-09-30Git 1.7.7v1.7.7Junio C Hamano3-10/+6
2011-09-30checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2-1/+47
2011-09-27templates/hooks--*: remove sample hooks without any functionalityGerrit Pape2-23/+0
2011-09-27notes_merge_commit(): do not pass temporary buffer to other functionMichael Haggerty1-1/+2
2011-09-27gitweb: Fix links to lines in blobs when javascript-actions are enabledPeter Stuge1-4/+4
2011-09-26contrib/hooks: adapt comment about Debian install location for contrib hooksGerrit Pape1-2/+2
2011-09-26apply --whitespace=error: correctly report new blank lines at endJunio C Hamano1-2/+9
2011-09-26Revert removal of multi-match discard heuristic in 27af01René Scharfe1-3/+7
2011-09-26Merge branch 'jc/namespace-doc-with-old-asciidoc'Junio C Hamano1-0/+7
2011-09-26git-read-tree.txt: update sparse checkout examplesNguyễn Thái Ngọc Duy1-2/+2
2011-09-26mergetool: no longer need to save standard inputJunio C Hamano1-6/+4
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah3-69/+72
2011-09-23Git 1.7.7-rc3v1.7.7-rc3Junio C Hamano2-31/+2
2011-09-23Merge 1.7.6.4 inJunio C Hamano2-1/+34
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano1-1/+1
2011-09-23Git 1.7.6.4v1.7.6.4Junio C Hamano4-3/+36
2011-09-23Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano6-10/+90
2011-09-23describe: Refresh the index when run with --dirtyAllan Caffee1-2/+15
2011-09-23Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano3-30/+114
2011-09-23Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano9-12/+33
2011-09-23Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano3-4/+13
2011-09-23Merge branch 'mg/branch-set-upstream-previous' into maintJunio C Hamano2-1/+15
2011-09-23Merge branch 'gb/maint-am-patch-format-error-message' into maintJunio C Hamano1-1/+2
2011-09-22diff: teach --stat/--numstat to honor -U$numJunio C Hamano1-0/+2
2011-09-22patch-id.c: use strbuf instead of a fixed bufferMichael Schubert1-4/+6
2011-09-21git-read-tree.txt: correct sparse-checkout and skip-worktree descriptionMichael J Gruber1-4/+4
2011-09-21git-read-tree.txt: language and typography fixesMichael J Gruber1-20/+20
2011-09-21unpack-trees: print "Aborting" to stderrMichael J Gruber3-1/+7
2011-09-21Remove 'working copy' from the documentation and C codeCarlos Martín Nieto4-6/+6
2011-09-21t9159-*.sh: skip for mergeinfo test for svn <= 1.4Ramsay Jones1-0/+8
2011-09-21Documentation/git-update-index: refer to 'ls-files'Stefan Naewe1-2/+5
2011-09-21bisect: fix exiting when checkout failed in bisect_start()Christian Couder1-1/+2
2011-09-19Merge branch 'maint'Junio C Hamano2-2/+2
2011-09-19git-mergetool: check return value from readJay Soffian2-2/+2
2011-09-19Merge branch 'ph/format-patch-no-color'Junio C Hamano1-4/+4
2011-09-19t4014: clean up format.thread config after each testJeff King1-4/+4
2011-09-19Teach progress eye-candy to fetch_refs_from_bundle()Junio C Hamano4-5/+10
2011-09-18Git 1.7.7-rc2v1.7.7-rc2Junio C Hamano2-2/+2
2011-09-18Accept tags in HEAD or MERGE_HEADNguyễn Thái Ngọc Duy7-14/+34
2011-09-18merge: remove global variable head[]Nguyễn Thái Ngọc Duy1-44/+53
2011-09-18merge: use return value of resolve_ref() to determine if HEAD is invalidNguyễn Thái Ngọc Duy1-1/+1
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano5-12/+39
2011-09-16branch --set-upstream: regression fixJunio C Hamano5-12/+39
2011-09-16Disambiguate duplicate t9160* testsFrédéric Heitzmann2-1/+1
2011-09-16gitweb: Strip non-printable characters from syntax highlighter outputJakub Narebski1-1/+13
2011-09-16Documentation/gitnamespaces.txt: cater to older asciidocJunio C Hamano1-0/+7
2011-09-15filter-branch: use require_clean_work_treeJeff King1-3/+1
2011-09-15t6019: avoid refname collision on case-insensitive systemsThomas Rast1-8/+11
2011-09-14Merge branch 'ph/format-patch-no-color'Junio C Hamano2-1/+10
2011-09-14run_hook: use argv_array APIJeff King1-10/+8
2011-09-14checkout: use argv_array APIJeff King1-19/+8